summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--scripts/context/lua/mtxrun.lua23
-rw-r--r--scripts/context/stubs/mswin/mtxrun.lua23
-rw-r--r--scripts/context/stubs/unix/mtxrun23
-rw-r--r--scripts/context/stubs/win64/mtxrun.lua23
-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/mkii/mult-pe.mkii2
-rw-r--r--tex/context/base/mkiv/cldf-lmt.lmt2
-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/status-files.pdfbin28050 -> 28037 bytes
-rw-r--r--tex/context/base/mkiv/status-lua.pdfbin255013 -> 254999 bytes
-rw-r--r--tex/context/base/mkiv/supp-box.lmt4
-rw-r--r--tex/context/base/mkiv/trac-log.lua25
-rw-r--r--tex/context/interface/mkii/keys-pe.xml2
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
17 files changed, 46 insertions, 93 deletions
diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index d39161568..0e419a646 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -13080,7 +13080,7 @@ do -- create closure to overcome 200 locals limit
package.loaded["trac-log"] = package.loaded["trac-log"] or true
--- original size: 33280, stripped down to: 21854
+-- original size: 33025, stripped down to: 21687
if not modules then modules={} end modules ['trac-log']={
version=1.001,
@@ -13880,13 +13880,11 @@ end
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(...)
- tex.error(format(...))
- end
-else
- function logs.texerrormessage(...)
- print(format(...))
+ texerror(first and formatters[fmt](first,...) or fmt)
end
end
if package.helpers.report then
@@ -13978,13 +13976,6 @@ if tex then
end
end
end
-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
end -- of closure
@@ -26198,8 +26189,8 @@ end -- of closure
-- used libraries : l-bit32.lua l-lua.lua l-macro.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-sha.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua util-soc-imp-reset.lua util-soc-imp-socket.lua util-soc-imp-copas.lua util-soc-imp-ltn12.lua util-soc-imp-mime.lua util-soc-imp-url.lua util-soc-imp-headers.lua util-soc-imp-tp.lua util-soc-imp-http.lua util-soc-imp-ftp.lua util-soc-imp-smtp.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua util-zip.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua libs-ini.lua luat-sta.lua luat-fmt.lua
-- skipped libraries : -
--- original bytes : 1040573
--- stripped bytes : 410989
+-- original bytes : 1040318
+-- stripped bytes : 410901
-- end library merge
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index d39161568..0e419a646 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -13080,7 +13080,7 @@ do -- create closure to overcome 200 locals limit
package.loaded["trac-log"] = package.loaded["trac-log"] or true
--- original size: 33280, stripped down to: 21854
+-- original size: 33025, stripped down to: 21687
if not modules then modules={} end modules ['trac-log']={
version=1.001,
@@ -13880,13 +13880,11 @@ end
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(...)
- tex.error(format(...))
- end
-else
- function logs.texerrormessage(...)
- print(format(...))
+ texerror(first and formatters[fmt](first,...) or fmt)
end
end
if package.helpers.report then
@@ -13978,13 +13976,6 @@ if tex then
end
end
end
-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
end -- of closure
@@ -26198,8 +26189,8 @@ end -- of closure
-- used libraries : l-bit32.lua l-lua.lua l-macro.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-sha.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua util-soc-imp-reset.lua util-soc-imp-socket.lua util-soc-imp-copas.lua util-soc-imp-ltn12.lua util-soc-imp-mime.lua util-soc-imp-url.lua util-soc-imp-headers.lua util-soc-imp-tp.lua util-soc-imp-http.lua util-soc-imp-ftp.lua util-soc-imp-smtp.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua util-zip.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua libs-ini.lua luat-sta.lua luat-fmt.lua
-- skipped libraries : -
--- original bytes : 1040573
--- stripped bytes : 410989
+-- original bytes : 1040318
+-- stripped bytes : 410901
-- end library merge
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index d39161568..0e419a646 100644
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -13080,7 +13080,7 @@ do -- create closure to overcome 200 locals limit
package.loaded["trac-log"] = package.loaded["trac-log"] or true
--- original size: 33280, stripped down to: 21854
+-- original size: 33025, stripped down to: 21687
if not modules then modules={} end modules ['trac-log']={
version=1.001,
@@ -13880,13 +13880,11 @@ end
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(...)
- tex.error(format(...))
- end
-else
- function logs.texerrormessage(...)
- print(format(...))
+ texerror(first and formatters[fmt](first,...) or fmt)
end
end
if package.helpers.report then
@@ -13978,13 +13976,6 @@ if tex then
end
end
end
-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
end -- of closure
@@ -26198,8 +26189,8 @@ end -- of closure
-- used libraries : l-bit32.lua l-lua.lua l-macro.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-sha.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua util-soc-imp-reset.lua util-soc-imp-socket.lua util-soc-imp-copas.lua util-soc-imp-ltn12.lua util-soc-imp-mime.lua util-soc-imp-url.lua util-soc-imp-headers.lua util-soc-imp-tp.lua util-soc-imp-http.lua util-soc-imp-ftp.lua util-soc-imp-smtp.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua util-zip.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua libs-ini.lua luat-sta.lua luat-fmt.lua
-- skipped libraries : -
--- original bytes : 1040573
--- stripped bytes : 410989
+-- original bytes : 1040318
+-- stripped bytes : 410901
-- end library merge
diff --git a/scripts/context/stubs/win64/mtxrun.lua b/scripts/context/stubs/win64/mtxrun.lua
index d39161568..0e419a646 100644
--- a/scripts/context/stubs/win64/mtxrun.lua
+++ b/scripts/context/stubs/win64/mtxrun.lua
@@ -13080,7 +13080,7 @@ do -- create closure to overcome 200 locals limit
package.loaded["trac-log"] = package.loaded["trac-log"] or true
--- original size: 33280, stripped down to: 21854
+-- original size: 33025, stripped down to: 21687
if not modules then modules={} end modules ['trac-log']={
version=1.001,
@@ -13880,13 +13880,11 @@ end
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(...)
- tex.error(format(...))
- end
-else
- function logs.texerrormessage(...)
- print(format(...))
+ texerror(first and formatters[fmt](first,...) or fmt)
end
end
if package.helpers.report then
@@ -13978,13 +13976,6 @@ if tex then
end
end
end
-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
end -- of closure
@@ -26198,8 +26189,8 @@ end -- of closure
-- used libraries : l-bit32.lua l-lua.lua l-macro.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-sha.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua util-soc-imp-reset.lua util-soc-imp-socket.lua util-soc-imp-copas.lua util-soc-imp-ltn12.lua util-soc-imp-mime.lua util-soc-imp-url.lua util-soc-imp-headers.lua util-soc-imp-tp.lua util-soc-imp-http.lua util-soc-imp-ftp.lua util-soc-imp-smtp.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua util-zip.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua libs-ini.lua luat-sta.lua luat-fmt.lua
-- skipped libraries : -
--- original bytes : 1040573
--- stripped bytes : 410989
+-- original bytes : 1040318
+-- stripped bytes : 410901
-- end library merge
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
Binary files differ
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
Binary files differ
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 20:21:01 +0000