diff options
Diffstat (limited to 'tex/context/base/lang-lab.lua')
-rw-r--r-- | tex/context/base/lang-lab.lua | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/tex/context/base/lang-lab.lua b/tex/context/base/lang-lab.lua index a217cd50d..893e1554d 100644 --- a/tex/context/base/lang-lab.lua +++ b/tex/context/base/lang-lab.lua @@ -61,9 +61,10 @@ if not modules then modules = { } end modules ['lang-lab'] = { local format, find = string.format, string.find local next, rawget, type = next, rawget, type -local prtcatcodes = tex.prtcatcodes local lpegmatch = lpeg.match +local prtcatcodes = catcodes.numbers.prtcatcodes -- todo: use different method + local trace_labels = false trackers.register("languages.labels", function(v) trace_labels = v end) local report_labels = logs.reporter("languages","labels") @@ -81,17 +82,19 @@ end labels.split = split -local function definelanguagelabels(data,command,tag,rawtag) +local contextsprint = context.sprint + +local function definelanguagelabels(data,class,tag,rawtag) for language, text in next, data.labels do if text == "" then -- skip elseif type(text) == "table" then - context("\\%s[%s][%s={{%s},{%s}}]",command,language,tag,text[1],text[2]) + contextsprint(prtcatcodes,"\\setlabeltextpair{",class,"}{",language,"}{",tag,"}{",text[1],"}{",text[2],"}") if trace_labels then report_labels("language '%s', defining label '%s' as '%s' and '%s'",language,rawtag,text[1],text[2]) end else - context("\\%s[%s][%s={{%s},}]",command,language,tag,text) + contextsprint(prtcatcodes,"\\setlabeltextpair{",class,"}{",language,"}{",tag,"}{",text,"}{}") if trace_labels then report_labels("language '%s', defining label '%s' as '%s'",language,rawtag,text) end @@ -99,11 +102,10 @@ local function definelanguagelabels(data,command,tag,rawtag) end end -function labels.define(command,name,prefixed) +function labels.define(class,name,prefixed) local list = languages.data.labels[name] if list then report_labels("defining label set '%s'",name) - context.pushcatcodes(prtcatcodes) -- context.unprotect for tag, data in next, list do if data.hidden then -- skip @@ -112,25 +114,24 @@ function labels.define(command,name,prefixed) if second then if rawget(variables,first) then if rawget(variables,second) then - definelanguagelabels(data,command,format("\\v!%s:\\v!%s",first,second),tag) + definelanguagelabels(data,class,format("\\v!%s:\\v!%s",first,second),tag) else - definelanguagelabels(data,command,format("\\v!%s:%s",first,second),tag) + definelanguagelabels(data,class,format("\\v!%s:%s",first,second),tag) end elseif rawget(variables,second) then - definelanguagelabels(data,command,format("%s:\\v!%s",first,second),tag) + definelanguagelabels(data,class,format("%s:\\v!%s",first,second),tag) else - definelanguagelabels(data,command,format("%s:%s",first,second),tag) + definelanguagelabels(data,class,format("%s:%s",first,second),tag) end elseif rawget(variables,rawtag) then - definelanguagelabels(data,command,format("\\v!%s",tag),tag) + definelanguagelabels(data,class,format("\\v!%s",tag),tag) else - definelanguagelabels(data,command,tag,tag) + definelanguagelabels(data,class,tag,tag) end else - definelanguagelabels(data,command,tag,tag) + definelanguagelabels(data,class,tag,tag) end end - context.popcatcodes() -- context.protect else report_labels("unknown label set '%s'",name) end @@ -151,11 +152,16 @@ end --~ --~ labels.check() + +-- interface + +commands.definelabels = labels.define + -- function commands.setstrippedtextprefix(str) -- context(string.strip(str)) -- end -function commands.concatcommalist(settings) +function commands.concatcommalist(settings) -- it's too easy to forget that this one is there local list = settings_to_array(settings.text or "") local size = #list if size > 1 then |