From d290750c8335eebdb21cb9ea63726bbd5c8ce1d2 Mon Sep 17 00:00:00 2001 From: Context Git Mirror Bot Date: Fri, 13 May 2016 12:06:01 +0200 Subject: 2016-05-13 11:18:00 --- tex/context/base/context-version.pdf | Bin 4253 -> 4249 bytes tex/context/base/mkiv/cont-new.mkiv | 2 +- tex/context/base/mkiv/context.mkiv | 2 +- tex/context/base/mkiv/lxml-lpt.lua | 2 +- tex/context/base/mkiv/page-mix.mkiv | 15 ++++++- tex/context/base/mkiv/page-mul.mkiv | 50 +++++++++------------ tex/context/base/mkiv/spac-ver.mkiv | 6 +++ tex/context/base/mkiv/status-files.pdf | Bin 9126 -> 9272 bytes tex/context/base/mkiv/status-lua.pdf | Bin 268187 -> 266499 bytes tex/context/interface/mkiv/i-align.xml | 2 +- tex/context/interface/mkiv/i-context.pdf | Bin 820456 -> 820669 bytes tex/context/interface/mkiv/i-graphics.xml | 6 +++ tex/context/interface/mkiv/i-readme.pdf | Bin 60793 -> 60791 bytes tex/context/interface/mkiv/i-vspace.xml | 8 +++- tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 15 files changed, 60 insertions(+), 35 deletions(-) (limited to 'tex') diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf index f0938c902..11c279789 100644 Binary files a/tex/context/base/context-version.pdf and b/tex/context/base/context-version.pdf differ diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index 79aa939d4..95c11e8a4 100644 --- a/tex/context/base/mkiv/cont-new.mkiv +++ b/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 11:12} %D This file is loaded at runtime, thereby providing an excellent place for %D hacks, patches, extensions and new features. diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv index b670c40c1..21c002736 100644 --- a/tex/context/base/mkiv/context.mkiv +++ b/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 11:12} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/mkiv/lxml-lpt.lua b/tex/context/base/mkiv/lxml-lpt.lua index b722fc318..7ee1db1d8 100644 --- a/tex/context/base/mkiv/lxml-lpt.lua +++ b/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/tex/context/base/mkiv/page-mix.mkiv b/tex/context/base/mkiv/page-mix.mkiv index 0e329ce09..a8610deb8 100644 --- a/tex/context/base/mkiv/page-mix.mkiv +++ b/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/tex/context/base/mkiv/page-mul.mkiv b/tex/context/base/mkiv/page-mul.mkiv index c72057010..5cc60d9ed 100644 --- a/tex/context/base/mkiv/page-mul.mkiv +++ b/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/tex/context/base/mkiv/spac-ver.mkiv b/tex/context/base/mkiv/spac-ver.mkiv index e591d85f6..250e4e396 100644 --- a/tex/context/base/mkiv/spac-ver.mkiv +++ b/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/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf index ce4ce0520..9d84f6994 100644 Binary files a/tex/context/base/mkiv/status-files.pdf and b/tex/context/base/mkiv/status-files.pdf differ diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf index c3f475e42..ffe988479 100644 Binary files a/tex/context/base/mkiv/status-lua.pdf and b/tex/context/base/mkiv/status-lua.pdf differ diff --git a/tex/context/interface/mkiv/i-align.xml b/tex/context/interface/mkiv/i-align.xml index aa94b0d4c..07a66d2dd 100644 --- a/tex/context/interface/mkiv/i-align.xml +++ b/tex/context/interface/mkiv/i-align.xml @@ -270,4 +270,4 @@ - \ No newline at end of file + diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf index 99c3cce1f..b58fce7f1 100644 Binary files a/tex/context/interface/mkiv/i-context.pdf and b/tex/context/interface/mkiv/i-context.pdf differ diff --git a/tex/context/interface/mkiv/i-graphics.xml b/tex/context/interface/mkiv/i-graphics.xml index 876467240..4e90a0c81 100644 --- a/tex/context/interface/mkiv/i-graphics.xml +++ b/tex/context/interface/mkiv/i-graphics.xml @@ -225,6 +225,12 @@ + + + + + + diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf index 5dc85d2f5..706fc05cb 100644 Binary files a/tex/context/interface/mkiv/i-readme.pdf and b/tex/context/interface/mkiv/i-readme.pdf differ diff --git a/tex/context/interface/mkiv/i-vspace.xml b/tex/context/interface/mkiv/i-vspace.xml index 340ce49d5..b6d7381ee 100644 --- a/tex/context/interface/mkiv/i-vspace.xml +++ b/tex/context/interface/mkiv/i-vspace.xml @@ -104,6 +104,12 @@ + + + + + + @@ -141,4 +147,4 @@ - \ No newline at end of file + diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 183135443..f0a920a7d 100644 --- a/tex/generic/context/luatex/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : c:/data/develop/context/sources/luatex-fonts-merged.lua -- parent file : c:/data/develop/context/sources/luatex-fonts.lua --- merge date : 05/12/16 23:49:15 +-- merge date : 05/13/16 11:12:36 do -- begin closure to overcome local limits and interference -- cgit v1.2.3