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.pdfbin4069 -> 4074 bytes
-rw-r--r--tex/context/base/context-version.pngbin104586 -> 105052 bytes
-rw-r--r--tex/context/base/context.mkii2
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/lxml-tex.lua58
-rw-r--r--tex/context/base/status-files.pdfbin24290 -> 24305 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin178850 -> 178939 bytes
-rw-r--r--tex/context/base/strc-con.mkvi17
-rw-r--r--tex/context/base/type-imp-xits.mkiv9
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
12 files changed, 53 insertions, 41 deletions
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 2cdbdb2cc..de3c84ebe 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.05.22 01:22}
+\newcontextversion{2012.05.22 14:04}
%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 462c58037..03c8e9d30 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.05.22 01:22}
+\newcontextversion{2012.05.22 14:04}
%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/context-version.pdf b/tex/context/base/context-version.pdf
index 0077d3618..c58880a55 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 1ff16a0eb..953d7a812 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 6377f0513..f6acae843 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.05.22 01:22}
+\edef\contextversion{2012.05.22 14:04}
%D For those who want to use this:
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 6f60b734c..fcfa08152 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -23,7 +23,7 @@
%D up and the dependencies are more consistent.
\edef\contextformat {\jobname}
-\edef\contextversion{2012.05.22 01:22}
+\edef\contextversion{2012.05.22 14:04}
%D For those who want to use this:
diff --git a/tex/context/base/lxml-tex.lua b/tex/context/base/lxml-tex.lua
index 22f989805..0b21e0a9c 100644
--- a/tex/context/base/lxml-tex.lua
+++ b/tex/context/base/lxml-tex.lua
@@ -148,6 +148,9 @@ local finalizers = xml.finalizers
finalizers.xml = finalizers.xml or { }
finalizers.tex = finalizers.tex or { }
+local xmlfinalizers = finalizers.xml
+local texfinalizers = finalizers.tex
+
-- serialization with entity handling
local ampersand = P("&")
@@ -1009,8 +1012,6 @@ end
-- finalizers
-local finalizers = xml.finalizers.tex
-
local function first(collected)
if collected and #collected > 0 then
xmlsprint(collected[1])
@@ -1248,30 +1249,30 @@ local function concat(collected,separator,lastseparator,textonly) -- test this o
concatrange(collected,false,false,separator,lastseparator,textonly)
end
-finalizers.first = first
-finalizers.last = last
-finalizers.all = all
-finalizers.reverse = reverse
-finalizers.count = count
-finalizers.command = command
-finalizers.attribute = attribute
-finalizers.text = text
-finalizers.stripped = stripped
-finalizers.lower = lower
-finalizers.upper = upper
-finalizers.ctxtext = ctxtext
-finalizers.context = ctxtext
-finalizers.position = position
-finalizers.match = match
-finalizers.index = index
-finalizers.concat = concat
-finalizers.concatrange = concatrange
-finalizers.chainattribute = chainattribute
-finalizers.default = all -- !!
+texfinalizers.first = first
+texfinalizers.last = last
+texfinalizers.all = all
+texfinalizers.reverse = reverse
+texfinalizers.count = count
+texfinalizers.command = command
+texfinalizers.attribute = attribute
+texfinalizers.text = text
+texfinalizers.stripped = stripped
+texfinalizers.lower = lower
+texfinalizers.upper = upper
+texfinalizers.ctxtext = ctxtext
+texfinalizers.context = ctxtext
+texfinalizers.position = position
+texfinalizers.match = match
+texfinalizers.index = index
+texfinalizers.concat = concat
+texfinalizers.concatrange = concatrange
+texfinalizers.chainattribute = chainattribute
+texfinalizers.default = all -- !!
local concat = table.concat
-function finalizers.tag(collected,n)
+function texfinalizers.tag(collected,n)
if collected then
local nc = #collected
if nc > 0 then
@@ -1291,7 +1292,7 @@ function finalizers.tag(collected,n)
end
end
-function finalizers.name(collected,n)
+function texfinalizers.name(collected,n)
if collected then
local nc = #collected
if nc > 0 then
@@ -1314,7 +1315,7 @@ function finalizers.name(collected,n)
end
end
-function finalizers.tags(collected,nonamespace)
+function texfinalizers.tags(collected,nonamespace)
if collected then
local nc = #collected
if nc > 0 then
@@ -1636,7 +1637,7 @@ lxml.get_id = getid lxml.obsolete.get_id = getid
-- goodies:
-function xml.finalizers.tex.lettered(collected)
+function texfinalizers.lettered(collected)
if collected then
local nc = #collected
if nc > 0 then
@@ -1647,7 +1648,7 @@ function xml.finalizers.tex.lettered(collected)
end
end
---~ function xml.finalizers.tex.apply(collected,what) -- to be tested
+--~ function texfinalizers.apply(collected,what) -- to be tested
--~ if collected then
--~ for c=1,#collected do
--~ contextsprint(ctxcatcodes,what(collected[c].dt[1]))
@@ -1682,3 +1683,6 @@ function lxml.tofile(id,pattern,filename,comment)
os.remove(filename) -- get rid of old content
end
end
+
+texfinalizers.upperall = xmlfinalizers.upperall
+texfinalizers.lowerall = xmlfinalizers.lowerall
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index a8dc4b054..23e0f7efc 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 056f5e83f..a367374b3 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files differ
diff --git a/tex/context/base/strc-con.mkvi b/tex/context/base/strc-con.mkvi
index cc4278b1e..220de809a 100644
--- a/tex/context/base/strc-con.mkvi
+++ b/tex/context/base/strc-con.mkvi
@@ -233,7 +233,10 @@
\constructionparameter\c!before
\begingroup
\edef\currentconstructionalternative{\constructionparameter\c!alternative}%
- \checkconstructionalternativeparent % this catches an unknown alternative
+ % \checkconstructionalternativeparent % this catches an unknown alternative
+ \doifnotsetups{\constructionalternativeparameter\c!renderingsetup}
+ {\letconstructionparameter\c!alternative\v!left
+ \let\currentconstructionalternative\v!left}%
\doadaptleftskip{\constructionparameter\c!margin}%
\setlocalhsize % so we can use \localhsize in width assignments
\constructionsheaddistance\constructionalternativeparameter\c!distance\relax
@@ -258,9 +261,11 @@
\setbox\constructionheadbox\hbox
{\forgetall
\dontcomplain
- \doifelse{\constructionparameter\c!alternative}\v!serried % brrr, hack, will change
- {\csname\??constructionmainhandler\currentconstructionhandler\endcsname\currentconstructiontext}
- {\csname\??constructionmainhandler\currentconstructionhandler\endcsname{\boxedconstructionhead\currentconstructiontext}}}%
+ \ifx\currentconstructionalternative\v!serried % brrr, hack, will change
+ \csname\??constructionmainhandler\currentconstructionhandler\endcsname\currentconstructiontext
+ \else
+ \csname\??constructionmainhandler\currentconstructionhandler\endcsname{\boxedconstructionhead\currentconstructiontext}%
+ \fi}%
\doifelse{\constructionparameter\c!aligntitle}\v!no
{\leftconstructionskip \leftskip
\rightconstructionskip\rightskip}
@@ -277,8 +282,8 @@
\fi
\strc_constructions_close_symbol_reset
%
- \doifnotsetups {\constructionalternativeparameter\c!renderingsetup}
- {\let\currentconstructionalternative\v!left}%
+ % \doifnotsetups {\constructionalternativeparameter\c!renderingsetup}
+ % {\let\currentconstructionalternative\v!left}%
\directsetup{\constructionalternativeparameter\c!renderingsetup}\relax
%
\dostoptagged % tag
diff --git a/tex/context/base/type-imp-xits.mkiv b/tex/context/base/type-imp-xits.mkiv
index 5a0c4d153..cf3856eae 100644
--- a/tex/context/base/type-imp-xits.mkiv
+++ b/tex/context/base/type-imp-xits.mkiv
@@ -23,9 +23,12 @@
\starttypescript [\s!math] [xits,xitsbidi] [\s!name]
\loadfontgoodies[xits-math]
- \definefontsynonym[\s!MathRoman ][\s!file:xits-math.otf][\s!features=\s!math\mathsizesuffix,\s!goodies=xits-math]
- \definefontsynonym[\s!MathRoman L2R][\s!file:xits-math.otf][\s!features=\s!math\mathsizesuffix-l2r,\s!goodies=xits-math]
- \definefontsynonym[\s!MathRoman R2L][\s!file:xits-math.otf][\s!features=\s!math\mathsizesuffix-r2l,\s!goodies=xits-math]
+ \definefontsynonym[\s!MathRoman ][\s!file:xits-math.otf] [\s!features=\s!math\mathsizesuffix,\s!goodies=xits-math]
+ \definefontsynonym[\s!MathRoman L2R][\s!file:xits-math.otf] [\s!features=\s!math\mathsizesuffix-l2r,\s!goodies=xits-math]
+ \definefontsynonym[\s!MathRoman R2L][\s!file:xits-math.otf] [\s!features=\s!math\mathsizesuffix-r2l,\s!goodies=xits-math]
+ \definefontsynonym[\s!MathBold ][\s!file:xits-mathbold.otf][\s!features=\s!math\mathsizesuffix,\s!goodies=xits-math]
+ \definefontsynonym[\s!MathBold L2R][\s!file:xits-mathbold.otf][\s!features=\s!math\mathsizesuffix-l2r,\s!goodies=xits-math]
+ \definefontsynonym[\s!MathBold R2L][\s!file:xits-mathbold.otf][\s!features=\s!math\mathsizesuffix-r2l,\s!goodies=xits-math]
\stoptypescript
\starttypescript [\s!serif] [xits] [\s!name]
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 51988e521..27b45ba71 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 : 05/22/12 01:22:21
+-- merge date : 05/22/12 14:04:45
do -- begin closure to overcome local limits and interference
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 15:39:20 +0000