summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--scripts/context/lua/mtxrun.lua34
-rw-r--r--scripts/context/stubs/mswin/mtxrun.lua34
-rw-r--r--scripts/context/stubs/unix/mtxrun34
-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.pdfbin4074 -> 4067 bytes
-rw-r--r--tex/context/base/context-version.pngbin106150 -> 106233 bytes
-rw-r--r--tex/context/base/context.mkii2
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/lxml-aux.lua34
-rw-r--r--tex/context/base/mult-aux.lua2
-rw-r--r--tex/context/base/status-files.pdfbin23993 -> 24026 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin169692 -> 169688 bytes
-rw-r--r--tex/context/base/strc-itm.mkvi6
-rw-r--r--tex/context/base/tabl-tbl.mkiv34
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
16 files changed, 118 insertions, 70 deletions
diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index 01219f0ab..175263748 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -9664,18 +9664,30 @@ local function copiedelement(element,newparent)
end
function xml.delete(root,pattern)
- local collected = xmlapplylpath(root,pattern)
- if collected then
- for c=1,#collected do
- local e = collected[c]
- local p = e.__p__
- if p then
- if trace_manipulations then
- report('deleting',pattern,c,e)
+ if not pattern or pattern == "" then
+ local p = root.__p__
+ if p then
+ if trace_manipulations then
+ report('deleting',"--",c,root)
+ end
+ local d = p.dt
+ remove(d,root.ni)
+ redo_ni(d) -- can be made faster and inlined
+ end
+ else
+ local collected = xmlapplylpath(root,pattern)
+ if collected then
+ for c=1,#collected do
+ local e = collected[c]
+ local p = e.__p__
+ if p then
+ if trace_manipulations then
+ report('deleting',pattern,c,e)
+ end
+ local d = p.dt
+ remove(d,e.ni)
+ redo_ni(d) -- can be made faster and inlined
end
- local d = p.dt
- remove(d,e.ni)
- redo_ni(d) -- can be made faster and inlined
end
end
end
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index 01219f0ab..175263748 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -9664,18 +9664,30 @@ local function copiedelement(element,newparent)
end
function xml.delete(root,pattern)
- local collected = xmlapplylpath(root,pattern)
- if collected then
- for c=1,#collected do
- local e = collected[c]
- local p = e.__p__
- if p then
- if trace_manipulations then
- report('deleting',pattern,c,e)
+ if not pattern or pattern == "" then
+ local p = root.__p__
+ if p then
+ if trace_manipulations then
+ report('deleting',"--",c,root)
+ end
+ local d = p.dt
+ remove(d,root.ni)
+ redo_ni(d) -- can be made faster and inlined
+ end
+ else
+ local collected = xmlapplylpath(root,pattern)
+ if collected then
+ for c=1,#collected do
+ local e = collected[c]
+ local p = e.__p__
+ if p then
+ if trace_manipulations then
+ report('deleting',pattern,c,e)
+ end
+ local d = p.dt
+ remove(d,e.ni)
+ redo_ni(d) -- can be made faster and inlined
end
- local d = p.dt
- remove(d,e.ni)
- redo_ni(d) -- can be made faster and inlined
end
end
end
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index 01219f0ab..175263748 100644
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -9664,18 +9664,30 @@ local function copiedelement(element,newparent)
end
function xml.delete(root,pattern)
- local collected = xmlapplylpath(root,pattern)
- if collected then
- for c=1,#collected do
- local e = collected[c]
- local p = e.__p__
- if p then
- if trace_manipulations then
- report('deleting',pattern,c,e)
+ if not pattern or pattern == "" then
+ local p = root.__p__
+ if p then
+ if trace_manipulations then
+ report('deleting',"--",c,root)
+ end
+ local d = p.dt
+ remove(d,root.ni)
+ redo_ni(d) -- can be made faster and inlined
+ end
+ else
+ local collected = xmlapplylpath(root,pattern)
+ if collected then
+ for c=1,#collected do
+ local e = collected[c]
+ local p = e.__p__
+ if p then
+ if trace_manipulations then
+ report('deleting',pattern,c,e)
+ end
+ local d = p.dt
+ remove(d,e.ni)
+ redo_ni(d) -- can be made faster and inlined
end
- local d = p.dt
- remove(d,e.ni)
- redo_ni(d) -- can be made faster and inlined
end
end
end
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index a6a4c706b..ae05abd03 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{2011.12.13 15:17}
+\newcontextversion{2011.12.14 00:20}
%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 cd8855bd9..1642f4648 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{2011.12.13 15:17}
+\newcontextversion{2011.12.14 00:20}
%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 4663b5c72..40c1335c8 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 6d51beecd..b31553735 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 7467753ba..8f41cda09 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{2011.12.13 15:17}
+\edef\contextversion{2011.12.14 00:20}
%D For those who want to use this:
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index a4b567738..3ee24df38 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -20,7 +20,7 @@
%D your styles an modules.
\edef\contextformat {\jobname}
-\edef\contextversion{2011.12.13 15:17}
+\edef\contextversion{2011.12.14 00:20}
%D For those who want to use this:
diff --git a/tex/context/base/lxml-aux.lua b/tex/context/base/lxml-aux.lua
index 4bcac4520..7df6179a0 100644
--- a/tex/context/base/lxml-aux.lua
+++ b/tex/context/base/lxml-aux.lua
@@ -200,18 +200,30 @@ local function copiedelement(element,newparent)
end
function xml.delete(root,pattern)
- local collected = xmlapplylpath(root,pattern)
- if collected then
- for c=1,#collected do
- local e = collected[c]
- local p = e.__p__
- if p then
- if trace_manipulations then
- report('deleting',pattern,c,e)
+ if not pattern or pattern == "" then
+ local p = root.__p__
+ if p then
+ if trace_manipulations then
+ report('deleting',"--",c,root)
+ end
+ local d = p.dt
+ remove(d,root.ni)
+ redo_ni(d) -- can be made faster and inlined
+ end
+ else
+ local collected = xmlapplylpath(root,pattern)
+ if collected then
+ for c=1,#collected do
+ local e = collected[c]
+ local p = e.__p__
+ if p then
+ if trace_manipulations then
+ report('deleting',pattern,c,e)
+ end
+ local d = p.dt
+ remove(d,e.ni)
+ redo_ni(d) -- can be made faster and inlined
end
- local d = p.dt
- remove(d,e.ni)
- redo_ni(d) -- can be made faster and inlined
end
end
end
diff --git a/tex/context/base/mult-aux.lua b/tex/context/base/mult-aux.lua
index 1bf32cd9d..e0fd87a02 100644
--- a/tex/context/base/mult-aux.lua
+++ b/tex/context/base/mult-aux.lua
@@ -67,7 +67,7 @@ function namespaces.define(namespace,settings)
end
local style = ns.style
if style == v_yes then
- context.installattributehandler(self,name)
+ context.installstyleandcolorhandler(self,name)
if trace_namespaces then
report_namespaces("installing attribute handler for '%s'",name)
end
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 0bdc57a12..0b4426fba 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 4cc70bb77..95661c132 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-itm.mkvi b/tex/context/base/strc-itm.mkvi
index b92fc031a..a47605dc1 100644
--- a/tex/context/base/strc-itm.mkvi
+++ b/tex/context/base/strc-itm.mkvi
@@ -284,9 +284,9 @@
\setuevalue{\e!start\currentitemgroup}{\startitemgroup[\currentitemgroup]}%
\setuevalue{\e!stop \currentitemgroup}{\stopitemgroup}%
\setuevalue{\e!setup\currentitemgroup\e!endsetup}{\setupitemgroup[\currentitemgroup]}% obsolete
-% \let\currentparentitemgroup\currentitemgroup
-% \definestructurecounter[\v_itemgroups_counter]%
-% \definestructureconversionset[\v_itemgroups_counter][\m_itemgroups_conversion_set][\m_itemgroups_item_symbol]%
+ \let\currentparentitemgroup\currentitemgroup
+ \definestructurecounter[\v_itemgroups_counter]%
+ \definestructureconversionset[\v_itemgroups_counter][\m_itemgroups_conversion_set][\m_itemgroups_item_symbol]%
\to \everydefineitemgroup
%D Global states
diff --git a/tex/context/base/tabl-tbl.mkiv b/tex/context/base/tabl-tbl.mkiv
index 99d507cf3..0a4aa3690 100644
--- a/tex/context/base/tabl-tbl.mkiv
+++ b/tex/context/base/tabl-tbl.mkiv
@@ -379,7 +379,7 @@
\fi
\fi\fi}
-\def\dodosettabulatepreamble#1#2#3% only makes sense for many tabulates
+\def\dodosettabulatepreamble#1#2% only makes sense for many tabulates
{\normalexpanded{\tabulatepreamble{\the\tabulatepreamble
\dochecklocaltabulatevrulecolor{\currenttabulatevrulecolor}{\the\tabulatevrulethickness}%
\dochecklocaltabulatecolor{\currenttabulatecolor}{\number\tabulatecolorspan}%
@@ -410,10 +410,10 @@
\bgroup
\noexpand\bbskip
\bgroup % we cannot combine the if because a cell may have only one ##
- \tabulatealign\number#1\relax % needed in tag passing
+ \tabulatealign\number\tabulatealign\relax % needed in tag passing
\noexpand\dostarttagged\noexpand\t!tabulatecell\noexpand\empty
\noexpand\dotagtabulatecell
- \noexpand#2%
+ \noexpand#1%
\ifcase\tabulatereshape\else
\beginreshapedtabulatepar
\fi
@@ -438,7 +438,7 @@
\ifcase\tabulatereshape\else
\endreshapedtabulatepar
\fi
- \noexpand#3%
+ \noexpand#2%
% \noexpand\dostoptagged
\egroup
\egroup
@@ -588,28 +588,28 @@
\def\tabulatesetpreamblewidthnormal
{\ifcase\tabulatealign\relax
- \dodosettabulatepreamble\tabulatealign\empty \tabulatehss \or
- \dodosettabulatepreamble\tabulatealign\empty \tabulatehss \or
- \dodosettabulatepreamble\tabulatealign\tabulatehss\empty \or
- \dodosettabulatepreamble\tabulatealign\tabulatehss\tabulatehss \fi}
+ \dodosettabulatepreamble\empty \tabulatehss \or
+ \dodosettabulatepreamble\empty \tabulatehss \or
+ \dodosettabulatepreamble\tabulatehss\empty \or
+ \dodosettabulatepreamble\tabulatehss\tabulatehss \fi}
\def\tabulatesetpreamblewidthfixed
{\ifcase\tabulatealign\relax
- \dodosettabulatepreamble\tabulatealign\bskip \eskip \or
- \dodosettabulatepreamble\tabulatealign\tabulatebskipraggedright \eskip \or
- \dodosettabulatepreamble\tabulatealign\tabulatebskipraggedleft \eskip \or
- \dodosettabulatepreamble\tabulatealign\tabulatebskipraggedcenter\eskip \fi}
+ \dodosettabulatepreamble\bskip \eskip \or
+ \dodosettabulatepreamble\tabulatebskipraggedright \eskip \or
+ \dodosettabulatepreamble\tabulatebskipraggedleft \eskip \or
+ \dodosettabulatepreamble\tabulatebskipraggedcenter\eskip \fi}
\def\tabulatesetpreamblewidthauto
{\global\advance\nofautotabulate\plusone
\ifcase\tabulatealign\relax
- \dodosettabulatepreamble\tabulatealign\bskip \eskip \or
- \dodosettabulatepreamble\tabulatealign\tabulatebskipraggedright \eskip \or
- \dodosettabulatepreamble\tabulatealign\tabulatebskipraggedleft \eskip \or
- \dodosettabulatepreamble\tabulatealign\tabulatebskipraggedcenter\eskip \fi}
+ \dodosettabulatepreamble\bskip \eskip \or
+ \dodosettabulatepreamble\tabulatebskipraggedright \eskip \or
+ \dodosettabulatepreamble\tabulatebskipraggedleft \eskip \or
+ \dodosettabulatepreamble\tabulatebskipraggedcenter\eskip \fi}
\def\tabulatesetpreamblewidthsimple
- {\dodosettabulatepreamble\tabulatealign\xbskip\xeskip}
+ {\dodosettabulatepreamble\xbskip\xeskip}
\def\doparsecolortabulate#1#2%
{\gdef\currenttabulatecolor{#2}%
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 1783ecfbb..b8d19cd6e 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 : 12/13/11 15:17:15
+-- merge date : 12/14/11 00:20:06
do -- begin closure to overcome local limits and interference
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 15:30:01 +0000