2020-08-09 22:03:00

13 files changed, 18 insertions, 29 deletions

diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index a99a94839..a49342e78 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{2020.08.09 19:51}
+\newcontextversion{2020.08.09 22:00}
 
 %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 36fc68da8..f3a860662 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{2020.08.09 19:51}
+\edef\contextversion{2020.08.09 22:00}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/mkii/mult-pe.mkii b/tex/context/base/mkii/mult-pe.mkii
index dee01466f..e2249033a 100644
--- a/tex/context/base/mkii/mult-pe.mkii
+++ b/tex/context/base/mkii/mult-pe.mkii
@@ -634,6 +634,7 @@
 \setinterfaceconstant{afterkey}{بعدازکلید}
 \setinterfaceconstant{aftersection}{aftersection}
 \setinterfaceconstant{align}{تنظیم}
+\setinterfaceconstant{alignbottom}{alignbottom}
 \setinterfaceconstant{aligncharacter}{حرف‌تنظیم}
 \setinterfaceconstant{alignmentcharacter}{حرف‌تنظیم‌کردن}
 \setinterfaceconstant{alignmentleftsample}{alignmentleftsample}
@@ -953,6 +954,7 @@
 \setinterfaceconstant{limittext}{مرزمتن}
 \setinterfaceconstant{line}{خط}
 \setinterfaceconstant{linecorrection}{تصحیح‌خط}
+\setinterfaceconstant{linedirection}{linedirection}
 \setinterfaceconstant{lines}{خطها}
 \setinterfaceconstant{list}{لیست}
 \setinterfaceconstant{listtext}{متن‌لیست}
diff --git a/tex/context/base/mkiv/cldf-lmt.lmt b/tex/context/base/mkiv/cldf-lmt.lmt
index a9e312423..d53abc444 100644
--- a/tex/context/base/mkiv/cldf-lmt.lmt
+++ b/tex/context/base/mkiv/cldf-lmt.lmt
@@ -729,7 +729,7 @@ context.indexedtables = context.hashedtables
 -- we don't bother. Providing \ifbitwiseand makes sense for performance reasons as
 -- if a bit beter than testing the bitwise and with an \ifcase.
 
-local reporterror = logs.reporterror
+local reporterror = logs.texerrormessage
 
 local function youcant(cmd)
     reporterror("you can't use \\%s this way, it's an integer value", cmd)
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 5a5e0acb5..e3523284e 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{2020.08.09 19:51}
+\newcontextversion{2020.08.09 22:00}
 
 %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 0a7c70fe9..ad7844715 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{2020.08.09 19:51}
+\edef\contextversion{2020.08.09 22:00}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/context.mkxl b/tex/context/base/mkiv/context.mkxl
index 531cea7b3..2d67ceca0 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{2020.08.09 19:51}
+\edef\contextversion{2020.08.09 22:00}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index d5418eb8e..622a6ffe8 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 9ce114508..a23a64b94 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.lmt b/tex/context/base/mkiv/supp-box.lmt
index ac04e5b08..96e0330e5 100644
--- a/tex/context/base/mkiv/supp-box.lmt
+++ b/tex/context/base/mkiv/supp-box.lmt
@@ -978,9 +978,7 @@ do
 
     -- todo: make helper that formats
 
-    local function reporterror(fmt,...)
-        tex.error(string.formatters[fmt](...))
-    end
+    local reporterror = logs.texerrormessage
 
     -- The first variant did a linear lookup but for large boxes and lots of
     -- analysis that is not nice. Okay, in practice performance is quite ok
diff --git a/tex/context/base/mkiv/trac-log.lua b/tex/context/base/mkiv/trac-log.lua
index d20a974e1..142d8baa3 100644
--- a/tex/context/base/mkiv/trac-log.lua
+++ b/tex/context/base/mkiv/trac-log.lua
@@ -1031,14 +1031,14 @@ if utilities then
     utilities.report = report_system
 end
 
-if tex and tex.error then
+do
+    local texerror   = tex and tex.error or print
+    local formatters = string.formatters
+
     function logs.texerrormessage(...) -- for the moment we put this function here
-        tex.error(format(...))
-    end
-else
-    function logs.texerrormessage(...)
-        print(format(...))
+        texerror(first and formatters[fmt](first,...) or fmt)
     end
+
 end
 
 -- this is somewhat slower but prevents out-of-order messages when print is mixed
@@ -1154,16 +1154,3 @@ if tex then
     end
 
 end
-
--- for now ... maybe directly but now we get the context too
-
-if tex.error then
-
-    local texerror   = tex.error
-    local formatters = string.formatters
-
-    function logs.reporterror(fmt,first,...)
-        texerror(first and formatters[fmt](first,...) or fmt)
-    end
-
-end
diff --git a/tex/context/interface/mkii/keys-pe.xml b/tex/context/interface/mkii/keys-pe.xml
index 3535589e7..db02305c6 100644
--- a/tex/context/interface/mkii/keys-pe.xml
+++ b/tex/context/interface/mkii/keys-pe.xml
@@ -640,6 +640,7 @@
 		<cd:constant name='afterkey' value='بعدازکلید'/>
 		<cd:constant name='aftersection' value='aftersection'/>
 		<cd:constant name='align' value='تنظیم'/>
+		<cd:constant name='alignbottom' value='alignbottom'/>
 		<cd:constant name='aligncharacter' value='حرف‌تنظیم'/>
 		<cd:constant name='alignmentcharacter' value='حرف‌تنظیم‌کردن'/>
 		<cd:constant name='alignmentleftsample' value='alignmentleftsample'/>
@@ -959,6 +960,7 @@
 		<cd:constant name='limittext' value='مرزمتن'/>
 		<cd:constant name='line' value='خط'/>
 		<cd:constant name='linecorrection' value='تصحیح‌خط'/>
+		<cd:constant name='linedirection' value='linedirection'/>
 		<cd:constant name='lines' value='خطها'/>
 		<cd:constant name='list' value='لیست'/>
 		<cd:constant name='listtext' value='متن‌لیست'/>
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 80395bca2..0f858f950 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  : 2020-08-09 19:51
+-- merge date  : 2020-08-09 22:00
 
 do -- begin closure to overcome local limits and interference