From 95a1799032dc61dbca4a11e495be34b4397c8fec Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Fri, 27 Jan 2017 16:14:16 +0100 Subject: 2017-01-27 14:46:00 --- doc/context/documents/general/manuals/luatex.pdf | Bin 1060453 -> 1063120 bytes doc/context/documents/general/qrcs/setup-cs.pdf | Bin 798618 -> 799508 bytes doc/context/documents/general/qrcs/setup-de.pdf | Bin 800249 -> 801177 bytes doc/context/documents/general/qrcs/setup-en.pdf | Bin 803809 -> 804150 bytes doc/context/documents/general/qrcs/setup-fr.pdf | Bin 797176 -> 798391 bytes doc/context/documents/general/qrcs/setup-it.pdf | Bin 799924 -> 799982 bytes doc/context/documents/general/qrcs/setup-nl.pdf | Bin 795310 -> 796496 bytes doc/context/documents/general/qrcs/setup-ro.pdf | Bin 795125 -> 795562 bytes .../sources/general/manuals/luatex/luatex-math.tex | 54 ++++++++++++++++++++- .../manuals/luatex/luatex-modifications.tex | 2 + .../general/manuals/luatex/luatex-nodes.tex | 5 +- 11 files changed, 58 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/doc/context/documents/general/manuals/luatex.pdf b/doc/context/documents/general/manuals/luatex.pdf index 0c28f3591..0afa33cee 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 0c0ce1cdb..8061cba60 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 2af8c21b5..393df51ef 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 db1aca861..bf623a1eb 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 f5cadbf6b..3450920b8 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 8d66356c2..46f80fd22 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-nl.pdf b/doc/context/documents/general/qrcs/setup-nl.pdf index e7a23c6de..13603b906 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 e018442a4..2bb62c200 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-math.tex b/doc/context/sources/general/manuals/luatex/luatex-math.tex index 0b639f0dc..1f92fc70c 100644 --- a/doc/context/sources/general/manuals/luatex/luatex-math.tex +++ b/doc/context/sources/general/manuals/luatex/luatex-math.tex @@ -985,7 +985,7 @@ For Latin Modern The result looks as follows: \subsection {Verbose versions of single-character math commands} \LUATEX\ defines six new primitives that have the same function as -\type {^}, \type {_}, \type {$}, and \type {$$}: %$ +\type {^}, \type {_}, \type {$}, and \type {$$}: \starttabulate[|l|l|l|l|] \NC \bf primitive \NC \bf explanation \NC \NR @@ -1018,7 +1018,57 @@ Inline math is surrounded by (optional) \type {\mathsurround} spacing but that i dimension. There is now an additional parameter \type {\mathsurroundskip}. When set to a non|-|zero value (or zero with some stretch or shrink) this parameter will replace \type {\mathsurround}. By using an additional parameter instead of changing the nature -of \type {\mathsurround}, we can remain compatible. +of \type {\mathsurround}, we can remain compatible. In the meantime a bit more +control has been added via \type {\mathsurroundmode}. This directive can take 6 values +with zero being the default behaviour. + +\start + +\def\OneLiner#1#2% + {\NC #1 +% \NC \ruledhbox{\mathsurroundmode#1\relax\hsize 100pt x$x$x} +% \NC \ruledhbox{\mathsurroundmode#1\relax\hsize 100pt x $x$ x} + \NC \dontleavehmode\inframed[align=normal,offset=0pt,frame=off]{\mathsurroundmode#1\relax\hsize 100pt x$x$x} + \NC \dontleavehmode\inframed[align=normal,offset=0pt,frame=off]{\mathsurroundmode#1\relax\hsize 100pt x $x$ x} + \NC #2 + \NC \NR} + +\startbuffer +\mathsurround 10pt +\mathsurroundskip20pt +\stopbuffer + +\typebuffer \getbuffer + +\starttabulate[|Tc|c|c|pl|] +\HL +\BC mode \BC \type {x$x$x} \BC \type {x $x$ x} \BC effect \NC \NR +\HL +\OneLiner{0}{obey \type {\mathsurround} when \type {\mathsurroundskip} is 0pt} +\OneLiner{1}{only add skip to the left} +\OneLiner{2}{only add skip to the right} +\OneLiner{3}{add skip to the left and right} +\OneLiner{4}{ignore the skip setting, obey \type {\mathsurround}} +\OneLiner{5}{disable all spacing around math} +\OneLiner{6}{only apply \type {\mathsurroundskip} when also spacing} +\OneLiner{7}{only apply \type {\mathsurroundskip} when no spacing} +\HL +\stoptabulate + +\stop + +Method six omits the surround glue when there is (x)spacing glue present while +method seven does the opposite, the glue is only applied when there is (x)space +glue present too. Anything more fance, like checking the begining or end of a +paragraph (or edges of a box) would not be robust anyway. If you want that you +can write a callback that runs over a list and analyzes a paragraph. Actually, in +that case you could also inject glue (or set the properties of a math node) +explicitly. So, these modes are in practice mostly useful for special purposes +and experiments (they originate in a tracker item). Keep in mind that this glue +is part of the math node and not always treated as normal glue: it travels with +the begin and end math nodes. Also, method 6 and 7 will zero the skip related +fields in a node when applicable in the first occasion that checks them +(linebreaking or packaging). % \section{Math todo} % diff --git a/doc/context/sources/general/manuals/luatex/luatex-modifications.tex b/doc/context/sources/general/manuals/luatex/luatex-modifications.tex index 711b6eec7..2857603ea 100644 --- a/doc/context/sources/general/manuals/luatex/luatex-modifications.tex +++ b/doc/context/sources/general/manuals/luatex/luatex-modifications.tex @@ -78,6 +78,8 @@ most still comes from the original. But we divert a bit. page is shipped out) or when \PDF\ output is enabled, the \type {true} specification is ignored. When you preload a plain format adapted to \LUATEX\ it can be that the \type {\mag} parameter already has been set. +\stopitem + \stopitemize \stopsubsection diff --git a/doc/context/sources/general/manuals/luatex/luatex-nodes.tex b/doc/context/sources/general/manuals/luatex/luatex-nodes.tex index 7495e6a61..f9fe4e808 100644 --- a/doc/context/sources/general/manuals/luatex/luatex-nodes.tex +++ b/doc/context/sources/general/manuals/luatex/luatex-nodes.tex @@ -1806,6 +1806,8 @@ If performance matters you can use an function instead: \NC getsubtype \NC consulted less but also a topper \NC \NR \NC getfont \NC used a lot in \OPENTYPE\ handling (glyph nodes are consulted a lot) \NC \NR \NC getchar \NC idem and also in other places \NC \NR +\NC getwhd \NC returns the \type {width}, \type {height} and \type {depth} of a list, rule or + (unexpanded) glyph \NC \NR \NC getdisc \NC returns the \type {pre}, \type {post} and \type {replace} fields and optionally when true is passed also the tail fields. \NC \NR \NC getlist \NC we often parse nested lists so this is a convenient one too @@ -1896,7 +1898,8 @@ this: \NC \type {setboth} \NC \yes \NC \yes \NC \NR \NC \type {setbox} \NC \nop \NC \yes \NC \NR \NC \type {setchar} \NC \yes \NC \yes \NC \NR -\NC \type {setdisc} \NC \yes \NC \yes \NC \NR +\NC \type {setdisc} \NC \nop \NC \yes \NC \NR +\NC \type {setwhd} \NC \nop \NC \yes \NC \NR \NC \type {setfield} \NC \yes \NC \yes \NC \NR \NC \type {setglue} \NC \yes \NC \yes \NC \NR \NC \type {setlink} \NC \yes \NC \yes \NC \NR -- cgit v1.2.3