diff options
Diffstat (limited to 'tex/context/base/mkxl/lang-lab.lmt')
| -rw-r--r-- | tex/context/base/mkxl/lang-lab.lmt | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/tex/context/base/mkxl/lang-lab.lmt b/tex/context/base/mkxl/lang-lab.lmt index b82721b76..f1f9b3580 100644 --- a/tex/context/base/mkxl/lang-lab.lmt +++ b/tex/context/base/mkxl/lang-lab.lmt @@ -91,29 +91,28 @@ function labels.define(class,name,prefixed) report_labels("defining label set %a",name) for tag, data in next, list do tag = variables[tag] or tag - if data.hidden then - -- skip - elseif prefixed then - local first, second = lpegmatch(splitter,tag) - if second then - if rawget(variables,first) then - if rawget(variables,second) then - definelanguagelabels(data,class,f_key_key(first,second),tag) + if not data.hidden then + local key = tag + if prefixed then + local first, second = lpegmatch(splitter,tag) + if second then + if rawget(variables,first) then + if rawget(variables,second) then + key = f_key_key(first,second) + else + key = f_key_raw(first,second) + end + elseif rawget(variables,second) then + key = f_raw_key(first,second) else - definelanguagelabels(data,class,f_key_raw(first,second),tag) + key = f_raw_raw(first,second) end - elseif rawget(variables,second) then - definelanguagelabels(data,class,f_raw_key(first,second),tag) - else - definelanguagelabels(data,class,f_raw_raw(first,second),tag) + elseif rawget(variables,rawtag) then + key = f_key(tag) end - elseif rawget(variables,rawtag) then - definelanguagelabels(data,class,f_key(tag),tag) - else - definelanguagelabels(data,class,tag,tag) end - else - definelanguagelabels(data,class,tag,tag) + -- report_labels("defining class %a, key %a, tag %a",class,key,tag) + definelanguagelabels(data,class,key,tag) end end else |