From 6b89257547b260e08e805816ef752a4b5018328e Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Fri, 8 Sep 2017 18:33:04 +0200 Subject: 2017-09-08 17:29:00 --- tex/context/base/mkii/cont-new.mkii | 2 +- tex/context/base/mkii/context.mkii | 2 +- tex/context/base/mkiv/cont-new.mkiv | 2 +- tex/context/base/mkiv/context.mkiv | 2 +- tex/context/base/mkiv/math-ali.mkiv | 42 +++++++++++++-------- tex/context/base/mkiv/status-files.pdf | Bin 25840 -> 25849 bytes tex/context/base/mkiv/status-lua.pdf | Bin 426575 -> 426575 bytes tex/context/interface/mkiv/i-context.pdf | Bin 818532 -> 818532 bytes tex/context/interface/mkiv/i-readme.pdf | Bin 60775 -> 60775 bytes tex/context/modules/mkiv/s-present-lines.mkiv | 6 +++ tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 11 files changed, 38 insertions(+), 20 deletions(-) (limited to 'tex') diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii index 9fa8fbf00..805595e50 100644 --- a/tex/context/base/mkii/cont-new.mkii +++ b/tex/context/base/mkii/cont-new.mkii @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2017.09.07 23:44} +\newcontextversion{2017.09.08 17:24} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new diff --git a/tex/context/base/mkii/context.mkii b/tex/context/base/mkii/context.mkii index a6b52218e..cdaac874c 100644 --- a/tex/context/base/mkii/context.mkii +++ b/tex/context/base/mkii/context.mkii @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2017.09.07 23:44} +\edef\contextversion{2017.09.08 17:24} %D For those who want to use this: diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index eb134e077..bfb0e6be1 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{2017.09.07 23:44} +\newcontextversion{2017.09.08 17:24} %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 62ffab044..d7f63e76e 100644 --- a/tex/context/base/mkiv/context.mkiv +++ b/tex/context/base/mkiv/context.mkiv @@ -41,7 +41,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2017.09.07 23:44} +\edef\contextversion{2017.09.08 17:24} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/mkiv/math-ali.mkiv b/tex/context/base/mkiv/math-ali.mkiv index c82170463..40da3d4c9 100644 --- a/tex/context/base/mkiv/math-ali.mkiv +++ b/tex/context/base/mkiv/math-ali.mkiv @@ -866,8 +866,25 @@ \alignmark\alignmark \math_matrix_stop_cell} -\def\math_matrix_make_pickup - {\gdef\NC{\gdef\NC{\aligntab}}} +\newconditional\c_math_matrix_first + +\def\math_matrix_NR + {\aligntab\omit + \math_matrix_stop_row + \math_matrix_pickup + \crcr + \math_matrix_start_row} + +\def\math_matrix_NC + {\ifconditional\c_math_matrix_first + \expandafter\math_matrix_NC_yes + \else + \expandafter\math_matrix_NC_nop + \fi} + +\def\math_matrix_pickup{\global\settrue \c_math_matrix_first} +\def\math_matrix_NC_yes{\global\setfalse\c_math_matrix_first} +\def\math_matrix_NC_nop{\aligntab} % avoids lookahead % \def\math_matrix_stop_wrapup % {\crcr @@ -879,17 +896,12 @@ {\dontleavehmode \bgroup \tabskip\zeropoint - \math_matrix_make_pickup - \def\NR{% - \aligntab\omit - \math_matrix_stop_row - \math_matrix_make_pickup - \crcr - \math_matrix_start_row - }% + \math_matrix_pickup + \let\NR\math_matrix_NR + \let\NC\math_matrix_NC + \let\MC\math_matrix_NC % \let\endmath\relax - \def\MC{\NC}% % \setbox\nextbox\vbox\bgroup \math_matrix_start_table @@ -942,8 +954,8 @@ \rawprocesscommacommand[\mathmatrixparameter\c!align]\math_matrix_set_columns_step} \unexpanded\def\math_matrix_start#1% - {\pushmacro\NC % not tested that well - \begingroup + {\begingroup + \globalpushmacro\c_math_matrix_first \edef\currentmathmatrix{#1}% \dosingleempty\math_matrix_start_indeed} @@ -958,8 +970,8 @@ \def\math_matrix_stop {\math_matrix_stop_processing - \endgroup - \popmacro\NC} + \globalpopmacro\c_math_matrix_first + \endgroup} % vcenter: % diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf index 22fbd7c09..a91d6f73c 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 82507f21e..89040ffec 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-context.pdf b/tex/context/interface/mkiv/i-context.pdf index ccd8e2fed..750f687f2 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-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf index 113894526..09ceb5d6c 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/modules/mkiv/s-present-lines.mkiv b/tex/context/modules/mkiv/s-present-lines.mkiv index c3f1f75dc..6d4c59a03 100644 --- a/tex/context/modules/mkiv/s-present-lines.mkiv +++ b/tex/context/modules/mkiv/s-present-lines.mkiv @@ -149,6 +149,12 @@ \stopstandardmakeup \stopsetups +\setupinteraction + [state=start, + color=maincolor, + contrastcolor=maincolor, + style=bold] + \usemodule[abr-04] \stopmodule diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 43f54fef2..4bd3958c8 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 : 09/07/17 23:44:19 +-- merge date : 09/08/17 17:24:08 do -- begin closure to overcome local limits and interference -- cgit v1.2.3