summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
Diffstat (limited to 'tex')
-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/mkiv/cont-new.mkiv2
-rw-r--r--tex/context/base/mkiv/context.mkiv4
-rw-r--r--tex/context/base/mkiv/core-lmt.lua36
-rw-r--r--tex/context/base/mkiv/core-lmt.mkiv28
-rw-r--r--tex/context/base/mkiv/math-ini.mkiv15
-rw-r--r--tex/context/base/mkiv/math-noa.lua48
-rw-r--r--tex/context/base/mkiv/status-files.pdfbin26044 -> 26314 bytes
-rw-r--r--tex/context/base/mkiv/status-lua.pdfbin269733 -> 235069 bytes
-rw-r--r--tex/context/base/mkiv/task-ini.lua1
-rw-r--r--tex/context/interface/mkiv/i-context.pdfbin864303 -> 913340 bytes
-rw-r--r--tex/context/interface/mkiv/i-readme.pdfbin60774 -> 25099 bytes
-rw-r--r--tex/context/modules/common/s-abbreviations-logos.tex1
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
15 files changed, 136 insertions, 5 deletions
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index 085361adc..38a56df30 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{2018.12.18 10:18}
+\newcontextversion{2018.12.19 18:48}
%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 0d4efe32d..ba45fd7fd 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{2018.12.18 10:18}
+\edef\contextversion{2018.12.19 18:48}
%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 288fadb55..fca09d204 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{2018.12.18 10:18}
+\newcontextversion{2018.12.19 18:48}
%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 8f4755092..26a200599 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{2018.12.18 10:18}
+\edef\contextversion{2018.12.19 18:48}
\edef\contextkind {beta}
%D For those who want to use this:
@@ -134,6 +134,8 @@
\loadmkvifile{file-res}
\loadmkvifile{file-lib}
+\doifelsefileexists{core-lmt.mkiv}{\loadmarkfile{core-lmt}}{}
+
\loadmarkfile{supp-dir}
\loadmarkfile{char-utf} % generic code (i.e. not much tex) ... could become unic-ini
diff --git a/tex/context/base/mkiv/core-lmt.lua b/tex/context/base/mkiv/core-lmt.lua
new file mode 100644
index 000000000..2f4f43116
--- /dev/null
+++ b/tex/context/base/mkiv/core-lmt.lua
@@ -0,0 +1,36 @@
+if not modules then modules = { } end modules ['core-lmt'] = {
+ version = 1.001,
+ comment = "companion to core-lmt.mkiv",
+ author = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
+ copyright = "PRAGMA ADE / ConTeXt Development Team",
+ license = "see context related readme files"
+}
+
+local implement = interfaces.implement
+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)
+ if scankeyword("tlt") then
+ what(0)
+ elseif scankeyword("trt") then
+ what(1)
+ elseif scankeyword("rtt") then
+ what(2)
+ elseif scankeyword("ltl") then
+ what(3)
+ end
+end
+
+implement { name = "textdir", public = true, protected = true, actions = function() scandir(settextdir) end }
+implement { name = "linedir", public = true, protected = true, actions = function() scandir(setlinedir) end }
+implement { name = "pagedir", public = true, protected = true, actions = function() scandir(setpagedir) end }
+implement { name = "pardir", public = true, protected = true, actions = function() scandir(setpardir) end }
+implement { name = "bodydir", public = true, protected = true, actions = function() scandir(setbodydir) end }
+implement { name = "boxdir", public = true, protected = true, actions = function() scandir(setboxdir) end }
diff --git a/tex/context/base/mkiv/core-lmt.mkiv b/tex/context/base/mkiv/core-lmt.mkiv
new file mode 100644
index 000000000..72199f854
--- /dev/null
+++ b/tex/context/base/mkiv/core-lmt.mkiv
@@ -0,0 +1,28 @@
+%D \module
+%D [ file=core-lmt,
+%D version=2010.08.2,
+%D title=\CONTEXT\ System Macros,
+%D subtitle=Primitives,
+%D author=Hans Hagen,
+%D date=\currentdate,
+%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+\writestatus{loading}{ConTeXt System Macros / Primitives}
+
+\registerctxluafile{core-lmt}{}
+
+\unprotect
+
+% nothing yet
+
+\protect \endinput
+
+% \starttext
+% abc{\textdir TRTdef}ghi
+% abc{\textdir trtdef}ghi
+% \boxdirection0=1
+% \stoptext
diff --git a/tex/context/base/mkiv/math-ini.mkiv b/tex/context/base/mkiv/math-ini.mkiv
index ce0b37f4a..02fbf7db5 100644
--- a/tex/context/base/mkiv/math-ini.mkiv
+++ b/tex/context/base/mkiv/math-ini.mkiv
@@ -123,6 +123,7 @@
\definesystemattribute[mathbidi] [public]
\definesystemattribute[mathdomain] [public]
\definesystemattribute[mathcollapsing] [public]
+\definesystemattribute[mathunstack] [public]
\definesystemattribute[displaymath] [public]
@@ -2867,6 +2868,20 @@
% \let\b\math_b
% \to \everymathematics
+%D Experiment
+
+\unexpanded\def\math_scripts_stack
+ {\mathunstackattribute\attributeunsetvalue}
+
+\unexpanded\def\math_scripts_unstack
+ {\clf_enablescriptunstacking
+ \mathunstackattribute\plusone}
+
+\appendtoks
+ \let\stackscripts \math_scripts_stack
+ \let\unstackscripts\math_scripts_unstack
+\to \everymathematics
+
\protect \endinput
% % not used (yet)
diff --git a/tex/context/base/mkiv/math-noa.lua b/tex/context/base/mkiv/math-noa.lua
index 0ff189e06..5cf367fba 100644
--- a/tex/context/base/mkiv/math-noa.lua
+++ b/tex/context/base/mkiv/math-noa.lua
@@ -1114,6 +1114,18 @@ do
setnext(stop_super)
end
if start_sub then
+
+-- if mode == "sub" then
+-- local sup = getsup(pointer)
+-- if sup and not getsub(pointer) then
+-- local nxt = getnext(pointer)
+-- local new = new_noad(pointer)
+-- setnucleus(new,new_submlist())
+-- setlink(pointer,new,nxt)
+-- pointer = new
+-- end
+-- end
+
if start_sub == stop_sub then
setsub(pointer,getnucleus(start_sub))
else
@@ -1140,6 +1152,42 @@ end
do
+ local unstack = { } noads.processors.unstack = unstack
+ local enabled = false
+
+ unstack[math_noad] = function(pointer,what,n,parent)
+ local sup = getsup(pointer)
+ local sub = getsub(pointer)
+ if sup and sub then
+ local nxt = getnext(pointer)
+ local new = new_noad(pointer)
+ setnucleus(new,new_submlist())
+ setsub(pointer)
+ setsub(new,sub)
+ setlink(pointer,new,nxt)
+ end
+ end
+
+ function handlers.unstack(head,style,penalties)
+ if enabled then
+ processnoads(head,unstack,"unstack")
+ return true -- not needed
+ end
+ end
+
+ implement {
+ name = "enablescriptunstacking",
+ onlyonce = true,
+ actions = function()
+ enableaction("math","noads.handlers.unstack")
+ enabled = true
+ end
+ }
+
+end
+
+do
+
local function collected(list)
if list and next(list) then
local n, t = 0, { }
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 9250cabc2..0a1fce1b6 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 a3280cc06..d7867f11e 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/task-ini.lua b/tex/context/base/mkiv/task-ini.lua
index 67a17109d..b7554c7cb 100644
--- a/tex/context/base/mkiv/task-ini.lua
+++ b/tex/context/base/mkiv/task-ini.lua
@@ -95,6 +95,7 @@ appendaction("shipouts", "wrapup", "luatex.synctex.collect",
appendaction("math", "normalizers", "noads.handlers.showtree", nil, "nonut", "disabled" )
appendaction("math", "normalizers", "noads.handlers.unscript", nil, "nonut", "enabled" )
+appendaction("math", "normalizers", "noads.handlers.unstack", nil, "nonut", "disabled" )
appendaction("math", "normalizers", "noads.handlers.variants", nil, "nonut", "enabled" )
appendaction("math", "normalizers", "noads.handlers.relocate", nil, "nonut", "enabled" )
appendaction("math", "normalizers", "noads.handlers.families", nil, "nonut", "enabled" )
diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf
index 60550d0b5..972cfe4e4 100644
--- a/tex/context/interface/mkiv/i-context.pdf
+++ b/tex/context/interface/mkiv/i-context.pdf
Binary files differ
diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf
index bbe47a8c6..7e88b757a 100644
--- a/tex/context/interface/mkiv/i-readme.pdf
+++ b/tex/context/interface/mkiv/i-readme.pdf
Binary files differ
diff --git a/tex/context/modules/common/s-abbreviations-logos.tex b/tex/context/modules/common/s-abbreviations-logos.tex
index 8cc342cc4..00719a668 100644
--- a/tex/context/modules/common/s-abbreviations-logos.tex
+++ b/tex/context/modules/common/s-abbreviations-logos.tex
@@ -206,6 +206,7 @@
\logo [OTEX] {Oriental \TeXsuffix}
\logo [OTF] {otf}
\logo [OTP] {otp}
+\logo [OSX] {os-x}
\logo [OVF] {ovf}
\logo [PASCAL] {Pascal}
\logo [PCTEX] {pc\TeXsuffix}
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 274c4abcf..f0ca93b49 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 : 12/18/18 10:18:15
+-- merge date : 12/19/18 18:48:37
do -- begin closure to overcome local limits and interference
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 03:00:50 +0000