diff options
author | Karl Berry <karl@freefriends.org> | 2016-05-14 21:37:43 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-05-14 21:37:43 +0000 |
commit | c285b32d78d4d2725778d9de6921cdc6ecbc1b08 (patch) | |
tree | 0aef7208e0d845165f9406e7ff230a96d752e79b /Master/texmf-dist/tex/context/base/mkiv | |
parent | de31a6ac7fa4e3394e7b67033d3b15dcc6141a32 (diff) |
context (14may16)
git-svn-id: svn://tug.org/texlive/trunk@41118 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/context/base/mkiv')
-rw-r--r-- | Master/texmf-dist/tex/context/base/mkiv/cont-new.mkiv | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/base/mkiv/context-todo.tex | 1 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/base/mkiv/context.mkiv | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/base/mkiv/file-job.mkvi | 3 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/base/mkiv/lxml-lpt.lua | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/base/mkiv/mult-low.lua | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/base/mkiv/page-mix.mkiv | 15 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/base/mkiv/page-mul.mkiv | 50 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/base/mkiv/spac-ver.mkiv | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/base/mkiv/status-files.pdf | bin | 9126 -> 9270 bytes | |||
-rw-r--r-- | Master/texmf-dist/tex/context/base/mkiv/status-lua.pdf | bin | 268187 -> 266494 bytes |
11 files changed, 50 insertions, 33 deletions
diff --git a/Master/texmf-dist/tex/context/base/mkiv/cont-new.mkiv b/Master/texmf-dist/tex/context/base/mkiv/cont-new.mkiv index 79aa939d433..ee9b7de6c9b 100644 --- a/Master/texmf-dist/tex/context/base/mkiv/cont-new.mkiv +++ b/Master/texmf-dist/tex/context/base/mkiv/cont-new.mkiv @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2016.05.12 23:49} +\newcontextversion{2016.05.13 16:21} %D This file is loaded at runtime, thereby providing an excellent place for %D hacks, patches, extensions and new features. diff --git a/Master/texmf-dist/tex/context/base/mkiv/context-todo.tex b/Master/texmf-dist/tex/context/base/mkiv/context-todo.tex index bf7d198c958..39cca9a3a72 100644 --- a/Master/texmf-dist/tex/context/base/mkiv/context-todo.tex +++ b/Master/texmf-dist/tex/context/base/mkiv/context-todo.tex @@ -76,3 +76,4 @@ check components and pre|post|replace in math-tag <cd:resolve name="keyword-reference-list-optional"/> </cd:arguments> </cd:command> + diff --git a/Master/texmf-dist/tex/context/base/mkiv/context.mkiv b/Master/texmf-dist/tex/context/base/mkiv/context.mkiv index b670c40c1d6..bf9d4627078 100644 --- a/Master/texmf-dist/tex/context/base/mkiv/context.mkiv +++ b/Master/texmf-dist/tex/context/base/mkiv/context.mkiv @@ -39,7 +39,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2016.05.12 23:49} +\edef\contextversion{2016.05.13 16:21} \edef\contextkind {beta} %D For those who want to use this: diff --git a/Master/texmf-dist/tex/context/base/mkiv/file-job.mkvi b/Master/texmf-dist/tex/context/base/mkiv/file-job.mkvi index 7814aba3f62..0958d84331b 100644 --- a/Master/texmf-dist/tex/context/base/mkiv/file-job.mkvi +++ b/Master/texmf-dist/tex/context/base/mkiv/file-job.mkvi @@ -319,6 +319,9 @@ {\setvariables[\s!document][#settings]% \the\everysetupdocument\relax} +\unexpanded\def\presetdocument[#settings]% + {\checkvariables[\s!document][#settings]} + % metadata:author metadata:title metadata:subject \setvariables diff --git a/Master/texmf-dist/tex/context/base/mkiv/lxml-lpt.lua b/Master/texmf-dist/tex/context/base/mkiv/lxml-lpt.lua index b722fc318bc..7ee1db1d8b6 100644 --- a/Master/texmf-dist/tex/context/base/mkiv/lxml-lpt.lua +++ b/Master/texmf-dist/tex/context/base/mkiv/lxml-lpt.lua @@ -609,7 +609,7 @@ local noparent = 1 - (lparent+rparent) local nested = P{lparent * (noparent + V(1))^0 * rparent} local value = P(lparent * C((noparent + nested)^0) * rparent) -- P{"("*C(((1-S("()"))+V(1))^0)*")"} -local lp_child = Cc("expr.child(ll,'") * R("az","AZ","--","__")^1 * Cc("')") +local lp_child = Cc("expr.child(ll,'") * R("az","AZ") * R("az","AZ","--","__")^0 * Cc("')") local lp_number = S("+-") * R("09")^1 local lp_string = Cc("'") * R("az","AZ","--","__")^1 * Cc("'") local lp_content = (P("'") * (1-P("'"))^0 * P("'") + P('"') * (1-P('"'))^0 * P('"')) diff --git a/Master/texmf-dist/tex/context/base/mkiv/mult-low.lua b/Master/texmf-dist/tex/context/base/mkiv/mult-low.lua index c9009cf1aa9..be7b0274700 100644 --- a/Master/texmf-dist/tex/context/base/mkiv/mult-low.lua +++ b/Master/texmf-dist/tex/context/base/mkiv/mult-low.lua @@ -100,7 +100,7 @@ return { "startcomponent", "stopcomponent", "component", "startproduct", "stopproduct", "product", "startproject", "stopproject", "project", - "starttext", "stoptext", "startnotext", "stopnotext","startdocument", "stopdocument", "documentvariable", "setupdocument", + "starttext", "stoptext", "startnotext", "stopnotext","startdocument", "stopdocument", "documentvariable", "setupdocument", "presetdocument", "startmodule", "stopmodule", "usemodule", "usetexmodule", "useluamodule","setupmodule","currentmoduleparameter","moduleparameter", "everystarttext", "everystoptext", -- diff --git a/Master/texmf-dist/tex/context/base/mkiv/page-mix.mkiv b/Master/texmf-dist/tex/context/base/mkiv/page-mix.mkiv index 0e329ce098b..a8610deb855 100644 --- a/Master/texmf-dist/tex/context/base/mkiv/page-mix.mkiv +++ b/Master/texmf-dist/tex/context/base/mkiv/page-mix.mkiv @@ -54,14 +54,25 @@ \installframedcommandhandler \??mixedcolumns {mixedcolumns} \??mixedcolumns +% old multicolumns mechanism +% +% \c!ntop=1, +% \c!rule=\v!off, +% \c!height=, +% \c!blank={\v!line,\v!fixed}, +% \c!rulethickness=\linewidth, +% \c!offset=.5\bodyfontsize, + \setupmixedcolumns [\c!distance=1.5\bodyfontsize, \c!n=\plustwo, - %\c!align=, % inherit + %\c!align=, % inherit (also replaces tolerance) %\c!before=, %\c!after=, %\c!separator=\v!none, %\c!setups=, + %\c!balance=\v!no, + %\c!blank={\v!line,\v!fixed}, yes or no \c!frame=\v!off, \c!strut=\v!no, \c!offset=\v!overlay, @@ -475,6 +486,8 @@ % \insidecolumnstrue % new % + \usealignparameter \mixedcolumnsparameter + \useblankparameter \mixedcolumnsparameter \useprofileparameter\mixedcolumnsparameter % new % \nofcolumns\c_page_mix_n_of_columns} % public diff --git a/Master/texmf-dist/tex/context/base/mkiv/page-mul.mkiv b/Master/texmf-dist/tex/context/base/mkiv/page-mul.mkiv index c7205701093..5cc60d9ed53 100644 --- a/Master/texmf-dist/tex/context/base/mkiv/page-mul.mkiv +++ b/Master/texmf-dist/tex/context/base/mkiv/page-mul.mkiv @@ -165,7 +165,6 @@ \newbox \b_page_mul_preceding_rest_of_page \newconditional\c_page_mul_reverse - \newconditional\c_page_mul_trace %D The next dimensions reports the final column height .. todo @@ -434,19 +433,19 @@ % messy correction, we need to rewrite this module (newcolumns) \setbox\columnpagebox\vbox {\offinterlineskip - \scratchdimen\ht\columnpagebox - \advance\scratchdimen\dp\columnpagebox % we probably lost that one already + \scratchdimen\htdp\columnpagebox \box\columnpagebox \vskip-\scratchdimen}% - \scratchdimen\noflines\openlineheight - \advance\scratchdimen-\openstrutdepth - \ifgridsnapping - % quick hack (at least it works with itemize) - \else - \advance\scratchdimen-\openlineheight - \advance\scratchdimen\topskip - \fi - \ht\columnpagebox\scratchdimen + \ht\columnpagebox\dimexpr + \noflines\openlineheight + -\openstrutdepth + \ifgridsnapping + % quick hack (at least it works with itemize) + \else + -\openlineheight + +\topskip + \fi + \relax \dp\columnpagebox\openstrutdepth % end of mess \box\columnpagebox @@ -479,22 +478,18 @@ \page_mul_calculate_column_result_dimensions \overlaycolumnfootnotes \setbox\columnpagebox\vbox - {\hbox to \makeupwidth - {\hskip\d_page_mul_leftskip\relax % new, \relax needed - \ifconditional\c_page_mul_reverse - \expandafter\dohandlerevcolumns - \else - \expandafter\dohandleallcolumns - \fi + {\hbox \ifconditional\c_page_mul_reverse dir TRT \fi to \makeupwidth + {\hskip\ifconditional\c_page_mul_reverse\d_page_mul_rightskip\else\d_page_mul_leftskip\fi\relax + \dohandleallcolumns {\finishcolumnbox - {\setbox\scratchbox\hbox - {\ifx\finishcolumnbox\relax\else\strut\fi - \box\currentcolumnbox}% hm, why strut + {\setbox\scratchbox\hbox + {\ifx\finishcolumnbox\relax\else\strut\fi + \box\currentcolumnbox}% hm, why strut \anch_mark_column_box\scratchbox \box\scratchbox}% - \hfil}% + \hfil}% \unskip - \hskip\d_page_mul_rightskip}}% new + \hskip\ifconditional\c_page_mul_reverse\d_page_mul_leftskip\else\d_page_mul_rightskip\fi}}% \scratchdimen\zeropoint \dohandleallcolumns {\ifdim-\ht\currenttopcolumnbox<\scratchdimen @@ -504,9 +499,9 @@ \advance\scratchdimen \ht\columnpagebox \setbox\scratchbox\hbox to \makeupwidth {\vrule - \s!width\zeropoint + \s!width \zeropoint \s!height\scratchdimen - \s!depth\dp\columnpagebox + \s!depth \dp\columnpagebox \dostepwiserecurse\plustwo\nofcolumns\plusone{\hfil\page_mul_between_columns}\hfil}% \setbox\columnpagebox\hbox {\box\columnpagebox @@ -529,8 +524,7 @@ \global\d_page_mul_preceding_height\zeropoint \page_otr_command_set_vsize \dosomebreak\nobreak % hm, only needed when topstuff - \ifgridsnapping - \else + \ifgridsnapping \else \ifcase\multicolumntopflushmethod % sometimes method 1 goes wrong, so we need a way out; best sort this out % when we run into it again diff --git a/Master/texmf-dist/tex/context/base/mkiv/spac-ver.mkiv b/Master/texmf-dist/tex/context/base/mkiv/spac-ver.mkiv index e591d85f6a3..250e4e3969e 100644 --- a/Master/texmf-dist/tex/context/base/mkiv/spac-ver.mkiv +++ b/Master/texmf-dist/tex/context/base/mkiv/spac-ver.mkiv @@ -1963,6 +1963,12 @@ \clf_vspacing{\currentvspacing}% \fi\fi} +\unexpanded\def\useblankparameter#1% faster local variant + {\edef\m_spac_blank_asked{#1\c!blank}% + \ifx\m_spac_blank_asked\empty\else + \clf_vspacing{\m_spac_blank_asked} + \fi} + % handy (and faster): \unexpanded\def\directvpenalty#1% diff --git a/Master/texmf-dist/tex/context/base/mkiv/status-files.pdf b/Master/texmf-dist/tex/context/base/mkiv/status-files.pdf Binary files differindex ce4ce0520e9..50c9c743acf 100644 --- a/Master/texmf-dist/tex/context/base/mkiv/status-files.pdf +++ b/Master/texmf-dist/tex/context/base/mkiv/status-files.pdf diff --git a/Master/texmf-dist/tex/context/base/mkiv/status-lua.pdf b/Master/texmf-dist/tex/context/base/mkiv/status-lua.pdf Binary files differindex c3f475e425c..c59d3c52fd2 100644 --- a/Master/texmf-dist/tex/context/base/mkiv/status-lua.pdf +++ b/Master/texmf-dist/tex/context/base/mkiv/status-lua.pdf |