diff options
Diffstat (limited to 'tex/context/base/mkiv')
| -rw-r--r-- | tex/context/base/mkiv/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/mkiv/context-error.lmx | 4 | ||||
| -rw-r--r-- | tex/context/base/mkiv/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/mkiv/mult-low.lua | 1 | ||||
| -rw-r--r-- | tex/context/base/mkiv/spac-ali.mkiv | 3 | ||||
| -rw-r--r-- | tex/context/base/mkiv/status-files.pdf | bin | 24770 -> 24763 bytes | |||
| -rw-r--r-- | tex/context/base/mkiv/status-lua.pdf | bin | 257675 -> 257684 bytes | |||
| -rw-r--r-- | tex/context/base/mkiv/syst-ini.mkiv | 6 | ||||
| -rw-r--r-- | tex/context/base/mkiv/typo-del.mkiv | 9 | ||||
| -rw-r--r-- | tex/context/base/mkiv/util-jsn.lua | 8 |
10 files changed, 26 insertions, 9 deletions
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index 1b143ffb7..d61d0887e 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{2021.12.10 11:29} +\newcontextversion{2021.12.14 19:16} %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-error.lmx b/tex/context/base/mkiv/context-error.lmx index d1a758b05..60579f4a0 100644 --- a/tex/context/base/mkiv/context-error.lmx +++ b/tex/context/base/mkiv/context-error.lmx @@ -51,9 +51,7 @@ </div></div> <div id="bottom"><div id="bottom-one"><div id="bottom-two"> Job Name: <?lua p(environment.jobname) ?> - ConTeXt Version: <?lua p(environment.version) ?> - Real Page: <?lua p(tracers.cs('c:realpageno')) ?> - Page: <?lua p(tracers.cs('c:pageno')) ?> + ConTeXt Version: <?lua p(environment.version) ?> </div></div></div> </body> </html> diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv index 7c32ed6d8..4675386c8 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{2021.12.10 11:29} +\edef\contextversion{2021.12.14 19:16} %D Kind of special: diff --git a/tex/context/base/mkiv/mult-low.lua b/tex/context/base/mkiv/mult-low.lua index baf85eb04..9c4c35037 100644 --- a/tex/context/base/mkiv/mult-low.lua +++ b/tex/context/base/mkiv/mult-low.lua @@ -538,6 +538,7 @@ return { "lefttoright", "righttoleft", "checkedlefttoright", "checkedrighttoleft", "synchronizelayoutdirection","synchronizedisplaydirection","synchronizeinlinedirection", "dirlre", "dirrle", "dirlro", "dirrlo", + "rtltext", "ltrtext", -- "lesshyphens", "morehyphens", "nohyphens", "dohyphens", "dohyphencollapsing", "nohyphencollapsing", "compounddiscretionary", diff --git a/tex/context/base/mkiv/spac-ali.mkiv b/tex/context/base/mkiv/spac-ali.mkiv index 2467f8352..a54c44b72 100644 --- a/tex/context/base/mkiv/spac-ali.mkiv +++ b/tex/context/base/mkiv/spac-ali.mkiv @@ -184,6 +184,9 @@ \unexpanded\def\leftorrightvbox{\ifconditional\displaylefttoright\expandafter\lefttorightvbox\else\expandafter\righttoleftvbox\fi} \unexpanded\def\leftorrightvtop{\ifconditional\displaylefttoright\expandafter\lefttorightvtop\else\expandafter\righttoleftvtop\fi} +\unexpanded\def\rtltext{\groupedcommand{\dontleavehmode\righttoleft\ignorespaces}\removeunwantedspaces} +\unexpanded\def\ltrtext{\groupedcommand{\dontleavehmode\lefttoright\ignorespaces}\removeunwantedspaces} + % Tolerance and hyphenation \ifdefined\lesshyphens \else \let\lesshyphens\relax \fi diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf Binary files differindex a7f20d3e8..708b6ffd2 100644 --- a/tex/context/base/mkiv/status-files.pdf +++ b/tex/context/base/mkiv/status-files.pdf diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf Binary files differindex 43b1fbf13..10f855c72 100644 --- a/tex/context/base/mkiv/status-lua.pdf +++ b/tex/context/base/mkiv/status-lua.pdf diff --git a/tex/context/base/mkiv/syst-ini.mkiv b/tex/context/base/mkiv/syst-ini.mkiv index 488f16e16..568912a33 100644 --- a/tex/context/base/mkiv/syst-ini.mkiv +++ b/tex/context/base/mkiv/syst-ini.mkiv @@ -1251,4 +1251,10 @@ \let\partokenname\gobbleoneargument \fi +%D In case we load \LMTX\ code. + +\ifdefined\autoparagraphmode \else + \newcount\autoparagraphmode +\fi + \protect \endinput diff --git a/tex/context/base/mkiv/typo-del.mkiv b/tex/context/base/mkiv/typo-del.mkiv index 9720326be..726c6d4ba 100644 --- a/tex/context/base/mkiv/typo-del.mkiv +++ b/tex/context/base/mkiv/typo-del.mkiv @@ -525,10 +525,11 @@ \usedelimitedtextstyleandcolor\c!style\c!color % \begingroup - \edef\p_delimited_left {\delimitedtextparameter{\c!left}}% - \edef\p_delimited_right {\delimitedtextparameter{\c!right}}% - \edef\p_delimited_nextleft {\delimitedtextparameter{\c!nextleft}}% - \edef\p_delimited_nextright{\delimitedtextparameter{\c!nextright}}% + \usealignparameter\delimitedtextparameter + \edef\p_delimited_left {\delimitedtextparameter\c!left}% + \edef\p_delimited_right {\delimitedtextparameter\c!right}% + \edef\p_delimited_nextleft {\delimitedtextparameter\c!nextleft}% + \edef\p_delimited_nextright{\delimitedtextparameter\c!nextright}% % \leftdelimitedtextmark % diff --git a/tex/context/base/mkiv/util-jsn.lua b/tex/context/base/mkiv/util-jsn.lua index 8da351897..c1048b00a 100644 --- a/tex/context/base/mkiv/util-jsn.lua +++ b/tex/context/base/mkiv/util-jsn.lua @@ -17,6 +17,10 @@ if not modules then modules = { } end modules ['util-jsn'] = { -- -- Upgraded for handling the somewhat more fax server templates. +if utilities and utilities.json then + return json +end + local P, V, R, S, C, Cc, Cs, Ct, Cf, Cg = lpeg.P, lpeg.V, lpeg.R, lpeg.S, lpeg.C, lpeg.Cc, lpeg.Cs, lpeg.Ct, lpeg.Cf, lpeg.Cg local lpegmatch = lpeg.match local format, gsub = string.format, string.gsub @@ -440,4 +444,8 @@ end -- inspect(l) -- print(s==l.s) +-- if not package.loaded.json then +-- package.loaded.json = json +-- end + return json |