summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/mkii/cont-new.mkii2
-rw-r--r--tex/context/base/mkii/context.mkii2
-rw-r--r--tex/context/base/mkiv/cont-new.mkiv2
-rw-r--r--tex/context/base/mkiv/context.mkiv2
-rw-r--r--tex/context/base/mkiv/context.mkxl2
-rw-r--r--tex/context/base/mkiv/grph-trf.mkiv4
-rw-r--r--tex/context/base/mkiv/mult-prm.lua6
-rw-r--r--tex/context/base/mkiv/pack-lyr.mkxl8
-rw-r--r--tex/context/base/mkiv/pack-rul.mkiv41
-rw-r--r--tex/context/base/mkiv/pack-rul.mkxl51
-rw-r--r--tex/context/base/mkiv/status-files.pdfbin26566 -> 26584 bytes
-rw-r--r--tex/context/base/mkiv/status-lua.pdfbin269667 -> 269667 bytes
-rw-r--r--tex/context/interface/mkiv/i-context.pdfbin893985 -> 894336 bytes
-rw-r--r--tex/context/interface/mkiv/i-readme.pdfbin61165 -> 61165 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
15 files changed, 85 insertions, 37 deletions
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index 5fbeafaf0..d2b57d4a6 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{2019.12.30 19:06}
+\newcontextversion{2019.12.31 11:28}
%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 35aefcf48..d90c73f8d 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{2019.12.30 19:06}
+\edef\contextversion{2019.12.31 11:28}
%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 16c966d45..59829a0de 100644
--- a/tex/context/base/mkiv/cont-new.mkiv
+++ b/tex/context/base/mkiv/cont-new.mkiv
@@ -13,7 +13,7 @@
% \normalend % uncomment this to get the real base runtime
-\newcontextversion{2019.12.30 19:06}
+\newcontextversion{2019.12.31 11:28}
%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 6b290ae2b..2d821e5a4 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -45,7 +45,7 @@
%D {YYYY.MM.DD HH:MM} format.
\edef\contextformat {\jobname}
-\edef\contextversion{2019.12.30 19:06}
+\edef\contextversion{2019.12.31 11:28}
\edef\contextkind {beta}
%D Kind of special:
diff --git a/tex/context/base/mkiv/context.mkxl b/tex/context/base/mkiv/context.mkxl
index c4eb9a610..c20380d19 100644
--- a/tex/context/base/mkiv/context.mkxl
+++ b/tex/context/base/mkiv/context.mkxl
@@ -29,7 +29,7 @@
%D {YYYY.MM.DD HH:MM} format.
\edef\contextformat {\jobname}
-\edef\contextversion{2019.12.30 19:06}
+\edef\contextversion{2019.12.31 11:28}
\edef\contextkind {beta}
%D Kind of special:
diff --git a/tex/context/base/mkiv/grph-trf.mkiv b/tex/context/base/mkiv/grph-trf.mkiv
index 18f988470..f9218036c 100644
--- a/tex/context/base/mkiv/grph-trf.mkiv
+++ b/tex/context/base/mkiv/grph-trf.mkiv
@@ -924,10 +924,10 @@
{\boxcursor\box\nextbox}
\setvalue{\??rotatepreset\v!left}%
- {\edef\p_rotation_rotation{\doifelseoddpage{90}{270}}}
+ {\edef\p_rotation_rotation{90}}
\setvalue{\??rotatepreset\v!right}%
- {\edef\p_rotation_rotation{\doifelseoddpage{270}{90}}}
+ {\edef\p_rotation_rotation{270}}
\setvalue{\??rotatepreset\v!inner}%
{\signalrightpage
diff --git a/tex/context/base/mkiv/mult-prm.lua b/tex/context/base/mkiv/mult-prm.lua
index d390f9c15..71479a3da 100644
--- a/tex/context/base/mkiv/mult-prm.lua
+++ b/tex/context/base/mkiv/mult-prm.lua
@@ -291,6 +291,7 @@ return {
"ifprotected",
"iftok",
"ifusercmd",
+ "ignorepars",
"immediateassigned",
"immediateassignment",
"initcatcodetable",
@@ -301,6 +302,8 @@ return {
"leftghost",
"leftmarginkern",
"letcharcode",
+ "letfrozen",
+ "letprotected",
"linedirection",
"localbrokenpenalty",
"localinterlinepenalty",
@@ -366,6 +369,8 @@ return {
"tokspre",
"tpack",
"tracingfonts",
+ "unletfrozen",
+ "unletprotected",
"vpack",
"wordboundary",
"xtoksapp",
@@ -570,6 +575,7 @@ return {
"everyjob",
"everymath",
"everypar",
+ "everytab",
"everyvbox",
"exhyphenchar",
"exhyphenpenalty",
diff --git a/tex/context/base/mkiv/pack-lyr.mkxl b/tex/context/base/mkiv/pack-lyr.mkxl
index 838e2fe19..43460092e 100644
--- a/tex/context/base/mkiv/pack-lyr.mkxl
+++ b/tex/context/base/mkiv/pack-lyr.mkxl
@@ -582,22 +582,22 @@
\def\pack_layers_flush_double#1%
{\startoverlay
{\ifcsname\??layerbox\currentlayer\endcsname
- \ifvoid\lastnamedcss\else \chardef\b_layer_two\lastnamedcs
+ \ifvoid\lastnamedcs\else \chardef\b_layer_two\lastnamedcs
\pack_layers_flush_indeed\plusone\currentlayer\b_layer_two
\fi
\fi}%
{\ifcsname\??layerbox\currentlayer:\the\realpageno\endcsname
- \ifvoid\lastnamedcss\else \chardef\b_layer_two\lastnamedcs
+ \ifvoid\lastnamedcs\else \chardef\b_layer_two\lastnamedcs
\pack_layers_flush_indeed\zerocount{\currentlayer:\the\realpageno}\b_layer_two
\fi
\fi}%
{\ifcsname\??layerbox#1\currentlayer\endcsname
- \ifvoid\lastnamedcss\else \chardef\b_layer_two\lastnamedcs
+ \ifvoid\lastnamedcs\else \chardef\b_layer_two\lastnamedcs
\pack_layers_flush_indeed\plusone{#1\currentlayer}\b_layer_two
\fi
\fi}%
{\ifcsname\??layerbox#1\currentlayer:\the\realpageno\endcsname
- \ifvoid\lastnamedcss\else \chardef\b_layer_two\lastnamedcs
+ \ifvoid\lastnamedcs\else \chardef\b_layer_two\lastnamedcs
\pack_layers_flush_indeed\zerocount{#1\currentlayer:\the\realpageno}\b_layer_two
\fi
\fi}%
diff --git a/tex/context/base/mkiv/pack-rul.mkiv b/tex/context/base/mkiv/pack-rul.mkiv
index 8732c7e6b..f44f547c0 100644
--- a/tex/context/base/mkiv/pack-rul.mkiv
+++ b/tex/context/base/mkiv/pack-rul.mkiv
@@ -468,25 +468,40 @@
{\def\pack_framed_define_overlay_indeed##1{\setvalue{\??overlay##1}{\executedefinedoverlay{##1}{#2}}}%
\processcommalist[#1]\pack_framed_define_overlay_indeed}
+% \unexpanded\def\executedefinedoverlay#1#2% we can share the definitions
+% {\bgroup % redundant grouping
+% \setbox\scratchbox\hbox\bgroup
+% \ifzeropt\d_framed_target_dp
+% \the\everyoverlay#2% saves wrapping (and lua call)
+% \else
+% \lower\d_framed_target_dp
+% \hbox{\the\everyoverlay#2}%
+% \fi
+% \egroup
+% \setlayoutcomponentattribute{\v!overlay:#1}%
+% \setbox\scratchbox\hpack \layoutcomponentboxattribute
+% {\kern -.5\dimexpr\wd\scratchbox-\d_framed_target_wd\relax % was \d_overlay_width
+% \raise-.5\dimexpr\ht\scratchbox-\d_framed_target_ht\relax % not \d_overlay_height !
+% \box\scratchbox}%
+% \wd\scratchbox\d_framed_target_wd
+% \ht\scratchbox\d_framed_target_ht
+% \dp\scratchbox\d_framed_target_dp
+% \box\scratchbox
+% \egroup}
+
+% 20191231: moved from cont-exp:
+
\unexpanded\def\executedefinedoverlay#1#2% we can share the definitions
{\bgroup % redundant grouping
- \setbox\scratchbox\hbox\bgroup
- \ifzeropt\d_framed_target_dp
- \the\everyoverlay#2% saves wrapping (and lua call)
- \else
- \lower\d_framed_target_dp
- \hbox{\the\everyoverlay#2}%
- \fi
- \egroup
\setlayoutcomponentattribute{\v!overlay:#1}%
- \setbox\scratchbox\hpack \layoutcomponentboxattribute
- {\kern -.5\dimexpr\wd\scratchbox-\d_framed_target_wd\relax % was \d_overlay_width
- \raise-.5\dimexpr\ht\scratchbox-\d_framed_target_ht\relax % not \d_overlay_height !
- \box\scratchbox}%
+ \setbox\scratchbox\hbox{\the\everyoverlay#2}%
+ \hpack to \d_framed_target_wd \layoutcomponentboxattribute
+ {\hskip-.5\dimexpr\wd\scratchbox-\d_framed_target_wd\relax
+ \box\scratchbox
+ \hss}%
\wd\scratchbox\d_framed_target_wd
\ht\scratchbox\d_framed_target_ht
\dp\scratchbox\d_framed_target_dp
- \box\scratchbox
\egroup}
%D \macros
diff --git a/tex/context/base/mkiv/pack-rul.mkxl b/tex/context/base/mkiv/pack-rul.mkxl
index 4304430d1..f0dc7de1b 100644
--- a/tex/context/base/mkiv/pack-rul.mkxl
+++ b/tex/context/base/mkiv/pack-rul.mkxl
@@ -469,21 +469,48 @@
{\def\pack_framed_define_overlay_indeed##1{\setvalue{\??overlay##1}{\executedefinedoverlay{##1}{#2}}}%
\processcommalist[#1]\pack_framed_define_overlay_indeed}
+% \unexpanded\def\executedefinedoverlay#1#2% we can share the definitions
+% {\bgroup % redundant grouping
+% \setbox\scratchbox\hbox\bgroup
+% \ifzeropt\d_framed_target_dp
+% \the\everyoverlay#2% saves wrapping (and lua call)
+% \else
+% \lower\d_framed_target_dp
+% \hbox{\the\everyoverlay#2}%
+% \fi
+% \egroup
+% \setlayoutcomponentattribute{\v!overlay:#1}%
+% \setbox\scratchbox\hpack \layoutcomponentboxattribute
+% {\kern -.5\dimexpr\wd\scratchbox-\d_framed_target_wd\relax % was \d_overlay_width
+% \raise-.5\dimexpr\ht\scratchbox-\d_framed_target_ht\relax % not \d_overlay_height !
+% \box\scratchbox}%
+% \wd\scratchbox\d_framed_target_wd
+% \ht\scratchbox\d_framed_target_ht
+% \dp\scratchbox\d_framed_target_dp
+% \box\scratchbox
+% \egroup}
+
+% 20191231: moved from cont-exp:
+%
+% % this is like the old:
+%
+% \unexpanded\def\executedefinedoverlay#1#2% we can share the definitions
+% {\bgroup % redundant grouping
+% \setlayoutcomponentattribute{\v!overlay:#1}%
+% \setbox\scratchbox\hbox \layoutcomponentboxattribute{\the\everyoverlay#2}%
+% \boxxoffset\scratchbox-.5\dimexpr\wd\scratchbox-\d_framed_target_wd\relax % was \d_overlay_width
+% % \boxyoffset\scratchbox-.5\dimexpr\ht\scratchbox-\d_framed_target_ht+\d_framed_target_dp\relax % not \d_overlay_height !
+% \wd\scratchbox\d_framed_target_wd
+% \ht\scratchbox\d_framed_target_ht
+% \dp\scratchbox\d_framed_target_dp
+% \box\scratchbox
+% \egroup}
+
\unexpanded\def\executedefinedoverlay#1#2% we can share the definitions
{\bgroup % redundant grouping
- \setbox\scratchbox\hbox\bgroup
- \ifzeropt\d_framed_target_dp
- \the\everyoverlay#2% saves wrapping (and lua call)
- \else
- \lower\d_framed_target_dp
- \hbox{\the\everyoverlay#2}%
- \fi
- \egroup
\setlayoutcomponentattribute{\v!overlay:#1}%
- \setbox\scratchbox\hpack \layoutcomponentboxattribute
- {\kern -.5\dimexpr\wd\scratchbox-\d_framed_target_wd\relax % was \d_overlay_width
- \raise-.5\dimexpr\ht\scratchbox-\d_framed_target_ht\relax % not \d_overlay_height !
- \box\scratchbox}%
+ \setbox\scratchbox\layoutcomponentboxattribute\hbox{\the\everyoverlay#2}%
+ \boxxoffset\scratchbox-.5\dimexpr\wd\scratchbox-\d_framed_target_wd\relax
\wd\scratchbox\d_framed_target_wd
\ht\scratchbox\d_framed_target_ht
\dp\scratchbox\d_framed_target_dp
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 7353957fb..5ec34ac15 100644
--- a/tex/context/base/mkiv/status-files.pdf
+++ b/tex/context/base/mkiv/status-files.pdf
Binary files differ
diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf
index 49f5b9660..a036e1f44 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
Binary files differ
diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf
index d67072314..7690ea2ae 100644
--- a/tex/context/interface/mkiv/i-context.pdf
+++ b/tex/context/interface/mkiv/i-context.pdf
Binary files differ
diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf
index fae19b600..7c07d9996 100644
--- a/tex/context/interface/mkiv/i-readme.pdf
+++ b/tex/context/interface/mkiv/i-readme.pdf
Binary files differ
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index fc4f2205d..3cddb3944 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 : 12/30/19 19:06:56
+-- merge date : 12/31/19 11:28:43
do -- begin closure to overcome local limits and interference