From 79d53c0a828babfb0935f98aee0fd82a39dbd220 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Mon, 3 Oct 2011 12:59:00 +0200 Subject: beta 2011.10.03 12:59 --- tex/context/base/cont-new.mkii | 2 +- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4096 -> 4095 bytes tex/context/base/context-version.png | Bin 105062 -> 105125 bytes tex/context/base/context.mkii | 2 +- tex/context/base/context.mkiv | 2 +- tex/context/base/data-exp.lua | 35 --------------------- tex/context/base/lang-lab.lua | 3 ++ tex/context/base/lang-lab.mkiv | 15 +++++++++ tex/context/base/status-files.pdf | Bin 23947 -> 23920 bytes tex/context/base/status-lua.pdf | Bin 162869 -> 162873 bytes tex/context/base/strc-ref.lua | 20 +++++++----- tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 13 files changed, 35 insertions(+), 48 deletions(-) (limited to 'tex') diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index d24e2d4f8..b3a6e6616 100644 --- a/tex/context/base/cont-new.mkii +++ b/tex/context/base/cont-new.mkii @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2011.10.02 22:44} +\newcontextversion{2011.10.03 12:59} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index bd35fb34c..5e78ffb75 100644 --- a/tex/context/base/cont-new.mkiv +++ b/tex/context/base/cont-new.mkiv @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2011.10.02 22:44} +\newcontextversion{2011.10.03 12:59} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf index 49e28803e..ab813a18b 100644 Binary files a/tex/context/base/context-version.pdf and b/tex/context/base/context-version.pdf differ diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png index d22f76b85..259d4f188 100644 Binary files a/tex/context/base/context-version.png and b/tex/context/base/context-version.png differ diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii index 53ec5343b..ca149be97 100644 --- a/tex/context/base/context.mkii +++ b/tex/context/base/context.mkii @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2011.10.02 22:44} +\edef\contextversion{2011.10.03 12:59} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 265181292..d2d91489b 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2011.10.02 22:44} +\edef\contextversion{2011.10.03 12:59} %D For those who want to use this: diff --git a/tex/context/base/data-exp.lua b/tex/context/base/data-exp.lua index 82fedcf6e..52368f8a8 100644 --- a/tex/context/base/data-exp.lua +++ b/tex/context/base/data-exp.lua @@ -130,41 +130,6 @@ end -- {a,b,c/{p,q/{x,y,z},w}v,d/{p,q,r}} -- {$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,.local,}/web2c} --- local cleanup = lpeg.replacer { --- { "!" , "" }, --- { "\\" , "/" }, --- } --- --- local homedir --- --- function resolvers.cleanpath(str) -- tricky, maybe only simple paths --- if not homedir then --- homedir = lpegmatch(cleanup,environment.homedir or "") --- if homedir == char(127) or homedir == "" or not lfs.isdir(homedir) then --- if trace_expansions then --- report_expansions("no home dir set, ignoring dependent paths") --- end --- function resolvers.cleanpath(str) --- if find(str,"~") then --- return "" -- special case --- else --- return str and lpegmatch(cleanup,str) --- end --- end --- else --- cleanup = lpeg.replacer { --- { "!" , "" }, --- { "\\" , "/" }, --- { "~" , homedir }, --- } --- function resolvers.cleanpath(str) --- return str and lpegmatch(cleanup,str) --- end --- end --- end --- return resolvers.cleanpath(str) --- end - local cleanup = lpeg.replacer { { "!" , "" }, { "\\" , "/" }, diff --git a/tex/context/base/lang-lab.lua b/tex/context/base/lang-lab.lua index 91b843beb..64d102768 100644 --- a/tex/context/base/lang-lab.lua +++ b/tex/context/base/lang-lab.lua @@ -153,3 +153,6 @@ end --~ --~ languages.labels.check() +-- function commands.setstrippedtextprefix(str) +-- context(string.strip(str)) +-- end diff --git a/tex/context/base/lang-lab.mkiv b/tex/context/base/lang-lab.mkiv index db15308e6..31ad760d0 100644 --- a/tex/context/base/lang-lab.mkiv +++ b/tex/context/base/lang-lab.mkiv @@ -82,6 +82,8 @@ \def\dododefinelabelclass#1#2#3#4#5#6#7#8#9% {\setuvalue{setup#1text}{\protecttextprefixes#2\def\currenttextprefixclass{#1}\dodoubleempty\dosetupsometextprefix}% \setuvalue{preset#1text}{\protecttextprefixes1\def\currenttextprefixclass{#1}\dodoubleempty\dosetupsometextprefix}% + \setuvalue{start#1text}{\protecttextprefixes1\def\currenttextprefixclass{#1}\dotripleempty\dostartsometextprefix[#1]}% + \letvalue{stop#1text}\relax \def#4{\reallanguagetag{\defaultlanguage\currentmainlanguage}}% \ifnum#2=\plustwo \def#3{#5#4}% @@ -169,6 +171,19 @@ \let\currenttextprefixtag \s!unknown \let\currenttextprefixclass\s!unknown +\def\dostartsometextprefix[#1][#2][#3]% class language name + {\ifthirdargument + \edef\currenttextprefixtag{\reallanguagetag{#2}}% + \edef\currenttextprefixname{#3}% + \else + \edef\currenttextprefixtag{\reallanguagetag\currentmainlanguage}% + \edef\currenttextprefixname{#2}% + \fi + \grabuntil{stop#1text}\dodostartsometextprefix} + +\def\dodostartsometextprefix#1% text (not special checking done here yet, only for long texts anyway) + {\expandafter\edef\csname\??ml:\currenttextprefixclass:\currenttextprefixtag:\currenttextprefixname\endcsname{{\ctxlua{context(string.strip(\!!bs#1\!!es))}}\empty}} + \def\dosetupsometextprefix[#1][#2]% {\ifsecondargument \edef\currenttextprefixtag{\reallanguagetag{#1}}% diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index ac3caf0cb..179300e49 100644 Binary files a/tex/context/base/status-files.pdf and b/tex/context/base/status-files.pdf differ diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf index f0d58bf2c..1cba3622d 100644 Binary files a/tex/context/base/status-lua.pdf and b/tex/context/base/status-lua.pdf differ diff --git a/tex/context/base/strc-ref.lua b/tex/context/base/strc-ref.lua index 8e3a3db82..da0549bb9 100644 --- a/tex/context/base/strc-ref.lua +++ b/tex/context/base/strc-ref.lua @@ -389,13 +389,6 @@ references.files.data = references.files.data or { } local files = references.files.data -table.setmetatableindex(files, function(t,k) - -- we assume that it's a file anyway - local v = { k, k } - files[k] = v - return v -end) - function references.files.define(name,file,description) if name and name ~= "" then files[name] = { file or "", description or file or "" } @@ -711,8 +704,19 @@ local function loadexternalreferences(name,utilitydata) end end +local externalfiles = { } + +table.setmetatableindex(externalfiles, function(t,k) + local v = files[k] + if not v then + v = { k, k } + end + externalfiles[k] = v + return v +end) + table.setmetatableindex(externals,function(t,k) -- either or not automatically - local filename = files[k][1] -- filename + local filename = externalfiles[k][1] -- filename local fullname = file.replacesuffix(filename,"tuc") if lfs.isfile(fullname) then -- todo: use other locator local utilitydata = job.loadother(fullname) diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index ba34077c9..7371dcfc9 100644 --- a/tex/generic/context/luatex/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : luatex-fonts-merged.lua -- parent file : luatex-fonts.lua --- merge date : 10/02/11 22:44:18 +-- merge date : 10/03/11 12:59:24 do -- begin closure to overcome local limits and interference -- cgit v1.2.3