2019-01-28 17:06:00

21 files changed, 81 insertions, 119 deletions

diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index dd19543a1..b67ac9678 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.01.28 12:25}
+\newcontextversion{2019.01.28 16:58}
 
 %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 7b8813e3b..44e420c5d 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.01.28 12:25}
+\edef\contextversion{2019.01.28 16:58}
 
 %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 677fc757a..898068167 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{2019.01.28 12:25}
+\newcontextversion{2019.01.28 16:58}
 
 %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 60e8c1bc4..b146002d0 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -42,7 +42,7 @@
 %D has to match \type {YYYY.MM.DD HH:MM} format.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2019.01.28 12:25}
+\edef\contextversion{2019.01.28 16:58}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/mkiv/core-con.mkiv b/tex/context/base/mkiv/core-con.mkiv
index 5ccc5ed35..d6838d835 100644
--- a/tex/context/base/mkiv/core-con.mkiv
+++ b/tex/context/base/mkiv/core-con.mkiv
@@ -190,10 +190,10 @@
 %D want to use as meaningful commands as possible, and because \TEX\ already
 %D uses up some of those, we save the original meanings.
 
-\savenormalmeaning\time
-\savenormalmeaning\year
-\savenormalmeaning\month
-\savenormalmeaning\day
+% \savenormalmeaning\time
+% \savenormalmeaning\year
+% \savenormalmeaning\month
+% \savenormalmeaning\day
 
 %D \macros
 %D   {month,MONTH}
@@ -218,7 +218,7 @@
 %D \showsetup{month}
 %D \showsetup{MONTH}
 
-\let\month              \monthlong
+\let\month\monthlong
 
 \unexpanded\def\MONTH     #1{\WORD{\month     {#1}}}
 \unexpanded\def\MONTHLONG #1{\WORD{\monthlong {#1}}}
@@ -408,18 +408,8 @@
 %D
 %D \typebuffer \getbuffer
 
-\setupsystem
-  [\c!y=\normalyear,
-   \c!m=\normalmonth,
-   \c!d=\normalday]
-
 \newtoks \everycurrentdate
 
-\def\syst_converters_check_date
-  {\edef\temp{\systemparameter\c!d}\scratchcounterone  \ifx\temp\empty\normalday  \else\temp\fi
-   \edef\temp{\systemparameter\c!m}\scratchcountertwo  \ifx\temp\empty\normalmonth\else\temp\fi
-   \edef\temp{\systemparameter\c!y}\scratchcounterthree\ifx\temp\empty\normalyear \else\temp\fi}
-
 \unexpanded\def\currentdate
   {\dosingleempty\syst_converters_current_date}
 
