From 431ad6f512041aa658f6b080adbc17c2b4dffba3 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Wed, 26 Aug 2009 01:43:00 +0200 Subject: beta 2009.08.26 01:43 --- tex/context/base/anch-pos.lua | 2 +- tex/context/base/attr-ini.lua | 2 +- tex/context/base/back-ini.lua | 2 +- tex/context/base/back-pdf.lua | 2 +- tex/context/base/bibl-tra.lua | 152 +++++++++++- tex/context/base/bibl-tra.mkiv | 54 +++-- tex/context/base/buff-ini.lua | 2 +- tex/context/base/buff-ini.mkiv | 10 +- tex/context/base/catc-ini.lua | 2 +- tex/context/base/char-cmp.lua | 2 +- tex/context/base/char-def.lua | 1 + tex/context/base/char-enc.lua | 2 +- tex/context/base/char-ini.lua | 2 +- tex/context/base/char-ini.mkiv | 1 + tex/context/base/char-map.lua | 2 +- tex/context/base/char-utf.lua | 2 +- tex/context/base/chem-ini.lua | 2 +- tex/context/base/chem-str.lua | 2 +- tex/context/base/colo-ini.lua | 2 +- tex/context/base/cont-new.tex | 2 +- tex/context/base/context.mkii | 1 + tex/context/base/context.mkiv | 5 +- tex/context/base/context.tex | 2 +- tex/context/base/core-con.lua | 4 +- tex/context/base/core-ctx.lua | 4 +- tex/context/base/core-job.lua | 2 +- tex/context/base/core-spa.lua | 2 +- tex/context/base/core-two.lua | 2 +- tex/context/base/core-uti.lua | 11 +- tex/context/base/data-aux.lua | 2 +- tex/context/base/data-bin.lua | 2 +- tex/context/base/data-con.lua | 2 +- tex/context/base/data-crl.lua | 2 +- tex/context/base/data-ctx.lua | 2 +- tex/context/base/data-gen.lua | 2 +- tex/context/base/data-inp.lua | 2 +- tex/context/base/data-lst.lua | 2 +- tex/context/base/data-lua.lua | 2 +- tex/context/base/data-out.lua | 2 +- tex/context/base/data-pre.lua | 2 +- tex/context/base/data-res.lua | 2 +- tex/context/base/data-tex.lua | 2 +- tex/context/base/data-tmf.lua | 2 +- tex/context/base/data-tmp.lua | 2 +- tex/context/base/data-tre.lua | 2 +- tex/context/base/data-use.lua | 2 +- tex/context/base/data-zip.lua | 2 +- tex/context/base/font-afm.lua | 2 +- tex/context/base/font-chk.lua | 2 +- tex/context/base/font-col.lua | 2 +- tex/context/base/font-ctx.lua | 2 +- tex/context/base/font-def.lua | 2 +- tex/context/base/font-enc.lua | 2 +- tex/context/base/font-ext.lua | 2 +- tex/context/base/font-fbk.lua | 2 +- tex/context/base/font-ini.lua | 2 +- tex/context/base/font-log.lua | 2 +- tex/context/base/font-map.lua | 2 +- tex/context/base/font-ota.lua | 3 +- tex/context/base/font-otb.lua | 2 +- tex/context/base/font-otd.lua | 2 +- tex/context/base/font-otf.lua | 2 +- tex/context/base/font-oti.lua | 2 +- tex/context/base/font-otn.lua | 2 +- tex/context/base/font-pat.lua | 2 +- tex/context/base/font-syn.lua | 2 +- tex/context/base/font-tfm.lua | 2 +- tex/context/base/font-vf.lua | 2 +- tex/context/base/font-xtx.lua | 2 +- tex/context/base/grph-inc.lua | 2 +- tex/context/base/grph-u3d.lua | 2 +- tex/context/base/java-ini.lua | 2 +- tex/context/base/l-aux.lua | 2 +- tex/context/base/l-boolean.lua | 2 +- tex/context/base/l-dir.lua | 2 +- tex/context/base/l-file.lua | 2 +- tex/context/base/l-io.lua | 2 +- tex/context/base/l-lpeg.lua | 2 +- tex/context/base/l-math.lua | 2 +- tex/context/base/l-number.lua | 2 +- tex/context/base/l-os.lua | 2 +- tex/context/base/l-set.lua | 2 +- tex/context/base/l-string.lua | 2 +- tex/context/base/l-table.lua | 2 +- tex/context/base/l-unicode.lua | 2 +- tex/context/base/l-url.lua | 2 +- tex/context/base/l-utils.lua | 2 +- tex/context/base/l-xml.lua | 30 ++- tex/context/base/lang-ini.lua | 2 +- tex/context/base/lang-url.lua | 2 +- tex/context/base/lpdf-ano.lua | 2 +- tex/context/base/lpdf-col.lua | 2 +- tex/context/base/lpdf-fld.lua | 2 +- tex/context/base/lpdf-grp.lua | 2 +- tex/context/base/lpdf-ini.lua | 5 +- tex/context/base/lpdf-mis.lua | 2 +- tex/context/base/lpdf-nod.lua | 4 +- tex/context/base/lpdf-ren.lua | 2 +- tex/context/base/lpdf-u3d.lua | 2 +- tex/context/base/lpdf-wid.lua | 2 +- tex/context/base/luat-cbk.lua | 2 +- tex/context/base/luat-cnf.lua | 2 +- tex/context/base/luat-env.lua | 2 +- tex/context/base/luat-exe.lua | 2 +- tex/context/base/luat-fio.lua | 2 +- tex/context/base/luat-ini.lua | 2 +- tex/context/base/luat-iop.lua | 2 +- tex/context/base/luat-lib.mkiv | 2 +- tex/context/base/luat-lua.lua | 2 +- tex/context/base/luat-run.lua | 2 +- tex/context/base/luat-sto.lua | 2 +- tex/context/base/lxml-ini.lua | 191 ++++++++++++++- tex/context/base/lxml-ini.mkiv | 46 ++-- tex/context/base/lxml-tab.lua | 30 ++- tex/context/base/math-ali.mkiv | 6 +- tex/context/base/math-dim.lua | 2 +- tex/context/base/math-ent.lua | 2 +- tex/context/base/math-ext.lua | 2 +- tex/context/base/math-ini.lua | 2 +- tex/context/base/math-map.lua | 2 +- tex/context/base/math-noa.lua | 2 +- tex/context/base/math-vfu.lua | 2 +- tex/context/base/meta-fun.lua | 2 +- tex/context/base/meta-pdf.lua | 2 +- tex/context/base/meta-pdh.lua | 2 +- tex/context/base/mlib-ctx.lua | 2 +- tex/context/base/mlib-pdf.lua | 2 +- tex/context/base/mlib-pps.lua | 2 +- tex/context/base/mlib-run.lua | 2 +- tex/context/base/mult-chk.lua | 2 +- tex/context/base/mult-cld.lua | 2 +- tex/context/base/mult-de.tex | 1 + tex/context/base/mult-def.lua | 58 ++--- tex/context/base/mult-en.tex | 1 + tex/context/base/mult-fr.tex | 1 + tex/context/base/mult-ini.lua | 4 +- tex/context/base/mult-it.tex | 1 + tex/context/base/mult-mcs.tex | 5 +- tex/context/base/mult-mde.tex | 5 +- tex/context/base/mult-men.tex | 5 +- tex/context/base/mult-mes.lua | 9 + tex/context/base/mult-mfr.tex | 5 +- tex/context/base/mult-mit.tex | 5 +- tex/context/base/mult-mnl.tex | 5 +- tex/context/base/mult-mno.tex | 5 +- tex/context/base/mult-mpe.tex | 5 +- tex/context/base/mult-mro.tex | 5 +- tex/context/base/mult-nl.tex | 1 + tex/context/base/mult-ro.tex | 1 + tex/context/base/node-bck.lua | 2 +- tex/context/base/node-ext.lua | 2 +- tex/context/base/node-fin.lua | 2 +- tex/context/base/node-fnt.lua | 2 +- tex/context/base/node-ini.lua | 2 +- tex/context/base/node-inj.lua | 112 ++++++--- tex/context/base/node-par.lua | 2 +- tex/context/base/node-pro.lua | 2 +- tex/context/base/node-ref.lua | 2 +- tex/context/base/node-res.lua | 2 +- tex/context/base/node-seq.lua | 2 +- tex/context/base/node-ser.lua | 2 +- tex/context/base/node-shp.lua | 2 +- tex/context/base/node-tex.lua | 2 +- tex/context/base/node-tra.lua | 2 +- tex/context/base/node-tsk.lua | 2 +- tex/context/base/node-tst.lua | 2 +- tex/context/base/pack-obj.lua | 2 +- tex/context/base/pack-rul.lua | 2 +- tex/context/base/pret-lua.lua | 2 +- tex/context/base/pret-mp.lua | 2 +- tex/context/base/pret-tex.lua | 2 +- tex/context/base/regi-8859-1.lua | 46 ++-- tex/context/base/regi-8859-10.lua | 46 ++-- tex/context/base/regi-8859-11.lua | 46 ++-- tex/context/base/regi-8859-13.lua | 46 ++-- tex/context/base/regi-8859-14.lua | 46 ++-- tex/context/base/regi-8859-15.lua | 46 ++-- tex/context/base/regi-8859-16.lua | 46 ++-- tex/context/base/regi-8859-2.lua | 46 ++-- tex/context/base/regi-8859-3.lua | 46 ++-- tex/context/base/regi-8859-4.lua | 46 ++-- tex/context/base/regi-8859-5.lua | 46 ++-- tex/context/base/regi-8859-6.lua | 46 ++-- tex/context/base/regi-8859-7.lua | 46 ++-- tex/context/base/regi-8859-8.lua | 46 ++-- tex/context/base/regi-8859-9.lua | 46 ++-- tex/context/base/regi-cp1250.lua | 46 ++-- tex/context/base/regi-cp1251.lua | 46 ++-- tex/context/base/regi-cp1252.lua | 46 ++-- tex/context/base/regi-cp1253.lua | 46 ++-- tex/context/base/regi-cp1254.lua | 46 ++-- tex/context/base/regi-cp1255.lua | 46 ++-- tex/context/base/regi-cp1256.lua | 46 ++-- tex/context/base/regi-cp1257.lua | 46 ++-- tex/context/base/regi-cp1258.lua | 46 ++-- tex/context/base/regi-ini.lua | 2 +- tex/context/base/scrn-int.lua | 2 +- tex/context/base/scrp-cjk.lua | 2 +- tex/context/base/scrp-ini.lua | 2 +- tex/context/base/sort-ini.lua | 2 +- tex/context/base/sort-lan.lua | 2 +- tex/context/base/strc-bkm.lua | 30 ++- tex/context/base/strc-blk.lua | 2 +- tex/context/base/strc-des.lua | 2 +- tex/context/base/strc-doc.lua | 11 +- tex/context/base/strc-doc.mkiv | 61 ++--- tex/context/base/strc-flt.lua | 2 +- tex/context/base/strc-ini.lua | 21 +- tex/context/base/strc-itm.lua | 2 +- tex/context/base/strc-lst.lua | 3 +- tex/context/base/strc-mar.lua | 2 +- tex/context/base/strc-mat.lua | 2 +- tex/context/base/strc-not.lua | 2 +- tex/context/base/strc-num.lua | 2 +- tex/context/base/strc-pag.lua | 2 +- tex/context/base/strc-prc.lua | 2 +- tex/context/base/strc-ref.lua | 344 +++++++++++++++++++--------- tex/context/base/strc-ref.mkiv | 38 ++- tex/context/base/strc-reg.lua | 26 ++- tex/context/base/strc-reg.mkiv | 199 ++++++++++++++-- tex/context/base/strc-sec.mkiv | 11 +- tex/context/base/strc-syn.lua | 2 +- tex/context/base/strc-xml.mkiv | 18 +- tex/context/base/supp-fil.lua | 2 +- tex/context/base/supp-mis.tex | 4 + tex/context/base/supp-mpe.tex | 4 + tex/context/base/supp-pdf.tex | 1 + tex/context/base/syst-aux.mkiv | 10 +- tex/context/base/syst-con.lua | 2 +- tex/context/base/syst-ext.mkii | 10 +- tex/context/base/syst-lua.lua | 2 +- tex/context/base/tabl-com.mkii | 21 ++ tex/context/base/tabl-com.mkiv | 21 ++ tex/context/base/tabl-ltb.mkii | 2 +- tex/context/base/tabl-ltb.mkiv | 2 +- tex/context/base/task-ini.lua | 2 +- tex/context/base/trac-deb.lua | 2 +- tex/context/base/trac-inf.lua | 2 +- tex/context/base/trac-lmx.lua | 2 +- tex/context/base/trac-log.lua | 2 +- tex/context/base/trac-tra.lua | 2 +- tex/context/base/typo-brk.lua | 2 +- tex/context/base/typo-cap.lua | 2 +- tex/context/base/typo-krn.lua | 2 +- tex/context/base/typo-mir.lua | 2 +- tex/context/base/typo-spa.lua | 2 +- tex/context/base/x-mathml.lua | 2 +- tex/context/interface/cont-cs.xml | 6 + tex/context/interface/cont-de.xml | 6 + tex/context/interface/cont-en.xml | 4 + tex/context/interface/cont-fr.xml | 6 + tex/context/interface/cont-it.xml | 6 + tex/context/interface/cont-nl.xml | 6 + tex/context/interface/cont-pe.xml | 6 + tex/context/interface/cont-ro.xml | 6 + tex/context/interface/keys-cs.xml | 1 + tex/context/interface/keys-de.xml | 1 + tex/context/interface/keys-en.xml | 1 + tex/context/interface/keys-fr.xml | 1 + tex/context/interface/keys-it.xml | 1 + tex/context/interface/keys-nl.xml | 1 + tex/context/interface/keys-pe.xml | 1 + tex/context/interface/keys-ro.xml | 1 + tex/generic/context/luatex-fonts-merged.lua | 159 +++++++++---- tex/generic/context/luatex-mplib.lua | 2 +- 265 files changed, 2160 insertions(+), 1120 deletions(-) create mode 100644 tex/context/base/supp-mis.tex create mode 100644 tex/context/base/supp-mpe.tex create mode 100644 tex/context/base/supp-pdf.tex create mode 100644 tex/context/base/tabl-com.mkii create mode 100644 tex/context/base/tabl-com.mkiv (limited to 'tex') diff --git a/tex/context/base/anch-pos.lua b/tex/context/base/anch-pos.lua index b16fac05c..2f68f1111 100644 --- a/tex/context/base/anch-pos.lua +++ b/tex/context/base/anch-pos.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['anch-pos'] = { version = 1.001, - comment = "companion to anch-pos.tex", + comment = "companion to anch-pos.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/attr-ini.lua b/tex/context/base/attr-ini.lua index 535488c35..4e3b52e1d 100644 --- a/tex/context/base/attr-ini.lua +++ b/tex/context/base/attr-ini.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['attr-ini'] = { version = 1.001, - comment = "companion to attr-ini.tex", + comment = "companion to attr-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/back-ini.lua b/tex/context/base/back-ini.lua index bad6b0282..171b40c97 100644 --- a/tex/context/base/back-ini.lua +++ b/tex/context/base/back-ini.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['back-ini'] = { version = 1.001, - comment = "companion to back-ini.tex", + comment = "companion to back-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/back-pdf.lua b/tex/context/base/back-pdf.lua index 908801d8a..52151aa6e 100644 --- a/tex/context/base/back-pdf.lua +++ b/tex/context/base/back-pdf.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['back-pdf'] = { version = 1.001, - comment = "companion to back-pdf.tex", + comment = "companion to back-pdf.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/bibl-tra.lua b/tex/context/base/bibl-tra.lua index 2258902bb..b38fbae71 100644 --- a/tex/context/base/bibl-tra.lua +++ b/tex/context/base/bibl-tra.lua @@ -92,10 +92,6 @@ end -- to look for previous definitions, and when not found again -- we look forward --- we directly operate on the reference list so that we avoid --- references to be resolved completely; for the moment we just --- ignore prefix (we assume that it's "") - local function compare(a,b) return a[3] < b[3] end @@ -128,8 +124,6 @@ function hacks.resolve(prefix,block,reference) -- maybe already feed it split end if found then local current = found.entries and found.entries.text ---~ local current = found.userdata and found.userdata.number ---~ local current = found.userdata and found.userdata.year if current and not done[current] then result[#result+1] = { blk, rest, current } done[current] = true @@ -180,10 +174,144 @@ function hacks.resolve(prefix,block,reference) -- maybe already feed it split end end ---~ function jobreferences.filters.user.number(data) ---~ texsprint(ctxcatcodes,data.userdata.number) ---~ end +-- we've decided that external references make no sense +-- +-- local function compare(a,b) +-- return a[3] < b[3] +-- end +-- +-- local function resolve(subset,block,rest) +-- local blk, tag, found = block, nil, nil +-- if rest then +-- if block then +-- tag = blk .. ":" .. rest +-- found = subset[tag] +-- if not found then +-- for i=block-1,1,-1 do +-- tag = i .. ":" .. rest +-- found = subset[tag] +-- if found then +-- blk = i +-- break +-- end +-- end +-- end +-- end +-- if not found then +-- blk = "*" +-- tag = blk .. ":" .. rest +-- found = subset[tag] +-- end +-- end +-- return blk, rest, found +-- end ---~ function jobreferences.filters.user.year(data) ---~ texsprint(ctxcatcodes,data.userdata.year) ---~ end +-- local function set_error(results,...) +-- local re = results[false] +-- if not re then re = { } results[false] = re end +-- re[#re+1] = { format(...) } +-- end +-- +-- local function resolve_outer(results,outer,inner) +-- if inner then +-- if outer then +-- local re = results[outer] +-- if not re then re = { } results[outer] = re end +-- -- todo: external refs +-- re[#re+1] = { format("%s: %s",outer,inner) } +-- else +-- set_error(results,"no outer for inner: %s",inner) +-- end +-- else +-- set_error(results,"no inner for outer: %s",outer) +-- end +-- end +-- +-- function hacks.resolve(prefix,block,reference) -- maybe already feed it split +-- local set, bug = jobreferences.identify(prefix,reference) +-- local subset = jobreferences.collected[prefix or ""] or jobreferences.collected[""] +-- if subset then +-- local jobname = tex.jobname +-- local results, done = { [jobname] = { } }, { } +-- local rj = results[jobname] +-- block = tonumber(block) +-- for i=1,#set do +-- local s = set[i] +-- local inner, outer, special = s.inner, s.outer, s.special +-- if special == "file" then +-- resolve_outer(results,outer,s.operation) +-- elseif outer then +-- resolve_outer(results,outer,inner) +-- elseif inner then +-- local blk, inner, found = resolve(subset,block,inner) +-- local current = found and found.entries and found.entries.text +-- if current and not done[current] then +-- rj[#rj+1] = { blk, inner, current } +-- done[current] = true +-- end +-- end +-- end +-- for where, result in next, results do +-- if where then -- else errors +-- sort(result,compare) +-- end +-- end +-- local first, last, firsti, lasti, firstr, lastr +-- local function finish(cw) +-- if first then +-- if last > first + 1 then +-- cw[#cw+1] = { firstr[1], firstr[2], lastr[1], lastr[2] } +-- else +-- cw[#cw+1] = { firstr[1], firstr[2] } +-- if last > first then +-- cw[#cw+1] = { lastr[1], lastr[2] } +-- end +-- end +-- end +-- end +-- local collections = { } +-- for where, result in next, results do +-- if where == jobname then +-- local cw = { } +-- for i=1,#result do +-- local r = result[i] +-- local current = r[3] +-- if not first then +-- first, last, firsti, lasti, firstr, lastr = current, current, i, i, r, r +-- elseif current == last + 1 then +-- last, lasti, lastr = current, i, r +-- else +-- finish(cw) +-- first, last, firsti, lasti, firstr, lastr = current, current, i, i, r, r +-- end +-- end +-- finish(cw) +-- if next(cw) then collections[where] = cw end +-- elseif where == false then +-- collections[where] = result -- temp hack +-- else +-- collections[where] = result -- temp hack +-- end +-- end +-- for where, collection in next, collections do +-- local n = #collection +-- for i=1,n do +-- local c = collection[i] +-- if where == jobname then +-- -- internals +-- if c[4] then +-- texsprint(ctxcatcodes,format("\\dowithbibtexnumrefrange{%s}{%s}{%s}{%s}{%s}{%s}{%s}",n,i,prefix,c[1],c[2],c[3],c[4])) +-- else +-- texsprint(ctxcatcodes,format("\\dowithbibtexnumref{%s}{%s}{%s}{%s}{%s}",n,i,prefix,c[1],c[2])) +-- end +-- elseif where == false then +-- -- errors +-- texsprint(ctxcatcodes,c[1]) +-- else +-- -- externals +-- texsprint(ctxcatcodes,c[1]) +-- end +-- end +-- end +-- end +-- end diff --git a/tex/context/base/bibl-tra.mkiv b/tex/context/base/bibl-tra.mkiv index 30211fcad..84e8bf44c 100644 --- a/tex/context/base/bibl-tra.mkiv +++ b/tex/context/base/bibl-tra.mkiv @@ -163,6 +163,7 @@ %D \item All constants, variables, message etc.\ are now in the core. %D \item Added: method=local|global (when global, previous shown entries are %D not shown again. +%D \item Added: state=start for initial loading. %D \stopitemize %D %D \subject{WISHLIST} @@ -326,12 +327,13 @@ %D \macros{usepublications} %D -%D We need \type{\usereferences} so that it is possible to -%D refer to page and/or appearance number for publications -%D in the other document. +%D After discussing it with Thomas Schmitz it became clear that using external +%D references makes no sense as one needs to refer to it in special ways and +%D because similar numbers can be confusing. So, for the moment this is not +%D supported in \MKIV. (So no: see reference [3-5,9] in "some other document") \def\usepublications[#1]% - {\usereferences[#1]\processcommalist[#1]\dousepublications} + {\processcommalist[#1]\dousepublications} \def\dousepublications#1% {\doonlyonce{#1.\f!bibextension} @@ -436,7 +438,7 @@ {\bibdoifelse\@@pb@month {#1\doifnumberelse\@@pb@month {\doifconversiondefinedelse\@@pbmonthconversion - {\convertnumber\@@pbmonthconversion{\@@pb@month}}{\@@pb@month}}% + {\convertnumber\@@pbmonthconversion\@@pb@month}{\@@pb@month}}% {\@@pb@month}#2}% {#3}} @@ -884,27 +886,28 @@ % we'll define proper handlers later \def\doplacepublicationindeed#1% - {\global\advance\bibtexcounter\plusone - \def\currentpublicationkey{#1}% - \ctxlua{bibtex.hacks.registerplaced("#1")}% - \dodolistelement - {pubs}% - {}% - {\number\bibtexcounter}% - {\expanded{\reference[\bibrefprefix#1]{\number\bibtexcounter}}% - \strut\dotypesetapublication{#1}\strut}% - {}% - {}} + {\doifbibreferencefoundelse{#1} + {\global\advance\bibtexcounter\plusone + \def\currentpublicationkey{#1}% + \ctxlua{bibtex.hacks.registerplaced("#1")}% + \dodolistelement + {pubs}% + {}% + {\number\bibtexcounter}% + {\expanded{\reference[\bibrefprefix#1]{\number\bibtexcounter}}% + \strut\dotypesetapublication{#1}\strut}% + {}% + {}} + {}} % invalid \def\dotypesetapublication#1% {\bgroup \def\@@currentalternative{:l:}% \presetbibvariables \let\biblanguage\empty - \ignorespaces\bibgetvard{#1}% - %\ifcsname pbdt-#1\endcsname - \bibalternative{\bibgetvart{#1}}% - %\fi + \ignorespaces + \bibgetvard{#1}% + \bibalternative{\bibgetvart{#1}}% \egroup} %D An few afterthoughts: @@ -1484,15 +1487,22 @@ %D And some defaults are loaded from bibl-apa: +\def\c!monthconversion{monthconversion} % todo + \setuppublications - [\v!month\v!conversion=, % hm, will become \c!monthconversion + [\c!state=\v!stop, + \c!monthconversion=, \c!alternative=apa, \c!method=\v!global, \c!refcommand=num, \c!numbercommand=\bibleftnumber] -\def\preloadbiblist{\dousepublications\jobname} +\def\preloadbiblist + {\doif\@@pbstate\v!start + {\globallet\preloadbiblist\relax + \dousepublications\jobname}} +\appendtoks \preloadbiblist \to \everysetuppublications \appendtoks \preloadbiblist \to \everystarttext \protect \endinput diff --git a/tex/context/base/buff-ini.lua b/tex/context/base/buff-ini.lua index f02963d6a..39788d2e1 100644 --- a/tex/context/base/buff-ini.lua +++ b/tex/context/base/buff-ini.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['buff-ini'] = { version = 1.001, - comment = "companion to core-buf.tex", + comment = "companion to core-buf.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/buff-ini.mkiv b/tex/context/base/buff-ini.mkiv index 29ce4687d..0c258a81d 100644 --- a/tex/context/base/buff-ini.mkiv +++ b/tex/context/base/buff-ini.mkiv @@ -51,11 +51,7 @@ % \stoptext \ifdefined\doinitializeverbatim \else% temp hack - \ifdefined\mkinitializeverbatim - \let\doinitializeverbatim\mkinitializeverbatim - \else - \def\doinitializeverbatim{\tttf} - \fi + \def\doinitializeverbatim{\tttf} \fi \unprotect @@ -174,7 +170,7 @@ \def\definebuffer {\dodoubleempty\dodefinebuffer} -\def\getbuffer +\unexpanded\def\getbuffer {\dodoubleempty\dogetbuffer} \def\dogetbuffer[#1][#2]% @@ -191,7 +187,7 @@ \dobuffer{16}{#2}\dogetbufferasis \getvalue{\??bu#1\c!after}} -\def\typebuffer +\unexpanded\def\typebuffer {\dodoubleempty\dotypebuffer} \def\doprocessbufferverbatim diff --git a/tex/context/base/catc-ini.lua b/tex/context/base/catc-ini.lua index e1558b459..90fe08bb4 100644 --- a/tex/context/base/catc-ini.lua +++ b/tex/context/base/catc-ini.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['catc-ini'] = { version = 1.001, - comment = "companion to catc-ini.tex", + comment = "companion to catc-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/char-cmp.lua b/tex/context/base/char-cmp.lua index bd3360499..42a354cb8 100644 --- a/tex/context/base/char-cmp.lua +++ b/tex/context/base/char-cmp.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['char-cmp'] = { version = 1.001, - comment = "companion to char-ini.tex", + comment = "companion to char-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/char-def.lua b/tex/context/base/char-def.lua index 665572ee8..6256852fb 100644 --- a/tex/context/base/char-def.lua +++ b/tex/context/base/char-def.lua @@ -1,5 +1,6 @@ if not modules then modules = { } end modules ['char-def'] = { version = 1.001, + comment = "companion to char-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/char-enc.lua b/tex/context/base/char-enc.lua index a4e5ac77d..45f404ee9 100644 --- a/tex/context/base/char-enc.lua +++ b/tex/context/base/char-enc.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['char-syn'] = { version = 1.001, - comment = "companion to char-ini.tex", + comment = "companion to char-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/char-ini.lua b/tex/context/base/char-ini.lua index ff42d91ee..4a981bb9b 100644 --- a/tex/context/base/char-ini.lua +++ b/tex/context/base/char-ini.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['char-ini'] = { version = 1.001, - comment = "companion to char-ini.tex", + comment = "companion to char-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/char-ini.mkiv b/tex/context/base/char-ini.mkiv index daa20e728..eb11fd83c 100644 --- a/tex/context/base/char-ini.mkiv +++ b/tex/context/base/char-ini.mkiv @@ -69,6 +69,7 @@ \number\xmlcatcodesr, } ) + catcodes.register("xmlcatcodes",\number\xmlcatcodes) } \protect \endinput diff --git a/tex/context/base/char-map.lua b/tex/context/base/char-map.lua index 0d8422bc2..3f8cc3b3d 100644 --- a/tex/context/base/char-map.lua +++ b/tex/context/base/char-map.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['char-map'] = { version = 1.001, - comment = "companion to char-ini.tex", + comment = "companion to char-ini.mkiv", author = "Hans Hagen & Arthur Reutenauer", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/char-utf.lua b/tex/context/base/char-utf.lua index 7dd5d914f..6dd85fdc8 100644 --- a/tex/context/base/char-utf.lua +++ b/tex/context/base/char-utf.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['char-utf'] = { version = 1.001, - comment = "companion to char-utf.tex", + comment = "companion to char-utf.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/chem-ini.lua b/tex/context/base/chem-ini.lua index 27b734840..a4af57256 100644 --- a/tex/context/base/chem-ini.lua +++ b/tex/context/base/chem-ini.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['chem-ini'] = { version = 1.001, - comment = "companion to chem-ini.tex", + comment = "companion to chem-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/chem-str.lua b/tex/context/base/chem-str.lua index 8ab48fca2..1a68450f9 100644 --- a/tex/context/base/chem-str.lua +++ b/tex/context/base/chem-str.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['chem-str'] = { version = 1.001, - comment = "companion to chem-str.tex", + comment = "companion to chem-str.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/colo-ini.lua b/tex/context/base/colo-ini.lua index a67df6a77..256af4707 100644 --- a/tex/context/base/colo-ini.lua +++ b/tex/context/base/colo-ini.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['colo-ini'] = { version = 1.000, - comment = "companion to colo-ini.tex", + comment = "companion to colo-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex index 3a6fc6c99..4d99eec1f 100644 --- a/tex/context/base/cont-new.tex +++ b/tex/context/base/cont-new.tex @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2009.08.22 18:35} +\newcontextversion{2009.08.26 01:43} %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.mkii b/tex/context/base/context.mkii index 7c1294f3b..e418d7a26 100644 --- a/tex/context/base/context.mkii +++ b/tex/context/base/context.mkii @@ -192,6 +192,7 @@ \loadmarkfile{pack-rul} \loadmarkfile{trac-vis} \loadmarkfile{strc-num} +\loadmarkfile{tabl-com} \loadmarkfile{tabl-pln} \loadmarkfile{tabl-tab} \loadmarkfile{tabl-tsp} diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 5771f1950..1f8de3e0a 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -20,8 +20,8 @@ \loadcorefile{syst-ini} -\ifnum\luatexversion<43 - \writestatus{!!!!}{Your luatex binary is way too old, you need at least version 0.42.} +\ifnum\luatexversion<43 % also change message + \writestatus{!!!!}{Your luatex binary is way too old, you need at least version 0.43!} \expandafter\end \fi @@ -213,6 +213,7 @@ \loadmarkfile{scrn-bar} \loadmarkfile{strc-bkm} % bookmarks +\loadmarkfile{tabl-com} \loadmarkfile{tabl-pln} \loadcorefile{thrd-tab} \loadmarkfile{tabl-tab} diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex index 01fe25f90..63ba86f3d 100644 --- a/tex/context/base/context.tex +++ b/tex/context/base/context.tex @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2009.08.22 18:35} +\edef\contextversion{2009.08.26 01:43} %D For those who want to use this: diff --git a/tex/context/base/core-con.lua b/tex/context/base/core-con.lua index e13f68456..47d6ca658 100644 --- a/tex/context/base/core-con.lua +++ b/tex/context/base/core-con.lua @@ -1,6 +1,6 @@ -if not modules then modules = { } end modules ['char-con'] = { +if not modules then modules = { } end modules ['core-con'] = { version = 1.001, - comment = "companion to core-con.tex", + comment = "companion to core-con.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/core-ctx.lua b/tex/context/base/core-ctx.lua index eb9003bf1..7c6cef07a 100644 --- a/tex/context/base/core-ctx.lua +++ b/tex/context/base/core-ctx.lua @@ -1,6 +1,6 @@ -if not modules then modules = { } end modules ['supp-fil'] = { +if not modules then modules = { } end modules ['core-ctx'] = { version = 1.001, - comment = "companion to supp-fil.tex", + comment = "companion to core-ctx.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/core-job.lua b/tex/context/base/core-job.lua index fb4f76de1..af2c71551 100644 --- a/tex/context/base/core-job.lua +++ b/tex/context/base/core-job.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['core-job'] = { version = 1.001, - comment = "companion to core-job.tex", + comment = "companion to core-job.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/core-spa.lua b/tex/context/base/core-spa.lua index ab08755cc..e32e968e1 100644 --- a/tex/context/base/core-spa.lua +++ b/tex/context/base/core-spa.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['core-spa'] = { version = 1.001, - comment = "companion to core-spa.tex", + comment = "companion to core-spa.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/core-two.lua b/tex/context/base/core-two.lua index 50c356f7b..f81b578ad 100644 --- a/tex/context/base/core-two.lua +++ b/tex/context/base/core-two.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['core-two'] = { version = 1.001, - comment = "companion to core-two.tex", + comment = "companion to core-two.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/core-uti.lua b/tex/context/base/core-uti.lua index 9a44aef78..e98012dab 100644 --- a/tex/context/base/core-uti.lua +++ b/tex/context/base/core-uti.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['core-uti'] = { version = 1.001, - comment = "companion to core-uti.tex", + comment = "companion to core-uti.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" @@ -39,8 +39,6 @@ end job.comment(format("version: %1.2f",jobs.version)) -job._save_, job._load_ = { }, { } - function job.initialize(loadname,savename) job.load(loadname) main.register_stop_actions(function() @@ -185,7 +183,6 @@ function packer.strip(p) p.hash = nil end - local packlist = { "numbers", "metadata", @@ -195,13 +192,15 @@ local packlist = { "pagedata", "directives", "specification", - "references", +-- "references", -- we need to rename of them as only one packs (not structure.lists.references) } local jobpacker = packer.new(packlist,1.01) job.pack = true +job._save_, job._load_ = { }, { } -- registers timing + function job.save(filename) statistics.starttiming(job._save_) local f = io.open(filename,'w') @@ -246,7 +245,7 @@ function job.load(filename) for l=1,#savelist do local list = savelist[l] local target, initializer = list[1], list[3] - packer.unpack(aux.accesstable(target),job.packer,true) + packer.unpack(aux.accesstable(target),job.packer,true) if type(initializer) == "function" then initializer(aux.accesstable(target)) end diff --git a/tex/context/base/data-aux.lua b/tex/context/base/data-aux.lua index 492cce6fd..923c6bb91 100644 --- a/tex/context/base/data-aux.lua +++ b/tex/context/base/data-aux.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['data-aux'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to luat-lib.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/data-bin.lua b/tex/context/base/data-bin.lua index 5f342c339..6e967fb1a 100644 --- a/tex/context/base/data-bin.lua +++ b/tex/context/base/data-bin.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['data-bin'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to luat-lib.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/data-con.lua b/tex/context/base/data-con.lua index 02ee9eedd..d35bc7ab1 100644 --- a/tex/context/base/data-con.lua +++ b/tex/context/base/data-con.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['data-con'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to luat-lib.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/data-crl.lua b/tex/context/base/data-crl.lua index 5cad241a6..bc9ff98b5 100644 --- a/tex/context/base/data-crl.lua +++ b/tex/context/base/data-crl.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['data-crl'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to luat-lib.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/data-ctx.lua b/tex/context/base/data-ctx.lua index 00d307b6d..b252ff9fa 100644 --- a/tex/context/base/data-ctx.lua +++ b/tex/context/base/data-ctx.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['data-ctx'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to luat-lib.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/data-gen.lua b/tex/context/base/data-gen.lua index 8537b0526..5a0755831 100644 --- a/tex/context/base/data-gen.lua +++ b/tex/context/base/data-gen.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['data-gen'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to luat-lib.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/data-inp.lua b/tex/context/base/data-inp.lua index 700e982c2..b7354e1ae 100644 --- a/tex/context/base/data-inp.lua +++ b/tex/context/base/data-inp.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['data-inp'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to luat-lib.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/data-lst.lua b/tex/context/base/data-lst.lua index 10d3ea479..5ee9bd03d 100644 --- a/tex/context/base/data-lst.lua +++ b/tex/context/base/data-lst.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['data-lst'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to luat-lib.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/data-lua.lua b/tex/context/base/data-lua.lua index 86231b3a3..7ad5edd57 100644 --- a/tex/context/base/data-lua.lua +++ b/tex/context/base/data-lua.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['data-lua'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to luat-lib.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/data-out.lua b/tex/context/base/data-out.lua index b774e25fc..f73ff9bdc 100644 --- a/tex/context/base/data-out.lua +++ b/tex/context/base/data-out.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['data-out'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to luat-lib.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/data-pre.lua b/tex/context/base/data-pre.lua index deee9ebf4..5cf5c93d5 100644 --- a/tex/context/base/data-pre.lua +++ b/tex/context/base/data-pre.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['data-res'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to luat-lib.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/data-res.lua b/tex/context/base/data-res.lua index 39e4aa208..9738cfaff 100644 --- a/tex/context/base/data-res.lua +++ b/tex/context/base/data-res.lua @@ -1,9 +1,9 @@ if not modules then modules = { } end modules ['data-inp'] = { version = 1.001, + comment = "companion to luat-lib.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files", - comment = "companion to luat-lib.tex", } -- After a few years using the code the large luat-inp.lua file diff --git a/tex/context/base/data-tex.lua b/tex/context/base/data-tex.lua index 16b6b125f..6407fea49 100644 --- a/tex/context/base/data-tex.lua +++ b/tex/context/base/data-tex.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['data-tex'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to luat-lib.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/data-tmf.lua b/tex/context/base/data-tmf.lua index 302841a65..4ba8c388d 100644 --- a/tex/context/base/data-tmf.lua +++ b/tex/context/base/data-tmf.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['data-tmf'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to luat-lib.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/data-tmp.lua b/tex/context/base/data-tmp.lua index 72875dcb7..802af6e4e 100644 --- a/tex/context/base/data-tmp.lua +++ b/tex/context/base/data-tmp.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['data-tmp'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to luat-lib.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/data-tre.lua b/tex/context/base/data-tre.lua index 9cac73b8e..74630b69b 100644 --- a/tex/context/base/data-tre.lua +++ b/tex/context/base/data-tre.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['data-tre'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to luat-lib.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/data-use.lua b/tex/context/base/data-use.lua index 609ffd88f..a88f55c18 100644 --- a/tex/context/base/data-use.lua +++ b/tex/context/base/data-use.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['data-use'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to luat-lib.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/data-zip.lua b/tex/context/base/data-zip.lua index dcb6b170a..97022c7d8 100644 --- a/tex/context/base/data-zip.lua +++ b/tex/context/base/data-zip.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['data-zip'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to luat-lib.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/font-afm.lua b/tex/context/base/font-afm.lua index 81b47a269..72b36600c 100644 --- a/tex/context/base/font-afm.lua +++ b/tex/context/base/font-afm.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['font-afm'] = { version = 1.001, - comment = "companion to font-ini.tex", + comment = "companion to font-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/font-chk.lua b/tex/context/base/font-chk.lua index 382f671d8..079712bae 100644 --- a/tex/context/base/font-chk.lua +++ b/tex/context/base/font-chk.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['font-chk'] = { version = 1.001, - comment = "companion to font-ini.tex", + comment = "companion to font-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/font-col.lua b/tex/context/base/font-col.lua index f2ee3f1ae..596a4946c 100644 --- a/tex/context/base/font-col.lua +++ b/tex/context/base/font-col.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['font-col'] = { version = 1.001, - comment = "companion to font-ini.tex", + comment = "companion to font-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/font-ctx.lua b/tex/context/base/font-ctx.lua index 2f51c5229..23f745130 100644 --- a/tex/context/base/font-ctx.lua +++ b/tex/context/base/font-ctx.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['font-ctx'] = { version = 1.001, - comment = "companion to font-ini.tex", + comment = "companion to font-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/font-def.lua b/tex/context/base/font-def.lua index 28afe670b..9c9a67178 100644 --- a/tex/context/base/font-def.lua +++ b/tex/context/base/font-def.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['font-def'] = { version = 1.001, - comment = "companion to font-ini.tex", + comment = "companion to font-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/font-enc.lua b/tex/context/base/font-enc.lua index faeae3a10..f43a212c4 100644 --- a/tex/context/base/font-enc.lua +++ b/tex/context/base/font-enc.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['font-enc'] = { version = 1.001, - comment = "companion to font-ini.tex", + comment = "companion to font-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/font-ext.lua b/tex/context/base/font-ext.lua index 17c302c53..bc741cc5d 100644 --- a/tex/context/base/font-ext.lua +++ b/tex/context/base/font-ext.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['font-ext'] = { version = 1.001, - comment = "companion to font-ini.tex and hand-ini.tex", + comment = "companion to font-ini.mkiv and hand-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/font-fbk.lua b/tex/context/base/font-fbk.lua index 6c4f78a3c..1ad1cc781 100644 --- a/tex/context/base/font-fbk.lua +++ b/tex/context/base/font-fbk.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['font-fbk'] = { version = 1.001, - comment = "companion to font-ini.tex", + comment = "companion to font-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/font-ini.lua b/tex/context/base/font-ini.lua index 4005726a5..6bebf6a86 100644 --- a/tex/context/base/font-ini.lua +++ b/tex/context/base/font-ini.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['font-ini'] = { version = 1.001, - comment = "companion to font-ini.tex", + comment = "companion to font-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/font-log.lua b/tex/context/base/font-log.lua index af0b2552f..74586664e 100644 --- a/tex/context/base/font-log.lua +++ b/tex/context/base/font-log.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['font-log'] = { version = 1.001, - comment = "companion to font-ini.tex", + comment = "companion to font-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/font-map.lua b/tex/context/base/font-map.lua index c597d4855..5a034727f 100644 --- a/tex/context/base/font-map.lua +++ b/tex/context/base/font-map.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['font-map'] = { version = 1.001, - comment = "companion to font-ini.tex", + comment = "companion to font-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/font-ota.lua b/tex/context/base/font-ota.lua index 72e7414c8..e2fa3f290 100644 --- a/tex/context/base/font-ota.lua +++ b/tex/context/base/font-ota.lua @@ -131,7 +131,8 @@ local isol_fina = { [0x06D3] = true, [0x06D5] = true, [0x06EE] = true, [0x06EF] = true, [0x0759] = true, [0x075A] = true, [0x075B] = true, [0x076B] = true, [0x076C] = true, [0x0771] = true, [0x0773] = true, [0x0774] = true, - [0x0778] = true, [0x0779] = true, + [0x0778] = true, [0x0779] = true, [0xFEF5] = true, [0xFEF7] = true, + [0xFEF9] = true, [0xFEFB] = true, } local isol_fina_medi_init = { diff --git a/tex/context/base/font-otb.lua b/tex/context/base/font-otb.lua index a4606d319..b80c88b39 100644 --- a/tex/context/base/font-otb.lua +++ b/tex/context/base/font-otb.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['font-otb'] = { version = 1.001, - comment = "companion to font-ini.tex", + comment = "companion to font-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/font-otd.lua b/tex/context/base/font-otd.lua index 78a828146..41e885331 100644 --- a/tex/context/base/font-otd.lua +++ b/tex/context/base/font-otd.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['font-otd'] = { version = 1.001, - comment = "companion to font-ini.tex", + comment = "companion to font-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/font-otf.lua b/tex/context/base/font-otf.lua index e8867c53d..ab93c73ac 100644 --- a/tex/context/base/font-otf.lua +++ b/tex/context/base/font-otf.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['font-otf'] = { version = 1.001, - comment = "companion to font-ini.tex", + comment = "companion to font-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/font-oti.lua b/tex/context/base/font-oti.lua index cbac6d36a..4cb270626 100644 --- a/tex/context/base/font-oti.lua +++ b/tex/context/base/font-oti.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['font-oti'] = { version = 1.001, - comment = "companion to font-ini.tex", + comment = "companion to font-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/font-otn.lua b/tex/context/base/font-otn.lua index 3c11b84f1..51ecc3811 100644 --- a/tex/context/base/font-otn.lua +++ b/tex/context/base/font-otn.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['font-otn'] = { version = 1.001, - comment = "companion to font-ini.tex", + comment = "companion to font-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/font-pat.lua b/tex/context/base/font-pat.lua index ae91700a9..4a97248c4 100644 --- a/tex/context/base/font-pat.lua +++ b/tex/context/base/font-pat.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['font-pat'] = { version = 1.001, - comment = "companion to font-ini.tex", + comment = "companion to font-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/font-syn.lua b/tex/context/base/font-syn.lua index 828808ec5..8b7aa72ef 100644 --- a/tex/context/base/font-syn.lua +++ b/tex/context/base/font-syn.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['font-syn'] = { version = 1.001, - comment = "companion to font-ini.tex", + comment = "companion to font-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/font-tfm.lua b/tex/context/base/font-tfm.lua index b2015723e..aeaf4fc94 100644 --- a/tex/context/base/font-tfm.lua +++ b/tex/context/base/font-tfm.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['font-tfm'] = { version = 1.001, - comment = "companion to font-ini.tex", + comment = "companion to font-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/font-vf.lua b/tex/context/base/font-vf.lua index c103555a3..4f99c47b9 100644 --- a/tex/context/base/font-vf.lua +++ b/tex/context/base/font-vf.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['font-vf'] = { version = 1.001, - comment = "companion to font-ini.tex", + comment = "companion to font-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/font-xtx.lua b/tex/context/base/font-xtx.lua index 7b3f1ec81..8aecae8d9 100644 --- a/tex/context/base/font-xtx.lua +++ b/tex/context/base/font-xtx.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['font-xtx'] = { version = 1.001, - comment = "companion to font-ini.tex", + comment = "companion to font-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/grph-inc.lua b/tex/context/base/grph-inc.lua index ef1df8e0b..df60b87ba 100644 --- a/tex/context/base/grph-inc.lua +++ b/tex/context/base/grph-inc.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['grph-inc'] = { version = 1.001, - comment = "companion to grph-inc.tex", + comment = "companion to grph-inc.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/grph-u3d.lua b/tex/context/base/grph-u3d.lua index e5944691c..d69240113 100644 --- a/tex/context/base/grph-u3d.lua +++ b/tex/context/base/grph-u3d.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['grph-u3d'] = { version = 1.001, - comment = "companion to grph-inc.tex", + comment = "companion to grph-inc.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/java-ini.lua b/tex/context/base/java-ini.lua index 161a1657e..9e3679bbf 100644 --- a/tex/context/base/java-ini.lua +++ b/tex/context/base/java-ini.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['java-ini'] = { version = 1.001, - comment = "companion to java-ini.tex", + comment = "companion to java-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/l-aux.lua b/tex/context/base/l-aux.lua index 0e5babeeb..39b8f9546 100644 --- a/tex/context/base/l-aux.lua +++ b/tex/context/base/l-aux.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['l-aux'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to luat-lib.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/l-boolean.lua b/tex/context/base/l-boolean.lua index c8c919eda..be7ec7d57 100644 --- a/tex/context/base/l-boolean.lua +++ b/tex/context/base/l-boolean.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['l-boolean'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to luat-lib.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/l-dir.lua b/tex/context/base/l-dir.lua index 5a726303f..db0737e5b 100644 --- a/tex/context/base/l-dir.lua +++ b/tex/context/base/l-dir.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['l-dir'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to luat-lib.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/l-file.lua b/tex/context/base/l-file.lua index 0782ac676..bdb4872d7 100644 --- a/tex/context/base/l-file.lua +++ b/tex/context/base/l-file.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['l-file'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to luat-lib.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/l-io.lua b/tex/context/base/l-io.lua index bcdf8791e..a77edb107 100644 --- a/tex/context/base/l-io.lua +++ b/tex/context/base/l-io.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['l-io'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to luat-lib.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/l-lpeg.lua b/tex/context/base/l-lpeg.lua index 88b445717..41dc2769b 100644 --- a/tex/context/base/l-lpeg.lua +++ b/tex/context/base/l-lpeg.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['l-lpeg'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to luat-lib.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/l-math.lua b/tex/context/base/l-math.lua index bfb3d506b..fc8db4721 100644 --- a/tex/context/base/l-math.lua +++ b/tex/context/base/l-math.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['l-math'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to luat-lib.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/l-number.lua b/tex/context/base/l-number.lua index 18d488a1a..c0434fd5d 100644 --- a/tex/context/base/l-number.lua +++ b/tex/context/base/l-number.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['l-number'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to luat-lib.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/l-os.lua b/tex/context/base/l-os.lua index 47b47fa4f..6806ec5ae 100644 --- a/tex/context/base/l-os.lua +++ b/tex/context/base/l-os.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['l-os'] = { version = 1.001, - comment = "companion to luat-lub.tex", + comment = "companion to luat-lib.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/l-set.lua b/tex/context/base/l-set.lua index 7fc67b24b..f844d0b40 100644 --- a/tex/context/base/l-set.lua +++ b/tex/context/base/l-set.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['l-set'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to luat-lib.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/l-string.lua b/tex/context/base/l-string.lua index f46d6df24..655214d1a 100644 --- a/tex/context/base/l-string.lua +++ b/tex/context/base/l-string.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['l-string'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to luat-lib.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/l-table.lua b/tex/context/base/l-table.lua index 90cb068e2..02bc47bf8 100644 --- a/tex/context/base/l-table.lua +++ b/tex/context/base/l-table.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['l-table'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to luat-lib.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/l-unicode.lua b/tex/context/base/l-unicode.lua index 124a1e240..a3b45028a 100644 --- a/tex/context/base/l-unicode.lua +++ b/tex/context/base/l-unicode.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['l-unicode'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to luat-lib.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/l-url.lua b/tex/context/base/l-url.lua index 097c94467..5d899e69e 100644 --- a/tex/context/base/l-url.lua +++ b/tex/context/base/l-url.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['l-url'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to luat-lib.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/l-utils.lua b/tex/context/base/l-utils.lua index 8d531711f..313381065 100644 --- a/tex/context/base/l-utils.lua +++ b/tex/context/base/l-utils.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['l-utils'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to luat-lib.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/l-xml.lua b/tex/context/base/l-xml.lua index 8b8a6ce44..bae492a32 100644 --- a/tex/context/base/l-xml.lua +++ b/tex/context/base/l-xml.lua @@ -163,6 +163,14 @@ local x = xml.convert(somestring)

An optional second boolean argument tells this function not to create a root element.

+ +

Valid entities are:

+ + + + + + --ldx]]-- xml.strip_cm_and_dt = false -- an extra global flag, in case we have many includes @@ -312,19 +320,27 @@ dt[0] = top local somecomment = C((1 - endcomment )^0) local somecdata = C((1 - endcdata )^0) - local function entity(k,v) entities[k] = v end + local function normalentity(k,v ) entities[k] = v end + local function systementity(k,v,n) entities[k] = v end + local function publicentity(k,v,n) entities[k] = v end local begindoctype = open * P("!DOCTYPE") local enddoctype = close local beginset = P("[") local endset = P("]") - local doctypename = C((1-somespace)^0) + local doctypename = C((1-somespace-close)^0) local elementdoctype = optionalspace * P("\plusone#3\fi - \xmlidx{#1}{#2}{\recurselevel} - } + \dorecurse \scratchcounter + {\ifnum\recurselevel>\plusone#3\fi + \xmlidx{#1}{#2}\recurselevel}% \fi} \def\xmlcdataobeyedline {\obeyedline} @@ -226,7 +228,7 @@ \def\stopxmldisplayverbatim {\endofverbatimlines \stoppacked} % \endgroup - \mkinitializeverbatim + \doinitializeverbatim \beginofverbatimlines} \def\startxmlinlineverbatim[#1]% @@ -234,7 +236,7 @@ \let\currenttypingclass\??ty \edef\currenttyping{xml:#1}% \let\stopxmldisplayverbatim\endgroup - \mkinitializeverbatim} + \doinitializeverbatim} % will move but is developed for xml @@ -405,4 +407,16 @@ {\let\processXMLfilegrouped\normalprocessXMLfilegrouped \doifelsenothing{#1}{\xmlprocess{main}{##1}{}}{\xmlprocess{#1}{##1}{}}}} +%D Experimental: + +%def\xmladdindex #1{\ctxlua{lxml.addindex("#1")}} +\def\xmlgetindex #1{\ctxlua{lxml.getindex("\xmldocument","#1")}} +\def\xmlrawindex #1{\ctxlua{lxml.rawindex("#1")}} +\def\xmlwithindex#1#2{\ctxlua{lxml.withindex("\xmldocument","#1","#2")}} +\def\xmlreference#1#2{\string\xmlwithindex{#1}{#2}} + +\startxmlsetups xml:flush + \xmlflush{#1} +\stopxmlsetups + \protect \endinput diff --git a/tex/context/base/lxml-tab.lua b/tex/context/base/lxml-tab.lua index 77c28f8d3..38d19f4b9 100644 --- a/tex/context/base/lxml-tab.lua +++ b/tex/context/base/lxml-tab.lua @@ -151,6 +151,14 @@ local x = xml.convert(somestring)

An optional second boolean argument tells this function not to create a root element.

+ +

Valid entities are:

+ + + + + + --ldx]]-- xml.strip_cm_and_dt = false -- an extra global flag, in case we have many includes @@ -304,19 +312,27 @@ local someinstruction = C((1 - endinstruction)^0) local somecomment = C((1 - endcomment )^0) local somecdata = C((1 - endcdata )^0) -local function entity(k,v) entities[k] = v end +local function normalentity(k,v ) entities[k] = v end +local function systementity(k,v,n) entities[k] = v end +local function publicentity(k,v,n) entities[k] = v end local begindoctype = open * P("!DOCTYPE") local enddoctype = close local beginset = P("[") local endset = P("]") -local doctypename = C((1-somespace)^0) +local doctypename = C((1-somespace-close)^0) local elementdoctype = optionalspace * P("<%s>%s",tag,title,tag)) texsprint(ctxcatcodes,format("\\xmlprocessbuffer{%s}{%s}{}",metadata.xmlroot or "main",tag)) + elseif metadata.xmlsetup then + texsprint(ctxcatcodes,format("\\xmlsetup{%s}{%s}",title,metadata.xmlsetup)) -- nasty else - texsprint(metadata.catcodes,title) + local catcodes = metadata.catcodes + if catcodes == xmlcatcodes then + texsprint(ctxcatcodes,title) -- nasty + else + texsprint(catcodes,title) + end end else texsprint(title) -- no catcode switch diff --git a/tex/context/base/strc-itm.lua b/tex/context/base/strc-itm.lua index fc609b448..e776f326d 100644 --- a/tex/context/base/strc-itm.lua +++ b/tex/context/base/strc-itm.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['strc-itm'] = { version = 1.001, - comment = "companion to strc-itm.tex", + comment = "companion to strc-itm.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/strc-lst.lua b/tex/context/base/strc-lst.lua index 592ea35e7..d6559a75c 100644 --- a/tex/context/base/strc-lst.lua +++ b/tex/context/base/strc-lst.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['strc-lst'] = { version = 1.001, - comment = "companion to strc-lst.tex", + comment = "companion to strc-lst.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" @@ -351,7 +351,6 @@ function lists.title(name,n,tag) -- tag becomes obsolete local titledata = data.titledata if titledata then helpers.title(titledata[tag] or titledata.list or titledata.title or "",data.metadata) ---~ texsprint(ctxcatcodes,titledata[tag] or titledata.list or titledata.title or "") end end end diff --git a/tex/context/base/strc-mar.lua b/tex/context/base/strc-mar.lua index f0d6df314..8ee814d77 100644 --- a/tex/context/base/strc-mar.lua +++ b/tex/context/base/strc-mar.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['strc-mar'] = { version = 1.001, - comment = "companion to strc-mar.tex", + comment = "companion to strc-mar.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/strc-mat.lua b/tex/context/base/strc-mat.lua index ba64bf9db..291cc8845 100644 --- a/tex/context/base/strc-mat.lua +++ b/tex/context/base/strc-mat.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['strc-mat'] = { version = 1.001, - comment = "companion to strc-mat.tex", + comment = "companion to strc-mat.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/strc-not.lua b/tex/context/base/strc-not.lua index 32a836ba8..266e22edc 100644 --- a/tex/context/base/strc-not.lua +++ b/tex/context/base/strc-not.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['strc-not'] = { version = 1.001, - comment = "companion to strc-not.tex", + comment = "companion to strc-not.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/strc-num.lua b/tex/context/base/strc-num.lua index 431200b39..bd0c4eb08 100644 --- a/tex/context/base/strc-num.lua +++ b/tex/context/base/strc-num.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['strc-num'] = { version = 1.001, - comment = "companion to strc-num.tex", + comment = "companion to strc-num.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/strc-pag.lua b/tex/context/base/strc-pag.lua index b95f0842a..a8e2ce0d6 100644 --- a/tex/context/base/strc-pag.lua +++ b/tex/context/base/strc-pag.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['strc-pag'] = { version = 1.001, - comment = "companion to strc-pag.tex", + comment = "companion to strc-pag.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/strc-prc.lua b/tex/context/base/strc-prc.lua index 35e7000db..b1a1fb0a9 100644 --- a/tex/context/base/strc-prc.lua +++ b/tex/context/base/strc-prc.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['strc-prc'] = { version = 1.001, - comment = "companion to strc-prc.tex", + comment = "companion to strc-prc.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/strc-ref.lua b/tex/context/base/strc-ref.lua index 2684c287e..db2a8d25a 100644 --- a/tex/context/base/strc-ref.lua +++ b/tex/context/base/strc-ref.lua @@ -1,12 +1,12 @@ if not modules then modules = { } end modules ['strc-ref'] = { version = 1.001, - comment = "companion to strc-ref.tex", + comment = "companion to strc-ref.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" } -local format, find, gmatch, match = string.format, string.find, string.gmatch, string.match +local format, find, gmatch, match, concat = string.format, string.find, string.gmatch, string.match, table.concat local texsprint, texwrite, texcount = tex.sprint, tex.write, tex.count local trace_referencing = false trackers.register("structure.referencing", function(v) trace_referencing = v end) @@ -18,20 +18,25 @@ local constants = interfaces.constants -- beware, this is a first step in the rewrite (just getting rid of -- the tuo file); later all access and parsing will also move to lua +-- the useddata and pagedata names might change +-- todo: pack exported data + jobreferences = jobreferences or { } jobreferences.tobesaved = jobreferences.tobesaved or { } jobreferences.collected = jobreferences.collected or { } -jobreferences.documents = jobreferences.documents or { } jobreferences.defined = jobreferences.defined or { } -- indirect ones jobreferences.derived = jobreferences.derived or { } -- taken from lists jobreferences.specials = jobreferences.specials or { } -- system references jobreferences.runners = jobreferences.runners or { } jobreferences.internals = jobreferences.internals or { } +jobreferences.exporters = jobreferences.exporters or { } +jobreferences.imported = jobreferences.imported or { } storage.register("jobreferences/defined", jobreferences.defined, "jobreferences.defined") local tobesaved, collected = jobreferences.tobesaved, jobreferences.collected -local defined, derived, specials, runners = jobreferences.defined, jobreferences.derived, jobreferences.specials, jobreferences.runners +local defined, derived, specials = jobreferences.defined, jobreferences.derived, jobreferences.specials +local exporters, runners = jobreferences.exporters, jobreferences.runners local currentreference = nil @@ -74,9 +79,9 @@ function jobreferences.set(kind,prefix,tag,data) end end -function jobreferences.setandgetattribute(kind,prefix,tag,data) -- maybe do internal automatically here +function jobreferences.setandgetattribute(kind,prefix,tag,data,view) -- maybe do internal automatically here jobreferences.set(kind,prefix,tag,data) - texcount.lastdestinationattribute = jobreferences.setinternalreference(prefix,tag) or -0x7FFFFFFF + texcount.lastdestinationattribute = jobreferences.setinternalreference(prefix,tag,nil,view) or -0x7FFFFFFF end function jobreferences.enhance(prefix,tag,spec) @@ -147,7 +152,7 @@ function jobreferences.resolvers.section(var) local vi = structure.lists.collected[var.i[2]] if vi then var.i = vi - var.r = (vi.references and vi.references.realpage) or 1 + var.r = (vi.references and vi.references.realpage) or (vi.pagedata and vi.pagedata.realpage) or 1 else var.i = nil var.r = 1 @@ -163,7 +168,7 @@ function jobreferences.resolvers.reference(var) local vi = var.i[2] if vi then var.i = vi - var.r = (vi.references and vi.references.realpage) or 1 + var.r = (vi.references and vi.references.realpage) or (vi.pagedata and vi.pagedata.realpage) or 1 else var.i = nil var.r = 1 @@ -180,10 +185,10 @@ local function register_from_lists(collected,derived) local kind, realpage = m.kind, r.realpage if kind and realpage then local d = derived[prefix] if not d then d = { } derived[prefix] = d end ---~ d[reference] = { kind, i } -for s in gmatch(reference,"[^,]+") do - d[s] = { kind, i } -end + --~ d[reference] = { kind, i } + for s in gmatch(reference,"[^,]+") do + d[s] = { kind, i } + end end end end @@ -263,7 +268,7 @@ function jobreferences.whatfrom(name) texsprint(ctxcatcodes,(urls[name] and variables.url) or (files[name] and variables.file) or variables.unknown) end -function jobreferences.from(name,method,space) +function jobreferences.from(name) local u = urls[name] if u then local url, file, description = u[1], u[2], u[3] @@ -274,7 +279,7 @@ function jobreferences.from(name,method,space) else description = url end - texsprint(ctxcatcodes,description) + texsprint(ctxcatcodes,format("\\dofromurl{%s}",description)) else local f = files[name] if f then @@ -284,45 +289,151 @@ function jobreferences.from(name,method,space) else description = file end - texsprint(ctxcatcodes,description) + texsprint(ctxcatcodes,format("\\dofromfile{%s}",description)) + end + end +end + +-- export + +exporters.references = exporters.references or { } +exporters.lists = exporters.lists or { } + +function exporters.references.generic(data) + local useddata = {} + local entries, userdata = data.entries, data.userdata + if entries then + for k, v in next, entries do + useddata[k] = v + end + end + if userdata then + for k, v in next, userdata do + useddata[k] = v + end + end + return useddata +end + +function exporters.lists.generic(data) + local useddata = { } + local titledata, numberdata = data.titledata, data.numberdata + if titledata then + useddata.title = titledata.title + end + if numberdata then + local numbers = numberdata.numbers + local t = { } + for i=1,#numbers do + local n = numbers[i] + if n ~= 0 then + t[#t+1] = n + end end + useddata.number = concat(t,".") end + return useddata end -function jobreferences.load(name) - if name then - local jdn = jobreferences.documents[name] +local function referencer(data) + local references = data.references + local realpage = references.realpage + local numberdata = jobpages.tobesaved[realpage] + local specification = numberdata.specification + return { + realpage = references.realpage, + number = numberdata.number, + conversion = specification.conversion, + -- prefix = only makes sense when bywhatever + } +end + +function jobreferences.export(usedname) + local exported = { } + local e_references, e_lists = exporters.references, exporters.lists + local g_references, g_lists = e_references.generic, e_lists.generic + -- todo: pagenumbers + -- todo: some packing + for prefix, references in next, jobreferences.tobesaved do + local pe = exported[prefix] if not pe then pe = { } exported[prefix] = pe end + for key, data in next, references do + local metadata = data.metadata + local exporter = e_references[metadata.kind] or g_references + if exporter then + pe[key] = { + metadata = { + kind = metadata.kind, + catcodes = metadata.catcodes, + coding = metadata.coding, -- we can omit "tex" + }, + useddata = exporter(data), + pagedata = referencer(data), + } + end + end + end + local pe = exported[""] if not pe then pe = { } exported[""] = pe end + for n, data in next, structure.lists.tobesaved do + local metadata = data.metadata + local exporter = e_lists[metadata.kind] or g_lists + if exporter then + local result = { + metadata = { + kind = metadata.kind, + catcodes = metadata.catcodes, + coding = metadata.coding, -- we can omit "tex" + }, + useddata = exporter(data), + pagedata = referencer(data), + } + for key in gmatch(data.references.reference,"[^,]+") do + pe[key] = result + end + end + end + local e = { + references = exported, + version = 1.00, + } + io.savedata(file.replacesuffix(usedname or tex.jobname,"tue"),table.serialize(e,true)) +end + +function jobreferences.import(usedname) + if usedname then + local imported = jobreferences.imported + local jdn = imported[usedname] if not jdn then - jdn = { } - local fn = files[name] - if fn then - jdn.filename = fn[1] - local data = io.loaddata(file.replacesuffix(fn[1],"tuc")) or "" - if data ~= "" then - -- quick and dirty, assume sane { } usage inside strings - local lists = data:match("structure%.lists%.collected=({.-[\n\r]+})[\n\r]") - if lists and lists ~= "" then - lists = loadstring("return" .. lists) - if lists then - jdn.lists = lists() - jdn.derived = { } - register_from_lists(jdn.lists,jdn.derived) - else - commands.writestatus("error","invalid structure data in %s",filename) - end - end - local references = data:match("jobreferences%.collected=({.-[\n\r]+})[\n\r]") - if references and references ~= "" then - references = loadstring("return" .. references) - if references then - jdn.references = references() - else - commands.writestatus("error","invalid reference data in %s",filename) - end - end + local filename = files[usedname] + if filename then -- only registered files + filename = filename[1] + else + filename = usedname + end + local data = io.loaddata(file.replacesuffix(filename,"tue")) or "" + if data == "" then + interfaces.showmessage("references",24,filename) + data = nil + else + data = loadstring(data) + if data then + data = data() + end + if data then + -- version check end + if not data then + interfaces.showmessage("references",25,filename) + end + end + if data then + interfaces.showmessage("references",26,filename) + jdn = data + jdn.filename = filename + else + jdn = { filename = filename, references = { }, version = 1.00 } end - jobreferences.documents[name] = jdn + imported[usedname] = jdn + imported[filename] = jdn end return jdn else @@ -330,6 +441,10 @@ function jobreferences.load(name) end end +function jobreferences.load(usedname) + -- gone +end + function jobreferences.define(prefix,reference,list) local d = defined[prefix] if not d then d = { } defined[prefix] = d end d[reference] = { "defined", list } @@ -480,17 +595,37 @@ local function identify(prefix,reference) var.error = "unknown special" end elseif outer then - local e = jobreferences.load(outer) + local e = jobreferences.import(outer) if e then - local f = e.filename - if f then - if inner then - local r = e.references + if inner then + local r = e.references + if r then + r = r[prefix] + if r then + r = r[inner] + if r then + if arguments then + -- outer::inner{argument} + var.kind = "outer with inner with arguments" + else + -- outer::inner + var.kind = "outer with inner" + end + var.i = { "reference", r } + jobreferences.resolvers.reference(var) + var.f = f + var.e = true -- external + end + end + end + if not r then + r = e.derived if r then r = r[prefix] if r then r = r[inner] if r then + -- outer::inner if arguments then -- outer::inner{argument} var.kind = "outer with inner with arguments" @@ -498,63 +633,39 @@ local function identify(prefix,reference) -- outer::inner var.kind = "outer with inner" end - var.i = { "reference", r } - jobreferences.resolvers.reference(var) + var.i = r + jobreferences.resolvers[r[1]](var) var.f = f end end end - if not r then - r = e.derived - if r then - r = r[prefix] - if r then - r = r[inner] - if r then - -- outer::inner - if arguments then - -- outer::inner{argument} - var.kind = "outer with inner with arguments" - else - -- outer::inner - var.kind = "outer with inner" - end - var.i = r - jobreferences.resolvers[r[1]](var) - var.f = f - end - end - end - end - if not r then - var.error = "unknown outer" - end - elseif special then - local s = specials[special] - if s then - if operation then - if arguments then - -- outer::special(operation{argument,argument}) - var.kind = "outer with special and operation and arguments" - else - -- outer::special(operation) - var.kind = "outer with special and operation" - end + end + if not r then + var.error = "unknown outer" + end + elseif special then + local s = specials[special] + if s then + if operation then + if arguments then + -- outer::special(operation{argument,argument}) + var.kind = "outer with special and operation and arguments" else - -- outer::special() - var.kind = "outer with special" + -- outer::special(operation) + var.kind = "outer with special and operation" end - var.f = f else - var.error = "unknown outer with special" + -- outer::special() + var.kind = "outer with special" end - else - -- outer:: - var.kind = "outer" var.f = f + else + var.error = "unknown outer with special" end else - var.error = "unknown outer" + -- outer:: + var.kind = "outer" + var.f = f end else var.error = "unknown outer" @@ -692,7 +803,7 @@ filters.generic = { } function filters.generic.title(data) if data then - local titledata = data.titledata + local titledata = data.titledata or data.useddata if titledata then helpers.title(titledata.title or "?",data.metadata) end @@ -701,7 +812,7 @@ end function filters.generic.text(data) if data then - local entries = data.entries + local entries = data.entries or data.useddata if entries then helpers.title(entries.text or "?",data.metadata) end @@ -710,16 +821,35 @@ end function filters.generic.number(data) -- todo: spec and then no stopper if data then - helpers.prefix(data) local numberdata = data.numberdata if numberdata then + helpers.prefix(data) sections.typesetnumber(numberdata,"number",numberdata or false) + else + local useddata = data.useddata + if useddata and useddsta.number then + tex.sprint(tex.ctxcatcodes,useddata.number) + end end end end +filters.generic.default = filters.generic.text + function filters.generic.page(data,prefixspec,pagespec) - helpers.prefixpage(data,prefixspec,pagespec) + local pagedata = data.pagedata + if pagedata then -- imported + local number, conversion = pagedata.number, pagedata.conversion + if not number then + -- error + elseif conversion then + tex.sprint(tex.ctxcatcodes,format("\\convertnumber{%s}{%s}",conversion,number)) + else + tex.sprint(tex.ctxcatcodes,number) + end + else + helpers.prefixpage(data,prefixspec,pagespec) + end end filters.user = { } @@ -761,18 +891,24 @@ end filters.section = { } -filters.section.title = filters.generic.title -filters.section.page = filters.generic.page - function filters.section.number(data) -- todo: spec and then no stopper if data then local numberdata = data.numberdata if numberdata then sections.typesetnumber(numberdata,"number",numberdata or false) + else + local useddata = data.useddata + if useddata and useddata.number then + tex.sprint(tex.ctxcatcodes,useddata.number) + end end end end +filters.section.title = filters.generic.title +filters.section.page = filters.generic.page +filters.section.default = filters.section.number + --~ filters.float = { } --~ filters.float.title = filters.generic.title diff --git a/tex/context/base/strc-ref.mkiv b/tex/context/base/strc-ref.mkiv index 7f5ebd0b3..c3c07964a 100644 --- a/tex/context/base/strc-ref.mkiv +++ b/tex/context/base/strc-ref.mkiv @@ -154,7 +154,7 @@ }, \fi userdata = structure.helpers.touserdata(\!!bs\detokenize{#3}\!!es) - }) + },"\@@iafocus") }% \xdef\currentdestinationattribute{\number\lastdestinationattribute}% \begingroup\dosetattribute{destination}\currentdestinationattribute\hbox{}\endgroup % todo @@ -609,6 +609,21 @@ {\settrue \autoglobalfilereferences} {\setfalse\autoglobalfilereferences}} +% \appendtoks\ctxlua{jobreferences.export("whatever")}\to\everystoptext +% \starttext +% \chapter[test]{test} +% test \in{IN}[more] and \in{IN}[test] or \at{AT}[more] and \at{AT}[test]\par +% test \in{IN}[whatever::more] and \in{IN}[whatever::test] or \at{AT}[whatever::more] and \at{AT}[whatever::test] \page +% reference\reference[more]{oeps} +% \stoptext + +\def\exportreferences + {\doif\@@rfexport\v!yes{\ctxlua{jobreferences.export()}}} + +\appendtoks + \exportreferences +\to \everygoodbye + \def\incrementreferenceprefix{+} \def\decrementreferenceprefix{-} @@ -738,6 +753,7 @@ \def\currentreferencepage {\ctxlua{jobreferences.filter("page")}} \def\currentreferencetitle {\ctxlua{jobreferences.filter("title")}} \def\currentreferencetext {\ctxlua{jobreferences.filter("text")}} +\def\currentreferencedefault {\ctxlua{jobreferences.filter("default")}} \def\currentreferencerealpage{\ctxlua{jobreferences.realpage()}} \def\getreferenceentry#1{\ctxlua{jobreferences.filter("#1")}} % user entry @@ -915,8 +931,8 @@ % [\inxx{a}{b}[one]] % \stoptext -\unexpanded\def\dospecialin{\let\currentreferencecontent\currentreferencenumber\doinatreference} -\unexpanded\def\dospecialat{\let\currentreferencecontent\currentreferencepage \doinatreference} +\unexpanded\def\dospecialin{\let\currentreferencecontent\currentreferencedefault\doinatreference} +\unexpanded\def\dospecialat{\let\currentreferencecontent\currentreferencepage \doinatreference} \newtoks\leftreferencetoks \newtoks\rightreferencetoks @@ -1244,11 +1260,22 @@ %D %D \showsetup{from} +%D We keep this for compatibility reasons, hence the hackery. + \def\dospecialfrom {\dosingleempty\dodospecialfrom} \def\dodospecialfrom[#1]% - {\dontleavehmode\goto{\ctxlua{jobreferences.from("#1")}}[fileorurl(#1)]} + {\dontleavehmode + \goto{\ctxlua{jobreferences.from("#1")}}[fileorurl(#1)]} + +\def\dofromurl#1% + {\dosetfontattribute \??ur\c!style + \dosetcolorattribute\??ur\c!color + #1} + +\def\dofromfile#1% + {#1} %D We also support: %D @@ -1605,7 +1632,8 @@ \c!right=\egroup, \c!global=\v!no, \c!expansion=\v!no, - \c!separator=\nonbreakablespace] + \c!separator=\nonbreakablespace, + \c!export=\v!no] \setupurl [\c!alternative=\v!both, diff --git a/tex/context/base/strc-reg.lua b/tex/context/base/strc-reg.lua index b406ea1b0..06e7ff916 100644 --- a/tex/context/base/strc-reg.lua +++ b/tex/context/base/strc-reg.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['strc-reg'] = { version = 1.001, - comment = "companion to strc-reg.tex", + comment = "companion to strc-reg.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" @@ -189,23 +189,31 @@ end jobregisters.define = allocate -local entrysplitter = lpeg.Ct(lpeg.splitat('+')) +local entrysplitter = lpeg.Ct(lpeg.splitat('+')) -- & obsolete in mkiv local tagged = { } local function preprocessentries(rawdata) local entries = rawdata.entries if entries then - local et = entrysplitter:match(entries[1]) -- alse & - local kt = entrysplitter:match(entries[2]) -- alse & + local e, k = entries[1] or "", entries[2] or "" + local et = (type(e) == "table" and e) or entrysplitter:match(e) + local kt = (type(k) == "table" and k) or entrysplitter:match(k) entries = { } for k=1,#et do entries[k] = { et[k] or "", kt[k] or "" } end +for k=#et,1,-1 do + if entries[k][1] ~= "" then + break + else + entries[k] = nil + end +end rawdata.list = entries rawdata.entries = nil else - rawdata.list = { "", "" } -- br + rawdata.list = { { "", "" } } -- br end end @@ -426,6 +434,7 @@ function jobregisters.flush(data,options,prefixspec,pagespec) d = d + 1 local entry = data[d] local e = { false, false, false, false } + local metadata = entry.metadata for i=1,4 do -- max 4 if entry.list[i] then e[i] = entry.list[i][1] @@ -445,7 +454,13 @@ function jobregisters.flush(data,options,prefixspec,pagespec) texsprint(ctxcatcodes,format("\\startregisterentries{%s}",n)) end end +if metadata then + texsprint(ctxcatcodes,"\\registerentry{") + helpers.title(e[i],metadata) + texsprint(ctxcatcodes,"}") +else texsprint(ctxcatcodes,format("\\registerentry{%s}",e[i])) +end else done[i] = false end @@ -629,4 +644,3 @@ function jobregisters.process(class,...) jobregisters.flush(collected[class],...) end end - diff --git a/tex/context/base/strc-reg.mkiv b/tex/context/base/strc-reg.mkiv index 86b828b53..a4892ad4f 100644 --- a/tex/context/base/strc-reg.mkiv +++ b/tex/context/base/strc-reg.mkiv @@ -57,14 +57,14 @@ \def\detokenizedregisterparameter#1{\detokenize\expandafter\expandafter\expandafter{\csname\??id#1\endcsname}} % always root -\def\registerparameter #1{\csname\doregisterparameter{\??id\currentregister}#1\endcsname} +\def\registerparameter #1{\csname\doregisterparameter{\??id\currentregister}{#1}\endcsname} \def\registerparameterhash#1{\doregisterparameterhash {\??id\currentregister}#1} -\def\doregisterparameter #1#2{\ifcsname#1#2\endcsname#1#2\else\expandafter\doregisterparentparameter \csname#1\s!parent\endcsname#2\fi} -\def\doregisterparameterhash#1#2{\ifcsname#1#2\endcsname #1\else\expandafter\doregisterparentparameterhash\csname#1\s!parent\endcsname#2\fi} +\def\doregisterparameter #1#2{\ifcsname#1#2\endcsname#1#2\else\expandafter\doregisterparentparameter \csname#1\s!parent\endcsname{#2}\fi} +\def\doregisterparameterhash#1#2{\ifcsname#1#2\endcsname #1\else\expandafter\doregisterparentparameterhash\csname#1\s!parent\endcsname{#2}\fi} -\def\doregisterparentparameter #1#2{\ifx#1\relax\s!empty\else\doregisterparameter #1#2\fi} -\def\doregisterparentparameterhash#1#2{\ifx#1\relax \else\doregisterparameterhash#1#2\fi} +\def\doregisterparentparameter #1#2{\ifx#1\relax\s!empty\else\doregisterparameter #1{#2}\fi} +\def\doregisterparentparameterhash#1#2{\ifx#1\relax \else\doregisterparameterhash#1{#2}\fi} \def\dosetregisterattributes#1#2% style color {\edef\fontattributehash {\registerparameterhash#1}% @@ -116,6 +116,7 @@ \c!unknownreference=\v!empty, \c!prefix=\v!both, %\c!expansion=, +%\c!xmlsetup=, \c!pageprefixconnector=\endash, \c!pagesegments=2:2, \c!file=\jobname, @@ -144,32 +145,138 @@ % tzt variant met n entries, parameters en userdata (altnum) +% \def\doregisterstructurepageregister#1#2#3% register data userdata +% {\begingroup +% \edef\currentregister{#1}% +% \getparameters[\??id][\c!entries=,\c!label=,\c!keys=,\c!alternative=,#2]% +% \edef\currentregisterlabel {\registerparameter\c!label}% +% \edef\currentregisterexpansion{\registerparameter\c!expansion}% +% \edef\currentregisterownnumber{\registerparameter\c!ownnumber}% +% \xdef\currentregisterkeys {\registerparameter\c!keys}% +% \ifx\currentregisterexpansion\s!xml +% \xmlstartraw +% \xdef\currentregisterentries{\registerparameter\c!entries}% +% \xmlstopraw +% \globallet\currentregistercoding\s!xml +% \else +% \ifx\currentregisterexpansion\v!yes +% \xdef\currentregisterentries{\registerparameter\c!entries}% +% \else +% \xdef\currentregisterentries{\detokenizedregisterparameter\c!entries}% +% \fi +% \globallet\currentregistercoding\s!tex +% \fi +% \setnextinternalreference +% % we could consider storing register entries in a list which we +% % could then sort +% \xdef\currentregisternumber{\ctxlua{ +% jobregisters.store { +% metadata = { +% kind = "entry", +% name = "\currentregister", +% level = structure.sections.currentlevel(), +% coding = "\currentregistercoding", +% catcodes = \the\catcodetable, +% \ifx\currentregisterownnumber\v!yes +% own = "\registerparameter\c!alternative", % can be used instead of pagenumber +% \fi +% }, +% references = { +% internal = \nextinternalreference, +% section = structure.sections.currentid(), % hm, why then not also lastsection the same way +% label = "\currentregisterlabel", +% }, +% \ifx\currentregisterentries\empty \else +% entries = { +% % we need a special one for xml, this is just a single one +% \!!bs\currentregisterentries\!!es, \!!bs\currentregisterkeys\!!es +% }, +% \fi +% userdata = structure.helpers.touserdata(\!!bs\detokenize{#3}\!!es) +% } +% } }% +% \ctxlua{jobreferences.setinternalreference(nil,nil,\nextinternalreference)}% +% \ifx\currentregisterownnumber\v!yes +% \glet\currentregistersynchronize\relax +% \else +% \xdef\currentregistersynchronize{\ctxlatelua{jobregisters.enhance("\currentregister",\currentregisternumber)}}% +% \fi +% \currentregistersynchronize % here? +% \attribute\destinationattribute\lastdestinationattribute \strut % todo +% \endgroup} + +\getparameters + [\??id] + [\c!label=, + \c!entries=, + \c!entries:1=,\c!entries:2=,\c!entries:3=, + \c!keys:1=,\c!keys:2=,\c!keys:3=, + \c!alternative=] + \def\doregisterstructurepageregister#1#2#3% register data userdata {\begingroup \edef\currentregister{#1}% - \getparameters[\??id][\c!entries=,\c!label=,\c!keys=,\c!alternative=,#2]% + %getparameters[\??id][\c!entries=,\c!label=,\c!keys=,\c!alternative=,#2]% + \getparameters[\??id][#2]% \edef\currentregisterlabel {\registerparameter\c!label}% \edef\currentregisterexpansion{\registerparameter\c!expansion}% \edef\currentregisterownnumber{\registerparameter\c!ownnumber}% \xdef\currentregisterkeys {\registerparameter\c!keys}% - \ifx\currentregisterexpansion\s!xml - \xmlstartraw - \xdef\currentregisterentries{\registerparameter\c!entries}% - \xmlstopraw - \globallet\currentregistercoding\s!xml + \xdef\currentregisterentries {\registerparameter\c!entries}% +\xdef\currentregisterxmlsetup{\registerparameter\c!xmlsetup}% + \ifx\currentregisterentries\empty + \ifx\currentregisterexpansion\s!xml + \xmlstartraw + \xdef\currentregisterentriesa{\registerparameter{\c!entries:1}}% + \xdef\currentregisterentriesb{\registerparameter{\c!entries:2}}% + \xdef\currentregisterentriesc{\registerparameter{\c!entries:3}}% + \xmlstopraw + \globallet\currentregistercoding\s!xml + \else + \ifx\currentregisterexpansion\v!yes + \xdef\currentregisterentriesa{\registerparameter{\c!entries:1}}% + \xdef\currentregisterentriesb{\registerparameter{\c!entries:2}}% + \xdef\currentregisterentriesc{\registerparameter{\c!entries:3}}% + \else + \xdef\currentregisterentriesa{\detokenizedregisterparameter{\c!entries:1}}% + \xdef\currentregisterentriesb{\detokenizedregisterparameter{\c!entries:2}}% + \xdef\currentregisterentriesc{\detokenizedregisterparameter{\c!entries:3}}% + \fi + \globallet\currentregistercoding\s!tex + \fi \else - \ifx\currentregisterexpansion\v!yes - \xdef\currentregisterentries{\registerparameter\c!entries}% + \ifx\currentregisterexpansion\s!xml + \xmlstartraw + \xdef\currentregisterentries{\registerparameter\c!entries}% + \xmlstopraw + \globallet\currentregistercoding\s!xml \else - \xdef\currentregisterentries{\detokenizedregisterparameter\c!entries}% + \ifx\currentregisterexpansion\v!yes + \xdef\currentregisterentries{\registerparameter\c!entries}% + \else + \xdef\currentregisterentries{\detokenizedregisterparameter\c!entries}% + \fi + \globallet\currentregistercoding\s!tex + \fi + \fi + \ifx\currentregisterkeys\empty + \ifx\currentregistercoding\s!xml + \xmlstartraw + \xdef\currentregisterkeysa{\registerparameter{\c!keys:1}}% + \xdef\currentregisterkeysb{\registerparameter{\c!keys:2}}% + \xdef\currentregisterkeysc{\registerparameter{\c!keys:3}}% + \xmlstopraw + \else + \xdef\currentregisterkeysa{\registerparameter{\c!keys:1}}% + \xdef\currentregisterkeysb{\registerparameter{\c!keys:2}}% + \xdef\currentregisterkeysc{\registerparameter{\c!keys:3}}% \fi - \globallet\currentregistercoding\s!tex \fi \setnextinternalreference % we could consider storing register entries in a list which we % could then sort \xdef\currentregisternumber{\ctxlua{ - jobregisters.store { + jobregisters.store { % 'own' should not be in metadata metadata = { kind = "entry", name = "\currentregister", @@ -179,18 +286,31 @@ \ifx\currentregisterownnumber\v!yes own = "\registerparameter\c!alternative", % can be used instead of pagenumber \fi + xmlroot = \ifx\currentreferencecoding\s!xml "\xmldocument" \else nil \fi, % only useful when text +\ifx\currentregisterxmlsetup\empty \else + xmlsetup = "\currentregisterxmlsetup", +\fi }, references = { internal = \nextinternalreference, section = structure.sections.currentid(), % hm, why then not also lastsection the same way label = "\currentregisterlabel", }, - \ifx\currentregisterentries\empty \else +% \ifx\currentregisterentries\empty \else entries = { % we need a special one for xml, this is just a single one - \!!bs\currentregisterentries\!!es, \!!bs\currentregisterkeys\!!es + \ifx\currentregisterentries\empty + { \!!bs\currentregisterentriesa\!!es, \!!bs\currentregisterentriesb\!!es, \!!bs\currentregisterentriesc\!!es }, + \else + \!!bs\currentregisterentries\!!es, + \fi + \ifx\currentregisterkeys\empty + { \!!bs\currentregisterkeysa\!!es, \!!bs\currentregisterkeysb\!!es, \!!bs\currentregisterkeysc\!!es }, + \else + \!!bs\currentregisterkeys\!!es, + \fi }, - \fi +% \fi userdata = structure.helpers.touserdata(\!!bs\detokenize{#3}\!!es) } } }% @@ -234,6 +354,8 @@ \def\setregisterentry {\dotripleempty\dosetregisterentry} \def\finishregisterentry{\dotripleempty\dofinishregisterentry} +% not yet document, not sure if thsi will stay: + \def\dosetregisterentry [#1][#2][#3]{\doflushatpar{\doregisterstructurepageregister{#1}{#2}{#3}}} \def\dofinishregisterentry[#1][#2][#3]{\dofinishregisterstructurepageregister{#1}{#2}{#3}} @@ -287,6 +409,41 @@ \fi \endgroup} +% The following variants are meant for (for instance xml). There is some +% overlap with previously defined macros. +% +% \starttext +% \setstructurepageregister[index][entries=alpha]a +% \setstructurepageregister[index][entries=gamma]g +% \setstructurepageregister[index][entries=beta]b +% \setstructurepageregister[index][entries:1=alpha,keys:1=z]a +% \setstructurepageregister[index][entries:1=gamma,keys:1=x]g +% \setstructurepageregister[index][entries:1=beta, keys:1=y]b +% \index{alpha}a +% \index{gamma}g +% \index{beta}b +% \placeregister[index][n=1] +% \stoptext + +\def\setstructurepageregister{\dotripleempty\dosetstructurepageregister} + +\def\dosetstructurepageregister[#1][#2][#3]% [register][settings][userdata] + {\doflushatpar{\doregisterstructurepageregister{#1}{#2}{#3}}} + +\def\startstructurepageregister{\doquadrupleempty\dostartstructurepageregister} +\def\stopstructurepageregister {\dodoubleargument\dostopstructurepageregister} + +\let\openstructurepageregisterrange \startstructurepageregister +\let\closestructurepageregisterrange\stopstructurepageregister + +\def\dostartstructurepageregister[#1][#2][#3][#4]% [register][tag][settings][userdata] + {\doflushatpar{\doregisterstructurepageregister{#1}{\c!label=#2,#3}{#4}}} + +\def\dostopstructurepageregister[#1][#2]% + {\normalexpanded{\ctxlatelua{jobregisters.extend("#1","#2")}}} + +% So far. + \def\doseeregister[#1][#2]#3#4% {\doflushatpar{\doprocessseeregister{#1}{#2}{#3}{#4}}} @@ -684,8 +841,8 @@ % \fi} % {\dosetpageregister{#1}}} -\def\dosetregister#1% - {\dosetpageregister{#1}} +% \def\dosetregister#1% +% {\dosetpageregister{#1}} % \newcounter\internallistreference diff --git a/tex/context/base/strc-sec.mkiv b/tex/context/base/strc-sec.mkiv index ddc601eb8..478fd6ddb 100644 --- a/tex/context/base/strc-sec.mkiv +++ b/tex/context/base/strc-sec.mkiv @@ -337,11 +337,12 @@ \normalexpanded{\noexpand\setmarking[\currentstructureheadcoupling]{\currentstructurelistnumber}}% \currentstructuresynchronize} -\def\fullstructureheadnumber{\labeltexts{\structureheadparameter\c!label}{\structurenumber}} % todo -\def\fullstructureheadtitle {\structurevariable{titledata.title}} % no catcode! +\unexpanded\def\fullstructureheadnumber{\labeltexts{\structureheadparameter\c!label}{\structurenumber}} % todo -\unexpanded\def\fullstructureheadtitle - {\structureautocatcodedget{titledata.title}{\structureheadparameter\s!catcodes}} +% \def\fullstructureheadtitle {\structurevariable{titledata.title}} % no catcode! +% \unexpanded\def\fullstructureheadtitle{\structureautocatcodedget{titledata.title}{\structureheadparameter\s!catcodes}} + +\unexpanded\def\fullstructureheadtitle{\ctxlua{structure.sections.title()}} \let\currentstructurehead \empty \let\currentstructureheadcoupling\empty @@ -361,6 +362,8 @@ \c!marking=, \c!list=, \c!expansion=\structureheadparameter\c!expansion, + \c!xmlsetup=\structureheadparameter\c!xmlsetup, + \s!catcodes=\structureheadparameter\s!catcodes, \c!sectionresetset=\structureheadparameter\c!sectionresetset, \c!sectionseparatorset=\structureheadparameter\c!sectionseparatorset, \c!sectionconversionset=\structureheadparameter\c!sectionconversionset, diff --git a/tex/context/base/strc-syn.lua b/tex/context/base/strc-syn.lua index d9b7b9a57..a99a4a9af 100644 --- a/tex/context/base/strc-syn.lua +++ b/tex/context/base/strc-syn.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['str-syn'] = { version = 1.001, - comment = "companion to str-syn.tex", + comment = "companion to str-syn.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/strc-xml.mkiv b/tex/context/base/strc-xml.mkiv index 3f11c0ac9..7a0099585 100644 --- a/tex/context/base/strc-xml.mkiv +++ b/tex/context/base/strc-xml.mkiv @@ -15,13 +15,23 @@ \unprotect -\startxmlsetups xml:ctx:tocentry - \xmlsetsetup{\xmldocument}{ctx:tocentry}{xml:ctx:tocentry} +\startxmlsetups xml:ctx:internal:setup + \xmlsetsetup{\xmldocument}{ctx:genericentry} {xml:ctx:genericentry} + \xmlsetsetup{\xmldocument}{ctx:sectionentry} {xml:ctx:sectionentry} + \xmlsetsetup{\xmldocument}{ctx:registerentry}{xml:ctx:registerentry} \stopxmlsetups -\xmlregistersetup{xml:ctx:tocentry} +\xmlregistersetup{xml:ctx:internal:setup} -\startxmlsetups xml:ctx:tocentry +\startxmlsetups xml:ctx:genericentry + \xmlflush{#1} +\stopxmlsetups + +\startxmlsetups xml:ctx:sectionentry + \xmlflush{#1} +\stopxmlsetups + +\startxmlsetups xml:ctx:registerentry \xmlflush{#1} \stopxmlsetups diff --git a/tex/context/base/supp-fil.lua b/tex/context/base/supp-fil.lua index a93b0bce9..bd92061f5 100644 --- a/tex/context/base/supp-fil.lua +++ b/tex/context/base/supp-fil.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['supp-fil'] = { version = 1.001, - comment = "companion to supp-fil.tex", + comment = "companion to supp-fil.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/supp-mis.tex b/tex/context/base/supp-mis.tex new file mode 100644 index 000000000..bda8d4f6f --- /dev/null +++ b/tex/context/base/supp-mis.tex @@ -0,0 +1,4 @@ +% This file is not needed, for instance supp-pdf has the relevant code +% built in and ppchtex is adapted. + +\input supp-mis.mkii diff --git a/tex/context/base/supp-mpe.tex b/tex/context/base/supp-mpe.tex new file mode 100644 index 000000000..f4438133a --- /dev/null +++ b/tex/context/base/supp-mpe.tex @@ -0,0 +1,4 @@ +% This file is not needed as I don't expect other macro packages +% to support the metafun extensions. + +\input supp-mpe.mkii diff --git a/tex/context/base/supp-pdf.tex b/tex/context/base/supp-pdf.tex new file mode 100644 index 000000000..2ae878067 --- /dev/null +++ b/tex/context/base/supp-pdf.tex @@ -0,0 +1 @@ +\input supp-pdf.mkii diff --git a/tex/context/base/syst-aux.mkiv b/tex/context/base/syst-aux.mkiv index 995a0cb6e..fe41f0906 100644 --- a/tex/context/base/syst-aux.mkiv +++ b/tex/context/base/syst-aux.mkiv @@ -3519,13 +3519,21 @@ \def\recurselevel{\number\fastrecursecounter}% \dodofastrecurse} +\def\resetrecurselevel{\let\recurselevel\!!zerocount} + \def\dodofastrecurse - {\ifnum\fastrecursecounter>\lastrecursecounter\else + {\ifnum\fastrecursecounter>\lastrecursecounter + % \resetrecurselevel % slows down + \else \fastrecursebody \advance\fastrecursecounter\steprecursecounter \expandafter\dodofastrecurse \fi} +% \appendtoks \resetrecurselevel \to \everydump + +\everydump\expandafter{\the\everydump\resetrecurselevel} + %D This alternative looks a bit different and uses a %D pseudo counter. When this macro is nested, we have to use %D different counters. This time we use keywords. diff --git a/tex/context/base/syst-con.lua b/tex/context/base/syst-con.lua index b2f6c42af..638f3c797 100644 --- a/tex/context/base/syst-con.lua +++ b/tex/context/base/syst-con.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['syst-con'] = { version = 1.001, - comment = "companion to syst-con.tex", + comment = "companion to syst-con.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/syst-ext.mkii b/tex/context/base/syst-ext.mkii index 898ee8000..649ab0530 100644 --- a/tex/context/base/syst-ext.mkii +++ b/tex/context/base/syst-ext.mkii @@ -1040,13 +1040,21 @@ \def\recurselevel{\number\fastrecursecounter}% \dodofastrecurse} +\def\resetrecurselevel{\let\recurselevel\!!zerocount} + \def\dodofastrecurse - {\ifnum\fastrecursecounter>\lastrecursecounter\else + {\ifnum\fastrecursecounter>\lastrecursecounter + % \resetrecurselevel % slows down + \else \fastrecursebody \advance\fastrecursecounter\steprecursecounter \expandafter\dodofastrecurse \fi} +% \appendtoks \resetrecurselevel \to \everydump + +\everydump\expandafter{\the\everydump\resetrecurselevel} + %D This alternative looks a bit different and uses a %D pseudo counter. When this macro is nested, we have to use %D different counters. This time we use keywords. diff --git a/tex/context/base/syst-lua.lua b/tex/context/base/syst-lua.lua index 6df1b7b44..dce6cf2da 100644 --- a/tex/context/base/syst-lua.lua +++ b/tex/context/base/syst-lua.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['syst-lua'] = { version = 1.001, - comment = "companion to syst-lua.tex", + comment = "companion to syst-lua.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/tabl-com.mkii b/tex/context/base/tabl-com.mkii new file mode 100644 index 000000000..892905f6c --- /dev/null +++ b/tex/context/base/tabl-com.mkii @@ -0,0 +1,21 @@ +%D \module +%D [ file=tabl-com, +%D version=2009.08.22, +%D title=\CONTEXT\ Table Macros, +%D subtitle=Common Code, +%D author=Hans Hagen, +%D date=\currentdate, +%D copyright={PRAGMA / Hans Hagen \& Ton Otten}] +%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 Table Macros / Common Code} + +\unprotect + +\let\NC\relax +\let\NR\relax + +\protect \endinput diff --git a/tex/context/base/tabl-com.mkiv b/tex/context/base/tabl-com.mkiv new file mode 100644 index 000000000..892905f6c --- /dev/null +++ b/tex/context/base/tabl-com.mkiv @@ -0,0 +1,21 @@ +%D \module +%D [ file=tabl-com, +%D version=2009.08.22, +%D title=\CONTEXT\ Table Macros, +%D subtitle=Common Code, +%D author=Hans Hagen, +%D date=\currentdate, +%D copyright={PRAGMA / Hans Hagen \& Ton Otten}] +%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 Table Macros / Common Code} + +\unprotect + +\let\NC\relax +\let\NR\relax + +\protect \endinput diff --git a/tex/context/base/tabl-ltb.mkii b/tex/context/base/tabl-ltb.mkii index 0ff64047e..095e30e2b 100644 --- a/tex/context/base/tabl-ltb.mkii +++ b/tex/context/base/tabl-ltb.mkii @@ -1,5 +1,5 @@ %D \module -%D [ file=core-ltb, +%D [ file=tabl-ltb, %D version=2002.10.31, %D title=\CONTEXT\ Table Macros, %D subtitle=Line Tables, diff --git a/tex/context/base/tabl-ltb.mkiv b/tex/context/base/tabl-ltb.mkiv index 0ff64047e..095e30e2b 100644 --- a/tex/context/base/tabl-ltb.mkiv +++ b/tex/context/base/tabl-ltb.mkiv @@ -1,5 +1,5 @@ %D \module -%D [ file=core-ltb, +%D [ file=tabl-ltb, %D version=2002.10.31, %D title=\CONTEXT\ Table Macros, %D subtitle=Line Tables, diff --git a/tex/context/base/task-ini.lua b/tex/context/base/task-ini.lua index 7ba20fa20..a4aa4b0e5 100644 --- a/tex/context/base/task-ini.lua +++ b/tex/context/base/task-ini.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['task-ini'] = { version = 1.001, - comment = "companion to task-ini.tex", + comment = "companion to task-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/trac-deb.lua b/tex/context/base/trac-deb.lua index f476169c3..cd006e68b 100644 --- a/tex/context/base/trac-deb.lua +++ b/tex/context/base/trac-deb.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['trac-deb'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to trac-deb.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/trac-inf.lua b/tex/context/base/trac-inf.lua index 3dfaf7119..4386c0c96 100644 --- a/tex/context/base/trac-inf.lua +++ b/tex/context/base/trac-inf.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['trac-inf'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to trac-inf.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/trac-lmx.lua b/tex/context/base/trac-lmx.lua index 07f5ae291..a39e3fe4e 100644 --- a/tex/context/base/trac-lmx.lua +++ b/tex/context/base/trac-lmx.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['trac-lmx'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to trac-lmx.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/trac-log.lua b/tex/context/base/trac-log.lua index d05bc9fec..ddcea55ef 100644 --- a/tex/context/base/trac-log.lua +++ b/tex/context/base/trac-log.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['luat-log'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to trac-log.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/trac-tra.lua b/tex/context/base/trac-tra.lua index aa18c3d98..afa264379 100644 --- a/tex/context/base/trac-tra.lua +++ b/tex/context/base/trac-tra.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['trac-tra'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to trac-tra.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/typo-brk.lua b/tex/context/base/typo-brk.lua index 33837ab7a..6a4d20bc1 100644 --- a/tex/context/base/typo-brk.lua +++ b/tex/context/base/typo-brk.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['typo-brk'] = { version = 1.001, - comment = "companion to typo-brk.tex", + comment = "companion to typo-brk.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/typo-cap.lua b/tex/context/base/typo-cap.lua index c232ac728..347456171 100644 --- a/tex/context/base/typo-cap.lua +++ b/tex/context/base/typo-cap.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['typo-cap'] = { version = 1.001, - comment = "companion to typo-cap.tex", + comment = "companion to typo-cap.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/typo-krn.lua b/tex/context/base/typo-krn.lua index d3031633d..5ab0b07ed 100644 --- a/tex/context/base/typo-krn.lua +++ b/tex/context/base/typo-krn.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['typo-krn'] = { version = 1.001, - comment = "companion to typo-krn.tex", + comment = "companion to typo-krn.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/typo-mir.lua b/tex/context/base/typo-mir.lua index 806b8e0a0..14125e5d3 100644 --- a/tex/context/base/typo-mir.lua +++ b/tex/context/base/typo-mir.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['typo-mir'] = { version = 1.001, - comment = "companion to typo-mir.tex", + comment = "companion to typo-mir.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/typo-spa.lua b/tex/context/base/typo-spa.lua index 20861d08b..b6a1fbb5b 100644 --- a/tex/context/base/typo-spa.lua +++ b/tex/context/base/typo-spa.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['typo-spa'] = { version = 1.001, - comment = "companion to typo-spa.tex", + comment = "companion to typo-spa.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/base/x-mathml.lua b/tex/context/base/x-mathml.lua index aa2e4e716..b4b7ca9e1 100644 --- a/tex/context/base/x-mathml.lua +++ b/tex/context/base/x-mathml.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['x-mathml'] = { version = 1.001, - comment = "companion to x-mathml.tex", + comment = "companion to x-mathml.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/context/interface/cont-cs.xml b/tex/context/interface/cont-cs.xml index 3bfad5fb4..754249d75 100644 --- a/tex/context/interface/cont-cs.xml +++ b/tex/context/interface/cont-cs.xml @@ -4763,6 +4763,10 @@ + + + + @@ -4997,6 +5001,8 @@ + + diff --git a/tex/context/interface/cont-de.xml b/tex/context/interface/cont-de.xml index 2fe0f460c..fe97020ff 100644 --- a/tex/context/interface/cont-de.xml +++ b/tex/context/interface/cont-de.xml @@ -4763,6 +4763,10 @@ + + + + @@ -4997,6 +5001,8 @@ + + diff --git a/tex/context/interface/cont-en.xml b/tex/context/interface/cont-en.xml index e3cb1e2fb..8f0f76f52 100644 --- a/tex/context/interface/cont-en.xml +++ b/tex/context/interface/cont-en.xml @@ -4763,6 +4763,10 @@ + + + + diff --git a/tex/context/interface/cont-fr.xml b/tex/context/interface/cont-fr.xml index 0a4e5bb4d..9d298d6b9 100644 --- a/tex/context/interface/cont-fr.xml +++ b/tex/context/interface/cont-fr.xml @@ -4763,6 +4763,10 @@ + + + + @@ -4997,6 +5001,8 @@ + + diff --git a/tex/context/interface/cont-it.xml b/tex/context/interface/cont-it.xml index 8064a3294..337255228 100644 --- a/tex/context/interface/cont-it.xml +++ b/tex/context/interface/cont-it.xml @@ -4763,6 +4763,10 @@ + + + + @@ -4997,6 +5001,8 @@ + + diff --git a/tex/context/interface/cont-nl.xml b/tex/context/interface/cont-nl.xml index c8f221c58..2961ac83c 100644 --- a/tex/context/interface/cont-nl.xml +++ b/tex/context/interface/cont-nl.xml @@ -4763,6 +4763,10 @@ + + + + @@ -4997,6 +5001,8 @@ + + diff --git a/tex/context/interface/cont-pe.xml b/tex/context/interface/cont-pe.xml index 0f320aa8e..fc18282d3 100644 --- a/tex/context/interface/cont-pe.xml +++ b/tex/context/interface/cont-pe.xml @@ -4763,6 +4763,10 @@ + + + + @@ -4997,6 +5001,8 @@ + + diff --git a/tex/context/interface/cont-ro.xml b/tex/context/interface/cont-ro.xml index 152201dc4..786f95b6c 100644 --- a/tex/context/interface/cont-ro.xml +++ b/tex/context/interface/cont-ro.xml @@ -4763,6 +4763,10 @@ + + + + @@ -4997,6 +5001,8 @@ + + diff --git a/tex/context/interface/keys-cs.xml b/tex/context/interface/keys-cs.xml index 7806bf329..0eefedb9c 100644 --- a/tex/context/interface/keys-cs.xml +++ b/tex/context/interface/keys-cs.xml @@ -624,6 +624,7 @@ + diff --git a/tex/context/interface/keys-de.xml b/tex/context/interface/keys-de.xml index 495c469f1..65e5c05b6 100644 --- a/tex/context/interface/keys-de.xml +++ b/tex/context/interface/keys-de.xml @@ -624,6 +624,7 @@ + diff --git a/tex/context/interface/keys-en.xml b/tex/context/interface/keys-en.xml index de535add6..b4f30ced6 100644 --- a/tex/context/interface/keys-en.xml +++ b/tex/context/interface/keys-en.xml @@ -624,6 +624,7 @@ + diff --git a/tex/context/interface/keys-fr.xml b/tex/context/interface/keys-fr.xml index daa878d8c..a59a47f6e 100644 --- a/tex/context/interface/keys-fr.xml +++ b/tex/context/interface/keys-fr.xml @@ -624,6 +624,7 @@ + diff --git a/tex/context/interface/keys-it.xml b/tex/context/interface/keys-it.xml index 1a099484d..e3907e16c 100644 --- a/tex/context/interface/keys-it.xml +++ b/tex/context/interface/keys-it.xml @@ -624,6 +624,7 @@ + diff --git a/tex/context/interface/keys-nl.xml b/tex/context/interface/keys-nl.xml index 791111c8e..de0462f71 100644 --- a/tex/context/interface/keys-nl.xml +++ b/tex/context/interface/keys-nl.xml @@ -624,6 +624,7 @@ + diff --git a/tex/context/interface/keys-pe.xml b/tex/context/interface/keys-pe.xml index 62b4c5af6..11c8447bd 100644 --- a/tex/context/interface/keys-pe.xml +++ b/tex/context/interface/keys-pe.xml @@ -624,6 +624,7 @@ + diff --git a/tex/context/interface/keys-ro.xml b/tex/context/interface/keys-ro.xml index f4faf5e4d..f8448fa53 100644 --- a/tex/context/interface/keys-ro.xml +++ b/tex/context/interface/keys-ro.xml @@ -624,6 +624,7 @@ + diff --git a/tex/generic/context/luatex-fonts-merged.lua b/tex/generic/context/luatex-fonts-merged.lua index e9f92f5c3..38fe3078b 100644 --- a/tex/generic/context/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex-fonts-merged.lua @@ -1,12 +1,12 @@ -- merged file : c:/data/develop/context/texmf/tex/generic/context/luatex-fonts-merged.lua -- parent file : c:/data/develop/context/texmf/tex/generic/context/luatex-fonts.lua --- merge date : 08/22/09 18:36:59 +-- merge date : 08/26/09 01:45:51 do -- begin closure to overcome local limits and interference if not modules then modules = { } end modules ['l-string'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to luat-lib.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" @@ -244,7 +244,7 @@ do -- begin closure to overcome local limits and interference if not modules then modules = { } end modules ['l-lpeg'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to luat-lib.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" @@ -351,7 +351,7 @@ do -- begin closure to overcome local limits and interference if not modules then modules = { } end modules ['l-boolean'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to luat-lib.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" @@ -411,7 +411,7 @@ do -- begin closure to overcome local limits and interference if not modules then modules = { } end modules ['l-math'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to luat-lib.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" @@ -457,7 +457,7 @@ do -- begin closure to overcome local limits and interference if not modules then modules = { } end modules ['l-table'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to luat-lib.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" @@ -1277,7 +1277,7 @@ do -- begin closure to overcome local limits and interference if not modules then modules = { } end modules ['l-file'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to luat-lib.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" @@ -1540,7 +1540,7 @@ do -- begin closure to overcome local limits and interference if not modules then modules = { } end modules ['l-io'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to luat-lib.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" @@ -1797,7 +1797,7 @@ do -- begin closure to overcome local limits and interference if not modules then modules = { } end modules ['data-con'] = { version = 1.001, - comment = "companion to luat-lib.tex", + comment = "companion to luat-lib.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" @@ -1924,7 +1924,7 @@ do -- begin closure to overcome local limits and interference if not modules then modules = { } end modules ['node-ini'] = { version = 1.001, - comment = "companion to node-ini.tex", + comment = "companion to node-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" @@ -2161,7 +2161,7 @@ do -- begin closure to overcome local limits and interference if not modules then modules = { } end modules ['node-res'] = { version = 1.001, - comment = "companion to node-ini.tex", + comment = "companion to node-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" @@ -2284,7 +2284,7 @@ do -- begin closure to overcome local limits and interference if not modules then modules = { } end modules ['node-inj'] = { version = 1.001, - comment = "companion to node-ini.tex", + comment = "companion to node-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" @@ -2455,6 +2455,7 @@ end function nodes.inject_kerns(head,where,keep) local has_marks, has_cursives, has_kerns = next(marks), next(cursives), next(kerns) if has_marks or has_cursives then +--~ if true then if trace_injections then nodes.trace_injection(head) end @@ -2474,7 +2475,7 @@ function nodes.inject_kerns(head,where,keep) if k then local kk = kerns[k] if kk then - local x, y, w, h = kk[2], kk[3], kk[4], kk[5] + local x, y, w, h = kk[2] or 0, kk[3] or 0, kk[4] or 0, kk[5] or 0 local dy = y - h if dy ~= 0 then ky[n] = dy @@ -2621,12 +2622,21 @@ function nodes.inject_kerns(head,where,keep) local rl, x, w = k[1], k[2] or 0, k[4] or 0 local wx = w - x if rl < 0 then +--~ if false then if wx ~= 0 then insert_node_before(head,n,newkern(wx)) end if x ~= 0 then insert_node_after (head,n,newkern(x)) end +--~ else +--~ if wx ~= 0 then +--~ insert_node_after(head,n,newkern(wx)) +--~ end +--~ if x ~= 0 then +--~ insert_node_before(head,n,newkern(x)) +--~ end +--~ end else -- if wx ~= 0 then -- insert_node_after(head,n,newkern(wx)) @@ -2660,35 +2670,46 @@ function nodes.inject_kerns(head,where,keep) if trace_injections then nodes.trace_injection(head) end - -- we assume done is true because there are kerns - for n in traverse_id(glyph,head) do - local k = has_attribute(n,kernpair) - if k then - local kk = kerns[k] - if kk then - -- only w can be nil, can be sped up when w == nil - local rl, x, y, w = kk[1], kk[2] or 0, kk[3] or 0, kk[4] or 0 - if y ~= 0 then - n.yoffset = y -- todo: h ? - end - local wx = w - x - if rl < 0 then - if wx ~= 0 then - insert_node_before(head,n,newkern(wx)) + local n = head + while n do + local id = n.id + if id == glyph then + local k = has_attribute(n,kernpair) + if k then + local kk = kerns[k] + if kk then + local rl, x, y, w = kk[1], kk[2] or 0, kk[3], kk[4] + if y and y ~= 0 then + n.yoffset = y -- todo: h ? end - if x ~= 0 then - insert_node_after (head,n,newkern(x)) - end - else - -- if wx ~= 0 then - -- insert_node_after(head,n,newkern(wx)) - -- end - if x ~= 0 then - insert_node_before(head,n,newkern(x)) + if w then + -- gpospair kerns + local wx = w - x + if rl < 0 then + if wx ~= 0 then + head, _ = insert_node_before(head,n,newkern(wx)) + end + if x ~= 0 then + head, n = insert_node_after(head,n,newkern(x)) + end + else + -- if wx ~= 0 then + -- head, n = insert_node_after(head,n,newkern(wx)) + -- end + if x ~= 0 then + head, _ = insert_node_before(head,n,newkern(x)) + end + end + else + -- simple (e.g. kernclass kerns) + if x ~= 0 then + head, _ = insert_node_before(head,n,newkern(x)) + end end end end end + n = n.next end if not keep then kerns = { } @@ -2700,13 +2721,52 @@ function nodes.inject_kerns(head,where,keep) return head, false end +--~ for n in traverse_id(glyph,head) do +--~ local k = has_attribute(n,kernpair) +--~ if k then +--~ local kk = kerns[k] +--~ if kk then +--~ -- only w can be nil, can be sped up when w == nil +--~ local rl, x, y, w = kk[1], kk[2] or 0, kk[3] or 0, kk[4] or 0 +--~ if y ~= 0 then +--~ n.yoffset = y -- todo: h ? +--~ end +--~ local wx = w - x +--~ if rl < 0 then +--~ if false then +--~ if wx ~= 0 then +--~ insert_node_before(head,n,newkern(wx)) +--~ end +--~ if x ~= 0 then +--~ insert_node_after (head,n,newkern(x)) +--~ end +--~ else +--~ if wx ~= 0 then +--~ insert_node_after(head,n,newkern(wx)) +--~ end +--~ if x ~= 0 then +--~ insert_node_before(head,n,newkern(x)) +--~ end +--~ end +--~ else +--~ -- if wx ~= 0 then +--~ -- insert_node_after(head,n,newkern(wx)) +--~ -- end +--~ if x ~= 0 then +--~ insert_node_before(head,n,newkern(x)) +--~ end +--~ end +--~ end +--~ end +--~ end + end -- closure do -- begin closure to overcome local limits and interference if not modules then modules = { } end modules ['node-fnt'] = { version = 1.001, - comment = "companion to font-ini.tex", + comment = "companion to font-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" @@ -2941,7 +3001,7 @@ do -- begin closure to overcome local limits and interference if not modules then modules = { } end modules ['font-ini'] = { version = 1.001, - comment = "companion to font-ini.tex", + comment = "companion to font-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" @@ -3043,7 +3103,7 @@ do -- begin closure to overcome local limits and interference if not modules then modules = { } end modules ['font-tfm'] = { version = 1.001, - comment = "companion to font-ini.tex", + comment = "companion to font-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" @@ -4982,7 +5042,7 @@ do -- begin closure to overcome local limits and interference if not modules then modules = { } end modules ['font-otf'] = { version = 1.001, - comment = "companion to font-ini.tex", + comment = "companion to font-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" @@ -6593,7 +6653,7 @@ do -- begin closure to overcome local limits and interference if not modules then modules = { } end modules ['font-otd'] = { version = 1.001, - comment = "companion to font-ini.tex", + comment = "companion to font-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" @@ -6676,7 +6736,7 @@ do -- begin closure to overcome local limits and interference if not modules then modules = { } end modules ['font-oti'] = { version = 1.001, - comment = "companion to font-ini.tex", + comment = "companion to font-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" @@ -6738,7 +6798,7 @@ do -- begin closure to overcome local limits and interference if not modules then modules = { } end modules ['font-otb'] = { version = 1.001, - comment = "companion to font-ini.tex", + comment = "companion to font-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" @@ -7114,7 +7174,7 @@ do -- begin closure to overcome local limits and interference if not modules then modules = { } end modules ['font-otn'] = { version = 1.001, - comment = "companion to font-ini.tex", + comment = "companion to font-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" @@ -9746,7 +9806,8 @@ local isol_fina = { [0x06D3] = true, [0x06D5] = true, [0x06EE] = true, [0x06EF] = true, [0x0759] = true, [0x075A] = true, [0x075B] = true, [0x076B] = true, [0x076C] = true, [0x0771] = true, [0x0773] = true, [0x0774] = true, - [0x0778] = true, [0x0779] = true, + [0x0778] = true, [0x0779] = true, [0xFEF5] = true, [0xFEF7] = true, + [0xFEF9] = true, [0xFEFB] = true, } local isol_fina_medi_init = { @@ -10183,7 +10244,7 @@ do -- begin closure to overcome local limits and interference if not modules then modules = { } end modules ['font-def'] = { version = 1.001, - comment = "companion to font-ini.tex", + comment = "companion to font-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" @@ -10787,7 +10848,7 @@ do -- begin closure to overcome local limits and interference if not modules then modules = { } end modules ['font-xtx'] = { version = 1.001, - comment = "companion to font-ini.tex", + comment = "companion to font-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" @@ -10907,7 +10968,7 @@ do -- begin closure to overcome local limits and interference if not modules then modules = { } end modules ['font-map'] = { version = 1.001, - comment = "companion to font-ini.tex", + comment = "companion to font-ini.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" diff --git a/tex/generic/context/luatex-mplib.lua b/tex/generic/context/luatex-mplib.lua index 6f9bdc7ef..09919af67 100644 --- a/tex/generic/context/luatex-mplib.lua +++ b/tex/generic/context/luatex-mplib.lua @@ -1,6 +1,6 @@ if not modules then modules = { } end modules ['supp-mpl'] = { version = 1.001, - comment = "companion to supp-mpl.tex", + comment = "companion to luatex-mplib.tex", author = "Hans Hagen & Taco Hoekwater", copyright = "ConTeXt Development Team", license = "public domain", -- cgit v1.2.3