From bcc5f422cb282c78b890ae719ac1a63eaa5e62aa Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Mon, 7 Jan 2019 13:28:56 +0100 Subject: 2019-01-07 10:16:00 --- doc/context/documents/general/manuals/luatex.pdf | Bin 1392317 -> 1518696 bytes doc/context/documents/general/qrcs/setup-cs.pdf | Bin 857730 -> 855723 bytes doc/context/documents/general/qrcs/setup-de.pdf | Bin 858234 -> 856570 bytes doc/context/documents/general/qrcs/setup-en.pdf | Bin 864786 -> 862538 bytes doc/context/documents/general/qrcs/setup-fr.pdf | Bin 856401 -> 854603 bytes doc/context/documents/general/qrcs/setup-it.pdf | Bin 861580 -> 859424 bytes .../documents/general/qrcs/setup-mapping-cs.pdf | Bin 348222 -> 347575 bytes .../documents/general/qrcs/setup-mapping-de.pdf | Bin 432721 -> 433778 bytes .../documents/general/qrcs/setup-mapping-en.pdf | Bin 346006 -> 345542 bytes .../documents/general/qrcs/setup-mapping-fr.pdf | Bin 348927 -> 348517 bytes .../documents/general/qrcs/setup-mapping-it.pdf | Bin 347327 -> 346869 bytes .../documents/general/qrcs/setup-mapping-nl.pdf | Bin 346738 -> 345909 bytes .../documents/general/qrcs/setup-mapping-ro.pdf | Bin 510034 -> 509943 bytes doc/context/documents/general/qrcs/setup-nl.pdf | Bin 851432 -> 849912 bytes doc/context/documents/general/qrcs/setup-ro.pdf | Bin 855593 -> 853577 bytes .../general/manuals/luatex/luatex-introduction.tex | 13 ++- .../sources/general/manuals/luatex/luatex-lua.tex | 127 ++++++++------------- .../general/manuals/luatex/luatex-preamble.tex | 24 ++-- 18 files changed, 66 insertions(+), 98 deletions(-) (limited to 'doc') diff --git a/doc/context/documents/general/manuals/luatex.pdf b/doc/context/documents/general/manuals/luatex.pdf index 909511695..64579ea5d 100644 Binary files a/doc/context/documents/general/manuals/luatex.pdf and b/doc/context/documents/general/manuals/luatex.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-cs.pdf b/doc/context/documents/general/qrcs/setup-cs.pdf index a4419cbac..07c29bcd9 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 1307192cc..641dda76c 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 870816228..e5740aa2c 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 a33afa9db..7d6ae81eb 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 b043eabf5..68d84e42d 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 93b4b50a0..ce8e808db 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 731c4f84e..45c469809 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 524fff8a5..67bf50992 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 3ca020d87..7316debcf 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 8e77b7749..f6d5d6a23 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 700c20639..0b3d8c46f 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 4a1cb0bf2..e804d25da 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 dd2098318..7a2d5a079 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 597703202..967dc6ad8 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/sources/general/manuals/luatex/luatex-introduction.tex b/doc/context/sources/general/manuals/luatex/luatex-introduction.tex index 1f997e250..5ed80f4c1 100644 --- a/doc/context/sources/general/manuals/luatex/luatex-introduction.tex +++ b/doc/context/sources/general/manuals/luatex/luatex-introduction.tex @@ -125,10 +125,15 @@ but there is no support for any of its experimental features. Intermediate releases (from trunk) are normally available via the \CONTEXT\ distribution channels (the garden and so called minimals). -Future versions will probably become a bit leaner and meaner. Some libraries -might become external as we don't want to bloat the binary and also don't want to -add more hard coded solutions. After all, with \LUA\ you can extend the core -functionality. The less dependencies, the better. +Version 1.10 is more or less an endpoint in development: this is what you get. +Because not only \CONTEXT, that we can adapt rather easily, uses \LUATEX, we +cannot change fundamentals without unforeseen consequences. By now it has been +proven that \LUA\ can be used to extend the core functionality so there is no +need to add more, and definitely no hard coded solutions for (not so) common +problems. Of course there will be bug fixes, maybe some optimization, and there +might even be some additions or non|-|intrusive improvements, but only after +testing outside the stable release. After all, the binary is already more than +large enough and there is not that much to gain. You might find \LUA\ helpers that are not yet documented. These are considered experimental, although when you encounter them in a \CONTEXT\ version that has diff --git a/doc/context/sources/general/manuals/luatex/luatex-lua.tex b/doc/context/sources/general/manuals/luatex/luatex-lua.tex index 27146d99b..f9107fa1f 100644 --- a/doc/context/sources/general/manuals/luatex/luatex-lua.tex +++ b/doc/context/sources/general/manuals/luatex/luatex-lua.tex @@ -347,29 +347,22 @@ returns the name. \startsubsection[title={Multibyte \type {string} functions}] -\libidx{string}{utfvalues} -\libidx{string}{utfcharacters} -\libidx{string}{characters} -\libidx{string}{characterpairs} -\libidx{string}{bytes} -\libidx{string}{bytepairs} -\libidx{string}{utfvalue} -\libidx{string}{utfcharacter} -\libidx{string}{utflength} - -The \type {string} library has a few extra functions like \type -{string.explode(s[,m])}. This function returns an array containing the string -argument \type {s} split into sub-strings based on the value of the string -argument \type {m}. The second argument is a string that is either empty (this -splits the string into characters), a single character (this splits on each -occurrence of that character, possibly introducing empty strings), or a single -character followed by the plus sign \type {+} (this special version does not -create empty sub-strings). The default value for \type {m} is \quote {\type { +}} -(multiple spaces). Note: \type {m} is not hidden by surrounding braces as it -would be if this function was written in \TEX\ macros. +The \type {string} library has a few extra functions, for example \libidx +{string} {explode}. This function takes upto two arguments: \type +{string.explode(s[,m])} and returns an array containing the string argument \type +{s} split into sub-strings based on the value of the string argument \type {m}. +The second argument is a string that is either empty (this splits the string into +characters), a single character (this splits on each occurrence of that +character, possibly introducing empty strings), or a single character followed by +the plus sign \type {+} (this special version does not create empty sub-strings). +The default value for \type {m} is \quote {\type { +}} (multiple spaces). Note: +\type {m} is not hidden by surrounding braces as it would be if this function was +written in \TEX\ macros. The \type {string} library also has six extra iterators that return strings -piecemeal: +piecemeal: \libidx {string} {utfvalues}, \libidx {string} {utfcharacters}, +\libidx {string} {characters}, \libidx {string} {characterpairs}, \libidx +{string} {bytes} and \libidx {string} {bytepairs}. \startitemize \startitem @@ -415,7 +408,8 @@ interpretation of character classes in \type {unicode.utf8} functions refer to the library sources at \hyphenatedurl {http://luaforge.net/projects/sln}. Version 5.3 of \LUA\ provides some native \UTF8 support but we have added a few -similar helpers too: +similar helpers too: \libidx {string} {utfvalue}, \libidx {string} {utfcharacter} +and \libidx {string} {utflength}. \startitemize \startitem @@ -431,27 +425,18 @@ similar helpers too: \stopitem \stopitemize -These three functions are relative fast and don't do much checking. They can be used -as building blocks for other helpers. So, eventually we can decide to drop the -\type {sln} library, just that you know. +These three functions are relative fast and don't do much checking. They can be +used as building blocks for other helpers. \stopsubsection \startsubsection[title={Extra \type {os} library functions}] -\libidx{os}{selfdir} -\libidx{os}{exec} -\libidx{os}{spawn} -\libidx{os}{setenv} -\libidx{os}{env} -\libidx{os}{gettimeofday} -\libidx{os}{times} -\libidx{os}{tmpdir} -\libidx{os}{type} -\libidx{os}{name} -\libidx{os}{uname} - -The \type {os} library has a few extra functions and variables: +The \type {os} library has a few extra functions and variables: \libidx {os} +{selfdir}, \libidx {os} {exec}, \libidx {os} {spawn}, \libidx {os} {setenv}, +\libidx {os} {env}, \libidx {os} {gettimeofday}, \libidx {os} {times}, \libidx +{os} {tmpdir}, \libidx {os} {type}, \libidx {os} {name} and \libidx {os} {uname}, +that we will discuss here. \startitemize @@ -585,24 +570,16 @@ The \type {os} library has a few extra functions and variables: \startsubsection[title={Binary input from files with \type {fio}}] -\libidx{fio}{readcardinal1} -\libidx{fio}{readcardinal2} -\libidx{fio}{readcardinal3} -\libidx{fio}{readcardinal4} -\libidx{fio}{readcardinaltable} -\libidx{fio}{readinteger1} -\libidx{fio}{readinteger2} -\libidx{fio}{readinteger3} -\libidx{fio}{readinteger4} -\libidx{fio}{readintegertable} -\libidx{fio}{readfixed2} -\libidx{fio}{readfixed4} -\libidx{fio}{read2dot14} -\libidx{fio}{setposition} -\libidx{fio}{getposition} -\libidx{fio}{skipposition} -\libidx{fio}{readbytes} -\libidx{fio}{readbytetable} +There is a whole set of helpers for reading numbers and strings from a file: +\libidx {fio} {readcardinal1}, \libidx {fio} {readcardinal2}, \libidx {fio} +{readcardinal3}, \libidx {fio} {readcardinal4}, \libidx {fio} +{readcardinaltable}, \libidx {fio} {readinteger1}, \libidx {fio} {readinteger2}, +\libidx {fio} {readinteger3}, \libidx {fio} {readinteger4}, \libidx {fio} +{readintegertable}, \libidx {fio} {readfixed2}, \libidx {fio} {readfixed4}, +\libidx {fio} {read2dot14}, \libidx {fio} {setposition}, \libidx {fio} +{getposition}, \libidx {fio} {skipposition}, \libidx {fio} {readbytes}, \libidx +{fio} {readbytetable}. They work on normal \LUA\ file handles. + %libidx{fio}{readline} %libidx{fio}{recordfilename} %libidx{fio}{checkpermission} @@ -635,39 +612,25 @@ in addition to the regular \type {io} library functions. \startsubsection[title={Binary input from strings with \type {sio}}] -\libidx{sio}{readcardinal1} -\libidx{sio}{readcardinal2} -\libidx{sio}{readcardinal3} -\libidx{sio}{readcardinal4} -\libidx{sio}{readcardinaltable} -\libidx{sio}{readinteger1} -\libidx{sio}{readinteger2} -\libidx{sio}{readinteger3} -\libidx{sio}{readinteger4} -\libidx{sio}{readintegertable} -\libidx{sio}{readfixed2} -\libidx{sio}{readfixed4} -\libidx{sio}{read2dot14} -\libidx{sio}{setposition} -\libidx{sio}{getposition} -\libidx{sio}{skipposition} -\libidx{sio}{readbytes} -\libidx{sio}{readbytetable} - A similar set of function as in the \type {fio} library is available in the \type -{sio} library. Here the first argument is a string. +{sio} library: \libidx {sio} {readcardinal1}, \libidx {sio} {readcardinal2}, +\libidx {sio} {readcardinal3}, \libidx {sio} {readcardinal4}, \libidx {sio} +{readcardinaltable}, \libidx {sio} {readinteger1}, \libidx {sio} {readinteger2}, +\libidx {sio} {readinteger3}, \libidx {sio} {readinteger4}, \libidx {sio} +{readintegertable}, \libidx {sio} {readfixed2}, \libidx {sio} {readfixed4}, +\libidx {sio} {read2dot14}, \libidx {sio} {setposition}, \libidx {sio} +{getposition}, \libidx {sio} {skipposition}, \libidx {sio} {readbytes} and +\libidx {sio} {readbytetable}. Here the first argument is a string instead of a +file handle. More details can be found in the previous section. \stopsubsection \startsubsection[title={Hashes conform \type {sha2}}] -\libidx{sha2}{digest256} -\libidx{sha2}{digest384} -\libidx{sha2}{digest512} - This library is a side effect of the \type {pdfe} library that needs such -helpers. The \type {digest256}, \type {digest384} and \type {digest512} functions -accept a string and return a string with the hash. +helpers. The \libidx{sha2}{digest256}, \libidx{sha2}{digest384} and +\libidx{sha2}{digest512} functions accept a string and return a string with the +hash. \stopsubsection diff --git a/doc/context/sources/general/manuals/luatex/luatex-preamble.tex b/doc/context/sources/general/manuals/luatex/luatex-preamble.tex index 1daef3c4d..829317977 100644 --- a/doc/context/sources/general/manuals/luatex/luatex-preamble.tex +++ b/doc/context/sources/general/manuals/luatex/luatex-preamble.tex @@ -87,19 +87,19 @@ When you read about nodes in the following chapters it's good to keep in mind th commands that relate to then. Here are a few: \starttabulate[|l|l|p|] -\DB command \BC node \BC explanation \NC \NR +\DB command \BC node \BC explanation \NC \NR \TB -\NC \prm {hbox} \NC \nod {hlist} \NC horizontal box \NC \NR -\NC \prm {vbox} \NC \nod {vlist} \NC vertical box with the baseline at the bottom \NC \NR -\NC \prm {vtop} \NC \nod {vlist} \NC vertical box with the baseline at the top \NC \NR -\NC \prm {hskip} \NC \nod {glue} \NC horizontal skip with optional stretch and shrink \NC \NR -\NC \prm {vskip} \NC \nod {glue} \NC vertical skip with optional stretch and shrink \NC \NR -\NC \prm {kern} \NC \nod {kern} \NC horizontal or vertical fixed skip \NC \NR -\NC \prm {discretionary} \NC \nod {disc} \NC hyphenation point (pre, post, replace) \NC \NR -\NC \prm {char} \NC \nod {glyph} \NC a character \NC \NR -\NC \prm {hrule} \NC \nod {rule} \NC a horizontal rule \NC \NR -\NC \prm {vrule} \NC \nod {rule} \NC a vertical rule \NC \NR -\NC \prm {textdir} \NC \nod {dir} \NC a change in text direction \NC \NR +\NC \prm {hbox} \NC \nod {hlist} \NC horizontal box \NC \NR +\NC \prm {vbox} \NC \nod {vlist} \NC vertical box with the baseline at the bottom \NC \NR +\NC \prm {vtop} \NC \nod {vlist} \NC vertical box with the baseline at the top \NC \NR +\NC \prm {hskip} \NC \nod {glue} \NC horizontal skip with optional stretch and shrink \NC \NR +\NC \prm {vskip} \NC \nod {glue} \NC vertical skip with optional stretch and shrink \NC \NR +\NC \prm {kern} \NC \nod {kern} \NC horizontal or vertical fixed skip \NC \NR +\NC \prm {discretionary} \NC \nod {disc} \NC hyphenation point (pre, post, replace) \NC \NR +\NC \prm {char} \NC \nod {glyph} \NC a character \NC \NR +\NC \prm {hrule} \NC \nod {rule} \NC a horizontal rule \NC \NR +\NC \prm {vrule} \NC \nod {rule} \NC a vertical rule \NC \NR +\NC \prm {textdir(ection)} \NC \nod {dir} \NC a change in text direction \NC \NR \LL \stoptabulate -- cgit v1.2.3