@@ -427,40 +417,40 @@
   {\dontleavehmode
    \begingroup
    \the\everycurrentdate
-   \syst_converters_check_date
    \clf_currentdate
-     {#1}%
-     {\currentdatespecification}%
-     {\labellanguage}%
-     \scratchcounterone
-     \scratchcountertwo
-     \scratchcounterthree
+     {#1}{\currentdatespecification}{\labellanguage}%
+     \normalyear\normalmonth\normalday
    \endgroup}
 
 \unexpanded\def\date
   {\dodoubleempty\syst_converters_date}
 
 \def\syst_converters_date[#1][#2]%
-  {\begingroup
+  {\dontleavehmode
+   \begingroup
+   \scratchcounterone  \normalyear
+   \scratchcountertwo  \normalmonth
+   \scratchcounterthree\normalday
    \iffirstargument
-     \setupsystem[#1]%
+     \letdummyparameter\c!y\empty
+     \letdummyparameter\c!m\empty
+     \letdummyparameter\c!d\empty
+     \getdummyparameters[#1]%
+     \edef\temp{\dummyparameter\c!y}\ifx\temp\empty\else\scratchcounterone  \temp\fi
+     \edef\temp{\dummyparameter\c!m}\ifx\temp\empty\else\scratchcountertwo  \temp\fi
+     \edef\temp{\dummyparameter\c!d}\ifx\temp\empty\else\scratchcounterthree\temp\fi
+     \relax
    \fi
-   \syst_converters_check_date
-   \syst_converters_current_date[#2]%
+   \the\everycurrentdate
+   \clf_currentdate
+     {#1}{\currentdatespecification}{\labellanguage}%
+     \scratchcounterone\scratchcountertwo\scratchcounterthree
    \endgroup}
 
 \def\rawdate[#1]% expandable and no labels
-  {\begingroup
-   \syst_converters_check_date
-   \clf_currentdate
-     {#1}%
-     {\currentdatespecification}%
-     {}%
-     \scratchcounterone
-     \scratchcountertwo
-     \scratchcounterthree
-   \relax
-   \endgroup}
+  {\clf_currentdate
+     {#1}{\currentdatespecification}{}%
+     \normalyear\normalmonth\normalday}
 
 %D \macros
 %D   {currenttime}
diff --git a/tex/context/base/mkiv/core-lmt.lua b/tex/context/base/mkiv/core-lmt.lua
index ae8c02ea5..700ce4721 100644
--- a/tex/context/base/mkiv/core-lmt.lua
+++ b/tex/context/base/mkiv/core-lmt.lua
@@ -11,9 +11,7 @@ local scankeyword = tokens.scanners.keyword
 
 local settextdir = tex.settextdir
 local setlinedir = tex.setlinedir
-local setpagedir = tex.setpagedir
 local setpardir  = tex.setpardir
-local setbodydir = tex.setbodydir
 local setboxdir  = tex.setboxdir
 
 local function scandir(what)
@@ -21,10 +19,12 @@ local function scandir(what)
         what(0)
     elseif scankeyword("trt") then
         what(1)
-    elseif scankeyword("rtt") then
-        what(2)
-    elseif scankeyword("ltl") then
-        what(3)
+ -- elseif scankeyword("rtt") then
+ --     what(2)
+ -- elseif scankeyword("ltl") then
+ --     what(3)
+    else
+        what(0)
     end
 end
 
diff --git a/tex/context/base/mkiv/data-use.lua b/tex/context/base/mkiv/data-use.lua
index ff25c803a..5985a2eac 100644
--- a/tex/context/base/mkiv/data-use.lua
+++ b/tex/context/base/mkiv/data-use.lua
@@ -69,7 +69,11 @@ function statistics.savefmtstatus(texname,formatbanner,sourcefile,kind,banner) -
         }
         io.savedata(luvname,table.serialize(luvdata,true))
         lua.registerfinalizer(function()
-            logs.report("format banner","%s",banner)
+            if jit then
+                logs.report("format banner","%s  lua: %s jit",banner,LUAVERSION)
+            else
+                logs.report("format banner","%s  lua: %s",banner,LUAVERSION)
+            end
             logs.newline()
         end)
     end
diff --git a/tex/context/base/mkiv/font-gds.mkvi b/tex/context/base/mkiv/font-gds.mkvi
index 549ede46f..05cf08790 100644
--- a/tex/context/base/mkiv/font-gds.mkvi
+++ b/tex/context/base/mkiv/font-gds.mkvi
@@ -62,7 +62,7 @@
 %
 % \definedfont[husayni*husayni-colored at 36pt]
 %
-% \starttext \pardir TRT \textdir TRT
+% \starttext \righttoleft
 %
 % \setfontcolorscheme[1]
 %
diff --git a/tex/context/base/mkiv/font-ocl.lua b/tex/context/base/mkiv/font-ocl.lua
index 8cb5a12fb..0976cdb21 100644
--- a/tex/context/base/mkiv/font-ocl.lua
+++ b/tex/context/base/mkiv/font-ocl.lua
@@ -146,11 +146,6 @@ local start = { "pdf", "mode", "font" } -- force text mode (so get q Q right)
 local push  = { "pdf", "page", "q" }
 local pop   = { "pdf", "page", "Q" }
 
-if not LUATEXFUNCTIONALITY or LUATEXFUNCTIONALITY < 6472 then -- for outside context (till tl 2019)
-    start = { "nop" }
-    ----- = stop
-end
-
 -- -- This one results in color directives inside BT ET but has less q Q pairs. It
 -- -- only shows the first glyph in acrobat and nothing more. No problem with other
 -- -- renderers.
diff --git a/tex/context/base/mkiv/font-tra.mkiv b/tex/context/base/mkiv/font-tra.mkiv
index c51ba78fc..205ca5ca0 100644
--- a/tex/context/base/mkiv/font-tra.mkiv
+++ b/tex/context/base/mkiv/font-tra.mkiv
@@ -188,7 +188,7 @@
 %       \showotfstepmessages\recurselevel
 %       \blank
 %       \startlinecorrection
-%       \dontleavehmode\bgroup\resetallattributes\pardir TLT\textdir TLT\relax\tttf\recurselevel: \showotfstepchars\recurselevel\egroup
+%       \dontleavehmode\bgroup\resetallattributes\lefttoright\tttf\recurselevel: \showotfstepchars\recurselevel\egroup
 %       \stoplinecorrection
 %       \blank
 %       \startlinecorrection
diff --git a/tex/context/base/mkiv/math-ini.mkiv b/tex/context/base/mkiv/math-ini.mkiv
index 2bc9817c1..50da1a400 100644
--- a/tex/context/base/mkiv/math-ini.mkiv
+++ b/tex/context/base/mkiv/math-ini.mkiv
@@ -1335,7 +1335,7 @@
 \to \everyswitchmathematics
 
 \unexpanded\def\math_basics_synchronize_direction
-  {\mathdirection\ifconditional\c_math_right_to_left\plusone\else\zerocount\fi}
+  {\mathdirection\ifconditional\c_math_right_to_left\directionrighttoleft\else\directionlefttoright\fi}
 
 % Not \everymathematics as it comes too late and I'm not in the mood for a mixed mode
 % kludge now (should be a property of beginmath nodes and passed to callbacks).
diff --git a/tex/context/base/mkiv/mult-low.lua b/tex/context/base/mkiv/mult-low.lua
index b62ee35e6..13cc31a94 100644
--- a/tex/context/base/mkiv/mult-low.lua
+++ b/tex/context/base/mkiv/mult-low.lua
@@ -21,7 +21,9 @@ return {
         "zeromuskip", "onemuskip",
         "pluscxxvii", "pluscxxviii", "pluscclv", "pluscclvi",
         "normalpagebox",
-        --        --
+        --
+        "directionlefttoright", "directionrighttoleft",
+        --
         "endoflinetoken", "outputnewlinechar",
         --
         "emptytoks", "empty", "undefined",
diff --git a/tex/context/base/mkiv/spac-ali.mkiv b/tex/context/base/mkiv/spac-ali.mkiv
index cc56f4069..4362ff250 100644
--- a/tex/context/base/mkiv/spac-ali.mkiv
+++ b/tex/context/base/mkiv/spac-ali.mkiv
@@ -61,19 +61,6 @@
 
 \newtoks\everyresetalign % todo
 
-%D We will not use bodydir and pagedir so we disable them. That way we get
-%D normal hyperlink support. We back on it (too hard to fake \type {\the}).
-
-\chardef\directionlefttoright\zerocount
-\chardef\directionrighttoleft\plusone
-
-\ifdefined\pagedir
-    \let\pagedir      \undefined \let\normalpagedir      \undefined
-    \let\bodydir      \undefined \let\normalbodydir      \undefined
-    \let\pagedirection\undefined \let\normalpagedirection\undefined
-    \let\bodydirection\undefined \let\normalbodydirection\undefined
-\fi
-
 % This will become a more advanced layout controller soon:
 
 \newconditional\layoutlefttoright   \settrue\layoutlefttoright
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 72f45c039..1dfc57e96 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
index 07cb7dd16..e797a2484 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
diff --git a/tex/context/base/mkiv/supp-box.mkiv b/tex/context/base/mkiv/supp-box.mkiv
index d3c74f725..59e710520 100644
--- a/tex/context/base/mkiv/supp-box.mkiv
+++ b/tex/context/base/mkiv/supp-box.mkiv
@@ -2770,41 +2770,7 @@
 
 %D And even rawer:
 
-           \let\naturalvcenter\normalvtop % will go away
-
-\ifdefined\bodydir
-
-    \unexpanded\def\naturalhbox  {\hbox  bdir\directionlefttoright}
-    \unexpanded\def\naturalvbox  {\vbox  bdir\directionlefttoright}
-    \unexpanded\def\naturalvtop  {\vtop  bdir\directionlefttoright}
-    \unexpanded\def\naturalhpack {\hpack bdir\directionlefttoright}
-    \unexpanded\def\naturalvpack {\vpack bdir\directionlefttoright}
-    \unexpanded\def\naturaltpack {\tpack bdir\directionlefttoright}
-
-    \unexpanded\def\reversehbox  {\hbox  bdir\directionrighttoleft}
-    \unexpanded\def\reversevbox  {\vbox  bdir\directionrighttoleft}
-    \unexpanded\def\reversevtop  {\vtop  bdir\directionrighttoleft}
-    \unexpanded\def\reversehpack {\hpack bdir\directionrighttoleft}
-    \unexpanded\def\reversevpack {\vpack bdir\directionrighttoleft}
-    \unexpanded\def\reversetpack {\tpack bdir\directionrighttoleft}
-
-\else
-
-    \unexpanded\def\naturalhbox  {\hbox  direction\directionlefttoright}
-    \unexpanded\def\naturalvbox  {\vbox  direction\directionlefttoright}
-    \unexpanded\def\naturalvtop  {\vtop  direction\directionlefttoright}
-    \unexpanded\def\naturalhpack {\hpack direction\directionlefttoright}
-    \unexpanded\def\naturalvpack {\vpack direction\directionlefttoright}
-    \unexpanded\def\naturaltpack {\tpack direction\directionlefttoright}
-
-    \unexpanded\def\reversehbox  {\hbox  direction\directionrighttoleft}
-    \unexpanded\def\reversevbox  {\vbox  direction\directionrighttoleft}
-    \unexpanded\def\reversevtop  {\vtop  direction\directionrighttoleft}
-    \unexpanded\def\reversehpack {\hpack direction\directionrighttoleft}
-    \unexpanded\def\reversevpack {\vpack direction\directionrighttoleft}
-    \unexpanded\def\reversetpack {\tpack direction\directionrighttoleft}
-
-\fi
+\let\naturalvcenter\normalvtop % will go away
 
 %D \macros
 %D   {vcenter}
diff --git a/tex/context/base/mkiv/supp-dir.mkiv b/tex/context/base/mkiv/supp-dir.mkiv
index 3447a83a3..277f2b7ca 100644
--- a/tex/context/base/mkiv/supp-dir.mkiv
+++ b/tex/context/base/mkiv/supp-dir.mkiv
@@ -13,8 +13,37 @@
 
 \unprotect
 
-% \expanded{\defineactivecharacter \number"2000E} {\textdirection TRT\relax}
-% \expanded{\defineactivecharacter \number"2000F} {\textdirection TLT\relax}
+\chardef\directionlefttoright\zerocount
+\chardef\directionrighttoleft\plusone
+
+\edef\??bdir{\ifdefined\bodydir bdir\else direction\fi}
+
+\unexpanded\edef\naturalhbox  {\hbox  \??bdir\directionlefttoright}
+\unexpanded\edef\naturalvbox  {\vbox  \??bdir\directionlefttoright}
+\unexpanded\edef\naturalvtop  {\vtop  \??bdir\directionlefttoright}
+\unexpanded\edef\naturalhpack {\hpack \??bdir\directionlefttoright}
+\unexpanded\edef\naturalvpack {\vpack \??bdir\directionlefttoright}
+\unexpanded\edef\naturaltpack {\tpack \??bdir\directionlefttoright}
+
+\unexpanded\edef\reversehbox  {\hbox  \??bdir\directionrighttoleft}
+\unexpanded\edef\reversevbox  {\vbox  \??bdir\directionrighttoleft}
+\unexpanded\edef\reversevtop  {\vtop  \??bdir\directionrighttoleft}
+\unexpanded\edef\reversehpack {\hpack \??bdir\directionrighttoleft}
+\unexpanded\edef\reversevpack {\vpack \??bdir\directionrighttoleft}
+\unexpanded\edef\reversetpack {\tpack \??bdir\directionrighttoleft}
+
+\ifdefined\bodydir
+    \let\bodydir      \undefined \let\normalbodydir      \undefined
+    \let\bodydirection\undefined \let\normalbodydirection\undefined
+\fi
+
+\ifdefined\pagedir
+    \let\pagedir      \undefined \let\normalpagedir      \undefined
+    \let\pagedirection\undefined \let\normalpagedirection\undefined
+\fi
+
+% \expanded{\defineactivecharacter \number"2000E} {\textdirection\directionrighttoleft\relax}
+% \expanded{\defineactivecharacter \number"2000F} {\textdirection\directionlefttoright\relax}
 
 \def\syst_direction_string#1{\ifcase#1=\plusone r2l\else l2r\fi}
 
diff --git a/tex/context/base/mkiv/syst-aux.mkiv b/tex/context/base/mkiv/syst-aux.mkiv
index 63def7f7a..8c264329a 100644
--- a/tex/context/base/mkiv/syst-aux.mkiv
+++ b/tex/context/base/mkiv/syst-aux.mkiv
@@ -7715,14 +7715,6 @@
   {\unprotect
    \syst_helpers_unprotected}
 
-% awaiting the definitive implementation
-
-% \ifdefined\resettimer \else
-%   \let\resettimer \relax
-%   \newcount\elapsedtime
-% \fi
-% \def\elapsedseconds{\expandafter\withoutpt\the\dimexpr\elapsedtime sp\relax}
-
 \let\resettimer    \clf_resettimer
 \let\elapsedtime   \clf_elapsedtime
 \let\elapsedseconds \elapsedtime
diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf
index d22baf534..2996163ad 100644
--- a/tex/context/interface/mkiv/i-context.pdf
+++ b/tex/context/interface/mkiv/i-context.pdf
diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf
index f9549aebf..7fc07ede0 100644
--- a/tex/context/interface/mkiv/i-readme.pdf
+++ b/tex/context/interface/mkiv/i-readme.pdf
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 5c6661592..89ae7d64d 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  : 01/28/19 12:25:54
+-- merge date  : 01/28/19 16:58:09
 
 do -- begin closure to overcome local limits and interference
 
@@ -31029,9 +31029,6 @@ end
 local start={ "pdf","mode","font" }
 local push={ "pdf","page","q" }
 local pop={ "pdf","page","Q" }
-if not LUATEXFUNCTIONALITY or LUATEXFUNCTIONALITY<6472 then 
- start={ "nop" }
-end
 local function initialize(tfmdata,kind,value)
  if value then
   local resources=tfmdata.resources