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.pdfbin4071 -> 4072 bytes
-rw-r--r--tex/context/base/context-version.pngbin104790 -> 105374 bytes
-rw-r--r--tex/context/base/context.mkii2
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/export-example.css15
-rw-r--r--tex/context/base/lpdf-wid.lua9
-rw-r--r--tex/context/base/meta-ini.mkiv6
-rw-r--r--tex/context/base/page-lin.lua4
-rw-r--r--tex/context/base/scrn-wid.mkvi2
-rw-r--r--tex/context/base/status-files.pdfbin24315 -> 24363 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin172402 -> 172402 bytes
-rw-r--r--tex/context/base/strc-doc.lua53
-rw-r--r--tex/context/base/strc-lst.mkvi17
-rw-r--r--tex/context/base/tabl-tbl.mkiv12
-rw-r--r--tex/context/base/typo-mar.mkiv4
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
18 files changed, 82 insertions, 50 deletions
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 1d46b2d66..1a9da369f 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.03.02 22:35}
+\newcontextversion{2012.03.05 19:49}
%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 46577655e..88b7b8f2b 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.03.02 22:35}
+\newcontextversion{2012.03.05 19:49}
%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 858f0aea3..20e1d1451 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 54190b7e5..881cfd40a 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 5436ad448..bf4707bb5 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.03.02 22:35}
+\edef\contextversion{2012.03.05 19:49}
%D For those who want to use this:
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index b77c94bea..6a52c0ef8 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.03.02 22:35}
+\edef\contextversion{2012.03.05 19:49}
%D For those who want to use this:
diff --git a/tex/context/base/export-example.css b/tex/context/base/export-example.css
index 7e6101360..06d51c587 100644
--- a/tex/context/base/export-example.css
+++ b/tex/context/base/export-example.css
@@ -204,7 +204,18 @@ section[detail="subsummary"]>sectiontitle {
/* itemtag : mixed */
/* itemcontent : mixed */
-/* there is no upper-greek */
+/* type : alphabetic ; */
+/* suffix : '.' ; */
+
+@counter-style lower-greek { /* css 3 */
+ type : non-repeating ;
+ glyphs : 'α' 'β' 'γ' 'δ' 'ε' 'ζ' 'η' 'θ' 'ι' 'κ' 'λ' 'μ' 'ν' 'ξ' 'ο' 'π' 'ρ' 'σ' 'τ' 'υ' 'φ' 'χ' 'ψ' 'ω' ;
+}
+
+@counter-style upper-greek { /* css 3 */
+ type : non-repeating ;
+ glyphs : 'Α' 'B' 'Γ' 'Δ' 'Ε' 'Ζ' 'Η' 'Θ' 'Ι' 'Κ' 'Λ' 'Μ' 'Ν' 'Ξ' 'Ο' 'Π' 'Ρ' 'Σ' 'Τ' 'Υ' 'Φ' 'Χ' 'Ψ' 'Ω' ;
+}
itemgroup {
display : block ;
@@ -223,7 +234,7 @@ itemgroup[symbol="r"] { list-style-type : lower-roman ; }
itemgroup[symbol="R"] { list-style-type : upper-roman ; }
itemgroup[symbol="n"] { list-style-type : decimal ; }
itemgroup[symbol="g"] { list-style-type : lower-greek ; }
-itemgroup[symbol="G"] { list-style-type : lower-greek ; }
+itemgroup[symbol="G"] { list-style-type : upper-greek ; }
item {
display : list-item ;
diff --git a/tex/context/base/lpdf-wid.lua b/tex/context/base/lpdf-wid.lua
index 0d73c56ba..13940be9c 100644
--- a/tex/context/base/lpdf-wid.lua
+++ b/tex/context/base/lpdf-wid.lua
@@ -447,7 +447,7 @@ end
-- object_2 -> <</Type /Rendition /S /MR /C << /Type /MediaClip ... >> >>
-- rendering -> <</Type /Rendition /S /MS [objref_1 objref_2]>>
--
--- we only work foreward here
+-- we only work foreward here (currently)
-- annotation is to be packed at the tex end
-- aiff audio/aiff
@@ -519,7 +519,12 @@ local function insertrenderingwindow(specification)
Border = pdf_border,
AA = actions,
}
- write_node(pdfannotation_node(specification.width or 0,specification.height or 0,0,d(),r)) -- save ref
+ local width = specification.width or 0
+ local height = specification.height or 0
+ if height == 0 or width == 0 then
+ -- todo: sound needs no window
+ end
+ write_node(pdfannotation_node(width,height,0,d(),r)) -- save ref
return pdfreference(r)
end
diff --git a/tex/context/base/meta-ini.mkiv b/tex/context/base/meta-ini.mkiv
index f64c1631b..41f697cc8 100644
--- a/tex/context/base/meta-ini.mkiv
+++ b/tex/context/base/meta-ini.mkiv
@@ -21,7 +21,11 @@
\newtoks \t_meta_initializations % tex, each
\newtoks \t_meta_userinclusions % mp, user
-\newtoks \everyMPgraphic % mp % public or not ?
+\newtoks \everyMPgraphic % mp % public or not ?
+
+\appendtoks
+ \restoreendofline % see interferences-001.tex
+\to \everyMPgraphic
\def\MPruntimefile {mprun}
\def\currentMPformat {metafun}
diff --git a/tex/context/base/page-lin.lua b/tex/context/base/page-lin.lua
index fc38f7e6b..b830dbbb9 100644
--- a/tex/context/base/page-lin.lua
+++ b/tex/context/base/page-lin.lua
@@ -206,6 +206,10 @@ function boxed.stage_zero(n)
return identify(texbox[n].list)
end
+-- reset ranges per page
+-- store first and last per page
+-- maybe just set marks directly
+
function boxed.stage_one(n,nested)
current_list = { }
local head = texbox[n]
diff --git a/tex/context/base/scrn-wid.mkvi b/tex/context/base/scrn-wid.mkvi
index 97fd1eb59..2b75f83cd 100644
--- a/tex/context/base/scrn-wid.mkvi
+++ b/tex/context/base/scrn-wid.mkvi
@@ -633,7 +633,7 @@
\def\currentrenderingwindow{#window}%
\else
\let\currentrenderingwindow\s!default
- \scrn_rendering_define_window[\currentrenderingwindow]%
+ \definerenderingwindow[\currentrenderingwindow]%
\fi
% todo
% \handlereferenceactions{\getvalue{\??rw\currentrenderingwindow\c!openpageaction }}\dosetuprenderingopenpageaction
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 25becac6d..0bf6899a3 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 b27c6d963..eceedcac0 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-doc.lua b/tex/context/base/strc-doc.lua
index 19dd528b9..793f1a2fd 100644
--- a/tex/context/base/strc-doc.lua
+++ b/tex/context/base/strc-doc.lua
@@ -19,7 +19,7 @@ local next, type = next, type
local format, gsub, find, gmatch, match = string.format, string.gsub, string.find, string.gmatch, string.match
local concat = table.concat
local max, min = math.max, math.min
-local allocate, mark = utilities.storage.allocate, utilities.storage.mark
+local allocate, mark, accesstable = utilities.storage.allocate, utilities.storage.mark, utilities.tables.accesstable
local catcodenumbers = catcodes.numbers
local ctxcatcodes = tex.ctxcatcodes
@@ -440,38 +440,35 @@ function sections.structuredata(depth,key,default,honorcatcodetable) -- todo: sp
depth = data.depth
end
local data = data.status[depth]
- local d = data
- for k in gmatch(key,"[^%.]+") do
- if type(d) == "table" then
- d = d[k]
- if not d then
- -- unknown key
- break
- end
+ local d
+ if data then
+ if find(key,"%.") then
+ d = accesstable(key,data)
+ else
+ d = data.titledata
+ d = d and d[key]
end
- if type(d) == "string" then
- if honorcatcodetable == true or honorcatcodetable == variables.auto then
- local metadata = data.metadata
- local catcodes = metadata and metadata.catcodes
- if catcodes then
- context.sprint(catcodes,d)
- else
- context(d)
- end
- elseif not honorcatcodetable or honorcatcodetable == "" then
+ end
+ if d and type(d) ~= "table" then
+ if honorcatcodetable == true or honorcatcodetable == variables.auto then
+ local metadata = data.metadata
+ local catcodes = metadata and metadata.catcodes
+ if catcodes then
+ context.sprint(catcodes,d)
+ else
context(d)
+ end
+ elseif not honorcatcodetable or honorcatcodetable == "" then
+ context(d)
+ else
+ local catcodes = catcodenumbers[honorcatcodetable]
+ if catcodes then
+ context.sprint(catcodes,d)
else
- local catcodes = catcodenumbers[honorcatcodetable]
- if catcodes then
- context.sprint(catcodes,d)
- else
- context(d)
- end
+ context(d)
end
- return
end
- end
- if default then
+ elseif default then
context(default)
end
end
diff --git a/tex/context/base/strc-lst.mkvi b/tex/context/base/strc-lst.mkvi
index 4b428454f..6750cdbb5 100644
--- a/tex/context/base/strc-lst.mkvi
+++ b/tex/context/base/strc-lst.mkvi
@@ -306,6 +306,11 @@
\def\strc_lists_combined_place[#tag][#settings]% i.e. no list set in settings
{\begingroup
+ %
+ \edef\currentlist{#tag}%
+ \setupcurrentlist[#settings]%
+ \edef\m_strc_list_alternative{\listparameter\c!alternative}% we only inherit alternative
+ %
\strc_lists_place_indeed{#tag}{\listparameter\c!list}{#settings}%
\endgroup}
@@ -791,9 +796,15 @@
\setfalse\c_lists_show_number
\to \t_lists_every_renderingcleanup
+\let\m_strc_list_alternative\empty % combined
+
\unexpanded\def\strc_lists_apply_renderingsetup
{\the\t_lists_every_renderingsetup
- \edef\currentlistalternative{\listparameter\c!alternative}%
+ \ifx\m_strc_list_alternative\empty
+ \edef\currentlistalternative{\listparameter\c!alternative}%
+ \else
+ \let\currentlistalternative\m_strc_list_alternative
+ \fi
\directsetup{\listalternativeparameter\c!renderingsetup}\relax
\the\t_lists_every_renderingcleanup}
@@ -870,7 +881,7 @@
\listparameter\c!before
\endgraf
\edef\p_width{\listparameter\c!width}
- \scratchdistance\listparameter\c!distance
+ \scratchdistance\listparameter\c!distance\relax
\ifx\p_width\v!fit
\scratchwidth\zeropoint
\else\ifconditional\c_lists_has_number
@@ -931,7 +942,7 @@
\edef\p_hang{\listparameter\c!hang}
\hangindent\dimexpr\wd\b_strc_lists_number+\scratchdistance\relax
\hangafter\ifx\p_hang\v!no\zerocount\else\plusone\fi
- \scratchdimen\listalternativeparameter\c!distance
+ \scratchdimen\listalternativeparameter\c!distance\relax
\ifdim\wd\b_strc_lists_page=\zeropoint \else\ifdim\scratchdimen>\zeropoint\relax
\rightskip\scratchdimen\!!plus\listalternativeparameter\c!stretch\relax
\parfillskip-\rightskip
diff --git a/tex/context/base/tabl-tbl.mkiv b/tex/context/base/tabl-tbl.mkiv
index ee2adb733..f217f1a0a 100644
--- a/tex/context/base/tabl-tbl.mkiv
+++ b/tex/context/base/tabl-tbl.mkiv
@@ -1035,11 +1035,11 @@
\def\tabl_tabulate_start_foot_yes[#1]%
{\processcontent{\e!stop\v!tabulatetail}\m_tabl_tabulate_data{\letvalue{\??tabulatefoot#1}\m_tabl_tabulate_data}}
-% \def\tabl_tabulate_start_head_nop{\tabl_tabulate_start_foot_yes[\v!tabulate]}
-% \def\tabl_tabulate_start_foot_nop{\tabl_tabulate_start_head_yes[\v!tabulate]}
+% \def\tabl_tabulate_start_head_nop{\tabl_tabulate_start_head_yes[\v!tabulate]}
+% \def\tabl_tabulate_start_foot_nop{\tabl_tabulate_start_foot_yes[\v!tabulate]}
-\def\tabl_tabulate_start_head_nop{\tabl_tabulate_start_foot_yes[]}
-\def\tabl_tabulate_start_foot_nop{\tabl_tabulate_start_head_yes[]}
+\def\tabl_tabulate_start_head_nop{\tabl_tabulate_start_head_yes[]}
+\def\tabl_tabulate_start_foot_nop{\tabl_tabulate_start_foot_yes[]}
\unexpanded\def\tabl_start_defined[#1]%
{\bgroup
@@ -1758,7 +1758,7 @@
\unexpanded\def\tabl_tabulate_FL_second_indeed
{\ifinsidefloat\else
- \doifemptyvalue{\??tt\currenttabulation\c!before}\tabl_tabulate_baselinecorrection % no expansion
+ \doifempty{\tabulationparameter\c!before}\tabl_tabulate_baselinecorrection % no expansion
\fi
\tabl_tabulate_hrule_inject
\tabl_tabulate_nobreak_inject
@@ -1782,7 +1782,7 @@
\tabl_tabulate_nobreak_inject
\tabl_tabulate_hrule_inject
\ifinsidefloat\else
- \doifemptyvalue{\??tt\currenttabulation\c!after} % no expansion
+ \doifempty{\tabulationparameter\c!after}
{\vskip\strutdp
\verticalstrut
\vskip-\struttotal}%
diff --git a/tex/context/base/typo-mar.mkiv b/tex/context/base/typo-mar.mkiv
index 5a8f7d250..788b7b3dd 100644
--- a/tex/context/base/typo-mar.mkiv
+++ b/tex/context/base/typo-mar.mkiv
@@ -194,7 +194,7 @@
\setupcurrentmarginframed[\c!location=\v!normal,#textparameters]%
\inheritedmarginframedframed\bgroup
\ifx\currentmargindatastrut\empty \else
- \dosetupstrut[\currentmargindatastrut]%
+ \synchronizestrut\currentmargindatastrut
\fi
\begstrut\margindataparameter\c!command{#content}\endstrut
\egroup
@@ -207,7 +207,7 @@
\the\everymargindatacontent
\usemargindatastyleandcolor\c!style\c!color
\ifx\currentmargindatastrut\empty \else
- \dosetupstrut[\currentmargindatastrut]%
+ \synchronizestrut\currentmargindatastrut
\fi
\begstrut\margindataparameter\c!command{#content}\endstrut
\egroup
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index bb47b946c..d78374712 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 : 03/02/12 22:35:34
+-- merge date : 03/05/12 19:49:15
do -- begin closure to overcome local limits and interference
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 03:54:25 +0000