From 204057fdc5023b5f4ff55a69bc6593388ea427e7 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Wed, 13 Jun 2018 09:56:22 +0200 Subject: 2018-06-12 21:56:00 --- doc/context/documents/general/manuals/onandon.pdf | Bin 3326371 -> 4750536 bytes doc/context/documents/general/qrcs/setup-cs.pdf | Bin 840614 -> 840618 bytes doc/context/documents/general/qrcs/setup-de.pdf | Bin 839221 -> 839230 bytes doc/context/documents/general/qrcs/setup-en.pdf | Bin 844228 -> 844242 bytes doc/context/documents/general/qrcs/setup-fr.pdf | Bin 838887 -> 838890 bytes doc/context/documents/general/qrcs/setup-it.pdf | Bin 842123 -> 842121 bytes .../documents/general/qrcs/setup-mapping-cs.pdf | Bin 345587 -> 221950 bytes .../documents/general/qrcs/setup-mapping-de.pdf | Bin 428900 -> 305723 bytes .../documents/general/qrcs/setup-mapping-en.pdf | Bin 342932 -> 219314 bytes .../documents/general/qrcs/setup-mapping-fr.pdf | Bin 345532 -> 222205 bytes .../documents/general/qrcs/setup-mapping-it.pdf | Bin 344401 -> 221545 bytes .../documents/general/qrcs/setup-mapping-nl.pdf | Bin 343515 -> 220437 bytes .../documents/general/qrcs/setup-mapping-ro.pdf | Bin 597872 -> 474081 bytes doc/context/documents/general/qrcs/setup-nl.pdf | Bin 834807 -> 834525 bytes doc/context/documents/general/qrcs/setup-ro.pdf | Bin 837490 -> 837490 bytes doc/context/scripts/mkiv/context.html | 1 + doc/context/scripts/mkiv/context.man | 3 ++ doc/context/scripts/mkiv/context.xml | 3 ++ doc/context/scripts/mkiv/mtx-context.html | 1 + doc/context/scripts/mkiv/mtx-context.man | 3 ++ doc/context/scripts/mkiv/mtx-context.xml | 3 ++ .../general/manuals/cld/cld-moreonfunctions.tex | 39 +++++++++++---------- .../general/manuals/onandon/onandon-110.tex | 24 +++++++++++++ 23 files changed, 59 insertions(+), 18 deletions(-) (limited to 'doc') diff --git a/doc/context/documents/general/manuals/onandon.pdf b/doc/context/documents/general/manuals/onandon.pdf index 16eef6dc8..3195b7ebd 100644 Binary files a/doc/context/documents/general/manuals/onandon.pdf and b/doc/context/documents/general/manuals/onandon.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-cs.pdf b/doc/context/documents/general/qrcs/setup-cs.pdf index a68cb9e58..90cba6aa0 100644 Binary files a/doc/context/documents/general/qrcs/setup-cs.pdf and b/doc/context/documents/general/qrcs/setup-cs.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-de.pdf b/doc/context/documents/general/qrcs/setup-de.pdf index ffae25018..e71e915da 100644 Binary files a/doc/context/documents/general/qrcs/setup-de.pdf and b/doc/context/documents/general/qrcs/setup-de.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-en.pdf b/doc/context/documents/general/qrcs/setup-en.pdf index ab8ade821..420e8e191 100644 Binary files a/doc/context/documents/general/qrcs/setup-en.pdf and b/doc/context/documents/general/qrcs/setup-en.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-fr.pdf b/doc/context/documents/general/qrcs/setup-fr.pdf index bc5c76359..d46a25afd 100644 Binary files a/doc/context/documents/general/qrcs/setup-fr.pdf and b/doc/context/documents/general/qrcs/setup-fr.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-it.pdf b/doc/context/documents/general/qrcs/setup-it.pdf index 0ce7a392d..bc9865a4a 100644 Binary files a/doc/context/documents/general/qrcs/setup-it.pdf and b/doc/context/documents/general/qrcs/setup-it.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-mapping-cs.pdf b/doc/context/documents/general/qrcs/setup-mapping-cs.pdf index 77e659396..1b69ce871 100644 Binary files a/doc/context/documents/general/qrcs/setup-mapping-cs.pdf and b/doc/context/documents/general/qrcs/setup-mapping-cs.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-mapping-de.pdf b/doc/context/documents/general/qrcs/setup-mapping-de.pdf index 014333311..2a509cbc8 100644 Binary files a/doc/context/documents/general/qrcs/setup-mapping-de.pdf and b/doc/context/documents/general/qrcs/setup-mapping-de.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-mapping-en.pdf b/doc/context/documents/general/qrcs/setup-mapping-en.pdf index d7de7c0f3..46f5f836d 100644 Binary files a/doc/context/documents/general/qrcs/setup-mapping-en.pdf and b/doc/context/documents/general/qrcs/setup-mapping-en.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-mapping-fr.pdf b/doc/context/documents/general/qrcs/setup-mapping-fr.pdf index 1f6f4a782..e46eb02c5 100644 Binary files a/doc/context/documents/general/qrcs/setup-mapping-fr.pdf and b/doc/context/documents/general/qrcs/setup-mapping-fr.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-mapping-it.pdf b/doc/context/documents/general/qrcs/setup-mapping-it.pdf index 8efe2ed0e..ba5cedcdd 100644 Binary files a/doc/context/documents/general/qrcs/setup-mapping-it.pdf and b/doc/context/documents/general/qrcs/setup-mapping-it.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-mapping-nl.pdf b/doc/context/documents/general/qrcs/setup-mapping-nl.pdf index 160d708aa..03dba05a3 100644 Binary files a/doc/context/documents/general/qrcs/setup-mapping-nl.pdf and b/doc/context/documents/general/qrcs/setup-mapping-nl.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-mapping-ro.pdf b/doc/context/documents/general/qrcs/setup-mapping-ro.pdf index 842fbbbfa..0713fbad1 100644 Binary files a/doc/context/documents/general/qrcs/setup-mapping-ro.pdf and b/doc/context/documents/general/qrcs/setup-mapping-ro.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-nl.pdf b/doc/context/documents/general/qrcs/setup-nl.pdf index 708705d08..ef605bd21 100644 Binary files a/doc/context/documents/general/qrcs/setup-nl.pdf and b/doc/context/documents/general/qrcs/setup-nl.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-ro.pdf b/doc/context/documents/general/qrcs/setup-ro.pdf index 48cfe1c2c..1f935a5f1 100644 Binary files a/doc/context/documents/general/qrcs/setup-ro.pdf and b/doc/context/documents/general/qrcs/setup-ro.pdf differ diff --git a/doc/context/scripts/mkiv/context.html b/doc/context/scripts/mkiv/context.html index cb841477a..b8837c525 100644 --- a/doc/context/scripts/mkiv/context.html +++ b/doc/context/scripts/mkiv/context.html @@ -61,6 +61,7 @@ --trackerslistset tracker variables (show list with --showtrackers) --directiveslistset directive variables (show list with --showdirectives) --silentlistdisable logcatgories (show list with --showlogcategories) + --stripstrip Lua code (only meant for production where no errors are expected) --errorslistshow errors at the end of a run, quit when in list (also when ----silent) --noconsoledisable logging to the console (logfile only) --purgeresultpurge result file before run diff --git a/doc/context/scripts/mkiv/context.man b/doc/context/scripts/mkiv/context.man index 39882b77e..fc92dd7aa 100644 --- a/doc/context/scripts/mkiv/context.man +++ b/doc/context/scripts/mkiv/context.man @@ -65,6 +65,9 @@ set directive variables (show list with --showdirectives) .B --silent=list disable logcatgories (show list with --showlogcategories) .TP +.B --strip +strip Lua code (only meant for production where no errors are expected) +.TP .B --errors=list show errors at the end of a run, quit when in list (also when ----silent) .TP diff --git a/doc/context/scripts/mkiv/context.xml b/doc/context/scripts/mkiv/context.xml index 9003b549a..c4d634443 100644 --- a/doc/context/scripts/mkiv/context.xml +++ b/doc/context/scripts/mkiv/context.xml @@ -70,6 +70,9 @@ disable logcatgories (show list with ) + + strip Lua code (only meant for production where no errors are expected) + show errors at the end of a run, quit when in list (also when ) diff --git a/doc/context/scripts/mkiv/mtx-context.html b/doc/context/scripts/mkiv/mtx-context.html index cb841477a..b8837c525 100644 --- a/doc/context/scripts/mkiv/mtx-context.html +++ b/doc/context/scripts/mkiv/mtx-context.html @@ -61,6 +61,7 @@ --trackerslistset tracker variables (show list with --showtrackers) --directiveslistset directive variables (show list with --showdirectives) --silentlistdisable logcatgories (show list with --showlogcategories) + --stripstrip Lua code (only meant for production where no errors are expected) --errorslistshow errors at the end of a run, quit when in list (also when ----silent) --noconsoledisable logging to the console (logfile only) --purgeresultpurge result file before run diff --git a/doc/context/scripts/mkiv/mtx-context.man b/doc/context/scripts/mkiv/mtx-context.man index 39882b77e..fc92dd7aa 100644 --- a/doc/context/scripts/mkiv/mtx-context.man +++ b/doc/context/scripts/mkiv/mtx-context.man @@ -65,6 +65,9 @@ set directive variables (show list with --showdirectives) .B --silent=list disable logcatgories (show list with --showlogcategories) .TP +.B --strip +strip Lua code (only meant for production where no errors are expected) +.TP .B --errors=list show errors at the end of a run, quit when in list (also when ----silent) .TP diff --git a/doc/context/scripts/mkiv/mtx-context.xml b/doc/context/scripts/mkiv/mtx-context.xml index 9003b549a..c4d634443 100644 --- a/doc/context/scripts/mkiv/mtx-context.xml +++ b/doc/context/scripts/mkiv/mtx-context.xml @@ -70,6 +70,9 @@ disable logcatgories (show list with ) + + strip Lua code (only meant for production where no errors are expected) + show errors at the end of a run, quit when in list (also when ) diff --git a/doc/context/sources/general/manuals/cld/cld-moreonfunctions.tex b/doc/context/sources/general/manuals/cld/cld-moreonfunctions.tex index fab22515e..da3d6fe46 100644 --- a/doc/context/sources/general/manuals/cld/cld-moreonfunctions.tex +++ b/doc/context/sources/general/manuals/cld/cld-moreonfunctions.tex @@ -173,24 +173,27 @@ example of why coding in \TEX\ makes sense as it looks more intuitive: \test{test 4 \test{test 5} test 6} \stoptyping -There is also another mechanism available. In the next example the second -argument is actually a string. - -\starttyping -local nested = context.nested - -context.test("test 8",nested.test("test 9"),"test 10") -\stoptyping - -There is a pitfall here: a nested context command needs to be flushed explicitly, -so in the case of: - -\starttyping -context.nested.test("test 9") -\stoptyping - -a string is created but nothing ends up at the \TEX\ end. Flushing is up to you. -Beware: \type {nested} only works with the regular \CONTEXT\ catcode regime. +The \type {context.nested} variant is now an alias to \type {context.delayed} and +no longer builds a string representation. + +% There is also another mechanism available. In the next example the second +% argument is actually a string. +% +% \starttyping +% local nested = context.nested +% +% context.test("test 8",nested.test("test 9"),"test 10") +% \stoptyping +% +% There is a pitfall here: a nested context command needs to be flushed explicitly, +% so in the case of: +% +% \starttyping +% context.nested.test("test 9") +% \stoptyping +% +% a string is created but nothing ends up at the \TEX\ end. Flushing is up to you. +% Beware: \type {nested} only works with the regular \CONTEXT\ catcode regime. \stopsection diff --git a/doc/context/sources/general/manuals/onandon/onandon-110.tex b/doc/context/sources/general/manuals/onandon/onandon-110.tex index 78ec96588..e8b005f24 100644 --- a/doc/context/sources/general/manuals/onandon/onandon-110.tex +++ b/doc/context/sources/general/manuals/onandon/onandon-110.tex @@ -63,6 +63,30 @@ add up, but less that one thinks, especially when macros are already quite optimal. Also this runtime includes time normally used for running additional programs (e.g.\ for getting bibliographies right). +It must be said that performance is not completely under our control. For +instance, we have patched the \LUAJIT\ hash function because it favours \URL's +and therefore favours hashing the middle of the string which is bad for our use +as we are more interested in the (often unique) start of strings. We also +compress the format which speeds up loading but not on the native windows 64~bit +binary. At the time this writing the extra overhead is 2~seconds due to some +suboptimal gzip handling; the cross compiled 64~bit mingw binaries that I use +don't suffer from this. When I was testing the 32~bit binaries on the machine of +a colleague, I was surprised to measure the following differences on a complex +document with hundreds of \XML\ files, many images and a lot of manipulations. + +\starttabulate[||c|c|] +\NC \BC 1.08 with \LUA\ 5.2 \BC 1.09 with \LUA\ 5.3 \NC \NR +\BC \LUATEX \NC $21.5$ \NC $15.2$ \NC \NR +\BC \LUAJITTEX \NC $10.7$ \NC $10.3$ \NC \NR +\stoptabulate + +Now, these are just rough numbers but they demonstrate that the gap between +\LUATEX\ and \LUAJITTEX\ is becoming less which is good because at this moment it +looks like \LUAJIT\ will not catch up with \LUA\ 5.3 so at some point we might +drop it. It will be interesting to see what \LUA\ 5.4 will bring as it offers an +\ alternative garbage collector. And imagine that the regular \LUA\ virtual +machine gets more optimized. + You also have to take into account that having a browser open in the background of a \TEX\ run has way more impact than a few tenths of a second in \LUATEX\ performance. The same is true for memory usage: why bother about \LUATEX\ taking -- cgit v1.2.3