diff options
| author | Hans Hagen <pragma@wxs.nl> | 2016-10-12 20:30:59 +0200 |
|---|---|---|
| committer | Context Git Mirror Bot <phg42.2a@gmail.com> | 2016-10-12 20:30:59 +0200 |
| commit | 1964c078d21c5f1d19a84fa6ef5c038f8ee80652 (patch) | |
| tree | 833b3c9c678bcc7043560ab2e83daeeb395d6d7c /tex/context/modules/mkiv/x-setups-basics.mkiv | |
| parent | 236690a6367b25187d37013e1e7fc196c5c44eb8 (diff) | |
| download | context-1964c078d21c5f1d19a84fa6ef5c038f8ee80652.tar.gz | |
2016-10-12 17:32:00
Diffstat (limited to 'tex/context/modules/mkiv/x-setups-basics.mkiv')
| -rw-r--r-- | tex/context/modules/mkiv/x-setups-basics.mkiv | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/tex/context/modules/mkiv/x-setups-basics.mkiv b/tex/context/modules/mkiv/x-setups-basics.mkiv index 28e1a577b..b7004c51c 100644 --- a/tex/context/modules/mkiv/x-setups-basics.mkiv +++ b/tex/context/modules/mkiv/x-setups-basics.mkiv @@ -167,11 +167,11 @@ local commands = interfaces.complete.commands local elements = interfaces.complete.elements - local function replace(pattern,attribute,one,two) + local function replace(pattern,attribute,one,two,three) for e in xml.collected(x,pattern) do local t = e.at[attribute] if t then - local c = one[t] or (two and two[t]) + local c = one[t] or (two and two[t]) or (three and three[t]) if c then local v = c[interface] if v then @@ -182,7 +182,7 @@ end end - replace('cd:command', 'name', commands, elements) + replace('cd:command', 'name', commands, elements, variables) replace('cd:string', 'value', commands, elements) replace('cd:variable' , 'value', variables) @@ -192,6 +192,7 @@ replace('cd:variable', 'type', variables) replace('cd:inherit', 'name', commands, elements) + replace('cd:instances/cd:constant', 'value', variables) end if tex.modes["setups:save"] and environment.currentrun == 1 then @@ -362,7 +363,7 @@ \stopxmlsetups \startxmlsetups xml:setups:make:variable - \xmlatt{#1}{value} + \setupintfont{\xmlatt{#1}{value}} \stopxmlsetups \let\m_cmd_current_hash\empty @@ -477,7 +478,7 @@ \stopxmlsetups \startxmlsetups xml:setups:instance - \xmlatt{#1}{value}\enspace + \xmlatt{#1}{value}\enskip % we need a break \stopxmlsetups \startxmlsetups xml:setups:typeset:instances @@ -745,7 +746,7 @@ \unexpanded\def\show_setup_any#1#2% {\bgroup \global\advance\c_cmd_current_argument\plusone - \doif{\xmlatt{#1}{optional}}{yes}\donetrue\donefalse + \doifelse{\xmlatt{#1}{optional}}{yes}\donetrue\donefalse \setbox0=\hbox {\ifdone\sl\fi \doifelse{\xmlatt{#1}{list}}{yes} @@ -883,9 +884,10 @@ } \blank[\v!big,\v!samepage] \starttabulate[|l|p|] + % no /interface here \xmlall {#1} - {/interface/command[@name=='\currentsetupparametercommand' or @handler=='\currentsetupparametercommand']/arguments/assignments/parameter/command(xml:setups:parameters:value)} + {interface/command[@name=='\currentsetupparametercommand' or @handler=='\currentsetupparametercommand']/arguments/assignments/parameter/command(xml:setups:parameters:value)} \ifnum\noftabulaterows = \zerocount \NC \parameterkey{no specific settings} \NC \NC \NR \fi |