From 62d980c99a617ff260f29ac2d3bdb084049f25b0 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Thu, 29 Dec 2022 15:11:22 +0100 Subject: 2022-12-29 14:31:00 --- tex/context/base/mkii/cont-new.mkii | 2 +- tex/context/base/mkii/context.mkii | 2 +- tex/context/base/mkiv/cont-log.mkiv | 1 + tex/context/base/mkiv/cont-new.mkiv | 2 +- tex/context/base/mkiv/context.mkiv | 2 +- tex/context/base/mkiv/mult-low.lua | 3 +++ tex/context/base/mkiv/mult-prm.lua | 2 ++ tex/context/base/mkiv/status-files.pdf | Bin 24611 -> 24610 bytes tex/context/base/mkiv/status-lua.pdf | Bin 264782 -> 264786 bytes tex/context/base/mkxl/cont-log.mkxl | 2 ++ tex/context/base/mkxl/cont-new.mkxl | 2 +- tex/context/base/mkxl/context.mkxl | 2 +- tex/context/base/mkxl/math-ali.mkxl | 2 +- tex/context/base/mkxl/mlib-int.lmt | 2 +- tex/context/base/mkxl/pack-rul.mkxl | 4 ++-- tex/context/base/mkxl/trac-vis.mkxl | 33 +++++++++++++++++++++++---------- 16 files changed, 41 insertions(+), 20 deletions(-) (limited to 'tex/context') diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii index 910099ba4..5dc828952 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{2022.12.27 21:02} +\newcontextversion{2022.12.29 14:29} %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 ebc3a7ed1..43ba6e35e 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{2022.12.27 21:02} +\edef\contextversion{2022.12.29 14:29} %D For those who want to use this: diff --git a/tex/context/base/mkiv/cont-log.mkiv b/tex/context/base/mkiv/cont-log.mkiv index a6cd1cc2f..bcd276bdf 100644 --- a/tex/context/base/mkiv/cont-log.mkiv +++ b/tex/context/base/mkiv/cont-log.mkiv @@ -207,6 +207,7 @@ \unexpanded\def\pdfeTeX {pdfe-\wordboundary\TeX} \unexpanded\def\luaTeX {lua\wordboundary\TeX} \unexpanded\def\Lua {Lua} +\unexpanded\def\LUA {\Lua} \unexpanded\def\luajitTeX {lua\wordboundary jit\wordboundary\TeX} \unexpanded\def\luametaTeX{lua\wordboundary meta\wordboundary\TeX} %unexpanded\def\XeTeX {X\lower.5\exheight\hbox{\kern-.15\emwidth\mirror{E}}\kern-.1667\emwidth\TeX} diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index 9da0701b3..ff5584f5a 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{2022.12.27 21:02} +\newcontextversion{2022.12.29 14:29} %D This file is loaded at runtime, thereby providing an excellent place for hacks, %D patches, extensions and new features. There can be local overloads in cont-loc diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv index 76d26f591..eecce37d5 100644 --- a/tex/context/base/mkiv/context.mkiv +++ b/tex/context/base/mkiv/context.mkiv @@ -49,7 +49,7 @@ %D {YYYY.MM.DD HH:MM} format. \edef\contextformat {\jobname} -\edef\contextversion{2022.12.27 21:02} +\edef\contextversion{2022.12.29 14:29} %D Kind of special: diff --git a/tex/context/base/mkiv/mult-low.lua b/tex/context/base/mkiv/mult-low.lua index ac4ce2e91..3a78c719d 100644 --- a/tex/context/base/mkiv/mult-low.lua +++ b/tex/context/base/mkiv/mult-low.lua @@ -308,10 +308,13 @@ return { -- "hglue", "vglue", "hfillneg", "vfillneg", "hfilllneg", "vfilllneg", -- + "hsplit", + -- "ruledhss", "ruledhfil", "ruledhfill", "ruledhfilll", "ruledhfilneg", "ruledhfillneg", "normalhfillneg", "normalhfilllneg", "ruledvss", "ruledvfil", "ruledvfill", "ruledvfilll", "ruledvfilneg", "ruledvfillneg", "normalvfillneg", "normalvfilllneg", "ruledhbox", "ruledvbox", "ruledvtop", "ruleddbox", "ruledvcenter", "ruledmbox", "ruledhpack", "ruledvpack", "ruledtpack", "ruleddpack", + "ruledvsplit", "ruledtsplit", "ruleddsplit", "ruledhskip", "ruledvskip", "ruledkern", "ruledmskip", "ruledmkern", "ruledhglue", "ruledvglue", "normalhglue", "normalvglue", "ruledpenalty", diff --git a/tex/context/base/mkiv/mult-prm.lua b/tex/context/base/mkiv/mult-prm.lua index 87e7119f2..c3f5c3f1a 100644 --- a/tex/context/base/mkiv/mult-prm.lua +++ b/tex/context/base/mkiv/mult-prm.lua @@ -847,6 +847,7 @@ return { "divideby", "doublehyphendemerits", "dp", + "dsplit", "dump", "edef", "else", @@ -1077,6 +1078,7 @@ return { "tracingparagraphs", "tracingrestores", "tracingstats", + "tsplit", "uccode", "uchyph", "unboundary", diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf index 401fcaf55..653a9e73b 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 da72ebe62..8c0f230e1 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/base/mkxl/cont-log.mkxl b/tex/context/base/mkxl/cont-log.mkxl index 710848b67..baf3afeba 100644 --- a/tex/context/base/mkxl/cont-log.mkxl +++ b/tex/context/base/mkxl/cont-log.mkxl @@ -188,6 +188,7 @@ \instance\protected\def\INRSTEX {inrs\TeX} \instance\protected\def\PRAGMA {Pragma ADE} +\instance\protected\def\LUA {\Lua} % below %D And this is how they show up: \TeX, \MetaFont, \MetaPost, \PiCTeX, \TaBlE, \ConTeXt, %D \PPCHTeX, \AmSTeX, \LaTeX, \LamSTeX. @@ -204,6 +205,7 @@ \frozen\instance\protected\def\luametaTeX{lua\wordboundary meta\wordboundary\TeX} \frozen\instance\protected\def\XeTeX {X\lower.5\exheight\hbox{\kern-.15\emwidth\mirror{E}}\kern-.1667\emwidth\TeX} + % % Adapted from a patch by Mojca: % % \def\syst_logos_xetex_e diff --git a/tex/context/base/mkxl/cont-new.mkxl b/tex/context/base/mkxl/cont-new.mkxl index f704da4e1..a35ab8489 100644 --- a/tex/context/base/mkxl/cont-new.mkxl +++ b/tex/context/base/mkxl/cont-new.mkxl @@ -13,7 +13,7 @@ % \normalend % uncomment this to get the real base runtime -\newcontextversion{2022.12.27 21:02} +\newcontextversion{2022.12.29 14:29} %D This file is loaded at runtime, thereby providing an excellent place for hacks, %D patches, extensions and new features. There can be local overloads in cont-loc diff --git a/tex/context/base/mkxl/context.mkxl b/tex/context/base/mkxl/context.mkxl index 2aec57d7b..152850f03 100644 --- a/tex/context/base/mkxl/context.mkxl +++ b/tex/context/base/mkxl/context.mkxl @@ -29,7 +29,7 @@ %D {YYYY.MM.DD HH:MM} format. \immutable\edef\contextformat {\jobname} -\immutable\edef\contextversion{2022.12.27 21:02} +\immutable\edef\contextversion{2022.12.29 14:29} %overloadmode 1 % check frozen / warning %overloadmode 2 % check frozen / error diff --git a/tex/context/base/mkxl/math-ali.mkxl b/tex/context/base/mkxl/math-ali.mkxl index 1fc01c6f7..7789dcb60 100644 --- a/tex/context/base/mkxl/math-ali.mkxl +++ b/tex/context/base/mkxl/math-ali.mkxl @@ -365,7 +365,7 @@ \halign \ifconditional\c_math_align_overflow_mode callback - attr + \s!attr \mathnumberlocationattribute \numexpr\ifconditional\c_math_align_reformat_mode\plusfour\else\plustwo\fi * \plussixteen\relax % just a signal \fi diff --git a/tex/context/base/mkxl/mlib-int.lmt b/tex/context/base/mkxl/mlib-int.lmt index 3d71db82f..647b7054c 100644 --- a/tex/context/base/mkxl/mlib-int.lmt +++ b/tex/context/base/mkxl/mlib-int.lmt @@ -233,7 +233,7 @@ do registerdirect("RuleV", function() return getdimen("d_rule_v") * factor end) registerdirect("RuleThickness", function() return getdimen("d_rule_line") * factor end) registerdirect("RuleOffset", function() return getdimen("d_rule_offset") / 65536 end) -- not factor - registerdirect("RuleDirection", function() return getmacro("c_rule_direction") end) + registerdirect("RuleDirection", function() return getmacro("m_rule_direction") end) registerdirect("RuleFactor", function() return getdimen("d_rule_factor") * factor end) registerdirect("RuleOption", function() return getmacro("m_rule_option") end) registerscript("RuleColor", function() return getmacro("m_rule_color") end) diff --git a/tex/context/base/mkxl/pack-rul.mkxl b/tex/context/base/mkxl/pack-rul.mkxl index 9bb7ddd8d..9b87d95b0 100644 --- a/tex/context/base/mkxl/pack-rul.mkxl +++ b/tex/context/base/mkxl/pack-rul.mkxl @@ -764,8 +764,8 @@ % % more modern: -\def\pack_framed_rules_hrule{\hrule\s!height\d_framed_linewidth\s!left\d_framed_linewidth\s!right \d_framed_linewidth} -\def\pack_framed_rules_vrule{\vrule\s!width \d_framed_linewidth\s!top \d_framed_linewidth\s!bottom\d_framed_linewidth\s!yoffset-\d_framed_linewidth} +\def\pack_framed_rules_hrule{\hrule\s!height\d_framed_linewidth\s!left\d_framed_linewidth\s!right \d_framed_linewidth\relax} +\def\pack_framed_rules_vrule{\vrule\s!width \d_framed_linewidth\s!top \d_framed_linewidth\s!bottom\d_framed_linewidth\relax}% \s!yoffset-\d_framed_linewidth} \def\pack_framed_t_rules{\pack_framed_rules_hrule\kern-\d_framed_linewidth} \def\pack_framed_b_rules{\kern-\d_framed_linewidth\pack_framed_rules_hrule} diff --git a/tex/context/base/mkxl/trac-vis.mkxl b/tex/context/base/mkxl/trac-vis.mkxl index 73ebc7cd4..3b088d05f 100644 --- a/tex/context/base/mkxl/trac-vis.mkxl +++ b/tex/context/base/mkxl/trac-vis.mkxl @@ -59,18 +59,31 @@ \aliased\let\syst_visualizers_vpack \vpack \aliased\let\syst_visualizers_tpack \tpack \aliased\let\syst_visualizers_dpack \dpack - -\permanent\protected\def\ruledhbox {\syst_visualizers_hbox attr \visualattribute \clf_getvisual{simplehbox} } -\permanent\protected\def\ruledhpack {\syst_visualizers_hpack attr \visualattribute \clf_getvisual{simplehbox} } -\permanent\protected\def\ruledvbox {\syst_visualizers_vbox attr \visualattribute \clf_getvisual{simplevbox} } -\permanent\protected\def\ruledvpack {\syst_visualizers_vpack attr \visualattribute \clf_getvisual{simplevbox} } -\permanent\protected\def\ruledvtop {\syst_visualizers_vtop attr \visualattribute \clf_getvisual{simplevtop} } -\permanent\protected\def\ruledtpack {\syst_visualizers_tpack attr \visualattribute \clf_getvisual{simplevtop} } -\permanent\protected\def\ruleddbox {\syst_visualizers_dbox attr \visualattribute \clf_getvisual{simplevtop} } -\permanent\protected\def\ruleddpack {\syst_visualizers_dpack attr \visualattribute \clf_getvisual{simplevtop} } -\permanent\protected\def\ruledvcenter{\syst_visualizers_vcenter attr \visualattribute \clf_getvisual{simplevbox} } +\aliased\let\syst_visualizers_vsplit \vsplit +\aliased\let\syst_visualizers_tsplit \tsplit +\aliased\let\syst_visualizers_dsplit \dsplit + +\permanent\protected\def\ruledhbox {\syst_visualizers_hbox \s!attr \visualattribute \clf_getvisual{simplehbox} } +\permanent\protected\def\ruledhpack {\syst_visualizers_hpack \s!attr \visualattribute \clf_getvisual{simplehbox} } +\permanent\protected\def\ruledvbox {\syst_visualizers_vbox \s!attr \visualattribute \clf_getvisual{simplevbox} } +\permanent\protected\def\ruledvpack {\syst_visualizers_vpack \s!attr \visualattribute \clf_getvisual{simplevbox} } +\permanent\protected\def\ruledvtop {\syst_visualizers_vtop \s!attr \visualattribute \clf_getvisual{simplevtop} } +\permanent\protected\def\ruledtpack {\syst_visualizers_tpack \s!attr \visualattribute \clf_getvisual{simplevtop} } +\permanent\protected\def\ruleddbox {\syst_visualizers_dbox \s!attr \visualattribute \clf_getvisual{simplevtop} } +\permanent\protected\def\ruleddpack {\syst_visualizers_dpack \s!attr \visualattribute \clf_getvisual{simplevtop} } +\permanent\protected\def\ruledvcenter{\syst_visualizers_vcenter \s!attr \visualattribute \clf_getvisual{simplevbox} } \permanent\protected\def\ruledmbox #1{\ruledhbox{\startimath#1\stopimath}} +\mutable\integerdef\c_syst_visualizer\zerocount + +\permanent\protected\def\ruledvsplit{\afterassignment\syst_visualizers_v_split\integerdef\c_syst_visualizer} +\permanent\protected\def\ruledtsplit{\afterassignment\syst_visualizers_t_split\integerdef\c_syst_visualizer} +\permanent\protected\def\ruleddsplit{\afterassignment\syst_visualizers_d_split\integerdef\c_syst_visualizer} + +\permanent\protected\def\syst_visualizers_v_split{\syst_visualizers_vsplit\c_syst_visualizer \s!attr \visualattribute \clf_getvisual {simplevbox}} +\permanent\protected\def\syst_visualizers_t_split{\syst_visualizers_tsplit\c_syst_visualizer \s!attr \visualattribute \clf_getvisual {simplevtop}} +\permanent\protected\def\syst_visualizers_d_split{\syst_visualizers_dsplit\c_syst_visualizer \s!attr \visualattribute \clf_getvisual {simplevtop}} + \appendtoks \ifcase\c_syst_visualizers_state\else \syst_visualizers_speedup -- cgit v1.2.3