summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/cont-new.mkii2
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4140 -> 4148 bytes
-rw-r--r--tex/context/base/context-version.pngbin40423 -> 40637 bytes
-rw-r--r--tex/context/base/context.mkii2
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/math-ini.lua127
-rw-r--r--tex/context/base/status-files.pdfbin24577 -> 24595 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin196318 -> 196320 bytes
-rw-r--r--tex/context/base/typo-del.mkiv4
-rw-r--r--tex/context/base/typo-itc.mkvi2
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
12 files changed, 47 insertions, 96 deletions
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 55a20ddcd..4248e3d70 100644
--- a/tex/context/base/cont-new.mkii
+++ b/tex/context/base/cont-new.mkii
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\newcontextversion{2012.11.12 17:10}
+\newcontextversion{2012.11.14 11:37}
%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/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index a5fb2b741..fae4ce095 100644
--- a/tex/context/base/cont-new.mkiv
+++ b/tex/context/base/cont-new.mkiv
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\newcontextversion{2012.11.12 17:10}
+\newcontextversion{2012.11.14 11:37}
%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/context-version.pdf b/tex/context/base/context-version.pdf
index 9cf5a7f51..57902b179 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
Binary files differ
diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png
index 0eaf7b69f..c9adb2c42 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
Binary files differ
diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii
index 2da64623f..d97023628 100644
--- a/tex/context/base/context.mkii
+++ b/tex/context/base/context.mkii
@@ -20,7 +20,7 @@
%D your styles an modules.
\edef\contextformat {\jobname}
-\edef\contextversion{2012.11.12 17:10}
+\edef\contextversion{2012.11.14 11:37}
%D For those who want to use this:
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 7477fe0ae..b5885fe57 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -25,7 +25,7 @@
%D up and the dependencies are more consistent.
\edef\contextformat {\jobname}
-\edef\contextversion{2012.11.12 17:10}
+\edef\contextversion{2012.11.14 11:37}
%D For those who want to use this:
diff --git a/tex/context/base/math-ini.lua b/tex/context/base/math-ini.lua
index c84a92aee..632bd0bbc 100644
--- a/tex/context/base/math-ini.lua
+++ b/tex/context/base/math-ini.lua
@@ -153,100 +153,47 @@ end
local escapes = characters.filters.utf.private.escapes
-local setmathcharacter, setmathsynonym, setmathsymbol -- once updated we will inline them
+-- not that many so no need to reuse tables
--- beware ... we only set the math character once ... which is why we
--- have the 'done' checking below
-
-if setmathcode then
-
- setmathcharacter = function(class,family,slot,unicode)
- if class <= 7 then
- setmathcode(slot,{class,family,unicode or slot})
- end
+local setmathcharacter = function(class,family,slot,unicode)
+ if class <= 7 then
+ setmathcode(slot,{class,family,unicode or slot})
end
+end
- setmathsynonym = function(class,family,slot,unicode,setcode)
- if setcode and class <= 7 then
- setmathcode(slot,{class,family,unicode})
- end
- if class == classes.open or class == classes.close then
- setdelcode(slot,{family,unicode,0,0})
- end
+local setmathsynonym = function(class,family,slot,unicode,setcode)
+ if setcode and class <= 7 then
+ setmathcode("global",slot,{class,family,unicode})
end
-
- setmathsymbol = function(name,class,family,slot) -- hex is nicer for tracing
- if class == classes.accent then
- contextsprint(format([[\ugdef\%s{\Umathaccent 0 "%X "%X }]],name,family,slot))
- elseif class == classes.topaccent then
- contextsprint(format([[\ugdef\%s{\Umathaccent 0 "%X "%X }]],name,family,slot))
- elseif class == classes.botaccent then
- contextsprint(format([[\ugdef\%s{\Umathbotaccent 0 "%X "%X }]],name,family,slot))
- elseif class == classes.over then
- contextsprint(format([[\ugdef\%s{\Udelimiterover "%X "%X }]],name,family,slot))
- elseif class == classes.under then
- contextsprint(format([[\ugdef\%s{\Udelimiterunder "%X "%X }]],name,family,slot))
- elseif class == classes.open or class == classes.close then
- setdelcode(slot,{family,slot,0,0})
- contextsprint(format([[\ugdef\%s{\Udelimiter "%X "%X "%X }]],name,class,family,slot))
- elseif class == classes.delimiter then
- setdelcode(slot,{family,slot,0,0})
- contextsprint(format([[\ugdef\%s{\Udelimiter 0 "%X "%X }]],name,family,slot))
- elseif class == classes.radical then
- contextsprint(format([[\ugdef\%s{\Uradical "%X "%X }]],name,family,slot))
- else
- -- beware, open/close and other specials should not end up here
- -- contextsprint(format([[\ugdef\%s{\Umathchar "%X "%X "%X }]],name,class,family,slot))
- contextsprint(format([[\Umathchardef\%s "%X "%X "%X ]],name,class,family,slot))
- end
+ if class == classes.open or class == classes.close then
+ setdelcode("global",slot,{family,unicode,0,0})
end
+end
-else
-
- report_math("your version of luatex is to old")
-
- os.exit()
-
- -- setmathcharacter = function(class,family,slot,unicode)
- -- if class <= 7 then
- -- contextsprint(mathcode(slot,class,family,unicode or slot))
- -- end
- -- end
- --
- -- setmathsynonym = function(class,family,slot,unicode,setcode)
- -- if setcode and class <= 7 then
- -- contextsprint(mathcode(slot,class,family,unicode))
- -- end
- -- if class == classes.open or class == classes.close then
- -- contextsprint(delcode(slot,family,unicode))
- -- end
- -- end
- --
- -- setmathsymbol = function(name,class,family,slot)
- -- if class == classes.accent then
- -- contextsprint(format([[\uxdef\%s{%s}]],name,mathaccent(class,family,slot)))
- -- elseif class == classes.topaccent then
- -- contextsprint(format([[\uxdef\%s{%s}]],name,mathtopaccent(class,family,slot)))
- -- elseif class == classes.botaccent then
- -- contextsprint(format([[\uxdef\%s{%s}]],name,mathbotaccent(class,family,slot)))
- -- elseif class == classes.over then
- -- contextsprint(format([[\uxdef\%s{%s}]],name,mathtopdelimiter(class,family,slot)))
- -- elseif class == classes.under then
- -- contextsprint(format([[\uxdef\%s{%s}]],name,mathbotdelimiter(class,family,slot)))
- -- elseif class == classes.open or class == classes.close then
- -- contextsprint(delcode(slot,family,slot))
- -- contextsprint(format([[\uxdef\%s{%s}]],name,delimiter(class,family,slot)))
- -- elseif class == classes.delimiter then
- -- contextsprint(delcode(slot,family,slot))
- -- contextsprint(format([[\uxdef\%s{%s}]],name,delimiter(0,family,slot)))
- -- elseif class == classes.radical then
- -- contextsprint(format([[\uxdef\%s{%s}]],name,radical(family,slot)))
- -- else
- -- -- beware, open/close and other specials should not end up here
- -- contextsprint(format([[\uxdef\%s{%s}]],name,mathchar(class,family,slot)))
- -- end
- -- end
-
+local setmathsymbol = function(name,class,family,slot) -- hex is nicer for tracing
+ if class == classes.accent then
+ contextsprint(format([[\ugdef\%s{\Umathaccent 0 "%X "%X }]],name,family,slot))
+ elseif class == classes.topaccent then
+ contextsprint(format([[\ugdef\%s{\Umathaccent 0 "%X "%X }]],name,family,slot))
+ elseif class == classes.botaccent then
+ contextsprint(format([[\ugdef\%s{\Umathbotaccent 0 "%X "%X }]],name,family,slot))
+ elseif class == classes.over then
+ contextsprint(format([[\ugdef\%s{\Udelimiterover "%X "%X }]],name,family,slot))
+ elseif class == classes.under then
+ contextsprint(format([[\ugdef\%s{\Udelimiterunder "%X "%X }]],name,family,slot))
+ elseif class == classes.open or class == classes.close then
+ setdelcode(slot,{family,slot,0,0})
+ contextsprint(format([[\ugdef\%s{\Udelimiter "%X "%X "%X }]],name,class,family,slot))
+ elseif class == classes.delimiter then
+ setdelcode(slot,{family,slot,0,0})
+ contextsprint(format([[\ugdef\%s{\Udelimiter 0 "%X "%X }]],name,family,slot))
+ elseif class == classes.radical then
+ contextsprint(format([[\ugdef\%s{\Uradical "%X "%X }]],name,family,slot))
+ else
+ -- beware, open/close and other specials should not end up here
+ -- contextsprint(format([[\ugdef\%s{\Umathchar "%X "%X "%X }]],name,class,family,slot))
+ contextsprint(format([[\Umathchardef\%s "%X "%X "%X ]],name,class,family,slot))
+ end
end
local function report(class,family,unicode,name)
@@ -332,7 +279,9 @@ function mathematics.define(family)
if trace_defining then
report(class,family,unicode,name)
end
+if setcode then
setmathcharacter(class,family,unicode)
+end
else
name = name or character.contextname
if name then
@@ -345,7 +294,9 @@ function mathematics.define(family)
report(class,family,unicode,character.adobename)
end
end
+if setcode then
setmathcharacter(class,family,unicode,unicode)
+end
end
end
end
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index e61ed0c0c..c081ae5f3 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
Binary files differ
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index 095fedbc0..c8c9717c4 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files differ
diff --git a/tex/context/base/typo-del.mkiv b/tex/context/base/typo-del.mkiv
index 7c36ef3c8..ee5d76266 100644
--- a/tex/context/base/typo-del.mkiv
+++ b/tex/context/base/typo-del.mkiv
@@ -537,10 +537,10 @@
\def\typo_delimited_fontdriven_b
{\dostarttagged\t!delimited\currentdelimitedtext
- \languageparameter{\c!left\currentdelimitedtext}}
+ \languageparameter{\c!left\currentparentdelimitedtext}}% was: \currentdelimitedtext
\def\typo_delimited_fontdriven_e
- {\languageparameter{\c!right\currentdelimitedtext}%
+ {\languageparameter{\c!right\currentparentdelimitedtext}% was: \currentdelimitedtext
\dostoptagged
\typo_delimited_pop}
diff --git a/tex/context/base/typo-itc.mkvi b/tex/context/base/typo-itc.mkvi
index 809c7a252..4a3bba518 100644
--- a/tex/context/base/typo-itc.mkvi
+++ b/tex/context/base/typo-itc.mkvi
@@ -18,7 +18,7 @@
%D The brave might try:
%D
%D \starttyping
-%D \definefontfeature[default][default][itlc=yes,notextitalics=yes]
+%D \definefontfeature[default][default][itlc=yes,textitalics=yes]
%D \setupitaliccorrection[global,always]
%D \stoptyping
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index d0cab53a6..512d71faa 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 : luatex-fonts-merged.lua
-- parent file : luatex-fonts.lua
--- merge date : 11/12/12 17:10:25
+-- merge date : 11/14/12 11:37:52
do -- begin closure to overcome local limits and interference
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 22:32:37 +0000