diff options
Diffstat (limited to 'tex')
| -rw-r--r-- | tex/context/base/cont-new.tex | 2 | ||||
| -rw-r--r-- | tex/context/base/context.tex | 2 | ||||
| -rw-r--r-- | tex/context/base/lang-ita.tex | 36 | ||||
| -rw-r--r-- | tex/context/base/lpdf-xmp.lua | 6 | ||||
| -rw-r--r-- | tex/context/base/lxml-ini.mkiv | 3 | ||||
| -rw-r--r-- | tex/context/base/strc-pag.mkiv | 3 |
6 files changed, 30 insertions, 22 deletions
diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex index 871233559..ed04f9a5c 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{2010.02.08 19:42} +\newcontextversion{2010.02.10 10:38} %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.tex b/tex/context/base/context.tex index 122df5fdd..1d92fb702 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{2010.02.08 19:42} +\edef\contextversion{2010.02.10 10:38} %D For those who want to use this: diff --git a/tex/context/base/lang-ita.tex b/tex/context/base/lang-ita.tex index 48b3bf242..d6695cf9e 100644 --- a/tex/context/base/lang-ita.tex +++ b/tex/context/base/lang-ita.tex @@ -265,49 +265,49 @@ \setuplabeltext [\s!pt] [\v!graphic=Gr\'afico ] \setuplabeltext [\s!ro] [\v!graphic=Graficul ] -\setuplabeltext [\s!fr] [\v!chapter=] -\setuplabeltext [\s!es] [\v!chapter=Cap\'\i tulo] -\setuplabeltext [\s!ca] [\v!chapter=Cap\'\i tol] +\setuplabeltext [\s!fr] [\v!chapter=] % Chapitre +\setuplabeltext [\s!es] [\v!chapter=] % Cap\'\i tulo +\setuplabeltext [\s!ca] [\v!chapter=] % Cap\'\i tol \setuplabeltext [\s!it] [\v!chapter=] \setuplabeltext [\s!la] [\v!chapter=] \setuplabeltext [\s!pt] [\v!chapter=] \setuplabeltext [\s!ro] [\v!chapter=] -\setuplabeltext [\s!fr] [\v!section=] -\setuplabeltext [\s!es] [\v!section=Secci\'on] -\setuplabeltext [\s!ca] [\v!section=Secci\'o] +\setuplabeltext [\s!fr] [\v!section=] % Section +\setuplabeltext [\s!es] [\v!section=] % Secci\'on +\setuplabeltext [\s!ca] [\v!section=] % Secci\'o \setuplabeltext [\s!it] [\v!section=] \setuplabeltext [\s!la] [\v!section=] \setuplabeltext [\s!pt] [\v!section=] \setuplabeltext [\s!ro] [\v!section=] -\setuplabeltext [\s!fr] [\v!subsection=] -\setuplabeltext [\s!es] [\v!subsection=Subsecci\'on] -\setuplabeltext [\s!ca] [\v!subsection=Subsecci\'o] +\setuplabeltext [\s!fr] [\v!subsection=] % Soussection +\setuplabeltext [\s!es] [\v!subsection=] % Subsecci\'on +\setuplabeltext [\s!ca] [\v!subsection=] % Subsecci\'o \setuplabeltext [\s!it] [\v!subsection=] \setuplabeltext [\s!la] [\v!subsection=] \setuplabeltext [\s!pt] [\v!subsection=] \setuplabeltext [\s!ro] [\v!subsection=] -\setuplabeltext [\s!fr] [\v!subsubsection=] -\setuplabeltext [\s!es] [\v!subsubsection=Subsubsecci\'on] -\setuplabeltext [\s!ca] [\v!subsubsection=Subsubsecci\'o] +\setuplabeltext [\s!fr] [\v!subsubsection=] % Soussoussection +\setuplabeltext [\s!es] [\v!subsubsection=] % Subsubsecci\'on +\setuplabeltext [\s!ca] [\v!subsubsection=] % Subsubsecci\'o \setuplabeltext [\s!it] [\v!subsubsection=] \setuplabeltext [\s!la] [\v!subsubsection=] \setuplabeltext [\s!pt] [\v!subsubsection=] \setuplabeltext [\s!ro] [\v!subsubsection=] -\setuplabeltext [\s!fr] [\v!subsubsubsection=] -\setuplabeltext [\s!es] [\v!subsubsubsection=Subsubsubsecci\'on] -\setuplabeltext [\s!ca] [\v!subsubsubsection=Subsubsubsecci\'o] +\setuplabeltext [\s!fr] [\v!subsubsubsection=] % Soussoussoussection +\setuplabeltext [\s!es] [\v!subsubsubsection=] % Subsubsubsecci\'on +\setuplabeltext [\s!ca] [\v!subsubsubsection=] % Subsubsubsecci\'o \setuplabeltext [\s!it] [\v!subsubsubsection=] \setuplabeltext [\s!la] [\v!subsubsubsection=] \setuplabeltext [\s!pt] [\v!subsubsubsection=] \setuplabeltext [\s!ro] [\v!subsubsubsection=] -\setuplabeltext [\s!fr] [\v!appendix=] -\setuplabeltext [\s!es] [\v!appendix=Ap\'endice] -\setuplabeltext [\s!ca] [\v!appendix=Ap\`endix] +\setuplabeltext [\s!fr] [\v!appendix=] % Annexe +\setuplabeltext [\s!es] [\v!appendix=] % Ap\'endice +\setuplabeltext [\s!ca] [\v!appendix=] % Ap\`endix \setuplabeltext [\s!it] [\v!appendix=] \setuplabeltext [\s!la] [\v!appendix=] \setuplabeltext [\s!pt] [\v!appendix=] diff --git a/tex/context/base/lpdf-xmp.lua b/tex/context/base/lpdf-xmp.lua index 78638efbb..9a936e64d 100644 --- a/tex/context/base/lpdf-xmp.lua +++ b/tex/context/base/lpdf-xmp.lua @@ -168,11 +168,15 @@ local function flushxmpinfo() texio.write_nl("log","") texio.write("log","\n% ",(gsub(blob,"[\r\n]","\n%% ")),"\n") end + blob = format(xpacket,packetid,blob) + if tex.pdfcompresslevel > 0 then + blob = gsub(blob,">%s+<","><") + end local r = pdf.obj { immediate = true, compresslevel = 0, type = "stream", - string = format(xpacket,packetid,blob), + string = blob, attr = md(), } lpdf.addtocatalog("Metadata",lpdf.reference(r)) diff --git a/tex/context/base/lxml-ini.mkiv b/tex/context/base/lxml-ini.mkiv index ac30cd129..f5adb0b7a 100644 --- a/tex/context/base/lxml-ini.mkiv +++ b/tex/context/base/lxml-ini.mkiv @@ -353,7 +353,10 @@ \chardef\xmlautoentities=1 % 0=off, 1=upper, 2=upper,lower +\let\isolatedentity\firstofoneargument + \def\xmlsetentity#1#2{\ctxlua{xml.register_entity('#1',\!!bs\detokenize{#2}\!!es)}} +\def\xmltexentity#1#2{\ctxlua{xml.register_entity('#1',\!!bs\detokenize{\isolatedentity{#2}}\!!es)}} % \xmlsetentity{tex}{\TEX{}} % {} needed diff --git a/tex/context/base/strc-pag.mkiv b/tex/context/base/strc-pag.mkiv index 0a55c50c8..2f0e3d4fe 100644 --- a/tex/context/base/strc-pag.mkiv +++ b/tex/context/base/strc-pag.mkiv @@ -241,8 +241,9 @@ % Hooks: +\def\currentpage{\the\realpageno}% rather useless + \appendtoks - \xdef\currentpage{\the\realpageno}% rather useless \ifnum\realpageno>\lastpage \globallet\lastpage\lastrealpage \fi \to \everyinitializepagecounters |