diff options
Diffstat (limited to 'tex')
46 files changed, 5972 insertions, 5004 deletions
diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex index 3db368588..42faa8da3 100644 --- a/tex/context/base/cont-new.tex +++ b/tex/context/base/cont-new.tex @@ -2239,8 +2239,7 @@  %D For Ton. To be documented.  \def\plaatsexterndocument[#1]% -  {\def\doexternaldocument[##1][##2][##3]% -     {\readlocfile{##2}\donothing\donothing}% +  {\def\doexternaldocument##1##2##3{\readlocfile{##2}\donothing\donothing}%     \getvalue{\v!file:::#1}}  %D Far from complete. diff --git a/tex/context/base/cont-sys.ori b/tex/context/base/cont-sys.ori index ad48b73fb..a37731782 100644 --- a/tex/context/base/cont-sys.ori +++ b/tex/context/base/cont-sys.ori @@ -60,12 +60,14 @@  % \preloadmapfile[ec-base.map]  % \preloadmapfile[8r-base.map]  % \preloadmapfile[qx-base.map] +% \preloadmapfile[t5-base.map]  % \preloadmapfile[texnansi-base.map]  % \preloadmapfile[original-ams-cmr.map]  % \preloadmapfile[original-ams-euler.map]  % \preloadmapfile[original-public-lm.map]  % \preloadmapfile[original-public-plr.map]  % \preloadmapfile[original-public-csr.map] +% \preloadmapfile[original-public-vnr.map]  %  % (2) otherwise, use this if you have a fast machine  % @@ -79,12 +81,14 @@  \loadmapfile[ec-base.map]  \loadmapfile[8r-base.map]  \loadmapfile[qx-base.map] +\loadmapfile[t5-base.map]  \loadmapfile[texnansi-base.map]  \loadmapfile[original-ams-cmr.map]  \loadmapfile[original-ams-euler.map]  \loadmapfile[original-public-lm.map]  \loadmapfile[original-public-plr.map]  \loadmapfile[original-public-csr.map] +\loadmapfile[original-public-vnr.map]  \loadmapfile[texnansi-public-lm.map]  \loadmapfile[ec-public-lm.map] diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex index 1caa66994..7938ebe07 100644 --- a/tex/context/base/context.tex +++ b/tex/context/base/context.tex @@ -31,7 +31,7 @@  %D 2004.8.30 the low level interface is english. Watch out and adapt  %D your styles an modules. -\def\contextversion{2004.11.16} +\def\contextversion{2004.11.22}  %D Welcome to the main module. When this module is ran through  %D \type{initex} or \type {tex -i} or \type {whatevertex} using diff --git a/tex/context/base/core-con.tex b/tex/context/base/core-con.tex index 88fe60728..42dd5ac40 100644 --- a/tex/context/base/core-con.tex +++ b/tex/context/base/core-con.tex @@ -203,6 +203,52 @@      \ruledhbox spread .15em{\hss\uppercased{\romannumerals{#1}}\hss}}}  %D \macros +%D   {defineconversionvector,conversionnumber} % bad names so no danger for clash +%D +%D For Adam and friends \unknown +%D +%D \startitemize[persiannummerals] +%D \item test \item test \item test \item test +%D \stopitemize + +% \defineconversionvector{alpha}{`a} +% \edef\test{\conversionnumber{alpha}{123}} + +% \ifx\gobbleoneargument\undefined \long\def\gobbleoneargument#1{} \fi + +\def\defineconversionvector#1#2% name base +  {\bgroup +   % dirty trick +   \uccode`\!=`\1 +   % plain: +   % \uccode`\0=\numexpr#2+0\relax \uccode`\1=\numexpr#2+1\relax +   % \uccode`\2=\numexpr#2+2\relax \uccode`\3=\numexpr#2+3\relax +   % \uccode`\4=\numexpr#2+4\relax \uccode`\5=\numexpr#2+5\relax +   % \uccode`\6=\numexpr#2+6\relax \uccode`\7=\numexpr#2+7\relax +   % \uccode`\8=\numexpr#2+8\relax \uccode`\9=\numexpr#2+9\relax +   % context: +   \dostepwiserecurse091{\expandafter\uccode\expandafter`\recurselevel=\numexpr#2+\recurselevel}% +   % prepared macro +   \uppercase\expandafter{\expandafter\gdef\csname::cvn::#1::\endcsname##!% +     {\ifcase##! 0\or1\or2\or3\or4\or5\or6\or7\or8\or9\fi}}% +   \egroup} + +\def\conversionnumber#1#2% +  {\ifcsname::cvn::#1::\endcsname +     \expandafter\doconversionnumber\csname::cvn::#1::\expandafter\endcsname\number#2\relax +   \else +      \number#2% +   \fi} + +\def\doconversionnumber#1#2% +  {\ifx#2\relax +     \expandafter\gobbleoneargument +   \else +     #1{#2}% +     \expandafter\doconversionnumber +   \fi#1} + +%D \macros  %D   {protectconversion}  %D  %D The previous two commands are not robust enough to be @@ -796,6 +842,19 @@  \defineconversion [\v!greek]         [\greeknumerals]  \defineconversion [\v!Greek]         [\Greeknumerals] +\defineconversion [arabicnumerals]   [\numbers] +\defineconversion [persiannumerals]  [\numbers] + +\beginXETEX \number + +\defineconversionvector{arabicnumerals} {"0660} +\defineconversionvector{persiannumerals}{"06F0} + +\defineconversion[arabicnumerals] [\conversionnumber{arabicnumerals}] +\defineconversion[persiannumerals][\conversionnumber{persiannumerals}] + +\endXETEX +  % Some bonus ones:  \defineconversion [\v!empty]         [\gobbleoneargument] diff --git a/tex/context/base/core-ref.tex b/tex/context/base/core-ref.tex index cfb885e84..9f5444841 100644 --- a/tex/context/base/core-ref.tex +++ b/tex/context/base/core-ref.tex @@ -2832,7 +2832,7 @@         {\doifelsenothing{#3}            {\douseexternaldocument[#1][#2][#2]}            {\doifsomething{#2} -             {\setgvalue{\v!file:::#1}{\doexternaldocument[][#2][#3]}% just \do +             {\setgvalue{\v!file:::#1}{\doexternaldocument{}{#2}{#3}}% just \do                \doif\@@rfstate\v!start                  {\doifparentfileelse{#2}                     {\showmessage\m!references{21}{#2}} @@ -2877,24 +2877,34 @@  \def\useURL    {\bgroup     \protectlabels -   \catcode`\#=12\catcode`\%=12\catcode`\/=12 -   \catcode`\_=12\catcode`\~=12\catcode`\:=12 +   \catcode`\#=\@@other\catcode`\%=\@@other\catcode`\/=\@@other +   \catcode`\_=\@@other\catcode`\~=\@@other\catcode`\:=\@@other     \dodoubleempty\douseURL}  \def\douseURL[#1][#2]%    {\egroup\doquadrupleempty\dodouseURL[#1][#2]} -\def\dodouseURL[#1][#2][#3][#4]% +% \def\dodouseURL[#1][#2][#3][#4]% +%   {\iffirstargument +%      \iffourthargument\setgvalue{\v!file:::#1}{\doexternaldocument{#2}{#3}{#4}}\else +%      \ifthirdargument \setgvalue{\v!file:::#1}{\doexternaldocument{#2}{#3}{\url[#1]}}\else +%      \ifsecondargument\setgvalue{\v!file:::#1}{\doexternaldocument{#2}{}{\url[#1]}}\fi\fi\fi +%    \fi} + +\def\dodouseURL[#1][#2][#3][#4]% to be redone: not too tricky redefs ad reuse    {\iffirstargument -     \iffourthargument -       \setgvalue{\v!file:::#1}{\doexternaldocument[#2][#3][#4]}% -     \else\ifthirdargument -       \setgvalue{\v!file:::#1}{\doexternaldocument[#2][#3][{\url[#1]}]}% -     \else\ifsecondargument -       \setgvalue{\v!file:::#1}{\doexternaldocument[#2][][{\url[#1]}]}% -     \fi\fi\fi +     \iffourthargument\setgvalue{\v!file:::#1}{\doexternaldocument{#2}{#3}{#4}}\else +     \ifthirdargument \setgvalue{\v!file:::#1}{\doexternalurl     {#2}{#3}{#1}}\else +     \ifsecondargument\setgvalue{\v!file:::#1}{\doexternalurl     {#2}{}  {#1}}\fi\fi\fi     \fi} +\def\doexternalurl#1#2#3% +  {\bgroup +   \doifsomething\@@urstyle{\let\@@iastyle\@@urstyle\let\@@urstyle\empty}% +   \doifsomething\@@urcolor{\let\@@iacolor\@@urcolor\let\@@urcolor\empty}% +   \doexternaldocument{#1}{#2}{\url[#3]}% +   \egroup} +  %D \macros  %D   {url,setupurl}  %D @@ -2912,23 +2922,21 @@  %D  %D \showsetup{\y!setupurl} -\def\setupurl% +\def\setupurl    {\dodoubleargument\getparameters[\??ur]}  \unexpanded\def\url[#1]% slow    {\bgroup     \processaction       [\@@uralternative] -     [ \v!none=>\chardef\urlsplitmode\zerocount, -      \v!both=>\chardef\urlsplitmode\plusone, -         \v!after=>\chardef\urlsplitmode\plustwo, -       \v!before=>\chardef\urlsplitmode\plusthree]% +     [  \v!none=>\chardef\urlsplitmode\zerocount, +        \v!both=>\chardef\urlsplitmode\plusone, +       \v!after=>\chardef\urlsplitmode\plustwo, +      \v!before=>\chardef\urlsplitmode\plusthree]%     \doifelse\@@urspace\v!yes -     {\setbetweenisolatedwords% -        {\scratchskip\currentspaceskip -         \hskip\zeropoint\!!plus.2\scratchskip}} +     {\setbetweenisolatedwords{\scratchskip\currentspaceskip\hskip\zeropoint\!!plus.2\scratchskip}}       {\setbetweenisolatedwords\allowbreak}% -   \def\doexternaldocument[##1][##2][##3]{\hyphenatedurl{##1}}% +   \def\doexternaldocument##1##2##3{\hyphenatedurl{##1}}% awful hack     \dostartattributes\??ur\c!style\c!color{}%     \getvalue{\v!file:::#1}%     \dostopattributes @@ -2972,7 +2980,7 @@  \newconditional\forceURLlocation -\def\setouterfilelocation[#1][#2][#3]% +\def\setouterfilelocation#1#2#3%    {\edef\otherURL{#1}%     \edef\otherfile{#2}}% @@ -3036,7 +3044,7 @@    {\ifundefined{\v!file:::#1}%       \tttf[#1]%     \else -     \def\doexternaldocument[##1][##2][##3]{\goto{##3}[#1::#2]}% +     \def\doexternaldocument##1##2##3{\goto{##3}[#1::#2]}%       \csname\v!file:::#1\endcsname     \fi} @@ -3044,7 +3052,7 @@    {\ifundefined{\v!file:::#1}%       \tttf[#1]%     \else -     \def\doexternaldocument[##1][##2][##3]{##3}% different than ^ +     \def\doexternaldocument##1##2##3{##3}% different than ^       \csname\v!file:::#1\endcsname     \fi} @@ -3533,9 +3541,9 @@           \!!counta\zerocount % new, was 1           \processallactionsinset             [#2] -           [       \v!page=>\advance\!!counta 4, -                \v!subpage=>\advance\!!counta 4, -                  \s!unknown=>\advance\!!counta 1]% +           [   \v!page=>\advance\!!counta 4, +            \v!subpage=>\advance\!!counta 4, +            \s!unknown=>\advance\!!counta 1]%           \ifdim\@@ibwidth=\!!zeropoint\relax             \!!widtha2em             \advance\!!widtha \@@ibdistance  % new @@ -3544,9 +3552,9 @@           \else             \!!widtha\@@ibwidth             \!!widthb\@@ibdistance           % new -           \multiply\!!widthb \!!counta    % new +           \multiply\!!widthb \!!counta     % new             \advance\!!widthb -\@@ibdistance % new -           \advance\!!widtha -\!!widthb    % new +           \advance\!!widtha -\!!widthb     % new             \divide\!!widtha \!!counta             \!!widthb\@@ibwidth           \fi @@ -3562,11 +3570,11 @@           \hbox to \!!widthb             {\processallactionsinset                [#2] -              [    \v!page=>\goto\v!firstpage +              [      \v!page=>\goto\v!firstpage                                \goto\v!nextpage                                \goto\v!previouspage                                \goto\v!lastpage, -                \v!subpage=>\goto\v!firstsubpage +                  \v!subpage=>\goto\v!firstsubpage                                \goto\v!nextsubpage                                \goto\v!previoussubpage                                \goto\v!lastsubpage, diff --git a/tex/context/base/core-reg.tex b/tex/context/base/core-reg.tex index 2836fab43..d9a94631d 100644 --- a/tex/context/base/core-reg.tex +++ b/tex/context/base/core-reg.tex @@ -907,7 +907,7 @@  \def\doplaceregister[#1][#2]%    {\iffirstargument       \begingroup -     \def\currentregister{#1}% +     \edef\currentregister{#1}%       \setupregister[\currentregister][#2]%       \raggedright       \startcolumns @@ -928,7 +928,7 @@  \def\docompleteregister[#1][#2]%    {\iffirstargument       \begingroup -     \def\currentregister{#1}% +     \edef\currentregister{#1}%       % the expansion is needed because we don't want \v!'s in the tuo file (french)       \expanded{\systemsuppliedchapter[\currentregister]{\noexpand\headtext{\currentregister}}}%       \placeregister[\currentregister][#2]% diff --git a/tex/context/base/enco-acc.tex b/tex/context/base/enco-acc.tex index 59d89dc54..e02536be6 100644 --- a/tex/context/base/enco-acc.tex +++ b/tex/context/base/enco-acc.tex @@ -114,6 +114,12 @@  \stopencoding +\startencoding[default] + +% vietnamese: if needed, \useencoding[enco-vna] + +\stopencoding +  % For Tobias Burnus, who wants:  %  % \starttypen diff --git a/tex/context/base/enco-def.tex b/tex/context/base/enco-def.tex index 78e1df7d7..65c44c30f 100644 --- a/tex/context/base/enco-def.tex +++ b/tex/context/base/enco-def.tex @@ -189,6 +189,8 @@  \definecharacter otilde           {\buildtextaccent\texttilde o}  \definecharacter Utilde           {\buildtextaccent\texttilde U}  \definecharacter utilde           {\buildtextaccent\texttilde u} +\definecharacter Ytilde           {\buildtextaccent\texttilde Y} +\definecharacter ytilde           {\buildtextaccent\texttilde y}  \definecharacter Adiaeresis       {\buildtextaccent\textdiaeresis A}  \definecharacter adiaeresis       {\buildtextaccent\textdiaeresis a} @@ -350,6 +352,103 @@  \definecharacter tcommaaccent     {t\quoteright}  \definecharacter Tcommaaccent     {T\quoteright} +\definecharacter Etilde           {\buildtextaccent\texttilde E} +\definecharacter etilde           {\buildtextaccent\texttilde e} + +\definecharacter Ahook               {A} +\definecharacter ahook               {a} +\definecharacter Ehook               {E} +\definecharacter ehook               {e} +\definecharacter Ihook               {I} +\definecharacter ihook               {i} +\definecharacter Ohook               {O} +\definecharacter ohook               {o} +\definecharacter Uhook               {U} +\definecharacter uhook               {u} +\definecharacter Yhook               {Y} +\definecharacter yhook               {y} + +\definecharacter Acircumflexgrave    {\Acircumflex} +\definecharacter Acircumflexacute    {\Acircumflex} +\definecharacter Acircumflextilde    {\Acircumflex} +\definecharacter Acircumflexhook     {\Acircumflex} +\definecharacter acircumflexgrave    {\acircumflex} +\definecharacter acircumflexacute    {\acircumflex} +\definecharacter acircumflextilde    {\acircumflex} +\definecharacter acircumflexhook     {\acircumflex} +\definecharacter Ecircumflexgrave    {\Ecircumflex} +\definecharacter Ecircumflexacute    {\Ecircumflex} +\definecharacter Ecircumflextilde    {\Ecircumflex} +\definecharacter Ecircumflexhook     {\Ecircumflex} +\definecharacter ecircumflexgrave    {\ecircumflex} +\definecharacter ecircumflexacute    {\ecircumflex} +\definecharacter ecircumflextilde    {\ecircumflex} +\definecharacter ecircumflexhook     {\ecircumflex} +\definecharacter Ocircumflexgrave    {\Ocircumflex} +\definecharacter Ocircumflexacute    {\Ocircumflex} +\definecharacter Ocircumflextilde    {\Ocircumflex} +\definecharacter Ocircumflexhook     {\Ocircumflex} +\definecharacter ocircumflexgrave    {\ocircumflex} +\definecharacter ocircumflexacute    {\ocircumflex} +\definecharacter ocircumflextilde    {\ocircumflex} +\definecharacter ocircumflexhook     {\ocircumflex} + +\definecharacter Abrevegrave         {\Abreve} +\definecharacter Abreveacute         {\Abreve} +\definecharacter Abrevetilde         {\Abreve} +\definecharacter Abrevehook          {\Abreve} +\definecharacter abrevegrave         {\abreve} +\definecharacter abreveacute         {\abreve} +\definecharacter abrevetilde         {\abreve} +\definecharacter abrevehook          {\abreve} + +\definecharacter Adotbelow           {\buildtextbottomdot A} +\definecharacter adotbelow           {\buildtextbottomdot a} +\definecharacter Edotbelow           {\buildtextbottomdot E} +\definecharacter edotbelow           {\buildtextbottomdot e} +\definecharacter Idotbelow           {\buildtextbottomdot I} +\definecharacter idotbelow           {\buildtextbottomdot i} +\definecharacter Odotbelow           {\buildtextbottomdot O} +\definecharacter odotbelow           {\buildtextbottomdot o} +\definecharacter Udotbelow           {\buildtextbottomdot U} +\definecharacter udotbelow           {\buildtextbottomdot u} +\definecharacter Ydotbelow           {\buildtextbottomdot Y} +\definecharacter ydotbelow           {\buildtextbottomdot y} +\definecharacter Ohorndotbelow       {\buildtextbottomdot O} +\definecharacter ohorndotbelow       {\buildtextbottomdot o} +\definecharacter Uhorndotbelow       {\buildtextbottomdot U} +\definecharacter uhorndotbelow       {\buildtextbottomdot u} + +\definecharacter Acircumflexdotbelow {\buildtextbottomdot\Acircumflex} +\definecharacter acircumflexdotbelow {\buildtextbottomdot\acircumflex} +\definecharacter Ecircumflexdotbelow {\buildtextbottomdot\Ecircumflex} +\definecharacter ecircumflexdotbelow {\buildtextbottomdot\ecircumflex} +\definecharacter Ocircumflexdotbelow {\buildtextbottomdot\Ocircumflex} +\definecharacter ocircumflexdotbelow {\buildtextbottomdot\ocircumflex} +\definecharacter Abrevedotbelow      {\buildtextbottomdot\Abreve} +\definecharacter abrevedotbelow      {\buildtextbottomdot\abreve} + +\definecharacter Ohorn               {O} +\definecharacter Ohorngrave          {\Ograve} +\definecharacter Ohornacute          {\Oacute} +\definecharacter Ohorntilde          {\Otilde} +\definecharacter Ohornhook           {O} +\definecharacter ohorn               {o} +\definecharacter ohorngrave          {\ograve} +\definecharacter ohornacute          {\oacute} +\definecharacter ohorntilde          {\otilde} +\definecharacter ohornhook           {o} +\definecharacter Uhorn               {U} +\definecharacter Uhorngrave          {\Ugrave} +\definecharacter Uhornacute          {\Uacute} +\definecharacter Uhorntilde          {\Utilde} +\definecharacter Uhornhook           {U} +\definecharacter uhorn               {u} +\definecharacter uhorngrave          {\ugrave} +\definecharacter uhornacute          {\uacute} +\definecharacter uhorntilde          {\utilde} +\definecharacter uhornhook           {u} +  \stopencoding  %D A few goodies: diff --git a/tex/context/base/enco-ini.tex b/tex/context/base/enco-ini.tex index ef07c418f..85ba61ad7 100644 --- a/tex/context/base/enco-ini.tex +++ b/tex/context/base/enco-ini.tex @@ -1369,7 +1369,7 @@        \lineskiplimit\zeropoint        \setbox0\hbox{#4}%        \halign -        {##\crcr#5\crcr +        {##\crcr\hbox{#5}\crcr           \hidewidth           \hskip#2\wd0           \hskip-#3\fontdimen1\font % in plain 1ex * dimenless value @@ -1499,7 +1499,9 @@  \useencoding[def,acc,raw,com,cas,mis] % mis should come first -\useencoding[ans,il2,ec,tbo,pdf,uc,pol,qx] +\useencoding[ans,il2,ec,tbo,pdf,uc,pol,qx,t5] + +% \useencoding[vna]  \setupencoding[\s!default=ec] % was: [\s!default=\s!default] diff --git a/tex/context/base/enco-t5.tex b/tex/context/base/enco-t5.tex new file mode 100644 index 000000000..8bee0fcef --- /dev/null +++ b/tex/context/base/enco-t5.tex @@ -0,0 +1,243 @@ +%D \module +%D   [     file=enco-t5, +%D      version=2004.11.16, +%D        title=\CONTEXT\ Encoding Macros, +%D     subtitle=New Vietnamese Encoding, +%D       author=Hans Hagen \& Adam Lindsay, +%D         date=\currentdate, +%D    copyright=PRAGMA \& Adam Lindsay] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + +%D This module is derived from the enco-x5 encoding, but now +%D approaches the world with named glyphs. + +\startencoding[t5] + +\definecasemaps 128 to 159 lc +32 uc   0 + +\definecasemaps 160 to 191 lc   0 uc -32 + +\definecasemaps 192 to 223 lc +32 uc   0 + +\definecasemaps 224 to 225 lc   0 uc -32 + +\definecasemap 26 26 27 \definecasemap 27 26 27 +\definecasemap 28 28 29 \definecasemap 29 28 29 +\definecasemap 30 30 31 \definecasemap 31 30 31 + +\definecharacter textgrave             0 +\definecharacter textacute             1 +\definecharacter textcircumflex        2 +\definecharacter texttilde             3 +\definecharacter textdiaeresis         4 +\definecharacter textbottomdot         5 +\definecharacter textring              6 +\definecharacter textcaron             7 +\definecharacter textbreve             8 +\definecharacter textmacron            9 +\definecharacter textdotaccent        10 +\definecharacter textcedilla          11 +\definecharacter texthookabove        12 + +\definecharacter quotesinglebase      13 +\definecharacter guilsingleleft       14 +\definecharacter guilsingleright      15 +\definecharacter quotedblleft         16 +\definecharacter quotedblright        17 +\definecharacter quotedblbase         18 +\definecharacter leftguillemot        19 +\definecharacter rightguillemot       20 +\definecharacter endash               21 +\definecharacter emdash               22 + +\definecharacter cwm                  23 +\definecharacter zeroinferior         24 +\definecharacter Yhook                26 +\definecharacter yhook                27 +\definecharacter Ydotbelow            28 +\definecharacter ydotbelow            29 +\definecharacter Dstroke              30 +\definecharacter dstroke              31 +\definecharacter textvisiblespace     32 + +\definecharacter dotlessi             25 +%definecharacter DJ                   30 +%definecharacter dj                   31 +\definecharacter Agrave              128 +\definecharacter Aacute              129 +\definecharacter Atilde              130 +\definecharacter Ahook               131 +\definecharacter Adotbelow           132 +\definecharacter Acircumflex         133 +\definecharacter Acircumflexgrave    134 +\definecharacter Acircumflexacute    135 +\definecharacter Acircumflextilde    136 +\definecharacter Acircumflexhook     137 +\definecharacter Acircumflexdotbelow 138 +\definecharacter Abreve              139 +\definecharacter Abrevegrave         140 +\definecharacter Abreveacute         141 +\definecharacter Abrevetilde         142 +\definecharacter Abrevehook          143 +\definecharacter Abrevedotbelow      144 +\definecharacter Egrave              145 +\definecharacter Eacute              146 +\definecharacter Etilde              147 +\definecharacter Ehook               148 +\definecharacter Edotbelow           149 +\definecharacter Ecircumflex         150 +\definecharacter Ecircumflexgrave    151 +\definecharacter Ecircumflexacute    152 +\definecharacter Ecircumflextilde    153 +\definecharacter Ecircumflexhook     154 +\definecharacter Ecircumflexdotbelow 155 +\definecharacter Igrave              156 +\definecharacter Iacute              157 +\definecharacter Itilde              158 +\definecharacter Ihook               159 +\definecharacter agrave              160 +\definecharacter aacute              161 +\definecharacter atilde              162 +\definecharacter ahook               163 +\definecharacter adotbelow           164 +\definecharacter acircumflex         165 +\definecharacter acircumflexgrave    166 +\definecharacter acircumflexacute    167 +\definecharacter acircumflextilde    168 +\definecharacter acircumflexhook     169 +\definecharacter acircumflexdotbelow 170 +\definecharacter abreve              171 +\definecharacter abrevegrave         172 +\definecharacter abreveacute         173 +\definecharacter abrevetilde         174 +\definecharacter abrevehook          175 +\definecharacter abrevedotbelow      176 +\definecharacter egrave              177 +\definecharacter eacute              178 +\definecharacter etilde              179 +\definecharacter ehook               180 +\definecharacter edotbelow           181 +\definecharacter ecircumflex         182 +\definecharacter ecircumflexgrave    183 +\definecharacter ecircumflexacute    184 +\definecharacter ecircumflextilde    185 +\definecharacter ecircumflexhook     186 +\definecharacter ecircumflexdotbelow 187 +\definecharacter igrave              188 +\definecharacter iacute              189 +\definecharacter itilde              190 +\definecharacter ihook               191 +\definecharacter Idotbelow           192 +\definecharacter Ograve              193 +\definecharacter Oacute              194 +\definecharacter Otilde              195 +\definecharacter Ohook               196 +\definecharacter Odotbelow           197 +\definecharacter Ocircumflex         198 +\definecharacter Ocircumflexgrave    199 +\definecharacter Ocircumflexacute    200 +\definecharacter Ocircumflextilde    201 +\definecharacter Ocircumflexhook     202 +\definecharacter Ocircumflexdotbelow 203 +\definecharacter Ohorn               204 +\definecharacter Ohorngrave          205 +\definecharacter Ohornacute          206 +\definecharacter Ohorntilde          207 +\definecharacter Ohornhook           208 +\definecharacter Ohorndotbelow       209 +\definecharacter Ugrave              210 +\definecharacter Uacute              211 +\definecharacter Utilde              212 +\definecharacter Uhook               213 +\definecharacter Udotbelow           214 +\definecharacter Uhorn               215 +\definecharacter Uhorngrave          216 +\definecharacter Uhornacute          217 +\definecharacter Uhorntilde          218 +\definecharacter Uhornhook           219 +\definecharacter Uhorndotbelow       220 +\definecharacter Ytilde              223 +\definecharacter idotbelow           224 +\definecharacter ograve              225 +\definecharacter oacute              226 +\definecharacter otilde              227 +\definecharacter ohook               228 +\definecharacter odotbelow           229 +\definecharacter ocircumflex         230 +\definecharacter ocircumflexgrave    231 +\definecharacter ocircumflexacute    232 +\definecharacter ocircumflextilde    233 +\definecharacter ocircumflexhook     234 +\definecharacter ocircumflexdotbelow 235 +\definecharacter ohorn               236 +\definecharacter ohorngrave          237 +\definecharacter ohornacute          238 +\definecharacter ohorntilde          239 +\definecharacter ohornhook           240 +\definecharacter ohorndotbelow       241 +\definecharacter ugrave              242 +\definecharacter uacute              243 +\definecharacter utilde              244 +\definecharacter uhook               245 +\definecharacter udotbelow           246 +\definecharacter uhorn               247 +\definecharacter uhorngrave          248 +\definecharacter uhornacute          249 +\definecharacter uhorntilde          250 +\definecharacter uhornhook           251 +\definecharacter uhorndotbelow       252 +\definecharacter ygrave              253 +\definecharacter yacute              254 +\definecharacter ytilde              255 + +\stopencoding + +\endinput + +% \startencoding [x5] +% +% \definecharacter aa {\xfiveencodedaa} +% \definecharacter AA {\xfiveencodedAA} +% +% \stopencoding +% +% \def\xfiveencodedaa% +%   {\accent23a} +% +% \def\xfiveencodedAA% +%   {\leavevmode +%    \setbox\z@\hbox{h}% +%    \dimen@\ht\z@ +%    \advance\dimen@ -1ex +%    \rlap{\raise.67\dimen@\hbox{\char23}}A} + +% \quotesinglbase     13 +% \guilsinglleft      14 +% \guilsinglright     15 +% \textquotedblleft   16 +% \textquotedblright  17 +% \quotedblbase       18 +% \guillemotleft      19 +% \guillemotright     20 +% \textendash         21 +% \textemdash         22 +% \textcompwordmark   23 +% \textperthousand    \% \char 24 +% \textpertenthousand \%\char 24\char 24 +% \textvisiblespace   32 +% \textquotedbl       `\" +% \textdollar         `\$ +% \textquoteright     `\' +% \textless           `\< +% \textgreater        `\> +% \textbackslash      `\ +% \textasciicircum    `\^ +% \textunderscore     95 +% \textquoteleft      `\` +% \textbraceleft      `\{ +% \textbar            `\| +% \textbraceright     `\} +% \textasciitilde     `\~ diff --git a/tex/context/base/enco-uc.tex b/tex/context/base/enco-uc.tex index 751f9f340..0d845685b 100644 --- a/tex/context/base/enco-uc.tex +++ b/tex/context/base/enco-uc.tex @@ -31,7 +31,7 @@  \definecharacter Iacute        {\uchar0{205}}  \definecharacter Icircumflex   {\uchar0{206}}  \definecharacter Idiaeresis    {\uchar0{207}} -\definecharacter Dstroke       {\uchar0{208}} +%\definecharacter Dstroke       {\uchar0{208}}  \definecharacter Ntilde        {\uchar0{209}}  \definecharacter Ograve        {\uchar0{210}}  \definecharacter Oacute        {\uchar0{211}} @@ -63,7 +63,7 @@  \definecharacter iacute        {\uchar0{237}}  \definecharacter icircumflex   {\uchar0{238}}  \definecharacter idiaeresis    {\uchar0{239}} -\definecharacter dmacron       {\uchar0{240}} +%\definecharacter dmacron       {\uchar0{240}}  \definecharacter ntilde        {\uchar0{241}}  \definecharacter ograve        {\uchar0{242}}  \definecharacter oacute        {\uchar0{243}} @@ -114,8 +114,8 @@  \definecharacter gbreve        {\uchar1{31}}  \definecharacter Gdotaccent    {\uchar1{32}}  \definecharacter gdotaccent    {\uchar1{33}} -\definecharacter Gdotaccent    {\uchar1{34}} -\definecharacter gdotaccent    {\uchar1{35}} +%definecharacter Gdotaccent    {\uchar1{34}} +%definecharacter gdotaccent    {\uchar1{35}}  \definecharacter Hcircumflex   {\uchar1{36}}  \definecharacter hcircumflex   {\uchar1{37}}  \definecharacter Hstroke       {\uchar1{38}} @@ -295,6 +295,11 @@  \definecharacter textellipsis     {\uchar{32}{38}}  \definecharacter perthousand      {\uchar{32}{48}} +\definecharacter Gcedilla         {\uchar1{34}} +\definecharacter gcedilla         {\uchar1{35}} +\definecharacter Eth              {\uchar0{208}} +\definecharacter eth              {\uchar0{240}} +  %D semi-automatic conversion meant it was easier to use  %D hex numbers here: @@ -499,6 +504,105 @@  \definecharacter cyrillicYO     {\uchar4{"01}}  \definecharacter cyrillicyo     {\uchar4{"51}} +%D Some Vietnamese characters finally: + +\definecharacter   Ohorn                {\uchar1{"A0}} +\definecharacter   ohorn                {\uchar1{"A1}} +\definecharacter   Uhorn                {\uchar1{"AF}} +\definecharacter   uhorn                {\uchar1{"B0}} + +\definecharacter   Yhook                {\uchar{"1E}{"F6}} +\definecharacter   yhook                {\uchar{"1E}{"F7}} +\definecharacter   Ydotbelow            {\uchar{"1E}{"F4}} +\definecharacter   ydotbelow            {\uchar{"1E}{"F5}} +\definecharacter   Ahook                {\uchar{"1E}{"A2}} +\definecharacter   Adotbelow            {\uchar{"1E}{"A0}} +\definecharacter   Acircumflexgrave     {\uchar{"1E}{"A6}} +\definecharacter   Acircumflexacute     {\uchar{"1E}{"A4}} +\definecharacter   Acircumflextilde     {\uchar{"1E}{"AA}} +\definecharacter   Acircumflexhook      {\uchar{"1E}{"A8}} +\definecharacter   Acircumflexdotbelow  {\uchar{"1E}{"AC}} +\definecharacter   Abrevegrave          {\uchar{"1E}{"B0}} +\definecharacter   Abreveacute          {\uchar{"1E}{"AE}} +\definecharacter   Abrevetilde          {\uchar{"1E}{"B4}} +\definecharacter   Abrevehook           {\uchar{"1E}{"B2}} +\definecharacter   Abrevedotbelow       {\uchar{"1E}{"B6}} +\definecharacter   Ehook                {\uchar{"1E}{"BA}} +\definecharacter   Edotbelow            {\uchar{"1E}{"B8}} +\definecharacter   Ecircumflexgrave     {\uchar{"1E}{"C0}} +\definecharacter   Ecircumflexacute     {\uchar{"1E}{"BE}} +\definecharacter   Ecircumflextilde     {\uchar{"1E}{"C4}} +\definecharacter   Ecircumflexhook      {\uchar{"1E}{"C2}} +\definecharacter   Ecircumflexdotbelow  {\uchar{"1E}{"C6}} +\definecharacter   Ihook                {\uchar{"1E}{"C8}} +\definecharacter   ahook                {\uchar{"1E}{"A3}} +\definecharacter   adotbelow            {\uchar{"1E}{"A1}} +\definecharacter   acircumflexgrave     {\uchar{"1E}{"A7}} +\definecharacter   acircumflexacute     {\uchar{"1E}{"A5}} +\definecharacter   acircumflextilde     {\uchar{"1E}{"AB}} +\definecharacter   acircumflexhook      {\uchar{"1E}{"A9}} +\definecharacter   acircumflexdotbelow  {\uchar{"1E}{"AD}} +\definecharacter   abrevegrave          {\uchar{"1E}{"B1}} +\definecharacter   abreveacute          {\uchar{"1E}{"AF}} +\definecharacter   abrevetilde          {\uchar{"1E}{"B5}} +\definecharacter   abrevehook           {\uchar{"1E}{"B3}} +\definecharacter   abrevedotbelow       {\uchar{"1E}{"B7}} +\definecharacter   ehook                {\uchar{"1E}{"BB}} +\definecharacter   edotbelow            {\uchar{"1E}{"B9}} +\definecharacter   ecircumflexgrave     {\uchar{"1E}{"C1}} +\definecharacter   ecircumflexacute     {\uchar{"1E}{"BF}} +\definecharacter   ecircumflextilde     {\uchar{"1E}{"C5}} +\definecharacter   ecircumflexhook      {\uchar{"1E}{"C3}} +\definecharacter   ecircumflexdotbelow  {\uchar{"1E}{"C7}} +\definecharacter   ihook                {\uchar{"1E}{"C9}} +\definecharacter   Idotbelow            {\uchar{"1E}{"CA}} +\definecharacter   Ohook                {\uchar{"1E}{"CE}} +\definecharacter   Odotbelow            {\uchar{"1E}{"CC}} +\definecharacter   Ocircumflexgrave     {\uchar{"1E}{"D2}} +\definecharacter   Ocircumflexacute     {\uchar{"1E}{"D0}} +\definecharacter   Ocircumflextilde     {\uchar{"1E}{"D6}} +\definecharacter   Ocircumflexhook      {\uchar{"1E}{"D4}} +\definecharacter   Ocircumflexdotbelow  {\uchar{"1E}{"D8}} +\definecharacter   Ohorngrave           {\uchar{"1E}{"DC}} +\definecharacter   Ohornacute           {\uchar{"1E}{"DA}} +\definecharacter   Ohorntilde           {\uchar{"1E}{"E0}} +\definecharacter   Ohornhook            {\uchar{"1E}{"DE}} +\definecharacter   Ohorndotbelow        {\uchar{"1E}{"E2}} +\definecharacter   Uhook                {\uchar{"1E}{"E6}} +\definecharacter   Udotbelow            {\uchar{"1E}{"E4}} +\definecharacter   Uhorngrave           {\uchar{"1E}{"EA}} +\definecharacter   Uhornacute           {\uchar{"1E}{"E8}} +\definecharacter   Uhorntilde           {\uchar{"1E}{"EE}} +\definecharacter   Uhornhook            {\uchar{"1E}{"EC}} +\definecharacter   Uhorndotbelow        {\uchar{"1E}{"F0}} +\definecharacter   Ytilde               {\uchar{"1E}{"F8}} +\definecharacter   idotbelow            {\uchar{"1E}{"CB}} +\definecharacter   ohook                {\uchar{"1E}{"CF}} +\definecharacter   odotbelow            {\uchar{"1E}{"CD}} +\definecharacter   ocircumflexgrave     {\uchar{"1E}{"D3}} +\definecharacter   ocircumflexacute     {\uchar{"1E}{"D1}} +\definecharacter   ocircumflextilde     {\uchar{"1E}{"D7}} +\definecharacter   ocircumflexhook      {\uchar{"1E}{"D5}} +\definecharacter   ocircumflexdotbelow  {\uchar{"1E}{"D9}} +\definecharacter   ohorngrave           {\uchar{"1E}{"DD}} +\definecharacter   ohornacute           {\uchar{"1E}{"DB}} +\definecharacter   ohorntilde           {\uchar{"1E}{"E1}} +\definecharacter   ohornhook            {\uchar{"1E}{"DF}} +\definecharacter   ohorndotbelow        {\uchar{"1E}{"E3}} +\definecharacter   uhook                {\uchar{"1E}{"E7}} +\definecharacter   udotbelow            {\uchar{"1E}{"E5}} +\definecharacter   uhorngrave           {\uchar{"1E}{"EB}} +\definecharacter   uhornacute           {\uchar{"1E}{"E9}} +\definecharacter   uhorntilde           {\uchar{"1E}{"EF}} +\definecharacter   uhornhook            {\uchar{"1E}{"ED}} +\definecharacter   uhorndotbelow        {\uchar{"1E}{"F1}} +\definecharacter   ytilde               {\uchar{"1E}{"F9}} + +\definecharacter   Etilde               {\uchar{"1E}{"BC}} +\definecharacter   etilde               {\uchar{"1E}{"BD}} +\definecharacter   Ygrave               {\uchar{"1E}{"F2}} +\definecharacter   ygrave               {\uchar{"1E}{"F3}} +  \stopencoding  \endinput diff --git a/tex/context/base/enco-vna.tex b/tex/context/base/enco-vna.tex new file mode 100644 index 000000000..aac129119 --- /dev/null +++ b/tex/context/base/enco-vna.tex @@ -0,0 +1,146 @@ +%D \module +%D   [     file=enco-vna, +%D      version=1999.12.12, +%D        title=\CONTEXT\ Encoding Macros, +%D     subtitle=Vietnamese Accents, +%D       author=Han The Thanh & Adam Lindsay & Hans Hagen, +%D         date=\currentdate, +%D    copyright=PRAGMA] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + +%D This module is originally derived from the some files Han The Thanh +%D prepared for \LATEX. The dual accent support is still +%D preliminary, but works ok. It's now adapted to named +%D glyphs, and is activated by \type {\useencoding[thisfile]}. + +% numbers are from original x5 encoding, and may not match with +% the newer t5 encoding + +%D This was apparently buggy from the start: there is nothing +%D to disambiguate \type{\ohorn} from \type{\ohook}. Both are +%D entered with \type{\h{o}}! + +\startencoding[default] + +\defineaccent h  A       {\Ahook}                % 131 +\defineaccent d  A       {\Adotbelow}            % 132 +\defineaccent ` ^A       {\Acircumflexgrave}     % 134 +\defineaccent ' ^A       {\Acircumflexacute}     % 135 +\defineaccent ~ ^A       {\Acircumflextilde}     % 136 +\defineaccent h ^A       {\Acircumflexhook}      % 137 +\defineaccent d ^A       {\Acircumflexdotbelow}  % 138 +\defineaccent ` uA       {\Abrevegrave}          % 140 +\defineaccent ' uA       {\Abreveacute}          % 141 +\defineaccent ~ uA       {\Abrevetilde}          % 142 +\defineaccent h uA       {\Abrevehook}           % 143 +\defineaccent d uA       {\Abrevedotbelow}       % 144 +\defineaccent h  E       {\Ehook}                % 148 +\defineaccent d  E       {\Edotbelow}            % 149 +\defineaccent ` ^E       {\Ecircumflexgrave}     % 151 +\defineaccent ' ^E       {\Ecircumflexacute}     % 152 +\defineaccent ~ ^E       {\Ecircumflextilde}     % 153 +\defineaccent h ^E       {\Ecircumflexhook}      % 154 +\defineaccent d ^E       {\Ecircumflexdotbelow}  % 155 +\defineaccent h  I       {\Ihook}                % 159 +\defineaccent d  I       {\Idotbelow}            % 192 +\defineaccent h  O       {\Ohook}                % 196 +\defineaccent d  O       {\Odotbelow}            % 197 +\defineaccent ` ^O       {\Ocircumflexgrave}     % 199 +\defineaccent ' ^O       {\Ocircumflexacute}     % 200 +\defineaccent ~ ^O       {\Ocircumflextilde}     % 201 +\defineaccent h ^O       {\Ocircumflexhook}      % 202 +\defineaccent d ^O       {\Ocircumflexdotbelow}  % 203 +%defineaccent h  O       {\Ohorn}                % !!! conflict with \Ohook! +\defineaccent ` hO       {\Ohorngrave}           % 205 +\defineaccent ` {\Ohorn} {\Ohorngrave}           % 205 +\defineaccent ' hO       {\Ohornacute}           % 206 +\defineaccent ' {\Ohorn} {\Ohornacute}           % 206 +\defineaccent ~ hO       {\Ohorntilde}           % 207 +\defineaccent ~ {\Ohorn} {\Ohorntilde}           % 207 +\defineaccent h hO       {\Ohornhook}            % 208 +\defineaccent h {\Ohorn} {\Ohornhook}            % 208 +\defineaccent d hO       {\Ohorndotbelow}        % 209 +\defineaccent d {\Ohorn} {\Ohorndotbelow}        % 209 +\defineaccent h  U       {\Uhook}                % 213 +\defineaccent d  U       {\Udotbelow}            % 214 +%defineaccent h  U       {\Uhorn}                % !!! conflict with \Uhook! honestly, people! +\defineaccent ` hU       {\Uhorngrave}           % 216 +\defineaccent ` {\Uhorn} {\Uhorngrave}           % 216 +\defineaccent ' hU       {\Uhornacute}           % 217 +\defineaccent ' {\Uhorn} {\Uhornacute}           % 217 +\defineaccent ~ hU       {\Uhorntilde}           % 218 +\defineaccent ~ {\Uhorn} {\Uhorntilde}           % 218 +\defineaccent h hU       {\Uhornhook}            % 219 +\defineaccent h {\Uhorn} {\Uhornhook}            % 219 +\defineaccent d hU       {\Uhorndotbelow}        % 220 +\defineaccent d {\Uhorn} {\Uhorndotbelow}        % 220 +\defineaccent `  Y       {\Ygrave}               % 221 +\defineaccent '  Y       {\Yacute}               % 222 +\defineaccent ~  Y       {\Ytilde}               % 223 +\defineaccent h  Y       {\Yhook}                %  26 +\defineaccent d  Y       {\Ydotbelow}            %  28 +\defineaccent h  a       {\ahook}                % 163 +\defineaccent d  a       {\adotbelow}            % 164 +\defineaccent ` ^a       {\acircumflexgrave}     % 166 +\defineaccent ' ^a       {\acircumflexacute}     % 167 +\defineaccent ~ ^a       {\acircumflextilde}     % 168 +\defineaccent h ^a       {\acircumflexhook}      % 169 +\defineaccent d ^a       {\acircumflexdotbelow}  % 170 +\defineaccent ` ua       {\abrevegrave}          % 172 +\defineaccent ' ua       {\abreveacute}          % 173 +\defineaccent ~ ua       {\abrevetilde}          % 174 +\defineaccent h ua       {\abrevehook}           % 175 +\defineaccent d ua       {\abrevedotbelow}       % 176 +\defineaccent h  e       {\ehook}                % 180 +\defineaccent d  e       {\edotbelow}            % 181 +\defineaccent ` ^e       {\ecircumflexgrave}     % 183 +\defineaccent ' ^e       {\ecircumflexacute}     % 184 +\defineaccent ~ ^e       {\ecircumflextilde}     % 185 +\defineaccent h ^e       {\ecircumflexhook}      % 186 +\defineaccent d ^e       {\ecircumflexdotbelow}  % 187 +\defineaccent h  i       {\ihook}                % 191 +\defineaccent d  i       {\idotbelow}            % 224 +\defineaccent h  o       {\ohook}                % 228 +\defineaccent d  o       {\odotbelow}            % 229 +\defineaccent ^  o       {\ocircumflex}          % 230 +\defineaccent ` ^o       {\ocircumflexgrave}     % 231 +\defineaccent ' ^o       {\ocircumflexacute}     % 232 +\defineaccent ~ ^o       {\ocircumflextilde}     % 233 +\defineaccent h ^o       {\ocircumflexhook}      % 234 +\defineaccent d ^o       {\ocircumflexdotbelow}  % 235 +%defineaccent h  o       {\ohorn}                % !!! +\defineaccent ` ho       {\ohorngrave}           % 237 +\defineaccent ' ho       {\ohornacute}           % 238 +\defineaccent ~ ho       {\ohorntilde}           % 239 +\defineaccent h ho       {\ohornhook}            % 240 +\defineaccent d ho       {\ohorndotbelow}        % 241 +\defineaccent ` {\ohorn} {\ohorngrave}           % 237 +\defineaccent ' {\ohorn} {\ohornacute}           % 238 +\defineaccent ~ {\ohorn} {\ohorntilde}           % 239 +\defineaccent h {\ohorn} {\ohornhook}            % 240 +\defineaccent d {\ohorn} {\ohorndotbelow}        % 241 +\defineaccent h  u       {\uhook}                % 245 +\defineaccent d  u       {\udotbelow}            % 246 +%defineaccent h  u       {\uhorn}                % !!! +\defineaccent ` hu       {\uhorngrave}           % 248 +\defineaccent ' hu       {\uhornacute}           % 249 +\defineaccent ~ hu       {\uhorntilde}           % 250 +\defineaccent h hu       {\uhornhook}            % 251 +\defineaccent d hu       {\uhorndotbelow}        % 252 +\defineaccent ` {\uhorn} {\uhorngrave}           % 248 +\defineaccent ' {\uhorn} {\uhornacute}           % 249 +\defineaccent ~ {\uhorn} {\uhorntilde}           % 250 +\defineaccent h {\uhorn} {\uhornhook}            % 251 +\defineaccent d {\uhorn} {\uhorndotbelow}        % 252 +\defineaccent `  y       {\ygrave}               % 253 +\defineaccent '  y       {\yacute}               % 254 +\defineaccent ~  y       {\ytilde}               % 255 +\defineaccent h  y       {\yhook}                %  27 +\defineaccent d  y       {\ydotbelow}            %  29 + +\stopencoding + +\endinput diff --git a/tex/context/base/font-ini.tex b/tex/context/base/font-ini.tex index 293c10443..7805654ff 100644 --- a/tex/context/base/font-ini.tex +++ b/tex/context/base/font-ini.tex @@ -1379,7 +1379,7 @@    {\expandafter\xdef\csname#1\endcsname       {\noexpand\csname#1:\endcsname        \noexpand\reactivatefont{\somefontname}{\fontfile}}% -   \global\expandafter\font\csname#1:\endcsname\lastfontname} +   \global\expandafter\font\csname#1:\endcsname\lastfontname\relax}  \def\reactivatefont#1%#2%    {\def\somefontname{#1}\def\fontfile}%{#2}} @@ -4419,12 +4419,61 @@     \ifx\fontalternative\c!it      \s!Italic \else     \ifx\fontalternative\c!bs \s!BoldSlanted \else     \ifx\fontalternative\c!bi  \s!BoldItalic \else -                                 \s!Regular \fi\fi\fi\fi\fi\fi}% +   \ifx\fontalternative\c!sc        \s!Caps \else +                                 \s!Regular \fi\fi\fi\fi\fi\fi\fi}%  %D We still have to take care of \type{\xi}, so:  \def\xi{\ifmmode\normalxi\else\elevenpoint\fi} +%D \macros +%D   {definefontvariant,fontvariant,variant} +%D +%D A slightly adapted version of Adam Lindsays variant patches: +%D +%D \starttyping +%D \usetypescriptfile[type-psc] \loadmapfile[texnansi-public-fpl] +%D \usetypescript[palatino][texnansi] \setupbodyfont[palatino] +%D +%D \definefontvariant [Serif][osf] [OsF] +%D +%D \startlines +%D {\sc abcdefgHIJKlmnop} +%D 123{\Var[osf]456}789 +%D {\Var[osf] 123{\Var[reset]456}789} +%D {\it  123{\Var[osf]456}789 +%D {\Var[osf]123{\Var[reset]456}789}} +%D {\tfb\bf 123{\Var[osf]456}789 +%D {\Var[osf] 123{\Var[reset]456}789}} +%D {\sc  123{\Var[osf]456}789 +%D {\Var[osf]  123{\Var[reset]456}789}} +%D \stoplines +%D \stoptyping + +\def\definefontvariant +  {\dotripleargument\dodefinefontvariant} + +\def\dodefinefontvariant[#1][#2][#3]% +  {\setvalue{\??fv#1#2}{#3}} + +\def\fontvariant#1#2{\executeifdefined{\??fv#1#2}\empty} + +\def\variant[#1]% +  {\expanded{\definedfont +     [\truefontname{\fontstringA\fontstylesuffix\fontvariant\fontstringA{#1}} +        at \currentfontscale\bodyfontsize]}} + +\beginXETEX  \font + +  \def\variant[#1]% +    {\font\variantfont\truefontname{\fontstringA\fontstylesuffix\fontvariant\fontstringA{#1}} +       at \currentfontscale\bodyfontsize +     \variantfont} + +\endXETEX + +\ifx\Var\undefined \let\Var\variant \fi +  %D By default we load the Computer Modern Roman fonts (but  %D not yet at this moment) and activate the 12pt roman  %D bodyfont. Sans serif and teletype are also available and diff --git a/tex/context/base/hand-def.tex b/tex/context/base/hand-def.tex index ece8bb13e..e73a8aa20 100644 --- a/tex/context/base/hand-def.tex +++ b/tex/context/base/hand-def.tex @@ -300,6 +300,109 @@    \inherithandling Thorn P    \inherithandling thorn p +  % vietnamese + +  \inherithandling Ahook A +  \inherithandling ahook a +  \inherithandling Ehook E +  \inherithandling ehook e +  \inherithandling Ihook I +  \inherithandling ihook i +  \inherithandling Ohook O +  \inherithandling ohook o +  \inherithandling Uhook U +  \inherithandling uhook u +  \inherithandling Yhook Y +  \inherithandling yhook y + +  \inherithandling Acircumflexgrave A +  \inherithandling Acircumflexacute A +  \inherithandling Acircumflextilde A +  \inherithandling Acircumflexhook  A +  \inherithandling acircumflexgrave a +  \inherithandling acircumflexacute a +  \inherithandling acircumflextilde a +  \inherithandling acircumflexhook  a +  \inherithandling Ecircumflexgrave E +  \inherithandling Ecircumflexacute E +  \inherithandling Ecircumflextilde E +  \inherithandling Ecircumflexhook  E +  \inherithandling ecircumflexgrave e +  \inherithandling ecircumflexacute e +  \inherithandling ecircumflextilde e +  \inherithandling ecircumflexhook  e +  \inherithandling Ocircumflexgrave O +  \inherithandling Ocircumflexacute O +  \inherithandling Ocircumflextilde O +  \inherithandling Ocircumflexhook  O +  \inherithandling ocircumflexgrave o +  \inherithandling ocircumflexacute o +  \inherithandling ocircumflextilde o +  \inherithandling ocircumflexhook  o + +  \inherithandling Abrevegrave A +  \inherithandling Abreveacute A +  \inherithandling Abrevetilde A +  \inherithandling Abrevehook  A +  \inherithandling abrevegrave a +  \inherithandling abreveacute a +  \inherithandling abrevetilde a +  \inherithandling abrevehook  a + +  \inherithandling Adotbelow A +  \inherithandling adotbelow a +  \inherithandling Edotbelow E +  \inherithandling edotbelow e +  \inherithandling Idotbelow I +  \inherithandling idotbelow i +  \inherithandling Odotbelow O +  \inherithandling odotbelow o +  \inherithandling Udotbelow U +  \inherithandling udotbelow u +  \inherithandling Ydotbelow Y +  \inherithandling ydotbelow y + +  \inherithandling Ohorndotbelow O +  \inherithandling ohorndotbelow o +  \inherithandling Uhorndotbelow U +  \inherithandling uhorndotbelow u + +  \inherithandling Acircumflexdotbelow A +  \inherithandling acircumflexdotbelow a +  \inherithandling Ecircumflexdotbelow E +  \inherithandling ecircumflexdotbelow e +  \inherithandling Ocircumflexdotbelow O +  \inherithandling ocircumflexdotbelow o + +  \inherithandling Abrevedotbelow A +  \inherithandling abrevedotbelow a + +  \inherithandling Ohorn      O +  \inherithandling Ohorngrave O +  \inherithandling Ohornacute O +  \inherithandling Ohorntilde O +  \inherithandling Ohornhook  O +  \inherithandling ohorn      o +  \inherithandling ohorngrave o +  \inherithandling ohornacute o +  \inherithandling ohorntilde o +  \inherithandling ohornhook  o +  \inherithandling Uhorn      U +  \inherithandling Uhorngrave U +  \inherithandling Uhornacute U +  \inherithandling Uhorntilde U +  \inherithandling Uhornhook  U +  \inherithandling uhorn      u +  \inherithandling uhorngrave u +  \inherithandling uhornacute u +  \inherithandling uhorntilde u +  \inherithandling uhornhook  u + +  \inherithandling Ytilde Y +  \inherithandling ytilde y +  \inherithandling Etilde E +  \inherithandling etilde e +  \stopfonthandling  \startfonthandling [hz] @@ -354,6 +457,28 @@  \stopfonthandling +% no ligs other than fi fl etc, no --- and '' + +\startfonthandling[noligs] + +    \settagcode - {\notagcode} +    \settagcode ' {\notagcode} +    \settagcode ` {\notagcode} +    \settagcode ? {\notagcode} +    \settagcode ! {\notagcode} + +\stopfonthandling + +% \startfonthandling[noligs] +%   \dostepwiserecurse{0}{255}{1}{\expanded{\settagcode \recurselevel\space\notagcode\space}} +% \stopfonthandling + +% \definefonthandling [noligs] [noligs] [type=tag] +% \setupfontsynonym[Serif][handling=noligs] +% \definefont[test][Serif at 12.34pt] +% +% {``fi--ffl---ffi'' \test ``fi--ffl---ffi''} +  \unprotect  % beware: extended extends the preceding vector (both protruding and @@ -378,6 +503,10 @@  \definefonthandling [quality]     [hz,pure] +% noligs (xml) : \definefonthandling [default] [noligs] + +\definefonthandling [noligs]      [noligs]                     [\c!type=tag] +  % A special case of guillemots, beware: when used ungrouped,  % it overloads all successive (current) encoding vector  % instances! Will be obsolete soon. diff --git a/tex/context/base/hand-ini.tex b/tex/context/base/hand-ini.tex index 305c38a1a..1cef5c56c 100644 --- a/tex/context/base/hand-ini.tex +++ b/tex/context/base/hand-ini.tex @@ -13,6 +13,8 @@  \writestatus{loading}{Context Handling Macros (ini)} +% \pushmacro -> dedicated fast one +  %D {\em This module is experimental and implements font  %D specific features, like hanging punctuation.} @@ -71,18 +73,56 @@  \newif\ifskiphandlingdef  \skiphandlingdeffalse +% much in common with hz/protruding defs +% todo: fix others + +\let\normalchar\char % also done in enco-ini + +\def\dosetsomehandling#1#2#3 #4 % no define since directly set +  {\ifskiphandlingdef \else +     \doifnumberelse{\string#2} +       {#1{#2#3}{#4}} +       {\doifelsenothing{#3} +          {#1{`#2}{#4}} +          {\let\char\empty +           \doifnumberelse{\csname#2#3\endcsname}{#1{\csname#2#3\endcsname}{#4}}\donothing +           \let\char\normalchar}}% +   \fi} + +\def\dosetpairhandling#1#2#3 #4 #5 % no define since directly set +  {\ifskiphandlingdef \else +     \doifnumberelse{\string#2} +       {#1{#2#3}{#4}} +       {\doifelsenothing{#3} +          {#1{`#2}{#4}} +          {\let\char\empty +           \doifnumberelse{\csname#2#3\endcsname}{#1{\csname#2#3\endcsname}{#4}{#5}}\donothing +           \let\char\normalchar}}% +   \fi} + +\def\doinhsomehandling#1#2 #3 % +  {\ifskiphandlingdef \else +     \let\char\empty +     \doifnumberelse{\csname#2\endcsname} +       {#1{\csname#2\endcsname}{`#3}} +       \donothing +     \let\char\normalchar +   \fi} + +% adjustspacing +  \newdimen\adjustdimen \let\handledfont\font  \ifx\undefined\pdfadjustspacing % we don't use pdftex -  \let\enableadjusting        \relax -  \let\disableadjusting       \relax -  \let\setadjusting           \gobbletwoarguments +  \let\enableadjusting     \relax +  \let\disableadjusting    \relax +  \let\setadjusting        \gobbletwoarguments -  \def\defineadjustfactor     #1 #2    {} -  \def\inheritadjustfactor    #1 #2    {} +  \def\defineadjustfactor  #1 #2 {} +  \def\inheritadjustfactor #1 #2 {} -  \let\setfontadjusting       \gobbleoneargument +  \let\setfontadjusting    \gobbleoneargument  \else @@ -91,27 +131,27 @@    \appendtoks \disableadjusting \to \everyforgetall % Here or not here? -  \def\dodefineadjustfactor#1#2 #3 % -    {\ifskiphandlingdef \else -       \doifelsenothing{#2} -         {\doifnumberelse{\string#1} -            {\dododefineadjustfactor {#1}{#3}} -            {\dododefineadjustfactor{`#1}{#3}}} -         {\pushmacro\char \let\char\empty -          \doifnumberelse{\csname#1#2\endcsname} -            {\dododefineadjustfactor{\csname#1#2\endcsname}{#3}} -            \donothing -          \popmacro\char}% -     \fi} - -  \def\doinheritadjustfactor#1 #2 % -    {\ifskiphandlingdef \else -       \pushmacro\char \let\char\empty -       \doifnumberelse{\csname#1\endcsname} -         {\dodoinheritadjustfactor{\csname#1\endcsname}{`#2}} -         \donothing -       \popmacro\char -     \fi} +%   \def\dodefineadjustfactor#1#2 #3 % +%     {\ifskiphandlingdef \else +%        \doifelsenothing{#2} +%          {\doifnumberelse{\string#1} +%             {\dododefineadjustfactor {#1}{#3}} +%             {\dododefineadjustfactor{`#1}{#3}}} +%          {\pushmacro\char \let\char\empty +%           \doifnumberelse{\csname#1#2\endcsname} +%             {\dododefineadjustfactor{\csname#1#2\endcsname}{#3}} +%             \donothing +%           \popmacro\char}% +%      \fi} + +%   \def\doinheritadjustfactor#1 #2 % +%     {\ifskiphandlingdef \else +%        \pushmacro\char \let\char\empty +%        \doifnumberelse{\csname#1\endcsname} +%          {\dodoinheritadjustfactor{\csname#1\endcsname}{`#2}} +%          \donothing +%        \popmacro\char +%      \fi}    \def\dododefineadjustfactor#1#2%      {\adjustdimen#2pt\multiply\adjustdimen\plusthousand\divide\adjustdimen\maxcard\relax @@ -123,11 +163,11 @@    \def\defineadjustfactor#1 #2 %      {\setfonttoks       \let\inherithandling\inheritadjustfactor -     \appendtoks\dodefineadjustfactor#1 #2 \to\fonttoks} +     \appendtoks\dosetsomehandling\dododefineadjustfactor#1 #2 \to\fonttoks}    \def\inheritadjustfactor#1 #2 %      {\setfonttoks -     \appendtoks\doinheritadjustfactor#1 #2 \to\fonttoks} +     \appendtoks\doinhsomehandling\dodoinheritadjustfactor#1 #2 \to\fonttoks}    \ifnum\pdftexversion<120      \let\@@pdfexpandbonus\plusthousand @@ -154,6 +194,8 @@         \fontname\handledfont}}  \fi +% protruding +  \newif\ifembasedprotruding \embasedprotrudingfalse  \newdimen\lproddimen \newdimen\rproddimen \let\handledfont\font @@ -193,27 +235,27 @@         \csname\@fha@\@fha@#1\c!right\endcsname\space         \fontname\handledfont}} -  \def\dodefineprotrudefactor#1#2 #3 #4 % -    {\ifskiphandlingdef \else -       \doifelsenothing{#2} -         {\doifnumberelse{\string#1} -            {\dododefineprotrudefactor {#1}{#3}{#4}} -            {\dododefineprotrudefactor{`#1}{#3}{#4}}} -         {\pushmacro\char \let\char\empty -          \doifnumberelse{\csname#1#2\endcsname} -            {\dododefineprotrudefactor{\csname#1#2\endcsname}{#3}{#4}} -            \donothing -          \popmacro\char}% -     \fi} - -  \def\doinheritprotrudefactor#1 #2 % -    {\ifskiphandlingdef \else -       \pushmacro\char \let\char\empty -       \doifnumberelse{\csname#1\endcsname} -         {\dodoinheritprotrudefactor{\csname#1\endcsname}{`#2}} -         \donothing -       \popmacro\char -     \fi} +%   \def\dodefineprotrudefactor#1#2 #3 #4 % +%     {\ifskiphandlingdef \else +%        \doifelsenothing{#2} +%          {\doifnumberelse{\string#1} +%             {\dododefineprotrudefactor {#1}{#3}{#4}} +%             {\dododefineprotrudefactor{`#1}{#3}{#4}}} +%          {\pushmacro\char \let\char\empty +%           \doifnumberelse{\csname#1#2\endcsname} +%             {\dododefineprotrudefactor{\csname#1#2\endcsname}{#3}{#4}} +%             \donothing +%           \popmacro\char}% +%      \fi} + +%   \def\doinheritprotrudefactor#1 #2 % +%     {\ifskiphandlingdef \else +%        \pushmacro\char \let\char\empty +%        \doifnumberelse{\csname#1\endcsname} +%          {\dodoinheritprotrudefactor{\csname#1\endcsname}{`#2}} +%          \donothing +%        \popmacro\char +%      \fi}    \beginETEX \fontcharwd @@ -281,14 +323,35 @@    \def\defineprotrudefactor#1 #2 #3 %      {\setfonttoks       \let\inherithandling\inheritprotrudefactor -     \appendtoks\dodefineprotrudefactor#1 #2 #3 \to\fonttoks} +     \appendtoks\dosetpairhandling\dododefineprotrudefactor#1 #2 #3 \to\fonttoks}    \def\inheritprotrudefactor#1 #2 %      {\setfonttoks -     \appendtoks\doinheritprotrudefactor#1 #2 \to\fonttoks} +     \appendtoks\doinhsomehandling\dodoinheritprotrudefactor#1 #2 \to\fonttoks}  \fi +% font attributes + +\let\notagcode\minusone + +\ifx\tagcode\undefined + +  \def\settagcode #1 #2 {} + +\else + +  \def\dodosettagcode#1#2% +    {\tagcode\handledfont#1 #2\relax} + +  \def\settagcode#1 #2 % +    {\setfonttoks +     \appendtoks\dosetsomehandling\dodosettagcode#1 #2 \to\fonttoks} + +\fi + +% hook into font mechanism +  \let\fonthandling\empty  \beginTEX @@ -392,13 +455,17 @@  \newtoks\everyenablefonthandling -\appendtoks -   \setprotrudingfactor\askedfonthandling -\to \everyenablefonthandling +\ifx\setprotrudingfactor\gobbleoneargument \else +  \appendtoks +     \setprotrudingfactor\askedfonthandling +  \to \everyenablefonthandling +\fi -\appendtoks -  \setfontadjusting\askedfonthandling -\to \everyenablefonthandling +\ifx\setfontadjusting\gobbleoneargument \else +  \appendtoks +    \setfontadjusting\askedfonthandling +  \to \everyenablefonthandling +\fi  \def\redofastenablehandling    {\edef\fonthandling{\csname\@fha@\@fha@\@fha@\askedfonthandling\endcsname}% diff --git a/tex/context/base/lang-vn.tex b/tex/context/base/lang-vn.tex index 1d20f838a..c01e56d82 100644 --- a/tex/context/base/lang-vn.tex +++ b/tex/context/base/lang-vn.tex @@ -1,11 +1,11 @@  %D \module  %D   [       file=lang-vn, -%D        version=1999.12.12, +%D        version=2004.11.22, % 1999.12.12,  %D          title=\CONTEXT\ Language Macros,  %D       subtitle=Vietnamese, -%D         author={Hans Hagen \& Han The Thanh}, +%D         author={Han The Thanh \& Adam Lindsay \& Hans Hagen},  %D           date=\currentdate, -%D      copyright={PRAGMA / Hans Hagen \& Ton Otten}] +%D      copyright=\PRAGMA]  %C  %C This module is part of the \CONTEXT\ macro||package and is  %C therefore copyrighted by \PRAGMA. See mreadme.pdf for @@ -38,23 +38,23 @@     \c!rightquote=\upperrightsingleninequote,     \c!leftquotation=\lowerleftdoubleninequote,     \c!rightquotation=\upperrightdoubleninequote, -   \c!date={{Ng\`ay },dd,{ th\'ang },\v!month,{ n\u a m },yy}, +   \c!date={{Ng\agrave y },dd,{ th\aacute ng },\v!month,{ n\abreve  m },yy},     \c!state=\v!stop]  \installlanguage [vietnamese] [\s!vn] -\setupheadtext [\s!vn] [\v!content=M\d{u}c l\d{u}c] -\setupheadtext [\s!vn] [\v!tables=Danh s\'ach b\h{a}ng] -\setupheadtext [\s!vn] [\v!figures=Danh s\'ach h\`inh v\~e] +\setupheadtext [\s!vn] [\v!content=M\udotbelow c l\udotbelow c] +\setupheadtext [\s!vn] [\v!tables=Danh s\aacute ch b\ahook ng] +\setupheadtext [\s!vn] [\v!figures=Danh s\aacute ch h\igrave nh v\etilde]  \setupheadtext [\s!vn] [\v!graphics=Graphics]  \setupheadtext [\s!vn] [\v!intermezzi=Intermezzos] -\setupheadtext [\s!vn] [\v!index=Ch\h{i} s\'{^o}] +\setupheadtext [\s!vn] [\v!index=Ch\ihook\ s\ocircumflexacute]  \setupheadtext [\s!vn] [\v!abbreviations=Abbreviations]  \setupheadtext [\s!vn] [\v!logos=Logos]  \setupheadtext [\s!vn] [\v!units=Units] -\setuplabeltext [\s!vn] [\v!table=B\h{a}ng] -\setuplabeltext [\s!vn] [\v!figure=H\`inh] +\setuplabeltext [\s!vn] [\v!table=B\ahook ng] +\setuplabeltext [\s!vn] [\v!figure=H\igrave nh]  \setuplabeltext [\s!vn] [\v!intermezzo=intermezzo]  \setuplabeltext [\s!vn] [\v!graphic=graphic]  \setuplabeltext [\s!vn] [\v!chapter=chapter] @@ -63,7 +63,7 @@  \setuplabeltext [\s!vn] [\v!subsubsection=] % not set  \setuplabeltext [\s!vn] [\v!subsubsubsection=] % not set  \setuplabeltext [\s!vn] [\v!appendix=] % not set -\setuplabeltext [\s!vn] [\v!part=Ph\`{^a} n ] +\setuplabeltext [\s!vn] [\v!part=Ph\acircumflexgrave n ]  \setuplabeltext [\s!vn] [\v!line=line ]  \setuplabeltext [\s!vn] [\v!lines=lines ] @@ -75,19 +75,17 @@  \setuplabeltext [\s!vn]    [\v!friday=Friday]  \setuplabeltext [\s!vn]  [\v!saturday=Saturday] -\setuplabeltext [\s!vn]   [\v!january=gi\^e ng] +\setuplabeltext [\s!vn]   [\v!january=gi\ecircumflex ng]  \setuplabeltext [\s!vn]  [\v!february=hai]  \setuplabeltext [\s!vn]     [\v!march=ba] -\setuplabeltext [\s!vn]     [\v!april=t\h{u}] -\setuplabeltext [\s!vn]       [\v!may=n\u a m] -\setuplabeltext [\s!vn]      [\v!june=s\'au] -\setuplabeltext [\s!vn]      [\v!july=b\h{a}y] -\setuplabeltext [\s!vn]    [\v!august=t\'am] -\setuplabeltext [\s!vn] [\v!september=ch\'in] -\setuplabeltext [\s!vn]   [\v!october=m\h{u}\`{ho}i] -\setuplabeltext [\s!vn]  [\v!november=m\h{u}\`{ho}im\d{^o}t] -\setuplabeltext [\s!vn]  [\v!december=m\h{u}\`{ho}ihai] +\setuplabeltext [\s!vn]     [\v!april=t\uhorn] +\setuplabeltext [\s!vn]       [\v!may=n\abreve m] +\setuplabeltext [\s!vn]      [\v!june=s\aacute u] +\setuplabeltext [\s!vn]      [\v!july=b\ahook y] +\setuplabeltext [\s!vn]    [\v!august=t\aacute m] +\setuplabeltext [\s!vn] [\v!september=ch\iacute n] +\setuplabeltext [\s!vn]   [\v!october=m\uhorn\ohorngrave i] +\setuplabeltext [\s!vn]  [\v!november=m\uhorn\ohorngrave i m\ocircumflexdotbelow t] +\setuplabeltext [\s!vn]  [\v!december=m\uhorn\ohorngrave i hai] -\protect - -\endinput +\protect \endinput diff --git a/tex/context/base/mult-sys.tex b/tex/context/base/mult-sys.tex index 92a405672..e77aa1328 100644 --- a/tex/context/base/mult-sys.tex +++ b/tex/context/base/mult-sys.tex @@ -77,6 +77,8 @@  \definesystemconstant {Sans}  \definesystemconstant {Support}  \definesystemconstant {Mono}  \definesystemconstant {Type} +\definesystemconstant {Caps} +  %D As the name of their define command states, the next set of  %D constants is used in the message macro's. @@ -441,6 +443,7 @@  \definesystemvariable {fr}   % ForM  \definesystemvariable {fs}   % FileSynonym  \definesystemvariable {ft}   % FonTs +\definesystemvariable {fv}   % FontVariant  \definesystemvariable {fx}   % FoXet  \definesystemvariable {ha}   % HAng  \definesystemvariable {hs}   % HSpace diff --git a/tex/context/base/setupe.tex b/tex/context/base/setupe.tex index 9fef6e512..c288171c8 100644 --- a/tex/context/base/setupe.tex +++ b/tex/context/base/setupe.tex @@ -297,7 +297,7 @@       \next\midname       \next\posname     \dostring{\space\space}{/}{sequence} -   \ifx\currenttype\empty \else +   \ifx\currenttype\empty \else \ifx\asciia\asciib \else       \dostring{\space\space}{}{arguments}         \let\command         \nocommand         \let\type            \notype @@ -307,7 +307,7 @@         \let\inheritvariables\doinheritvariables         \newcounter\currentwhatever \currenttype       \dostring{\space\space}{/}{arguments} -   \fi +   \fi \fi     \dostring{}{/}{command}  }%     \egroup} diff --git a/tex/context/base/supp-box.tex b/tex/context/base/supp-box.tex index af9f5d223..3d9c9414f 100644 --- a/tex/context/base/supp-box.tex +++ b/tex/context/base/supp-box.tex @@ -773,7 +773,7 @@       \normalhbox to \shapesignal{\strut\hss}% plus \strut       \prevdepth\strutdp} % never \nointerlineskip -\def\endofshapebox% +\def\endofshapebox    {\endgraf     \egroup} @@ -1093,7 +1093,7 @@  %D value crops the beginning. The macro thereby becomes less  %D readable, which is why we kept the original here too. -\unexpanded\def\limitatetext% +\unexpanded\def\limitatetext    {\bgroup % evt \setstrut     \forgetall % otherwise indentation and so    %\def\limitatetext##1##2##3{##1}% \def ! diff --git a/tex/context/base/type-buy.tex b/tex/context/base/type-buy.tex index c8ce968a5..632793146 100644 --- a/tex/context/base/type-buy.tex +++ b/tex/context/base/type-buy.tex @@ -623,4 +623,96 @@  \stoptypescript +% monotype sabon + +\starttypescript [map] [sabon] [ec,8r,texnansi] +  \loadmapfile[\typescriptthree-monotype-sabon.map] +\stoptypescript + +\starttypescript [serif] [sabon] [name] + +  \definefontsynonym [Serif]            [SabonMT] +  \definefontsynonym [SerifItalic]      [SabonMT-Italic] +  \definefontsynonym [SerifSlanted]     [SabonMT-Italic] +  \definefontsynonym [SerifBold]        [SabonMT-SemiBold] +  \definefontsynonym [SerifBoldItalic]  [SabonMT-SemiBoldItalic] +  \definefontsynonym [SerifBoldSlanted] [SabonMT-SemiBoldItalic] +  \definefontsynonym [SerifCaps]        [SabonMT-RegularSC] + +\stoptypescript + +\starttypescript [serif] [sabon] [ec,8r,texnansi] + +  \definefontsynonym[SabonMT]                  [\typescriptthree-sab]  [encoding=\typescriptthree] +  \definefontsynonym[SabonMT-Italic]           [\typescriptthree-sabi] [encoding=\typescriptthree] +  \definefontsynonym[SabonMT-ItalicOsF]        [\typescriptthree-saboi][encoding=\typescriptthree] +  \definefontsynonym[SabonMT-SemiBoldOsF]      [\typescriptthree-sabos][encoding=\typescriptthree] +  \definefontsynonym[SabonMT-SemiBold]         [\typescriptthree-sabs] [encoding=\typescriptthree] +  \definefontsynonym[SabonMT-RegularSC]        [\typescriptthree-sabsc][encoding=\typescriptthree] +  \definefontsynonym[SabonMT-SemiBoldItalic]   [\typescriptthree-sabsi][encoding=\typescriptthree] +  \definefontsynonym[SabonMT-SemiBoldItalicOsF][\typescriptthree-sasio][encoding=\typescriptthree] + +\stoptypescript + +% itc stone + +\starttypescript [map] [stone] [ec,8r,texnansi] +  \loadmapfile[\typescriptthree-itc-stone.map] +\stoptypescript + +\starttypescript [sans] [stone] [name] + +  \definefontsynonym [Sans]            [StoneSansITC-Medium] +  \definefontsynonym [SansItalic]      [StoneSansITC-MediumItalic] +  \definefontsynonym [SansSlanted]     [StoneSansITC-MediumItalic] +  \definefontsynonym [SansBold]        [StoneSansITC-Bold] +  \definefontsynonym [SansBoldItalic]  [StoneSansITC-BoldItalic] +  \definefontsynonym [SansBoldSlanted] [StoneSansITC-BoldItalic] +  \definefontsynonym [SansCaps]        [StoneSansSCITC-Medium] + +\stoptypescript + +\starttypescript [sans] [stone-oldstyle] [name] + +  \definefontsynonym [Sans]            [StoneSansOSITC-Medium] +  \definefontsynonym [SansItalic]      [StoneSansOSITC-MediumItalic] +  \definefontsynonym [SansSlanted]     [StoneSansOSITC-MediumItalic] +  \definefontsynonym [SansBold]        [StoneSansOSITC-Bold] +  \definefontsynonym [SansBoldItalic]  [StoneSansOSITC-BoldItalic] +  \definefontsynonym [SansBoldSlanted] [StoneSansOSITC-BoldItalic] +  \definefontsynonym [SansCaps]        [StoneSansSCITC-Medium] + +\stoptypescript + +\starttypescript [sans] [stone] [ec,8r,texnansi] + +  \definefontsynonym[StoneSansITC-Bold]          [\typescriptthree-stosnb]  [encoding=\typescriptthree] +  \definefontsynonym[StoneSansITC-BoldItalic]    [\typescriptthree-stosnbi] [encoding=\typescriptthree] +  \definefontsynonym[StoneSansITC-Medium]        [\typescriptthree-stosnm]  [encoding=\typescriptthree] +  \definefontsynonym[StoneSansITC-MediumItalic]  [\typescriptthree-stosnmi] [encoding=\typescriptthree] +  \definefontsynonym[StoneSansOSITC-Bold]        [\typescriptthree-stosnob] [encoding=\typescriptthree] +  \definefontsynonym[StoneSansOSITC-BoldItalic]  [\typescriptthree-stosnobi][encoding=\typescriptthree] +  \definefontsynonym[StoneSansOSITC-Medium]      [\typescriptthree-stosnom] [encoding=\typescriptthree] +  \definefontsynonym[StoneSansOSITC-MediumItalic][\typescriptthree-stosnomi][encoding=\typescriptthree] +  \definefontsynonym[StoneSansSCITC-Medium]      [\typescriptthree-stosnscm][encoding=\typescriptthree] +  \definefontsynonym[StoneSansSemITC-Semi]       [\typescriptthree-stosns]  [encoding=\typescriptthree] +  \definefontsynonym[StoneSansSemITC-SemiIta]    [\typescriptthree-stosnsi] [encoding=\typescriptthree] +  \definefontsynonym[StoneSansSemOSITC-Semi]     [\typescriptthree-stosnos] [encoding=\typescriptthree] +  \definefontsynonym[StoneSansSemOSITC-SemiIta]  [\typescriptthree-stosnosi][encoding=\typescriptthree] +  \definefontsynonym[StoneSansSemSCITC-Semi]     [\typescriptthree-stosnscs][encoding=\typescriptthree] + +\stoptypescript + +% linotype industria + +\starttypescript [map] [industria] [ec,8r,texnansi] +  \loadmapfile[\typescriptthree-linotype-industria.map] +\stoptypescript + +\starttypescript [sans] [industria] [ec,8r,texnansi] + +  \definefontsynonym[Industria-Solid][\typescriptthree-lt50545][encoding=\typescriptthree] + +\stoptypescript +  \endinput diff --git a/tex/context/base/type-enc.tex b/tex/context/base/type-enc.tex index 022db40c4..fa1a10308 100644 --- a/tex/context/base/type-enc.tex +++ b/tex/context/base/type-enc.tex @@ -18,7 +18,7 @@  % Free fonts. -% beter \typefacethree dan \typefaceencoding ! ! ! ! ! ! ander sgeen selectie op bv ec +% beter \typefacethree dan \typefaceencoding ! ! ! ! ! ! anders geen selectie op bv ec  % Computer & Latin Modern Roman (DEK/AMS/BJ) @@ -298,6 +298,65 @@    \definefontsynonym [cmvtt10]  [plvtt10]  [encoding=pl0]  \stoptypescript +\starttypescript [all] [computer-modern] [t5] +  \definefontsynonym [cmb10]    [vnb10]    [encoding=t5] +  \definefontsynonym [cmbx10]   [vnbx10]   [encoding=t5] +  \definefontsynonym [cmbx12]   [vnbx12]   [encoding=t5] +  \definefontsynonym [cmbx5]    [vnbx5]    [encoding=t5] +  \definefontsynonym [cmbx6]    [vnbx6]    [encoding=t5] +  \definefontsynonym [cmbx7]    [vnbx7]    [encoding=t5] +  \definefontsynonym [cmbx8]    [vnbx8]    [encoding=t5] +  \definefontsynonym [cmbx9]    [vnbx9]    [encoding=t5] +  \definefontsynonym [cmbxsl10] [vnbxsl10] [encoding=t5] +  \definefontsynonym [cmbxti10] [vnbxti10] [encoding=t5] +  \definefontsynonym [cmcsc10]  [vncsc10]  [encoding=t5] +  \definefontsynonym [cmdunh10] [vndunh10] [encoding=t5] +  \definefontsynonym [cmff10]   [vnff10]   [encoding=t5] +  \definefontsynonym [cmfi10]   [vnfi10]   [encoding=t5] +  \definefontsynonym [cmfib8]   [vnfib8]   [encoding=t5] +  \definefontsynonym [cminch]   [vninch]   [encoding=t5] +  \definefontsynonym [cmitt10]  [vnitt10]  [encoding=t5] +  \definefontsynonym [cmr10]    [vnr10]    [encoding=t5] +  \definefontsynonym [cmr12]    [vnr12]    [encoding=t5] +  \definefontsynonym [cmr17]    [vnr17]    [encoding=t5] +  \definefontsynonym [cmr5]     [vnr5]     [encoding=t5] +  \definefontsynonym [cmr6]     [vnr6]     [encoding=t5] +  \definefontsynonym [cmr7]     [vnr7]     [encoding=t5] +  \definefontsynonym [cmr8]     [vnr8]     [encoding=t5] +  \definefontsynonym [cmr9]     [vnr9]     [encoding=t5] +  \definefontsynonym [cmsl10]   [vnsl10]   [encoding=t5] +  \definefontsynonym [cmsl12]   [vnsl12]   [encoding=t5] +  \definefontsynonym [cmsl8]    [vnsl8]    [encoding=t5] +  \definefontsynonym [cmsl9]    [vnsl9]    [encoding=t5] +  \definefontsynonym [cmsltt10] [vnsltt10] [encoding=t5] +  \definefontsynonym [cmss10]   [vnss10]   [encoding=t5] +  \definefontsynonym [cmss12]   [vnss12]   [encoding=t5] +  \definefontsynonym [cmss17]   [vnss17]   [encoding=t5] +  \definefontsynonym [cmss8]    [vnss8]    [encoding=t5] +  \definefontsynonym [cmss9]    [vnss9]    [encoding=t5] +  \definefontsynonym [cmssbx10] [vnssbx10] [encoding=t5] +  \definefontsynonym [cmssdc10] [vnssdc10] [encoding=t5] +  \definefontsynonym [cmssi10]  [vnssi10]  [encoding=t5] +  \definefontsynonym [cmssi12]  [vnssi12]  [encoding=t5] +  \definefontsynonym [cmssi17]  [vnssi17]  [encoding=t5] +  \definefontsynonym [cmssi8]   [vnssi8]   [encoding=t5] +  \definefontsynonym [cmssi9]   [vnssi9]   [encoding=t5] +  \definefontsynonym [cmssq8]   [vnssq8]   [encoding=t5] +  \definefontsynonym [cmssqi8]  [vnssqi8]  [encoding=t5] +  \definefontsynonym [cmtcsc10] [vntcsc10] [encoding=t5] +  \definefontsynonym [cmti10]   [vnti10]   [encoding=t5] +  \definefontsynonym [cmti12]   [vnti12]   [encoding=t5] +  \definefontsynonym [cmti7]    [vnti7]    [encoding=t5] +  \definefontsynonym [cmti8]    [vnti8]    [encoding=t5] +  \definefontsynonym [cmti9]    [vnti9]    [encoding=t5] +  \definefontsynonym [cmtt10]   [vntt10]   [encoding=t5] +  \definefontsynonym [cmtt12]   [vntt12]   [encoding=t5] +  \definefontsynonym [cmtt8]    [vntt8]    [encoding=t5] +  \definefontsynonym [cmtt9]    [vntt9]    [encoding=t5] +  \definefontsynonym [cmu10]    [vnu10]    [encoding=t5] +  \definefontsynonym [cmvtt10]  [vnvtt10]  [encoding=t5] +\stoptypescript +  %D {\em Comments by Victor Figurnov:} the wcmb10, wcmbx10,  %D \unknown\ fonts below are taken from the Paradissa  %D collection by Basil Malyshev. These fonts don't conform t2a @@ -856,7 +915,7 @@  % Courier (URW) -\starttypescript [mono] [courier] [texnansi,ec,8r] +\starttypescript [mono] [courier] [texnansi,ec,8r,t5]    \definefontsynonym [Courier]             [\typefaceencoding-ucrr8a]  [encoding=\typefaceencoding]    \definefontsynonym [Courier-Bold]        [\typefaceencoding-ucrb8a]  [encoding=\typefaceencoding]    \definefontsynonym [Courier-Oblique]     [\typefaceencoding-ucrro8a] [encoding=\typefaceencoding] @@ -881,7 +940,7 @@  % Helvetica (URW) -\starttypescript [sans] [helvetica] [texnansi,ec,8r] +\starttypescript [sans] [helvetica] [texnansi,ec,8r,t5]    \definefontsynonym [Helvetica]             [\typefaceencoding-uhvr8a]  [encoding=\typefaceencoding]    \definefontsynonym [Helvetica-Italic]      [\typefaceencoding-uhvri8a] [encoding=\typefaceencoding]    \definefontsynonym [Helvetica-Oblique]     [\typefaceencoding-uhvro8a] [encoding=\typefaceencoding] @@ -901,7 +960,7 @@  % Times Roman (URW) -\starttypescript [serif] [times] [texnansi,ec,8r] +\starttypescript [serif] [times] [texnansi,ec,8r,t5]    \definefontsynonym [Times-Roman]       [\typefaceencoding-utmr8a]  [encoding=\typefaceencoding]    \definefontsynonym [Times-Italic]      [\typefaceencoding-utmri8a] [encoding=\typefaceencoding]    \definefontsynonym [Times-Bold]        [\typefaceencoding-utmb8a]  [encoding=\typefaceencoding] @@ -964,7 +1023,7 @@  % Palatino (URW) -\starttypescript [serif] [palatino] [texnansi,ec,8r] +\starttypescript [serif] [palatino] [texnansi,ec,8r,t5]    \definefontsynonym [Palatino]             [\typefaceencoding-uplr8a]  [encoding=\typefaceencoding]    \definefontsynonym [Palatino-Italic]      [\typefaceencoding-uplri8a] [encoding=\typefaceencoding]    \definefontsynonym [Palatino-Bold]        [\typefaceencoding-uplb8a]  [encoding=\typefaceencoding] @@ -986,6 +1045,21 @@    \definefontsynonym [Palatino-Caps]        [Palatino]  \stoptypescript +% bonus definitions + +% when these fonts are in tex live ... +% +% \definefontsynonym [Palatino-Caps] [TeXPalladioL-SC] [encoding=\typefaceencoding] + +\starttypescript [serif] [palatino] [ec,texnansi,8r] + + \definefontsynonym[TeXPalladioL-BoldItalicOsF][\typescriptthree-fplbij8a][encoding=\typescriptthree] + \definefontsynonym[TeXPalladioL-BoldOsF]      [\typescriptthree-fplbj8a] [encoding=\typescriptthree] + \definefontsynonym[TeXPalladioL-SC]           [\typescriptthree-fplrc8a] [encoding=\typescriptthree] + \definefontsynonym[TeXPalladioL-ItalicOsF]    [\typescriptthree-fplrij8a][encoding=\typescriptthree] + +\stoptypescript +  % Palatino Math (PX)  \starttypescript [math] [palatino] [all] @@ -1008,7 +1082,7 @@  % Bookman (URW) -\starttypescript [serif] [bookman] [ec,texnansi,8r] +\starttypescript [serif] [bookman] [ec,texnansi,8r,t5]    \definefontsynonym [Bookman-Light]           [\typefaceencoding-ubkl8a]  [encoding=\typefaceencoding]    \definefontsynonym [Bookman-LightItalic]     [\typefaceencoding-ubkli8a] [encoding=\typefaceencoding]    \definefontsynonym [Bookman-DemiBold]        [\typefaceencoding-ubkd8a]  [encoding=\typefaceencoding] @@ -1042,7 +1116,7 @@  % New Century Schoolbook (URW) -\starttypescript [serif] [schoolbook] [ec,texnansi,8r] +\starttypescript [serif] [schoolbook] [ec,texnansi,8r,t5]    \definefontsynonym [Schoolbook-Roman]        [\typefaceencoding-uncr8a]  [encoding=\typefaceencoding]    \definefontsynonym [Schoolbook-Italic]       [\typefaceencoding-uncri8a] [encoding=\typefaceencoding]    \definefontsynonym [Schoolbook-Bold]         [\typefaceencoding-uncb8a]  [encoding=\typefaceencoding] @@ -1265,4 +1339,44 @@  \stoptypescript +\starttypescript [berry] [t5] + +\setupencoding[default=t5] + +\definefontsynonym [t5-utmr8a]                 [utmr8v]  [encoding=t5] +\definefontsynonym [t5-utmri8a]                [utmri8v] [encoding=t5] +\definefontsynonym [t5-utmb8a]                 [utmb8v]  [encoding=t5] +\definefontsynonym [t5-utmbi8a]                [utmbi8v] [encoding=t5] + +\definefontsynonym [t5-utmr8a-slanted-167]     [utmro8v] [encoding=t5] +\definefontsynonym [t5-utmb8a-slanted-167]     [utmbo8v] [encoding=t5] + +\definefontsynonym [t5-uhvr8a]                 [uhvr8v]  [encoding=t5] +\definefontsynonym [t5-uhvro8a]                [uhvro8v] [encoding=t5] +\definefontsynonym [t5-uhvb8a]                 [uhvb8v]  [encoding=t5] +\definefontsynonym [t5-uhvbo8a]                [uhvbo8v] [encoding=t5] + +\definefontsynonym [t5-ucrr8a]                 [ucrr8v]  [encoding=t5] +\definefontsynonym [t5-ucrb8a]                 [ucrb8v]  [encoding=t5] +\definefontsynonym [t5-ucrro8a]                [ucrro8v] [encoding=t5] +\definefontsynonym [t5-ucrbo8a]                [ucrbo8v] [encoding=t5] + +\definefontsynonym [t5-uplr8a]                 [uplr8v]  [encoding=t5] +\definefontsynonym [t5-uplri8a]                [uplri8v] [encoding=t5] +\definefontsynonym [t5-uplb8a]                 [uplb8v]  [encoding=t5] +\definefontsynonym [t5-uplbi8a]                [uplbi8v] [encoding=t5] +\definefontsynonym [t5-uplr8a-slanted-167]     [uplro8v] [encoding=t5] +\definefontsynonym [t5-uplb8a-slanted-167]     [uplbo8v] [encoding=t5] +\definefontsynonym [t5-uplr8a-capitalized-800] [uplr8v]  [encoding=t5] + +\definefontsynonym [t5-ubkl8a]                 [ubkl8v]  [encoding=t5] +\definefontsynonym [t5-ubkli8a]                [ubkli8v] [encoding=t5] +\definefontsynonym [t5-ubkd8a]                 [ubkd8v]  [encoding=t5] +\definefontsynonym [t5-ubkdi8a]                [ubkdi8v] [encoding=t5] +\definefontsynonym [t5-ubkl8a-slanted-167]     [ubklo8v] [encoding=t5] +\definefontsynonym [t5-ubkd8a-slanted-167]     [ubkdo8v] [encoding=t5] +\definefontsynonym [t5-ubkl8a-capitalized-800] [ubkl8v]  [encoding=t5] + +\stoptypescript +  \endinput diff --git a/tex/context/base/type-exa.tex b/tex/context/base/type-exa.tex index 222faa0d7..749b2f390 100644 --- a/tex/context/base/type-exa.tex +++ b/tex/context/base/type-exa.tex @@ -13,7 +13,7 @@  %D A couple of goodies: -\starttypescript [modern] [texnansi,ec,il2,pl0,default] +\starttypescript [modern] [texnansi,ec,il2,pl0,t5,default]    \definetypeface [modern] [rm] [serif] [latin-modern] [computer-modern] [encoding=\typescripttwo]    \definetypeface [modern] [ss] [sans]  [latin-modern] [computer-modern] [encoding=\typescripttwo] @@ -22,7 +22,7 @@  \stoptypescript -\starttypescript [modern-base] [texnansi,ec,il2,pl0,default] +\starttypescript [modern-base] [texnansi,ec,il2,pl0,t5,default]    \definetypeface [modern] [rm] [serif] [computer-modern] [default] [encoding=\typescripttwo]    \definetypeface [modern] [ss] [sans]  [computer-modern] [default] [encoding=\typescripttwo] @@ -31,7 +31,7 @@  \stoptypescript -\starttypescript [postscript] [texnansi,ec,8r,uc] +\starttypescript [postscript] [texnansi,ec,8r,t5,uc]    \definetypeface [postscript] [rm] [serif] [times]     [default] [encoding=\typescripttwo]    \definetypeface [postscript] [mm] [math]  [times]     [default] @@ -40,7 +40,7 @@  \stoptypescript -\starttypescript [times] [texnansi,ec,8r,uc] +\starttypescript [times] [texnansi,ec,8r,t5,uc]    \definetypeface [times] [rm] [serif] [times]     [default] [encoding=\typescripttwo]    \definetypeface [times] [ss] [sans]  [helvetica] [default] [rscale=.9,encoding=\typescripttwo] @@ -51,7 +51,7 @@  \stoptypescript -\starttypescript [palatino] [texnansi,ec,8r,uc] +\starttypescript [palatino] [texnansi,ec,8r,t5,uc]    \definetypeface [palatino] [rm] [serif] [palatino] [default] [encoding=\typescripttwo]    \definetypeface [palatino] [mm] [math]  [palatino] [default] [encoding=default] @@ -91,7 +91,7 @@  \stoptypescript -\starttypescript [lucida] [texnansi,ec,8r,uc] +\starttypescript [lucida] [texnansi,ec,8r]    \definetypeface [lucida] [mm] [math]        [lucida] [default] [encoding=\typescripttwo] @@ -192,7 +192,7 @@  \stoptypescript -\starttypescript [modernvariable] [texnansi,ec,8r] +\starttypescript [modernvariable] [texnansi,ec,8r,t5]    \definetypeface [modernvariable] [rm] [serif] [simple] [default] [encoding=\typescripttwo]    \definetypeface [modernvariable] [ss] [sans]  [modern] [default] [encoding=\typescripttwo] diff --git a/tex/context/base/type-ini.tex b/tex/context/base/type-ini.tex index 5466eeaab..7d2ed73c2 100644 --- a/tex/context/base/type-ini.tex +++ b/tex/context/base/type-ini.tex @@ -34,6 +34,12 @@  \usetypescriptfile[\f!typeprefix loc] % local scripts  \usetypescriptfile[\f!typeprefix akb] % adobe karl berry names +\beginXETEX \font + +  \usetypescriptfile[\f!typeprefix xtx] % xetex definitions + +\endXETEX +  %usetypescriptfile[\f!typeprefix pre] % predefined scripts (compatible)  %usetypescriptfile[typeface]          % project scripts @@ -356,8 +362,8 @@       \saverelativefontsize{#2}{\relativefontsize}% fall back      %\writestatus{typeface}{[#1] [#2] [#3] [#4]}       \writestatus\m!fonts{[#1] [#2] [#3] [#4] / \typefaceencoding}% -     \usetypescript[map][\typefaceencoding]% will become obsolete -     \usetypescript[#3,map][#4][name,default,\typefaceencoding,special]% +     %\usetypescript[map][\typefaceencoding]% latest versions of pdftex can load after first page +     \usetypescript[#3,map][#4][name,default,\typefaceencoding,special]% is default needed       \usetypescript[#3][#5][size]%       \popmacro\fontclass       \popmacro\typefaceencoding diff --git a/tex/context/base/type-map.tex b/tex/context/base/type-map.tex index 97d42d9bf..cb88ed8d7 100644 --- a/tex/context/base/type-map.tex +++ b/tex/context/base/type-map.tex @@ -18,12 +18,14 @@    \loadmapfile[ec-base.map]    \loadmapfile[8r-base.map]    \loadmapfile[qx-base.map] +  \loadmapfile[t5-base.map]    \loadmapfile[texnansi-base.map]    \loadmapfile[original-ams-cmr.map]    \loadmapfile[original-ams-euler.map]    \loadmapfile[original-public-lm.map]    \loadmapfile[original-public-plr.map]    \loadmapfile[original-public-csr.map] +  \loadmapfile[original-public-vnr.map]  \stoptypescript  % This is the base map file, load it to be sure. @@ -58,67 +60,72 @@    \loadmapfile[original-public-lm.map]  \stoptypescript -% latin modern +\starttypescript [map] [vnr] +  \loadmapfile[original-public-vnr.map] +\stoptypescript + +% latin modern (t5 to be done) -\starttypescript [map] [latin-modern] [ec,texnansi,qx] +\starttypescript [map] [latin-modern] [ec,texnansi,qx,t5]    \loadmapfile[\typescriptthree-public-lm.map]    \loadmapfile[\typescriptthree-var-exclusive-public-lm.map]  \stoptypescript  % the next applies to texfont generated metrics -\starttypescript [map] [utopia] [ec,8r,texnansi] +\starttypescript [map] [utopia] [ec,texnansi,t5,8r]    \loadmapfile[\typescriptthree-adobe-utopia.map]  \stoptypescript -\starttypescript [map] [charter] [ec,8r,texnansi] +\starttypescript [map] [charter] [ec,texnansi,t5,8r]    \loadmapfile[\typescriptthree-bitstrea-charter.map]  \stoptypescript -\starttypescript [map] [antykwa-torunska] [ec,8r,texnansi] +\starttypescript [map] [antykwa-torunska] [ec,texnansi,t5,8r]    \loadmapfile[\typescriptthree-public-antt.map]  \stoptypescript -\starttypescript [map] [antykwa-poltawskiego] [ec,8r,texnansi] +\starttypescript [map] [antykwa-poltawskiego] [ec,texnansi,t5,8r]    \loadmapfile[\typescriptthree-public-antp.map]  \stoptypescript -\starttypescript [map] [bookman] [ec,8r,texnansi] +\starttypescript [map] [bookman] [ec,texnansi,t5,8r]    \loadmapfile[\typescriptthree-urw-bookman.map]  \stoptypescript -\starttypescript [map] [courier] [ec,8r,texnansi] +\starttypescript [map] [courier] [ec,texnansi,t5,8r]    \loadmapfile[\typescriptthree-urw-courier.map]  \stoptypescript -\starttypescript [map] [helvetica] [ec,8r,texnansi] +\starttypescript [map] [helvetica] [ec,texnansi,t5,8r]    \loadmapfile[\typescriptthree-urw-helvetica.map]  \stoptypescript -\starttypescript [map] [palatino] [ec,8r,texnansi] +\starttypescript [map] [palatino] [ec,texnansi,t5,8r]    \loadmapfile[\typescriptthree-urw-palatino.map] +  \loadmapfile[\typescriptthree-public-pfl.map]  \stoptypescript -\starttypescript [map] [times] [ec,8r,texnansi] +\starttypescript [map] [times] [ec,texnansi,t5,8r]    \loadmapfile[\typescriptthree-urw-times.map]  \stoptypescript -\starttypescript [map] [chancery] [ec,8r,texnansi] +\starttypescript [map] [chancery] [ec,texnansi,t5,8r]    \loadmapfile[\typescriptthree-urw-zapfchan.map]  \stoptypescript -\starttypescript [map] [schoolbook] [ec,8r,texnansi] +\starttypescript [map] [schoolbook] [ec,texnansi,t5,8r]    \loadmapfile[\typescriptthree-urw-ncntrsbk.map]  \stoptypescript  % once i can be sure that the map files are in the tree, i will  % use those instead of original (too many variants anyway) -\starttypescript [map] [palatino] [default,ec,texnansi,8r] +\starttypescript [map] [palatino] [default,ec,texnansi,t5,8r]    \loadmapfile[original-youngryu-px.map]  \stoptypescript -\starttypescript [map] [times] [default,ec,texnansi,8r] +\starttypescript [map] [times] [default,ec,texnansi,t5,8r]    \loadmapfile[original-youngryu-tx.map]  \stoptypescript diff --git a/tex/context/base/type-syn.tex b/tex/context/base/type-syn.tex index 542d3d9e6..d0a3b52fc 100644 --- a/tex/context/base/type-syn.tex +++ b/tex/context/base/type-syn.tex @@ -381,4 +381,15 @@    \definefontsynonym [MathBeta]      [Palatino-Math-SymbolsB]  \stoptypescript +% bonus definitions + +\starttypescript [serif] [palatino] [name] + \definefontsynonym [SerifRegular]      [Serif] + \definefontsynonym [SerifRegularOsF]   [TeXPalladioL-SC] + \definefontsynonym [SerifItalicOsF]    [TeXPalladioL-ItalicOsF] + \definefontsynonym [SerifBoldOsF]      [TeXPalladioL-BoldOsF] + \definefontsynonym [SerifBoldItalicOsF][TeXPalladioL-BoldItalicOsF] + \definefontsynonym [SerifCapsOsF]      [TeXPalladioL-SC] +\stoptypescript +  \endinput diff --git a/tex/context/base/unic-000.tex b/tex/context/base/unic-000.tex index 83e90e444..cb5221df0 100644 --- a/tex/context/base/unic-000.tex +++ b/tex/context/base/unic-000.tex @@ -27,26 +27,26 @@      textdiaeresis\or      copyright\or      ordfeminine\or    %  FEMININE ORDINAL INDICATOR -    \@@unknownchar\or %  LEFT-POINTING DOUBLE ANGLE QUOTATION MARK +    leftguillemot\or %  LEFT-POINTING DOUBLE ANGLE QUOTATION MARK      textlognot\or      softhyphen\or      registered\or      textmacron\or      textdegree\or      textpm\or -    \@@unknownchar\or %  SUPERSCRIPT TWO -    \@@unknownchar\or %  SUPERSCRIPT THREE +    twosuperior\or %  SUPERSCRIPT TWO +    threesuperior\or %  SUPERSCRIPT THREE      textacute\or -    \@@unknownchar\or %  MICRO SIGN -    \@@unknownchar\or %  PILCROW SIGN -    \@@unknownchar\or %  MIDDLE DOT +    textmu\or %  MICRO SIGN +    paragraphmark\or %  PILCROW SIGN +    periodcentered\or %  MIDDLE DOT      textcedilla\or -    \@@unknownchar\or %  SUPERSCRIPT ONE +    onesuperior\or %  SUPERSCRIPT ONE      ordmasculine\or   %  MASCULINE ORDINAL INDICATOR -    \@@unknownchar\or %  RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK -    \@@unknownchar\or %  VULGAR FRACTION ONE QUARTER -    \@@unknownchar\or %  VULGAR FRACTION ONE HALF -    \@@unknownchar\or %  VULGAR FRACTION THREE QUARTERS +    rightguillemot\or %  RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK +    onequarter\or %  VULGAR FRACTION ONE QUARTER +    onehalf\or %  VULGAR FRACTION ONE HALF +    threequarters\or %  VULGAR FRACTION THREE QUARTERS      questiondown\or      Agrave\or      Aacute\or @@ -64,7 +64,7 @@      Iacute\or      Icircumflex\or      Idiaeresis\or -    \@@unknownchar\or % Eth\or +    Eth\or % Eth\or      Ntilde\or      Ograve\or      Oacute\or @@ -96,7 +96,7 @@      iacute\or      icircumflex\or      idiaeresis\or -    \@@unknownchar\or % eth\or +    eth\or % eth\or      ntilde\or      ograve\or      oacute\or @@ -132,7 +132,7 @@      \textdiaeresis     \or      \copyright         \or      \ordfeminine       \or %  FEMININE ORDINAL INDICATOR -    \unknownchar       \or %  LEFT-POINTING DOUBLE ANGLE QUOTATION MARK +    \leftguillemot    \or %  LEFT-POINTING DOUBLE ANGLE QUOTATION MARK      \textlognot        \or      \softhyphen        \or      \registered        \or @@ -142,13 +142,13 @@      \twosuperior       \or      \threesuperior     \or      \textacute         \or -    \unknownchar       \or %  MICRO SIGN -    \unknownchar       \or %  PILCROW SIGN +    \textmu            \or %  MICRO SIGN +    \paragraphmark     \or %  PILCROW SIGN      \periodcentered    \or      \textcedilla       \or      \onesuperior       \or      \ordmasculine      \or %  MASCULINE ORDINAL INDICATOR -    \unknownchar       \or %  RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK +    \rightguillemot    \or %  RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK      \onequarter        \or      \onehalf           \or      \threequarter      \or @@ -169,7 +169,7 @@      \Iacute            \or      \Icircumflex       \or      \Idiaeresis        \or -    \unknownchar       \or % \Eth \or +    \Eth               \or % \Eth \or      \Ntilde            \or      \Ograve            \or      \Oacute            \or @@ -201,12 +201,12 @@      \iacute            \or      \icircumflex       \or      \idiaeresis        \or -    \unknownchar       \or % \eth \or +    \eth               \or % \eth \or      \ntilde            \or      \ograve            \or      \oacute            \or      \ocircumflex       \or -    \ohungarumlaut     \or +    \otilde            \or      \odiaeresis        \or      \textdiv           \or      \ostroke           \or diff --git a/tex/context/base/unic-001.tex b/tex/context/base/unic-001.tex index f68ca7ec9..43ac71dee 100644 --- a/tex/context/base/unic-001.tex +++ b/tex/context/base/unic-001.tex @@ -152,8 +152,8 @@  \startunicodevector 1    \expandafter\strippedcsname    \ifcase\numexpr(#1+1)\or -    \unknownchar   \or -    \unknownchar   \or +    \Amacron       \or +    \amacron       \or      \Abreve        \or      \abreve        \or      \Aogonek       \or @@ -186,8 +186,8 @@      \gbreve        \or      \Gdotaccent    \or      \gdotaccent    \or -    \unknownchar   \or % \Gcedilla \or -    \unknownchar   \or % \gcedilla \or +    \Gcedilla      \or % \Gcedilla \or +    \gcedilla      \or % \gcedilla \or      \Hcircumflex   \or      \hcircumflex   \or      \Hstroke       \or @@ -208,15 +208,15 @@      \jcircumflex   \or      \Kcedilla      \or      \kcedilla      \or -    \unknownchar   \or % \kkra \or +    \kkra          \or % \kkra \or      \Lacute        \or      \lacute        \or      \Lcedilla      \or      \lcedilla      \or      \Lcaron        \or      \lcaron        \or -    \unknownchar   \or % \Ldotmiddle \or -    \unknownchar   \or % \ldotmiddle \or +    \Ldotmiddle    \or % \Ldotmiddle \or +    \ldotmiddle    \or % \ldotmiddle \or      \Lstroke       \or      \lstroke       \or      \Nacute        \or @@ -279,7 +279,7 @@      \zdotaccent    \or      \Zcaron        \or      \zcaron        \or -    \unknownchar   \or % 127 \slong \else +    \slong         \or % 127 \slong \else      \unknownchar   \or      \unknownchar   \or      \unknownchar   \or @@ -299,6 +299,36 @@      \unknownchar   \or      \unknownchar   \or      \textflorin    \or % 146 +    \unknownchar   \or +    \unknownchar   \or +    \unknownchar   \or +    \unknownchar   \or +    \unknownchar   \or +    \unknownchar   \or +    \unknownchar   \or +    \unknownchar   \or +    \unknownchar   \or +    \unknownchar   \or +    \unknownchar   \or +    \unknownchar   \or +    \unknownchar   \or +    \Ohorn         \or % 160 +    \ohorn         \or +    \unknownchar   \or +    \unknownchar   \or +    \unknownchar   \or +    \unknownchar   \or +    \unknownchar   \or +    \unknownchar   \or +    \unknownchar   \or +    \unknownchar   \or +    \unknownchar   \or +    \unknownchar   \or +    \unknownchar   \or +    \unknownchar   \or +    \unknownchar   \or +    \Uhorn         \or % 175 +    \uhorn         \else      \unknownchar    \fi  \stopunicodevector diff --git a/tex/context/base/unic-030.tex b/tex/context/base/unic-030.tex new file mode 100644 index 000000000..f94f49c53 --- /dev/null +++ b/tex/context/base/unic-030.tex @@ -0,0 +1,113 @@ +%D \module +%D   [       file=unic-030, +%D        version=2004.11.18, +%D          title=\CONTEXT\ \UNICODE\ Macros, +%D       subtitle=Vector 30, +%D         author=Adam Lindsay, +%D           date=\currentdate, +%D      copyright={PRAGMA / Adam Lindsay}] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + +\unprotect + +\startunicodevector 30 +  \expandafter\strippedcsname +  \ifcase\numexpr(#1-159) \or % space needed, terminates expr +    \Adotbelow           \or +    \adotbelow           \or +    \Ahook               \or +    \ahook               \or +    \Acircumflexacute    \or +    \acircumflexacute    \or +    \Acircumflexgrave    \or +    \acircumflexgrave    \or +    \Acircumflexhook     \or +    \acircumflexhook     \or +    \Acircumflextilde    \or +    \acircumflextilde    \or +    \Acircumflexdotbelow \or +    \acircumflexdotbelow \or +    \Abreveacute         \or +    \abreveacute         \or +    \Abrevegrave         \or +    \abrevegrave         \or +    \Abrevehook          \or +    \abrevehook          \or +    \Abrevetilde         \or +    \abrevetilde         \or +    \Abrevedotbelow      \or +    \abrevedotbelow      \or +    \Edotbelow           \or +    \edotbelow           \or +    \Ehook               \or +    \ehook               \or +    \Etilde              \or +    \etilde              \or +    \Ecircumflexacute    \or +    \ecircumflexacute    \or +    \Ecircumflexgrave    \or +    \ecircumflexgrave    \or +    \Ecircumflexhook     \or +    \ecircumflexhook     \or +    \Ecircumflextilde    \or +    \ecircumflextilde    \or +    \Ecircumflexdotbelow \or +    \ecircumflexdotbelow \or +    \Ihook               \or +    \ihook               \or +    \Idotbelow           \or +    \idotbelow           \or +    \Odotbelow           \or +    \odotbelow           \or +    \Ohook               \or +    \ohook               \or +    \Ocircumflexacute    \or +    \ocircumflexacute    \or +    \Ocircumflexgrave    \or +    \ocircumflexgrave    \or +    \Ocircumflexhook     \or +    \ocircumflexhook     \or +    \Ocircumflextilde    \or +    \ocircumflextilde    \or +    \Ocircumflexdotbelow \or +    \ocircumflexdotbelow \or +    \Ohornacute          \or +    \ohornacute          \or +    \Ohorngrave          \or +    \ohorngrave          \or +    \Ohornhook           \or +    \ohornhook           \or +    \Ohorntilde          \or +    \ohorntilde          \or +    \Ohorndotbelow       \or +    \ohorndotbelow       \or +    \Udotbelow           \or +    \udotbelow           \or +    \Uhook               \or +    \uhook               \or +    \Uhornacute          \or +    \uhornacute          \or +    \Uhorngrave          \or +    \uhorngrave          \or +    \Uhornhook           \or +    \uhornhook           \or +    \Uhorntilde          \or +    \uhorntilde          \or +    \Uhorndotbelow       \or +    \uhorndotbelow       \or +    \Ygrave              \or +    \ygrave              \or +    \Ydotbelow           \or +    \ydotbelow           \or +    \Yhook               \or +    \yhook               \or +    \Ytilde              \or +    \ytilde              \else +    \unknownchar +  \fi +\stopunicodevector + +\protect \endinput diff --git a/tex/context/base/unic-032.tex b/tex/context/base/unic-032.tex index 2b7366e59..b18bf7d37 100644 --- a/tex/context/base/unic-032.tex +++ b/tex/context/base/unic-032.tex @@ -145,6 +145,10 @@  % U+206E 	NATIONAL DIGIT SHAPES  % U+206F 	NOMINAL DIGIT SHAPES +\ifx\undefined\zerowidthspace \unexpanded\def\zerowidthspace{\kern\zeropoint} + +% will be made more efficient +  \startunicodevector 32    \ifcase\numexpr(#1)      \strippedcsname \enspace          \or % U+2000  	EN QUAD @@ -158,14 +162,14 @@      \strippedcsname \unknownchar      \or % U+2008 	PUNCTUATION SPACE      \strippedcsname \unknownchar      \or % U+2009 	THIN SPACE      \strippedcsname \unknownchar      \or % U+200A 	HAIR SPACE -    \strippedcsname \unknownchar      \or % U+200B 	ZERO WIDTH SPACE +    \strippedcsname \zerowidthspace   \or % U+200B 	ZERO WIDTH SPACE      \strippedcsname \unknownchar      \or % U+200C 	ZERO WIDTH NON-JOINER      \strippedcsname \unknownchar      \or % U+200D 	ZERO WIDTH JOINER      \strippedcsname \unknownchar      \or % U+200E 	LEFT-TO-RIGHT MARK      \strippedcsname \unknownchar      \or % U+200F 	RIGHT-TO-LEFT MARK      \strippedcsname \breakinghyphen   \or % U+2010 	HYPHEN      \strippedcsname \nonbreakinghyphen\or % U+2011 	NON-BREAKING HYPHEN -    \strippedcsname \endash           \or % U+2012 	FIGURE DASH +    \strippedcsname \textminus        \or % U+2012 	FIGURE DASH    % \ifcase\numexpr(#1-19)      \strippedcsname \endash           \or % U+2013 	EN DASH      \strippedcsname \emdash           \or % U+2014 	EM DASH @@ -194,8 +198,8 @@      \strippedcsname \doubleprime      \or   % U+2033 DOUBLE PRIME      \strippedcsname \tripleprime      \else % U+2034 TRIPLE PRIME    \ifcase\numexpr(#1-57) -    \strippedcsname \unknownchar      \or   % SINGLE LEFT-POINTING ANGLE QUOTATION MARK -    \strippedcsname \unknownchar      \else % SINGLE RIGHT-POINTING ANGLE QUOTATION MARK +    \strippedcsname \guilsingleleft   \or   % SINGLE LEFT-POINTING ANGLE QUOTATION MARK +    \strippedcsname \guilsingleright  \else % SINGLE RIGHT-POINTING ANGLE QUOTATION MARK    \ifcase\numexpr(#1-172)      \strippedcsname \texteuro         \else      \strippedcsname \unknownchar diff --git a/tex/context/base/unic-exp.tex b/tex/context/base/unic-exp.tex index 1f60cb99c..0004a5c2d 100644 --- a/tex/context/base/unic-exp.tex +++ b/tex/context/base/unic-exp.tex @@ -31,12 +31,9 @@         \writestatus{unicode}{expanding vector #1}%         \setvalue{\@@univector\@@univector#1}{\expandedunivector{#1}}%         \dorecurse{255} -         {\@EA\ifx\csname\csname\@@univector#1\endcsname\recurselevel\endcsname -            \unknownchar +         {\@EA\ifx\csname\csname\@@univector#1\endcsname\recurselevel\endcsname\unknownchar              % skip            \else -            % \@EAEAEA\let\@EA\@EA\csname\@@univector\@@univector#1:\recurselevel\endcsname -            %   \csname\csname\@@univector#1\endcsname\recurselevel\endcsname              \@EA\let\csname\@@univector\@@univector#1:\recurselevel\@EA\endcsname                \csname\csname\@@univector#1\endcsname\recurselevel\endcsname            \fi}% @@ -66,6 +63,6 @@  %D Let's use it: -\expandunivector[0,1,2,32,33] +\expandunivector[0,1,2,30,32,33]  \protect \endinput diff --git a/tex/context/base/unic-ini.tex b/tex/context/base/unic-ini.tex index 6cc498475..636fb7d83 100644 --- a/tex/context/base/unic-ini.tex +++ b/tex/context/base/unic-ini.tex @@ -565,6 +565,6 @@  %D Well, let's at least preload a few familiar ones. Here we  %D also load the \UTF\ regime. -\useunicodevector[0,1,2,32,33] \useregime[utf] +\useunicodevector[0,1,2,30,32,33] \useregime[utf]  \protect  \endinput diff --git a/tex/context/base/x-fe.tex b/tex/context/base/x-fe.tex index 302960d0c..75fc6a9f0 100644 --- a/tex/context/base/x-fe.tex +++ b/tex/context/base/x-fe.tex @@ -97,7 +97,7 @@  \defineXMLargument    [fe:message]    [category=XML-FO] -  {\writestatus{\XMLop{category}}} +  {\writeFOstatus{\XMLop{category}}}  %D Handy diff --git a/tex/context/base/xtag-pre.tex b/tex/context/base/xtag-pre.tex index 96231bd87..e589e39be 100644 --- a/tex/context/base/xtag-pre.tex +++ b/tex/context/base/xtag-pre.tex @@ -22,6 +22,10 @@  \unprotect +%D Let's get rid of ligatures: + +% \definefonthandling [default] [noligs] +  %D First we define the default error handler. When tracing is  %D activated, the unknown element is showed verbatim. diff --git a/tex/context/interface/cont-cz.xml b/tex/context/interface/cont-cz.xml index 0c81fd8ad..d7399bf8d 100644 --- a/tex/context/interface/cont-cz.xml +++ b/tex/context/interface/cont-cz.xml @@ -1,10 +1,10 @@  <?xml version="1.0"?> -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2004.11.17"> -<cd:command name="instalacejazyka" file="lang-ini.tex"> +<cd:command name="installlanguage" file="lang-ini.tex">    <cd:sequence> -    <cd:string value="instalacejazyka"/> +    <cd:string value="installlanguage"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -56,9 +56,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavjazyk" file="lang-ini.tex"> +<cd:command name="setuplanguage" file="lang-ini.tex">    <cd:sequence> -    <cd:string value="nastavjazyk"/> +    <cd:string value="setuplanguage"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -72,14 +72,14 @@        <cd:constant type=".."/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="instalacejazyka"/> +      <cd:inherit name="installlanguage"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="jazyk"> +<cd:command name="language">    <cd:sequence> -    <cd:string value="jazyk"/> +    <cd:string value="language"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -95,9 +95,9 @@    </cd:arguments>  </cd:command> -<cd:command name="hlavnijazyk" file="lang-ini.tex"> +<cd:command name="mainlanguage" file="lang-ini.tex">    <cd:sequence> -    <cd:string value="hlavnijazyk"/> +    <cd:string value="mainlanguage"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -113,9 +113,9 @@    </cd:arguments>  </cd:command> -<cd:command name="prelozit" file="lang-lab.tex"> +<cd:command name="translate" file="lang-lab.tex">    <cd:sequence> -    <cd:string value="prelozit"/> +    <cd:string value="translate"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -126,9 +126,9 @@    </cd:arguments>  </cd:command> -<cd:command name="uzijkodovani" file="enco-ini.tex"> +<cd:command name="useencoding" file="enco-ini.tex">    <cd:sequence> -    <cd:string value="uzijkodovani"/> +    <cd:string value="useencoding"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -137,9 +137,9 @@    </cd:arguments>  </cd:command> -<cd:command name="uzijspeciality" file="spec-ini.tex"> +<cd:command name="usespecials" file="spec-ini.tex">    <cd:sequence> -    <cd:string value="uzijspeciality"/> +    <cd:string value="usespecials"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -149,9 +149,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definujvystup" file="spec-ini.tex"> +<cd:command name="defineoutput" file="spec-ini.tex">    <cd:sequence> -    <cd:string value="definujvystup"/> +    <cd:string value="defineoutput"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -163,9 +163,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavvystup" file="spec-ini.tex"> +<cd:command name="setupoutput" file="spec-ini.tex">    <cd:sequence> -    <cd:string value="nastavvystup"/> +    <cd:string value="setupoutput"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -174,9 +174,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definujprostredizakladnihofontu" file="font-ini.tex"> +<cd:command name="definebodyfontenvironment" file="font-ini.tex">    <cd:sequence> -    <cd:string value="definujprostredizakladnihofontu"/> +    <cd:string value="definebodyfontenvironment"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -211,34 +211,34 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavprostredizakladnihofontu" file="font-ini.tex"> +<cd:command name="setupbodyfontenvironment" file="font-ini.tex">    <cd:sequence> -    <cd:string value="nastavprostredizakladnihofontu"/> +    <cd:string value="setupbodyfontenvironment"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> -      <cd:inherit name="nastavzakladnifont"/> +      <cd:inherit name="setupbodyfont"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="nastavzakladnifont"/> +      <cd:inherit name="setupbodyfont"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="ukazpostredizakladnihofontu"> +<cd:command name="showbodyfontenvironment">    <cd:sequence> -    <cd:string value="ukazpostredizakladnihofontu"/> +    <cd:string value="showbodyfontenvironment"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> -      <cd:inherit name="nastavzakladnifont"/> +      <cd:inherit name="setupbodyfont"/>      </cd:keywords>    </cd:arguments>  </cd:command> -<cd:command name="definujzakladnifont" file="font-ini.tex"> +<cd:command name="definebodyfont" file="font-ini.tex">    <cd:sequence> -    <cd:string value="definujzakladnifont"/> +    <cd:string value="definebodyfont"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -299,20 +299,20 @@    </cd:arguments>  </cd:command> -<cd:command name="ukazzakladnifont"> +<cd:command name="showbodyfont">    <cd:sequence> -    <cd:string value="ukazzakladnifont"/> +    <cd:string value="showbodyfont"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> -      <cd:inherit name="nastavzakladnifont"/> +      <cd:inherit name="setupbodyfont"/>      </cd:keywords>    </cd:arguments>  </cd:command> -<cd:command name="nastavzakladnifont"> +<cd:command name="setupbodyfont">    <cd:sequence> -    <cd:string value="nastavzakladnifont"/> +    <cd:string value="setupbodyfont"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -335,9 +335,9 @@    </cd:arguments>  </cd:command> -<cd:command name="prepninazakladnifont" file="font-ini.tex"> +<cd:command name="switchtobodyfont" file="font-ini.tex">    <cd:sequence> -    <cd:string value="prepninazakladnifont"/> +    <cd:string value="switchtobodyfont"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -351,9 +351,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definujfont" file="font-ini.tex"> +<cd:command name="definefont" file="font-ini.tex">    <cd:sequence> -    <cd:string value="definujfont"/> +    <cd:string value="definefont"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -379,9 +379,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavbarvu" file="colo-ini.tex"> +<cd:command name="setupcolor" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="nastavbarvu"/> +    <cd:string value="setupcolor"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -390,9 +390,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavbarvy" file="colo-ini.tex"> +<cd:command name="setupcolors" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="nastavbarvy"/> +    <cd:string value="setupcolors"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -448,9 +448,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definujbarvu" file="colo-ini.tex"> +<cd:command name="definecolor" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="definujbarvu"/> +    <cd:string value="definecolor"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -485,9 +485,9 @@    </cd:arguments>  </cd:command> -<cd:command name="barva" type="environment" file="colo-ini.tex"> +<cd:command name="color" type="environment" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="barva"/> +    <cd:string value="color"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -496,9 +496,9 @@    </cd:arguments>  </cd:command> -<cd:command name="barva" file="colo-ini.tex"> +<cd:command name="color" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="barva"/> +    <cd:string value="color"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -508,9 +508,9 @@    </cd:arguments>  </cd:command> -<cd:command name="sedabarva" file="colo-ini.tex"> +<cd:command name="graycolor" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="sedabarva"/> +    <cd:string value="graycolor"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -519,9 +519,9 @@    </cd:arguments>  </cd:command> -<cd:command name="ukazbarvu"> +<cd:command name="showcolor">    <cd:sequence> -    <cd:string value="ukazbarvu"/> +    <cd:string value="showcolor"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -530,9 +530,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definujpaletu" file="colo-ini.tex"> +<cd:command name="definepalet" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="definujpaletu"/> +    <cd:string value="definepalet"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -546,9 +546,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavpaletu" file="colo-ini.tex"> +<cd:command name="setuppalet" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="nastavpaletu"/> +    <cd:string value="setuppalet"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -557,9 +557,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definujskupinubarev" file="colo-ini.tex"> +<cd:command name="definecolorgroup" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="definujskupinubarev"/> +    <cd:string value="definecolorgroup"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -575,9 +575,9 @@    </cd:arguments>  </cd:command> -<cd:command name="ukazpaletu"> +<cd:command name="showpalet">    <cd:sequence> -    <cd:string value="ukazpaletu"/> +    <cd:string value="showpalet"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -592,9 +592,9 @@    </cd:arguments>  </cd:command> -<cd:command name="ukazskupinubarev"> +<cd:command name="showcolorgroup">    <cd:sequence> -    <cd:string value="ukazskupinubarev"/> +    <cd:string value="showcolorgroup"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -610,9 +610,9 @@    </cd:arguments>  </cd:command> -<cd:command name="porovnejpaletu"> +<cd:command name="comparepalet">    <cd:sequence> -    <cd:string value="porovnejpaletu"/> +    <cd:string value="comparepalet"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -621,9 +621,9 @@    </cd:arguments>  </cd:command> -<cd:command name="porovnejskupinubarev"> +<cd:command name="comparecolorgroup">    <cd:sequence> -    <cd:string value="porovnejskupinubarev"/> +    <cd:string value="comparecolorgroup"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -632,9 +632,9 @@    </cd:arguments>  </cd:command> -<cd:command name="ukazupravu" file="supp-vis.tex"> +<cd:command name="showmakeup" file="supp-vis.tex">    <cd:sequence> -    <cd:string value="ukazupravu"/> +    <cd:string value="showmakeup"/>    </cd:sequence>  </cd:command> @@ -647,14 +647,14 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="nastavtype"/> +      <cd:inherit name="setuptype"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="nastavtype" file="core-ver.tex"> +<cd:command name="setuptype" file="core-ver.tex">    <cd:sequence> -    <cd:string value="nastavtype"/> +    <cd:string value="setuptype"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -693,9 +693,9 @@    </cd:arguments>  </cd:command> -<cd:command name="pis" file="core-ver.tex"> +<cd:command name="typ" file="core-ver.tex">    <cd:sequence> -    <cd:string value="pis"/> +    <cd:string value="typ"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -720,9 +720,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definujopis" file="core-ver.tex"> +<cd:command name="definetyping" file="core-ver.tex">    <cd:sequence> -    <cd:string value="definujopis"/> +    <cd:string value="definetyping"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -731,14 +731,14 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="nastavopis"/> +      <cd:inherit name="setuptyping"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="nastavopis" file="core-ver.tex"> +<cd:command name="setuptyping" file="core-ver.tex">    <cd:sequence> -    <cd:string value="nastavopis"/> +    <cd:string value="setuptyping"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -838,13 +838,11 @@    <cd:sequence>      <cd:variable value="typing"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="opissoubor" file="verb-ini.tex"> +<cd:command name="typefile" file="verb-ini.tex">    <cd:sequence> -    <cd:string value="opissoubor"/> +    <cd:string value="typefile"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -854,9 +852,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavpoznamkypodcarou" file="core-not.tex"> +<cd:command name="setupfootnotes" file="core-not.tex">    <cd:sequence> -    <cd:string value="nastavpoznamkypodcarou"/> +    <cd:string value="setupfootnotes"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -957,25 +955,25 @@        <cd:parameter name="faktor">          <cd:constant type="cd:number"/>        </cd:parameter> -      <cd:inherit name="oramovani"/> +      <cd:inherit name="framed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="nastavdefinicipoznamekpodcarou" file="core-not.tex"> +<cd:command name="setupfootnotedefinition" file="core-not.tex">    <cd:sequence> -    <cd:string value="nastavdefinicipoznamekpodcarou"/> +    <cd:string value="setupfootnotedefinition"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> -      <cd:inherit name="definujpopis"/> +      <cd:inherit name="definedescription"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="poznamkapodcarou" file="core-not.tex"> +<cd:command name="footnote" file="core-not.tex">    <cd:sequence> -    <cd:string value="poznamkapodcarou"/> +    <cd:string value="footnote"/>    </cd:sequence>    <cd:arguments>      <cd:reference optional="yes"/> @@ -993,9 +991,9 @@    </cd:arguments>  </cd:command> -<cd:command name="poznamka" file="core-not.tex"> +<cd:command name="note" file="core-not.tex">    <cd:sequence> -    <cd:string value="poznamka"/> +    <cd:string value="note"/>    </cd:sequence>    <cd:arguments>      <cd:reference interactive="yes"/> @@ -1006,35 +1004,33 @@    <cd:sequence>      <cd:string value="localfootnotes"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="umistilokalnipoznamkypodcarou" file="core-not.tex"> +<cd:command name="placelocalfootnotes" file="core-not.tex">    <cd:sequence> -    <cd:string value="umistilokalnipoznamkypodcarou"/> +    <cd:string value="placelocalfootnotes"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="nastavpoznamkypodcarou"/> +      <cd:inherit name="setupfootnotes"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="umistipoznamkypodcarou" file="core-not.tex"> +<cd:command name="placefootnotes" file="core-not.tex">    <cd:sequence> -    <cd:string value="umistipoznamkypodcarou"/> +    <cd:string value="placefootnotes"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="nastavpoznamkypodcarou"/> +      <cd:inherit name="setupfootnotes"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="nastavpodtrzeni" file="core-fnt.tex"> +<cd:command name="setupunderbar" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="nastavpodtrzeni"/> +    <cd:string value="setupunderbar"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -1059,117 +1055,117 @@    </cd:arguments>  </cd:command> -<cd:command name="podtrzeno" file="core-fnt.tex"> +<cd:command name="underbar" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="podtrzeno"/> +    <cd:string value="underbar"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="podtrzeni" file="core-fnt.tex"> +<cd:command name="underbars" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="podtrzeni"/> +    <cd:string value="underbars"/>    </cd:sequence>    <cd:arguments>      <cd:word list="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="nadtrzeno" file="core-fnt.tex"> +<cd:command name="overbar" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="nadtrzeno"/> +    <cd:string value="overbar"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="nadtrzeni" file="core-fnt.tex"> +<cd:command name="overbars" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="nadtrzeni"/> +    <cd:string value="overbars"/>    </cd:sequence>    <cd:arguments>      <cd:word list="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="preskrtnuto" file="core-fnt.tex"> +<cd:command name="overstrike" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="preskrtnuto"/> +    <cd:string value="overstrike"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="preskrtnuti" file="core-fnt.tex"> +<cd:command name="overstrikes" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="preskrtnuti"/> +    <cd:string value="overstrikes"/>    </cd:sequence>    <cd:arguments>      <cd:word list="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="rimskecislice" file="core-con.tex"> +<cd:command name="romannumerals" file="core-con.tex">    <cd:sequence> -    <cd:string value="rimskecislice"/> +    <cd:string value="romannumerals"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="Rimskecislice" file="core-con.tex"> +<cd:command name="Romannumerals" file="core-con.tex">    <cd:sequence> -    <cd:string value="Rimskecislice"/> +    <cd:string value="Romannumerals"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="cisla" file="core-con.tex"> +<cd:command name="numbers" file="core-con.tex">    <cd:sequence> -    <cd:string value="cisla"/> +    <cd:string value="numbers"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="znak" file="core-con.tex"> +<cd:command name="character" file="core-con.tex">    <cd:sequence> -    <cd:string value="znak"/> +    <cd:string value="character"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="Znak" file="core-con.tex"> +<cd:command name="Character" file="core-con.tex">    <cd:sequence> -    <cd:string value="Znak"/> +    <cd:string value="Character"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="znaky" file="core-con.tex"> +<cd:command name="characters" file="core-con.tex">    <cd:sequence> -    <cd:string value="znaky"/> +    <cd:string value="characters"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="Znaky" file="core-con.tex"> +<cd:command name="Characters" file="core-con.tex">    <cd:sequence> -    <cd:string value="Znaky"/> +    <cd:string value="Characters"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -1185,45 +1181,45 @@    </cd:arguments>  </cd:command> -<cd:command name="mesic" file="core-con.tex"> +<cd:command name="month" file="core-con.tex">    <cd:sequence> -    <cd:string value="mesic"/> +    <cd:string value="month"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="MESIC" file="core-con.tex"> +<cd:command name="MONTH" file="core-con.tex">    <cd:sequence> -    <cd:string value="MESIC"/> +    <cd:string value="MONTH"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="vsedniden" file="core-con.tex"> +<cd:command name="weekday" file="core-con.tex">    <cd:sequence> -    <cd:string value="vsedniden"/> +    <cd:string value="weekday"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="VSEDNIDEN" file="core-con.tex"> +<cd:command name="WEEKDAY" file="core-con.tex">    <cd:sequence> -    <cd:string value="VSEDNIDEN"/> +    <cd:string value="WEEKDAY"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="nastavkapitalky" file="core-fnt.tex"> +<cd:command name="setupcapitals" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="nastavkapitalky"/> +    <cd:string value="setupcapitals"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -1284,54 +1280,54 @@    </cd:arguments>  </cd:command> -<cd:command name="SLOVO" file="core-fnt.tex"> +<cd:command name="WORD" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="SLOVO"/> +    <cd:string value="WORD"/>    </cd:sequence>    <cd:arguments>      <cd:word/>    </cd:arguments>  </cd:command> -<cd:command name="SLOVA" file="core-fnt.tex"> +<cd:command name="WORDS" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="SLOVA"/> +    <cd:string value="WORDS"/>    </cd:sequence>    <cd:arguments>      <cd:word list="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="Slovo" file="core-fnt.tex"> +<cd:command name="Word" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="Slovo"/> +    <cd:string value="Word"/>    </cd:sequence>    <cd:arguments>      <cd:word/>    </cd:arguments>  </cd:command> -<cd:command name="Slova" file="core-fnt.tex"> +<cd:command name="Words" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="Slova"/> +    <cd:string value="Words"/>    </cd:sequence>    <cd:arguments>      <cd:word list="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="roztazene" file="core-fnt.tex"> +<cd:command name="stretched" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="roztazene"/> +    <cd:string value="stretched"/>    </cd:sequence>    <cd:arguments>      <cd:word/>    </cd:arguments>  </cd:command> -<cd:command name="definujsymbol" file="symb-ini.tex"> +<cd:command name="definesymbol" file="symb-ini.tex">    <cd:sequence> -    <cd:string value="definujsymbol"/> +    <cd:string value="definesymbol"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1343,9 +1339,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definujobrazeksymbol" file="symb-ini.tex"> +<cd:command name="definefiguresymbol" file="symb-ini.tex">    <cd:sequence> -    <cd:string value="definujobrazeksymbol"/> +    <cd:string value="definefiguresymbol"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1355,7 +1351,7 @@        <cd:constant type="cd:text"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="externiobraz"/> +      <cd:inherit name="externalfigure"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -1385,9 +1381,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavsadusymbolu" file="symb-ini.tex"> +<cd:command name="setupsymbolset" file="symb-ini.tex">    <cd:sequence> -    <cd:string value="nastavsadusymbolu"/> +    <cd:string value="setupsymbolset"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1396,9 +1392,9 @@    </cd:arguments>  </cd:command> -<cd:command name="uzijsymbol" file="symb-ini.tex"> +<cd:command name="usesymbols" file="symb-ini.tex">    <cd:sequence> -    <cd:string value="uzijsymbol"/> +    <cd:string value="usesymbols"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1407,9 +1403,9 @@    </cd:arguments>  </cd:command> -<cd:command name="ukazsadusymbolu"> +<cd:command name="showsymbolset">    <cd:sequence> -    <cd:string value="ukazsadusymbolu"/> +    <cd:string value="showsymbolset"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1418,9 +1414,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definujkonverzi" file="core-con.tex"> +<cd:command name="defineconversion" file="core-con.tex">    <cd:sequence> -    <cd:string value="definujkonverzi"/> +    <cd:string value="defineconversion"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1433,9 +1429,9 @@    </cd:arguments>  </cd:command> -<cd:command name="konvertujcislo" file="core-con.tex"> +<cd:command name="convertnumber" file="core-con.tex">    <cd:sequence> -    <cd:string value="konvertujcislo"/> +    <cd:string value="convertnumber"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -1443,9 +1439,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavtexthlavicky" file="lang-lab.tex"> +<cd:command name="setupheadtext" file="lang-lab.tex">    <cd:sequence> -    <cd:string value="nastavtexthlavicky"/> +    <cd:string value="setupheadtext"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -1466,9 +1462,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavtextpopisku" file="lang-lab.tex"> +<cd:command name="setuplabeltext" file="lang-lab.tex">    <cd:sequence> -    <cd:string value="nastavtextpopisku"/> +    <cd:string value="setuplabeltext"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -1489,27 +1485,27 @@    </cd:arguments>  </cd:command> -<cd:command name="texthlavicky" file="lang-lab.tex"> +<cd:command name="headtext" file="lang-lab.tex">    <cd:sequence> -    <cd:string value="texthlavicky"/> +    <cd:string value="headtext"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="textpopisku"> +<cd:command name="labeltext">    <cd:sequence> -    <cd:string value="textpopisku"/> +    <cd:string value="labeltext"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="nastavmarginalnilinky" file="core-rul.tex"> +<cd:command name="setupmarginrules" file="core-rul.tex">    <cd:sequence> -    <cd:string value="nastavmarginalnilinky"/> +    <cd:string value="setupmarginrules"/>    </cd:sequence>    <cd:arguments>      <cd:assignments> @@ -1523,9 +1519,9 @@    </cd:arguments>  </cd:command> -<cd:command name="marginalnilinka" type="environment"> +<cd:command name="marginrule" type="environment">    <cd:sequence> -    <cd:string value="marginalnilinka"/> +    <cd:string value="marginrule"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1534,9 +1530,9 @@    </cd:arguments>  </cd:command> -<cd:command name="marginalnilinka"> +<cd:command name="marginrule">    <cd:sequence> -    <cd:string value="marginalnilinka"/> +    <cd:string value="marginrule"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1546,9 +1542,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavsirkucary" file="core-rul.tex"> +<cd:command name="setuplinewidth" file="core-rul.tex">    <cd:sequence> -    <cd:string value="nastavsirkucary"/> +    <cd:string value="setuplinewidth"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1557,9 +1553,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavoramovani" file="core-rul.tex"> +<cd:command name="setupframed" file="core-rul.tex">    <cd:sequence> -    <cd:string value="nastavoramovani"/> +    <cd:string value="setupframed"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -1701,44 +1697,44 @@    </cd:arguments>  </cd:command> -<cd:command name="oramovani" file="core-rul.tex"> +<cd:command name="framed" file="core-rul.tex">    <cd:sequence> -    <cd:string value="oramovani"/> +    <cd:string value="framed"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="nastavoramovani"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="zaramovani" file="core-rul.tex"> +<cd:command name="inframed" file="core-rul.tex">    <cd:sequence> -    <cd:string value="zaramovani"/> +    <cd:string value="inframed"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="nastavoramovani"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="tenkelinky" file="core-rul.tex"> +<cd:command name="thinrules" file="core-rul.tex">    <cd:sequence> -    <cd:string value="tenkelinky"/> +    <cd:string value="thinrules"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes"> -      <cd:inherit name="nastavtenkelinky"/> +      <cd:inherit name="setupthinrules"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="nastavtenkelinky" file="core-rul.tex"> +<cd:command name="setupthinrules" file="core-rul.tex">    <cd:sequence> -    <cd:string value="nastavtenkelinky"/> +    <cd:string value="setupthinrules"/>    </cd:sequence>    <cd:arguments>      <cd:assignments> @@ -1795,49 +1791,49 @@    </cd:arguments>  </cd:command> -<cd:command name="vlasovalinka" file="core-rul.tex"> +<cd:command name="hairline" file="core-rul.tex">    <cd:sequence> -    <cd:string value="vlasovalinka"/> +    <cd:string value="hairline"/>    </cd:sequence>  </cd:command> -<cd:command name="tenkalinka" file="core-rul.tex"> +<cd:command name="thinrule" file="core-rul.tex">    <cd:sequence> -    <cd:string value="tenkalinka"/> +    <cd:string value="thinrule"/>    </cd:sequence>  </cd:command> -<cd:command name="definujoramovanytext" file="core-rul.tex"> +<cd:command name="defineframedtext" file="core-rul.tex">    <cd:sequence> -    <cd:string value="definujoramovanytext"/> +    <cd:string value="defineframedtext"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="nastavoramovanetexty"/> +      <cd:inherit name="setupframedtexts"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="definujoramovani" file="core-rul.tex"> +<cd:command name="defineframed" file="core-rul.tex">    <cd:sequence> -    <cd:string value="definujoramovani"/> +    <cd:string value="defineframed"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="nastavoramovanetexty"/> +      <cd:inherit name="setupframedtexts"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="nastavoramovanetexty" file="core-rul.tex"> +<cd:command name="setupframedtexts" file="core-rul.tex">    <cd:sequence> -    <cd:string value="nastavoramovanetexty"/> +    <cd:string value="setupframedtexts"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -1891,7 +1887,7 @@          <cd:constant type="nastred"/>          <cd:constant type="zadny"/>        </cd:parameter> -      <cd:inherit name="nastavoramovani"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -1908,7 +1904,7 @@        <cd:constant type="zadny"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="nastavoramovanetexty"/> +      <cd:inherit name="setupframedtexts"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -1919,28 +1915,26 @@    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="nastavoramovanetexty"/> +      <cd:inherit name="setupframedtexts"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="pozadi" type="environment"> +<cd:command name="background" type="environment">    <cd:sequence> -    <cd:string value="pozadi"/> +    <cd:string value="background"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="pozadi"> +<cd:command name="background">    <cd:sequence> -    <cd:string value="pozadi"/> +    <cd:string value="background"/>    </cd:sequence>  </cd:command> -<cd:command name="nastavpozadi" file="core-rul.tex"> +<cd:command name="setupbackground" file="core-rul.tex">    <cd:sequence> -    <cd:string value="nastavpozadi"/> +    <cd:string value="setupbackground"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -1966,40 +1960,40 @@          <cd:constant type="start"/>          <cd:constant type="stop"/>        </cd:parameter> -      <cd:inherit name="nastavoramovani"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="vyplnovelinky"> +<cd:command name="fillinrules">    <cd:sequence> -    <cd:string value="vyplnovelinky"/> +    <cd:string value="fillinrules"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="nastavvyplnovelinky"/> +      <cd:inherit name="setupfillinrules"/>      </cd:assignments>      <cd:content/>      <cd:content optional="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="vyplnenytext"> +<cd:command name="fillintext">    <cd:sequence> -    <cd:string value="vyplnenytext"/> +    <cd:string value="fillintext"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="nastavvyplnovelinky"/> +      <cd:inherit name="setupfillinrules"/>      </cd:assignments>      <cd:content/>      <cd:content optional="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="nastavvyplnovelinky" file="core-rul.tex"> +<cd:command name="setupfillinrules" file="core-rul.tex">    <cd:sequence> -    <cd:string value="nastavvyplnovelinky"/> +    <cd:string value="setupfillinrules"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -2042,21 +2036,21 @@    </cd:arguments>  </cd:command> -<cd:command name="vyplnovyradek"> +<cd:command name="fillinline">    <cd:sequence> -    <cd:string value="vyplnovyradek"/> +    <cd:string value="fillinline"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="nastavvyplnoveradky"/> +      <cd:inherit name="setupfillinlines"/>      </cd:assignments>      <cd:nothing/>    </cd:arguments>  </cd:command> -<cd:command name="nastavvyplnoveradky" file="core-rul.tex"> +<cd:command name="setupfillinlines" file="core-rul.tex">    <cd:sequence> -    <cd:string value="nastavvyplnoveradky"/> +    <cd:string value="setupfillinlines"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -2079,9 +2073,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavtextovelinky" file="core-rul.tex"> +<cd:command name="setuptextrules" file="core-rul.tex">    <cd:sequence> -    <cd:string value="nastavtextovelinky"/> +    <cd:string value="setuptextrules"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -2131,9 +2125,9 @@    </cd:arguments>  </cd:command> -<cd:command name="textovalinka" file="core-rul.tex"> +<cd:command name="textrule" file="core-rul.tex">    <cd:sequence> -    <cd:string value="textovalinka"/> +    <cd:string value="textrule"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2144,9 +2138,9 @@    </cd:arguments>  </cd:command> -<cd:command name="textovalinka" type="environment" file="core-rul.tex"> +<cd:command name="textrule" type="environment" file="core-rul.tex">    <cd:sequence> -    <cd:string value="textovalinka"/> +    <cd:string value="textrule"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2157,31 +2151,31 @@    </cd:arguments>  </cd:command> -<cd:command name="cernalinka" file="core-rul.tex"> +<cd:command name="blackrule" file="core-rul.tex">    <cd:sequence> -    <cd:string value="cernalinka"/> +    <cd:string value="blackrule"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="nastavcernelinky"/> +      <cd:inherit name="setupblackrules"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="cernelinky" file="core-rul.tex"> +<cd:command name="blackrules" file="core-rul.tex">    <cd:sequence> -    <cd:string value="cernelinky"/> +    <cd:string value="blackrules"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> -      <cd:inherit name="nastavcernelinky"/> +      <cd:inherit name="setupblackrules"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="nastavcernelinky" file="core-rul.tex"> +<cd:command name="setupblackrules" file="core-rul.tex">    <cd:sequence> -    <cd:string value="nastavcernelinky"/> +    <cd:string value="setupblackrules"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -2211,9 +2205,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definujprekryv" file="core-rul.tex"> +<cd:command name="defineoverlay" file="core-rul.tex">    <cd:sequence> -    <cd:string value="definujprekryv"/> +    <cd:string value="defineoverlay"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -2225,9 +2219,9 @@    </cd:arguments>  </cd:command> -<cd:command name="uzijmodul"> +<cd:command name="usemodule">    <cd:sequence> -    <cd:string value="uzijmodul"/> +    <cd:string value="usemodule"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -2247,9 +2241,9 @@    </cd:arguments>  </cd:command> -<cd:command name="zadnytest"> +<cd:command name="donttest">    <cd:sequence> -    <cd:string value="zadnytest"/> +    <cd:string value="donttest"/>    </cd:sequence>  </cd:command> @@ -2257,13 +2251,11 @@    <cd:sequence>      <cd:string value="localenvironment"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="nastavsystem" file="core-sys.tex"> +<cd:command name="setupsystem" file="core-sys.tex">    <cd:sequence> -    <cd:string value="nastavsystem"/> +    <cd:string value="setupsystem"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -2299,27 +2291,27 @@    </cd:arguments>  </cd:command> -<cd:command name="nizky" file="core-fnt.tex"> +<cd:command name="low" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="nizky"/> +    <cd:string value="low"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="vysoky" file="core-fnt.tex"> +<cd:command name="high" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="vysoky"/> +    <cd:string value="high"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="nivy" file="core-fnt.tex"> +<cd:command name="lohi" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="nivy"/> +    <cd:string value="lohi"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2330,9 +2322,9 @@    </cd:arguments>  </cd:command> -<cd:command name="ukazramecek"> +<cd:command name="showframe">    <cd:sequence> -    <cd:string value="ukazramecek"/> +    <cd:string value="showframe"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2343,45 +2335,45 @@    </cd:arguments>  </cd:command> -<cd:command name="zarovnanovlevo" file="core-spa.tex"> +<cd:command name="leftaligned" file="core-spa.tex">    <cd:sequence> -    <cd:string value="zarovnanovlevo"/> +    <cd:string value="leftaligned"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="zarovnanovpravo" file="core-spa.tex"> +<cd:command name="rightaligned" file="core-spa.tex">    <cd:sequence> -    <cd:string value="zarovnanovpravo"/> +    <cd:string value="rightaligned"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="zarovnanonastred" file="core-spa.tex"> +<cd:command name="midaligned" file="core-spa.tex">    <cd:sequence> -    <cd:string value="zarovnanonastred"/> +    <cd:string value="midaligned"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="slovovpravo" file="core-spa.tex"> +<cd:command name="wordright" file="core-spa.tex">    <cd:sequence> -    <cd:string value="slovovpravo"/> +    <cd:string value="wordright"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="naokraj" file="core-sec.tex"> +<cd:command name="inmargin" file="core-sec.tex">    <cd:sequence> -    <cd:string value="naokraj"/> +    <cd:string value="inmargin"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2394,9 +2386,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nadruhyokraj" file="page-mar.tex"> +<cd:command name="inothermargin" file="page-mar.tex">    <cd:sequence> -    <cd:string value="nadruhyokraj"/> +    <cd:string value="inothermargin"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2409,9 +2401,9 @@    </cd:arguments>  </cd:command> -<cd:command name="vlevo"> +<cd:command name="inleft">    <cd:sequence> -    <cd:string value="vlevo"/> +    <cd:string value="inleft"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2424,9 +2416,9 @@    </cd:arguments>  </cd:command> -<cd:command name="vpravo"> +<cd:command name="inright">    <cd:sequence> -    <cd:string value="vpravo"/> +    <cd:string value="inright"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2469,33 +2461,33 @@    </cd:arguments>  </cd:command> -<cd:command name="sloupec"> +<cd:command name="column">    <cd:sequence> -    <cd:string value="sloupec"/> +    <cd:string value="column"/>    </cd:sequence>  </cd:command> -<cd:command name="ukazpodpery" file="core-spa.tex"> +<cd:command name="showstruts" file="core-spa.tex">    <cd:sequence> -    <cd:string value="ukazpodpery"/> +    <cd:string value="showstruts"/>    </cd:sequence>  </cd:command> -<cd:command name="ukaznastaveni"> +<cd:command name="showsetups">    <cd:sequence> -    <cd:string value="ukaznastaveni"/> +    <cd:string value="showsetups"/>    </cd:sequence>  </cd:command> -<cd:command name="ukazvzhled"> +<cd:command name="showlayout">    <cd:sequence> -    <cd:string value="ukazvzhled"/> +    <cd:string value="showlayout"/>    </cd:sequence>  </cd:command> -<cd:command name="marginalnitext" file="page-mar.tex"> +<cd:command name="margintext" file="page-mar.tex">    <cd:sequence> -    <cd:string value="marginalnitext"/> +    <cd:string value="margintext"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2508,9 +2500,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavmarginalniblok" file="page-flt.tex"> +<cd:command name="setupmarginblocks" file="page-flt.tex">    <cd:sequence> -    <cd:string value="nastavmarginalniblok"/> +    <cd:string value="setupmarginblocks"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -2568,8 +2560,6 @@    <cd:sequence>      <cd:string value="marginblock"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="part" file="core-sec.tex"> @@ -2672,9 +2662,9 @@    </cd:arguments>  </cd:command> -<cd:command name="tref" file="core-ref.tex"> +<cd:command name="in" file="core-ref.tex">    <cd:sequence> -    <cd:string value="tref"/> +    <cd:string value="in"/>    </cd:sequence>    <cd:arguments>      <cd:content interactive="yes"/> @@ -2683,9 +2673,9 @@    </cd:arguments>  </cd:command> -<cd:command name="pref"> +<cd:command name="at">    <cd:sequence> -    <cd:string value="pref"/> +    <cd:string value="at"/>    </cd:sequence>    <cd:arguments>      <cd:content interactive="yes"/> @@ -2694,9 +2684,9 @@    </cd:arguments>  </cd:command> -<cd:command name="oref"> +<cd:command name="about">    <cd:sequence> -    <cd:string value="oref"/> +    <cd:string value="about"/>    </cd:sequence>    <cd:arguments>      <cd:content interactive="yes"/> @@ -2704,9 +2694,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nekde" file="core-ref.tex"> +<cd:command name="somewhere" file="core-ref.tex">    <cd:sequence> -    <cd:string value="nekde"/> +    <cd:string value="somewhere"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -2715,9 +2705,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastrane" file="core-ref.tex"> +<cd:command name="atpage" file="core-ref.tex">    <cd:sequence> -    <cd:string value="nastrane"/> +    <cd:string value="atpage"/>    </cd:sequence>    <cd:arguments>      <cd:reference/> @@ -2740,9 +2730,9 @@    </cd:arguments>  </cd:command> -<cd:command name="odkaznatext" file="core-ref.tex"> +<cd:command name="textreference" file="core-ref.tex">    <cd:sequence> -    <cd:string value="odkaznatext"/> +    <cd:string value="textreference"/>    </cd:sequence>    <cd:arguments>      <cd:reference/> @@ -2750,18 +2740,18 @@    </cd:arguments>  </cd:command> -<cd:command name="odkaznastranu" file="core-ref.tex"> +<cd:command name="pagereference" file="core-ref.tex">    <cd:sequence> -    <cd:string value="odkaznastranu"/> +    <cd:string value="pagereference"/>    </cd:sequence>    <cd:arguments>      <cd:reference/>    </cd:arguments>  </cd:command> -<cd:command name="odkaz" file="core-ref.tex"> +<cd:command name="reference" file="core-ref.tex">    <cd:sequence> -    <cd:string value="odkaz"/> +    <cd:string value="reference"/>    </cd:sequence>    <cd:arguments>      <cd:reference/> @@ -2769,9 +2759,9 @@    </cd:arguments>  </cd:command> -<cd:command name="uzijodkazy" file="core-ref.tex"> +<cd:command name="usereferences" file="core-ref.tex">    <cd:sequence> -    <cd:string value="uzijodkazy"/> +    <cd:string value="usereferences"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -2780,9 +2770,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definujodkaz" file="core-ref.tex"> +<cd:command name="definereference" file="core-ref.tex">    <cd:sequence> -    <cd:string value="definujodkaz"/> +    <cd:string value="definereference"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -2792,9 +2782,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definujformatodkazu" file="core-ref.tex"> +<cd:command name="definereferenceformat" file="core-ref.tex">    <cd:sequence> -    <cd:string value="definujformatodkazu"/> +    <cd:string value="definereferenceformat"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -2839,9 +2829,9 @@    </cd:arguments>  </cd:command> -<cd:command name="jdidolu" file="core-spa.tex"> +<cd:command name="godown" file="core-spa.tex">    <cd:sequence> -    <cd:string value="jdidolu"/> +    <cd:string value="godown"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -2850,15 +2840,15 @@    </cd:arguments>  </cd:command> -<cd:command name="bilemisto" file="core-spa.tex"> +<cd:command name="whitespace" file="core-spa.tex">    <cd:sequence> -    <cd:string value="bilemisto"/> +    <cd:string value="whitespace"/>    </cd:sequence>  </cd:command> -<cd:command name="zadnebilemisto" file="core-spa.tex"> +<cd:command name="nowhitespace" file="core-spa.tex">    <cd:sequence> -    <cd:string value="zadnebilemisto"/> +    <cd:string value="nowhitespace"/>    </cd:sequence>  </cd:command> @@ -2868,15 +2858,15 @@    </cd:sequence>  </cd:command> -<cd:command name="mezera" file="syst-pln.tex"> +<cd:command name="space" file="syst-pln.tex">    <cd:sequence> -    <cd:string value="mezera"/> +    <cd:string value="space"/>    </cd:sequence>  </cd:command> -<cd:command name="tvrdemezery" file="core-spa.tex"> +<cd:command name="fixedspaces" file="core-spa.tex">    <cd:sequence> -    <cd:string value="tvrdemezery"/> +    <cd:string value="fixedspaces"/>    </cd:sequence>  </cd:command> @@ -2891,21 +2881,21 @@    </cd:arguments>  </cd:command> -<cd:command name="zadnamezera" file="core-spa.tex"> +<cd:command name="nospace" file="core-spa.tex">    <cd:sequence> -    <cd:string value="zadnamezera"/> +    <cd:string value="nospace"/>    </cd:sequence>  </cd:command> -<cd:command name="zhustene" file="core-spa.tex"> +<cd:command name="packed" file="core-spa.tex">    <cd:sequence> -    <cd:string value="zhustene"/> +    <cd:string value="packed"/>    </cd:sequence>  </cd:command> -<cd:command name="nastavpopisy" file="core-des.tex"> +<cd:command name="setupdescriptions" file="core-des.tex">    <cd:sequence> -    <cd:string value="nastavpopisy"/> +    <cd:string value="setupdescriptions"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -3004,23 +2994,23 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavvycty" file="core-des.tex"> +<cd:command name="setupenumerations" file="core-des.tex">    <cd:sequence> -    <cd:string value="nastavvycty"/> +    <cd:string value="setupenumerations"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes">        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="definujpopis"/> +      <cd:inherit name="definedescription"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="definujvycet" file="core-des.tex"> +<cd:command name="defineenumeration" file="core-des.tex">    <cd:sequence> -    <cd:string value="definujvycet"/> +    <cd:string value="defineenumeration"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -3030,7 +3020,7 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="nastavvycty"/> +      <cd:inherit name="setupenumerations"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -3048,20 +3038,18 @@    <cd:sequence>      <cd:variable value="enumeration"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="definujpopis" file="core-des.tex"> +<cd:command name="definedescription" file="core-des.tex">    <cd:sequence> -    <cd:string value="definujpopis"/> +    <cd:string value="definedescription"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="nastavpopisy"/> +      <cd:inherit name="setupdescriptions"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -3085,9 +3073,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavodsazovani" file="core-des.tex"> +<cd:command name="setupindentations" file="core-des.tex">    <cd:sequence> -    <cd:string value="nastavodsazovani"/> +    <cd:string value="setupindentations"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -3140,16 +3128,16 @@    </cd:arguments>  </cd:command> -<cd:command name="definujodsazovani" file="core-des.tex"> +<cd:command name="defineindenting" file="core-des.tex">    <cd:sequence> -    <cd:string value="definujodsazovani"/> +    <cd:string value="defineindenting"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="nastavodsazovani"/> +      <cd:inherit name="setupindentations"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -3163,9 +3151,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definujpopisek" file="core-des.tex"> +<cd:command name="definelabel" file="core-des.tex">    <cd:sequence> -    <cd:string value="definujpopisek"/> +    <cd:string value="definelabel"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3219,9 +3207,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavsloupce" file="page-mul.tex"> +<cd:command name="setupcolumns" file="page-mul.tex">    <cd:sequence> -    <cd:string value="nastavsloupce"/> +    <cd:string value="setupcolumns"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -3273,7 +3261,7 @@          <cd:constant type="vlevo"/>          <cd:constant type="vpravo"/>        </cd:parameter> -      <cd:inherit name="nastavoramovani"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -3284,14 +3272,14 @@    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="nastavsloupce"/> +      <cd:inherit name="setupcolumns"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="definujtext" file="page-txt.tex"> +<cd:command name="definetext" file="page-txt.tex">    <cd:sequence> -    <cd:string value="definujtext"/> +    <cd:string value="definetext"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3313,9 +3301,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavzahlavi" file="page-txt.tex"> +<cd:command name="setupheader" file="page-txt.tex">    <cd:sequence> -    <cd:string value="nastavzahlavi"/> +    <cd:string value="setupheader"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -3384,77 +3372,77 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavupati" file="page-txt.tex"> +<cd:command name="setupfooter" file="page-txt.tex">    <cd:sequence> -    <cd:string value="nastavupati"/> +    <cd:string value="setupfooter"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> -      <cd:inherit name="nastavzahlavi"/> +      <cd:inherit name="setupheader"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="nastavzahlavi"/> +      <cd:inherit name="setupheader"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="nastavtext" file="page-txt.tex"> +<cd:command name="setuptext" file="page-txt.tex">    <cd:sequence> -    <cd:string value="nastavtext"/> +    <cd:string value="setuptext"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> -      <cd:inherit name="nastavzahlavi"/> +      <cd:inherit name="setupheader"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="nastavzahlavi"/> +      <cd:inherit name="setupheader"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="nastavhorejsek" file="page-txt.tex"> +<cd:command name="setuptop" file="page-txt.tex">    <cd:sequence> -    <cd:string value="nastavhorejsek"/> +    <cd:string value="setuptop"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> -      <cd:inherit name="nastavzahlavi"/> +      <cd:inherit name="setupheader"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="nastavzahlavi"/> +      <cd:inherit name="setupheader"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="nastavspodek" file="page-txt.tex"> +<cd:command name="setupbottom" file="page-txt.tex">    <cd:sequence> -    <cd:string value="nastavspodek"/> +    <cd:string value="setupbottom"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> -      <cd:inherit name="nastavzahlavi"/> +      <cd:inherit name="setupheader"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="nastavzahlavi"/> +      <cd:inherit name="setupheader"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="zadnezahlaviaupati" file="page-txt.tex"> +<cd:command name="noheaderandfooterlines" file="page-txt.tex">    <cd:sequence> -    <cd:string value="zadnezahlaviaupati"/> +    <cd:string value="noheaderandfooterlines"/>    </cd:sequence>  </cd:command> -<cd:command name="zadnehorniadolniradky" file="page-txt.tex"> +<cd:command name="notopandbottomlines" file="page-txt.tex">    <cd:sequence> -    <cd:string value="zadnehorniadolniradky"/> +    <cd:string value="notopandbottomlines"/>    </cd:sequence>  </cd:command> -<cd:command name="nastavtextyzahlavi" file="page-txt.tex"> +<cd:command name="setupheadertexts" file="page-txt.tex">    <cd:sequence> -    <cd:string value="nastavtextyzahlavi"/> +    <cd:string value="setupheadertexts"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -3479,9 +3467,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavtextyupati" file="page-txt.tex"> +<cd:command name="setupfootertexts" file="page-txt.tex">    <cd:sequence> -    <cd:string value="nastavtextyupati"/> +    <cd:string value="setupfootertexts"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -3506,9 +3494,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavtexttexty" file="page-txt.tex"> +<cd:command name="setuptexttexts" file="page-txt.tex">    <cd:sequence> -    <cd:string value="nastavtexttexty"/> +    <cd:string value="setuptexttexts"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -3533,9 +3521,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavhornitexty" file="page-txt.tex"> +<cd:command name="setuptoptexts" file="page-txt.tex">    <cd:sequence> -    <cd:string value="nastavhornitexty"/> +    <cd:string value="setuptoptexts"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -3560,9 +3548,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavdolnitexty" file="page-txt.tex"> +<cd:command name="setupbottomtexts" file="page-txt.tex">    <cd:sequence> -    <cd:string value="nastavdolnitexty"/> +    <cd:string value="setupbottomtexts"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -3587,9 +3575,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definujznaceni" file="core-mar.tex"> +<cd:command name="definemarking" file="core-mar.tex">    <cd:sequence> -    <cd:string value="definujznaceni"/> +    <cd:string value="definemarking"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3601,9 +3589,9 @@    </cd:arguments>  </cd:command> -<cd:command name="propojeneznaceni" file="core-sec.tex"> +<cd:command name="couplemarking" file="core-sec.tex">    <cd:sequence> -    <cd:string value="propojeneznaceni"/> +    <cd:string value="couplemarking"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3615,9 +3603,9 @@    </cd:arguments>  </cd:command> -<cd:command name="rozpojeneznaceni" file="core-mar.tex"> +<cd:command name="decouplemarking" file="core-mar.tex">    <cd:sequence> -    <cd:string value="rozpojeneznaceni"/> +    <cd:string value="decouplemarking"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3626,9 +3614,9 @@    </cd:arguments>  </cd:command> -<cd:command name="resetznaceni" file="core-mar.tex"> +<cd:command name="resetmarking" file="core-mar.tex">    <cd:sequence> -    <cd:string value="resetznaceni"/> +    <cd:string value="resetmarking"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3637,9 +3625,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavznaceni" file="core-mar.tex"> +<cd:command name="setupmarking" file="core-mar.tex">    <cd:sequence> -    <cd:string value="nastavznaceni"/> +    <cd:string value="setupmarking"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3661,9 +3649,9 @@    </cd:arguments>  </cd:command> -<cd:command name="znaceni" file="core-mar.tex"> +<cd:command name="marking" file="core-mar.tex">    <cd:sequence> -    <cd:string value="znaceni"/> +    <cd:string value="marking"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3673,9 +3661,9 @@    </cd:arguments>  </cd:command> -<cd:command name="ziskejznaceni" file="core-mar.tex"> +<cd:command name="getmarking" file="core-mar.tex">    <cd:sequence> -    <cd:string value="ziskejznaceni"/> +    <cd:string value="getmarking"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3692,18 +3680,18 @@    </cd:arguments>  </cd:command> -<cd:command name="zadneznaceni" file="core-mar.tex"> +<cd:command name="nomarking" file="core-mar.tex">    <cd:sequence> -    <cd:string value="zadneznaceni"/> +    <cd:string value="nomarking"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="nastavvzhled" file="page-ini.tex"> +<cd:command name="setuplayout" file="page-ini.tex">    <cd:sequence> -    <cd:string value="nastavvzhled"/> +    <cd:string value="setuplayout"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -3865,9 +3853,9 @@    </cd:arguments>  </cd:command> -<cd:command name="prizpusobvzhled" file="page-lay.tex"> +<cd:command name="adaptlayout" file="page-lay.tex">    <cd:sequence> -    <cd:string value="prizpusobvzhled"/> +    <cd:string value="adaptlayout"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -3885,27 +3873,27 @@    </cd:arguments>  </cd:command> -<cd:command name="ukazmrizku" file="page-ini.tex"> +<cd:command name="showgrid" file="page-ini.tex">    <cd:sequence> -    <cd:string value="ukazmrizku"/> +    <cd:string value="showgrid"/>    </cd:sequence>  </cd:command> -<cd:command name="umistinamrizku" file="core-grd.tex"> +<cd:command name="placeongrid" file="core-grd.tex">    <cd:sequence> -    <cd:string value="umistinamrizku"/> +    <cd:string value="placeongrid"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> -      <cd:inherit name="premistinamrizku"/> +      <cd:inherit name="moveongrid"/>      </cd:keywords>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="premistinamrizku" file="core-grd.tex"> +<cd:command name="moveongrid" file="core-grd.tex">    <cd:sequence> -    <cd:string value="premistinamrizku"/> +    <cd:string value="moveongrid"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -3931,18 +3919,18 @@    </cd:arguments>  </cd:command> -<cd:command name="projekt" type="environment"> +<cd:command name="project" type="environment">    <cd:sequence> -    <cd:string value="projekt"/> +    <cd:string value="project"/>    </cd:sequence>    <cd:arguments>      <cd:file/>    </cd:arguments>  </cd:command> -<cd:command name="prostredi" type="environment"> +<cd:command name="environment" type="environment">    <cd:sequence> -    <cd:string value="prostredi"/> +    <cd:string value="environment"/>    </cd:sequence>    <cd:arguments>      <cd:file/> @@ -3958,24 +3946,24 @@    </cd:arguments>  </cd:command> -<cd:command name="komponenta" type="environment"> +<cd:command name="component" type="environment">    <cd:sequence> -    <cd:string value="komponenta"/> +    <cd:string value="component"/>    </cd:sequence>    <cd:arguments>      <cd:file/>    </cd:arguments>  </cd:command> -<cd:command name="zadnedalsisoubory"> +<cd:command name="nomorefiles">    <cd:sequence> -    <cd:string value="zadnedalsisoubory"/> +    <cd:string value="nomorefiles"/>    </cd:sequence>  </cd:command> -<cd:command name="nastavmeziradkovoumezeru"> +<cd:command name="setupinterlinespace">    <cd:sequence> -    <cd:string value="nastavmeziradkovoumezeru"/> +    <cd:string value="setupinterlinespace"/>    </cd:sequence>    <cd:arguments>      <cd:choice> @@ -4008,9 +3996,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavcislovanistran" file="page-num.tex"> +<cd:command name="setuppagenumbering" file="page-num.tex">    <cd:sequence> -    <cd:string value="nastavcislovanistran"/> +    <cd:string value="setuppagenumbering"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4090,9 +4078,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavzuzeni" file="core-spa.tex"> +<cd:command name="setupnarrower" file="core-spa.tex">    <cd:sequence> -    <cd:string value="nastavzuzeni"/> +    <cd:string value="setupnarrower"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4109,9 +4097,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definuj" file="syst-ext.tex"> +<cd:command name="define" file="syst-ext.tex">    <cd:sequence> -    <cd:string value="definuj"/> +    <cd:string value="define"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -4122,18 +4110,18 @@    </cd:arguments>  </cd:command> -<cd:command name="uzijprikazy" file="core-sys.tex"> +<cd:command name="usecommands" file="core-sys.tex">    <cd:sequence> -    <cd:string value="uzijprikazy"/> +    <cd:string value="usecommands"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="definujstartstop" file="core-sys.tex"> +<cd:command name="definestartstop" file="core-sys.tex">    <cd:sequence> -    <cd:string value="definujstartstop"/> +    <cd:string value="definestartstop"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -4163,9 +4151,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavnadpisy" file="core-sec.tex"> +<cd:command name="setupheads" file="core-sec.tex">    <cd:sequence> -    <cd:string value="nastavnadpisy"/> +    <cd:string value="setupheads"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4215,9 +4203,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavpopisky" file="page-flt.tex"> +<cd:command name="setupcaptions" file="page-flt.tex">    <cd:sequence> -    <cd:string value="nastavpopisky"/> +    <cd:string value="setupcaptions"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4296,23 +4284,23 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavpopisek" file="page-flt.tex"> +<cd:command name="setupcaption" file="page-flt.tex">    <cd:sequence> -    <cd:string value="nastavpopisek"/> +    <cd:string value="setupcaption"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="nastavpopisky"/> +      <cd:inherit name="setupcaptions"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="nastavplvouciobjekty" file="page-flt.tex"> +<cd:command name="setupfloats" file="page-flt.tex">    <cd:sequence> -    <cd:string value="nastavplvouciobjekty"/> +    <cd:string value="setupfloats"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4389,14 +4377,14 @@          <cd:constant type="normalni"/>          <cd:constant type="radek"/>        </cd:parameter> -      <cd:inherit name="nastavoramovani"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="nastavdeleniplvoucichobjektu" file="page-flt.tex"> +<cd:command name="setupfloatsplitting" file="page-flt.tex">    <cd:sequence> -    <cd:string value="nastavdeleniplvoucichobjektu"/> +    <cd:string value="setupfloatsplitting"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4414,22 +4402,22 @@    </cd:arguments>  </cd:command> -<cd:command name="rozdelplvouciobjekt" file="page-flt.tex"> +<cd:command name="splitfloat" file="page-flt.tex">    <cd:sequence> -    <cd:string value="rozdelplvouciobjekt"/> +    <cd:string value="splitfloat"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="nastavdeleniplvoucichobjektu"/> +      <cd:inherit name="setupfloatsplitting"/>      </cd:assignments>      <cd:content/>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="nastavumisteniprotejsku" file="page-ini.tex"> +<cd:command name="setupoppositeplacing" file="page-ini.tex">    <cd:sequence> -    <cd:string value="nastavumisteniprotejsku"/> +    <cd:string value="setupoppositeplacing"/>    </cd:sequence>    <cd:arguments>      <cd:assignments> @@ -4454,13 +4442,11 @@    <cd:sequence>      <cd:string value="opposite"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="nastavdelitko" file="core-mis.tex"> +<cd:command name="setuphyphenmark" file="core-mis.tex">    <cd:sequence> -    <cd:string value="nastavdelitko"/> +    <cd:string value="setuphyphenmark"/>    </cd:sequence>    <cd:arguments>      <cd:assignments> @@ -4478,9 +4464,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavumistovani" file="page-lyr.tex"> +<cd:command name="setuppositioning" file="page-lyr.tex">    <cd:sequence> -    <cd:string value="nastavumistovani"/> +    <cd:string value="setuppositioning"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4523,13 +4509,11 @@    <cd:sequence>      <cd:string value="positioning"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="mrizka" file="core-spa.tex"> +<cd:command name="grid" file="core-spa.tex">    <cd:sequence> -    <cd:string value="mrizka"/> +    <cd:string value="grid"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4584,9 +4568,9 @@    </cd:arguments>  </cd:command> -<cd:command name="strana" file="page-ini.tex"> +<cd:command name="page" file="page-ini.tex">    <cd:sequence> -    <cd:string value="strana"/> +    <cd:string value="page"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -4611,9 +4595,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavodkazovani" file="core-ref.tex"> +<cd:command name="setupreferencing" file="core-ref.tex">    <cd:sequence> -    <cd:string value="nastavodkazovani"/> +    <cd:string value="setupreferencing"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4667,9 +4651,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavurl" file="core-ref.tex"> +<cd:command name="setupurl" file="core-ref.tex">    <cd:sequence> -    <cd:string value="nastavurl"/> +    <cd:string value="setupurl"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4697,9 +4681,9 @@    </cd:arguments>  </cd:command> -<cd:command name="zapisdoseznamuodkazu" file="core-lst.tex"> +<cd:command name="writetoreferencelist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="zapisdoseznamuodkazu"/> +    <cd:string value="writetoreferencelist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -4710,9 +4694,9 @@    </cd:arguments>  </cd:command> -<cd:command name="umistiseznamodkazu"> +<cd:command name="placereferencelist">    <cd:sequence> -    <cd:string value="umistiseznamodkazu"/> +    <cd:string value="placereferencelist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -4721,23 +4705,23 @@    </cd:arguments>  </cd:command> -<cd:command name="definujseznamodkazu" file="core-lst.tex"> +<cd:command name="definereferencelist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="definujseznamodkazu"/> +    <cd:string value="definereferencelist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="nastavseznamodkazu"/> +      <cd:inherit name="setupreferencelist"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="nastavseznamodkazu" file="core-lst.tex"> +<cd:command name="setupreferencelist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="nastavseznamodkazu"/> +    <cd:string value="setupreferencelist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -4767,9 +4751,9 @@    </cd:arguments>  </cd:command> -<cd:command name="zapisdoseznamu" file="core-lst.tex"> +<cd:command name="writetolist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="zapisdoseznamu"/> +    <cd:string value="writetolist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -4781,9 +4765,9 @@    </cd:arguments>  </cd:command> -<cd:command name="zapismeziseznam" file="core-lst.tex"> +<cd:command name="writebetweenlist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="zapismeziseznam"/> +    <cd:string value="writebetweenlist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -4794,9 +4778,9 @@    </cd:arguments>  </cd:command> -<cd:command name="zadnyseznam" file="core-lst.tex"> +<cd:command name="nolist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="zadnyseznam"/> +    <cd:string value="nolist"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -4815,51 +4799,51 @@    </cd:arguments>  </cd:command> -<cd:command name="umistiseznam" file="core-lst.tex"> +<cd:command name="placelist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="umistiseznam"/> +    <cd:string value="placelist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes">        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="nastavseznam"/> +      <cd:inherit name="setuplist"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stanovcharakteristickuseznamu" file="core-lst.tex"> +<cd:command name="determinelistcharacteristics" file="core-lst.tex">    <cd:sequence> -    <cd:string value="stanovcharakteristickuseznamu"/> +    <cd:string value="determinelistcharacteristics"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes">        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="nastavseznam"/> +      <cd:inherit name="setuplist"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="umistikombinovanyseznam" file="core-lst.tex"> +<cd:command name="placecombinedlist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="umistikombinovanyseznam"/> +    <cd:string value="placecombinedlist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="nastavkombinovanyseznam"/> +      <cd:inherit name="setupcombinedlist"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="definujseznam" file="core-lst.tex"> +<cd:command name="definelist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="definujseznam"/> +    <cd:string value="definelist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -4869,14 +4853,14 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="nastavseznam"/> +      <cd:inherit name="setuplist"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="nastavseznam" file="core-lst.tex"> +<cd:command name="setuplist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="nastavseznam"/> +    <cd:string value="setuplist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -5047,14 +5031,14 @@        <cd:parameter name="maxsirka">          <cd:constant type="cd:dimension"/>        </cd:parameter> -      <cd:inherit name="oramovani"/> +      <cd:inherit name="framed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="definujkombinovanyseznam" file="core-lst.tex"> +<cd:command name="definecombinedlist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="definujkombinovanyseznam"/> +    <cd:string value="definecombinedlist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -5064,14 +5048,14 @@        <cd:constant type="cd:list"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="nastavkombinovanyseznam"/> +      <cd:inherit name="setupcombinedlist"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="nastavkombinovanyseznam" file="core-lst.tex"> +<cd:command name="setupcombinedlist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="nastavkombinovanyseznam"/> +    <cd:string value="setupcombinedlist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -5086,12 +5070,12 @@          <cd:constant type="cd:section"/>          <cd:constant type="aktualni"/>        </cd:parameter> -      <cd:inherit name="nastavseznam"/> +      <cd:inherit name="setuplist"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="umistikombinovanyseznam" generated="yes" file="core-lst.tex"> +<cd:command name="placecombinedlist" generated="yes" file="core-lst.tex">    <cd:sequence>      <cd:string value="umisti"/>      <cd:variable value="combinedlist"/> @@ -5101,7 +5085,7 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="nastavkombinovanyseznam"/> +      <cd:inherit name="setupcombinedlist"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -5116,14 +5100,14 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="nastavkombinovanyseznam"/> +      <cd:inherit name="setupcombinedlist"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="nastavcislovani" file="core-num.tex"> +<cd:command name="setupnumbering" file="core-num.tex">    <cd:sequence> -    <cd:string value="nastavcislovani"/> +    <cd:string value="setupnumbering"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -5199,18 +5183,18 @@    </cd:arguments>  </cd:command> -<cd:command name="publikace" file="core-mis.tex"> +<cd:command name="publication" file="core-mis.tex">    <cd:sequence> -    <cd:string value="publikace"/> +    <cd:string value="publication"/>    </cd:sequence>    <cd:arguments>      <cd:reference/>    </cd:arguments>  </cd:command> -<cd:command name="nastavpublikace" file="core-mis.tex"> +<cd:command name="setuppublications" file="core-mis.tex">    <cd:sequence> -    <cd:string value="nastavpublikace"/> +    <cd:string value="setuppublications"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -5218,14 +5202,14 @@          <cd:constant type="apa"/>          <cd:constant type="normalni"/>        </cd:parameter> -      <cd:inherit name="nastavvycty"/> +      <cd:inherit name="setupenumerations"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="nastavradky" file="page-lin.tex"> +<cd:command name="setuplines" file="page-lin.tex">    <cd:sequence> -    <cd:string value="nastavradky"/> +    <cd:string value="setuplines"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -5252,13 +5236,11 @@    <cd:sequence>      <cd:string value="lines"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="nastavcislovaniodstavcu" file="page-lin.tex"> +<cd:command name="setupparagraphnumbering" file="page-lin.tex">    <cd:sequence> -    <cd:string value="nastavcislovaniodstavcu"/> +    <cd:string value="setupparagraphnumbering"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -5285,9 +5267,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavcislovaniradku" file="page-lin.tex"> +<cd:command name="setuplinenumbering" file="page-lin.tex">    <cd:sequence> -    <cd:string value="nastavcislovaniradku"/> +    <cd:string value="setuplinenumbering"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -5353,27 +5335,27 @@    </cd:arguments>  </cd:command> -<cd:command name="nejakyradek" file="page-lin.tex"> +<cd:command name="someline" file="page-lin.tex">    <cd:sequence> -    <cd:string value="nejakyradek"/> +    <cd:string value="someline"/>    </cd:sequence>    <cd:arguments>      <cd:reference/>    </cd:arguments>  </cd:command> -<cd:command name="vradku" file="page-lin.tex"> +<cd:command name="inline" file="page-lin.tex">    <cd:sequence> -    <cd:string value="vradku"/> +    <cd:string value="inline"/>    </cd:sequence>    <cd:arguments>      <cd:reference/>    </cd:arguments>  </cd:command> -<cd:command name="nastavmarginalie" file="page-mar.tex"> +<cd:command name="setupinmargin" file="page-mar.tex">    <cd:sequence> -    <cd:string value="nastavmarginalie"/> +    <cd:string value="setupinmargin"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -5432,14 +5414,14 @@          <cd:constant type="ano"/>          <cd:constant type="ne"/>        </cd:parameter> -      <cd:inherit name="nastavoramovani"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="nastavcislostrany" file="page-num.tex"> +<cd:command name="setuppagenumber" file="page-num.tex">    <cd:sequence> -    <cd:string value="nastavcislostrany"/> +    <cd:string value="setuppagenumber"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -5455,9 +5437,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavpodcislostrany" file="page-num.tex"> +<cd:command name="setupsubpagenumber" file="page-num.tex">    <cd:sequence> -    <cd:string value="nastavpodcislostrany"/> +    <cd:string value="setupsubpagenumber"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -5474,9 +5456,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavpreskok"> +<cd:command name="setupblank">    <cd:sequence> -    <cd:string value="nastavpreskok"/> +    <cd:string value="setupblank"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -5493,23 +5475,23 @@    </cd:arguments>  </cd:command> -<cd:command name="definujpreskok" file="core-spa.tex"> +<cd:command name="defineblank" file="core-spa.tex">    <cd:sequence> -    <cd:string value="definujpreskok"/> +    <cd:string value="defineblank"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:keywords> -      <cd:inherit name="nastavpreskok"/> +      <cd:inherit name="setupblank"/>      </cd:keywords>    </cd:arguments>  </cd:command> -<cd:command name="definujvelikostpapiru" file="page-lay.tex"> +<cd:command name="definepapersize" file="page-lay.tex">    <cd:sequence> -    <cd:string value="definujvelikostpapiru"/> +    <cd:string value="definepapersize"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -5570,9 +5552,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavvelikostpapiru" file="page-lay.tex"> +<cd:command name="setuppapersize" file="page-lay.tex">    <cd:sequence> -    <cd:string value="nastavvelikostpapiru"/> +    <cd:string value="setuppapersize"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -5610,9 +5592,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavusporadani" file="page-imp.tex"> +<cd:command name="setuparranging" file="page-imp.tex">    <cd:sequence> -    <cd:string value="nastavusporadani"/> +    <cd:string value="setuparranging"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -5639,26 +5621,26 @@    </cd:arguments>  </cd:command> -<cd:command name="ukazvytisk"> +<cd:command name="showprint">    <cd:sequence> -    <cd:string value="ukazvytisk"/> +    <cd:string value="showprint"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> -      <cd:inherit name="nastavvelikostpapiru"/> +      <cd:inherit name="setuppapersize"/>      </cd:keywords>      <cd:keywords list="yes"> -      <cd:inherit name="nastavvelikostpapiru"/> +      <cd:inherit name="setuppapersize"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="nastavvzhled"/> +      <cd:inherit name="setuplayout"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="definujlogo" file="page-log.tex"> +<cd:command name="definelogo" file="page-log.tex">    <cd:sequence> -    <cd:string value="definujlogo"/> +    <cd:string value="definelogo"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -5694,9 +5676,9 @@    </cd:arguments>  </cd:command> -<cd:command name="umistiloga" file="page-log.tex"> +<cd:command name="placelogos" file="page-log.tex">    <cd:sequence> -    <cd:string value="umistiloga"/> +    <cd:string value="placelogos"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -5705,9 +5687,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavbilamista"> +<cd:command name="setupwhitespace">    <cd:sequence> -    <cd:string value="nastavbilamista"/> +    <cd:string value="setupwhitespace"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -5723,9 +5705,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavodsazovani"> +<cd:command name="setupindenting">    <cd:sequence> -    <cd:string value="nastavodsazovani"/> +    <cd:string value="setupindenting"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -5740,23 +5722,23 @@    </cd:arguments>  </cd:command> -<cd:command name="definujbloksekce" file="core-sec.tex"> +<cd:command name="definesectionblock" file="core-sec.tex">    <cd:sequence> -    <cd:string value="definujbloksekce"/> +    <cd:string value="definesectionblock"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="nastavbloksekce"/> +      <cd:inherit name="setupsectionblock"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="nastavbloksekce" file="core-sec.tex"> +<cd:command name="setupsectionblock" file="core-sec.tex">    <cd:sequence> -    <cd:string value="nastavbloksekce"/> +    <cd:string value="setupsectionblock"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -5781,9 +5763,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definujsekci" file="core-sec.tex"> +<cd:command name="definesection" file="core-sec.tex">    <cd:sequence> -    <cd:string value="definujsekci"/> +    <cd:string value="definesection"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -5792,9 +5774,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavsekci" file="core-sec.tex"> +<cd:command name="setupsection" file="core-sec.tex">    <cd:sequence> -    <cd:string value="nastavsekci"/> +    <cd:string value="setupsection"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -5819,9 +5801,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavnadpis" file="core-sec.tex"> +<cd:command name="setuphead" file="core-sec.tex">    <cd:sequence> -    <cd:string value="nastavnadpis"/> +    <cd:string value="setuphead"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -5958,14 +5940,14 @@          <cd:constant type="ano"/>          <cd:constant type="ne"/>        </cd:parameter> -      <cd:inherit name="nastavnadpisy"/> +      <cd:inherit name="setupheads"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="nastavcislonadpisu" file="core-sec.tex"> +<cd:command name="setupheadnumber" file="core-sec.tex">    <cd:sequence> -    <cd:string value="nastavcislonadpisu"/> +    <cd:string value="setupheadnumber"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -5979,9 +5961,9 @@    </cd:arguments>  </cd:command> -<cd:command name="cislonadpisu"> +<cd:command name="headnumber">    <cd:sequence> -    <cd:string value="cislonadpisu"/> +    <cd:string value="headnumber"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -5990,9 +5972,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stanovcislonadpisu" file="core-sec.tex"> +<cd:command name="determineheadnumber" file="core-sec.tex">    <cd:sequence> -    <cd:string value="stanovcislonadpisu"/> +    <cd:string value="determineheadnumber"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6001,9 +5983,9 @@    </cd:arguments>  </cd:command> -<cd:command name="aktualnicislonadpisu" file="core-sec.tex"> +<cd:command name="currentheadnumber" file="core-sec.tex">    <cd:sequence> -    <cd:string value="aktualnicislonadpisu"/> +    <cd:string value="currentheadnumber"/>    </cd:sequence>  </cd:command> @@ -6014,9 +5996,9 @@    </cd:sequence>  </cd:command> -<cd:command name="definujnadpis" file="core-sec.tex"> +<cd:command name="definehead" file="core-sec.tex">    <cd:sequence> -    <cd:string value="definujnadpis"/> +    <cd:string value="definehead"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6196,27 +6178,27 @@    </cd:arguments>  </cd:command> -<cd:command name="polozka"> +<cd:command name="item">    <cd:sequence> -    <cd:string value="polozka"/> +    <cd:string value="item"/>    </cd:sequence>    <cd:arguments>      <cd:reference optional="yes" list="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="spodek"> +<cd:command name="but">    <cd:sequence> -    <cd:string value="spodek"/> +    <cd:string value="but"/>    </cd:sequence>    <cd:arguments>      <cd:reference interactive="exclusive"/>    </cd:arguments>  </cd:command> -<cd:command name="pol"> +<cd:command name="its">    <cd:sequence> -    <cd:string value="pol"/> +    <cd:string value="its"/>    </cd:sequence>    <cd:arguments>      <cd:reference optional="yes" list="yes"/> @@ -6232,18 +6214,18 @@    </cd:arguments>  </cd:command> -<cd:command name="nadpis"> +<cd:command name="head">    <cd:sequence> -    <cd:string value="nadpis"/> +    <cd:string value="head"/>    </cd:sequence>    <cd:arguments>      <cd:reference optional="yes" list="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="okr"> +<cd:command name="mar">    <cd:sequence> -    <cd:string value="okr"/> +    <cd:string value="mar"/>    </cd:sequence>    <cd:arguments>      <cd:reference optional="yes" list="yes"/> @@ -6275,9 +6257,9 @@    </cd:sequence>  </cd:command> -<cd:command name="definujrejstrik" file="core-reg.tex"> +<cd:command name="defineregister" file="core-reg.tex">    <cd:sequence> -    <cd:string value="definujrejstrik"/> +    <cd:string value="defineregister"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6289,9 +6271,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavrejstrik" file="core-reg.tex"> +<cd:command name="setupregister" file="core-reg.tex">    <cd:sequence> -    <cd:string value="nastavrejstrik"/> +    <cd:string value="setupregister"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6434,9 +6416,9 @@    </cd:arguments>  </cd:command> -<cd:command name="zapisdorejstriku" file="core-reg.tex"> +<cd:command name="writetoregister" file="core-reg.tex">    <cd:sequence> -    <cd:string value="zapisdorejstriku"/> +    <cd:string value="writetoregister"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6462,9 +6444,9 @@    </cd:arguments>  </cd:command> -<cd:command name="propojenyrejstrik" file="core-reg.tex"> +<cd:command name="coupleregister" file="core-reg.tex">    <cd:sequence> -    <cd:string value="propojenyrejstrik"/> +    <cd:string value="coupleregister"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6473,16 +6455,16 @@    </cd:arguments>  </cd:command> -<cd:command name="umistirejstrik" file="core-reg.tex"> +<cd:command name="placeregister" file="core-reg.tex">    <cd:sequence> -    <cd:string value="umistirejstrik"/> +    <cd:string value="placeregister"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="nastavrejstrik"/> +      <cd:inherit name="setupregister"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -6508,26 +6490,26 @@    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="yes" optional="yes" list="yes"> -      <cd:inherit name="nastavrejstrik"/> +      <cd:inherit name="setupregister"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="umistirejstrik" generated="yes" file="core-reg.tex"> +<cd:command name="placeregister" generated="yes" file="core-reg.tex">    <cd:sequence>      <cd:string value="umisti"/>      <cd:variable value="rejstrik"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="yes" optional="yes" list="yes"> -      <cd:inherit name="nastavrejstrik"/> +      <cd:inherit name="setupregister"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="definujsynonyma" file="core-syn.tex"> +<cd:command name="definesynonyms" file="core-syn.tex">    <cd:sequence> -    <cd:string value="definujsynonyma"/> +    <cd:string value="definesynonyms"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6545,9 +6527,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavsynonyma" file="core-syn.tex"> +<cd:command name="setupsynonyms" file="core-syn.tex">    <cd:sequence> -    <cd:string value="nastavsynonyma"/> +    <cd:string value="setupsynonyms"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6644,9 +6626,9 @@    </cd:sequence>  </cd:command> -<cd:command name="definujtrideni" file="core-syn.tex"> +<cd:command name="definesorting" file="core-syn.tex">    <cd:sequence> -    <cd:string value="definujtrideni"/> +    <cd:string value="definesorting"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6661,9 +6643,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavtrideni" file="core-syn.tex"> +<cd:command name="setupsorting" file="core-syn.tex">    <cd:sequence> -    <cd:string value="nastavtrideni"/> +    <cd:string value="setupsorting"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6739,16 +6721,16 @@    </cd:sequence>  </cd:command> -<cd:command name="definujupravu" file="page-mak.tex"> +<cd:command name="definemakeup" file="page-mak.tex">    <cd:sequence> -    <cd:string value="definujupravu"/> +    <cd:string value="definemakeup"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="nastavupravu"/> +      <cd:inherit name="setupmakeup"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -6762,14 +6744,14 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="nastavupravu"/> +      <cd:inherit name="setupmakeup"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="nastavupravu" file="page-mak.tex"> +<cd:command name="setupmakeup" file="page-mak.tex">    <cd:sequence> -    <cd:string value="nastavupravu"/> +    <cd:string value="setupmakeup"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6849,13 +6831,11 @@      <cd:variable value="jmeno"/>      <cd:string value="zlom"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="verze"> +<cd:command name="version">    <cd:sequence> -    <cd:string value="verze"/> +    <cd:string value="version"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6866,20 +6846,20 @@    </cd:arguments>  </cd:command> -<cd:command name="aktualnidatum"> +<cd:command name="currentdate">    <cd:sequence> -    <cd:string value="aktualnidatum"/> +    <cd:string value="currentdate"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> -      <cd:inherit name="datum"/> +      <cd:inherit name="date"/>      </cd:keywords>    </cd:arguments>  </cd:command> -<cd:command name="datum" file="core-con.tex"> +<cd:command name="date" file="core-con.tex">    <cd:sequence> -    <cd:string value="datum"/> +    <cd:string value="date"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> @@ -6898,15 +6878,15 @@    </cd:arguments>  </cd:command> -<cd:command name="odkaznadatum" file="core-mis.tex"> +<cd:command name="referraldate" file="core-mis.tex">    <cd:sequence> -    <cd:string value="odkaznadatum"/> +    <cd:string value="referraldate"/>    </cd:sequence>  </cd:command> -<cd:command name="odsazovani" file="core-spa.tex"> +<cd:command name="indenting" file="core-spa.tex">    <cd:sequence> -    <cd:string value="odsazovani"/> +    <cd:string value="indenting"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -6921,15 +6901,15 @@    </cd:arguments>  </cd:command> -<cd:command name="zadneodsazovani" file="core-spa.tex"> +<cd:command name="noindenting" file="core-spa.tex">    <cd:sequence> -    <cd:string value="zadneodsazovani"/> +    <cd:string value="noindenting"/>    </cd:sequence>  </cd:command> -<cd:command name="preskoc" file="core-spa.tex"> +<cd:command name="blank" file="core-spa.tex">    <cd:sequence> -    <cd:string value="preskoc"/> +    <cd:string value="blank"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -6952,9 +6932,9 @@    </cd:arguments>  </cd:command> -<cd:command name="zhustene" type="environment" file="core-spa.tex"> +<cd:command name="packed" type="environment" file="core-spa.tex">    <cd:sequence> -    <cd:string value="zhustene"/> +    <cd:string value="packed"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -6967,21 +6947,17 @@    <cd:sequence>      <cd:string value="unpacked"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="linecorrection" type="environment">    <cd:sequence>      <cd:string value="linecorrection"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="korekcebilehomista" file="core-spa.tex"> +<cd:command name="correctwhitespace" file="core-spa.tex">    <cd:sequence> -    <cd:string value="korekcebilehomista"/> +    <cd:string value="correctwhitespace"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -6992,16 +6968,12 @@    <cd:sequence>      <cd:string value="postponing"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="lokalne" type="environment">    <cd:sequence>      <cd:string value="lokalne"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="narrower" type="environment"> @@ -7021,13 +6993,11 @@    <cd:sequence>      <cd:string value="hiding"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="nastavzarovnani" file="core-spa.tex"> +<cd:command name="setupalign" file="core-spa.tex">    <cd:sequence> -    <cd:string value="nastavzarovnani"/> +    <cd:string value="setupalign"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7057,14 +7027,14 @@    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> -      <cd:inherit name="nastavzarovnani"/> +      <cd:inherit name="setupalign"/>      </cd:keywords>    </cd:arguments>  </cd:command> -<cd:command name="nastavradkovani"> +<cd:command name="setupspacing">    <cd:sequence> -    <cd:string value="nastavradkovani"/> +    <cd:string value="setupspacing"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7074,9 +7044,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavtoleranci" file="core-spa.tex"> +<cd:command name="setuptolerance" file="core-spa.tex">    <cd:sequence> -    <cd:string value="nastavtoleranci"/> +    <cd:string value="setuptolerance"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7092,9 +7062,9 @@    </cd:arguments>  </cd:command> -<cd:command name="typstrany" file="page-ini.tex"> +<cd:command name="pagetype" file="page-ini.tex">    <cd:sequence> -    <cd:string value="typstrany"/> +    <cd:string value="pagetype"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7103,9 +7073,9 @@    </cd:arguments>  </cd:command> -<cd:command name="zpracujstranu" file="page-ini.tex"> +<cd:command name="processpage" file="page-ini.tex">    <cd:sequence> -    <cd:string value="zpracujstranu"/> +    <cd:string value="processpage"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7118,9 +7088,9 @@    </cd:arguments>  </cd:command> -<cd:command name="parovastrana" file="page-ini.tex"> +<cd:command name="couplepage" file="page-ini.tex">    <cd:sequence> -    <cd:string value="parovastrana"/> +    <cd:string value="couplepage"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7140,9 +7110,9 @@    </cd:arguments>  </cd:command> -<cd:command name="pozice" file="page-lyr.tex"> +<cd:command name="position" file="page-lyr.tex">    <cd:sequence> -    <cd:string value="pozice"/> +    <cd:string value="position"/>    </cd:sequence>    <cd:arguments>      <cd:position list="yes"/> @@ -7150,9 +7120,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavrastr" file="core-rul.tex"> +<cd:command name="setupscreens" file="core-rul.tex">    <cd:sequence> -    <cd:string value="nastavrastr"/> +    <cd:string value="setupscreens"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -7174,9 +7144,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavpozadi" file="page-bck.tex"> +<cd:command name="setupbackgrounds" file="page-bck.tex">    <cd:sequence> -    <cd:string value="nastavpozadi"/> +    <cd:string value="setupbackgrounds"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -7203,7 +7173,7 @@          <cd:constant type="stop"/>          <cd:variable type="cd:repeat"/>        </cd:parameter> -      <cd:inherit name="nastavoramovani"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -7219,9 +7189,9 @@    </cd:arguments>  </cd:command> -<cd:command name="ziskejbuffer"> +<cd:command name="getbuffer">    <cd:sequence> -    <cd:string value="ziskejbuffer"/> +    <cd:string value="getbuffer"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -7241,9 +7211,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definujbuffer" file="core-buf.tex"> +<cd:command name="definebuffer" file="core-buf.tex">    <cd:sequence> -    <cd:string value="definujbuffer"/> +    <cd:string value="definebuffer"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7252,9 +7222,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavbuffer" file="core-buf.tex"> +<cd:command name="setupbuffer" file="core-buf.tex">    <cd:sequence> -    <cd:string value="nastavbuffer"/> +    <cd:string value="setupbuffer"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -7274,9 +7244,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definujblok" file="core-buf.tex"> +<cd:command name="defineblock" file="core-buf.tex">    <cd:sequence> -    <cd:string value="definujblok"/> +    <cd:string value="defineblock"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7285,15 +7255,15 @@    </cd:arguments>  </cd:command> -<cd:command name="zadnedalsibloky" file="core-buf.tex"> +<cd:command name="nomoreblocks" file="core-buf.tex">    <cd:sequence> -    <cd:string value="zadnedalsibloky"/> +    <cd:string value="nomoreblocks"/>    </cd:sequence>  </cd:command> -<cd:command name="schovejbloky" file="core-buf.tex"> +<cd:command name="hideblocks" file="core-buf.tex">    <cd:sequence> -    <cd:string value="schovejbloky"/> +    <cd:string value="hideblocks"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7305,9 +7275,9 @@    </cd:arguments>  </cd:command> -<cd:command name="zachovejbloky" file="core-buf.tex"> +<cd:command name="keepblocks" file="core-buf.tex">    <cd:sequence> -    <cd:string value="zachovejbloky"/> +    <cd:string value="keepblocks"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7320,9 +7290,9 @@    </cd:arguments>  </cd:command> -<cd:command name="uzijbloky" file="core-buf.tex"> +<cd:command name="useblocks" file="core-buf.tex">    <cd:sequence> -    <cd:string value="uzijbloky"/> +    <cd:string value="useblocks"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7334,9 +7304,9 @@    </cd:arguments>  </cd:command> -<cd:command name="zpracujbloky" file="core-buf.tex"> +<cd:command name="processblocks" file="core-buf.tex">    <cd:sequence> -    <cd:string value="zpracujbloky"/> +    <cd:string value="processblocks"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7376,9 +7346,9 @@    </cd:arguments>  </cd:command> -<cd:command name="vyberbloky" file="core-buf.tex"> +<cd:command name="selectblocks" file="core-buf.tex">    <cd:sequence> -    <cd:string value="vyberbloky"/> +    <cd:string value="selectblocks"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7396,9 +7366,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavblok" file="core-buf.tex"> +<cd:command name="setupblock" file="core-buf.tex">    <cd:sequence> -    <cd:string value="nastavblok"/> +    <cd:string value="setupblock"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7435,22 +7405,20 @@    <cd:sequence>      <cd:variable value="rovnice"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="matematika" file="supp-mat.tex"> +<cd:command name="mathematics" file="supp-mat.tex">    <cd:sequence> -    <cd:string value="matematika"/> +    <cd:string value="mathematics"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="umistirovnici" file="core-mat.tex"> +<cd:command name="placeformula" file="core-mat.tex">    <cd:sequence> -    <cd:string value="umistirovnici"/> +    <cd:string value="placeformula"/>    </cd:sequence>    <cd:arguments>      <cd:reference optional="yes" list="yes"/> @@ -7459,9 +7427,9 @@    </cd:arguments>  </cd:command> -<cd:command name="umistipodrovnici" file="core-mat.tex"> +<cd:command name="placesubformula" file="core-mat.tex">    <cd:sequence> -    <cd:string value="umistipodrovnici"/> +    <cd:string value="placesubformula"/>    </cd:sequence>    <cd:arguments>      <cd:reference optional="yes" list="yes"/> @@ -7542,9 +7510,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definujplvouciobjekt" file="page-flt.tex"> +<cd:command name="definefloat" file="page-flt.tex">    <cd:sequence> -    <cd:string value="definujplvouciobjekt"/> +    <cd:string value="definefloat"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7556,9 +7524,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavplvouciobjekt" file="page-flt.tex"> +<cd:command name="setupfloat" file="page-flt.tex">    <cd:sequence> -    <cd:string value="nastavplvouciobjekt"/> +    <cd:string value="setupfloat"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7597,7 +7565,7 @@          <cd:constant type="nastred"/>          <cd:constant type="vpravo"/>        </cd:parameter> -      <cd:inherit name="nastavoramovani"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -7628,8 +7596,6 @@      <cd:string value="placelistof"/>      <cd:variable value="floats"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="completelistoffloats" generated="yes"> @@ -7637,13 +7603,11 @@      <cd:string value="completelistof"/>      <cd:variable value="floats"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="odkaz" file="core-mis.tex"> +<cd:command name="referral" file="core-mis.tex">    <cd:sequence> -    <cd:string value="odkaz"/> +    <cd:string value="referral"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -7669,9 +7633,9 @@    </cd:arguments>  </cd:command> -<cd:command name="vyberpapir"> +<cd:command name="selectpaper">    <cd:sequence> -    <cd:string value="vyberpapir"/> +    <cd:string value="selectpaper"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -7683,9 +7647,9 @@    </cd:arguments>  </cd:command> -<cd:command name="dvoustrannypapir"> +<cd:command name="couplepaper">    <cd:sequence> -    <cd:string value="dvoustrannypapir"/> +    <cd:string value="couplepaper"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7705,9 +7669,9 @@    </cd:arguments>  </cd:command> -<cd:command name="zlomek" file="core-mis.tex"> +<cd:command name="fraction" file="core-mis.tex">    <cd:sequence> -    <cd:string value="zlomek"/> +    <cd:string value="fraction"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -7715,9 +7679,9 @@    </cd:arguments>  </cd:command> -<cd:command name="tecky" file="core-mis.tex"> +<cd:command name="periods" file="core-mis.tex">    <cd:sequence> -    <cd:string value="tecky"/> +    <cd:string value="periods"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7726,30 +7690,21 @@    </cd:arguments>  </cd:command> -<cd:command name="bydliste"> -  <cd:sequence> -    <cd:string value="bydliste"/> -  </cd:sequence> -  <cd:arguments> -    <cd:content/> -  </cd:arguments> -</cd:command> - -<cd:command name="polozky"> +<cd:command name="items">    <cd:sequence> -    <cd:string value="polozky"/> +    <cd:string value="items"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="nastavpolozky"/> +      <cd:inherit name="setupitems"/>      </cd:assignments>      <cd:content list="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="nastavpolozky" file="core-mis.tex"> +<cd:command name="setupitems" file="core-mis.tex">    <cd:sequence> -    <cd:string value="nastavpolozky"/> +    <cd:string value="setupitems"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -7796,9 +7751,9 @@    </cd:arguments>  </cd:command> -<cd:command name="citace" type="environment" file="core-mis.tex"> +<cd:command name="quotation" type="environment" file="core-mis.tex">    <cd:sequence> -    <cd:string value="citace"/> +    <cd:string value="quotation"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7809,27 +7764,27 @@    </cd:arguments>  </cd:command> -<cd:command name="citace" file="core-mis.tex"> +<cd:command name="quotation" file="core-mis.tex">    <cd:sequence> -    <cd:string value="citace"/> +    <cd:string value="quotation"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="citovat" file="core-mis.tex"> +<cd:command name="quote" file="core-mis.tex">    <cd:sequence> -    <cd:string value="citovat"/> +    <cd:string value="quote"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="nastavcitaci" file="core-mis.tex"> +<cd:command name="setupquote" file="core-mis.tex">    <cd:sequence> -    <cd:string value="nastavcitaci"/> +    <cd:string value="setupquote"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -7860,9 +7815,9 @@    </cd:arguments>  </cd:command> -<cd:command name="scitani"> +<cd:command name="adding">    <cd:sequence> -    <cd:string value="scitani"/> +    <cd:string value="adding"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7873,9 +7828,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definujodstavce" file="core-mis.tex"> +<cd:command name="defineparagraphs" file="core-mis.tex">    <cd:sequence> -    <cd:string value="definujodstavce"/> +    <cd:string value="defineparagraphs"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7931,13 +7886,11 @@    <cd:sequence>      <cd:variable value="odstavec"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="nastavodstavce" file="core-mis.tex"> +<cd:command name="setupparagraphs" file="core-mis.tex">    <cd:sequence> -    <cd:string value="nastavodstavce"/> +    <cd:string value="setupparagraphs"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -8000,9 +7953,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavtab" file="core-mis.tex"> +<cd:command name="setuptab" file="core-mis.tex">    <cd:sequence> -    <cd:string value="nastavtab"/> +    <cd:string value="setuptab"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -8051,9 +8004,9 @@    </cd:arguments>  </cd:command> -<cd:command name="popisky"> +<cd:command name="labels">    <cd:sequence> -    <cd:string value="popisky"/> +    <cd:string value="labels"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -8062,9 +8015,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definujtabelaci" file="core-tbl.tex"> +<cd:command name="definetabulate" file="core-tbl.tex">    <cd:sequence> -    <cd:string value="definujtabelaci"/> +    <cd:string value="definetabulate"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -8088,14 +8041,14 @@        <cd:constant type="cd:text"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="uzijexterniobraz"/> +      <cd:inherit name="useexternalfigure"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="nastavtabelaci" file="core-tbl.tex"> +<cd:command name="setuptabulate" file="core-tbl.tex">    <cd:sequence> -    <cd:string value="nastavtabelaci"/> +    <cd:string value="setuptabulate"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -8162,9 +8115,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavtabulky" file="core-tab.tex"> +<cd:command name="setuptables" file="core-tab.tex">    <cd:sequence> -    <cd:string value="nastavtabulky"/> +    <cd:string value="setuptables"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -8269,9 +8222,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definujsablonutabulky" file="core-tab.tex"> +<cd:command name="definetabletemplate" file="core-tab.tex">    <cd:sequence> -    <cd:string value="definujsablonutabulky"/> +    <cd:string value="definetabletemplate"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -8289,9 +8242,9 @@    </cd:arguments>  </cd:command> -<cd:command name="uzijexternisoubory" file="core-mis.tex"> +<cd:command name="useexternalfiles" file="core-mis.tex">    <cd:sequence> -    <cd:string value="uzijexternisoubory"/> +    <cd:string value="useexternalfiles"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -8312,9 +8265,9 @@    </cd:arguments>  </cd:command> -<cd:command name="uzijexternisoubor" file="core-mis.tex"> +<cd:command name="useexternalfile" file="core-mis.tex">    <cd:sequence> -    <cd:string value="uzijexternisoubor"/> +    <cd:string value="useexternalfile"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -8338,9 +8291,9 @@    </cd:arguments>  </cd:command> -<cd:command name="uzijexterniobraz" file="core-fig.tex"> +<cd:command name="useexternalfigure" file="core-fig.tex">    <cd:sequence> -    <cd:string value="uzijexterniobraz"/> +    <cd:string value="useexternalfigure"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -8423,23 +8376,23 @@    </cd:arguments>  </cd:command> -<cd:command name="externiobraz" file="core-fig.tex"> +<cd:command name="externalfigure" file="core-fig.tex">    <cd:sequence> -    <cd:string value="externiobraz"/> +    <cd:string value="externalfigure"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:file"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="uzijexterniobraz"/> +      <cd:inherit name="useexternalfigure"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="nastavexterniobrazy" file="core-fig.tex"> +<cd:command name="setupexternalfigures" file="core-fig.tex">    <cd:sequence> -    <cd:string value="nastavexterniobrazy"/> +    <cd:string value="setupexternalfigures"/>    </cd:sequence>    <cd:arguments>      <cd:assignments> @@ -8481,9 +8434,9 @@    </cd:arguments>  </cd:command> -<cd:command name="ukazexterniobrazy" file="core-fig.tex"> +<cd:command name="showexternalfigures" file="core-fig.tex">    <cd:sequence> -    <cd:string value="ukazexterniobrazy"/> +    <cd:string value="showexternalfigures"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> @@ -8496,9 +8449,9 @@    </cd:arguments>  </cd:command> -<cd:command name="uzijexternizvuk" file="core-fig.tex"> +<cd:command name="useexternalsoundtrack" file="core-fig.tex">    <cd:sequence> -    <cd:string value="uzijexternizvuk"/> +    <cd:string value="useexternalsoundtrack"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -8535,9 +8488,9 @@    </cd:arguments>  </cd:command> -<cd:command name="fakt" type="environment"> +<cd:command name="fact" type="environment">    <cd:sequence> -    <cd:string value="fakt"/> +    <cd:string value="fact"/>    </cd:sequence>    <cd:arguments>      <cd:tex command="fact"/> @@ -8548,21 +8501,21 @@    </cd:arguments>  </cd:command> -<cd:command name="otocit" file="core-mis.tex"> +<cd:command name="rotate" file="core-mis.tex">    <cd:sequence> -    <cd:string value="otocit"/> +    <cd:string value="rotate"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="nastavotoceni"/> +      <cd:inherit name="setuprotate"/>      </cd:assignments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="nastavotoceni" file="core-mis.tex"> +<cd:command name="setuprotate" file="core-mis.tex">    <cd:sequence> -    <cd:string value="nastavotoceni"/> +    <cd:string value="setuprotate"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -8576,23 +8529,23 @@          <cd:constant type="siroky"/>          <cd:constant type="podlehloubky"/>        </cd:parameter> -      <cd:inherit name="nastavoramovani"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="zrcadlit" file="core-mis.tex"> +<cd:command name="mirror" file="core-mis.tex">    <cd:sequence> -    <cd:string value="zrcadlit"/> +    <cd:string value="mirror"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="meritko" file="core-mis.tex"> +<cd:command name="scale" file="core-mis.tex">    <cd:sequence> -    <cd:string value="meritko"/> +    <cd:string value="scale"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> @@ -8607,9 +8560,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavspojeni" file="core-mis.tex"> +<cd:command name="setupcombinations" file="core-mis.tex">    <cd:sequence> -    <cd:string value="nastavspojeni"/> +    <cd:string value="setupcombinations"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -8674,9 +8627,9 @@    </cd:arguments>  </cd:command> -<cd:command name="umistivedlesebe" file="core-mis.tex"> +<cd:command name="placesidebyside" file="core-mis.tex">    <cd:sequence> -    <cd:string value="umistivedlesebe"/> +    <cd:string value="placesidebyside"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -8684,9 +8637,9 @@    </cd:arguments>  </cd:command> -<cd:command name="umistinadsebe" file="core-mis.tex"> +<cd:command name="placeontopofeachother" file="core-mis.tex">    <cd:sequence> -    <cd:string value="umistinadsebe"/> +    <cd:string value="placeontopofeachother"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -8715,9 +8668,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavinterakcniobrazovku" file="core-int.tex"> +<cd:command name="setupinteractionscreen" file="core-int.tex">    <cd:sequence> -    <cd:string value="nastavinterakcniobrazovku"/> +    <cd:string value="setupinteractionscreen"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" list="yes"> @@ -8757,17 +8710,15 @@    </cd:arguments>  </cd:command> -<cd:command name="obrazovka" file="core-int.tex"> +<cd:command name="screen" file="core-int.tex">    <cd:sequence> -    <cd:string value="obrazovka"/> +    <cd:string value="screen"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="nastavprechodstrany" file="core-int.tex"> +<cd:command name="setuppagetransitions" file="core-int.tex">    <cd:sequence> -    <cd:string value="nastavprechodstrany"/> +    <cd:string value="setuppagetransitions"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -8777,9 +8728,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavinterakci" file="core-nav.tex"> +<cd:command name="setupinteraction" file="core-nav.tex">    <cd:sequence> -    <cd:string value="nastavinterakci"/> +    <cd:string value="setupinteraction"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" list="yes"> @@ -8871,9 +8822,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definujinterakcnimenu" file="core-int.tex"> +<cd:command name="defineinteractionmenu" file="core-int.tex">    <cd:sequence> -    <cd:string value="definujinterakcnimenu"/> +    <cd:string value="defineinteractionmenu"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive" list="yes"> @@ -8952,14 +8903,14 @@          <cd:constant type="ano"/>          <cd:constant type="ne"/>        </cd:parameter> -      <cd:inherit name="nastavoramovani"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="definujinterakcnimenu" file="core-int.tex"> +<cd:command name="defineinteractionmenu" file="core-int.tex">    <cd:sequence> -    <cd:string value="definujinterakcnimenu"/> +    <cd:string value="defineinteractionmenu"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -8977,14 +8928,14 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="nastavinterakcnimenu"/> +      <cd:inherit name="setupinteractionmenu"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="interaktivnimenu" type="environment"> +<cd:command name="interactionmenu" type="environment">    <cd:sequence> -    <cd:string value="interaktivnimenu"/> +    <cd:string value="interactionmenu"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -8993,9 +8944,9 @@    </cd:arguments>  </cd:command> -<cd:command name="zablokujinterakcnimenu" file="core-int.tex"> +<cd:command name="disableinteractionmenu" file="core-int.tex">    <cd:sequence> -    <cd:string value="zablokujinterakcnimenu"/> +    <cd:string value="disableinteractionmenu"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -9009,9 +8960,9 @@    </cd:arguments>  </cd:command> -<cd:command name="uzijexternidokument" file="core-ref.tex"> +<cd:command name="useexternaldocument" file="core-ref.tex">    <cd:sequence> -    <cd:string value="uzijexternidokument"/> +    <cd:string value="useexternaldocument"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -9026,9 +8977,9 @@    </cd:arguments>  </cd:command> -<cd:command name="uzijURL" file="core-ref.tex"> +<cd:command name="useURL" file="core-ref.tex">    <cd:sequence> -    <cd:string value="uzijURL"/> +    <cd:string value="useURL"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -9046,9 +8997,9 @@    </cd:arguments>  </cd:command> -<cd:command name="propojenydokument" file="core-ref.tex"> +<cd:command name="coupledocument" file="core-ref.tex">    <cd:sequence> -    <cd:string value="propojenydokument"/> +    <cd:string value="coupledocument"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -9063,33 +9014,33 @@    </cd:arguments>  </cd:command> -<cd:command name="zref" file="core-ref.tex"> +<cd:command name="from" file="core-ref.tex">    <cd:sequence> -    <cd:string value="zref"/> +    <cd:string value="from"/>    </cd:sequence>    <cd:arguments>      <cd:reference interactive="exclusive"/>    </cd:arguments>  </cd:command> -<cd:command name="interakcnilista"> +<cd:command name="interactionbar">    <cd:sequence> -    <cd:string value="interakcnilista"/> +    <cd:string value="interactionbar"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" list="yes"> -      <cd:inherit name="nastavinterakcnilistu"/> +      <cd:inherit name="setupinteractionbar"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="interakcnitlacitka" file="core-ref.tex"> +<cd:command name="interactionbuttons" file="core-ref.tex">    <cd:sequence> -    <cd:string value="interakcnitlacitka"/> +    <cd:string value="interactionbuttons"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" optional="yes" list="yes"> -      <cd:inherit name="nastavinterakcnilistu"/> +      <cd:inherit name="setupinteractionbar"/>      </cd:assignments>      <cd:keywords list="yes">        <cd:constant type="cd:name"/> @@ -9097,9 +9048,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavinterakcnilistu" file="core-int.tex"> +<cd:command name="setupinteractionbar" file="core-int.tex">    <cd:sequence> -    <cd:string value="nastavinterakcnilistu"/> +    <cd:string value="setupinteractionbar"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" list="yes"> @@ -9142,30 +9093,26 @@          <cd:constant type="stredni"/>          <cd:constant type="velke"/>        </cd:parameter> -      <cd:inherit name="nastavoramovani"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="synchronizovat" file="core-int.tex"> +<cd:command name="synchronize" file="core-int.tex">    <cd:sequence> -    <cd:string value="synchronizovat"/> +    <cd:string value="synchronize"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="synchronization" type="environment">    <cd:sequence>      <cd:string value="synchronization"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="nastavsynchronizacnilistu" file="core-int.tex"> +<cd:command name="setupsynchronizationbar" file="core-int.tex">    <cd:sequence> -    <cd:string value="nastavsynchronizacnilistu"/> +    <cd:string value="setupsynchronizationbar"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" list="yes"> @@ -9194,14 +9141,14 @@        <cd:parameter name="barva">          <cd:constant type="cd:name"/>        </cd:parameter> -      <cd:inherit name="nastavoramovani"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="synchronizacnilista" file="core-int.tex"> +<cd:command name="synchronizationbar" file="core-int.tex">    <cd:sequence> -    <cd:string value="synchronizacnilista"/> +    <cd:string value="synchronizationbar"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -9212,14 +9159,14 @@          <cd:constant type="stranka"/>          <cd:constant type="lokalne"/>        </cd:parameter> -      <cd:inherit name="nastavsynchronizacnilistu"/> +      <cd:inherit name="setupsynchronizationbar"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="nastavsynchronizaci" file="core-int.tex"> +<cd:command name="setupsynchronization" file="core-int.tex">    <cd:sequence> -    <cd:string value="nastavsynchronizaci"/> +    <cd:string value="setupsynchronization"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" list="yes"> @@ -9231,9 +9178,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definujprofil" file="core-int.tex"> +<cd:command name="defineprofile" file="core-int.tex">    <cd:sequence> -    <cd:string value="definujprofil"/> +    <cd:string value="defineprofile"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive" list="yes"> @@ -9245,9 +9192,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavprofily" file="core-int.tex"> +<cd:command name="setupprofiles" file="core-int.tex">    <cd:sequence> -    <cd:string value="nastavprofily"/> +    <cd:string value="setupprofiles"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" list="yes"> @@ -9269,9 +9216,9 @@    </cd:arguments>  </cd:command> -<cd:command name="dodrzujprofil" file="core-int.tex"> +<cd:command name="followprofile" file="core-int.tex">    <cd:sequence> -    <cd:string value="dodrzujprofil"/> +    <cd:string value="followprofile"/>    </cd:sequence>    <cd:arguments>      <cd:content interactive="exclusive"/> @@ -9281,9 +9228,9 @@    </cd:arguments>  </cd:command> -<cd:command name="umistizalozky" file="core-int.tex"> +<cd:command name="placebookmarks" file="core-int.tex">    <cd:sequence> -    <cd:string value="umistizalozky"/> +    <cd:string value="placebookmarks"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -9294,9 +9241,9 @@    </cd:arguments>  </cd:command> -<cd:command name="zalozka"> +<cd:command name="bookmark">    <cd:sequence> -    <cd:string value="zalozka"/> +    <cd:string value="bookmark"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -9306,9 +9253,9 @@    </cd:arguments>  </cd:command> -<cd:command name="verze" type="environment"> +<cd:command name="version" type="environment">    <cd:sequence> -    <cd:string value="verze"/> +    <cd:string value="version"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive" list="yes"> @@ -9317,9 +9264,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavverze" file="core-int.tex"> +<cd:command name="setupversions" file="core-int.tex">    <cd:sequence> -    <cd:string value="nastavverze"/> +    <cd:string value="setupversions"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -9340,23 +9287,21 @@    </cd:arguments>  </cd:command> -<cd:command name="oznacverzi" file="core-int.tex"> +<cd:command name="markversion" file="core-int.tex">    <cd:sequence> -    <cd:string value="oznacverzi"/> +    <cd:string value="markversion"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="vyberverzi" file="core-int.tex"> +<cd:command name="selectversion" file="core-int.tex">    <cd:sequence> -    <cd:string value="vyberverzi"/> +    <cd:string value="selectversion"/>    </cd:sequence>  </cd:command> -<cd:command name="definujverzi" file="core-int.tex"> +<cd:command name="defineversion" file="core-int.tex">    <cd:sequence> -    <cd:string value="definujverzi"/> +    <cd:string value="defineversion"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9368,9 +9313,9 @@    </cd:arguments>  </cd:command> -<cd:command name="dodrzujverzi" file="core-int.tex"> +<cd:command name="followversion" file="core-int.tex">    <cd:sequence> -    <cd:string value="dodrzujverzi"/> +    <cd:string value="followversion"/>    </cd:sequence>    <cd:arguments>      <cd:content interactive="exclusive"/> @@ -9380,9 +9325,9 @@    </cd:arguments>  </cd:command> -<cd:command name="dodrzujverziprofilu" file="core-int.tex"> +<cd:command name="followprofileversion" file="core-int.tex">    <cd:sequence> -    <cd:string value="dodrzujverziprofilu"/> +    <cd:string value="followprofileversion"/>    </cd:sequence>    <cd:arguments>      <cd:content interactive="exclusive"/> @@ -9395,9 +9340,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definujprogram" file="core-ref.tex"> +<cd:command name="defineprogram" file="core-ref.tex">    <cd:sequence> -    <cd:string value="definujprogram"/> +    <cd:string value="defineprogram"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -9412,9 +9357,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavprogramy" file="core-ref.tex"> +<cd:command name="setupprograms" file="core-ref.tex">    <cd:sequence> -    <cd:string value="nastavprogramy"/> +    <cd:string value="setupprograms"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" list="yes"> @@ -9465,9 +9410,9 @@  <!-- remark skipped --> -<cd:command name="jdina" file="core-ref.tex"> +<cd:command name="goto" file="core-ref.tex">    <cd:sequence> -    <cd:string value="jdina"/> +    <cd:string value="goto"/>    </cd:sequence>    <cd:arguments>      <cd:content interactive="exclusive"/> @@ -9476,9 +9421,9 @@    </cd:arguments>  </cd:command> -<cd:command name="jdinabox" file="core-ref.tex"> +<cd:command name="gotobox" file="core-ref.tex">    <cd:sequence> -    <cd:string value="jdinabox"/> +    <cd:string value="gotobox"/>    </cd:sequence>    <cd:arguments>      <cd:content interactive="exclusive"/> @@ -9486,22 +9431,22 @@    </cd:arguments>  </cd:command> -<cd:command name="tlacitko"> +<cd:command name="button">    <cd:sequence> -    <cd:string value="tlacitko"/> +    <cd:string value="button"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" optional="yes" list="yes"> -      <cd:inherit name="nastavtlacitka"/> +      <cd:inherit name="setupbuttons"/>      </cd:assignments>      <cd:content/>      <cd:reference list="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="nastavtlacitka" file="core-ref.tex"> +<cd:command name="setupbuttons" file="core-ref.tex">    <cd:sequence> -    <cd:string value="nastavtlacitka"/> +    <cd:string value="setupbuttons"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -9509,16 +9454,16 @@          <cd:constant type="start"/>          <cd:constant type="stop"/>        </cd:parameter> -      <cd:inherit name="nastavoramovani"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command>  <!-- menubutton skipped --> -<cd:command name="nastavkomentar" file="core-int.tex"> +<cd:command name="setupcomment" file="core-int.tex">    <cd:sequence> -    <cd:string value="nastavkomentar"/> +    <cd:string value="setupcomment"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -9566,38 +9511,38 @@    </cd:arguments>  </cd:command> -<cd:command name="komentar" type="environment"> +<cd:command name="comment" type="environment">    <cd:sequence> -    <cd:string value="komentar"/> +    <cd:string value="comment"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes">        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="nastavkomentar"/> +      <cd:inherit name="setupcomment"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="komentar"> +<cd:command name="comment">    <cd:sequence> -    <cd:string value="komentar"/> +    <cd:string value="comment"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes">        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="nastavkomentar"/> +      <cd:inherit name="setupcomment"/>      </cd:assignments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="definujpole" file="core-fld.tex"> +<cd:command name="definefield" file="core-fld.tex">    <cd:sequence> -    <cd:string value="definujpole"/> +    <cd:string value="definefield"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9618,9 +9563,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definujpodpole" file="core-fld.tex"> +<cd:command name="definesubfield" file="core-fld.tex">    <cd:sequence> -    <cd:string value="definujpodpole"/> +    <cd:string value="definesubfield"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9635,9 +9580,9 @@    </cd:arguments>  </cd:command> -<cd:command name="kopirujpole" file="core-fld.tex"> +<cd:command name="copyfield" file="core-fld.tex">    <cd:sequence> -    <cd:string value="kopirujpole"/> +    <cd:string value="copyfield"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9649,9 +9594,9 @@    </cd:arguments>  </cd:command> -<cd:command name="klonujpole" file="core-fld.tex"> +<cd:command name="clonefield" file="core-fld.tex">    <cd:sequence> -    <cd:string value="klonujpole"/> +    <cd:string value="clonefield"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9669,9 +9614,9 @@    </cd:arguments>  </cd:command> -<cd:command name="pole" file="core-fld.tex"> +<cd:command name="field" file="core-fld.tex">    <cd:sequence> -    <cd:string value="pole"/> +    <cd:string value="field"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9680,9 +9625,9 @@    </cd:arguments>  </cd:command> -<cd:command name="prizpusobivepole" file="core-fld.tex"> +<cd:command name="fitfield" file="core-fld.tex">    <cd:sequence> -    <cd:string value="prizpusobivepole"/> +    <cd:string value="fitfield"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9691,9 +9636,9 @@    </cd:arguments>  </cd:command> -<cd:command name="vyplnovepole" file="core-fld.tex"> +<cd:command name="fillinfield" file="core-fld.tex">    <cd:sequence> -    <cd:string value="vyplnovepole"/> +    <cd:string value="fillinfield"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -9703,9 +9648,9 @@    </cd:arguments>  </cd:command> -<cd:command name="bublinkovanapoveda" file="core-fld.tex"> +<cd:command name="tooltip" file="core-fld.tex">    <cd:sequence> -    <cd:string value="bublinkovanapoveda"/> +    <cd:string value="tooltip"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -9718,9 +9663,9 @@    </cd:arguments>  </cd:command> -<cd:command name="ukazpole" file="core-fld.tex"> +<cd:command name="showfields" file="core-fld.tex">    <cd:sequence> -    <cd:string value="ukazpole"/> +    <cd:string value="showfields"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -9729,15 +9674,15 @@    </cd:arguments>  </cd:command> -<cd:command name="zaznamovepole" file="core-fld.tex"> +<cd:command name="logfields" file="core-fld.tex">    <cd:sequence> -    <cd:string value="zaznamovepole"/> +    <cd:string value="logfields"/>    </cd:sequence>  </cd:command> -<cd:command name="nastavpole" file="core-fld.tex"> +<cd:command name="setupfield" file="core-fld.tex">    <cd:sequence> -    <cd:string value="nastavpole"/> +    <cd:string value="setupfield"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9750,7 +9695,7 @@        <cd:constant type="ramecek"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="nastavvsechnapole"/> +      <cd:inherit name="setupfields"/>      </cd:assignments>      <cd:assignments list="yes">      </cd:assignments> @@ -9759,9 +9704,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavvsechnapole" file="core-fld.tex"> +<cd:command name="setupfields" file="core-fld.tex">    <cd:sequence> -    <cd:string value="nastavvsechnapole"/> +    <cd:string value="setupfields"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -9847,7 +9792,7 @@        <cd:parameter name="barvapozadipole">          <cd:constant type="cd:name"/>        </cd:parameter> -      <cd:inherit name="oramovani"/> +      <cd:inherit name="framed"/>      </cd:assignments>      <cd:assignments list="yes">      </cd:assignments> @@ -9870,9 +9815,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definujzasobnikpoli" file="core-fld.tex"> +<cd:command name="definefieldstack" file="core-fld.tex">    <cd:sequence> -    <cd:string value="definujzasobnikpoli"/> +    <cd:string value="definefieldstack"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9882,14 +9827,14 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="nastavvsechnapole"/> +      <cd:inherit name="setupfields"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="zasobnikpoli" file="core-fld.tex"> +<cd:command name="fieldstack" file="core-fld.tex">    <cd:sequence> -    <cd:string value="zasobnikpoli"/> +    <cd:string value="fieldstack"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9899,26 +9844,26 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="nastavvsechnapole"/> +      <cd:inherit name="setupfields"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="orez" file="core-fig.tex"> +<cd:command name="clip" file="core-fig.tex">    <cd:sequence> -    <cd:string value="orez"/> +    <cd:string value="clip"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="nastavorez"/> +      <cd:inherit name="setupclipping"/>      </cd:assignments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="nastavorez" file="core-fig.tex"> +<cd:command name="setupclipping" file="core-fig.tex">    <cd:sequence> -    <cd:string value="nastavorez"/> +    <cd:string value="setupclipping"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -9953,9 +9898,9 @@    </cd:arguments>  </cd:command> -<cd:command name="umistilegendu"> +<cd:command name="placelegend">    <cd:sequence> -    <cd:string value="umistilegendu"/> +    <cd:string value="placelegend"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -9963,9 +9908,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nastavlegendu"> +<cd:command name="setuplegend">    <cd:sequence> -    <cd:string value="nastavlegendu"/> +    <cd:string value="setuplegend"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -10149,7 +10094,7 @@        <cd:constant type="cd:file"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="nastavmeziradkovoumezeru"/> +      <cd:inherit name="setupinterlinespace"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -10174,7 +10119,7 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="nastavumistovani"/> +      <cd:inherit name="setuppositioning"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -10188,7 +10133,7 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="nastavumistovani"/> +      <cd:inherit name="setuppositioning"/>      </cd:assignments>    </cd:arguments>  </cd:command> diff --git a/tex/context/interface/cont-de.xml b/tex/context/interface/cont-de.xml index cf4b8fc9c..f849578f5 100644 --- a/tex/context/interface/cont-de.xml +++ b/tex/context/interface/cont-de.xml @@ -1,10 +1,10 @@  <?xml version="1.0"?> -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2004.11.17"> -<cd:command name="installieresprache" file="lang-ini.tex"> +<cd:command name="installlanguage" file="lang-ini.tex">    <cd:sequence> -    <cd:string value="installieresprache"/> +    <cd:string value="installlanguage"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -56,9 +56,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stellespracheein" file="lang-ini.tex"> +<cd:command name="setuplanguage" file="lang-ini.tex">    <cd:sequence> -    <cd:string value="stellespracheein"/> +    <cd:string value="setuplanguage"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -72,14 +72,14 @@        <cd:constant type=".."/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="installieresprache"/> +      <cd:inherit name="installlanguage"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="sprache"> +<cd:command name="language">    <cd:sequence> -    <cd:string value="sprache"/> +    <cd:string value="language"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -95,9 +95,9 @@    </cd:arguments>  </cd:command> -<cd:command name="hauptsprache" file="lang-ini.tex"> +<cd:command name="mainlanguage" file="lang-ini.tex">    <cd:sequence> -    <cd:string value="hauptsprache"/> +    <cd:string value="mainlanguage"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -113,9 +113,9 @@    </cd:arguments>  </cd:command> -<cd:command name="uebersetzten" file="lang-lab.tex"> +<cd:command name="translate" file="lang-lab.tex">    <cd:sequence> -    <cd:string value="uebersetzten"/> +    <cd:string value="translate"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -126,9 +126,9 @@    </cd:arguments>  </cd:command> -<cd:command name="benutzekodierung" file="enco-ini.tex"> +<cd:command name="useencoding" file="enco-ini.tex">    <cd:sequence> -    <cd:string value="benutzekodierung"/> +    <cd:string value="useencoding"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -137,9 +137,9 @@    </cd:arguments>  </cd:command> -<cd:command name="benutzespezielles" file="spec-ini.tex"> +<cd:command name="usespecials" file="spec-ini.tex">    <cd:sequence> -    <cd:string value="benutzespezielles"/> +    <cd:string value="usespecials"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -163,9 +163,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelleausgabeein" file="spec-ini.tex"> +<cd:command name="setupoutput" file="spec-ini.tex">    <cd:sequence> -    <cd:string value="stelleausgabeein"/> +    <cd:string value="setupoutput"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -174,9 +174,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definierefliesstextumgebung" file="font-ini.tex"> +<cd:command name="definebodyfontenvironment" file="font-ini.tex">    <cd:sequence> -    <cd:string value="definierefliesstextumgebung"/> +    <cd:string value="definebodyfontenvironment"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -211,34 +211,34 @@    </cd:arguments>  </cd:command> -<cd:command name="stellefliesstextumgebungein" file="font-ini.tex"> +<cd:command name="setupbodyfontenvironment" file="font-ini.tex">    <cd:sequence> -    <cd:string value="stellefliesstextumgebungein"/> +    <cd:string value="setupbodyfontenvironment"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> -      <cd:inherit name="stellefliesstextein"/> +      <cd:inherit name="setupbodyfont"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="stellefliesstextein"/> +      <cd:inherit name="setupbodyfont"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="zeigefliesstextumgebung"> +<cd:command name="showbodyfontenvironment">    <cd:sequence> -    <cd:string value="zeigefliesstextumgebung"/> +    <cd:string value="showbodyfontenvironment"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> -      <cd:inherit name="stellefliesstextein"/> +      <cd:inherit name="setupbodyfont"/>      </cd:keywords>    </cd:arguments>  </cd:command> -<cd:command name="definierefliesstext" file="font-ini.tex"> +<cd:command name="definebodyfont" file="font-ini.tex">    <cd:sequence> -    <cd:string value="definierefliesstext"/> +    <cd:string value="definebodyfont"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -299,20 +299,20 @@    </cd:arguments>  </cd:command> -<cd:command name="zeigefliesstext"> +<cd:command name="showbodyfont">    <cd:sequence> -    <cd:string value="zeigefliesstext"/> +    <cd:string value="showbodyfont"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> -      <cd:inherit name="stellefliesstextein"/> +      <cd:inherit name="setupbodyfont"/>      </cd:keywords>    </cd:arguments>  </cd:command> -<cd:command name="stellefliesstextein"> +<cd:command name="setupbodyfont">    <cd:sequence> -    <cd:string value="stellefliesstextein"/> +    <cd:string value="setupbodyfont"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -335,9 +335,9 @@    </cd:arguments>  </cd:command> -<cd:command name="wechselezumfliesstext" file="font-ini.tex"> +<cd:command name="switchtobodyfont" file="font-ini.tex">    <cd:sequence> -    <cd:string value="wechselezumfliesstext"/> +    <cd:string value="switchtobodyfont"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -351,9 +351,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definiereschrift" file="font-ini.tex"> +<cd:command name="definefont" file="font-ini.tex">    <cd:sequence> -    <cd:string value="definiereschrift"/> +    <cd:string value="definefont"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -379,9 +379,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stellefarbeein" file="colo-ini.tex"> +<cd:command name="setupcolor" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="stellefarbeein"/> +    <cd:string value="setupcolor"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -390,9 +390,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stellefarbenein" file="colo-ini.tex"> +<cd:command name="setupcolors" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="stellefarbenein"/> +    <cd:string value="setupcolors"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -448,9 +448,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definierefarbe" file="colo-ini.tex"> +<cd:command name="definecolor" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="definierefarbe"/> +    <cd:string value="definecolor"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -485,9 +485,9 @@    </cd:arguments>  </cd:command> -<cd:command name="farbe" type="environment" file="colo-ini.tex"> +<cd:command name="color" type="environment" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="farbe"/> +    <cd:string value="color"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -496,9 +496,9 @@    </cd:arguments>  </cd:command> -<cd:command name="farbe" file="colo-ini.tex"> +<cd:command name="color" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="farbe"/> +    <cd:string value="color"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -508,9 +508,9 @@    </cd:arguments>  </cd:command> -<cd:command name="graufarbe" file="colo-ini.tex"> +<cd:command name="graycolor" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="graufarbe"/> +    <cd:string value="graycolor"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -519,9 +519,9 @@    </cd:arguments>  </cd:command> -<cd:command name="zeigefarbe"> +<cd:command name="showcolor">    <cd:sequence> -    <cd:string value="zeigefarbe"/> +    <cd:string value="showcolor"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -530,9 +530,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definierepalette" file="colo-ini.tex"> +<cd:command name="definepalet" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="definierepalette"/> +    <cd:string value="definepalet"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -546,9 +546,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stellepaletteein" file="colo-ini.tex"> +<cd:command name="setuppalet" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="stellepaletteein"/> +    <cd:string value="setuppalet"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -557,9 +557,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definierefarbengruppe" file="colo-ini.tex"> +<cd:command name="definecolorgroup" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="definierefarbengruppe"/> +    <cd:string value="definecolorgroup"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -575,9 +575,9 @@    </cd:arguments>  </cd:command> -<cd:command name="zeigepalette"> +<cd:command name="showpalet">    <cd:sequence> -    <cd:string value="zeigepalette"/> +    <cd:string value="showpalet"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -592,9 +592,9 @@    </cd:arguments>  </cd:command> -<cd:command name="zeigefarbengruppe"> +<cd:command name="showcolorgroup">    <cd:sequence> -    <cd:string value="zeigefarbengruppe"/> +    <cd:string value="showcolorgroup"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -610,9 +610,9 @@    </cd:arguments>  </cd:command> -<cd:command name="vergleichepalette"> +<cd:command name="comparepalet">    <cd:sequence> -    <cd:string value="vergleichepalette"/> +    <cd:string value="comparepalet"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -621,9 +621,9 @@    </cd:arguments>  </cd:command> -<cd:command name="vergleichefarbengruppe"> +<cd:command name="comparecolorgroup">    <cd:sequence> -    <cd:string value="vergleichefarbengruppe"/> +    <cd:string value="comparecolorgroup"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -632,9 +632,9 @@    </cd:arguments>  </cd:command> -<cd:command name="zeigeumbruch" file="supp-vis.tex"> +<cd:command name="showmakeup" file="supp-vis.tex">    <cd:sequence> -    <cd:string value="zeigeumbruch"/> +    <cd:string value="showmakeup"/>    </cd:sequence>  </cd:command> @@ -647,14 +647,14 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="stelletipein"/> +      <cd:inherit name="setuptype"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stelletipein" file="core-ver.tex"> +<cd:command name="setuptype" file="core-ver.tex">    <cd:sequence> -    <cd:string value="stelletipein"/> +    <cd:string value="setuptype"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -693,9 +693,9 @@    </cd:arguments>  </cd:command> -<cd:command name="tip" file="core-ver.tex"> +<cd:command name="typ" file="core-ver.tex">    <cd:sequence> -    <cd:string value="tip"/> +    <cd:string value="typ"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -720,9 +720,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definieretippen" file="core-ver.tex"> +<cd:command name="definetyping" file="core-ver.tex">    <cd:sequence> -    <cd:string value="definieretippen"/> +    <cd:string value="definetyping"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -731,14 +731,14 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="stelletippenein"/> +      <cd:inherit name="setuptyping"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stelletippenein" file="core-ver.tex"> +<cd:command name="setuptyping" file="core-ver.tex">    <cd:sequence> -    <cd:string value="stelletippenein"/> +    <cd:string value="setuptyping"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -838,13 +838,11 @@    <cd:sequence>      <cd:variable value="tippen"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="tippedatei" file="verb-ini.tex"> +<cd:command name="typefile" file="verb-ini.tex">    <cd:sequence> -    <cd:string value="tippedatei"/> +    <cd:string value="typefile"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -854,9 +852,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stellefussnotenein" file="core-not.tex"> +<cd:command name="setupfootnotes" file="core-not.tex">    <cd:sequence> -    <cd:string value="stellefussnotenein"/> +    <cd:string value="setupfootnotes"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -957,25 +955,25 @@        <cd:parameter name="faktor">          <cd:constant type="cd:number"/>        </cd:parameter> -      <cd:inherit name="umrahmt"/> +      <cd:inherit name="framed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stellefussnotendefinitionein" file="core-not.tex"> +<cd:command name="setupfootnotedefinition" file="core-not.tex">    <cd:sequence> -    <cd:string value="stellefussnotendefinitionein"/> +    <cd:string value="setupfootnotedefinition"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> -      <cd:inherit name="definierebeschreibung"/> +      <cd:inherit name="definedescription"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="fussnote" file="core-not.tex"> +<cd:command name="footnote" file="core-not.tex">    <cd:sequence> -    <cd:string value="fussnote"/> +    <cd:string value="footnote"/>    </cd:sequence>    <cd:arguments>      <cd:reference optional="yes"/> @@ -993,9 +991,9 @@    </cd:arguments>  </cd:command> -<cd:command name="notiz" file="core-not.tex"> +<cd:command name="note" file="core-not.tex">    <cd:sequence> -    <cd:string value="notiz"/> +    <cd:string value="note"/>    </cd:sequence>    <cd:arguments>      <cd:reference interactive="yes"/> @@ -1006,35 +1004,33 @@    <cd:sequence>      <cd:string value="localfootnotes"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="platzierelokalefussnoten" file="core-not.tex"> +<cd:command name="placelocalfootnotes" file="core-not.tex">    <cd:sequence> -    <cd:string value="platzierelokalefussnoten"/> +    <cd:string value="placelocalfootnotes"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stellefussnotenein"/> +      <cd:inherit name="setupfootnotes"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="platzierefussnoten" file="core-not.tex"> +<cd:command name="placefootnotes" file="core-not.tex">    <cd:sequence> -    <cd:string value="platzierefussnoten"/> +    <cd:string value="placefootnotes"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stellefussnotenein"/> +      <cd:inherit name="setupfootnotes"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stelleunterstreichenein" file="core-fnt.tex"> +<cd:command name="setupunderbar" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="stelleunterstreichenein"/> +    <cd:string value="setupunderbar"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -1059,117 +1055,117 @@    </cd:arguments>  </cd:command> -<cd:command name="unterstrichen" file="core-fnt.tex"> +<cd:command name="underbar" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="unterstrichen"/> +    <cd:string value="underbar"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="unterstreichen" file="core-fnt.tex"> +<cd:command name="underbars" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="unterstreichen"/> +    <cd:string value="underbars"/>    </cd:sequence>    <cd:arguments>      <cd:word list="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="ueberstrichen" file="core-fnt.tex"> +<cd:command name="overbar" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="ueberstrichen"/> +    <cd:string value="overbar"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="ueberstreichen" file="core-fnt.tex"> +<cd:command name="overbars" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="ueberstreichen"/> +    <cd:string value="overbars"/>    </cd:sequence>    <cd:arguments>      <cd:word list="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="durchgestrichen" file="core-fnt.tex"> +<cd:command name="overstrike" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="durchgestrichen"/> +    <cd:string value="overstrike"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="durchstreichen" file="core-fnt.tex"> +<cd:command name="overstrikes" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="durchstreichen"/> +    <cd:string value="overstrikes"/>    </cd:sequence>    <cd:arguments>      <cd:word list="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="roemischezahlen" file="core-con.tex"> +<cd:command name="romannumerals" file="core-con.tex">    <cd:sequence> -    <cd:string value="roemischezahlen"/> +    <cd:string value="romannumerals"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="Roemischezahlen" file="core-con.tex"> +<cd:command name="Romannumerals" file="core-con.tex">    <cd:sequence> -    <cd:string value="Roemischezahlen"/> +    <cd:string value="Romannumerals"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="ziffern" file="core-con.tex"> +<cd:command name="numbers" file="core-con.tex">    <cd:sequence> -    <cd:string value="ziffern"/> +    <cd:string value="numbers"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="buchstabe" file="core-con.tex"> +<cd:command name="character" file="core-con.tex">    <cd:sequence> -    <cd:string value="buchstabe"/> +    <cd:string value="character"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="Buchstabe" file="core-con.tex"> +<cd:command name="Character" file="core-con.tex">    <cd:sequence> -    <cd:string value="Buchstabe"/> +    <cd:string value="Character"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="buchstaben" file="core-con.tex"> +<cd:command name="characters" file="core-con.tex">    <cd:sequence> -    <cd:string value="buchstaben"/> +    <cd:string value="characters"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="Buchstaben" file="core-con.tex"> +<cd:command name="Characters" file="core-con.tex">    <cd:sequence> -    <cd:string value="Buchstaben"/> +    <cd:string value="Characters"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -1185,45 +1181,45 @@    </cd:arguments>  </cd:command> -<cd:command name="monat" file="core-con.tex"> +<cd:command name="month" file="core-con.tex">    <cd:sequence> -    <cd:string value="monat"/> +    <cd:string value="month"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="MONAT" file="core-con.tex"> +<cd:command name="MONTH" file="core-con.tex">    <cd:sequence> -    <cd:string value="MONAT"/> +    <cd:string value="MONTH"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="wochentag" file="core-con.tex"> +<cd:command name="weekday" file="core-con.tex">    <cd:sequence> -    <cd:string value="wochentag"/> +    <cd:string value="weekday"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="WOCHENTAG" file="core-con.tex"> +<cd:command name="WEEKDAY" file="core-con.tex">    <cd:sequence> -    <cd:string value="WOCHENTAG"/> +    <cd:string value="WEEKDAY"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="stelleversalienein" file="core-fnt.tex"> +<cd:command name="setupcapitals" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="stelleversalienein"/> +    <cd:string value="setupcapitals"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -1284,54 +1280,54 @@    </cd:arguments>  </cd:command> -<cd:command name="WORT" file="core-fnt.tex"> +<cd:command name="WORD" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="WORT"/> +    <cd:string value="WORD"/>    </cd:sequence>    <cd:arguments>      <cd:word/>    </cd:arguments>  </cd:command> -<cd:command name="WOERTER" file="core-fnt.tex"> +<cd:command name="WORDS" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="WOERTER"/> +    <cd:string value="WORDS"/>    </cd:sequence>    <cd:arguments>      <cd:word list="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="Wort" file="core-fnt.tex"> +<cd:command name="Word" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="Wort"/> +    <cd:string value="Word"/>    </cd:sequence>    <cd:arguments>      <cd:word/>    </cd:arguments>  </cd:command> -<cd:command name="Woerter" file="core-fnt.tex"> +<cd:command name="Words" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="Woerter"/> +    <cd:string value="Words"/>    </cd:sequence>    <cd:arguments>      <cd:word list="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="gestreckt" file="core-fnt.tex"> +<cd:command name="stretched" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="gestreckt"/> +    <cd:string value="stretched"/>    </cd:sequence>    <cd:arguments>      <cd:word/>    </cd:arguments>  </cd:command> -<cd:command name="definieresymbol" file="symb-ini.tex"> +<cd:command name="definesymbol" file="symb-ini.tex">    <cd:sequence> -    <cd:string value="definieresymbol"/> +    <cd:string value="definesymbol"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1343,9 +1339,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definiereabbsymbol" file="symb-ini.tex"> +<cd:command name="definefiguresymbol" file="symb-ini.tex">    <cd:sequence> -    <cd:string value="definiereabbsymbol"/> +    <cd:string value="definefiguresymbol"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1355,7 +1351,7 @@        <cd:constant type="cd:text"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="externeabbildung"/> +      <cd:inherit name="externalfigure"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -1385,9 +1381,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stellesymbolsetein" file="symb-ini.tex"> +<cd:command name="setupsymbolset" file="symb-ini.tex">    <cd:sequence> -    <cd:string value="stellesymbolsetein"/> +    <cd:string value="setupsymbolset"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1396,9 +1392,9 @@    </cd:arguments>  </cd:command> -<cd:command name="verwendesymbole" file="symb-ini.tex"> +<cd:command name="usesymbols" file="symb-ini.tex">    <cd:sequence> -    <cd:string value="verwendesymbole"/> +    <cd:string value="usesymbols"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1418,9 +1414,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definierekonversion" file="core-con.tex"> +<cd:command name="defineconversion" file="core-con.tex">    <cd:sequence> -    <cd:string value="definierekonversion"/> +    <cd:string value="defineconversion"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1433,9 +1429,9 @@    </cd:arguments>  </cd:command> -<cd:command name="konvertierezahl" file="core-con.tex"> +<cd:command name="convertnumber" file="core-con.tex">    <cd:sequence> -    <cd:string value="konvertierezahl"/> +    <cd:string value="convertnumber"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -1443,9 +1439,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelleueberschrifttextein" file="lang-lab.tex"> +<cd:command name="setupheadtext" file="lang-lab.tex">    <cd:sequence> -    <cd:string value="stelleueberschrifttextein"/> +    <cd:string value="setupheadtext"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -1466,9 +1462,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stellelabeltextein" file="lang-lab.tex"> +<cd:command name="setuplabeltext" file="lang-lab.tex">    <cd:sequence> -    <cd:string value="stellelabeltextein"/> +    <cd:string value="setuplabeltext"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -1489,9 +1485,9 @@    </cd:arguments>  </cd:command> -<cd:command name="ueberschrifttext" file="lang-lab.tex"> +<cd:command name="headtext" file="lang-lab.tex">    <cd:sequence> -    <cd:string value="ueberschrifttext"/> +    <cd:string value="headtext"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -1507,9 +1503,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stellemarginallinieein" file="core-rul.tex"> +<cd:command name="setupmarginrules" file="core-rul.tex">    <cd:sequence> -    <cd:string value="stellemarginallinieein"/> +    <cd:string value="setupmarginrules"/>    </cd:sequence>    <cd:arguments>      <cd:assignments> @@ -1523,9 +1519,9 @@    </cd:arguments>  </cd:command> -<cd:command name="marginallinie" type="environment"> +<cd:command name="marginrule" type="environment">    <cd:sequence> -    <cd:string value="marginallinie"/> +    <cd:string value="marginrule"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1534,9 +1530,9 @@    </cd:arguments>  </cd:command> -<cd:command name="marginallinie"> +<cd:command name="marginrule">    <cd:sequence> -    <cd:string value="marginallinie"/> +    <cd:string value="marginrule"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1546,9 +1542,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stellelinienbreiteein" file="core-rul.tex"> +<cd:command name="setuplinewidth" file="core-rul.tex">    <cd:sequence> -    <cd:string value="stellelinienbreiteein"/> +    <cd:string value="setuplinewidth"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1557,9 +1553,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelleumrahmtein" file="core-rul.tex"> +<cd:command name="setupframed" file="core-rul.tex">    <cd:sequence> -    <cd:string value="stelleumrahmtein"/> +    <cd:string value="setupframed"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -1701,44 +1697,44 @@    </cd:arguments>  </cd:command> -<cd:command name="umrahmt" file="core-rul.tex"> +<cd:command name="framed" file="core-rul.tex">    <cd:sequence> -    <cd:string value="umrahmt"/> +    <cd:string value="framed"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelleumrahmtein"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="imumriss" file="core-rul.tex"> +<cd:command name="inframed" file="core-rul.tex">    <cd:sequence> -    <cd:string value="imumriss"/> +    <cd:string value="inframed"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelleumrahmtein"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="duennerumriss" file="core-rul.tex"> +<cd:command name="thinrules" file="core-rul.tex">    <cd:sequence> -    <cd:string value="duennerumriss"/> +    <cd:string value="thinrules"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes"> -      <cd:inherit name="stelleduennerumrissein"/> +      <cd:inherit name="setupthinrules"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stelleduennerumrissein" file="core-rul.tex"> +<cd:command name="setupthinrules" file="core-rul.tex">    <cd:sequence> -    <cd:string value="stelleduennerumrissein"/> +    <cd:string value="setupthinrules"/>    </cd:sequence>    <cd:arguments>      <cd:assignments> @@ -1795,49 +1791,49 @@    </cd:arguments>  </cd:command> -<cd:command name="haarlinie" file="core-rul.tex"> +<cd:command name="hairline" file="core-rul.tex">    <cd:sequence> -    <cd:string value="haarlinie"/> +    <cd:string value="hairline"/>    </cd:sequence>  </cd:command> -<cd:command name="duennelinie" file="core-rul.tex"> +<cd:command name="thinrule" file="core-rul.tex">    <cd:sequence> -    <cd:string value="duennelinie"/> +    <cd:string value="thinrule"/>    </cd:sequence>  </cd:command> -<cd:command name="definiereumrahmtertext" file="core-rul.tex"> +<cd:command name="defineframedtext" file="core-rul.tex">    <cd:sequence> -    <cd:string value="definiereumrahmtertext"/> +    <cd:string value="defineframedtext"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelleumrahmtetexteein"/> +      <cd:inherit name="setupframedtexts"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="definiereumrahmt" file="core-rul.tex"> +<cd:command name="defineframed" file="core-rul.tex">    <cd:sequence> -    <cd:string value="definiereumrahmt"/> +    <cd:string value="defineframed"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelleumrahmtetexteein"/> +      <cd:inherit name="setupframedtexts"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stelleumrahmtetexteein" file="core-rul.tex"> +<cd:command name="setupframedtexts" file="core-rul.tex">    <cd:sequence> -    <cd:string value="stelleumrahmtetexteein"/> +    <cd:string value="setupframedtexts"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -1891,7 +1887,7 @@          <cd:constant type="mittig"/>          <cd:constant type="kein"/>        </cd:parameter> -      <cd:inherit name="stelleumrahmtein"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -1908,7 +1904,7 @@        <cd:constant type="kein"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelleumrahmtetexteein"/> +      <cd:inherit name="setupframedtexts"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -1919,28 +1915,26 @@    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelleumrahmtetexteein"/> +      <cd:inherit name="setupframedtexts"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="hintergrund" type="environment"> +<cd:command name="background" type="environment">    <cd:sequence> -    <cd:string value="hintergrund"/> +    <cd:string value="background"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="hintergrund"> +<cd:command name="background">    <cd:sequence> -    <cd:string value="hintergrund"/> +    <cd:string value="background"/>    </cd:sequence>  </cd:command> -<cd:command name="stellehintergrundein" file="core-rul.tex"> +<cd:command name="setupbackground" file="core-rul.tex">    <cd:sequence> -    <cd:string value="stellehintergrundein"/> +    <cd:string value="setupbackground"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -1966,40 +1960,40 @@          <cd:constant type="start"/>          <cd:constant type="stop"/>        </cd:parameter> -      <cd:inherit name="stelleumrahmtein"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="gefuelltesrechteck"> +<cd:command name="fillinrules">    <cd:sequence> -    <cd:string value="gefuelltesrechteck"/> +    <cd:string value="fillinrules"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stellegefuelltesrechteckein"/> +      <cd:inherit name="setupfillinrules"/>      </cd:assignments>      <cd:content/>      <cd:content optional="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="ausfuelltext"> +<cd:command name="fillintext">    <cd:sequence> -    <cd:string value="ausfuelltext"/> +    <cd:string value="fillintext"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stellegefuelltesrechteckein"/> +      <cd:inherit name="setupfillinrules"/>      </cd:assignments>      <cd:content/>      <cd:content optional="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="stellegefuelltesrechteckein" file="core-rul.tex"> +<cd:command name="setupfillinrules" file="core-rul.tex">    <cd:sequence> -    <cd:string value="stellegefuelltesrechteckein"/> +    <cd:string value="setupfillinrules"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -2042,21 +2036,21 @@    </cd:arguments>  </cd:command> -<cd:command name="gefuelltezeile"> +<cd:command name="fillinline">    <cd:sequence> -    <cd:string value="gefuelltezeile"/> +    <cd:string value="fillinline"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stellegefuelltezeileein"/> +      <cd:inherit name="setupfillinlines"/>      </cd:assignments>      <cd:nothing/>    </cd:arguments>  </cd:command> -<cd:command name="stellegefuelltezeileein" file="core-rul.tex"> +<cd:command name="setupfillinlines" file="core-rul.tex">    <cd:sequence> -    <cd:string value="stellegefuelltezeileein"/> +    <cd:string value="setupfillinlines"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -2079,9 +2073,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelletextumrissein" file="core-rul.tex"> +<cd:command name="setuptextrules" file="core-rul.tex">    <cd:sequence> -    <cd:string value="stelletextumrissein"/> +    <cd:string value="setuptextrules"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -2131,9 +2125,9 @@    </cd:arguments>  </cd:command> -<cd:command name="textlinie" file="core-rul.tex"> +<cd:command name="textrule" file="core-rul.tex">    <cd:sequence> -    <cd:string value="textlinie"/> +    <cd:string value="textrule"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2144,9 +2138,9 @@    </cd:arguments>  </cd:command> -<cd:command name="textlinie" type="environment" file="core-rul.tex"> +<cd:command name="textrule" type="environment" file="core-rul.tex">    <cd:sequence> -    <cd:string value="textlinie"/> +    <cd:string value="textrule"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2157,31 +2151,31 @@    </cd:arguments>  </cd:command> -<cd:command name="rechteck" file="core-rul.tex"> +<cd:command name="blackrule" file="core-rul.tex">    <cd:sequence> -    <cd:string value="rechteck"/> +    <cd:string value="blackrule"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stellerechteckein"/> +      <cd:inherit name="setupblackrules"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="rechtecke" file="core-rul.tex"> +<cd:command name="blackrules" file="core-rul.tex">    <cd:sequence> -    <cd:string value="rechtecke"/> +    <cd:string value="blackrules"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> -      <cd:inherit name="stellerechteckein"/> +      <cd:inherit name="setupblackrules"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stellerechteckein" file="core-rul.tex"> +<cd:command name="setupblackrules" file="core-rul.tex">    <cd:sequence> -    <cd:string value="stellerechteckein"/> +    <cd:string value="setupblackrules"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -2211,9 +2205,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definiereoverlay" file="core-rul.tex"> +<cd:command name="defineoverlay" file="core-rul.tex">    <cd:sequence> -    <cd:string value="definiereoverlay"/> +    <cd:string value="defineoverlay"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -2225,9 +2219,9 @@    </cd:arguments>  </cd:command> -<cd:command name="verwendemodul"> +<cd:command name="usemodule">    <cd:sequence> -    <cd:string value="verwendemodul"/> +    <cd:string value="usemodule"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -2236,9 +2230,9 @@    </cd:arguments>  </cd:command> -<cd:command name="ruecksetzten" file="core-num.tex"> +<cd:command name="reset" file="core-num.tex">    <cd:sequence> -    <cd:string value="ruecksetzten"/> +    <cd:string value="reset"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -2247,9 +2241,9 @@    </cd:arguments>  </cd:command> -<cd:command name="keintest"> +<cd:command name="donttest">    <cd:sequence> -    <cd:string value="keintest"/> +    <cd:string value="donttest"/>    </cd:sequence>  </cd:command> @@ -2257,13 +2251,11 @@    <cd:sequence>      <cd:string value="localenvironment"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="stellesystemein" file="core-sys.tex"> +<cd:command name="setupsystem" file="core-sys.tex">    <cd:sequence> -    <cd:string value="stellesystemein"/> +    <cd:string value="setupsystem"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -2299,27 +2291,27 @@    </cd:arguments>  </cd:command> -<cd:command name="tief" file="core-fnt.tex"> +<cd:command name="low" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="tief"/> +    <cd:string value="low"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="hoch" file="core-fnt.tex"> +<cd:command name="high" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="hoch"/> +    <cd:string value="high"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="tiho" file="core-fnt.tex"> +<cd:command name="lohi" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="tiho"/> +    <cd:string value="lohi"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2330,9 +2322,9 @@    </cd:arguments>  </cd:command> -<cd:command name="zeigerahmen"> +<cd:command name="showframe">    <cd:sequence> -    <cd:string value="zeigerahmen"/> +    <cd:string value="showframe"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2343,45 +2335,45 @@    </cd:arguments>  </cd:command> -<cd:command name="linksbuendig" file="core-spa.tex"> +<cd:command name="leftaligned" file="core-spa.tex">    <cd:sequence> -    <cd:string value="linksbuendig"/> +    <cd:string value="leftaligned"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="rechtsbuendig" file="core-spa.tex"> +<cd:command name="rightaligned" file="core-spa.tex">    <cd:sequence> -    <cd:string value="rechtsbuendig"/> +    <cd:string value="rightaligned"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="zentriert" file="core-spa.tex"> +<cd:command name="midaligned" file="core-spa.tex">    <cd:sequence> -    <cd:string value="zentriert"/> +    <cd:string value="midaligned"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="wortrechts" file="core-spa.tex"> +<cd:command name="wordright" file="core-spa.tex">    <cd:sequence> -    <cd:string value="wortrechts"/> +    <cd:string value="wordright"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="inmarginalie" file="core-sec.tex"> +<cd:command name="inmargin" file="core-sec.tex">    <cd:sequence> -    <cd:string value="inmarginalie"/> +    <cd:string value="inmargin"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2394,9 +2386,9 @@    </cd:arguments>  </cd:command> -<cd:command name="inanderermarginale" file="page-mar.tex"> +<cd:command name="inothermargin" file="page-mar.tex">    <cd:sequence> -    <cd:string value="inanderermarginale"/> +    <cd:string value="inothermargin"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2409,9 +2401,9 @@    </cd:arguments>  </cd:command> -<cd:command name="imlinken"> +<cd:command name="inleft">    <cd:sequence> -    <cd:string value="imlinken"/> +    <cd:string value="inleft"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2424,9 +2416,9 @@    </cd:arguments>  </cd:command> -<cd:command name="imrechten"> +<cd:command name="inright">    <cd:sequence> -    <cd:string value="imrechten"/> +    <cd:string value="inright"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2469,33 +2461,33 @@    </cd:arguments>  </cd:command> -<cd:command name="spalte"> +<cd:command name="column">    <cd:sequence> -    <cd:string value="spalte"/> +    <cd:string value="column"/>    </cd:sequence>  </cd:command> -<cd:command name="zeigestruts" file="core-spa.tex"> +<cd:command name="showstruts" file="core-spa.tex">    <cd:sequence> -    <cd:string value="zeigestruts"/> +    <cd:string value="showstruts"/>    </cd:sequence>  </cd:command> -<cd:command name="zeigeeinstellungen"> +<cd:command name="showsetups">    <cd:sequence> -    <cd:string value="zeigeeinstellungen"/> +    <cd:string value="showsetups"/>    </cd:sequence>  </cd:command> -<cd:command name="zeigelayout"> +<cd:command name="showlayout">    <cd:sequence> -    <cd:string value="zeigelayout"/> +    <cd:string value="showlayout"/>    </cd:sequence>  </cd:command> -<cd:command name="marginaltext" file="page-mar.tex"> +<cd:command name="margintext" file="page-mar.tex">    <cd:sequence> -    <cd:string value="marginaltext"/> +    <cd:string value="margintext"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2508,9 +2500,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stellemarginalblockein" file="page-flt.tex"> +<cd:command name="setupmarginblocks" file="page-flt.tex">    <cd:sequence> -    <cd:string value="stellemarginalblockein"/> +    <cd:string value="setupmarginblocks"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -2568,8 +2560,6 @@    <cd:sequence>      <cd:string value="marginblock"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="part" file="core-sec.tex"> @@ -2683,9 +2673,9 @@    </cd:arguments>  </cd:command> -<cd:command name="bei"> +<cd:command name="at">    <cd:sequence> -    <cd:string value="bei"/> +    <cd:string value="at"/>    </cd:sequence>    <cd:arguments>      <cd:content interactive="yes"/> @@ -2694,9 +2684,9 @@    </cd:arguments>  </cd:command> -<cd:command name="ueber"> +<cd:command name="about">    <cd:sequence> -    <cd:string value="ueber"/> +    <cd:string value="about"/>    </cd:sequence>    <cd:arguments>      <cd:content interactive="yes"/> @@ -2704,9 +2694,9 @@    </cd:arguments>  </cd:command> -<cd:command name="irgendwo" file="core-ref.tex"> +<cd:command name="somewhere" file="core-ref.tex">    <cd:sequence> -    <cd:string value="irgendwo"/> +    <cd:string value="somewhere"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -2715,9 +2705,9 @@    </cd:arguments>  </cd:command> -<cd:command name="aufseite" file="core-ref.tex"> +<cd:command name="atpage" file="core-ref.tex">    <cd:sequence> -    <cd:string value="aufseite"/> +    <cd:string value="atpage"/>    </cd:sequence>    <cd:arguments>      <cd:reference/> @@ -2740,9 +2730,9 @@    </cd:arguments>  </cd:command> -<cd:command name="textreferenz" file="core-ref.tex"> +<cd:command name="textreference" file="core-ref.tex">    <cd:sequence> -    <cd:string value="textreferenz"/> +    <cd:string value="textreference"/>    </cd:sequence>    <cd:arguments>      <cd:reference/> @@ -2750,18 +2740,18 @@    </cd:arguments>  </cd:command> -<cd:command name="seitenreferenz" file="core-ref.tex"> +<cd:command name="pagereference" file="core-ref.tex">    <cd:sequence> -    <cd:string value="seitenreferenz"/> +    <cd:string value="pagereference"/>    </cd:sequence>    <cd:arguments>      <cd:reference/>    </cd:arguments>  </cd:command> -<cd:command name="referenz" file="core-ref.tex"> +<cd:command name="reference" file="core-ref.tex">    <cd:sequence> -    <cd:string value="referenz"/> +    <cd:string value="reference"/>    </cd:sequence>    <cd:arguments>      <cd:reference/> @@ -2769,9 +2759,9 @@    </cd:arguments>  </cd:command> -<cd:command name="verwendereferenzen" file="core-ref.tex"> +<cd:command name="usereferences" file="core-ref.tex">    <cd:sequence> -    <cd:string value="verwendereferenzen"/> +    <cd:string value="usereferences"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -2780,9 +2770,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definierereferenz" file="core-ref.tex"> +<cd:command name="definereference" file="core-ref.tex">    <cd:sequence> -    <cd:string value="definierereferenz"/> +    <cd:string value="definereference"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -2792,9 +2782,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definierereferenzformat" file="core-ref.tex"> +<cd:command name="definereferenceformat" file="core-ref.tex">    <cd:sequence> -    <cd:string value="definierereferenzformat"/> +    <cd:string value="definereferenceformat"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -2839,9 +2829,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nachunten" file="core-spa.tex"> +<cd:command name="godown" file="core-spa.tex">    <cd:sequence> -    <cd:string value="nachunten"/> +    <cd:string value="godown"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -2850,15 +2840,15 @@    </cd:arguments>  </cd:command> -<cd:command name="zwischenraum" file="core-spa.tex"> +<cd:command name="whitespace" file="core-spa.tex">    <cd:sequence> -    <cd:string value="zwischenraum"/> +    <cd:string value="whitespace"/>    </cd:sequence>  </cd:command> -<cd:command name="keinzwischenraum" file="core-spa.tex"> +<cd:command name="nowhitespace" file="core-spa.tex">    <cd:sequence> -    <cd:string value="keinzwischenraum"/> +    <cd:string value="nowhitespace"/>    </cd:sequence>  </cd:command> @@ -2868,15 +2858,15 @@    </cd:sequence>  </cd:command> -<cd:command name="spatium" file="syst-pln.tex"> +<cd:command name="space" file="syst-pln.tex">    <cd:sequence> -    <cd:string value="spatium"/> +    <cd:string value="space"/>    </cd:sequence>  </cd:command> -<cd:command name="festesspatium" file="core-spa.tex"> +<cd:command name="fixedspaces" file="core-spa.tex">    <cd:sequence> -    <cd:string value="festesspatium"/> +    <cd:string value="fixedspaces"/>    </cd:sequence>  </cd:command> @@ -2891,21 +2881,21 @@    </cd:arguments>  </cd:command> -<cd:command name="keinspatium" file="core-spa.tex"> +<cd:command name="nospace" file="core-spa.tex">    <cd:sequence> -    <cd:string value="keinspatium"/> +    <cd:string value="nospace"/>    </cd:sequence>  </cd:command> -<cd:command name="kleinerdurchschuss" file="core-spa.tex"> +<cd:command name="packed" file="core-spa.tex">    <cd:sequence> -    <cd:string value="kleinerdurchschuss"/> +    <cd:string value="packed"/>    </cd:sequence>  </cd:command> -<cd:command name="definierebeschreibungen" file="core-des.tex"> +<cd:command name="setupdescriptions" file="core-des.tex">    <cd:sequence> -    <cd:string value="definierebeschreibungen"/> +    <cd:string value="setupdescriptions"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -3004,23 +2994,23 @@    </cd:arguments>  </cd:command> -<cd:command name="stellebeschreibungein" file="core-des.tex"> +<cd:command name="setupenumerations" file="core-des.tex">    <cd:sequence> -    <cd:string value="stellebeschreibungein"/> +    <cd:string value="setupenumerations"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes">        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="definierebeschreibung"/> +      <cd:inherit name="definedescription"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="definierenummerierung" file="core-des.tex"> +<cd:command name="defineenumeration" file="core-des.tex">    <cd:sequence> -    <cd:string value="definierenummerierung"/> +    <cd:string value="defineenumeration"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -3030,7 +3020,7 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stellebeschreibungein"/> +      <cd:inherit name="setupenumerations"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -3048,20 +3038,18 @@    <cd:sequence>      <cd:variable value="enumeration"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="definierebeschreibung" file="core-des.tex"> +<cd:command name="definedescription" file="core-des.tex">    <cd:sequence> -    <cd:string value="definierebeschreibung"/> +    <cd:string value="definedescription"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="definierebeschreibungen"/> +      <cd:inherit name="setupdescriptions"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -3085,9 +3073,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelleeinzuegein" file="core-des.tex"> +<cd:command name="setupindentations" file="core-des.tex">    <cd:sequence> -    <cd:string value="stelleeinzuegein"/> +    <cd:string value="setupindentations"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -3140,16 +3128,16 @@    </cd:arguments>  </cd:command> -<cd:command name="definiereeinzug" file="core-des.tex"> +<cd:command name="defineindenting" file="core-des.tex">    <cd:sequence> -    <cd:string value="definiereeinzug"/> +    <cd:string value="defineindenting"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="stelleeinzuegein"/> +      <cd:inherit name="setupindentations"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -3163,9 +3151,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definierelabel" file="core-des.tex"> +<cd:command name="definelabel" file="core-des.tex">    <cd:sequence> -    <cd:string value="definierelabel"/> +    <cd:string value="definelabel"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3219,9 +3207,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stellespaltenein" file="page-mul.tex"> +<cd:command name="setupcolumns" file="page-mul.tex">    <cd:sequence> -    <cd:string value="stellespaltenein"/> +    <cd:string value="setupcolumns"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -3273,7 +3261,7 @@          <cd:constant type="links"/>          <cd:constant type="rechts"/>        </cd:parameter> -      <cd:inherit name="stelleumrahmtein"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -3284,14 +3272,14 @@    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stellespaltenein"/> +      <cd:inherit name="setupcolumns"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="definieretext" file="page-txt.tex"> +<cd:command name="definetext" file="page-txt.tex">    <cd:sequence> -    <cd:string value="definieretext"/> +    <cd:string value="definetext"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3313,9 +3301,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stellekopfzeileein" file="page-txt.tex"> +<cd:command name="setupheader" file="page-txt.tex">    <cd:sequence> -    <cd:string value="stellekopfzeileein"/> +    <cd:string value="setupheader"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -3384,77 +3372,77 @@    </cd:arguments>  </cd:command> -<cd:command name="stellefusszeileein" file="page-txt.tex"> +<cd:command name="setupfooter" file="page-txt.tex">    <cd:sequence> -    <cd:string value="stellefusszeileein"/> +    <cd:string value="setupfooter"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> -      <cd:inherit name="stellekopfzeileein"/> +      <cd:inherit name="setupheader"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="stellekopfzeileein"/> +      <cd:inherit name="setupheader"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stelletextein" file="page-txt.tex"> +<cd:command name="setuptext" file="page-txt.tex">    <cd:sequence> -    <cd:string value="stelletextein"/> +    <cd:string value="setuptext"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> -      <cd:inherit name="stellekopfzeileein"/> +      <cd:inherit name="setupheader"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="stellekopfzeileein"/> +      <cd:inherit name="setupheader"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stellenobenein" file="page-txt.tex"> +<cd:command name="setuptop" file="page-txt.tex">    <cd:sequence> -    <cd:string value="stellenobenein"/> +    <cd:string value="setuptop"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> -      <cd:inherit name="stellekopfzeileein"/> +      <cd:inherit name="setupheader"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="stellekopfzeileein"/> +      <cd:inherit name="setupheader"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stelleuntenein" file="page-txt.tex"> +<cd:command name="setupbottom" file="page-txt.tex">    <cd:sequence> -    <cd:string value="stelleuntenein"/> +    <cd:string value="setupbottom"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> -      <cd:inherit name="stellekopfzeileein"/> +      <cd:inherit name="setupheader"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="stellekopfzeileein"/> +      <cd:inherit name="setupheader"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="keinekopfundfusszeilen" file="page-txt.tex"> +<cd:command name="noheaderandfooterlines" file="page-txt.tex">    <cd:sequence> -    <cd:string value="keinekopfundfusszeilen"/> +    <cd:string value="noheaderandfooterlines"/>    </cd:sequence>  </cd:command> -<cd:command name="keinzeilenobenundunten" file="page-txt.tex"> +<cd:command name="notopandbottomlines" file="page-txt.tex">    <cd:sequence> -    <cd:string value="keinzeilenobenundunten"/> +    <cd:string value="notopandbottomlines"/>    </cd:sequence>  </cd:command> -<cd:command name="stellekopfzeilentextein" file="page-txt.tex"> +<cd:command name="setupheadertexts" file="page-txt.tex">    <cd:sequence> -    <cd:string value="stellekopfzeilentextein"/> +    <cd:string value="setupheadertexts"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -3479,9 +3467,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stellefusszeilentextein" file="page-txt.tex"> +<cd:command name="setupfootertexts" file="page-txt.tex">    <cd:sequence> -    <cd:string value="stellefusszeilentextein"/> +    <cd:string value="setupfootertexts"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -3506,9 +3494,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelletexttexteein" file="page-txt.tex"> +<cd:command name="setuptexttexts" file="page-txt.tex">    <cd:sequence> -    <cd:string value="stelletexttexteein"/> +    <cd:string value="setuptexttexts"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -3533,9 +3521,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelletextobenein" file="page-txt.tex"> +<cd:command name="setuptoptexts" file="page-txt.tex">    <cd:sequence> -    <cd:string value="stelletextobenein"/> +    <cd:string value="setuptoptexts"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -3560,9 +3548,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelletextuntenein" file="page-txt.tex"> +<cd:command name="setupbottomtexts" file="page-txt.tex">    <cd:sequence> -    <cd:string value="stelletextuntenein"/> +    <cd:string value="setupbottomtexts"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -3587,9 +3575,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definierebeschriftung" file="core-mar.tex"> +<cd:command name="definemarking" file="core-mar.tex">    <cd:sequence> -    <cd:string value="definierebeschriftung"/> +    <cd:string value="definemarking"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3601,9 +3589,9 @@    </cd:arguments>  </cd:command> -<cd:command name="verknuepfebeschriftung" file="core-sec.tex"> +<cd:command name="couplemarking" file="core-sec.tex">    <cd:sequence> -    <cd:string value="verknuepfebeschriftung"/> +    <cd:string value="couplemarking"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3615,9 +3603,9 @@    </cd:arguments>  </cd:command> -<cd:command name="entknuepfebeschriftung" file="core-mar.tex"> +<cd:command name="decouplemarking" file="core-mar.tex">    <cd:sequence> -    <cd:string value="entknuepfebeschriftung"/> +    <cd:string value="decouplemarking"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3626,9 +3614,9 @@    </cd:arguments>  </cd:command> -<cd:command name="ruecksetztenbeschriftung" file="core-mar.tex"> +<cd:command name="resetmarking" file="core-mar.tex">    <cd:sequence> -    <cd:string value="ruecksetztenbeschriftung"/> +    <cd:string value="resetmarking"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3637,9 +3625,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stellebeschriftungein" file="core-mar.tex"> +<cd:command name="setupmarking" file="core-mar.tex">    <cd:sequence> -    <cd:string value="stellebeschriftungein"/> +    <cd:string value="setupmarking"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3661,9 +3649,9 @@    </cd:arguments>  </cd:command> -<cd:command name="beschriftung" file="core-mar.tex"> +<cd:command name="marking" file="core-mar.tex">    <cd:sequence> -    <cd:string value="beschriftung"/> +    <cd:string value="marking"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3673,9 +3661,9 @@    </cd:arguments>  </cd:command> -<cd:command name="holebeschriftung" file="core-mar.tex"> +<cd:command name="getmarking" file="core-mar.tex">    <cd:sequence> -    <cd:string value="holebeschriftung"/> +    <cd:string value="getmarking"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3692,18 +3680,18 @@    </cd:arguments>  </cd:command> -<cd:command name="keinebeschriftung" file="core-mar.tex"> +<cd:command name="nomarking" file="core-mar.tex">    <cd:sequence> -    <cd:string value="keinebeschriftung"/> +    <cd:string value="nomarking"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="stellelayoutein" file="page-ini.tex"> +<cd:command name="setuplayout" file="page-ini.tex">    <cd:sequence> -    <cd:string value="stellelayoutein"/> +    <cd:string value="setuplayout"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -3865,9 +3853,9 @@    </cd:arguments>  </cd:command> -<cd:command name="passelayoutan" file="page-lay.tex"> +<cd:command name="adaptlayout" file="page-lay.tex">    <cd:sequence> -    <cd:string value="passelayoutan"/> +    <cd:string value="adaptlayout"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -3885,27 +3873,27 @@    </cd:arguments>  </cd:command> -<cd:command name="zeigegitter" file="page-ini.tex"> +<cd:command name="showgrid" file="page-ini.tex">    <cd:sequence> -    <cd:string value="zeigegitter"/> +    <cd:string value="showgrid"/>    </cd:sequence>  </cd:command> -<cd:command name="amgitterausrichten" file="core-grd.tex"> +<cd:command name="placeongrid" file="core-grd.tex">    <cd:sequence> -    <cd:string value="amgitterausrichten"/> +    <cd:string value="placeongrid"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> -      <cd:inherit name="amgitterneuausrichten"/> +      <cd:inherit name="moveongrid"/>      </cd:keywords>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="amgitterneuausrichten" file="core-grd.tex"> +<cd:command name="moveongrid" file="core-grd.tex">    <cd:sequence> -    <cd:string value="amgitterneuausrichten"/> +    <cd:string value="moveongrid"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -3931,18 +3919,18 @@    </cd:arguments>  </cd:command> -<cd:command name="projekt" type="environment"> +<cd:command name="project" type="environment">    <cd:sequence> -    <cd:string value="projekt"/> +    <cd:string value="project"/>    </cd:sequence>    <cd:arguments>      <cd:file/>    </cd:arguments>  </cd:command> -<cd:command name="umgebung" type="environment"> +<cd:command name="environment" type="environment">    <cd:sequence> -    <cd:string value="umgebung"/> +    <cd:string value="environment"/>    </cd:sequence>    <cd:arguments>      <cd:file/> @@ -3958,24 +3946,24 @@    </cd:arguments>  </cd:command> -<cd:command name="komponente" type="environment"> +<cd:command name="component" type="environment">    <cd:sequence> -    <cd:string value="komponente"/> +    <cd:string value="component"/>    </cd:sequence>    <cd:arguments>      <cd:file/>    </cd:arguments>  </cd:command> -<cd:command name="keinedateienmehr"> +<cd:command name="nomorefiles">    <cd:sequence> -    <cd:string value="keinedateienmehr"/> +    <cd:string value="nomorefiles"/>    </cd:sequence>  </cd:command> -<cd:command name="stellezeilenabstandein"> +<cd:command name="setupinterlinespace">    <cd:sequence> -    <cd:string value="stellezeilenabstandein"/> +    <cd:string value="setupinterlinespace"/>    </cd:sequence>    <cd:arguments>      <cd:choice> @@ -4008,9 +3996,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelleseitennummeriernungein" file="page-num.tex"> +<cd:command name="setuppagenumbering" file="page-num.tex">    <cd:sequence> -    <cd:string value="stelleseitennummeriernungein"/> +    <cd:string value="setuppagenumbering"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4090,9 +4078,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelleengerein" file="core-spa.tex"> +<cd:command name="setupnarrower" file="core-spa.tex">    <cd:sequence> -    <cd:string value="stelleengerein"/> +    <cd:string value="setupnarrower"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4109,9 +4097,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definieren" file="syst-ext.tex"> +<cd:command name="define" file="syst-ext.tex">    <cd:sequence> -    <cd:string value="definieren"/> +    <cd:string value="define"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -4122,18 +4110,18 @@    </cd:arguments>  </cd:command> -<cd:command name="verwendebefehl" file="core-sys.tex"> +<cd:command name="usecommands" file="core-sys.tex">    <cd:sequence> -    <cd:string value="verwendebefehl"/> +    <cd:string value="usecommands"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="definierestartstop" file="core-sys.tex"> +<cd:command name="definestartstop" file="core-sys.tex">    <cd:sequence> -    <cd:string value="definierestartstop"/> +    <cd:string value="definestartstop"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -4163,9 +4151,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelleueberschriftenein" file="core-sec.tex"> +<cd:command name="setupheads" file="core-sec.tex">    <cd:sequence> -    <cd:string value="stelleueberschriftenein"/> +    <cd:string value="setupheads"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4215,9 +4203,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stellebilderunterschriftein" file="page-flt.tex"> +<cd:command name="setupcaptions" file="page-flt.tex">    <cd:sequence> -    <cd:string value="stellebilderunterschriftein"/> +    <cd:string value="setupcaptions"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4296,23 +4284,23 @@    </cd:arguments>  </cd:command> -<cd:command name="stellebildunterschriftein" file="page-flt.tex"> +<cd:command name="setupcaption" file="page-flt.tex">    <cd:sequence> -    <cd:string value="stellebildunterschriftein"/> +    <cd:string value="setupcaption"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="stellebilderunterschriftein"/> +      <cd:inherit name="setupcaptions"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stellegleitobjekteein" file="page-flt.tex"> +<cd:command name="setupfloats" file="page-flt.tex">    <cd:sequence> -    <cd:string value="stellegleitobjekteein"/> +    <cd:string value="setupfloats"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4389,14 +4377,14 @@          <cd:constant type="normal"/>          <cd:constant type="zeile"/>        </cd:parameter> -      <cd:inherit name="stelleumrahmtein"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stelleplatziegeteiltegleitobjekt" file="page-flt.tex"> +<cd:command name="setupfloatsplitting" file="page-flt.tex">    <cd:sequence> -    <cd:string value="stelleplatziegeteiltegleitobjekt"/> +    <cd:string value="setupfloatsplitting"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4414,22 +4402,22 @@    </cd:arguments>  </cd:command> -<cd:command name="teilegleitobjekt" file="page-flt.tex"> +<cd:command name="splitfloat" file="page-flt.tex">    <cd:sequence> -    <cd:string value="teilegleitobjekt"/> +    <cd:string value="splitfloat"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelleplatziegeteiltegleitobjekt"/> +      <cd:inherit name="setupfloatsplitting"/>      </cd:assignments>      <cd:content/>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="stellegegenueberplatzierenein" file="page-ini.tex"> +<cd:command name="setupoppositeplacing" file="page-ini.tex">    <cd:sequence> -    <cd:string value="stellegegenueberplatzierenein"/> +    <cd:string value="setupoppositeplacing"/>    </cd:sequence>    <cd:arguments>      <cd:assignments> @@ -4454,13 +4442,11 @@    <cd:sequence>      <cd:string value="opposite"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="stellebindestrichein" file="core-mis.tex"> +<cd:command name="setuphyphenmark" file="core-mis.tex">    <cd:sequence> -    <cd:string value="stellebindestrichein"/> +    <cd:string value="setuphyphenmark"/>    </cd:sequence>    <cd:arguments>      <cd:assignments> @@ -4478,9 +4464,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stellepositionierenein" file="page-lyr.tex"> +<cd:command name="setuppositioning" file="page-lyr.tex">    <cd:sequence> -    <cd:string value="stellepositionierenein"/> +    <cd:string value="setuppositioning"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4523,13 +4509,11 @@    <cd:sequence>      <cd:string value="positioning"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="gitter" file="core-spa.tex"> +<cd:command name="grid" file="core-spa.tex">    <cd:sequence> -    <cd:string value="gitter"/> +    <cd:string value="grid"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4584,9 +4568,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seite" file="page-ini.tex"> +<cd:command name="page" file="page-ini.tex">    <cd:sequence> -    <cd:string value="seite"/> +    <cd:string value="page"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -4611,9 +4595,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stellereferenzierenein" file="core-ref.tex"> +<cd:command name="setupreferencing" file="core-ref.tex">    <cd:sequence> -    <cd:string value="stellereferenzierenein"/> +    <cd:string value="setupreferencing"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4667,9 +4651,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelleurlein" file="core-ref.tex"> +<cd:command name="setupurl" file="core-ref.tex">    <cd:sequence> -    <cd:string value="stelleurlein"/> +    <cd:string value="setupurl"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4697,9 +4681,9 @@    </cd:arguments>  </cd:command> -<cd:command name="schreibezurreferenzliste" file="core-lst.tex"> +<cd:command name="writetoreferencelist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="schreibezurreferenzliste"/> +    <cd:string value="writetoreferencelist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -4710,9 +4694,9 @@    </cd:arguments>  </cd:command> -<cd:command name="platzierereferenzliste"> +<cd:command name="placereferencelist">    <cd:sequence> -    <cd:string value="platzierereferenzliste"/> +    <cd:string value="placereferencelist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -4721,23 +4705,23 @@    </cd:arguments>  </cd:command> -<cd:command name="definierereferenzliste" file="core-lst.tex"> +<cd:command name="definereferencelist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="definierereferenzliste"/> +    <cd:string value="definereferencelist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stellereferenzlisteein"/> +      <cd:inherit name="setupreferencelist"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stellereferenzlisteein" file="core-lst.tex"> +<cd:command name="setupreferencelist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="stellereferenzlisteein"/> +    <cd:string value="setupreferencelist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -4767,9 +4751,9 @@    </cd:arguments>  </cd:command> -<cd:command name="schreibezurliste" file="core-lst.tex"> +<cd:command name="writetolist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="schreibezurliste"/> +    <cd:string value="writetolist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -4781,9 +4765,9 @@    </cd:arguments>  </cd:command> -<cd:command name="schreibezwischenliste" file="core-lst.tex"> +<cd:command name="writebetweenlist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="schreibezwischenliste"/> +    <cd:string value="writebetweenlist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -4794,9 +4778,9 @@    </cd:arguments>  </cd:command> -<cd:command name="keineliste" file="core-lst.tex"> +<cd:command name="nolist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="keineliste"/> +    <cd:string value="nolist"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -4815,51 +4799,51 @@    </cd:arguments>  </cd:command> -<cd:command name="platziereliste" file="core-lst.tex"> +<cd:command name="placelist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="platziereliste"/> +    <cd:string value="placelist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes">        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stellelisteein"/> +      <cd:inherit name="setuplist"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="bestimmelistencharakeristika" file="core-lst.tex"> +<cd:command name="determinelistcharacteristics" file="core-lst.tex">    <cd:sequence> -    <cd:string value="bestimmelistencharakeristika"/> +    <cd:string value="determinelistcharacteristics"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes">        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stellelisteein"/> +      <cd:inherit name="setuplist"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="platzierezusammengestellteliste" file="core-lst.tex"> +<cd:command name="placecombinedlist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="platzierezusammengestellteliste"/> +    <cd:string value="placecombinedlist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stellezusammengestelltelisteein"/> +      <cd:inherit name="setupcombinedlist"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="definiereliste" file="core-lst.tex"> +<cd:command name="definelist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="definiereliste"/> +    <cd:string value="definelist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -4869,14 +4853,14 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stellelisteein"/> +      <cd:inherit name="setuplist"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stellelisteein" file="core-lst.tex"> +<cd:command name="setuplist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="stellelisteein"/> +    <cd:string value="setuplist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -5047,14 +5031,14 @@        <cd:parameter name="maxbreite">          <cd:constant type="cd:dimension"/>        </cd:parameter> -      <cd:inherit name="umrahmt"/> +      <cd:inherit name="framed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="definierezusammengestellteliste" file="core-lst.tex"> +<cd:command name="definecombinedlist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="definierezusammengestellteliste"/> +    <cd:string value="definecombinedlist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -5064,14 +5048,14 @@        <cd:constant type="cd:list"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stellezusammengestelltelisteein"/> +      <cd:inherit name="setupcombinedlist"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stellezusammengestelltelisteein" file="core-lst.tex"> +<cd:command name="setupcombinedlist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="stellezusammengestelltelisteein"/> +    <cd:string value="setupcombinedlist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -5086,12 +5070,12 @@          <cd:constant type="cd:section"/>          <cd:constant type="aktuell"/>        </cd:parameter> -      <cd:inherit name="stellelisteein"/> +      <cd:inherit name="setuplist"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="platzierezusammengestellteliste" generated="yes" file="core-lst.tex"> +<cd:command name="placecombinedlist" generated="yes" file="core-lst.tex">    <cd:sequence>      <cd:string value="platziere"/>      <cd:variable value="combinedlist"/> @@ -5101,7 +5085,7 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stellezusammengestelltelisteein"/> +      <cd:inherit name="setupcombinedlist"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -5116,14 +5100,14 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="stellezusammengestelltelisteein"/> +      <cd:inherit name="setupcombinedlist"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stellenummerierungein" file="core-num.tex"> +<cd:command name="setupnumbering" file="core-num.tex">    <cd:sequence> -    <cd:string value="stellenummerierungein"/> +    <cd:string value="setupnumbering"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -5199,18 +5183,18 @@    </cd:arguments>  </cd:command> -<cd:command name="publikation" file="core-mis.tex"> +<cd:command name="publication" file="core-mis.tex">    <cd:sequence> -    <cd:string value="publikation"/> +    <cd:string value="publication"/>    </cd:sequence>    <cd:arguments>      <cd:reference/>    </cd:arguments>  </cd:command> -<cd:command name="stellepublikationein" file="core-mis.tex"> +<cd:command name="setuppublications" file="core-mis.tex">    <cd:sequence> -    <cd:string value="stellepublikationein"/> +    <cd:string value="setuppublications"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -5218,14 +5202,14 @@          <cd:constant type="apa"/>          <cd:constant type="normal"/>        </cd:parameter> -      <cd:inherit name="stellebeschreibungein"/> +      <cd:inherit name="setupenumerations"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stellezeilenein" file="page-lin.tex"> +<cd:command name="setuplines" file="page-lin.tex">    <cd:sequence> -    <cd:string value="stellezeilenein"/> +    <cd:string value="setuplines"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -5252,13 +5236,11 @@    <cd:sequence>      <cd:string value="lines"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="stelleabsatznummerierungein" file="page-lin.tex"> +<cd:command name="setupparagraphnumbering" file="page-lin.tex">    <cd:sequence> -    <cd:string value="stelleabsatznummerierungein"/> +    <cd:string value="setupparagraphnumbering"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -5285,9 +5267,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stellezeilennumerierungein" file="page-lin.tex"> +<cd:command name="setuplinenumbering" file="page-lin.tex">    <cd:sequence> -    <cd:string value="stellezeilennumerierungein"/> +    <cd:string value="setuplinenumbering"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -5353,27 +5335,27 @@    </cd:arguments>  </cd:command> -<cd:command name="einezeile" file="page-lin.tex"> +<cd:command name="someline" file="page-lin.tex">    <cd:sequence> -    <cd:string value="einezeile"/> +    <cd:string value="someline"/>    </cd:sequence>    <cd:arguments>      <cd:reference/>    </cd:arguments>  </cd:command> -<cd:command name="inzeile" file="page-lin.tex"> +<cd:command name="inline" file="page-lin.tex">    <cd:sequence> -    <cd:string value="inzeile"/> +    <cd:string value="inline"/>    </cd:sequence>    <cd:arguments>      <cd:reference/>    </cd:arguments>  </cd:command> -<cd:command name="stelleinmarginalieein" file="page-mar.tex"> +<cd:command name="setupinmargin" file="page-mar.tex">    <cd:sequence> -    <cd:string value="stelleinmarginalieein"/> +    <cd:string value="setupinmargin"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -5432,14 +5414,14 @@          <cd:constant type="ja"/>          <cd:constant type="nein"/>        </cd:parameter> -      <cd:inherit name="stelleumrahmtein"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stelleseitennummerein" file="page-num.tex"> +<cd:command name="setuppagenumber" file="page-num.tex">    <cd:sequence> -    <cd:string value="stelleseitennummerein"/> +    <cd:string value="setuppagenumber"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -5455,9 +5437,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelleunterseitennummerein" file="page-num.tex"> +<cd:command name="setupsubpagenumber" file="page-num.tex">    <cd:sequence> -    <cd:string value="stelleunterseitennummerein"/> +    <cd:string value="setupsubpagenumber"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -5474,9 +5456,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelleblankoein"> +<cd:command name="setupblank">    <cd:sequence> -    <cd:string value="stelleblankoein"/> +    <cd:string value="setupblank"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -5493,23 +5475,23 @@    </cd:arguments>  </cd:command> -<cd:command name="definiereblanko" file="core-spa.tex"> +<cd:command name="defineblank" file="core-spa.tex">    <cd:sequence> -    <cd:string value="definiereblanko"/> +    <cd:string value="defineblank"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:keywords> -      <cd:inherit name="stelleblankoein"/> +      <cd:inherit name="setupblank"/>      </cd:keywords>    </cd:arguments>  </cd:command> -<cd:command name="definierepapierformat" file="page-lay.tex"> +<cd:command name="definepapersize" file="page-lay.tex">    <cd:sequence> -    <cd:string value="definierepapierformat"/> +    <cd:string value="definepapersize"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -5570,9 +5552,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stellepapierformatein" file="page-lay.tex"> +<cd:command name="setuppapersize" file="page-lay.tex">    <cd:sequence> -    <cd:string value="stellepapierformatein"/> +    <cd:string value="setuppapersize"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -5610,9 +5592,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelleanordnenein" file="page-imp.tex"> +<cd:command name="setuparranging" file="page-imp.tex">    <cd:sequence> -    <cd:string value="stelleanordnenein"/> +    <cd:string value="setuparranging"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -5639,26 +5621,26 @@    </cd:arguments>  </cd:command> -<cd:command name="zeigedruck"> +<cd:command name="showprint">    <cd:sequence> -    <cd:string value="zeigedruck"/> +    <cd:string value="showprint"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> -      <cd:inherit name="stellepapierformatein"/> +      <cd:inherit name="setuppapersize"/>      </cd:keywords>      <cd:keywords list="yes"> -      <cd:inherit name="stellepapierformatein"/> +      <cd:inherit name="setuppapersize"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="stellelayoutein"/> +      <cd:inherit name="setuplayout"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="definierelogo" file="page-log.tex"> +<cd:command name="definelogo" file="page-log.tex">    <cd:sequence> -    <cd:string value="definierelogo"/> +    <cd:string value="definelogo"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -5694,9 +5676,9 @@    </cd:arguments>  </cd:command> -<cd:command name="platzierelogo" file="page-log.tex"> +<cd:command name="placelogos" file="page-log.tex">    <cd:sequence> -    <cd:string value="platzierelogo"/> +    <cd:string value="placelogos"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -5705,9 +5687,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stellezwischenraumein"> +<cd:command name="setupwhitespace">    <cd:sequence> -    <cd:string value="stellezwischenraumein"/> +    <cd:string value="setupwhitespace"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -5723,9 +5705,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelleeinziehenein"> +<cd:command name="setupindenting">    <cd:sequence> -    <cd:string value="stelleeinziehenein"/> +    <cd:string value="setupindenting"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -5740,23 +5722,23 @@    </cd:arguments>  </cd:command> -<cd:command name="definiereabschnittsblock" file="core-sec.tex"> +<cd:command name="definesectionblock" file="core-sec.tex">    <cd:sequence> -    <cd:string value="definiereabschnittsblock"/> +    <cd:string value="definesectionblock"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelleabschnittsblockein"/> +      <cd:inherit name="setupsectionblock"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stelleabschnittsblockein" file="core-sec.tex"> +<cd:command name="setupsectionblock" file="core-sec.tex">    <cd:sequence> -    <cd:string value="stelleabschnittsblockein"/> +    <cd:string value="setupsectionblock"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -5781,9 +5763,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definiereabschnitt" file="core-sec.tex"> +<cd:command name="definesection" file="core-sec.tex">    <cd:sequence> -    <cd:string value="definiereabschnitt"/> +    <cd:string value="definesection"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -5792,9 +5774,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelleabschnittein" file="core-sec.tex"> +<cd:command name="setupsection" file="core-sec.tex">    <cd:sequence> -    <cd:string value="stelleabschnittein"/> +    <cd:string value="setupsection"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -5819,9 +5801,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelleueberschriftein" file="core-sec.tex"> +<cd:command name="setuphead" file="core-sec.tex">    <cd:sequence> -    <cd:string value="stelleueberschriftein"/> +    <cd:string value="setuphead"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -5958,14 +5940,14 @@          <cd:constant type="ja"/>          <cd:constant type="nein"/>        </cd:parameter> -      <cd:inherit name="stelleueberschriftenein"/> +      <cd:inherit name="setupheads"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stellekopfzahlein" file="core-sec.tex"> +<cd:command name="setupheadnumber" file="core-sec.tex">    <cd:sequence> -    <cd:string value="stellekopfzahlein"/> +    <cd:string value="setupheadnumber"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -5979,9 +5961,9 @@    </cd:arguments>  </cd:command> -<cd:command name="kopfnummer"> +<cd:command name="headnumber">    <cd:sequence> -    <cd:string value="kopfnummer"/> +    <cd:string value="headnumber"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -5990,9 +5972,9 @@    </cd:arguments>  </cd:command> -<cd:command name="bestimmekopfnummer" file="core-sec.tex"> +<cd:command name="determineheadnumber" file="core-sec.tex">    <cd:sequence> -    <cd:string value="bestimmekopfnummer"/> +    <cd:string value="determineheadnumber"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6001,9 +5983,9 @@    </cd:arguments>  </cd:command> -<cd:command name="heutigeskopfnummer" file="core-sec.tex"> +<cd:command name="currentheadnumber" file="core-sec.tex">    <cd:sequence> -    <cd:string value="heutigeskopfnummer"/> +    <cd:string value="currentheadnumber"/>    </cd:sequence>  </cd:command> @@ -6014,9 +5996,9 @@    </cd:sequence>  </cd:command> -<cd:command name="definiereueberschrift" file="core-sec.tex"> +<cd:command name="definehead" file="core-sec.tex">    <cd:sequence> -    <cd:string value="definiereueberschrift"/> +    <cd:string value="definehead"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6196,9 +6178,9 @@    </cd:arguments>  </cd:command> -<cd:command name="pos"> +<cd:command name="item">    <cd:sequence> -    <cd:string value="pos"/> +    <cd:string value="item"/>    </cd:sequence>    <cd:arguments>      <cd:reference optional="yes" list="yes"/> @@ -6232,9 +6214,9 @@    </cd:arguments>  </cd:command> -<cd:command name="kopf"> +<cd:command name="head">    <cd:sequence> -    <cd:string value="kopf"/> +    <cd:string value="head"/>    </cd:sequence>    <cd:arguments>      <cd:reference optional="yes" list="yes"/> @@ -6275,9 +6257,9 @@    </cd:sequence>  </cd:command> -<cd:command name="definiereregister" file="core-reg.tex"> +<cd:command name="defineregister" file="core-reg.tex">    <cd:sequence> -    <cd:string value="definiereregister"/> +    <cd:string value="defineregister"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6289,9 +6271,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelleregisterein" file="core-reg.tex"> +<cd:command name="setupregister" file="core-reg.tex">    <cd:sequence> -    <cd:string value="stelleregisterein"/> +    <cd:string value="setupregister"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6434,9 +6416,9 @@    </cd:arguments>  </cd:command> -<cd:command name="schreibezumregister" file="core-reg.tex"> +<cd:command name="writetoregister" file="core-reg.tex">    <cd:sequence> -    <cd:string value="schreibezumregister"/> +    <cd:string value="writetoregister"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6462,9 +6444,9 @@    </cd:arguments>  </cd:command> -<cd:command name="verknuepfregister" file="core-reg.tex"> +<cd:command name="coupleregister" file="core-reg.tex">    <cd:sequence> -    <cd:string value="verknuepfregister"/> +    <cd:string value="coupleregister"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6473,16 +6455,16 @@    </cd:arguments>  </cd:command> -<cd:command name="platziereregister" file="core-reg.tex"> +<cd:command name="placeregister" file="core-reg.tex">    <cd:sequence> -    <cd:string value="platziereregister"/> +    <cd:string value="placeregister"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelleregisterein"/> +      <cd:inherit name="setupregister"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -6508,26 +6490,26 @@    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="yes" optional="yes" list="yes"> -      <cd:inherit name="stelleregisterein"/> +      <cd:inherit name="setupregister"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="platziereregister" generated="yes" file="core-reg.tex"> +<cd:command name="placeregister" generated="yes" file="core-reg.tex">    <cd:sequence>      <cd:string value="platziere"/>      <cd:variable value="register"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="yes" optional="yes" list="yes"> -      <cd:inherit name="stelleregisterein"/> +      <cd:inherit name="setupregister"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="definieresynonyme" file="core-syn.tex"> +<cd:command name="definesynonyms" file="core-syn.tex">    <cd:sequence> -    <cd:string value="definieresynonyme"/> +    <cd:string value="definesynonyms"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6545,9 +6527,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stellesynonymein" file="core-syn.tex"> +<cd:command name="setupsynonyms" file="core-syn.tex">    <cd:sequence> -    <cd:string value="stellesynonymein"/> +    <cd:string value="setupsynonyms"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6644,9 +6626,9 @@    </cd:sequence>  </cd:command> -<cd:command name="definieresortieren" file="core-syn.tex"> +<cd:command name="definesorting" file="core-syn.tex">    <cd:sequence> -    <cd:string value="definieresortieren"/> +    <cd:string value="definesorting"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6661,9 +6643,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stellesortierenein" file="core-syn.tex"> +<cd:command name="setupsorting" file="core-syn.tex">    <cd:sequence> -    <cd:string value="stellesortierenein"/> +    <cd:string value="setupsorting"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6739,16 +6721,16 @@    </cd:sequence>  </cd:command> -<cd:command name="definiereumbruch" file="page-mak.tex"> +<cd:command name="definemakeup" file="page-mak.tex">    <cd:sequence> -    <cd:string value="definiereumbruch"/> +    <cd:string value="definemakeup"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="stelleumbruchein"/> +      <cd:inherit name="setupmakeup"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -6762,14 +6744,14 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelleumbruchein"/> +      <cd:inherit name="setupmakeup"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stelleumbruchein" file="page-mak.tex"> +<cd:command name="setupmakeup" file="page-mak.tex">    <cd:sequence> -    <cd:string value="stelleumbruchein"/> +    <cd:string value="setupmakeup"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6849,8 +6831,6 @@      <cd:variable value="name"/>      <cd:string value="umbruch"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="version"> @@ -6866,20 +6846,20 @@    </cd:arguments>  </cd:command> -<cd:command name="heutigesdatum"> +<cd:command name="currentdate">    <cd:sequence> -    <cd:string value="heutigesdatum"/> +    <cd:string value="currentdate"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> -      <cd:inherit name="datum"/> +      <cd:inherit name="date"/>      </cd:keywords>    </cd:arguments>  </cd:command> -<cd:command name="datum" file="core-con.tex"> +<cd:command name="date" file="core-con.tex">    <cd:sequence> -    <cd:string value="datum"/> +    <cd:string value="date"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> @@ -6898,15 +6878,15 @@    </cd:arguments>  </cd:command> -<cd:command name="verweisdatum" file="core-mis.tex"> +<cd:command name="referraldate" file="core-mis.tex">    <cd:sequence> -    <cd:string value="verweisdatum"/> +    <cd:string value="referraldate"/>    </cd:sequence>  </cd:command> -<cd:command name="einziehen" file="core-spa.tex"> +<cd:command name="indenting" file="core-spa.tex">    <cd:sequence> -    <cd:string value="einziehen"/> +    <cd:string value="indenting"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -6921,15 +6901,15 @@    </cd:arguments>  </cd:command> -<cd:command name="nichteinziehen" file="core-spa.tex"> +<cd:command name="noindenting" file="core-spa.tex">    <cd:sequence> -    <cd:string value="nichteinziehen"/> +    <cd:string value="noindenting"/>    </cd:sequence>  </cd:command> -<cd:command name="blanko" file="core-spa.tex"> +<cd:command name="blank" file="core-spa.tex">    <cd:sequence> -    <cd:string value="blanko"/> +    <cd:string value="blank"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -6952,9 +6932,9 @@    </cd:arguments>  </cd:command> -<cd:command name="kleinerdurchschuss" type="environment" file="core-spa.tex"> +<cd:command name="packed" type="environment" file="core-spa.tex">    <cd:sequence> -    <cd:string value="kleinerdurchschuss"/> +    <cd:string value="packed"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -6967,21 +6947,17 @@    <cd:sequence>      <cd:string value="unpacked"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="linecorrection" type="environment">    <cd:sequence>      <cd:string value="linecorrection"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="korrigierezwischenraum" file="core-spa.tex"> +<cd:command name="correctwhitespace" file="core-spa.tex">    <cd:sequence> -    <cd:string value="korrigierezwischenraum"/> +    <cd:string value="correctwhitespace"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -6992,16 +6968,12 @@    <cd:sequence>      <cd:string value="postponing"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="lokal" type="environment">    <cd:sequence>      <cd:string value="lokal"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="narrower" type="environment"> @@ -7021,13 +6993,11 @@    <cd:sequence>      <cd:string value="hiding"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="stelleausrichtungein" file="core-spa.tex"> +<cd:command name="setupalign" file="core-spa.tex">    <cd:sequence> -    <cd:string value="stelleausrichtungein"/> +    <cd:string value="setupalign"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7057,14 +7027,14 @@    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> -      <cd:inherit name="stelleausrichtungein"/> +      <cd:inherit name="setupalign"/>      </cd:keywords>    </cd:arguments>  </cd:command> -<cd:command name="stellespatiumein"> +<cd:command name="setupspacing">    <cd:sequence> -    <cd:string value="stellespatiumein"/> +    <cd:string value="setupspacing"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7074,9 +7044,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelletoleranzein" file="core-spa.tex"> +<cd:command name="setuptolerance" file="core-spa.tex">    <cd:sequence> -    <cd:string value="stelletoleranzein"/> +    <cd:string value="setuptolerance"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7092,9 +7062,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seitentyp" file="page-ini.tex"> +<cd:command name="pagetype" file="page-ini.tex">    <cd:sequence> -    <cd:string value="seitentyp"/> +    <cd:string value="pagetype"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7103,9 +7073,9 @@    </cd:arguments>  </cd:command> -<cd:command name="bearbeiteseite" file="page-ini.tex"> +<cd:command name="processpage" file="page-ini.tex">    <cd:sequence> -    <cd:string value="bearbeiteseite"/> +    <cd:string value="processpage"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7118,9 +7088,9 @@    </cd:arguments>  </cd:command> -<cd:command name="doppelseite" file="page-ini.tex"> +<cd:command name="couplepage" file="page-ini.tex">    <cd:sequence> -    <cd:string value="doppelseite"/> +    <cd:string value="couplepage"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7150,9 +7120,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stellerasterein" file="core-rul.tex"> +<cd:command name="setupscreens" file="core-rul.tex">    <cd:sequence> -    <cd:string value="stellerasterein"/> +    <cd:string value="setupscreens"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -7174,9 +7144,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stellehintergruendeein" file="page-bck.tex"> +<cd:command name="setupbackgrounds" file="page-bck.tex">    <cd:sequence> -    <cd:string value="stellehintergruendeein"/> +    <cd:string value="setupbackgrounds"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -7203,7 +7173,7 @@          <cd:constant type="stop"/>          <cd:variable type="cd:repeat"/>        </cd:parameter> -      <cd:inherit name="stelleumrahmtein"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -7219,9 +7189,9 @@    </cd:arguments>  </cd:command> -<cd:command name="holepuffer"> +<cd:command name="getbuffer">    <cd:sequence> -    <cd:string value="holepuffer"/> +    <cd:string value="getbuffer"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -7230,9 +7200,9 @@    </cd:arguments>  </cd:command> -<cd:command name="tippepuffer" file="core-buf.tex"> +<cd:command name="typebuffer" file="core-buf.tex">    <cd:sequence> -    <cd:string value="tippepuffer"/> +    <cd:string value="typebuffer"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7241,9 +7211,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definierepuffer" file="core-buf.tex"> +<cd:command name="definebuffer" file="core-buf.tex">    <cd:sequence> -    <cd:string value="definierepuffer"/> +    <cd:string value="definebuffer"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7252,9 +7222,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stellepufferein" file="core-buf.tex"> +<cd:command name="setupbuffer" file="core-buf.tex">    <cd:sequence> -    <cd:string value="stellepufferein"/> +    <cd:string value="setupbuffer"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -7274,9 +7244,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definiereblock" file="core-buf.tex"> +<cd:command name="defineblock" file="core-buf.tex">    <cd:sequence> -    <cd:string value="definiereblock"/> +    <cd:string value="defineblock"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7285,15 +7255,15 @@    </cd:arguments>  </cd:command> -<cd:command name="keinebloeckemehr" file="core-buf.tex"> +<cd:command name="nomoreblocks" file="core-buf.tex">    <cd:sequence> -    <cd:string value="keinebloeckemehr"/> +    <cd:string value="nomoreblocks"/>    </cd:sequence>  </cd:command> -<cd:command name="verbergebloecke" file="core-buf.tex"> +<cd:command name="hideblocks" file="core-buf.tex">    <cd:sequence> -    <cd:string value="verbergebloecke"/> +    <cd:string value="hideblocks"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7305,9 +7275,9 @@    </cd:arguments>  </cd:command> -<cd:command name="behaltebloecke" file="core-buf.tex"> +<cd:command name="keepblocks" file="core-buf.tex">    <cd:sequence> -    <cd:string value="behaltebloecke"/> +    <cd:string value="keepblocks"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7320,9 +7290,9 @@    </cd:arguments>  </cd:command> -<cd:command name="verwendebloecke" file="core-buf.tex"> +<cd:command name="useblocks" file="core-buf.tex">    <cd:sequence> -    <cd:string value="verwendebloecke"/> +    <cd:string value="useblocks"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7334,9 +7304,9 @@    </cd:arguments>  </cd:command> -<cd:command name="bearbeitebloecke" file="core-buf.tex"> +<cd:command name="processblocks" file="core-buf.tex">    <cd:sequence> -    <cd:string value="bearbeitebloecke"/> +    <cd:string value="processblocks"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7376,9 +7346,9 @@    </cd:arguments>  </cd:command> -<cd:command name="waehlebloeckeaus" file="core-buf.tex"> +<cd:command name="selectblocks" file="core-buf.tex">    <cd:sequence> -    <cd:string value="waehlebloeckeaus"/> +    <cd:string value="selectblocks"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7396,9 +7366,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelleblockein" file="core-buf.tex"> +<cd:command name="setupblock" file="core-buf.tex">    <cd:sequence> -    <cd:string value="stelleblockein"/> +    <cd:string value="setupblock"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7435,22 +7405,20 @@    <cd:sequence>      <cd:variable value="formel"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="mathematik" file="supp-mat.tex"> +<cd:command name="mathematics" file="supp-mat.tex">    <cd:sequence> -    <cd:string value="mathematik"/> +    <cd:string value="mathematics"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="platziereformel" file="core-mat.tex"> +<cd:command name="placeformula" file="core-mat.tex">    <cd:sequence> -    <cd:string value="platziereformel"/> +    <cd:string value="placeformula"/>    </cd:sequence>    <cd:arguments>      <cd:reference optional="yes" list="yes"/> @@ -7459,9 +7427,9 @@    </cd:arguments>  </cd:command> -<cd:command name="platziereunterformel" file="core-mat.tex"> +<cd:command name="placesubformula" file="core-mat.tex">    <cd:sequence> -    <cd:string value="platziereunterformel"/> +    <cd:string value="placesubformula"/>    </cd:sequence>    <cd:arguments>      <cd:reference optional="yes" list="yes"/> @@ -7542,9 +7510,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definieregleitobjekt" file="page-flt.tex"> +<cd:command name="definefloat" file="page-flt.tex">    <cd:sequence> -    <cd:string value="definieregleitobjekt"/> +    <cd:string value="definefloat"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7556,9 +7524,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stellegleitobjektein" file="page-flt.tex"> +<cd:command name="setupfloat" file="page-flt.tex">    <cd:sequence> -    <cd:string value="stellegleitobjektein"/> +    <cd:string value="setupfloat"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7597,7 +7565,7 @@          <cd:constant type="mittig"/>          <cd:constant type="rechts"/>        </cd:parameter> -      <cd:inherit name="stelleumrahmtein"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -7628,8 +7596,6 @@      <cd:string value="placelistof"/>      <cd:variable value="floats"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="completelistoffloats" generated="yes"> @@ -7637,13 +7603,11 @@      <cd:string value="completelistof"/>      <cd:variable value="floats"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="verweis" file="core-mis.tex"> +<cd:command name="referral" file="core-mis.tex">    <cd:sequence> -    <cd:string value="verweis"/> +    <cd:string value="referral"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -7669,9 +7633,9 @@    </cd:arguments>  </cd:command> -<cd:command name="waehlepapieraus"> +<cd:command name="selectpaper">    <cd:sequence> -    <cd:string value="waehlepapieraus"/> +    <cd:string value="selectpaper"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -7683,9 +7647,9 @@    </cd:arguments>  </cd:command> -<cd:command name="doppelseitigespapier"> +<cd:command name="couplepaper">    <cd:sequence> -    <cd:string value="doppelseitigespapier"/> +    <cd:string value="couplepaper"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7705,9 +7669,9 @@    </cd:arguments>  </cd:command> -<cd:command name="bruch" file="core-mis.tex"> +<cd:command name="fraction" file="core-mis.tex">    <cd:sequence> -    <cd:string value="bruch"/> +    <cd:string value="fraction"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -7715,9 +7679,9 @@    </cd:arguments>  </cd:command> -<cd:command name="punkt" file="core-mis.tex"> +<cd:command name="periods" file="core-mis.tex">    <cd:sequence> -    <cd:string value="punkt"/> +    <cd:string value="periods"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7726,30 +7690,21 @@    </cd:arguments>  </cd:command> -<cd:command name="wohnort"> -  <cd:sequence> -    <cd:string value="wohnort"/> -  </cd:sequence> -  <cd:arguments> -    <cd:content/> -  </cd:arguments> -</cd:command> - -<cd:command name="posten"> +<cd:command name="items">    <cd:sequence> -    <cd:string value="posten"/> +    <cd:string value="items"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stellepostenein"/> +      <cd:inherit name="setupitems"/>      </cd:assignments>      <cd:content list="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="stellepostenein" file="core-mis.tex"> +<cd:command name="setupitems" file="core-mis.tex">    <cd:sequence> -    <cd:string value="stellepostenein"/> +    <cd:string value="setupitems"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -7796,9 +7751,9 @@    </cd:arguments>  </cd:command> -<cd:command name="zitat" type="environment" file="core-mis.tex"> +<cd:command name="quotation" type="environment" file="core-mis.tex">    <cd:sequence> -    <cd:string value="zitat"/> +    <cd:string value="quotation"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7809,27 +7764,27 @@    </cd:arguments>  </cd:command> -<cd:command name="zitat" file="core-mis.tex"> +<cd:command name="quotation" file="core-mis.tex">    <cd:sequence> -    <cd:string value="zitat"/> +    <cd:string value="quotation"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="zitieren" file="core-mis.tex"> +<cd:command name="quote" file="core-mis.tex">    <cd:sequence> -    <cd:string value="zitieren"/> +    <cd:string value="quote"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="stellezitierenein" file="core-mis.tex"> +<cd:command name="setupquote" file="core-mis.tex">    <cd:sequence> -    <cd:string value="stellezitierenein"/> +    <cd:string value="setupquote"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -7860,9 +7815,9 @@    </cd:arguments>  </cd:command> -<cd:command name="zusatz"> +<cd:command name="adding">    <cd:sequence> -    <cd:string value="zusatz"/> +    <cd:string value="adding"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7873,9 +7828,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definiereabsaetze" file="core-mis.tex"> +<cd:command name="defineparagraphs" file="core-mis.tex">    <cd:sequence> -    <cd:string value="definiereabsaetze"/> +    <cd:string value="defineparagraphs"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7931,13 +7886,11 @@    <cd:sequence>      <cd:variable value="absatz"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="stelleabsaetzeein" file="core-mis.tex"> +<cd:command name="setupparagraphs" file="core-mis.tex">    <cd:sequence> -    <cd:string value="stelleabsaetzeein"/> +    <cd:string value="setupparagraphs"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -8000,9 +7953,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelletabein" file="core-mis.tex"> +<cd:command name="setuptab" file="core-mis.tex">    <cd:sequence> -    <cd:string value="stelletabein"/> +    <cd:string value="setuptab"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -8062,9 +8015,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definieretabulator" file="core-tbl.tex"> +<cd:command name="definetabulate" file="core-tbl.tex">    <cd:sequence> -    <cd:string value="definieretabulator"/> +    <cd:string value="definetabulate"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -8088,14 +8041,14 @@        <cd:constant type="cd:text"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="verwendeexterneabbildung"/> +      <cd:inherit name="useexternalfigure"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stelletabulatorein" file="core-tbl.tex"> +<cd:command name="setuptabulate" file="core-tbl.tex">    <cd:sequence> -    <cd:string value="stelletabulatorein"/> +    <cd:string value="setuptabulate"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -8162,9 +8115,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelletabellenein" file="core-tab.tex"> +<cd:command name="setuptables" file="core-tab.tex">    <cd:sequence> -    <cd:string value="stelletabellenein"/> +    <cd:string value="setuptables"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -8269,9 +8222,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definieretabellenvorlage" file="core-tab.tex"> +<cd:command name="definetabletemplate" file="core-tab.tex">    <cd:sequence> -    <cd:string value="definieretabellenvorlage"/> +    <cd:string value="definetabletemplate"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -8289,9 +8242,9 @@    </cd:arguments>  </cd:command> -<cd:command name="verwendeexternedateien" file="core-mis.tex"> +<cd:command name="useexternalfiles" file="core-mis.tex">    <cd:sequence> -    <cd:string value="verwendeexternedateien"/> +    <cd:string value="useexternalfiles"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -8312,9 +8265,9 @@    </cd:arguments>  </cd:command> -<cd:command name="verwendeexternedatei" file="core-mis.tex"> +<cd:command name="useexternalfile" file="core-mis.tex">    <cd:sequence> -    <cd:string value="verwendeexternedatei"/> +    <cd:string value="useexternalfile"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -8338,9 +8291,9 @@    </cd:arguments>  </cd:command> -<cd:command name="verwendeexterneabbildung" file="core-fig.tex"> +<cd:command name="useexternalfigure" file="core-fig.tex">    <cd:sequence> -    <cd:string value="verwendeexterneabbildung"/> +    <cd:string value="useexternalfigure"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -8423,23 +8376,23 @@    </cd:arguments>  </cd:command> -<cd:command name="externeabbildung" file="core-fig.tex"> +<cd:command name="externalfigure" file="core-fig.tex">    <cd:sequence> -    <cd:string value="externeabbildung"/> +    <cd:string value="externalfigure"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:file"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="verwendeexterneabbildung"/> +      <cd:inherit name="useexternalfigure"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stelleexterneabbildungenein" file="core-fig.tex"> +<cd:command name="setupexternalfigures" file="core-fig.tex">    <cd:sequence> -    <cd:string value="stelleexterneabbildungenein"/> +    <cd:string value="setupexternalfigures"/>    </cd:sequence>    <cd:arguments>      <cd:assignments> @@ -8481,9 +8434,9 @@    </cd:arguments>  </cd:command> -<cd:command name="zeigeexterneabbildungen" file="core-fig.tex"> +<cd:command name="showexternalfigures" file="core-fig.tex">    <cd:sequence> -    <cd:string value="zeigeexterneabbildungen"/> +    <cd:string value="showexternalfigures"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> @@ -8496,9 +8449,9 @@    </cd:arguments>  </cd:command> -<cd:command name="verwendeexternestonstueck" file="core-fig.tex"> +<cd:command name="useexternalsoundtrack" file="core-fig.tex">    <cd:sequence> -    <cd:string value="verwendeexternestonstueck"/> +    <cd:string value="useexternalsoundtrack"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -8535,9 +8488,9 @@    </cd:arguments>  </cd:command> -<cd:command name="geg" type="environment"> +<cd:command name="fact" type="environment">    <cd:sequence> -    <cd:string value="geg"/> +    <cd:string value="fact"/>    </cd:sequence>    <cd:arguments>      <cd:tex command="fact"/> @@ -8548,21 +8501,21 @@    </cd:arguments>  </cd:command> -<cd:command name="drehen" file="core-mis.tex"> +<cd:command name="rotate" file="core-mis.tex">    <cd:sequence> -    <cd:string value="drehen"/> +    <cd:string value="rotate"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelledrehenein"/> +      <cd:inherit name="setuprotate"/>      </cd:assignments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="stelledrehenein" file="core-mis.tex"> +<cd:command name="setuprotate" file="core-mis.tex">    <cd:sequence> -    <cd:string value="stelledrehenein"/> +    <cd:string value="setuprotate"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -8576,23 +8529,23 @@          <cd:constant type="breit"/>          <cd:constant type="tiefe"/>        </cd:parameter> -      <cd:inherit name="stelleumrahmtein"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="spiegeln" file="core-mis.tex"> +<cd:command name="mirror" file="core-mis.tex">    <cd:sequence> -    <cd:string value="spiegeln"/> +    <cd:string value="mirror"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="format" file="core-mis.tex"> +<cd:command name="scale" file="core-mis.tex">    <cd:sequence> -    <cd:string value="format"/> +    <cd:string value="scale"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> @@ -8607,9 +8560,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stellekombinationein" file="core-mis.tex"> +<cd:command name="setupcombinations" file="core-mis.tex">    <cd:sequence> -    <cd:string value="stellekombinationein"/> +    <cd:string value="setupcombinations"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -8674,9 +8627,9 @@    </cd:arguments>  </cd:command> -<cd:command name="platzierenebeneinander" file="core-mis.tex"> +<cd:command name="placesidebyside" file="core-mis.tex">    <cd:sequence> -    <cd:string value="platzierenebeneinander"/> +    <cd:string value="placesidebyside"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -8684,9 +8637,9 @@    </cd:arguments>  </cd:command> -<cd:command name="platziereuntereinander" file="core-mis.tex"> +<cd:command name="placeontopofeachother" file="core-mis.tex">    <cd:sequence> -    <cd:string value="platziereuntereinander"/> +    <cd:string value="placeontopofeachother"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -8715,9 +8668,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelleinteraktionsbildschirmein" file="core-int.tex"> +<cd:command name="setupinteractionscreen" file="core-int.tex">    <cd:sequence> -    <cd:string value="stelleinteraktionsbildschirmein"/> +    <cd:string value="setupinteractionscreen"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" list="yes"> @@ -8757,17 +8710,15 @@    </cd:arguments>  </cd:command> -<cd:command name="bildschirm" file="core-int.tex"> +<cd:command name="screen" file="core-int.tex">    <cd:sequence> -    <cd:string value="bildschirm"/> +    <cd:string value="screen"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="stelleseitenuebergangein" file="core-int.tex"> +<cd:command name="setuppagetransitions" file="core-int.tex">    <cd:sequence> -    <cd:string value="stelleseitenuebergangein"/> +    <cd:string value="setuppagetransitions"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -8777,9 +8728,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelleinteraktionein" file="core-nav.tex"> +<cd:command name="setupinteraction" file="core-nav.tex">    <cd:sequence> -    <cd:string value="stelleinteraktionein"/> +    <cd:string value="setupinteraction"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" list="yes"> @@ -8871,9 +8822,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definiereinteraktionsmenue" file="core-int.tex"> +<cd:command name="defineinteractionmenu" file="core-int.tex">    <cd:sequence> -    <cd:string value="definiereinteraktionsmenue"/> +    <cd:string value="defineinteractionmenu"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive" list="yes"> @@ -8952,14 +8903,14 @@          <cd:constant type="ja"/>          <cd:constant type="nein"/>        </cd:parameter> -      <cd:inherit name="stelleumrahmtein"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="definiereinteraktionsmenue" file="core-int.tex"> +<cd:command name="defineinteractionmenu" file="core-int.tex">    <cd:sequence> -    <cd:string value="definiereinteraktionsmenue"/> +    <cd:string value="defineinteractionmenu"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -8977,14 +8928,14 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelleinteraktionsmenueein"/> +      <cd:inherit name="setupinteractionmenu"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="interaktionsmenue" type="environment"> +<cd:command name="interactionmenu" type="environment">    <cd:sequence> -    <cd:string value="interaktionsmenue"/> +    <cd:string value="interactionmenu"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -8993,9 +8944,9 @@    </cd:arguments>  </cd:command> -<cd:command name="inaktiviereinteraktionsmenue" file="core-int.tex"> +<cd:command name="disableinteractionmenu" file="core-int.tex">    <cd:sequence> -    <cd:string value="inaktiviereinteraktionsmenue"/> +    <cd:string value="disableinteractionmenu"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -9009,9 +8960,9 @@    </cd:arguments>  </cd:command> -<cd:command name="verwendeexteresdokument" file="core-ref.tex"> +<cd:command name="useexternaldocument" file="core-ref.tex">    <cd:sequence> -    <cd:string value="verwendeexteresdokument"/> +    <cd:string value="useexternaldocument"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -9026,9 +8977,9 @@    </cd:arguments>  </cd:command> -<cd:command name="verwendeURL" file="core-ref.tex"> +<cd:command name="useURL" file="core-ref.tex">    <cd:sequence> -    <cd:string value="verwendeURL"/> +    <cd:string value="useURL"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -9046,9 +8997,9 @@    </cd:arguments>  </cd:command> -<cd:command name="verknuepfedokument" file="core-ref.tex"> +<cd:command name="coupledocument" file="core-ref.tex">    <cd:sequence> -    <cd:string value="verknuepfedokument"/> +    <cd:string value="coupledocument"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -9063,33 +9014,33 @@    </cd:arguments>  </cd:command> -<cd:command name="von" file="core-ref.tex"> +<cd:command name="from" file="core-ref.tex">    <cd:sequence> -    <cd:string value="von"/> +    <cd:string value="from"/>    </cd:sequence>    <cd:arguments>      <cd:reference interactive="exclusive"/>    </cd:arguments>  </cd:command> -<cd:command name="interaktionsbalken"> +<cd:command name="interactionbar">    <cd:sequence> -    <cd:string value="interaktionsbalken"/> +    <cd:string value="interactionbar"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" list="yes"> -      <cd:inherit name="stelleinteraktionsbalkenein"/> +      <cd:inherit name="setupinteractionbar"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="interaktionsknopfe" file="core-ref.tex"> +<cd:command name="interactionbuttons" file="core-ref.tex">    <cd:sequence> -    <cd:string value="interaktionsknopfe"/> +    <cd:string value="interactionbuttons"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" optional="yes" list="yes"> -      <cd:inherit name="stelleinteraktionsbalkenein"/> +      <cd:inherit name="setupinteractionbar"/>      </cd:assignments>      <cd:keywords list="yes">        <cd:constant type="cd:name"/> @@ -9097,9 +9048,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelleinteraktionsbalkenein" file="core-int.tex"> +<cd:command name="setupinteractionbar" file="core-int.tex">    <cd:sequence> -    <cd:string value="stelleinteraktionsbalkenein"/> +    <cd:string value="setupinteractionbar"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" list="yes"> @@ -9142,30 +9093,26 @@          <cd:constant type="mittel"/>          <cd:constant type="gross"/>        </cd:parameter> -      <cd:inherit name="stelleumrahmtein"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="synchronisieren" file="core-int.tex"> +<cd:command name="synchronize" file="core-int.tex">    <cd:sequence> -    <cd:string value="synchronisieren"/> +    <cd:string value="synchronize"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="synchronization" type="environment">    <cd:sequence>      <cd:string value="synchronization"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="stellesynchronisationsbalkenein" file="core-int.tex"> +<cd:command name="setupsynchronizationbar" file="core-int.tex">    <cd:sequence> -    <cd:string value="stellesynchronisationsbalkenein"/> +    <cd:string value="setupsynchronizationbar"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" list="yes"> @@ -9194,14 +9141,14 @@        <cd:parameter name="farbe">          <cd:constant type="cd:name"/>        </cd:parameter> -      <cd:inherit name="stelleumrahmtein"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="synchronisationsbalken" file="core-int.tex"> +<cd:command name="synchronizationbar" file="core-int.tex">    <cd:sequence> -    <cd:string value="synchronisationsbalken"/> +    <cd:string value="synchronizationbar"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -9212,14 +9159,14 @@          <cd:constant type="seite"/>          <cd:constant type="lokal"/>        </cd:parameter> -      <cd:inherit name="stellesynchronisationsbalkenein"/> +      <cd:inherit name="setupsynchronizationbar"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stellesynchronisationein" file="core-int.tex"> +<cd:command name="setupsynchronization" file="core-int.tex">    <cd:sequence> -    <cd:string value="stellesynchronisationein"/> +    <cd:string value="setupsynchronization"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" list="yes"> @@ -9231,9 +9178,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definiereprofil" file="core-int.tex"> +<cd:command name="defineprofile" file="core-int.tex">    <cd:sequence> -    <cd:string value="definiereprofil"/> +    <cd:string value="defineprofile"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive" list="yes"> @@ -9245,9 +9192,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelleprofilein" file="core-int.tex"> +<cd:command name="setupprofiles" file="core-int.tex">    <cd:sequence> -    <cd:string value="stelleprofilein"/> +    <cd:string value="setupprofiles"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" list="yes"> @@ -9269,9 +9216,9 @@    </cd:arguments>  </cd:command> -<cd:command name="folgeprofil" file="core-int.tex"> +<cd:command name="followprofile" file="core-int.tex">    <cd:sequence> -    <cd:string value="folgeprofil"/> +    <cd:string value="followprofile"/>    </cd:sequence>    <cd:arguments>      <cd:content interactive="exclusive"/> @@ -9281,9 +9228,9 @@    </cd:arguments>  </cd:command> -<cd:command name="platzierebookmarks" file="core-int.tex"> +<cd:command name="placebookmarks" file="core-int.tex">    <cd:sequence> -    <cd:string value="platzierebookmarks"/> +    <cd:string value="placebookmarks"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -9317,9 +9264,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelleversionein" file="core-int.tex"> +<cd:command name="setupversions" file="core-int.tex">    <cd:sequence> -    <cd:string value="stelleversionein"/> +    <cd:string value="setupversions"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -9340,23 +9287,21 @@    </cd:arguments>  </cd:command> -<cd:command name="beschrifteversion" file="core-int.tex"> +<cd:command name="markversion" file="core-int.tex">    <cd:sequence> -    <cd:string value="beschrifteversion"/> +    <cd:string value="markversion"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="waehleversionaus" file="core-int.tex"> +<cd:command name="selectversion" file="core-int.tex">    <cd:sequence> -    <cd:string value="waehleversionaus"/> +    <cd:string value="selectversion"/>    </cd:sequence>  </cd:command> -<cd:command name="definiereversion" file="core-int.tex"> +<cd:command name="defineversion" file="core-int.tex">    <cd:sequence> -    <cd:string value="definiereversion"/> +    <cd:string value="defineversion"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9368,9 +9313,9 @@    </cd:arguments>  </cd:command> -<cd:command name="folgeversion" file="core-int.tex"> +<cd:command name="followversion" file="core-int.tex">    <cd:sequence> -    <cd:string value="folgeversion"/> +    <cd:string value="followversion"/>    </cd:sequence>    <cd:arguments>      <cd:content interactive="exclusive"/> @@ -9380,9 +9325,9 @@    </cd:arguments>  </cd:command> -<cd:command name="folgeprofilversion" file="core-int.tex"> +<cd:command name="followprofileversion" file="core-int.tex">    <cd:sequence> -    <cd:string value="folgeprofilversion"/> +    <cd:string value="followprofileversion"/>    </cd:sequence>    <cd:arguments>      <cd:content interactive="exclusive"/> @@ -9395,9 +9340,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definiereprogramme" file="core-ref.tex"> +<cd:command name="defineprogram" file="core-ref.tex">    <cd:sequence> -    <cd:string value="definiereprogramme"/> +    <cd:string value="defineprogram"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -9412,9 +9357,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelleprogrammein" file="core-ref.tex"> +<cd:command name="setupprograms" file="core-ref.tex">    <cd:sequence> -    <cd:string value="stelleprogrammein"/> +    <cd:string value="setupprograms"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" list="yes"> @@ -9425,9 +9370,9 @@    </cd:arguments>  </cd:command> -<cd:command name="programm" file="core-ref.tex"> +<cd:command name="program" file="core-ref.tex">    <cd:sequence> -    <cd:string value="programm"/> +    <cd:string value="program"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -9465,9 +9410,9 @@  <!-- remark skipped --> -<cd:command name="zu" file="core-ref.tex"> +<cd:command name="goto" file="core-ref.tex">    <cd:sequence> -    <cd:string value="zu"/> +    <cd:string value="goto"/>    </cd:sequence>    <cd:arguments>      <cd:content interactive="exclusive"/> @@ -9476,9 +9421,9 @@    </cd:arguments>  </cd:command> -<cd:command name="zurbox" file="core-ref.tex"> +<cd:command name="gotobox" file="core-ref.tex">    <cd:sequence> -    <cd:string value="zurbox"/> +    <cd:string value="gotobox"/>    </cd:sequence>    <cd:arguments>      <cd:content interactive="exclusive"/> @@ -9486,22 +9431,22 @@    </cd:arguments>  </cd:command> -<cd:command name="knopf"> +<cd:command name="button">    <cd:sequence> -    <cd:string value="knopf"/> +    <cd:string value="button"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" optional="yes" list="yes"> -      <cd:inherit name="stelleknopfein"/> +      <cd:inherit name="setupbuttons"/>      </cd:assignments>      <cd:content/>      <cd:reference list="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="stelleknopfein" file="core-ref.tex"> +<cd:command name="setupbuttons" file="core-ref.tex">    <cd:sequence> -    <cd:string value="stelleknopfein"/> +    <cd:string value="setupbuttons"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -9509,16 +9454,16 @@          <cd:constant type="start"/>          <cd:constant type="stop"/>        </cd:parameter> -      <cd:inherit name="stelleumrahmtein"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command>  <!-- menubutton skipped --> -<cd:command name="stellekommentarein" file="core-int.tex"> +<cd:command name="setupcomment" file="core-int.tex">    <cd:sequence> -    <cd:string value="stellekommentarein"/> +    <cd:string value="setupcomment"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -9566,38 +9511,38 @@    </cd:arguments>  </cd:command> -<cd:command name="kommentar" type="environment"> +<cd:command name="comment" type="environment">    <cd:sequence> -    <cd:string value="kommentar"/> +    <cd:string value="comment"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes">        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stellekommentarein"/> +      <cd:inherit name="setupcomment"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="kommentar"> +<cd:command name="comment">    <cd:sequence> -    <cd:string value="kommentar"/> +    <cd:string value="comment"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes">        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stellekommentarein"/> +      <cd:inherit name="setupcomment"/>      </cd:assignments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="definierefeld" file="core-fld.tex"> +<cd:command name="definefield" file="core-fld.tex">    <cd:sequence> -    <cd:string value="definierefeld"/> +    <cd:string value="definefield"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9618,9 +9563,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definieresubfeld" file="core-fld.tex"> +<cd:command name="definesubfield" file="core-fld.tex">    <cd:sequence> -    <cd:string value="definieresubfeld"/> +    <cd:string value="definesubfield"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9635,9 +9580,9 @@    </cd:arguments>  </cd:command> -<cd:command name="kopierefeld" file="core-fld.tex"> +<cd:command name="copyfield" file="core-fld.tex">    <cd:sequence> -    <cd:string value="kopierefeld"/> +    <cd:string value="copyfield"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9649,9 +9594,9 @@    </cd:arguments>  </cd:command> -<cd:command name="klonierefeld" file="core-fld.tex"> +<cd:command name="clonefield" file="core-fld.tex">    <cd:sequence> -    <cd:string value="klonierefeld"/> +    <cd:string value="clonefield"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9669,9 +9614,9 @@    </cd:arguments>  </cd:command> -<cd:command name="feld" file="core-fld.tex"> +<cd:command name="field" file="core-fld.tex">    <cd:sequence> -    <cd:string value="feld"/> +    <cd:string value="field"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9680,9 +9625,9 @@    </cd:arguments>  </cd:command> -<cd:command name="passendfeld" file="core-fld.tex"> +<cd:command name="fitfield" file="core-fld.tex">    <cd:sequence> -    <cd:string value="passendfeld"/> +    <cd:string value="fitfield"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9691,9 +9636,9 @@    </cd:arguments>  </cd:command> -<cd:command name="ausfuellfeld" file="core-fld.tex"> +<cd:command name="fillinfield" file="core-fld.tex">    <cd:sequence> -    <cd:string value="ausfuellfeld"/> +    <cd:string value="fillinfield"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -9718,9 +9663,9 @@    </cd:arguments>  </cd:command> -<cd:command name="zeigefelder" file="core-fld.tex"> +<cd:command name="showfields" file="core-fld.tex">    <cd:sequence> -    <cd:string value="zeigefelder"/> +    <cd:string value="showfields"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -9729,15 +9674,15 @@    </cd:arguments>  </cd:command> -<cd:command name="registrierefelder" file="core-fld.tex"> +<cd:command name="logfields" file="core-fld.tex">    <cd:sequence> -    <cd:string value="registrierefelder"/> +    <cd:string value="logfields"/>    </cd:sequence>  </cd:command> -<cd:command name="stellefeldein" file="core-fld.tex"> +<cd:command name="setupfield" file="core-fld.tex">    <cd:sequence> -    <cd:string value="stellefeldein"/> +    <cd:string value="setupfield"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9750,7 +9695,7 @@        <cd:constant type="rahmen"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="stellefelderin"/> +      <cd:inherit name="setupfields"/>      </cd:assignments>      <cd:assignments list="yes">      </cd:assignments> @@ -9759,9 +9704,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stellefelderin" file="core-fld.tex"> +<cd:command name="setupfields" file="core-fld.tex">    <cd:sequence> -    <cd:string value="stellefelderin"/> +    <cd:string value="setupfields"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -9847,7 +9792,7 @@        <cd:parameter name="feldhintergrundfarbe">          <cd:constant type="cd:name"/>        </cd:parameter> -      <cd:inherit name="umrahmt"/> +      <cd:inherit name="framed"/>      </cd:assignments>      <cd:assignments list="yes">      </cd:assignments> @@ -9870,9 +9815,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definierefeldstapel" file="core-fld.tex"> +<cd:command name="definefieldstack" file="core-fld.tex">    <cd:sequence> -    <cd:string value="definierefeldstapel"/> +    <cd:string value="definefieldstack"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9882,14 +9827,14 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="stellefelderin"/> +      <cd:inherit name="setupfields"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="feldstapel" file="core-fld.tex"> +<cd:command name="fieldstack" file="core-fld.tex">    <cd:sequence> -    <cd:string value="feldstapel"/> +    <cd:string value="fieldstack"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9899,26 +9844,26 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stellefelderin"/> +      <cd:inherit name="setupfields"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="ausschnitt" file="core-fig.tex"> +<cd:command name="clip" file="core-fig.tex">    <cd:sequence> -    <cd:string value="ausschnitt"/> +    <cd:string value="clip"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelleausschnittein"/> +      <cd:inherit name="setupclipping"/>      </cd:assignments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="stelleausschnittein" file="core-fig.tex"> +<cd:command name="setupclipping" file="core-fig.tex">    <cd:sequence> -    <cd:string value="stelleausschnittein"/> +    <cd:string value="setupclipping"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -9953,9 +9898,9 @@    </cd:arguments>  </cd:command> -<cd:command name="platzierelegende"> +<cd:command name="placelegend">    <cd:sequence> -    <cd:string value="platzierelegende"/> +    <cd:string value="placelegend"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -9963,9 +9908,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stellelegendeein"> +<cd:command name="setuplegend">    <cd:sequence> -    <cd:string value="stellelegendeein"/> +    <cd:string value="setuplegend"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -10149,7 +10094,7 @@        <cd:constant type="cd:file"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stellezeilenabstandein"/> +      <cd:inherit name="setupinterlinespace"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -10174,7 +10119,7 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stellepositionierenein"/> +      <cd:inherit name="setuppositioning"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -10188,7 +10133,7 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="stellepositionierenein"/> +      <cd:inherit name="setuppositioning"/>      </cd:assignments>    </cd:arguments>  </cd:command> diff --git a/tex/context/interface/cont-en.xml b/tex/context/interface/cont-en.xml index 60b13dd7e..05bbfd7c6 100644 --- a/tex/context/interface/cont-en.xml +++ b/tex/context/interface/cont-en.xml @@ -1,6 +1,6 @@  <?xml version="1.0"?> -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2004.11.17">  <cd:command name="installlanguage" file="lang-ini.tex">    <cd:sequence> @@ -838,8 +838,6 @@    <cd:sequence>      <cd:variable value="typing"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="typefile" file="verb-ini.tex"> @@ -1006,8 +1004,6 @@    <cd:sequence>      <cd:string value="localfootnotes"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="placelocalfootnotes" file="core-not.tex"> @@ -1928,8 +1924,6 @@    <cd:sequence>      <cd:string value="background"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="background"> @@ -2257,8 +2251,6 @@    <cd:sequence>      <cd:string value="localenvironment"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="setupsystem" file="core-sys.tex"> @@ -2568,8 +2560,6 @@    <cd:sequence>      <cd:string value="marginblock"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="part" file="core-sec.tex"> @@ -3048,8 +3038,6 @@    <cd:sequence>      <cd:variable value="enumeration"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="definedescription" file="core-des.tex"> @@ -4454,8 +4442,6 @@    <cd:sequence>      <cd:string value="opposite"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="setuphyphenmark" file="core-mis.tex"> @@ -4523,8 +4509,6 @@    <cd:sequence>      <cd:string value="positioning"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="grid" file="core-spa.tex"> @@ -5252,8 +5236,6 @@    <cd:sequence>      <cd:string value="lines"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="setupparagraphnumbering" file="page-lin.tex"> @@ -6849,8 +6831,6 @@      <cd:variable value="name"/>      <cd:string value="makeup"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="version"> @@ -6967,16 +6947,12 @@    <cd:sequence>      <cd:string value="unpacked"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="linecorrection" type="environment">    <cd:sequence>      <cd:string value="linecorrection"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="correctwhitespace" file="core-spa.tex"> @@ -6992,16 +6968,12 @@    <cd:sequence>      <cd:string value="postponing"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="local" type="environment">    <cd:sequence>      <cd:string value="local"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="narrower" type="environment"> @@ -7021,8 +6993,6 @@    <cd:sequence>      <cd:string value="hiding"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="setupalign" file="core-spa.tex"> @@ -7435,8 +7405,6 @@    <cd:sequence>      <cd:variable value="formula"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="mathematics" file="supp-mat.tex"> @@ -7628,8 +7596,6 @@      <cd:string value="placelistof"/>      <cd:variable value="floats"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="completelistoffloats" generated="yes"> @@ -7637,8 +7603,6 @@      <cd:string value="completelistof"/>      <cd:variable value="floats"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="referral" file="core-mis.tex"> @@ -7726,15 +7690,6 @@    </cd:arguments>  </cd:command> -<cd:command name="domicile"> -  <cd:sequence> -    <cd:string value="domicile"/> -  </cd:sequence> -  <cd:arguments> -    <cd:content/> -  </cd:arguments> -</cd:command> -  <cd:command name="items">    <cd:sequence>      <cd:string value="items"/> @@ -7931,8 +7886,6 @@    <cd:sequence>      <cd:variable value="paragraph"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="setupparagraphs" file="core-mis.tex"> @@ -8761,8 +8714,6 @@    <cd:sequence>      <cd:string value="screen"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="setuppagetransitions" file="core-int.tex"> @@ -9151,16 +9102,12 @@    <cd:sequence>      <cd:string value="synchronize"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="synchronization" type="environment">    <cd:sequence>      <cd:string value="synchronization"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="setupsynchronizationbar" file="core-int.tex"> @@ -9344,8 +9291,6 @@    <cd:sequence>      <cd:string value="markversion"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="selectversion" file="core-int.tex"> diff --git a/tex/context/interface/cont-it.xml b/tex/context/interface/cont-it.xml index 0984e65c4..af326a6bf 100644 --- a/tex/context/interface/cont-it.xml +++ b/tex/context/interface/cont-it.xml @@ -1,10 +1,10 @@  <?xml version="1.0"?> -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2004.11.17"> -<cd:command name="installalingua" file="lang-ini.tex"> +<cd:command name="installlanguage" file="lang-ini.tex">    <cd:sequence> -    <cd:string value="installalingua"/> +    <cd:string value="installlanguage"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -56,9 +56,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostalingua" file="lang-ini.tex"> +<cd:command name="setuplanguage" file="lang-ini.tex">    <cd:sequence> -    <cd:string value="impostalingua"/> +    <cd:string value="setuplanguage"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -72,14 +72,14 @@        <cd:constant type=".."/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="installalingua"/> +      <cd:inherit name="installlanguage"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="lingua"> +<cd:command name="language">    <cd:sequence> -    <cd:string value="lingua"/> +    <cd:string value="language"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -95,9 +95,9 @@    </cd:arguments>  </cd:command> -<cd:command name="linguaprincipale" file="lang-ini.tex"> +<cd:command name="mainlanguage" file="lang-ini.tex">    <cd:sequence> -    <cd:string value="linguaprincipale"/> +    <cd:string value="mainlanguage"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -113,9 +113,9 @@    </cd:arguments>  </cd:command> -<cd:command name="traduci" file="lang-lab.tex"> +<cd:command name="translate" file="lang-lab.tex">    <cd:sequence> -    <cd:string value="traduci"/> +    <cd:string value="translate"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -126,9 +126,9 @@    </cd:arguments>  </cd:command> -<cd:command name="usacodifica" file="enco-ini.tex"> +<cd:command name="useencoding" file="enco-ini.tex">    <cd:sequence> -    <cd:string value="usacodifica"/> +    <cd:string value="useencoding"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -137,9 +137,9 @@    </cd:arguments>  </cd:command> -<cd:command name="usaspecialita" file="spec-ini.tex"> +<cd:command name="usespecials" file="spec-ini.tex">    <cd:sequence> -    <cd:string value="usaspecialita"/> +    <cd:string value="usespecials"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -149,9 +149,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definiscioutput" file="spec-ini.tex"> +<cd:command name="defineoutput" file="spec-ini.tex">    <cd:sequence> -    <cd:string value="definiscioutput"/> +    <cd:string value="defineoutput"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -163,9 +163,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostaoutput" file="spec-ini.tex"> +<cd:command name="setupoutput" file="spec-ini.tex">    <cd:sequence> -    <cd:string value="impostaoutput"/> +    <cd:string value="setupoutput"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -174,9 +174,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definisciambientefontdeltesto" file="font-ini.tex"> +<cd:command name="definebodyfontenvironment" file="font-ini.tex">    <cd:sequence> -    <cd:string value="definisciambientefontdeltesto"/> +    <cd:string value="definebodyfontenvironment"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -211,34 +211,34 @@    </cd:arguments>  </cd:command> -<cd:command name="impostaambientefontdeltesto" file="font-ini.tex"> +<cd:command name="setupbodyfontenvironment" file="font-ini.tex">    <cd:sequence> -    <cd:string value="impostaambientefontdeltesto"/> +    <cd:string value="setupbodyfontenvironment"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> -      <cd:inherit name="impostafontdeltesto"/> +      <cd:inherit name="setupbodyfont"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="impostafontdeltesto"/> +      <cd:inherit name="setupbodyfont"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="mostraambientefontdeltesto"> +<cd:command name="showbodyfontenvironment">    <cd:sequence> -    <cd:string value="mostraambientefontdeltesto"/> +    <cd:string value="showbodyfontenvironment"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> -      <cd:inherit name="impostafontdeltesto"/> +      <cd:inherit name="setupbodyfont"/>      </cd:keywords>    </cd:arguments>  </cd:command> -<cd:command name="definiscifontdeltesto" file="font-ini.tex"> +<cd:command name="definebodyfont" file="font-ini.tex">    <cd:sequence> -    <cd:string value="definiscifontdeltesto"/> +    <cd:string value="definebodyfont"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -299,20 +299,20 @@    </cd:arguments>  </cd:command> -<cd:command name="mostrafontdeltesto"> +<cd:command name="showbodyfont">    <cd:sequence> -    <cd:string value="mostrafontdeltesto"/> +    <cd:string value="showbodyfont"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> -      <cd:inherit name="impostafontdeltesto"/> +      <cd:inherit name="setupbodyfont"/>      </cd:keywords>    </cd:arguments>  </cd:command> -<cd:command name="impostafontdeltesto"> +<cd:command name="setupbodyfont">    <cd:sequence> -    <cd:string value="impostafontdeltesto"/> +    <cd:string value="setupbodyfont"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -335,9 +335,9 @@    </cd:arguments>  </cd:command> -<cd:command name="cambiaafontdeltesto" file="font-ini.tex"> +<cd:command name="switchtobodyfont" file="font-ini.tex">    <cd:sequence> -    <cd:string value="cambiaafontdeltesto"/> +    <cd:string value="switchtobodyfont"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -351,9 +351,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definiscifont" file="font-ini.tex"> +<cd:command name="definefont" file="font-ini.tex">    <cd:sequence> -    <cd:string value="definiscifont"/> +    <cd:string value="definefont"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -365,9 +365,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostastrut" file="core-spa.tex"> +<cd:command name="setupstrut" file="core-spa.tex">    <cd:sequence> -    <cd:string value="impostastrut"/> +    <cd:string value="setupstrut"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -379,9 +379,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostacolore" file="colo-ini.tex"> +<cd:command name="setupcolor" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="impostacolore"/> +    <cd:string value="setupcolor"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -390,9 +390,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostacolori" file="colo-ini.tex"> +<cd:command name="setupcolors" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="impostacolori"/> +    <cd:string value="setupcolors"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -448,9 +448,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definiscicolore" file="colo-ini.tex"> +<cd:command name="definecolor" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="definiscicolore"/> +    <cd:string value="definecolor"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -485,9 +485,9 @@    </cd:arguments>  </cd:command> -<cd:command name="colore" type="environment" file="colo-ini.tex"> +<cd:command name="color" type="environment" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="colore"/> +    <cd:string value="color"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -496,9 +496,9 @@    </cd:arguments>  </cd:command> -<cd:command name="colore" file="colo-ini.tex"> +<cd:command name="color" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="colore"/> +    <cd:string value="color"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -508,9 +508,9 @@    </cd:arguments>  </cd:command> -<cd:command name="coloregrigio" file="colo-ini.tex"> +<cd:command name="graycolor" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="coloregrigio"/> +    <cd:string value="graycolor"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -519,9 +519,9 @@    </cd:arguments>  </cd:command> -<cd:command name="mostracolore"> +<cd:command name="showcolor">    <cd:sequence> -    <cd:string value="mostracolore"/> +    <cd:string value="showcolor"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -530,9 +530,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definiscitavolozza" file="colo-ini.tex"> +<cd:command name="definepalet" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="definiscitavolozza"/> +    <cd:string value="definepalet"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -546,9 +546,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostatavolozza" file="colo-ini.tex"> +<cd:command name="setuppalet" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="impostatavolozza"/> +    <cd:string value="setuppalet"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -557,9 +557,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definiscigruppocolori" file="colo-ini.tex"> +<cd:command name="definecolorgroup" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="definiscigruppocolori"/> +    <cd:string value="definecolorgroup"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -575,9 +575,9 @@    </cd:arguments>  </cd:command> -<cd:command name="mostratavolozza"> +<cd:command name="showpalet">    <cd:sequence> -    <cd:string value="mostratavolozza"/> +    <cd:string value="showpalet"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -592,9 +592,9 @@    </cd:arguments>  </cd:command> -<cd:command name="mostragruppocolori"> +<cd:command name="showcolorgroup">    <cd:sequence> -    <cd:string value="mostragruppocolori"/> +    <cd:string value="showcolorgroup"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -610,9 +610,9 @@    </cd:arguments>  </cd:command> -<cd:command name="confrontatavolozza"> +<cd:command name="comparepalet">    <cd:sequence> -    <cd:string value="confrontatavolozza"/> +    <cd:string value="comparepalet"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -621,9 +621,9 @@    </cd:arguments>  </cd:command> -<cd:command name="confrontagruppocolori"> +<cd:command name="comparecolorgroup">    <cd:sequence> -    <cd:string value="confrontagruppocolori"/> +    <cd:string value="comparecolorgroup"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -632,29 +632,29 @@    </cd:arguments>  </cd:command> -<cd:command name="mostramakeup" file="supp-vis.tex"> +<cd:command name="showmakeup" file="supp-vis.tex">    <cd:sequence> -    <cd:string value="mostramakeup"/> +    <cd:string value="showmakeup"/>    </cd:sequence>  </cd:command> -<cd:command name="definiscitype" file="core-ver.tex"> +<cd:command name="definetype" file="core-ver.tex">    <cd:sequence> -    <cd:string value="definiscitype"/> +    <cd:string value="definetype"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="impostatype"/> +      <cd:inherit name="setuptype"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="impostatype" file="core-ver.tex"> +<cd:command name="setuptype" file="core-ver.tex">    <cd:sequence> -    <cd:string value="impostatype"/> +    <cd:string value="setuptype"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -720,9 +720,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definiscityping" file="core-ver.tex"> +<cd:command name="definetyping" file="core-ver.tex">    <cd:sequence> -    <cd:string value="definiscityping"/> +    <cd:string value="definetyping"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -731,14 +731,14 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="impostatyping"/> +      <cd:inherit name="setuptyping"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="impostatyping" file="core-ver.tex"> +<cd:command name="setuptyping" file="core-ver.tex">    <cd:sequence> -    <cd:string value="impostatyping"/> +    <cd:string value="setuptyping"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -838,8 +838,6 @@    <cd:sequence>      <cd:variable value="typing"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="typefile" file="verb-ini.tex"> @@ -854,9 +852,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostanotepdp" file="core-not.tex"> +<cd:command name="setupfootnotes" file="core-not.tex">    <cd:sequence> -    <cd:string value="impostanotepdp"/> +    <cd:string value="setupfootnotes"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -957,25 +955,25 @@        <cd:parameter name="fattore">          <cd:constant type="cd:number"/>        </cd:parameter> -      <cd:inherit name="incorniciato"/> +      <cd:inherit name="framed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="impostadefinizionenotepdp" file="core-not.tex"> +<cd:command name="setupfootnotedefinition" file="core-not.tex">    <cd:sequence> -    <cd:string value="impostadefinizionenotepdp"/> +    <cd:string value="setupfootnotedefinition"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> -      <cd:inherit name="definiscidescrizione"/> +      <cd:inherit name="definedescription"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="notapdp" file="core-not.tex"> +<cd:command name="footnote" file="core-not.tex">    <cd:sequence> -    <cd:string value="notapdp"/> +    <cd:string value="footnote"/>    </cd:sequence>    <cd:arguments>      <cd:reference optional="yes"/> @@ -983,9 +981,9 @@    </cd:arguments>  </cd:command> -<cd:command name="testonotapdp" file="core-not.tex"> +<cd:command name="footnotetext" file="core-not.tex">    <cd:sequence> -    <cd:string value="testonotapdp"/> +    <cd:string value="footnotetext"/>    </cd:sequence>    <cd:arguments>      <cd:reference optional="yes"/> @@ -993,9 +991,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nota" file="core-not.tex"> +<cd:command name="note" file="core-not.tex">    <cd:sequence> -    <cd:string value="nota"/> +    <cd:string value="note"/>    </cd:sequence>    <cd:arguments>      <cd:reference interactive="yes"/> @@ -1006,35 +1004,33 @@    <cd:sequence>      <cd:string value="localfootnotes"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="mettinotepdplocali" file="core-not.tex"> +<cd:command name="placelocalfootnotes" file="core-not.tex">    <cd:sequence> -    <cd:string value="mettinotepdplocali"/> +    <cd:string value="placelocalfootnotes"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="impostanotepdp"/> +      <cd:inherit name="setupfootnotes"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="mettinotepdp" file="core-not.tex"> +<cd:command name="placefootnotes" file="core-not.tex">    <cd:sequence> -    <cd:string value="mettinotepdp"/> +    <cd:string value="placefootnotes"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="impostanotepdp"/> +      <cd:inherit name="setupfootnotes"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="impostasottolinea" file="core-fnt.tex"> +<cd:command name="setupunderbar" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="impostasottolinea"/> +    <cd:string value="setupunderbar"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -1059,117 +1055,117 @@    </cd:arguments>  </cd:command> -<cd:command name="sottolinea" file="core-fnt.tex"> +<cd:command name="underbar" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="sottolinea"/> +    <cd:string value="underbar"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="sottolinee" file="core-fnt.tex"> +<cd:command name="underbars" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="sottolinee"/> +    <cd:string value="underbars"/>    </cd:sequence>    <cd:arguments>      <cd:word list="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="sopralinea" file="core-fnt.tex"> +<cd:command name="overbar" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="sopralinea"/> +    <cd:string value="overbar"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="sopralinee" file="core-fnt.tex"> +<cd:command name="overbars" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="sopralinee"/> +    <cd:string value="overbars"/>    </cd:sequence>    <cd:arguments>      <cd:word list="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="sbarrato" file="core-fnt.tex"> +<cd:command name="overstrike" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="sbarrato"/> +    <cd:string value="overstrike"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="sbarrati" file="core-fnt.tex"> +<cd:command name="overstrikes" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="sbarrati"/> +    <cd:string value="overstrikes"/>    </cd:sequence>    <cd:arguments>      <cd:word list="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="numeriromani" file="core-con.tex"> +<cd:command name="romannumerals" file="core-con.tex">    <cd:sequence> -    <cd:string value="numeriromani"/> +    <cd:string value="romannumerals"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="Numeriromani" file="core-con.tex"> +<cd:command name="Romannumerals" file="core-con.tex">    <cd:sequence> -    <cd:string value="Numeriromani"/> +    <cd:string value="Romannumerals"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="numeri" file="core-con.tex"> +<cd:command name="numbers" file="core-con.tex">    <cd:sequence> -    <cd:string value="numeri"/> +    <cd:string value="numbers"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="lettera" file="core-con.tex"> +<cd:command name="character" file="core-con.tex">    <cd:sequence> -    <cd:string value="lettera"/> +    <cd:string value="character"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="Lettera" file="core-con.tex"> +<cd:command name="Character" file="core-con.tex">    <cd:sequence> -    <cd:string value="Lettera"/> +    <cd:string value="Character"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="lettere" file="core-con.tex"> +<cd:command name="characters" file="core-con.tex">    <cd:sequence> -    <cd:string value="lettere"/> +    <cd:string value="characters"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="Lettere" file="core-con.tex"> +<cd:command name="Characters" file="core-con.tex">    <cd:sequence> -    <cd:string value="Lettere"/> +    <cd:string value="Characters"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -1185,45 +1181,45 @@    </cd:arguments>  </cd:command> -<cd:command name="mese" file="core-con.tex"> +<cd:command name="month" file="core-con.tex">    <cd:sequence> -    <cd:string value="mese"/> +    <cd:string value="month"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="MESE" file="core-con.tex"> +<cd:command name="MONTH" file="core-con.tex">    <cd:sequence> -    <cd:string value="MESE"/> +    <cd:string value="MONTH"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="giornosettimana" file="core-con.tex"> +<cd:command name="weekday" file="core-con.tex">    <cd:sequence> -    <cd:string value="giornosettimana"/> +    <cd:string value="weekday"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="GIORNOSETTIMANA" file="core-con.tex"> +<cd:command name="WEEKDAY" file="core-con.tex">    <cd:sequence> -    <cd:string value="GIORNOSETTIMANA"/> +    <cd:string value="WEEKDAY"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="impostamaiuscole" file="core-fnt.tex"> +<cd:command name="setupcapitals" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="impostamaiuscole"/> +    <cd:string value="setupcapitals"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -1284,54 +1280,54 @@    </cd:arguments>  </cd:command> -<cd:command name="PAROLA" file="core-fnt.tex"> +<cd:command name="WORD" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="PAROLA"/> +    <cd:string value="WORD"/>    </cd:sequence>    <cd:arguments>      <cd:word/>    </cd:arguments>  </cd:command> -<cd:command name="PAROLE" file="core-fnt.tex"> +<cd:command name="WORDS" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="PAROLE"/> +    <cd:string value="WORDS"/>    </cd:sequence>    <cd:arguments>      <cd:word list="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="Parola" file="core-fnt.tex"> +<cd:command name="Word" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="Parola"/> +    <cd:string value="Word"/>    </cd:sequence>    <cd:arguments>      <cd:word/>    </cd:arguments>  </cd:command> -<cd:command name="Parole" file="core-fnt.tex"> +<cd:command name="Words" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="Parole"/> +    <cd:string value="Words"/>    </cd:sequence>    <cd:arguments>      <cd:word list="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="stirato" file="core-fnt.tex"> +<cd:command name="stretched" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="stirato"/> +    <cd:string value="stretched"/>    </cd:sequence>    <cd:arguments>      <cd:word/>    </cd:arguments>  </cd:command> -<cd:command name="definiscisimbolo" file="symb-ini.tex"> +<cd:command name="definesymbol" file="symb-ini.tex">    <cd:sequence> -    <cd:string value="definiscisimbolo"/> +    <cd:string value="definesymbol"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1343,9 +1339,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definiscifigurasimbolo" file="symb-ini.tex"> +<cd:command name="definefiguresymbol" file="symb-ini.tex">    <cd:sequence> -    <cd:string value="definiscifigurasimbolo"/> +    <cd:string value="definefiguresymbol"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1355,14 +1351,14 @@        <cd:constant type="cd:text"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="figuraesterna"/> +      <cd:inherit name="externalfigure"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="simbolo" file="symb-ini.tex"> +<cd:command name="symbol" file="symb-ini.tex">    <cd:sequence> -    <cd:string value="simbolo"/> +    <cd:string value="symbol"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -1385,9 +1381,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostasetsimboli" file="symb-ini.tex"> +<cd:command name="setupsymbolset" file="symb-ini.tex">    <cd:sequence> -    <cd:string value="impostasetsimboli"/> +    <cd:string value="setupsymbolset"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1396,9 +1392,9 @@    </cd:arguments>  </cd:command> -<cd:command name="usasimboli" file="symb-ini.tex"> +<cd:command name="usesymbols" file="symb-ini.tex">    <cd:sequence> -    <cd:string value="usasimboli"/> +    <cd:string value="usesymbols"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1407,9 +1403,9 @@    </cd:arguments>  </cd:command> -<cd:command name="mostrasetsimboli"> +<cd:command name="showsymbolset">    <cd:sequence> -    <cd:string value="mostrasetsimboli"/> +    <cd:string value="showsymbolset"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1418,9 +1414,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definisciconversione" file="core-con.tex"> +<cd:command name="defineconversion" file="core-con.tex">    <cd:sequence> -    <cd:string value="definisciconversione"/> +    <cd:string value="defineconversion"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1433,9 +1429,9 @@    </cd:arguments>  </cd:command> -<cd:command name="convertinumero" file="core-con.tex"> +<cd:command name="convertnumber" file="core-con.tex">    <cd:sequence> -    <cd:string value="convertinumero"/> +    <cd:string value="convertnumber"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -1443,9 +1439,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostatestointestazioni" file="lang-lab.tex"> +<cd:command name="setupheadtext" file="lang-lab.tex">    <cd:sequence> -    <cd:string value="impostatestointestazioni"/> +    <cd:string value="setupheadtext"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -1466,9 +1462,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostatestoetichette" file="lang-lab.tex"> +<cd:command name="setuplabeltext" file="lang-lab.tex">    <cd:sequence> -    <cd:string value="impostatestoetichette"/> +    <cd:string value="setuplabeltext"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -1489,27 +1485,27 @@    </cd:arguments>  </cd:command> -<cd:command name="testoinstestazioni" file="lang-lab.tex"> +<cd:command name="headtext" file="lang-lab.tex">    <cd:sequence> -    <cd:string value="testoinstestazioni"/> +    <cd:string value="headtext"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="testoetichetta"> +<cd:command name="labeltext">    <cd:sequence> -    <cd:string value="testoetichetta"/> +    <cd:string value="labeltext"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="impostalineemargine" file="core-rul.tex"> +<cd:command name="setupmarginrules" file="core-rul.tex">    <cd:sequence> -    <cd:string value="impostalineemargine"/> +    <cd:string value="setupmarginrules"/>    </cd:sequence>    <cd:arguments>      <cd:assignments> @@ -1523,9 +1519,9 @@    </cd:arguments>  </cd:command> -<cd:command name="lineamargine" type="environment"> +<cd:command name="marginrule" type="environment">    <cd:sequence> -    <cd:string value="lineamargine"/> +    <cd:string value="marginrule"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1534,9 +1530,9 @@    </cd:arguments>  </cd:command> -<cd:command name="lineamargine"> +<cd:command name="marginrule">    <cd:sequence> -    <cd:string value="lineamargine"/> +    <cd:string value="marginrule"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1546,9 +1542,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostaampiezzariga" file="core-rul.tex"> +<cd:command name="setuplinewidth" file="core-rul.tex">    <cd:sequence> -    <cd:string value="impostaampiezzariga"/> +    <cd:string value="setuplinewidth"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1557,9 +1553,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostaincorniciato" file="core-rul.tex"> +<cd:command name="setupframed" file="core-rul.tex">    <cd:sequence> -    <cd:string value="impostaincorniciato"/> +    <cd:string value="setupframed"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -1701,44 +1697,44 @@    </cd:arguments>  </cd:command> -<cd:command name="incorniciato" file="core-rul.tex"> +<cd:command name="framed" file="core-rul.tex">    <cd:sequence> -    <cd:string value="incorniciato"/> +    <cd:string value="framed"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="impostaincorniciato"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="circondato" file="core-rul.tex"> +<cd:command name="inframed" file="core-rul.tex">    <cd:sequence> -    <cd:string value="circondato"/> +    <cd:string value="inframed"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="impostaincorniciato"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="lineesottili" file="core-rul.tex"> +<cd:command name="thinrules" file="core-rul.tex">    <cd:sequence> -    <cd:string value="lineesottili"/> +    <cd:string value="thinrules"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes"> -      <cd:inherit name="impostalineesottili"/> +      <cd:inherit name="setupthinrules"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="impostalineesottili" file="core-rul.tex"> +<cd:command name="setupthinrules" file="core-rul.tex">    <cd:sequence> -    <cd:string value="impostalineesottili"/> +    <cd:string value="setupthinrules"/>    </cd:sequence>    <cd:arguments>      <cd:assignments> @@ -1795,49 +1791,49 @@    </cd:arguments>  </cd:command> -<cd:command name="capello" file="core-rul.tex"> +<cd:command name="hairline" file="core-rul.tex">    <cd:sequence> -    <cd:string value="capello"/> +    <cd:string value="hairline"/>    </cd:sequence>  </cd:command> -<cd:command name="lineasottile" file="core-rul.tex"> +<cd:command name="thinrule" file="core-rul.tex">    <cd:sequence> -    <cd:string value="lineasottile"/> +    <cd:string value="thinrule"/>    </cd:sequence>  </cd:command> -<cd:command name="definiscitestoincorniciato" file="core-rul.tex"> +<cd:command name="defineframedtext" file="core-rul.tex">    <cd:sequence> -    <cd:string value="definiscitestoincorniciato"/> +    <cd:string value="defineframedtext"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="impostatestiincorniciati"/> +      <cd:inherit name="setupframedtexts"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="definisciincorniciato" file="core-rul.tex"> +<cd:command name="defineframed" file="core-rul.tex">    <cd:sequence> -    <cd:string value="definisciincorniciato"/> +    <cd:string value="defineframed"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="impostatestiincorniciati"/> +      <cd:inherit name="setupframedtexts"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="impostatestiincorniciati" file="core-rul.tex"> +<cd:command name="setupframedtexts" file="core-rul.tex">    <cd:sequence> -    <cd:string value="impostatestiincorniciati"/> +    <cd:string value="setupframedtexts"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -1891,7 +1887,7 @@          <cd:constant type="centro"/>          <cd:constant type="nessuno"/>        </cd:parameter> -      <cd:inherit name="impostaincorniciato"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -1908,7 +1904,7 @@        <cd:constant type="nessuno"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="impostatestiincorniciati"/> +      <cd:inherit name="setupframedtexts"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -1919,28 +1915,26 @@    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="impostatestiincorniciati"/> +      <cd:inherit name="setupframedtexts"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="sfondo" type="environment"> +<cd:command name="background" type="environment">    <cd:sequence> -    <cd:string value="sfondo"/> +    <cd:string value="background"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="sfondo"> +<cd:command name="background">    <cd:sequence> -    <cd:string value="sfondo"/> +    <cd:string value="background"/>    </cd:sequence>  </cd:command> -<cd:command name="impostasfondo" file="core-rul.tex"> +<cd:command name="setupbackground" file="core-rul.tex">    <cd:sequence> -    <cd:string value="impostasfondo"/> +    <cd:string value="setupbackground"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -1966,40 +1960,40 @@          <cd:constant type="inizia"/>          <cd:constant type="termina"/>        </cd:parameter> -      <cd:inherit name="impostaincorniciato"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="lineeriempimento"> +<cd:command name="fillinrules">    <cd:sequence> -    <cd:string value="lineeriempimento"/> +    <cd:string value="fillinrules"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="impostalineeriempimento"/> +      <cd:inherit name="setupfillinrules"/>      </cd:assignments>      <cd:content/>      <cd:content optional="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="testoriempimento"> +<cd:command name="fillintext">    <cd:sequence> -    <cd:string value="testoriempimento"/> +    <cd:string value="fillintext"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="impostalineeriempimento"/> +      <cd:inherit name="setupfillinrules"/>      </cd:assignments>      <cd:content/>      <cd:content optional="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="impostalineeriempimento" file="core-rul.tex"> +<cd:command name="setupfillinrules" file="core-rul.tex">    <cd:sequence> -    <cd:string value="impostalineeriempimento"/> +    <cd:string value="setupfillinrules"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -2042,21 +2036,21 @@    </cd:arguments>  </cd:command> -<cd:command name="rigariempimento"> +<cd:command name="fillinline">    <cd:sequence> -    <cd:string value="rigariempimento"/> +    <cd:string value="fillinline"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="impostarigheriempimento"/> +      <cd:inherit name="setupfillinlines"/>      </cd:assignments>      <cd:nothing/>    </cd:arguments>  </cd:command> -<cd:command name="impostarigheriempimento" file="core-rul.tex"> +<cd:command name="setupfillinlines" file="core-rul.tex">    <cd:sequence> -    <cd:string value="impostarigheriempimento"/> +    <cd:string value="setupfillinlines"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -2079,9 +2073,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostalineetesto" file="core-rul.tex"> +<cd:command name="setuptextrules" file="core-rul.tex">    <cd:sequence> -    <cd:string value="impostalineetesto"/> +    <cd:string value="setuptextrules"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -2131,9 +2125,9 @@    </cd:arguments>  </cd:command> -<cd:command name="lineatesto" file="core-rul.tex"> +<cd:command name="textrule" file="core-rul.tex">    <cd:sequence> -    <cd:string value="lineatesto"/> +    <cd:string value="textrule"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2144,9 +2138,9 @@    </cd:arguments>  </cd:command> -<cd:command name="lineatesto" type="environment" file="core-rul.tex"> +<cd:command name="textrule" type="environment" file="core-rul.tex">    <cd:sequence> -    <cd:string value="lineatesto"/> +    <cd:string value="textrule"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2157,31 +2151,31 @@    </cd:arguments>  </cd:command> -<cd:command name="lineanera" file="core-rul.tex"> +<cd:command name="blackrule" file="core-rul.tex">    <cd:sequence> -    <cd:string value="lineanera"/> +    <cd:string value="blackrule"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="impostalineenere"/> +      <cd:inherit name="setupblackrules"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="lineenere" file="core-rul.tex"> +<cd:command name="blackrules" file="core-rul.tex">    <cd:sequence> -    <cd:string value="lineenere"/> +    <cd:string value="blackrules"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> -      <cd:inherit name="impostalineenere"/> +      <cd:inherit name="setupblackrules"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="impostalineenere" file="core-rul.tex"> +<cd:command name="setupblackrules" file="core-rul.tex">    <cd:sequence> -    <cd:string value="impostalineenere"/> +    <cd:string value="setupblackrules"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -2211,9 +2205,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definiscisovrapposizione" file="core-rul.tex"> +<cd:command name="defineoverlay" file="core-rul.tex">    <cd:sequence> -    <cd:string value="definiscisovrapposizione"/> +    <cd:string value="defineoverlay"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -2225,9 +2219,9 @@    </cd:arguments>  </cd:command> -<cd:command name="usamodulo"> +<cd:command name="usemodule">    <cd:sequence> -    <cd:string value="usamodulo"/> +    <cd:string value="usemodule"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -2236,9 +2230,9 @@    </cd:arguments>  </cd:command> -<cd:command name="reimposta" file="core-num.tex"> +<cd:command name="reset" file="core-num.tex">    <cd:sequence> -    <cd:string value="reimposta"/> +    <cd:string value="reset"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -2247,9 +2241,9 @@    </cd:arguments>  </cd:command> -<cd:command name="notest"> +<cd:command name="donttest">    <cd:sequence> -    <cd:string value="notest"/> +    <cd:string value="donttest"/>    </cd:sequence>  </cd:command> @@ -2257,13 +2251,11 @@    <cd:sequence>      <cd:string value="localenvironment"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="impostasistema" file="core-sys.tex"> +<cd:command name="setupsystem" file="core-sys.tex">    <cd:sequence> -    <cd:string value="impostasistema"/> +    <cd:string value="setupsystem"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -2299,27 +2291,27 @@    </cd:arguments>  </cd:command> -<cd:command name="ped" file="core-fnt.tex"> +<cd:command name="low" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="ped"/> +    <cd:string value="low"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="ap" file="core-fnt.tex"> +<cd:command name="high" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="ap"/> +    <cd:string value="high"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="pedap" file="core-fnt.tex"> +<cd:command name="lohi" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="pedap"/> +    <cd:string value="lohi"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2330,9 +2322,9 @@    </cd:arguments>  </cd:command> -<cd:command name="mostracornice"> +<cd:command name="showframe">    <cd:sequence> -    <cd:string value="mostracornice"/> +    <cd:string value="showframe"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2343,45 +2335,45 @@    </cd:arguments>  </cd:command> -<cd:command name="allineasinistra" file="core-spa.tex"> +<cd:command name="leftaligned" file="core-spa.tex">    <cd:sequence> -    <cd:string value="allineasinistra"/> +    <cd:string value="leftaligned"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="allineadestra" file="core-spa.tex"> +<cd:command name="rightaligned" file="core-spa.tex">    <cd:sequence> -    <cd:string value="allineadestra"/> +    <cd:string value="rightaligned"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="allineacentro" file="core-spa.tex"> +<cd:command name="midaligned" file="core-spa.tex">    <cd:sequence> -    <cd:string value="allineacentro"/> +    <cd:string value="midaligned"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="paroladestra" file="core-spa.tex"> +<cd:command name="wordright" file="core-spa.tex">    <cd:sequence> -    <cd:string value="paroladestra"/> +    <cd:string value="wordright"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="inmargine" file="core-sec.tex"> +<cd:command name="inmargin" file="core-sec.tex">    <cd:sequence> -    <cd:string value="inmargine"/> +    <cd:string value="inmargin"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2394,9 +2386,9 @@    </cd:arguments>  </cd:command> -<cd:command name="inaltromargine" file="page-mar.tex"> +<cd:command name="inothermargin" file="page-mar.tex">    <cd:sequence> -    <cd:string value="inaltromargine"/> +    <cd:string value="inothermargin"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2409,9 +2401,9 @@    </cd:arguments>  </cd:command> -<cd:command name="insinistra"> +<cd:command name="inleft">    <cd:sequence> -    <cd:string value="insinistra"/> +    <cd:string value="inleft"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2424,9 +2416,9 @@    </cd:arguments>  </cd:command> -<cd:command name="indestra"> +<cd:command name="inright">    <cd:sequence> -    <cd:string value="indestra"/> +    <cd:string value="inright"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2469,33 +2461,33 @@    </cd:arguments>  </cd:command> -<cd:command name="colonna"> +<cd:command name="column">    <cd:sequence> -    <cd:string value="colonna"/> +    <cd:string value="column"/>    </cd:sequence>  </cd:command> -<cd:command name="mostrastruts" file="core-spa.tex"> +<cd:command name="showstruts" file="core-spa.tex">    <cd:sequence> -    <cd:string value="mostrastruts"/> +    <cd:string value="showstruts"/>    </cd:sequence>  </cd:command> -<cd:command name="mostraimpostazioni"> +<cd:command name="showsetups">    <cd:sequence> -    <cd:string value="mostraimpostazioni"/> +    <cd:string value="showsetups"/>    </cd:sequence>  </cd:command> -<cd:command name="mostralyout"> +<cd:command name="showlayout">    <cd:sequence> -    <cd:string value="mostralyout"/> +    <cd:string value="showlayout"/>    </cd:sequence>  </cd:command> -<cd:command name="testoinmargine" file="page-mar.tex"> +<cd:command name="margintext" file="page-mar.tex">    <cd:sequence> -    <cd:string value="testoinmargine"/> +    <cd:string value="margintext"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2508,9 +2500,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostablocchimargine" file="page-flt.tex"> +<cd:command name="setupmarginblocks" file="page-flt.tex">    <cd:sequence> -    <cd:string value="impostablocchimargine"/> +    <cd:string value="setupmarginblocks"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -2568,8 +2560,6 @@    <cd:sequence>      <cd:string value="marginblock"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="part" file="core-sec.tex"> @@ -2683,9 +2673,9 @@    </cd:arguments>  </cd:command> -<cd:command name="al"> +<cd:command name="at">    <cd:sequence> -    <cd:string value="al"/> +    <cd:string value="at"/>    </cd:sequence>    <cd:arguments>      <cd:content interactive="yes"/> @@ -2694,9 +2684,9 @@    </cd:arguments>  </cd:command> -<cd:command name="intorno"> +<cd:command name="about">    <cd:sequence> -    <cd:string value="intorno"/> +    <cd:string value="about"/>    </cd:sequence>    <cd:arguments>      <cd:content interactive="yes"/> @@ -2704,9 +2694,9 @@    </cd:arguments>  </cd:command> -<cd:command name="daqualcheparte" file="core-ref.tex"> +<cd:command name="somewhere" file="core-ref.tex">    <cd:sequence> -    <cd:string value="daqualcheparte"/> +    <cd:string value="somewhere"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -2715,18 +2705,18 @@    </cd:arguments>  </cd:command> -<cd:command name="apagina" file="core-ref.tex"> +<cd:command name="atpage" file="core-ref.tex">    <cd:sequence> -    <cd:string value="apagina"/> +    <cd:string value="atpage"/>    </cd:sequence>    <cd:arguments>      <cd:reference/>    </cd:arguments>  </cd:command> -<cd:command name="rif" file="core-ref.tex"> +<cd:command name="ref" file="core-ref.tex">    <cd:sequence> -    <cd:string value="rif"/> +    <cd:string value="ref"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -2740,9 +2730,9 @@    </cd:arguments>  </cd:command> -<cd:command name="riferimentotesto" file="core-ref.tex"> +<cd:command name="textreference" file="core-ref.tex">    <cd:sequence> -    <cd:string value="riferimentotesto"/> +    <cd:string value="textreference"/>    </cd:sequence>    <cd:arguments>      <cd:reference/> @@ -2750,18 +2740,18 @@    </cd:arguments>  </cd:command> -<cd:command name="riferimentopagina" file="core-ref.tex"> +<cd:command name="pagereference" file="core-ref.tex">    <cd:sequence> -    <cd:string value="riferimentopagina"/> +    <cd:string value="pagereference"/>    </cd:sequence>    <cd:arguments>      <cd:reference/>    </cd:arguments>  </cd:command> -<cd:command name="riferimento" file="core-ref.tex"> +<cd:command name="reference" file="core-ref.tex">    <cd:sequence> -    <cd:string value="riferimento"/> +    <cd:string value="reference"/>    </cd:sequence>    <cd:arguments>      <cd:reference/> @@ -2769,9 +2759,9 @@    </cd:arguments>  </cd:command> -<cd:command name="usariferimenti" file="core-ref.tex"> +<cd:command name="usereferences" file="core-ref.tex">    <cd:sequence> -    <cd:string value="usariferimenti"/> +    <cd:string value="usereferences"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -2780,9 +2770,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definisciriferimento" file="core-ref.tex"> +<cd:command name="definereference" file="core-ref.tex">    <cd:sequence> -    <cd:string value="definisciriferimento"/> +    <cd:string value="definereference"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -2792,9 +2782,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definisciformatoriferimento" file="core-ref.tex"> +<cd:command name="definereferenceformat" file="core-ref.tex">    <cd:sequence> -    <cd:string value="definisciformatoriferimento"/> +    <cd:string value="definereferenceformat"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -2839,9 +2829,9 @@    </cd:arguments>  </cd:command> -<cd:command name="vaigiu" file="core-spa.tex"> +<cd:command name="godown" file="core-spa.tex">    <cd:sequence> -    <cd:string value="vaigiu"/> +    <cd:string value="godown"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -2850,15 +2840,15 @@    </cd:arguments>  </cd:command> -<cd:command name="spaziobianco" file="core-spa.tex"> +<cd:command name="whitespace" file="core-spa.tex">    <cd:sequence> -    <cd:string value="spaziobianco"/> +    <cd:string value="whitespace"/>    </cd:sequence>  </cd:command> -<cd:command name="nientespaziobianco" file="core-spa.tex"> +<cd:command name="nowhitespace" file="core-spa.tex">    <cd:sequence> -    <cd:string value="nientespaziobianco"/> +    <cd:string value="nowhitespace"/>    </cd:sequence>  </cd:command> @@ -2868,15 +2858,15 @@    </cd:sequence>  </cd:command> -<cd:command name="spazio" file="syst-pln.tex"> +<cd:command name="space" file="syst-pln.tex">    <cd:sequence> -    <cd:string value="spazio"/> +    <cd:string value="space"/>    </cd:sequence>  </cd:command> -<cd:command name="spazifissi" file="core-spa.tex"> +<cd:command name="fixedspaces" file="core-spa.tex">    <cd:sequence> -    <cd:string value="spazifissi"/> +    <cd:string value="fixedspaces"/>    </cd:sequence>  </cd:command> @@ -2891,21 +2881,21 @@    </cd:arguments>  </cd:command> -<cd:command name="nientespazio" file="core-spa.tex"> +<cd:command name="nospace" file="core-spa.tex">    <cd:sequence> -    <cd:string value="nientespazio"/> +    <cd:string value="nospace"/>    </cd:sequence>  </cd:command> -<cd:command name="impaccato" file="core-spa.tex"> +<cd:command name="packed" file="core-spa.tex">    <cd:sequence> -    <cd:string value="impaccato"/> +    <cd:string value="packed"/>    </cd:sequence>  </cd:command> -<cd:command name="impostadescrizioni" file="core-des.tex"> +<cd:command name="setupdescriptions" file="core-des.tex">    <cd:sequence> -    <cd:string value="impostadescrizioni"/> +    <cd:string value="setupdescriptions"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -3004,23 +2994,23 @@    </cd:arguments>  </cd:command> -<cd:command name="impostaenumerazioni" file="core-des.tex"> +<cd:command name="setupenumerations" file="core-des.tex">    <cd:sequence> -    <cd:string value="impostaenumerazioni"/> +    <cd:string value="setupenumerations"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes">        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="definiscidescrizione"/> +      <cd:inherit name="definedescription"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="definiscienumerazione" file="core-des.tex"> +<cd:command name="defineenumeration" file="core-des.tex">    <cd:sequence> -    <cd:string value="definiscienumerazione"/> +    <cd:string value="defineenumeration"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -3030,7 +3020,7 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="impostaenumerazioni"/> +      <cd:inherit name="setupenumerations"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -3048,20 +3038,18 @@    <cd:sequence>      <cd:variable value="enumeration"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="definiscidescrizione" file="core-des.tex"> +<cd:command name="definedescription" file="core-des.tex">    <cd:sequence> -    <cd:string value="definiscidescrizione"/> +    <cd:string value="definedescription"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="impostadescrizioni"/> +      <cd:inherit name="setupdescriptions"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -3085,9 +3073,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostarientri" file="core-des.tex"> +<cd:command name="setupindentations" file="core-des.tex">    <cd:sequence> -    <cd:string value="impostarientri"/> +    <cd:string value="setupindentations"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -3140,16 +3128,16 @@    </cd:arguments>  </cd:command> -<cd:command name="definiscirientro" file="core-des.tex"> +<cd:command name="defineindenting" file="core-des.tex">    <cd:sequence> -    <cd:string value="definiscirientro"/> +    <cd:string value="defineindenting"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="impostarientri"/> +      <cd:inherit name="setupindentations"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -3163,9 +3151,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definiscietichetta" file="core-des.tex"> +<cd:command name="definelabel" file="core-des.tex">    <cd:sequence> -    <cd:string value="definiscietichetta"/> +    <cd:string value="definelabel"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3219,9 +3207,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostacolonne" file="page-mul.tex"> +<cd:command name="setupcolumns" file="page-mul.tex">    <cd:sequence> -    <cd:string value="impostacolonne"/> +    <cd:string value="setupcolumns"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -3273,7 +3261,7 @@          <cd:constant type="sinistra"/>          <cd:constant type="destra"/>        </cd:parameter> -      <cd:inherit name="impostaincorniciato"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -3284,14 +3272,14 @@    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="impostacolonne"/> +      <cd:inherit name="setupcolumns"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="definiscitesto" file="page-txt.tex"> +<cd:command name="definetext" file="page-txt.tex">    <cd:sequence> -    <cd:string value="definiscitesto"/> +    <cd:string value="definetext"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3313,9 +3301,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostainstestazione" file="page-txt.tex"> +<cd:command name="setupheader" file="page-txt.tex">    <cd:sequence> -    <cd:string value="impostainstestazione"/> +    <cd:string value="setupheader"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -3384,77 +3372,77 @@    </cd:arguments>  </cd:command> -<cd:command name="impostapdp" file="page-txt.tex"> +<cd:command name="setupfooter" file="page-txt.tex">    <cd:sequence> -    <cd:string value="impostapdp"/> +    <cd:string value="setupfooter"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> -      <cd:inherit name="impostainstestazione"/> +      <cd:inherit name="setupheader"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="impostainstestazione"/> +      <cd:inherit name="setupheader"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="impostatesto" file="page-txt.tex"> +<cd:command name="setuptext" file="page-txt.tex">    <cd:sequence> -    <cd:string value="impostatesto"/> +    <cd:string value="setuptext"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> -      <cd:inherit name="impostainstestazione"/> +      <cd:inherit name="setupheader"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="impostainstestazione"/> +      <cd:inherit name="setupheader"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="impostacima" file="page-txt.tex"> +<cd:command name="setuptop" file="page-txt.tex">    <cd:sequence> -    <cd:string value="impostacima"/> +    <cd:string value="setuptop"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> -      <cd:inherit name="impostainstestazione"/> +      <cd:inherit name="setupheader"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="impostainstestazione"/> +      <cd:inherit name="setupheader"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="impostafondo" file="page-txt.tex"> +<cd:command name="setupbottom" file="page-txt.tex">    <cd:sequence> -    <cd:string value="impostafondo"/> +    <cd:string value="setupbottom"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> -      <cd:inherit name="impostainstestazione"/> +      <cd:inherit name="setupheader"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="impostainstestazione"/> +      <cd:inherit name="setupheader"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="nientelineintestazionepdp" file="page-txt.tex"> +<cd:command name="noheaderandfooterlines" file="page-txt.tex">    <cd:sequence> -    <cd:string value="nientelineintestazionepdp"/> +    <cd:string value="noheaderandfooterlines"/>    </cd:sequence>  </cd:command> -<cd:command name="nientelineecimafondo" file="page-txt.tex"> +<cd:command name="notopandbottomlines" file="page-txt.tex">    <cd:sequence> -    <cd:string value="nientelineecimafondo"/> +    <cd:string value="notopandbottomlines"/>    </cd:sequence>  </cd:command> -<cd:command name="impostatestiintestazioni" file="page-txt.tex"> +<cd:command name="setupheadertexts" file="page-txt.tex">    <cd:sequence> -    <cd:string value="impostatestiintestazioni"/> +    <cd:string value="setupheadertexts"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -3479,9 +3467,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostatestipdp" file="page-txt.tex"> +<cd:command name="setupfootertexts" file="page-txt.tex">    <cd:sequence> -    <cd:string value="impostatestipdp"/> +    <cd:string value="setupfootertexts"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -3506,9 +3494,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostatestotesti" file="page-txt.tex"> +<cd:command name="setuptexttexts" file="page-txt.tex">    <cd:sequence> -    <cd:string value="impostatestotesti"/> +    <cd:string value="setuptexttexts"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -3533,9 +3521,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostatesticima" file="page-txt.tex"> +<cd:command name="setuptoptexts" file="page-txt.tex">    <cd:sequence> -    <cd:string value="impostatesticima"/> +    <cd:string value="setuptoptexts"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -3560,9 +3548,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostatestifondo" file="page-txt.tex"> +<cd:command name="setupbottomtexts" file="page-txt.tex">    <cd:sequence> -    <cd:string value="impostatestifondo"/> +    <cd:string value="setupbottomtexts"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -3587,9 +3575,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definiscimarcatura" file="core-mar.tex"> +<cd:command name="definemarking" file="core-mar.tex">    <cd:sequence> -    <cd:string value="definiscimarcatura"/> +    <cd:string value="definemarking"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3601,9 +3589,9 @@    </cd:arguments>  </cd:command> -<cd:command name="accoppiamarcatura" file="core-sec.tex"> +<cd:command name="couplemarking" file="core-sec.tex">    <cd:sequence> -    <cd:string value="accoppiamarcatura"/> +    <cd:string value="couplemarking"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3615,9 +3603,9 @@    </cd:arguments>  </cd:command> -<cd:command name="separamarcatura" file="core-mar.tex"> +<cd:command name="decouplemarking" file="core-mar.tex">    <cd:sequence> -    <cd:string value="separamarcatura"/> +    <cd:string value="decouplemarking"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3626,9 +3614,9 @@    </cd:arguments>  </cd:command> -<cd:command name="reimpostamarcatura" file="core-mar.tex"> +<cd:command name="resetmarking" file="core-mar.tex">    <cd:sequence> -    <cd:string value="reimpostamarcatura"/> +    <cd:string value="resetmarking"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3637,9 +3625,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostamarcatura" file="core-mar.tex"> +<cd:command name="setupmarking" file="core-mar.tex">    <cd:sequence> -    <cd:string value="impostamarcatura"/> +    <cd:string value="setupmarking"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3661,9 +3649,9 @@    </cd:arguments>  </cd:command> -<cd:command name="marcatura" file="core-mar.tex"> +<cd:command name="marking" file="core-mar.tex">    <cd:sequence> -    <cd:string value="marcatura"/> +    <cd:string value="marking"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3673,9 +3661,9 @@    </cd:arguments>  </cd:command> -<cd:command name="prendimarcatura" file="core-mar.tex"> +<cd:command name="getmarking" file="core-mar.tex">    <cd:sequence> -    <cd:string value="prendimarcatura"/> +    <cd:string value="getmarking"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3692,18 +3680,18 @@    </cd:arguments>  </cd:command> -<cd:command name="nientemarcatura" file="core-mar.tex"> +<cd:command name="nomarking" file="core-mar.tex">    <cd:sequence> -    <cd:string value="nientemarcatura"/> +    <cd:string value="nomarking"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="impostalayout" file="page-ini.tex"> +<cd:command name="setuplayout" file="page-ini.tex">    <cd:sequence> -    <cd:string value="impostalayout"/> +    <cd:string value="setuplayout"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -3865,9 +3853,9 @@    </cd:arguments>  </cd:command> -<cd:command name="adattalayout" file="page-lay.tex"> +<cd:command name="adaptlayout" file="page-lay.tex">    <cd:sequence> -    <cd:string value="adattalayout"/> +    <cd:string value="adaptlayout"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -3885,27 +3873,27 @@    </cd:arguments>  </cd:command> -<cd:command name="mostragriglia" file="page-ini.tex"> +<cd:command name="showgrid" file="page-ini.tex">    <cd:sequence> -    <cd:string value="mostragriglia"/> +    <cd:string value="showgrid"/>    </cd:sequence>  </cd:command> -<cd:command name="mettiingriglia" file="core-grd.tex"> +<cd:command name="placeongrid" file="core-grd.tex">    <cd:sequence> -    <cd:string value="mettiingriglia"/> +    <cd:string value="placeongrid"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> -      <cd:inherit name="spostaagriglia"/> +      <cd:inherit name="moveongrid"/>      </cd:keywords>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="spostaagriglia" file="core-grd.tex"> +<cd:command name="moveongrid" file="core-grd.tex">    <cd:sequence> -    <cd:string value="spostaagriglia"/> +    <cd:string value="moveongrid"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -3931,18 +3919,18 @@    </cd:arguments>  </cd:command> -<cd:command name="progetto" type="environment"> +<cd:command name="project" type="environment">    <cd:sequence> -    <cd:string value="progetto"/> +    <cd:string value="project"/>    </cd:sequence>    <cd:arguments>      <cd:file/>    </cd:arguments>  </cd:command> -<cd:command name="ambiente" type="environment"> +<cd:command name="environment" type="environment">    <cd:sequence> -    <cd:string value="ambiente"/> +    <cd:string value="environment"/>    </cd:sequence>    <cd:arguments>      <cd:file/> @@ -3958,24 +3946,24 @@    </cd:arguments>  </cd:command> -<cd:command name="componenet" type="environment"> +<cd:command name="component" type="environment">    <cd:sequence> -    <cd:string value="componenet"/> +    <cd:string value="component"/>    </cd:sequence>    <cd:arguments>      <cd:file/>    </cd:arguments>  </cd:command> -<cd:command name="bastafile"> +<cd:command name="nomorefiles">    <cd:sequence> -    <cd:string value="bastafile"/> +    <cd:string value="nomorefiles"/>    </cd:sequence>  </cd:command> -<cd:command name="impostainterlinea"> +<cd:command name="setupinterlinespace">    <cd:sequence> -    <cd:string value="impostainterlinea"/> +    <cd:string value="setupinterlinespace"/>    </cd:sequence>    <cd:arguments>      <cd:choice> @@ -4008,9 +3996,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostanumerazionepagina" file="page-num.tex"> +<cd:command name="setuppagenumbering" file="page-num.tex">    <cd:sequence> -    <cd:string value="impostanumerazionepagina"/> +    <cd:string value="setuppagenumbering"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4090,9 +4078,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostapiustretto" file="core-spa.tex"> +<cd:command name="setupnarrower" file="core-spa.tex">    <cd:sequence> -    <cd:string value="impostapiustretto"/> +    <cd:string value="setupnarrower"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4109,9 +4097,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definisci" file="syst-ext.tex"> +<cd:command name="define" file="syst-ext.tex">    <cd:sequence> -    <cd:string value="definisci"/> +    <cd:string value="define"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -4122,18 +4110,18 @@    </cd:arguments>  </cd:command> -<cd:command name="usacomandi" file="core-sys.tex"> +<cd:command name="usecommands" file="core-sys.tex">    <cd:sequence> -    <cd:string value="usacomandi"/> +    <cd:string value="usecommands"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="definisciiniziatermina" file="core-sys.tex"> +<cd:command name="definestartstop" file="core-sys.tex">    <cd:sequence> -    <cd:string value="definisciiniziatermina"/> +    <cd:string value="definestartstop"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -4163,9 +4151,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostateste" file="core-sec.tex"> +<cd:command name="setupheads" file="core-sec.tex">    <cd:sequence> -    <cd:string value="impostateste"/> +    <cd:string value="setupheads"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4215,9 +4203,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostacaptions" file="page-flt.tex"> +<cd:command name="setupcaptions" file="page-flt.tex">    <cd:sequence> -    <cd:string value="impostacaptions"/> +    <cd:string value="setupcaptions"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4296,23 +4284,23 @@    </cd:arguments>  </cd:command> -<cd:command name="impostacaption" file="page-flt.tex"> +<cd:command name="setupcaption" file="page-flt.tex">    <cd:sequence> -    <cd:string value="impostacaption"/> +    <cd:string value="setupcaption"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="impostacaptions"/> +      <cd:inherit name="setupcaptions"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="impostaoggettimobili" file="page-flt.tex"> +<cd:command name="setupfloats" file="page-flt.tex">    <cd:sequence> -    <cd:string value="impostaoggettimobili"/> +    <cd:string value="setupfloats"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4389,14 +4377,14 @@          <cd:constant type="normale"/>          <cd:constant type="riga"/>        </cd:parameter> -      <cd:inherit name="impostaincorniciato"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="impostaspezzamentooggettomobile" file="page-flt.tex"> +<cd:command name="setupfloatsplitting" file="page-flt.tex">    <cd:sequence> -    <cd:string value="impostaspezzamentooggettomobile"/> +    <cd:string value="setupfloatsplitting"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4414,22 +4402,22 @@    </cd:arguments>  </cd:command> -<cd:command name="spezzaoggettomobile" file="page-flt.tex"> +<cd:command name="splitfloat" file="page-flt.tex">    <cd:sequence> -    <cd:string value="spezzaoggettomobile"/> +    <cd:string value="splitfloat"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="impostaspezzamentooggettomobile"/> +      <cd:inherit name="setupfloatsplitting"/>      </cd:assignments>      <cd:content/>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="impostaposizionamentoopposti" file="page-ini.tex"> +<cd:command name="setupoppositeplacing" file="page-ini.tex">    <cd:sequence> -    <cd:string value="impostaposizionamentoopposti"/> +    <cd:string value="setupoppositeplacing"/>    </cd:sequence>    <cd:arguments>      <cd:assignments> @@ -4454,13 +4442,11 @@    <cd:sequence>      <cd:string value="opposite"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="impostasegnosillabazione" file="core-mis.tex"> +<cd:command name="setuphyphenmark" file="core-mis.tex">    <cd:sequence> -    <cd:string value="impostasegnosillabazione"/> +    <cd:string value="setuphyphenmark"/>    </cd:sequence>    <cd:arguments>      <cd:assignments> @@ -4478,9 +4464,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostaposizionamento" file="page-lyr.tex"> +<cd:command name="setuppositioning" file="page-lyr.tex">    <cd:sequence> -    <cd:string value="impostaposizionamento"/> +    <cd:string value="setuppositioning"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4523,13 +4509,11 @@    <cd:sequence>      <cd:string value="positioning"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="griglia" file="core-spa.tex"> +<cd:command name="grid" file="core-spa.tex">    <cd:sequence> -    <cd:string value="griglia"/> +    <cd:string value="grid"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4584,9 +4568,9 @@    </cd:arguments>  </cd:command> -<cd:command name="pagina" file="page-ini.tex"> +<cd:command name="page" file="page-ini.tex">    <cd:sequence> -    <cd:string value="pagina"/> +    <cd:string value="page"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -4611,9 +4595,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostariferimento" file="core-ref.tex"> +<cd:command name="setupreferencing" file="core-ref.tex">    <cd:sequence> -    <cd:string value="impostariferimento"/> +    <cd:string value="setupreferencing"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4667,9 +4651,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostaurl" file="core-ref.tex"> +<cd:command name="setupurl" file="core-ref.tex">    <cd:sequence> -    <cd:string value="impostaurl"/> +    <cd:string value="setupurl"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4697,9 +4681,9 @@    </cd:arguments>  </cd:command> -<cd:command name="scriviinlistariferimenti" file="core-lst.tex"> +<cd:command name="writetoreferencelist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="scriviinlistariferimenti"/> +    <cd:string value="writetoreferencelist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -4710,9 +4694,9 @@    </cd:arguments>  </cd:command> -<cd:command name="mettilistariferimenti"> +<cd:command name="placereferencelist">    <cd:sequence> -    <cd:string value="mettilistariferimenti"/> +    <cd:string value="placereferencelist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -4721,23 +4705,23 @@    </cd:arguments>  </cd:command> -<cd:command name="definiscilistariferimenti" file="core-lst.tex"> +<cd:command name="definereferencelist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="definiscilistariferimenti"/> +    <cd:string value="definereferencelist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="impostalistariferimenti"/> +      <cd:inherit name="setupreferencelist"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="impostalistariferimenti" file="core-lst.tex"> +<cd:command name="setupreferencelist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="impostalistariferimenti"/> +    <cd:string value="setupreferencelist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -4767,9 +4751,9 @@    </cd:arguments>  </cd:command> -<cd:command name="scriviinelenco" file="core-lst.tex"> +<cd:command name="writetolist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="scriviinelenco"/> +    <cd:string value="writetolist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -4781,9 +4765,9 @@    </cd:arguments>  </cd:command> -<cd:command name="scrividentroelenco" file="core-lst.tex"> +<cd:command name="writebetweenlist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="scrividentroelenco"/> +    <cd:string value="writebetweenlist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -4794,9 +4778,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nienteelenco" file="core-lst.tex"> +<cd:command name="nolist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="nienteelenco"/> +    <cd:string value="nolist"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -4815,51 +4799,51 @@    </cd:arguments>  </cd:command> -<cd:command name="mettielenco" file="core-lst.tex"> +<cd:command name="placelist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="mettielenco"/> +    <cd:string value="placelist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes">        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="impostaelenco"/> +      <cd:inherit name="setuplist"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="determinacarattersticheelenco" file="core-lst.tex"> +<cd:command name="determinelistcharacteristics" file="core-lst.tex">    <cd:sequence> -    <cd:string value="determinacarattersticheelenco"/> +    <cd:string value="determinelistcharacteristics"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes">        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="impostaelenco"/> +      <cd:inherit name="setuplist"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="mettielencocombinato" file="core-lst.tex"> +<cd:command name="placecombinedlist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="mettielencocombinato"/> +    <cd:string value="placecombinedlist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="impostaelencocombinato"/> +      <cd:inherit name="setupcombinedlist"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="definiscielenco" file="core-lst.tex"> +<cd:command name="definelist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="definiscielenco"/> +    <cd:string value="definelist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -4869,14 +4853,14 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="impostaelenco"/> +      <cd:inherit name="setuplist"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="impostaelenco" file="core-lst.tex"> +<cd:command name="setuplist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="impostaelenco"/> +    <cd:string value="setuplist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -5047,14 +5031,14 @@        <cd:parameter name="ampiezzamax">          <cd:constant type="cd:dimension"/>        </cd:parameter> -      <cd:inherit name="incorniciato"/> +      <cd:inherit name="framed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="definiscielencocombinato" file="core-lst.tex"> +<cd:command name="definecombinedlist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="definiscielencocombinato"/> +    <cd:string value="definecombinedlist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -5064,14 +5048,14 @@        <cd:constant type="cd:list"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="impostaelencocombinato"/> +      <cd:inherit name="setupcombinedlist"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="impostaelencocombinato" file="core-lst.tex"> +<cd:command name="setupcombinedlist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="impostaelencocombinato"/> +    <cd:string value="setupcombinedlist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -5086,12 +5070,12 @@          <cd:constant type="cd:section"/>          <cd:constant type="corrente"/>        </cd:parameter> -      <cd:inherit name="impostaelenco"/> +      <cd:inherit name="setuplist"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="mettielencocombinato" generated="yes" file="core-lst.tex"> +<cd:command name="placecombinedlist" generated="yes" file="core-lst.tex">    <cd:sequence>      <cd:string value="metti"/>      <cd:variable value="combinedlist"/> @@ -5101,7 +5085,7 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="impostaelencocombinato"/> +      <cd:inherit name="setupcombinedlist"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -5116,14 +5100,14 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="impostaelencocombinato"/> +      <cd:inherit name="setupcombinedlist"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="impostanumerazione" file="core-num.tex"> +<cd:command name="setupnumbering" file="core-num.tex">    <cd:sequence> -    <cd:string value="impostanumerazione"/> +    <cd:string value="setupnumbering"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -5199,18 +5183,18 @@    </cd:arguments>  </cd:command> -<cd:command name="pubblicazione" file="core-mis.tex"> +<cd:command name="publication" file="core-mis.tex">    <cd:sequence> -    <cd:string value="pubblicazione"/> +    <cd:string value="publication"/>    </cd:sequence>    <cd:arguments>      <cd:reference/>    </cd:arguments>  </cd:command> -<cd:command name="impostapubblicazioni" file="core-mis.tex"> +<cd:command name="setuppublications" file="core-mis.tex">    <cd:sequence> -    <cd:string value="impostapubblicazioni"/> +    <cd:string value="setuppublications"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -5218,14 +5202,14 @@          <cd:constant type="apa"/>          <cd:constant type="normale"/>        </cd:parameter> -      <cd:inherit name="impostaenumerazioni"/> +      <cd:inherit name="setupenumerations"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="impostarighe" file="page-lin.tex"> +<cd:command name="setuplines" file="page-lin.tex">    <cd:sequence> -    <cd:string value="impostarighe"/> +    <cd:string value="setuplines"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -5252,13 +5236,11 @@    <cd:sequence>      <cd:string value="lines"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="impostanumerazionecapoversi" file="page-lin.tex"> +<cd:command name="setupparagraphnumbering" file="page-lin.tex">    <cd:sequence> -    <cd:string value="impostanumerazionecapoversi"/> +    <cd:string value="setupparagraphnumbering"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -5285,9 +5267,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostanumerazionerighe" file="page-lin.tex"> +<cd:command name="setuplinenumbering" file="page-lin.tex">    <cd:sequence> -    <cd:string value="impostanumerazionerighe"/> +    <cd:string value="setuplinenumbering"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -5353,27 +5335,27 @@    </cd:arguments>  </cd:command> -<cd:command name="qualcheriga" file="page-lin.tex"> +<cd:command name="someline" file="page-lin.tex">    <cd:sequence> -    <cd:string value="qualcheriga"/> +    <cd:string value="someline"/>    </cd:sequence>    <cd:arguments>      <cd:reference/>    </cd:arguments>  </cd:command> -<cd:command name="inriga" file="page-lin.tex"> +<cd:command name="inline" file="page-lin.tex">    <cd:sequence> -    <cd:string value="inriga"/> +    <cd:string value="inline"/>    </cd:sequence>    <cd:arguments>      <cd:reference/>    </cd:arguments>  </cd:command> -<cd:command name="impostainmargine" file="page-mar.tex"> +<cd:command name="setupinmargin" file="page-mar.tex">    <cd:sequence> -    <cd:string value="impostainmargine"/> +    <cd:string value="setupinmargin"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -5432,14 +5414,14 @@          <cd:constant type="si"/>          <cd:constant type="no"/>        </cd:parameter> -      <cd:inherit name="impostaincorniciato"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="impostanumeropagina" file="page-num.tex"> +<cd:command name="setuppagenumber" file="page-num.tex">    <cd:sequence> -    <cd:string value="impostanumeropagina"/> +    <cd:string value="setuppagenumber"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -5455,9 +5437,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostanumerosottopagina" file="page-num.tex"> +<cd:command name="setupsubpagenumber" file="page-num.tex">    <cd:sequence> -    <cd:string value="impostanumerosottopagina"/> +    <cd:string value="setupsubpagenumber"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -5474,9 +5456,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostarigovuoto"> +<cd:command name="setupblank">    <cd:sequence> -    <cd:string value="impostarigovuoto"/> +    <cd:string value="setupblank"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -5493,23 +5475,23 @@    </cd:arguments>  </cd:command> -<cd:command name="definiscirigovuoto" file="core-spa.tex"> +<cd:command name="defineblank" file="core-spa.tex">    <cd:sequence> -    <cd:string value="definiscirigovuoto"/> +    <cd:string value="defineblank"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:keywords> -      <cd:inherit name="impostarigovuoto"/> +      <cd:inherit name="setupblank"/>      </cd:keywords>    </cd:arguments>  </cd:command> -<cd:command name="definiscidimensionicarta" file="page-lay.tex"> +<cd:command name="definepapersize" file="page-lay.tex">    <cd:sequence> -    <cd:string value="definiscidimensionicarta"/> +    <cd:string value="definepapersize"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -5570,9 +5552,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostadimensionicarta" file="page-lay.tex"> +<cd:command name="setuppapersize" file="page-lay.tex">    <cd:sequence> -    <cd:string value="impostadimensionicarta"/> +    <cd:string value="setuppapersize"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -5610,9 +5592,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostaparranging" file="page-imp.tex"> +<cd:command name="setuparranging" file="page-imp.tex">    <cd:sequence> -    <cd:string value="impostaparranging"/> +    <cd:string value="setuparranging"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -5639,26 +5621,26 @@    </cd:arguments>  </cd:command> -<cd:command name="mostrastampa"> +<cd:command name="showprint">    <cd:sequence> -    <cd:string value="mostrastampa"/> +    <cd:string value="showprint"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> -      <cd:inherit name="impostadimensionicarta"/> +      <cd:inherit name="setuppapersize"/>      </cd:keywords>      <cd:keywords list="yes"> -      <cd:inherit name="impostadimensionicarta"/> +      <cd:inherit name="setuppapersize"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="impostalayout"/> +      <cd:inherit name="setuplayout"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="definiscilogo" file="page-log.tex"> +<cd:command name="definelogo" file="page-log.tex">    <cd:sequence> -    <cd:string value="definiscilogo"/> +    <cd:string value="definelogo"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -5694,9 +5676,9 @@    </cd:arguments>  </cd:command> -<cd:command name="mettiloghi" file="page-log.tex"> +<cd:command name="placelogos" file="page-log.tex">    <cd:sequence> -    <cd:string value="mettiloghi"/> +    <cd:string value="placelogos"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -5705,9 +5687,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostaspaziobianco"> +<cd:command name="setupwhitespace">    <cd:sequence> -    <cd:string value="impostaspaziobianco"/> +    <cd:string value="setupwhitespace"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -5723,9 +5705,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostarientro"> +<cd:command name="setupindenting">    <cd:sequence> -    <cd:string value="impostarientro"/> +    <cd:string value="setupindenting"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -5740,23 +5722,23 @@    </cd:arguments>  </cd:command> -<cd:command name="definiscibloccosezione" file="core-sec.tex"> +<cd:command name="definesectionblock" file="core-sec.tex">    <cd:sequence> -    <cd:string value="definiscibloccosezione"/> +    <cd:string value="definesectionblock"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="impostabloccosezione"/> +      <cd:inherit name="setupsectionblock"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="impostabloccosezione" file="core-sec.tex"> +<cd:command name="setupsectionblock" file="core-sec.tex">    <cd:sequence> -    <cd:string value="impostabloccosezione"/> +    <cd:string value="setupsectionblock"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -5781,9 +5763,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definiscisezione" file="core-sec.tex"> +<cd:command name="definesection" file="core-sec.tex">    <cd:sequence> -    <cd:string value="definiscisezione"/> +    <cd:string value="definesection"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -5792,9 +5774,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostasezione" file="core-sec.tex"> +<cd:command name="setupsection" file="core-sec.tex">    <cd:sequence> -    <cd:string value="impostasezione"/> +    <cd:string value="setupsection"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -5819,9 +5801,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostatesta" file="core-sec.tex"> +<cd:command name="setuphead" file="core-sec.tex">    <cd:sequence> -    <cd:string value="impostatesta"/> +    <cd:string value="setuphead"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -5958,14 +5940,14 @@          <cd:constant type="si"/>          <cd:constant type="no"/>        </cd:parameter> -      <cd:inherit name="impostateste"/> +      <cd:inherit name="setupheads"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="impostanumerotesta" file="core-sec.tex"> +<cd:command name="setupheadnumber" file="core-sec.tex">    <cd:sequence> -    <cd:string value="impostanumerotesta"/> +    <cd:string value="setupheadnumber"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -5979,9 +5961,9 @@    </cd:arguments>  </cd:command> -<cd:command name="numerotesta"> +<cd:command name="headnumber">    <cd:sequence> -    <cd:string value="numerotesta"/> +    <cd:string value="headnumber"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -5990,9 +5972,9 @@    </cd:arguments>  </cd:command> -<cd:command name="determinanumerotesta" file="core-sec.tex"> +<cd:command name="determineheadnumber" file="core-sec.tex">    <cd:sequence> -    <cd:string value="determinanumerotesta"/> +    <cd:string value="determineheadnumber"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6001,9 +5983,9 @@    </cd:arguments>  </cd:command> -<cd:command name="numerotestacorrente" file="core-sec.tex"> +<cd:command name="currentheadnumber" file="core-sec.tex">    <cd:sequence> -    <cd:string value="numerotestacorrente"/> +    <cd:string value="currentheadnumber"/>    </cd:sequence>  </cd:command> @@ -6014,9 +5996,9 @@    </cd:sequence>  </cd:command> -<cd:command name="definiscitesta" file="core-sec.tex"> +<cd:command name="definehead" file="core-sec.tex">    <cd:sequence> -    <cd:string value="definiscitesta"/> +    <cd:string value="definehead"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6196,27 +6178,27 @@    </cd:arguments>  </cd:command> -<cd:command name="elemento"> +<cd:command name="item">    <cd:sequence> -    <cd:string value="elemento"/> +    <cd:string value="item"/>    </cd:sequence>    <cd:arguments>      <cd:reference optional="yes" list="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="fondo"> +<cd:command name="but">    <cd:sequence> -    <cd:string value="fondo"/> +    <cd:string value="but"/>    </cd:sequence>    <cd:arguments>      <cd:reference interactive="exclusive"/>    </cd:arguments>  </cd:command> -<cd:command name="el"> +<cd:command name="its">    <cd:sequence> -    <cd:string value="el"/> +    <cd:string value="its"/>    </cd:sequence>    <cd:arguments>      <cd:reference optional="yes" list="yes"/> @@ -6232,9 +6214,9 @@    </cd:arguments>  </cd:command> -<cd:command name="testa"> +<cd:command name="head">    <cd:sequence> -    <cd:string value="testa"/> +    <cd:string value="head"/>    </cd:sequence>    <cd:arguments>      <cd:reference optional="yes" list="yes"/> @@ -6260,9 +6242,9 @@    </cd:arguments>  </cd:command> -<cd:command name="sim" file="core-itm.tex"> +<cd:command name="sym" file="core-itm.tex">    <cd:sequence> -    <cd:string value="sim"/> +    <cd:string value="sym"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -6275,9 +6257,9 @@    </cd:sequence>  </cd:command> -<cd:command name="definisciregistro" file="core-reg.tex"> +<cd:command name="defineregister" file="core-reg.tex">    <cd:sequence> -    <cd:string value="definisciregistro"/> +    <cd:string value="defineregister"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6289,9 +6271,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostaregistro" file="core-reg.tex"> +<cd:command name="setupregister" file="core-reg.tex">    <cd:sequence> -    <cd:string value="impostaregistro"/> +    <cd:string value="setupregister"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6434,9 +6416,9 @@    </cd:arguments>  </cd:command> -<cd:command name="scriviinregistro" file="core-reg.tex"> +<cd:command name="writetoregister" file="core-reg.tex">    <cd:sequence> -    <cd:string value="scriviinregistro"/> +    <cd:string value="writetoregister"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6462,9 +6444,9 @@    </cd:arguments>  </cd:command> -<cd:command name="accoppiaregistro" file="core-reg.tex"> +<cd:command name="coupleregister" file="core-reg.tex">    <cd:sequence> -    <cd:string value="accoppiaregistro"/> +    <cd:string value="coupleregister"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6473,16 +6455,16 @@    </cd:arguments>  </cd:command> -<cd:command name="mettiregistro" file="core-reg.tex"> +<cd:command name="placeregister" file="core-reg.tex">    <cd:sequence> -    <cd:string value="mettiregistro"/> +    <cd:string value="placeregister"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="impostaregistro"/> +      <cd:inherit name="setupregister"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -6508,26 +6490,26 @@    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="yes" optional="yes" list="yes"> -      <cd:inherit name="impostaregistro"/> +      <cd:inherit name="setupregister"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="mettiregistro" generated="yes" file="core-reg.tex"> +<cd:command name="placeregister" generated="yes" file="core-reg.tex">    <cd:sequence>      <cd:string value="metti"/>      <cd:variable value="registro"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="yes" optional="yes" list="yes"> -      <cd:inherit name="impostaregistro"/> +      <cd:inherit name="setupregister"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="definiscisinonimi" file="core-syn.tex"> +<cd:command name="definesynonyms" file="core-syn.tex">    <cd:sequence> -    <cd:string value="definiscisinonimi"/> +    <cd:string value="definesynonyms"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6545,9 +6527,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostasinonimi" file="core-syn.tex"> +<cd:command name="setupsynonyms" file="core-syn.tex">    <cd:sequence> -    <cd:string value="impostasinonimi"/> +    <cd:string value="setupsynonyms"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6644,9 +6626,9 @@    </cd:sequence>  </cd:command> -<cd:command name="definisciordinamento" file="core-syn.tex"> +<cd:command name="definesorting" file="core-syn.tex">    <cd:sequence> -    <cd:string value="definisciordinamento"/> +    <cd:string value="definesorting"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6661,9 +6643,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostaordinamento" file="core-syn.tex"> +<cd:command name="setupsorting" file="core-syn.tex">    <cd:sequence> -    <cd:string value="impostaordinamento"/> +    <cd:string value="setupsorting"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6739,16 +6721,16 @@    </cd:sequence>  </cd:command> -<cd:command name="definiscimakeup" file="page-mak.tex"> +<cd:command name="definemakeup" file="page-mak.tex">    <cd:sequence> -    <cd:string value="definiscimakeup"/> +    <cd:string value="definemakeup"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="impostamakeup"/> +      <cd:inherit name="setupmakeup"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -6762,14 +6744,14 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="impostamakeup"/> +      <cd:inherit name="setupmakeup"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="impostamakeup" file="page-mak.tex"> +<cd:command name="setupmakeup" file="page-mak.tex">    <cd:sequence> -    <cd:string value="impostamakeup"/> +    <cd:string value="setupmakeup"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6849,13 +6831,11 @@      <cd:variable value="nome"/>      <cd:string value="makeup"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="versione"> +<cd:command name="version">    <cd:sequence> -    <cd:string value="versione"/> +    <cd:string value="version"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6866,20 +6846,20 @@    </cd:arguments>  </cd:command> -<cd:command name="datadioggi"> +<cd:command name="currentdate">    <cd:sequence> -    <cd:string value="datadioggi"/> +    <cd:string value="currentdate"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> -      <cd:inherit name="data"/> +      <cd:inherit name="date"/>      </cd:keywords>    </cd:arguments>  </cd:command> -<cd:command name="data" file="core-con.tex"> +<cd:command name="date" file="core-con.tex">    <cd:sequence> -    <cd:string value="data"/> +    <cd:string value="date"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> @@ -6898,15 +6878,15 @@    </cd:arguments>  </cd:command> -<cd:command name="datareferral" file="core-mis.tex"> +<cd:command name="referraldate" file="core-mis.tex">    <cd:sequence> -    <cd:string value="datareferral"/> +    <cd:string value="referraldate"/>    </cd:sequence>  </cd:command> -<cd:command name="rientro" file="core-spa.tex"> +<cd:command name="indenting" file="core-spa.tex">    <cd:sequence> -    <cd:string value="rientro"/> +    <cd:string value="indenting"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -6921,15 +6901,15 @@    </cd:arguments>  </cd:command> -<cd:command name="nienterientro" file="core-spa.tex"> +<cd:command name="noindenting" file="core-spa.tex">    <cd:sequence> -    <cd:string value="nienterientro"/> +    <cd:string value="noindenting"/>    </cd:sequence>  </cd:command> -<cd:command name="rigovuoto" file="core-spa.tex"> +<cd:command name="blank" file="core-spa.tex">    <cd:sequence> -    <cd:string value="rigovuoto"/> +    <cd:string value="blank"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -6952,9 +6932,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impaccato" type="environment" file="core-spa.tex"> +<cd:command name="packed" type="environment" file="core-spa.tex">    <cd:sequence> -    <cd:string value="impaccato"/> +    <cd:string value="packed"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -6967,21 +6947,17 @@    <cd:sequence>      <cd:string value="unpacked"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="linecorrection" type="environment">    <cd:sequence>      <cd:string value="linecorrection"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="correggispaziobianco" file="core-spa.tex"> +<cd:command name="correctwhitespace" file="core-spa.tex">    <cd:sequence> -    <cd:string value="correggispaziobianco"/> +    <cd:string value="correctwhitespace"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -6992,16 +6968,12 @@    <cd:sequence>      <cd:string value="postponing"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="locale" type="environment">    <cd:sequence>      <cd:string value="locale"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="narrower" type="environment"> @@ -7021,13 +6993,11 @@    <cd:sequence>      <cd:string value="hiding"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="impostaallineamento" file="core-spa.tex"> +<cd:command name="setupalign" file="core-spa.tex">    <cd:sequence> -    <cd:string value="impostaallineamento"/> +    <cd:string value="setupalign"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7057,14 +7027,14 @@    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> -      <cd:inherit name="impostaallineamento"/> +      <cd:inherit name="setupalign"/>      </cd:keywords>    </cd:arguments>  </cd:command> -<cd:command name="impostaspaziatura"> +<cd:command name="setupspacing">    <cd:sequence> -    <cd:string value="impostaspaziatura"/> +    <cd:string value="setupspacing"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7074,9 +7044,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostatolleranza" file="core-spa.tex"> +<cd:command name="setuptolerance" file="core-spa.tex">    <cd:sequence> -    <cd:string value="impostatolleranza"/> +    <cd:string value="setuptolerance"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7092,9 +7062,9 @@    </cd:arguments>  </cd:command> -<cd:command name="tipopagina" file="page-ini.tex"> +<cd:command name="pagetype" file="page-ini.tex">    <cd:sequence> -    <cd:string value="tipopagina"/> +    <cd:string value="pagetype"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7103,9 +7073,9 @@    </cd:arguments>  </cd:command> -<cd:command name="elaborapagina" file="page-ini.tex"> +<cd:command name="processpage" file="page-ini.tex">    <cd:sequence> -    <cd:string value="elaborapagina"/> +    <cd:string value="processpage"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7118,9 +7088,9 @@    </cd:arguments>  </cd:command> -<cd:command name="accoppiapagina" file="page-ini.tex"> +<cd:command name="couplepage" file="page-ini.tex">    <cd:sequence> -    <cd:string value="accoppiapagina"/> +    <cd:string value="couplepage"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7140,9 +7110,9 @@    </cd:arguments>  </cd:command> -<cd:command name="posizione" file="page-lyr.tex"> +<cd:command name="position" file="page-lyr.tex">    <cd:sequence> -    <cd:string value="posizione"/> +    <cd:string value="position"/>    </cd:sequence>    <cd:arguments>      <cd:position list="yes"/> @@ -7150,9 +7120,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostaschermi" file="core-rul.tex"> +<cd:command name="setupscreens" file="core-rul.tex">    <cd:sequence> -    <cd:string value="impostaschermi"/> +    <cd:string value="setupscreens"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -7174,9 +7144,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostasfondi" file="page-bck.tex"> +<cd:command name="setupbackgrounds" file="page-bck.tex">    <cd:sequence> -    <cd:string value="impostasfondi"/> +    <cd:string value="setupbackgrounds"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -7203,7 +7173,7 @@          <cd:constant type="termina"/>          <cd:variable type="cd:repeat"/>        </cd:parameter> -      <cd:inherit name="impostaincorniciato"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -7219,9 +7189,9 @@    </cd:arguments>  </cd:command> -<cd:command name="prendibuffer"> +<cd:command name="getbuffer">    <cd:sequence> -    <cd:string value="prendibuffer"/> +    <cd:string value="getbuffer"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -7241,9 +7211,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definiscibuffer" file="core-buf.tex"> +<cd:command name="definebuffer" file="core-buf.tex">    <cd:sequence> -    <cd:string value="definiscibuffer"/> +    <cd:string value="definebuffer"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7252,9 +7222,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostabuffer" file="core-buf.tex"> +<cd:command name="setupbuffer" file="core-buf.tex">    <cd:sequence> -    <cd:string value="impostabuffer"/> +    <cd:string value="setupbuffer"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -7274,9 +7244,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definisciblocco" file="core-buf.tex"> +<cd:command name="defineblock" file="core-buf.tex">    <cd:sequence> -    <cd:string value="definisciblocco"/> +    <cd:string value="defineblock"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7285,15 +7255,15 @@    </cd:arguments>  </cd:command> -<cd:command name="bastablocchi" file="core-buf.tex"> +<cd:command name="nomoreblocks" file="core-buf.tex">    <cd:sequence> -    <cd:string value="bastablocchi"/> +    <cd:string value="nomoreblocks"/>    </cd:sequence>  </cd:command> -<cd:command name="nascondiblocchi" file="core-buf.tex"> +<cd:command name="hideblocks" file="core-buf.tex">    <cd:sequence> -    <cd:string value="nascondiblocchi"/> +    <cd:string value="hideblocks"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7305,9 +7275,9 @@    </cd:arguments>  </cd:command> -<cd:command name="tieniblocchi" file="core-buf.tex"> +<cd:command name="keepblocks" file="core-buf.tex">    <cd:sequence> -    <cd:string value="tieniblocchi"/> +    <cd:string value="keepblocks"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7320,9 +7290,9 @@    </cd:arguments>  </cd:command> -<cd:command name="usablocco" file="core-buf.tex"> +<cd:command name="useblocks" file="core-buf.tex">    <cd:sequence> -    <cd:string value="usablocco"/> +    <cd:string value="useblocks"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7334,9 +7304,9 @@    </cd:arguments>  </cd:command> -<cd:command name="elaborablocchi" file="core-buf.tex"> +<cd:command name="processblocks" file="core-buf.tex">    <cd:sequence> -    <cd:string value="elaborablocchi"/> +    <cd:string value="processblocks"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7348,9 +7318,9 @@    </cd:arguments>  </cd:command> -<cd:command name="saltablocchi" file="core-buf.tex"> +<cd:command name="bypassblocks" file="core-buf.tex">    <cd:sequence> -    <cd:string value="saltablocchi"/> +    <cd:string value="bypassblocks"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7362,9 +7332,9 @@    </cd:arguments>  </cd:command> -<cd:command name="forzablocchi"> +<cd:command name="forceblocks">    <cd:sequence> -    <cd:string value="forzablocchi"/> +    <cd:string value="forceblocks"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7376,9 +7346,9 @@    </cd:arguments>  </cd:command> -<cd:command name="selezionablocchi" file="core-buf.tex"> +<cd:command name="selectblocks" file="core-buf.tex">    <cd:sequence> -    <cd:string value="selezionablocchi"/> +    <cd:string value="selectblocks"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7396,9 +7366,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostablocco" file="core-buf.tex"> +<cd:command name="setupblock" file="core-buf.tex">    <cd:sequence> -    <cd:string value="impostablocco"/> +    <cd:string value="setupblock"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7435,22 +7405,20 @@    <cd:sequence>      <cd:variable value="formula"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="matematica" file="supp-mat.tex"> +<cd:command name="mathematics" file="supp-mat.tex">    <cd:sequence> -    <cd:string value="matematica"/> +    <cd:string value="mathematics"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="mettiformula" file="core-mat.tex"> +<cd:command name="placeformula" file="core-mat.tex">    <cd:sequence> -    <cd:string value="mettiformula"/> +    <cd:string value="placeformula"/>    </cd:sequence>    <cd:arguments>      <cd:reference optional="yes" list="yes"/> @@ -7459,9 +7427,9 @@    </cd:arguments>  </cd:command> -<cd:command name="mettisottoformula" file="core-mat.tex"> +<cd:command name="placesubformula" file="core-mat.tex">    <cd:sequence> -    <cd:string value="mettisottoformula"/> +    <cd:string value="placesubformula"/>    </cd:sequence>    <cd:arguments>      <cd:reference optional="yes" list="yes"/> @@ -7542,9 +7510,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definiscioggettomobile" file="page-flt.tex"> +<cd:command name="definefloat" file="page-flt.tex">    <cd:sequence> -    <cd:string value="definiscioggettomobile"/> +    <cd:string value="definefloat"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7556,9 +7524,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostaoggettomobile" file="page-flt.tex"> +<cd:command name="setupfloat" file="page-flt.tex">    <cd:sequence> -    <cd:string value="impostaoggettomobile"/> +    <cd:string value="setupfloat"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7597,7 +7565,7 @@          <cd:constant type="centro"/>          <cd:constant type="destra"/>        </cd:parameter> -      <cd:inherit name="impostaincorniciato"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -7628,8 +7596,6 @@      <cd:string value="placelistof"/>      <cd:variable value="floats"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="completelistoffloats" generated="yes"> @@ -7637,8 +7603,6 @@      <cd:string value="completelistof"/>      <cd:variable value="floats"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="referral" file="core-mis.tex"> @@ -7669,9 +7633,9 @@    </cd:arguments>  </cd:command> -<cd:command name="selezionacarta"> +<cd:command name="selectpaper">    <cd:sequence> -    <cd:string value="selezionacarta"/> +    <cd:string value="selectpaper"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -7683,9 +7647,9 @@    </cd:arguments>  </cd:command> -<cd:command name="accoppiacarta"> +<cd:command name="couplepaper">    <cd:sequence> -    <cd:string value="accoppiacarta"/> +    <cd:string value="couplepaper"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7694,9 +7658,9 @@    </cd:arguments>  </cd:command> -<cd:command name="chim" file="core-mis.tex"> +<cd:command name="chem" file="core-mis.tex">    <cd:sequence> -    <cd:string value="chim"/> +    <cd:string value="chem"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -7705,9 +7669,9 @@    </cd:arguments>  </cd:command> -<cd:command name="frazione" file="core-mis.tex"> +<cd:command name="fraction" file="core-mis.tex">    <cd:sequence> -    <cd:string value="frazione"/> +    <cd:string value="fraction"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -7715,9 +7679,9 @@    </cd:arguments>  </cd:command> -<cd:command name="punti" file="core-mis.tex"> +<cd:command name="periods" file="core-mis.tex">    <cd:sequence> -    <cd:string value="punti"/> +    <cd:string value="periods"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7726,30 +7690,21 @@    </cd:arguments>  </cd:command> -<cd:command name="domicilio"> -  <cd:sequence> -    <cd:string value="domicilio"/> -  </cd:sequence> -  <cd:arguments> -    <cd:content/> -  </cd:arguments> -</cd:command> - -<cd:command name="elementi"> +<cd:command name="items">    <cd:sequence> -    <cd:string value="elementi"/> +    <cd:string value="items"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="impostaelementi"/> +      <cd:inherit name="setupitems"/>      </cd:assignments>      <cd:content list="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="impostaelementi" file="core-mis.tex"> +<cd:command name="setupitems" file="core-mis.tex">    <cd:sequence> -    <cd:string value="impostaelementi"/> +    <cd:string value="setupitems"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -7796,9 +7751,9 @@    </cd:arguments>  </cd:command> -<cd:command name="citazione" type="environment" file="core-mis.tex"> +<cd:command name="quotation" type="environment" file="core-mis.tex">    <cd:sequence> -    <cd:string value="citazione"/> +    <cd:string value="quotation"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7809,27 +7764,27 @@    </cd:arguments>  </cd:command> -<cd:command name="citazione" file="core-mis.tex"> +<cd:command name="quotation" file="core-mis.tex">    <cd:sequence> -    <cd:string value="citazione"/> +    <cd:string value="quotation"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="menzione" file="core-mis.tex"> +<cd:command name="quote" file="core-mis.tex">    <cd:sequence> -    <cd:string value="menzione"/> +    <cd:string value="quote"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="impostamenzione" file="core-mis.tex"> +<cd:command name="setupquote" file="core-mis.tex">    <cd:sequence> -    <cd:string value="impostamenzione"/> +    <cd:string value="setupquote"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -7873,9 +7828,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definiscicapoversi" file="core-mis.tex"> +<cd:command name="defineparagraphs" file="core-mis.tex">    <cd:sequence> -    <cd:string value="definiscicapoversi"/> +    <cd:string value="defineparagraphs"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7931,13 +7886,11 @@    <cd:sequence>      <cd:variable value="capoverso"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="impostacapoversi" file="core-mis.tex"> +<cd:command name="setupparagraphs" file="core-mis.tex">    <cd:sequence> -    <cd:string value="impostacapoversi"/> +    <cd:string value="setupparagraphs"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -8000,9 +7953,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostatab" file="core-mis.tex"> +<cd:command name="setuptab" file="core-mis.tex">    <cd:sequence> -    <cd:string value="impostatab"/> +    <cd:string value="setuptab"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -8051,9 +8004,9 @@    </cd:arguments>  </cd:command> -<cd:command name="etichette"> +<cd:command name="labels">    <cd:sequence> -    <cd:string value="etichette"/> +    <cd:string value="labels"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -8062,9 +8015,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definiscitabulato" file="core-tbl.tex"> +<cd:command name="definetabulate" file="core-tbl.tex">    <cd:sequence> -    <cd:string value="definiscitabulato"/> +    <cd:string value="definetabulate"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -8088,14 +8041,14 @@        <cd:constant type="cd:text"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="usafiguraesterna"/> +      <cd:inherit name="useexternalfigure"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="impostatabulato" file="core-tbl.tex"> +<cd:command name="setuptabulate" file="core-tbl.tex">    <cd:sequence> -    <cd:string value="impostatabulato"/> +    <cd:string value="setuptabulate"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -8162,9 +8115,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostatabelle" file="core-tab.tex"> +<cd:command name="setuptables" file="core-tab.tex">    <cd:sequence> -    <cd:string value="impostatabelle"/> +    <cd:string value="setuptables"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -8269,9 +8222,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definiscimodellotabella" file="core-tab.tex"> +<cd:command name="definetabletemplate" file="core-tab.tex">    <cd:sequence> -    <cd:string value="definiscimodellotabella"/> +    <cd:string value="definetabletemplate"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -8289,9 +8242,9 @@    </cd:arguments>  </cd:command> -<cd:command name="usafileesterni" file="core-mis.tex"> +<cd:command name="useexternalfiles" file="core-mis.tex">    <cd:sequence> -    <cd:string value="usafileesterni"/> +    <cd:string value="useexternalfiles"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -8312,9 +8265,9 @@    </cd:arguments>  </cd:command> -<cd:command name="usafileesterno" file="core-mis.tex"> +<cd:command name="useexternalfile" file="core-mis.tex">    <cd:sequence> -    <cd:string value="usafileesterno"/> +    <cd:string value="useexternalfile"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -8338,9 +8291,9 @@    </cd:arguments>  </cd:command> -<cd:command name="usafiguraesterna" file="core-fig.tex"> +<cd:command name="useexternalfigure" file="core-fig.tex">    <cd:sequence> -    <cd:string value="usafiguraesterna"/> +    <cd:string value="useexternalfigure"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -8423,23 +8376,23 @@    </cd:arguments>  </cd:command> -<cd:command name="figuraesterna" file="core-fig.tex"> +<cd:command name="externalfigure" file="core-fig.tex">    <cd:sequence> -    <cd:string value="figuraesterna"/> +    <cd:string value="externalfigure"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:file"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="usafiguraesterna"/> +      <cd:inherit name="useexternalfigure"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="impostafigureesterne" file="core-fig.tex"> +<cd:command name="setupexternalfigures" file="core-fig.tex">    <cd:sequence> -    <cd:string value="impostafigureesterne"/> +    <cd:string value="setupexternalfigures"/>    </cd:sequence>    <cd:arguments>      <cd:assignments> @@ -8481,9 +8434,9 @@    </cd:arguments>  </cd:command> -<cd:command name="mostrafiguresterne" file="core-fig.tex"> +<cd:command name="showexternalfigures" file="core-fig.tex">    <cd:sequence> -    <cd:string value="mostrafiguresterne"/> +    <cd:string value="showexternalfigures"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> @@ -8496,9 +8449,9 @@    </cd:arguments>  </cd:command> -<cd:command name="usacolonnasonoraesterna" file="core-fig.tex"> +<cd:command name="useexternalsoundtrack" file="core-fig.tex">    <cd:sequence> -    <cd:string value="usacolonnasonoraesterna"/> +    <cd:string value="useexternalsoundtrack"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -8535,9 +8488,9 @@    </cd:arguments>  </cd:command> -<cd:command name="fatto" type="environment"> +<cd:command name="fact" type="environment">    <cd:sequence> -    <cd:string value="fatto"/> +    <cd:string value="fact"/>    </cd:sequence>    <cd:arguments>      <cd:tex command="fact"/> @@ -8548,21 +8501,21 @@    </cd:arguments>  </cd:command> -<cd:command name="ruota" file="core-mis.tex"> +<cd:command name="rotate" file="core-mis.tex">    <cd:sequence> -    <cd:string value="ruota"/> +    <cd:string value="rotate"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="impostarotazione"/> +      <cd:inherit name="setuprotate"/>      </cd:assignments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="impostarotazione" file="core-mis.tex"> +<cd:command name="setuprotate" file="core-mis.tex">    <cd:sequence> -    <cd:string value="impostarotazione"/> +    <cd:string value="setuprotate"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -8576,23 +8529,23 @@          <cd:constant type="ampio"/>          <cd:constant type="profondita"/>        </cd:parameter> -      <cd:inherit name="impostaincorniciato"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="riflessione" file="core-mis.tex"> +<cd:command name="mirror" file="core-mis.tex">    <cd:sequence> -    <cd:string value="riflessione"/> +    <cd:string value="mirror"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="scala" file="core-mis.tex"> +<cd:command name="scale" file="core-mis.tex">    <cd:sequence> -    <cd:string value="scala"/> +    <cd:string value="scale"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> @@ -8607,9 +8560,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostacombinazioni" file="core-mis.tex"> +<cd:command name="setupcombinations" file="core-mis.tex">    <cd:sequence> -    <cd:string value="impostacombinazioni"/> +    <cd:string value="setupcombinations"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -8674,9 +8627,9 @@    </cd:arguments>  </cd:command> -<cd:command name="mettifiancoafianco" file="core-mis.tex"> +<cd:command name="placesidebyside" file="core-mis.tex">    <cd:sequence> -    <cd:string value="mettifiancoafianco"/> +    <cd:string value="placesidebyside"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -8684,9 +8637,9 @@    </cd:arguments>  </cd:command> -<cd:command name="mettiunosullaltro" file="core-mis.tex"> +<cd:command name="placeontopofeachother" file="core-mis.tex">    <cd:sequence> -    <cd:string value="mettiunosullaltro"/> +    <cd:string value="placeontopofeachother"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -8715,9 +8668,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostaschermointerazione" file="core-int.tex"> +<cd:command name="setupinteractionscreen" file="core-int.tex">    <cd:sequence> -    <cd:string value="impostaschermointerazione"/> +    <cd:string value="setupinteractionscreen"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" list="yes"> @@ -8757,17 +8710,15 @@    </cd:arguments>  </cd:command> -<cd:command name="schermo" file="core-int.tex"> +<cd:command name="screen" file="core-int.tex">    <cd:sequence> -    <cd:string value="schermo"/> +    <cd:string value="screen"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="impostatransizionepagina" file="core-int.tex"> +<cd:command name="setuppagetransitions" file="core-int.tex">    <cd:sequence> -    <cd:string value="impostatransizionepagina"/> +    <cd:string value="setuppagetransitions"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -8777,9 +8728,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostainterazione" file="core-nav.tex"> +<cd:command name="setupinteraction" file="core-nav.tex">    <cd:sequence> -    <cd:string value="impostainterazione"/> +    <cd:string value="setupinteraction"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" list="yes"> @@ -8871,9 +8822,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definiscimenuinterazione" file="core-int.tex"> +<cd:command name="defineinteractionmenu" file="core-int.tex">    <cd:sequence> -    <cd:string value="definiscimenuinterazione"/> +    <cd:string value="defineinteractionmenu"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive" list="yes"> @@ -8952,14 +8903,14 @@          <cd:constant type="si"/>          <cd:constant type="no"/>        </cd:parameter> -      <cd:inherit name="impostaincorniciato"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="definiscimenuinterazione" file="core-int.tex"> +<cd:command name="defineinteractionmenu" file="core-int.tex">    <cd:sequence> -    <cd:string value="definiscimenuinterazione"/> +    <cd:string value="defineinteractionmenu"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -8977,14 +8928,14 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="impostamenuinterazione"/> +      <cd:inherit name="setupinteractionmenu"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="menuinterattivo" type="environment"> +<cd:command name="interactionmenu" type="environment">    <cd:sequence> -    <cd:string value="menuinterattivo"/> +    <cd:string value="interactionmenu"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -8993,9 +8944,9 @@    </cd:arguments>  </cd:command> -<cd:command name="disabilitamenuinterazione" file="core-int.tex"> +<cd:command name="disableinteractionmenu" file="core-int.tex">    <cd:sequence> -    <cd:string value="disabilitamenuinterazione"/> +    <cd:string value="disableinteractionmenu"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -9009,9 +8960,9 @@    </cd:arguments>  </cd:command> -<cd:command name="usadocumentoesterno" file="core-ref.tex"> +<cd:command name="useexternaldocument" file="core-ref.tex">    <cd:sequence> -    <cd:string value="usadocumentoesterno"/> +    <cd:string value="useexternaldocument"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -9026,9 +8977,9 @@    </cd:arguments>  </cd:command> -<cd:command name="usaURL" file="core-ref.tex"> +<cd:command name="useURL" file="core-ref.tex">    <cd:sequence> -    <cd:string value="usaURL"/> +    <cd:string value="useURL"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -9046,9 +8997,9 @@    </cd:arguments>  </cd:command> -<cd:command name="accoppiadocumento" file="core-ref.tex"> +<cd:command name="coupledocument" file="core-ref.tex">    <cd:sequence> -    <cd:string value="accoppiadocumento"/> +    <cd:string value="coupledocument"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -9063,33 +9014,33 @@    </cd:arguments>  </cd:command> -<cd:command name="da" file="core-ref.tex"> +<cd:command name="from" file="core-ref.tex">    <cd:sequence> -    <cd:string value="da"/> +    <cd:string value="from"/>    </cd:sequence>    <cd:arguments>      <cd:reference interactive="exclusive"/>    </cd:arguments>  </cd:command> -<cd:command name="barrainterazione"> +<cd:command name="interactionbar">    <cd:sequence> -    <cd:string value="barrainterazione"/> +    <cd:string value="interactionbar"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" list="yes"> -      <cd:inherit name="impostabarrainterazione"/> +      <cd:inherit name="setupinteractionbar"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="pulsantinterazione" file="core-ref.tex"> +<cd:command name="interactionbuttons" file="core-ref.tex">    <cd:sequence> -    <cd:string value="pulsantinterazione"/> +    <cd:string value="interactionbuttons"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" optional="yes" list="yes"> -      <cd:inherit name="impostabarrainterazione"/> +      <cd:inherit name="setupinteractionbar"/>      </cd:assignments>      <cd:keywords list="yes">        <cd:constant type="cd:name"/> @@ -9097,9 +9048,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostabarrainterazione" file="core-int.tex"> +<cd:command name="setupinteractionbar" file="core-int.tex">    <cd:sequence> -    <cd:string value="impostabarrainterazione"/> +    <cd:string value="setupinteractionbar"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" list="yes"> @@ -9142,30 +9093,26 @@          <cd:constant type="medio"/>          <cd:constant type="grande"/>        </cd:parameter> -      <cd:inherit name="impostaincorniciato"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="sincronizza" file="core-int.tex"> +<cd:command name="synchronize" file="core-int.tex">    <cd:sequence> -    <cd:string value="sincronizza"/> +    <cd:string value="synchronize"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="synchronization" type="environment">    <cd:sequence>      <cd:string value="synchronization"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="impostabarrasincronizzazione" file="core-int.tex"> +<cd:command name="setupsynchronizationbar" file="core-int.tex">    <cd:sequence> -    <cd:string value="impostabarrasincronizzazione"/> +    <cd:string value="setupsynchronizationbar"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" list="yes"> @@ -9194,14 +9141,14 @@        <cd:parameter name="colore">          <cd:constant type="cd:name"/>        </cd:parameter> -      <cd:inherit name="impostaincorniciato"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="barrasincronizzazione" file="core-int.tex"> +<cd:command name="synchronizationbar" file="core-int.tex">    <cd:sequence> -    <cd:string value="barrasincronizzazione"/> +    <cd:string value="synchronizationbar"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -9212,14 +9159,14 @@          <cd:constant type="pagina"/>          <cd:constant type="locale"/>        </cd:parameter> -      <cd:inherit name="impostabarrasincronizzazione"/> +      <cd:inherit name="setupsynchronizationbar"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="impostasincronizzazione" file="core-int.tex"> +<cd:command name="setupsynchronization" file="core-int.tex">    <cd:sequence> -    <cd:string value="impostasincronizzazione"/> +    <cd:string value="setupsynchronization"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" list="yes"> @@ -9231,9 +9178,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definisciprofilo" file="core-int.tex"> +<cd:command name="defineprofile" file="core-int.tex">    <cd:sequence> -    <cd:string value="definisciprofilo"/> +    <cd:string value="defineprofile"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive" list="yes"> @@ -9245,9 +9192,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostaprofili" file="core-int.tex"> +<cd:command name="setupprofiles" file="core-int.tex">    <cd:sequence> -    <cd:string value="impostaprofili"/> +    <cd:string value="setupprofiles"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" list="yes"> @@ -9269,9 +9216,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seguiprofilo" file="core-int.tex"> +<cd:command name="followprofile" file="core-int.tex">    <cd:sequence> -    <cd:string value="seguiprofilo"/> +    <cd:string value="followprofile"/>    </cd:sequence>    <cd:arguments>      <cd:content interactive="exclusive"/> @@ -9281,9 +9228,9 @@    </cd:arguments>  </cd:command> -<cd:command name="mettisegnalibro" file="core-int.tex"> +<cd:command name="placebookmarks" file="core-int.tex">    <cd:sequence> -    <cd:string value="mettisegnalibro"/> +    <cd:string value="placebookmarks"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -9294,9 +9241,9 @@    </cd:arguments>  </cd:command> -<cd:command name="segnalibro"> +<cd:command name="bookmark">    <cd:sequence> -    <cd:string value="segnalibro"/> +    <cd:string value="bookmark"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -9306,9 +9253,9 @@    </cd:arguments>  </cd:command> -<cd:command name="versione" type="environment"> +<cd:command name="version" type="environment">    <cd:sequence> -    <cd:string value="versione"/> +    <cd:string value="version"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive" list="yes"> @@ -9317,9 +9264,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostaversioni" file="core-int.tex"> +<cd:command name="setupversions" file="core-int.tex">    <cd:sequence> -    <cd:string value="impostaversioni"/> +    <cd:string value="setupversions"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -9340,23 +9287,21 @@    </cd:arguments>  </cd:command> -<cd:command name="marcaversione" file="core-int.tex"> +<cd:command name="markversion" file="core-int.tex">    <cd:sequence> -    <cd:string value="marcaversione"/> +    <cd:string value="markversion"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="selezionaversione" file="core-int.tex"> +<cd:command name="selectversion" file="core-int.tex">    <cd:sequence> -    <cd:string value="selezionaversione"/> +    <cd:string value="selectversion"/>    </cd:sequence>  </cd:command> -<cd:command name="definisciversion" file="core-int.tex"> +<cd:command name="defineversion" file="core-int.tex">    <cd:sequence> -    <cd:string value="definisciversion"/> +    <cd:string value="defineversion"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9368,9 +9313,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seguiversione" file="core-int.tex"> +<cd:command name="followversion" file="core-int.tex">    <cd:sequence> -    <cd:string value="seguiversione"/> +    <cd:string value="followversion"/>    </cd:sequence>    <cd:arguments>      <cd:content interactive="exclusive"/> @@ -9380,9 +9325,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seguiversioneprofilo" file="core-int.tex"> +<cd:command name="followprofileversion" file="core-int.tex">    <cd:sequence> -    <cd:string value="seguiversioneprofilo"/> +    <cd:string value="followprofileversion"/>    </cd:sequence>    <cd:arguments>      <cd:content interactive="exclusive"/> @@ -9395,9 +9340,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definisciprogramma" file="core-ref.tex"> +<cd:command name="defineprogram" file="core-ref.tex">    <cd:sequence> -    <cd:string value="definisciprogramma"/> +    <cd:string value="defineprogram"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -9412,9 +9357,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostaprogrammi" file="core-ref.tex"> +<cd:command name="setupprograms" file="core-ref.tex">    <cd:sequence> -    <cd:string value="impostaprogrammi"/> +    <cd:string value="setupprograms"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" list="yes"> @@ -9425,9 +9370,9 @@    </cd:arguments>  </cd:command> -<cd:command name="programma" file="core-ref.tex"> +<cd:command name="program" file="core-ref.tex">    <cd:sequence> -    <cd:string value="programma"/> +    <cd:string value="program"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -9465,9 +9410,9 @@  <!-- remark skipped --> -<cd:command name="vaia" file="core-ref.tex"> +<cd:command name="goto" file="core-ref.tex">    <cd:sequence> -    <cd:string value="vaia"/> +    <cd:string value="goto"/>    </cd:sequence>    <cd:arguments>      <cd:content interactive="exclusive"/> @@ -9476,9 +9421,9 @@    </cd:arguments>  </cd:command> -<cd:command name="vaiabox" file="core-ref.tex"> +<cd:command name="gotobox" file="core-ref.tex">    <cd:sequence> -    <cd:string value="vaiabox"/> +    <cd:string value="gotobox"/>    </cd:sequence>    <cd:arguments>      <cd:content interactive="exclusive"/> @@ -9486,22 +9431,22 @@    </cd:arguments>  </cd:command> -<cd:command name="pulsante"> +<cd:command name="button">    <cd:sequence> -    <cd:string value="pulsante"/> +    <cd:string value="button"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" optional="yes" list="yes"> -      <cd:inherit name="impostapulsanti"/> +      <cd:inherit name="setupbuttons"/>      </cd:assignments>      <cd:content/>      <cd:reference list="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="impostapulsanti" file="core-ref.tex"> +<cd:command name="setupbuttons" file="core-ref.tex">    <cd:sequence> -    <cd:string value="impostapulsanti"/> +    <cd:string value="setupbuttons"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -9509,16 +9454,16 @@          <cd:constant type="inizia"/>          <cd:constant type="termina"/>        </cd:parameter> -      <cd:inherit name="impostaincorniciato"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command>  <!-- menubutton skipped --> -<cd:command name="impostacommento" file="core-int.tex"> +<cd:command name="setupcomment" file="core-int.tex">    <cd:sequence> -    <cd:string value="impostacommento"/> +    <cd:string value="setupcomment"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -9566,38 +9511,38 @@    </cd:arguments>  </cd:command> -<cd:command name="commento" type="environment"> +<cd:command name="comment" type="environment">    <cd:sequence> -    <cd:string value="commento"/> +    <cd:string value="comment"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes">        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="impostacommento"/> +      <cd:inherit name="setupcomment"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="commento"> +<cd:command name="comment">    <cd:sequence> -    <cd:string value="commento"/> +    <cd:string value="comment"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes">        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="impostacommento"/> +      <cd:inherit name="setupcomment"/>      </cd:assignments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="definiscicampo" file="core-fld.tex"> +<cd:command name="definefield" file="core-fld.tex">    <cd:sequence> -    <cd:string value="definiscicampo"/> +    <cd:string value="definefield"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9618,9 +9563,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definiscisottocampo" file="core-fld.tex"> +<cd:command name="definesubfield" file="core-fld.tex">    <cd:sequence> -    <cd:string value="definiscisottocampo"/> +    <cd:string value="definesubfield"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9635,9 +9580,9 @@    </cd:arguments>  </cd:command> -<cd:command name="copiacampo" file="core-fld.tex"> +<cd:command name="copyfield" file="core-fld.tex">    <cd:sequence> -    <cd:string value="copiacampo"/> +    <cd:string value="copyfield"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9649,9 +9594,9 @@    </cd:arguments>  </cd:command> -<cd:command name="clonacampo" file="core-fld.tex"> +<cd:command name="clonefield" file="core-fld.tex">    <cd:sequence> -    <cd:string value="clonacampo"/> +    <cd:string value="clonefield"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9669,9 +9614,9 @@    </cd:arguments>  </cd:command> -<cd:command name="campi" file="core-fld.tex"> +<cd:command name="field" file="core-fld.tex">    <cd:sequence> -    <cd:string value="campi"/> +    <cd:string value="field"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9680,9 +9625,9 @@    </cd:arguments>  </cd:command> -<cd:command name="adattacampo" file="core-fld.tex"> +<cd:command name="fitfield" file="core-fld.tex">    <cd:sequence> -    <cd:string value="adattacampo"/> +    <cd:string value="fitfield"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9691,9 +9636,9 @@    </cd:arguments>  </cd:command> -<cd:command name="camporiempimento" file="core-fld.tex"> +<cd:command name="fillinfield" file="core-fld.tex">    <cd:sequence> -    <cd:string value="camporiempimento"/> +    <cd:string value="fillinfield"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -9718,9 +9663,9 @@    </cd:arguments>  </cd:command> -<cd:command name="mostracampi" file="core-fld.tex"> +<cd:command name="showfields" file="core-fld.tex">    <cd:sequence> -    <cd:string value="mostracampi"/> +    <cd:string value="showfields"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -9729,15 +9674,15 @@    </cd:arguments>  </cd:command> -<cd:command name="logcampi" file="core-fld.tex"> +<cd:command name="logfields" file="core-fld.tex">    <cd:sequence> -    <cd:string value="logcampi"/> +    <cd:string value="logfields"/>    </cd:sequence>  </cd:command> -<cd:command name="impostacampo" file="core-fld.tex"> +<cd:command name="setupfield" file="core-fld.tex">    <cd:sequence> -    <cd:string value="impostacampo"/> +    <cd:string value="setupfield"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9750,7 +9695,7 @@        <cd:constant type="cornice"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="impostacampi"/> +      <cd:inherit name="setupfields"/>      </cd:assignments>      <cd:assignments list="yes">      </cd:assignments> @@ -9759,9 +9704,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostacampi" file="core-fld.tex"> +<cd:command name="setupfields" file="core-fld.tex">    <cd:sequence> -    <cd:string value="impostacampi"/> +    <cd:string value="setupfields"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -9847,7 +9792,7 @@        <cd:parameter name="coloresfondocampo">          <cd:constant type="cd:name"/>        </cd:parameter> -      <cd:inherit name="incorniciato"/> +      <cd:inherit name="framed"/>      </cd:assignments>      <cd:assignments list="yes">      </cd:assignments> @@ -9856,9 +9801,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostaforms" file="core-fld.tex"> +<cd:command name="setupforms" file="core-fld.tex">    <cd:sequence> -    <cd:string value="impostaforms"/> +    <cd:string value="setupforms"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -9870,9 +9815,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definiscistackcampi" file="core-fld.tex"> +<cd:command name="definefieldstack" file="core-fld.tex">    <cd:sequence> -    <cd:string value="definiscistackcampi"/> +    <cd:string value="definefieldstack"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9882,14 +9827,14 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="impostacampi"/> +      <cd:inherit name="setupfields"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stackcampi" file="core-fld.tex"> +<cd:command name="fieldstack" file="core-fld.tex">    <cd:sequence> -    <cd:string value="stackcampi"/> +    <cd:string value="fieldstack"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9899,7 +9844,7 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="impostacampi"/> +      <cd:inherit name="setupfields"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -9910,15 +9855,15 @@    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="impostaclippling"/> +      <cd:inherit name="setupclipping"/>      </cd:assignments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="impostaclippling" file="core-fig.tex"> +<cd:command name="setupclipping" file="core-fig.tex">    <cd:sequence> -    <cd:string value="impostaclippling"/> +    <cd:string value="setupclipping"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -9953,9 +9898,9 @@    </cd:arguments>  </cd:command> -<cd:command name="mettilegenda"> +<cd:command name="placelegend">    <cd:sequence> -    <cd:string value="mettilegenda"/> +    <cd:string value="placelegend"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -9963,9 +9908,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostalegenda"> +<cd:command name="setuplegend">    <cd:sequence> -    <cd:string value="impostalegenda"/> +    <cd:string value="setuplegend"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -9999,23 +9944,23 @@    </cd:arguments>  </cd:command> -<cd:command name="definiscilinea"> +<cd:command name="definerule">    <cd:sequence> -    <cd:string value="definiscilinea"/> +    <cd:string value="definerule"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="impostalinea"/> +      <cd:inherit name="setuprule"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="mettilinea"> +<cd:command name="placerule">    <cd:sequence> -    <cd:string value="mettilinea"/> +    <cd:string value="placerule"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -10024,9 +9969,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostalinea"> +<cd:command name="setuprule">    <cd:sequence> -    <cd:string value="impostalinea"/> +    <cd:string value="setuprule"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -10055,13 +10000,13 @@    </cd:arguments>  </cd:command> -<cd:command name="definiscivariabiletesto"> +<cd:command name="definetextvariable">    <cd:sequence> -    <cd:string value="definiscivariabiletesto"/> +    <cd:string value="definetextvariable"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> -      <cd:inherit name="impostavariabiletesto"/> +      <cd:inherit name="setuptextvariable"/>      </cd:keywords>      <cd:keywords optional="yes">      </cd:keywords> @@ -10070,9 +10015,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostavariabiletesto"> +<cd:command name="setuptextvariable">    <cd:sequence> -    <cd:string value="impostavariabiletesto"/> +    <cd:string value="setuptextvariable"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -10101,9 +10046,9 @@    </cd:arguments>  </cd:command> -<cd:command name="setvariabiletesto"> +<cd:command name="settextvariable">    <cd:sequence> -    <cd:string value="setvariabiletesto"/> +    <cd:string value="settextvariable"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -10115,9 +10060,9 @@    </cd:arguments>  </cd:command> -<cd:command name="mettivariabiletesto"> +<cd:command name="placetextvariable">    <cd:sequence> -    <cd:string value="mettivariabiletesto"/> +    <cd:string value="placetextvariable"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -10126,9 +10071,9 @@    </cd:arguments>  </cd:command> -<cd:command name="variabiletesto"> +<cd:command name="textvariable">    <cd:sequence> -    <cd:string value="variabiletesto"/> +    <cd:string value="textvariable"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -10137,9 +10082,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definiscifontgrezzo"> +<cd:command name="definerawfont">    <cd:sequence> -    <cd:string value="definiscifontgrezzo"/> +    <cd:string value="definerawfont"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -10149,14 +10094,14 @@        <cd:constant type="cd:file"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="impostainterlinea"/> +      <cd:inherit name="setupinterlinespace"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="passaafontgrezzo"> +<cd:command name="switchtorawfont">    <cd:sequence> -    <cd:string value="passaafontgrezzo"/> +    <cd:string value="switchtorawfont"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -10165,37 +10110,37 @@    </cd:arguments>  </cd:command> -<cd:command name="definisciposizionetesto"> +<cd:command name="definetextposition">    <cd:sequence> -    <cd:string value="definisciposizionetesto"/> +    <cd:string value="definetextposition"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="impostaposizionamento"/> +      <cd:inherit name="setuppositioning"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="impostaposizionetesto"> +<cd:command name="setuptextposition">    <cd:sequence> -    <cd:string value="impostaposizionetesto"/> +    <cd:string value="setuptextposition"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="impostaposizionamento"/> +      <cd:inherit name="setuppositioning"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="posizionatesto"> +<cd:command name="positiontext">    <cd:sequence> -    <cd:string value="posizionatesto"/> +    <cd:string value="positiontext"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -10205,9 +10150,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impostastrut" file="core-spa.tex"> +<cd:command name="setupstrut" file="core-spa.tex">    <cd:sequence> -    <cd:string value="impostastrut"/> +    <cd:string value="setupstrut"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> diff --git a/tex/context/interface/cont-nl.xml b/tex/context/interface/cont-nl.xml index de51ef7d3..4de4aa083 100644 --- a/tex/context/interface/cont-nl.xml +++ b/tex/context/interface/cont-nl.xml @@ -1,10 +1,10 @@  <?xml version="1.0"?> -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2004.11.17"> -<cd:command name="installeertaal" file="lang-ini.tex"> +<cd:command name="installlanguage" file="lang-ini.tex">    <cd:sequence> -    <cd:string value="installeertaal"/> +    <cd:string value="installlanguage"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -56,9 +56,9 @@    </cd:arguments>  </cd:command> -<cd:command name="steltaalin" file="lang-ini.tex"> +<cd:command name="setuplanguage" file="lang-ini.tex">    <cd:sequence> -    <cd:string value="steltaalin"/> +    <cd:string value="setuplanguage"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -72,14 +72,14 @@        <cd:constant type=".."/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="installeertaal"/> +      <cd:inherit name="installlanguage"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="taal"> +<cd:command name="language">    <cd:sequence> -    <cd:string value="taal"/> +    <cd:string value="language"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -95,9 +95,9 @@    </cd:arguments>  </cd:command> -<cd:command name="hoofdtaal" file="lang-ini.tex"> +<cd:command name="mainlanguage" file="lang-ini.tex">    <cd:sequence> -    <cd:string value="hoofdtaal"/> +    <cd:string value="mainlanguage"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -113,9 +113,9 @@    </cd:arguments>  </cd:command> -<cd:command name="vertaal" file="lang-lab.tex"> +<cd:command name="translate" file="lang-lab.tex">    <cd:sequence> -    <cd:string value="vertaal"/> +    <cd:string value="translate"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -126,9 +126,9 @@    </cd:arguments>  </cd:command> -<cd:command name="usecodering" file="enco-ini.tex"> +<cd:command name="useencoding" file="enco-ini.tex">    <cd:sequence> -    <cd:string value="usecodering"/> +    <cd:string value="useencoding"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -137,9 +137,9 @@    </cd:arguments>  </cd:command> -<cd:command name="gebruikspecials" file="spec-ini.tex"> +<cd:command name="usespecials" file="spec-ini.tex">    <cd:sequence> -    <cd:string value="gebruikspecials"/> +    <cd:string value="usespecials"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -149,9 +149,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definieeruitvoer" file="spec-ini.tex"> +<cd:command name="defineoutput" file="spec-ini.tex">    <cd:sequence> -    <cd:string value="definieeruitvoer"/> +    <cd:string value="defineoutput"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -163,9 +163,9 @@    </cd:arguments>  </cd:command> -<cd:command name="steluitvoerin" file="spec-ini.tex"> +<cd:command name="setupoutput" file="spec-ini.tex">    <cd:sequence> -    <cd:string value="steluitvoerin"/> +    <cd:string value="setupoutput"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -174,9 +174,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definieerkorpsomgeving" file="font-ini.tex"> +<cd:command name="definebodyfontenvironment" file="font-ini.tex">    <cd:sequence> -    <cd:string value="definieerkorpsomgeving"/> +    <cd:string value="definebodyfontenvironment"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -211,34 +211,34 @@    </cd:arguments>  </cd:command> -<cd:command name="stelkorpsomgevingin" file="font-ini.tex"> +<cd:command name="setupbodyfontenvironment" file="font-ini.tex">    <cd:sequence> -    <cd:string value="stelkorpsomgevingin"/> +    <cd:string value="setupbodyfontenvironment"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> -      <cd:inherit name="stelkorpsin"/> +      <cd:inherit name="setupbodyfont"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="stelkorpsin"/> +      <cd:inherit name="setupbodyfont"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="toonkorpsomgeving"> +<cd:command name="showbodyfontenvironment">    <cd:sequence> -    <cd:string value="toonkorpsomgeving"/> +    <cd:string value="showbodyfontenvironment"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> -      <cd:inherit name="stelkorpsin"/> +      <cd:inherit name="setupbodyfont"/>      </cd:keywords>    </cd:arguments>  </cd:command> -<cd:command name="definieerkorps" file="font-ini.tex"> +<cd:command name="definebodyfont" file="font-ini.tex">    <cd:sequence> -    <cd:string value="definieerkorps"/> +    <cd:string value="definebodyfont"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -299,20 +299,20 @@    </cd:arguments>  </cd:command> -<cd:command name="toonkorps"> +<cd:command name="showbodyfont">    <cd:sequence> -    <cd:string value="toonkorps"/> +    <cd:string value="showbodyfont"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> -      <cd:inherit name="stelkorpsin"/> +      <cd:inherit name="setupbodyfont"/>      </cd:keywords>    </cd:arguments>  </cd:command> -<cd:command name="stelkorpsin"> +<cd:command name="setupbodyfont">    <cd:sequence> -    <cd:string value="stelkorpsin"/> +    <cd:string value="setupbodyfont"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -335,9 +335,9 @@    </cd:arguments>  </cd:command> -<cd:command name="switchnaarkorps" file="font-ini.tex"> +<cd:command name="switchtobodyfont" file="font-ini.tex">    <cd:sequence> -    <cd:string value="switchnaarkorps"/> +    <cd:string value="switchtobodyfont"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -351,9 +351,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definieerfont" file="font-ini.tex"> +<cd:command name="definefont" file="font-ini.tex">    <cd:sequence> -    <cd:string value="definieerfont"/> +    <cd:string value="definefont"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -365,9 +365,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelstrutin" file="core-spa.tex"> +<cd:command name="setupstrut" file="core-spa.tex">    <cd:sequence> -    <cd:string value="stelstrutin"/> +    <cd:string value="setupstrut"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -379,9 +379,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelkleurin" file="colo-ini.tex"> +<cd:command name="setupcolor" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="stelkleurin"/> +    <cd:string value="setupcolor"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -390,9 +390,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelkleurenin" file="colo-ini.tex"> +<cd:command name="setupcolors" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="stelkleurenin"/> +    <cd:string value="setupcolors"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -448,9 +448,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definieerkleur" file="colo-ini.tex"> +<cd:command name="definecolor" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="definieerkleur"/> +    <cd:string value="definecolor"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -485,9 +485,9 @@    </cd:arguments>  </cd:command> -<cd:command name="kleur" type="environment" file="colo-ini.tex"> +<cd:command name="color" type="environment" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="kleur"/> +    <cd:string value="color"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -496,9 +496,9 @@    </cd:arguments>  </cd:command> -<cd:command name="kleur" file="colo-ini.tex"> +<cd:command name="color" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="kleur"/> +    <cd:string value="color"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -508,9 +508,9 @@    </cd:arguments>  </cd:command> -<cd:command name="grijskleur" file="colo-ini.tex"> +<cd:command name="graycolor" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="grijskleur"/> +    <cd:string value="graycolor"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -519,9 +519,9 @@    </cd:arguments>  </cd:command> -<cd:command name="toonkleur"> +<cd:command name="showcolor">    <cd:sequence> -    <cd:string value="toonkleur"/> +    <cd:string value="showcolor"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -530,9 +530,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definieerpalet" file="colo-ini.tex"> +<cd:command name="definepalet" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="definieerpalet"/> +    <cd:string value="definepalet"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -546,9 +546,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelpaletin" file="colo-ini.tex"> +<cd:command name="setuppalet" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="stelpaletin"/> +    <cd:string value="setuppalet"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -557,9 +557,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definieerkleurgroep" file="colo-ini.tex"> +<cd:command name="definecolorgroup" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="definieerkleurgroep"/> +    <cd:string value="definecolorgroup"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -575,9 +575,9 @@    </cd:arguments>  </cd:command> -<cd:command name="toonpalet"> +<cd:command name="showpalet">    <cd:sequence> -    <cd:string value="toonpalet"/> +    <cd:string value="showpalet"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -592,9 +592,9 @@    </cd:arguments>  </cd:command> -<cd:command name="toonkleurgroep"> +<cd:command name="showcolorgroup">    <cd:sequence> -    <cd:string value="toonkleurgroep"/> +    <cd:string value="showcolorgroup"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -610,9 +610,9 @@    </cd:arguments>  </cd:command> -<cd:command name="vergelijkpalet"> +<cd:command name="comparepalet">    <cd:sequence> -    <cd:string value="vergelijkpalet"/> +    <cd:string value="comparepalet"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -621,9 +621,9 @@    </cd:arguments>  </cd:command> -<cd:command name="vergelijkkleurgroep"> +<cd:command name="comparecolorgroup">    <cd:sequence> -    <cd:string value="vergelijkkleurgroep"/> +    <cd:string value="comparecolorgroup"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -632,29 +632,29 @@    </cd:arguments>  </cd:command> -<cd:command name="toonopmaak" file="supp-vis.tex"> +<cd:command name="showmakeup" file="supp-vis.tex">    <cd:sequence> -    <cd:string value="toonopmaak"/> +    <cd:string value="showmakeup"/>    </cd:sequence>  </cd:command> -<cd:command name="definieertype" file="core-ver.tex"> +<cd:command name="definetype" file="core-ver.tex">    <cd:sequence> -    <cd:string value="definieertype"/> +    <cd:string value="definetype"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="steltypein"/> +      <cd:inherit name="setuptype"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="steltypein" file="core-ver.tex"> +<cd:command name="setuptype" file="core-ver.tex">    <cd:sequence> -    <cd:string value="steltypein"/> +    <cd:string value="setuptype"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -720,9 +720,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definieertypen" file="core-ver.tex"> +<cd:command name="definetyping" file="core-ver.tex">    <cd:sequence> -    <cd:string value="definieertypen"/> +    <cd:string value="definetyping"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -731,14 +731,14 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="steltypenin"/> +      <cd:inherit name="setuptyping"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="steltypenin" file="core-ver.tex"> +<cd:command name="setuptyping" file="core-ver.tex">    <cd:sequence> -    <cd:string value="steltypenin"/> +    <cd:string value="setuptyping"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -838,8 +838,6 @@    <cd:sequence>      <cd:variable value="typen"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="typefile" file="verb-ini.tex"> @@ -854,9 +852,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelvoetnotenin" file="core-not.tex"> +<cd:command name="setupfootnotes" file="core-not.tex">    <cd:sequence> -    <cd:string value="stelvoetnotenin"/> +    <cd:string value="setupfootnotes"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -957,25 +955,25 @@        <cd:parameter name="factor">          <cd:constant type="cd:number"/>        </cd:parameter> -      <cd:inherit name="omlijnd"/> +      <cd:inherit name="framed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stelvoetnootdefinitiein" file="core-not.tex"> +<cd:command name="setupfootnotedefinition" file="core-not.tex">    <cd:sequence> -    <cd:string value="stelvoetnootdefinitiein"/> +    <cd:string value="setupfootnotedefinition"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> -      <cd:inherit name="doordefinieren"/> +      <cd:inherit name="definedescription"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="voetnoot" file="core-not.tex"> +<cd:command name="footnote" file="core-not.tex">    <cd:sequence> -    <cd:string value="voetnoot"/> +    <cd:string value="footnote"/>    </cd:sequence>    <cd:arguments>      <cd:reference optional="yes"/> @@ -983,9 +981,9 @@    </cd:arguments>  </cd:command> -<cd:command name="voetnoottekst" file="core-not.tex"> +<cd:command name="footnotetext" file="core-not.tex">    <cd:sequence> -    <cd:string value="voetnoottekst"/> +    <cd:string value="footnotetext"/>    </cd:sequence>    <cd:arguments>      <cd:reference optional="yes"/> @@ -993,9 +991,9 @@    </cd:arguments>  </cd:command> -<cd:command name="noot" file="core-not.tex"> +<cd:command name="note" file="core-not.tex">    <cd:sequence> -    <cd:string value="noot"/> +    <cd:string value="note"/>    </cd:sequence>    <cd:arguments>      <cd:reference interactive="yes"/> @@ -1006,35 +1004,33 @@    <cd:sequence>      <cd:string value="localfootnotes"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="plaatslokalevoetnoten" file="core-not.tex"> +<cd:command name="placelocalfootnotes" file="core-not.tex">    <cd:sequence> -    <cd:string value="plaatslokalevoetnoten"/> +    <cd:string value="placelocalfootnotes"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelvoetnotenin"/> +      <cd:inherit name="setupfootnotes"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="plaatsvoetnoten" file="core-not.tex"> +<cd:command name="placefootnotes" file="core-not.tex">    <cd:sequence> -    <cd:string value="plaatsvoetnoten"/> +    <cd:string value="placefootnotes"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelvoetnotenin"/> +      <cd:inherit name="setupfootnotes"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stelonderstrepenin" file="core-fnt.tex"> +<cd:command name="setupunderbar" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="stelonderstrepenin"/> +    <cd:string value="setupunderbar"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -1059,117 +1055,117 @@    </cd:arguments>  </cd:command> -<cd:command name="onderstreep" file="core-fnt.tex"> +<cd:command name="underbar" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="onderstreep"/> +    <cd:string value="underbar"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="onderstrepen" file="core-fnt.tex"> +<cd:command name="underbars" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="onderstrepen"/> +    <cd:string value="underbars"/>    </cd:sequence>    <cd:arguments>      <cd:word list="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="overstreep" file="core-fnt.tex"> +<cd:command name="overbar" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="overstreep"/> +    <cd:string value="overbar"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="overstrepen" file="core-fnt.tex"> +<cd:command name="overbars" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="overstrepen"/> +    <cd:string value="overbars"/>    </cd:sequence>    <cd:arguments>      <cd:word list="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="doorstreep" file="core-fnt.tex"> +<cd:command name="overstrike" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="doorstreep"/> +    <cd:string value="overstrike"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="doorstrepen" file="core-fnt.tex"> +<cd:command name="overstrikes" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="doorstrepen"/> +    <cd:string value="overstrikes"/>    </cd:sequence>    <cd:arguments>      <cd:word list="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="romeins" file="core-con.tex"> +<cd:command name="romannumerals" file="core-con.tex">    <cd:sequence> -    <cd:string value="romeins"/> +    <cd:string value="romannumerals"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="Romeins" file="core-con.tex"> +<cd:command name="Romannumerals" file="core-con.tex">    <cd:sequence> -    <cd:string value="Romeins"/> +    <cd:string value="Romannumerals"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="cijfers" file="core-con.tex"> +<cd:command name="numbers" file="core-con.tex">    <cd:sequence> -    <cd:string value="cijfers"/> +    <cd:string value="numbers"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="letter" file="core-con.tex"> +<cd:command name="character" file="core-con.tex">    <cd:sequence> -    <cd:string value="letter"/> +    <cd:string value="character"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="Letter" file="core-con.tex"> +<cd:command name="Character" file="core-con.tex">    <cd:sequence> -    <cd:string value="Letter"/> +    <cd:string value="Character"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="letters" file="core-con.tex"> +<cd:command name="characters" file="core-con.tex">    <cd:sequence> -    <cd:string value="letters"/> +    <cd:string value="characters"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="Letters" file="core-con.tex"> +<cd:command name="Characters" file="core-con.tex">    <cd:sequence> -    <cd:string value="Letters"/> +    <cd:string value="Characters"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -1185,45 +1181,45 @@    </cd:arguments>  </cd:command> -<cd:command name="maand" file="core-con.tex"> +<cd:command name="month" file="core-con.tex">    <cd:sequence> -    <cd:string value="maand"/> +    <cd:string value="month"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="MAAND" file="core-con.tex"> +<cd:command name="MONTH" file="core-con.tex">    <cd:sequence> -    <cd:string value="MAAND"/> +    <cd:string value="MONTH"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="weekdag" file="core-con.tex"> +<cd:command name="weekday" file="core-con.tex">    <cd:sequence> -    <cd:string value="weekdag"/> +    <cd:string value="weekday"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="WEEKDAG" file="core-con.tex"> +<cd:command name="WEEKDAY" file="core-con.tex">    <cd:sequence> -    <cd:string value="WEEKDAG"/> +    <cd:string value="WEEKDAY"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="stelkapitalenin" file="core-fnt.tex"> +<cd:command name="setupcapitals" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="stelkapitalenin"/> +    <cd:string value="setupcapitals"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -1284,54 +1280,54 @@    </cd:arguments>  </cd:command> -<cd:command name="WOORD" file="core-fnt.tex"> +<cd:command name="WORD" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="WOORD"/> +    <cd:string value="WORD"/>    </cd:sequence>    <cd:arguments>      <cd:word/>    </cd:arguments>  </cd:command> -<cd:command name="WOORDEN" file="core-fnt.tex"> +<cd:command name="WORDS" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="WOORDEN"/> +    <cd:string value="WORDS"/>    </cd:sequence>    <cd:arguments>      <cd:word list="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="Woord" file="core-fnt.tex"> +<cd:command name="Word" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="Woord"/> +    <cd:string value="Word"/>    </cd:sequence>    <cd:arguments>      <cd:word/>    </cd:arguments>  </cd:command> -<cd:command name="Woorden" file="core-fnt.tex"> +<cd:command name="Words" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="Woorden"/> +    <cd:string value="Words"/>    </cd:sequence>    <cd:arguments>      <cd:word list="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="uitgerekt" file="core-fnt.tex"> +<cd:command name="stretched" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="uitgerekt"/> +    <cd:string value="stretched"/>    </cd:sequence>    <cd:arguments>      <cd:word/>    </cd:arguments>  </cd:command> -<cd:command name="definieersymbool" file="symb-ini.tex"> +<cd:command name="definesymbol" file="symb-ini.tex">    <cd:sequence> -    <cd:string value="definieersymbool"/> +    <cd:string value="definesymbol"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1343,9 +1339,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definieerfiguursymbool" file="symb-ini.tex"> +<cd:command name="definefiguresymbol" file="symb-ini.tex">    <cd:sequence> -    <cd:string value="definieerfiguursymbool"/> +    <cd:string value="definefiguresymbol"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1355,14 +1351,14 @@        <cd:constant type="cd:text"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="externfiguur"/> +      <cd:inherit name="externalfigure"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="symbool" file="symb-ini.tex"> +<cd:command name="symbol" file="symb-ini.tex">    <cd:sequence> -    <cd:string value="symbool"/> +    <cd:string value="symbol"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -1385,9 +1381,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelsymboolsetin" file="symb-ini.tex"> +<cd:command name="setupsymbolset" file="symb-ini.tex">    <cd:sequence> -    <cd:string value="stelsymboolsetin"/> +    <cd:string value="setupsymbolset"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1396,9 +1392,9 @@    </cd:arguments>  </cd:command> -<cd:command name="gebruiksymbolen" file="symb-ini.tex"> +<cd:command name="usesymbols" file="symb-ini.tex">    <cd:sequence> -    <cd:string value="gebruiksymbolen"/> +    <cd:string value="usesymbols"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1407,9 +1403,9 @@    </cd:arguments>  </cd:command> -<cd:command name="toonsymboolset"> +<cd:command name="showsymbolset">    <cd:sequence> -    <cd:string value="toonsymboolset"/> +    <cd:string value="showsymbolset"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1418,9 +1414,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definieerconversie" file="core-con.tex"> +<cd:command name="defineconversion" file="core-con.tex">    <cd:sequence> -    <cd:string value="definieerconversie"/> +    <cd:string value="defineconversion"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1433,9 +1429,9 @@    </cd:arguments>  </cd:command> -<cd:command name="converteernummer" file="core-con.tex"> +<cd:command name="convertnumber" file="core-con.tex">    <cd:sequence> -    <cd:string value="converteernummer"/> +    <cd:string value="convertnumber"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -1443,9 +1439,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelkoptekstin" file="lang-lab.tex"> +<cd:command name="setupheadtext" file="lang-lab.tex">    <cd:sequence> -    <cd:string value="stelkoptekstin"/> +    <cd:string value="setupheadtext"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -1466,9 +1462,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stellabeltekstin" file="lang-lab.tex"> +<cd:command name="setuplabeltext" file="lang-lab.tex">    <cd:sequence> -    <cd:string value="stellabeltekstin"/> +    <cd:string value="setuplabeltext"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -1489,27 +1485,27 @@    </cd:arguments>  </cd:command> -<cd:command name="koptekst" file="lang-lab.tex"> +<cd:command name="headtext" file="lang-lab.tex">    <cd:sequence> -    <cd:string value="koptekst"/> +    <cd:string value="headtext"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="labeltekst"> +<cd:command name="labeltext">    <cd:sequence> -    <cd:string value="labeltekst"/> +    <cd:string value="labeltext"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="stelkantlijnin" file="core-rul.tex"> +<cd:command name="setupmarginrules" file="core-rul.tex">    <cd:sequence> -    <cd:string value="stelkantlijnin"/> +    <cd:string value="setupmarginrules"/>    </cd:sequence>    <cd:arguments>      <cd:assignments> @@ -1523,9 +1519,9 @@    </cd:arguments>  </cd:command> -<cd:command name="kantlijn" type="environment"> +<cd:command name="marginrule" type="environment">    <cd:sequence> -    <cd:string value="kantlijn"/> +    <cd:string value="marginrule"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1534,9 +1530,9 @@    </cd:arguments>  </cd:command> -<cd:command name="kantlijn"> +<cd:command name="marginrule">    <cd:sequence> -    <cd:string value="kantlijn"/> +    <cd:string value="marginrule"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1546,9 +1542,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stellijndiktein" file="core-rul.tex"> +<cd:command name="setuplinewidth" file="core-rul.tex">    <cd:sequence> -    <cd:string value="stellijndiktein"/> +    <cd:string value="setuplinewidth"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1557,9 +1553,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelomlijndin" file="core-rul.tex"> +<cd:command name="setupframed" file="core-rul.tex">    <cd:sequence> -    <cd:string value="stelomlijndin"/> +    <cd:string value="setupframed"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -1701,44 +1697,44 @@    </cd:arguments>  </cd:command> -<cd:command name="omlijnd" file="core-rul.tex"> +<cd:command name="framed" file="core-rul.tex">    <cd:sequence> -    <cd:string value="omlijnd"/> +    <cd:string value="framed"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelomlijndin"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="inlijnd" file="core-rul.tex"> +<cd:command name="inframed" file="core-rul.tex">    <cd:sequence> -    <cd:string value="inlijnd"/> +    <cd:string value="inframed"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelomlijndin"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="dunnelijnen" file="core-rul.tex"> +<cd:command name="thinrules" file="core-rul.tex">    <cd:sequence> -    <cd:string value="dunnelijnen"/> +    <cd:string value="thinrules"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes"> -      <cd:inherit name="steldunnelijnenin"/> +      <cd:inherit name="setupthinrules"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="steldunnelijnenin" file="core-rul.tex"> +<cd:command name="setupthinrules" file="core-rul.tex">    <cd:sequence> -    <cd:string value="steldunnelijnenin"/> +    <cd:string value="setupthinrules"/>    </cd:sequence>    <cd:arguments>      <cd:assignments> @@ -1795,49 +1791,49 @@    </cd:arguments>  </cd:command> -<cd:command name="haarlijn" file="core-rul.tex"> +<cd:command name="hairline" file="core-rul.tex">    <cd:sequence> -    <cd:string value="haarlijn"/> +    <cd:string value="hairline"/>    </cd:sequence>  </cd:command> -<cd:command name="dunnelijn" file="core-rul.tex"> +<cd:command name="thinrule" file="core-rul.tex">    <cd:sequence> -    <cd:string value="dunnelijn"/> +    <cd:string value="thinrule"/>    </cd:sequence>  </cd:command> -<cd:command name="definieerkadertekst" file="core-rul.tex"> +<cd:command name="defineframedtext" file="core-rul.tex">    <cd:sequence> -    <cd:string value="definieerkadertekst"/> +    <cd:string value="defineframedtext"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelkadertekstenin"/> +      <cd:inherit name="setupframedtexts"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="definieeromlijnd" file="core-rul.tex"> +<cd:command name="defineframed" file="core-rul.tex">    <cd:sequence> -    <cd:string value="definieeromlijnd"/> +    <cd:string value="defineframed"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelkadertekstenin"/> +      <cd:inherit name="setupframedtexts"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stelkadertekstenin" file="core-rul.tex"> +<cd:command name="setupframedtexts" file="core-rul.tex">    <cd:sequence> -    <cd:string value="stelkadertekstenin"/> +    <cd:string value="setupframedtexts"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -1891,7 +1887,7 @@          <cd:constant type="midden"/>          <cd:constant type="geen"/>        </cd:parameter> -      <cd:inherit name="stelomlijndin"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -1908,7 +1904,7 @@        <cd:constant type="geen"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelkadertekstenin"/> +      <cd:inherit name="setupframedtexts"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -1919,28 +1915,26 @@    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelkadertekstenin"/> +      <cd:inherit name="setupframedtexts"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="achtergrond" type="environment"> +<cd:command name="background" type="environment">    <cd:sequence> -    <cd:string value="achtergrond"/> +    <cd:string value="background"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="achtergrond"> +<cd:command name="background">    <cd:sequence> -    <cd:string value="achtergrond"/> +    <cd:string value="background"/>    </cd:sequence>  </cd:command> -<cd:command name="stelachtergrondin" file="core-rul.tex"> +<cd:command name="setupbackground" file="core-rul.tex">    <cd:sequence> -    <cd:string value="stelachtergrondin"/> +    <cd:string value="setupbackground"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -1966,40 +1960,40 @@          <cd:constant type="start"/>          <cd:constant type="stop"/>        </cd:parameter> -      <cd:inherit name="stelomlijndin"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="invullijnen"> +<cd:command name="fillinrules">    <cd:sequence> -    <cd:string value="invullijnen"/> +    <cd:string value="fillinrules"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelinvullijnenin"/> +      <cd:inherit name="setupfillinrules"/>      </cd:assignments>      <cd:content/>      <cd:content optional="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="invultekst"> +<cd:command name="fillintext">    <cd:sequence> -    <cd:string value="invultekst"/> +    <cd:string value="fillintext"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelinvullijnenin"/> +      <cd:inherit name="setupfillinrules"/>      </cd:assignments>      <cd:content/>      <cd:content optional="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="stelinvullijnenin" file="core-rul.tex"> +<cd:command name="setupfillinrules" file="core-rul.tex">    <cd:sequence> -    <cd:string value="stelinvullijnenin"/> +    <cd:string value="setupfillinrules"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -2042,21 +2036,21 @@    </cd:arguments>  </cd:command> -<cd:command name="invulregel"> +<cd:command name="fillinline">    <cd:sequence> -    <cd:string value="invulregel"/> +    <cd:string value="fillinline"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelinvulregelsin"/> +      <cd:inherit name="setupfillinlines"/>      </cd:assignments>      <cd:nothing/>    </cd:arguments>  </cd:command> -<cd:command name="stelinvulregelsin" file="core-rul.tex"> +<cd:command name="setupfillinlines" file="core-rul.tex">    <cd:sequence> -    <cd:string value="stelinvulregelsin"/> +    <cd:string value="setupfillinlines"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -2079,9 +2073,9 @@    </cd:arguments>  </cd:command> -<cd:command name="steltekstlijnenin" file="core-rul.tex"> +<cd:command name="setuptextrules" file="core-rul.tex">    <cd:sequence> -    <cd:string value="steltekstlijnenin"/> +    <cd:string value="setuptextrules"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -2131,9 +2125,9 @@    </cd:arguments>  </cd:command> -<cd:command name="tekstlijn" file="core-rul.tex"> +<cd:command name="textrule" file="core-rul.tex">    <cd:sequence> -    <cd:string value="tekstlijn"/> +    <cd:string value="textrule"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2144,9 +2138,9 @@    </cd:arguments>  </cd:command> -<cd:command name="tekstlijn" type="environment" file="core-rul.tex"> +<cd:command name="textrule" type="environment" file="core-rul.tex">    <cd:sequence> -    <cd:string value="tekstlijn"/> +    <cd:string value="textrule"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2157,31 +2151,31 @@    </cd:arguments>  </cd:command> -<cd:command name="blokje" file="core-rul.tex"> +<cd:command name="blackrule" file="core-rul.tex">    <cd:sequence> -    <cd:string value="blokje"/> +    <cd:string value="blackrule"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelblokjesin"/> +      <cd:inherit name="setupblackrules"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="blokjes" file="core-rul.tex"> +<cd:command name="blackrules" file="core-rul.tex">    <cd:sequence> -    <cd:string value="blokjes"/> +    <cd:string value="blackrules"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> -      <cd:inherit name="stelblokjesin"/> +      <cd:inherit name="setupblackrules"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stelblokjesin" file="core-rul.tex"> +<cd:command name="setupblackrules" file="core-rul.tex">    <cd:sequence> -    <cd:string value="stelblokjesin"/> +    <cd:string value="setupblackrules"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -2211,9 +2205,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definieeroverlay" file="core-rul.tex"> +<cd:command name="defineoverlay" file="core-rul.tex">    <cd:sequence> -    <cd:string value="definieeroverlay"/> +    <cd:string value="defineoverlay"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -2225,9 +2219,9 @@    </cd:arguments>  </cd:command> -<cd:command name="gebruikmodule"> +<cd:command name="usemodule">    <cd:sequence> -    <cd:string value="gebruikmodule"/> +    <cd:string value="usemodule"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -2247,9 +2241,9 @@    </cd:arguments>  </cd:command> -<cd:command name="geentest"> +<cd:command name="donttest">    <cd:sequence> -    <cd:string value="geentest"/> +    <cd:string value="donttest"/>    </cd:sequence>  </cd:command> @@ -2257,13 +2251,11 @@    <cd:sequence>      <cd:string value="localenvironment"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="stelsysteemin" file="core-sys.tex"> +<cd:command name="setupsystem" file="core-sys.tex">    <cd:sequence> -    <cd:string value="stelsysteemin"/> +    <cd:string value="setupsystem"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -2299,27 +2291,27 @@    </cd:arguments>  </cd:command> -<cd:command name="laag" file="core-fnt.tex"> +<cd:command name="low" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="laag"/> +    <cd:string value="low"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="hoog" file="core-fnt.tex"> +<cd:command name="high" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="hoog"/> +    <cd:string value="high"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="laho" file="core-fnt.tex"> +<cd:command name="lohi" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="laho"/> +    <cd:string value="lohi"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2330,9 +2322,9 @@    </cd:arguments>  </cd:command> -<cd:command name="toonkader"> +<cd:command name="showframe">    <cd:sequence> -    <cd:string value="toonkader"/> +    <cd:string value="showframe"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2343,45 +2335,45 @@    </cd:arguments>  </cd:command> -<cd:command name="regellinks" file="core-spa.tex"> +<cd:command name="leftaligned" file="core-spa.tex">    <cd:sequence> -    <cd:string value="regellinks"/> +    <cd:string value="leftaligned"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="regelrechts" file="core-spa.tex"> +<cd:command name="rightaligned" file="core-spa.tex">    <cd:sequence> -    <cd:string value="regelrechts"/> +    <cd:string value="rightaligned"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="regelmidden" file="core-spa.tex"> +<cd:command name="midaligned" file="core-spa.tex">    <cd:sequence> -    <cd:string value="regelmidden"/> +    <cd:string value="midaligned"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="woordrechts" file="core-spa.tex"> +<cd:command name="wordright" file="core-spa.tex">    <cd:sequence> -    <cd:string value="woordrechts"/> +    <cd:string value="wordright"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="inmarge" file="core-sec.tex"> +<cd:command name="inmargin" file="core-sec.tex">    <cd:sequence> -    <cd:string value="inmarge"/> +    <cd:string value="inmargin"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2394,9 +2386,9 @@    </cd:arguments>  </cd:command> -<cd:command name="inanderemarge" file="page-mar.tex"> +<cd:command name="inothermargin" file="page-mar.tex">    <cd:sequence> -    <cd:string value="inanderemarge"/> +    <cd:string value="inothermargin"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2409,9 +2401,9 @@    </cd:arguments>  </cd:command> -<cd:command name="inlinker"> +<cd:command name="inleft">    <cd:sequence> -    <cd:string value="inlinker"/> +    <cd:string value="inleft"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2424,9 +2416,9 @@    </cd:arguments>  </cd:command> -<cd:command name="inrechter"> +<cd:command name="inright">    <cd:sequence> -    <cd:string value="inrechter"/> +    <cd:string value="inright"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2439,9 +2431,9 @@    </cd:arguments>  </cd:command> -<cd:command name="inbinnen"> +<cd:command name="ininner">    <cd:sequence> -    <cd:string value="inbinnen"/> +    <cd:string value="ininner"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2454,9 +2446,9 @@    </cd:arguments>  </cd:command> -<cd:command name="inbuiten"> +<cd:command name="inouter">    <cd:sequence> -    <cd:string value="inbuiten"/> +    <cd:string value="inouter"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2469,33 +2461,33 @@    </cd:arguments>  </cd:command> -<cd:command name="kolom"> +<cd:command name="column">    <cd:sequence> -    <cd:string value="kolom"/> +    <cd:string value="column"/>    </cd:sequence>  </cd:command> -<cd:command name="toonstruts" file="core-spa.tex"> +<cd:command name="showstruts" file="core-spa.tex">    <cd:sequence> -    <cd:string value="toonstruts"/> +    <cd:string value="showstruts"/>    </cd:sequence>  </cd:command> -<cd:command name="tooninstellingen"> +<cd:command name="showsetups">    <cd:sequence> -    <cd:string value="tooninstellingen"/> +    <cd:string value="showsetups"/>    </cd:sequence>  </cd:command> -<cd:command name="toonlayout"> +<cd:command name="showlayout">    <cd:sequence> -    <cd:string value="toonlayout"/> +    <cd:string value="showlayout"/>    </cd:sequence>  </cd:command> -<cd:command name="margetekst" file="page-mar.tex"> +<cd:command name="margintext" file="page-mar.tex">    <cd:sequence> -    <cd:string value="margetekst"/> +    <cd:string value="margintext"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2508,9 +2500,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelmargeblokkenin" file="page-flt.tex"> +<cd:command name="setupmarginblocks" file="page-flt.tex">    <cd:sequence> -    <cd:string value="stelmargeblokkenin"/> +    <cd:string value="setupmarginblocks"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -2568,8 +2560,6 @@    <cd:sequence>      <cd:string value="marginblock"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="part" file="core-sec.tex"> @@ -2683,9 +2673,9 @@    </cd:arguments>  </cd:command> -<cd:command name="op"> +<cd:command name="at">    <cd:sequence> -    <cd:string value="op"/> +    <cd:string value="at"/>    </cd:sequence>    <cd:arguments>      <cd:content interactive="yes"/> @@ -2704,9 +2694,9 @@    </cd:arguments>  </cd:command> -<cd:command name="ergens" file="core-ref.tex"> +<cd:command name="somewhere" file="core-ref.tex">    <cd:sequence> -    <cd:string value="ergens"/> +    <cd:string value="somewhere"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -2715,9 +2705,9 @@    </cd:arguments>  </cd:command> -<cd:command name="oppagina" file="core-ref.tex"> +<cd:command name="atpage" file="core-ref.tex">    <cd:sequence> -    <cd:string value="oppagina"/> +    <cd:string value="atpage"/>    </cd:sequence>    <cd:arguments>      <cd:reference/> @@ -2740,9 +2730,9 @@    </cd:arguments>  </cd:command> -<cd:command name="tekstreferentie" file="core-ref.tex"> +<cd:command name="textreference" file="core-ref.tex">    <cd:sequence> -    <cd:string value="tekstreferentie"/> +    <cd:string value="textreference"/>    </cd:sequence>    <cd:arguments>      <cd:reference/> @@ -2750,18 +2740,18 @@    </cd:arguments>  </cd:command> -<cd:command name="paginareferentie" file="core-ref.tex"> +<cd:command name="pagereference" file="core-ref.tex">    <cd:sequence> -    <cd:string value="paginareferentie"/> +    <cd:string value="pagereference"/>    </cd:sequence>    <cd:arguments>      <cd:reference/>    </cd:arguments>  </cd:command> -<cd:command name="referentie" file="core-ref.tex"> +<cd:command name="reference" file="core-ref.tex">    <cd:sequence> -    <cd:string value="referentie"/> +    <cd:string value="reference"/>    </cd:sequence>    <cd:arguments>      <cd:reference/> @@ -2769,9 +2759,9 @@    </cd:arguments>  </cd:command> -<cd:command name="gebruikreferenties" file="core-ref.tex"> +<cd:command name="usereferences" file="core-ref.tex">    <cd:sequence> -    <cd:string value="gebruikreferenties"/> +    <cd:string value="usereferences"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -2780,9 +2770,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definieerreferentie" file="core-ref.tex"> +<cd:command name="definereference" file="core-ref.tex">    <cd:sequence> -    <cd:string value="definieerreferentie"/> +    <cd:string value="definereference"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -2792,9 +2782,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definieerreferentieformaat" file="core-ref.tex"> +<cd:command name="definereferenceformat" file="core-ref.tex">    <cd:sequence> -    <cd:string value="definieerreferentieformaat"/> +    <cd:string value="definereferenceformat"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -2839,9 +2829,9 @@    </cd:arguments>  </cd:command> -<cd:command name="omlaag" file="core-spa.tex"> +<cd:command name="godown" file="core-spa.tex">    <cd:sequence> -    <cd:string value="omlaag"/> +    <cd:string value="godown"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -2850,15 +2840,15 @@    </cd:arguments>  </cd:command> -<cd:command name="witruimte" file="core-spa.tex"> +<cd:command name="whitespace" file="core-spa.tex">    <cd:sequence> -    <cd:string value="witruimte"/> +    <cd:string value="whitespace"/>    </cd:sequence>  </cd:command> -<cd:command name="geenwitruimte" file="core-spa.tex"> +<cd:command name="nowhitespace" file="core-spa.tex">    <cd:sequence> -    <cd:string value="geenwitruimte"/> +    <cd:string value="nowhitespace"/>    </cd:sequence>  </cd:command> @@ -2868,21 +2858,21 @@    </cd:sequence>  </cd:command> -<cd:command name="spatie" file="syst-pln.tex"> +<cd:command name="space" file="syst-pln.tex">    <cd:sequence> -    <cd:string value="spatie"/> +    <cd:string value="space"/>    </cd:sequence>  </cd:command> -<cd:command name="vastespaties" file="core-spa.tex"> +<cd:command name="fixedspaces" file="core-spa.tex">    <cd:sequence> -    <cd:string value="vastespaties"/> +    <cd:string value="fixedspaces"/>    </cd:sequence>  </cd:command> -<cd:command name="legeregels" file="page-lin.tex"> +<cd:command name="emptylines" file="page-lin.tex">    <cd:sequence> -    <cd:string value="legeregels"/> +    <cd:string value="emptylines"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -2891,21 +2881,21 @@    </cd:arguments>  </cd:command> -<cd:command name="geenspatie" file="core-spa.tex"> +<cd:command name="nospace" file="core-spa.tex">    <cd:sequence> -    <cd:string value="geenspatie"/> +    <cd:string value="nospace"/>    </cd:sequence>  </cd:command> -<cd:command name="opelkaar" file="core-spa.tex"> +<cd:command name="packed" file="core-spa.tex">    <cd:sequence> -    <cd:string value="opelkaar"/> +    <cd:string value="packed"/>    </cd:sequence>  </cd:command> -<cd:command name="steldoordefinierenin" file="core-des.tex"> +<cd:command name="setupdescriptions" file="core-des.tex">    <cd:sequence> -    <cd:string value="steldoordefinierenin"/> +    <cd:string value="setupdescriptions"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -3004,23 +2994,23 @@    </cd:arguments>  </cd:command> -<cd:command name="steldoornummerenin" file="core-des.tex"> +<cd:command name="setupenumerations" file="core-des.tex">    <cd:sequence> -    <cd:string value="steldoornummerenin"/> +    <cd:string value="setupenumerations"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes">        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="doordefinieren"/> +      <cd:inherit name="definedescription"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="doornummeren" file="core-des.tex"> +<cd:command name="defineenumeration" file="core-des.tex">    <cd:sequence> -    <cd:string value="doornummeren"/> +    <cd:string value="defineenumeration"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -3030,7 +3020,7 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="steldoornummerenin"/> +      <cd:inherit name="setupenumerations"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -3048,20 +3038,18 @@    <cd:sequence>      <cd:variable value="enumeration"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="doordefinieren" file="core-des.tex"> +<cd:command name="definedescription" file="core-des.tex">    <cd:sequence> -    <cd:string value="doordefinieren"/> +    <cd:string value="definedescription"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="steldoordefinierenin"/> +      <cd:inherit name="setupdescriptions"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -3085,9 +3073,9 @@    </cd:arguments>  </cd:command> -<cd:command name="steldoorspringenin" file="core-des.tex"> +<cd:command name="setupindentations" file="core-des.tex">    <cd:sequence> -    <cd:string value="steldoorspringenin"/> +    <cd:string value="setupindentations"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -3140,16 +3128,16 @@    </cd:arguments>  </cd:command> -<cd:command name="doorspringen" file="core-des.tex"> +<cd:command name="defineindenting" file="core-des.tex">    <cd:sequence> -    <cd:string value="doorspringen"/> +    <cd:string value="defineindenting"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="steldoorspringenin"/> +      <cd:inherit name="setupindentations"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -3163,9 +3151,9 @@    </cd:arguments>  </cd:command> -<cd:command name="doorlabelen" file="core-des.tex"> +<cd:command name="definelabel" file="core-des.tex">    <cd:sequence> -    <cd:string value="doorlabelen"/> +    <cd:string value="definelabel"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3219,9 +3207,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelkolommenin" file="page-mul.tex"> +<cd:command name="setupcolumns" file="page-mul.tex">    <cd:sequence> -    <cd:string value="stelkolommenin"/> +    <cd:string value="setupcolumns"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -3273,7 +3261,7 @@          <cd:constant type="links"/>          <cd:constant type="rechts"/>        </cd:parameter> -      <cd:inherit name="stelomlijndin"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -3284,14 +3272,14 @@    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelkolommenin"/> +      <cd:inherit name="setupcolumns"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="definieertekst" file="page-txt.tex"> +<cd:command name="definetext" file="page-txt.tex">    <cd:sequence> -    <cd:string value="definieertekst"/> +    <cd:string value="definetext"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3313,9 +3301,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelhoofdin" file="page-txt.tex"> +<cd:command name="setupheader" file="page-txt.tex">    <cd:sequence> -    <cd:string value="stelhoofdin"/> +    <cd:string value="setupheader"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -3384,77 +3372,77 @@    </cd:arguments>  </cd:command> -<cd:command name="stelvoetin" file="page-txt.tex"> +<cd:command name="setupfooter" file="page-txt.tex">    <cd:sequence> -    <cd:string value="stelvoetin"/> +    <cd:string value="setupfooter"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> -      <cd:inherit name="stelhoofdin"/> +      <cd:inherit name="setupheader"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="stelhoofdin"/> +      <cd:inherit name="setupheader"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="steltekstin" file="page-txt.tex"> +<cd:command name="setuptext" file="page-txt.tex">    <cd:sequence> -    <cd:string value="steltekstin"/> +    <cd:string value="setuptext"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> -      <cd:inherit name="stelhoofdin"/> +      <cd:inherit name="setupheader"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="stelhoofdin"/> +      <cd:inherit name="setupheader"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stelbovenin" file="page-txt.tex"> +<cd:command name="setuptop" file="page-txt.tex">    <cd:sequence> -    <cd:string value="stelbovenin"/> +    <cd:string value="setuptop"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> -      <cd:inherit name="stelhoofdin"/> +      <cd:inherit name="setupheader"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="stelhoofdin"/> +      <cd:inherit name="setupheader"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stelonderin" file="page-txt.tex"> +<cd:command name="setupbottom" file="page-txt.tex">    <cd:sequence> -    <cd:string value="stelonderin"/> +    <cd:string value="setupbottom"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> -      <cd:inherit name="stelhoofdin"/> +      <cd:inherit name="setupheader"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="stelhoofdin"/> +      <cd:inherit name="setupheader"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="geenhoofdenvoetregels" file="page-txt.tex"> +<cd:command name="noheaderandfooterlines" file="page-txt.tex">    <cd:sequence> -    <cd:string value="geenhoofdenvoetregels"/> +    <cd:string value="noheaderandfooterlines"/>    </cd:sequence>  </cd:command> -<cd:command name="geenbovenenonderregels" file="page-txt.tex"> +<cd:command name="notopandbottomlines" file="page-txt.tex">    <cd:sequence> -    <cd:string value="geenbovenenonderregels"/> +    <cd:string value="notopandbottomlines"/>    </cd:sequence>  </cd:command> -<cd:command name="stelhoofdtekstenin" file="page-txt.tex"> +<cd:command name="setupheadertexts" file="page-txt.tex">    <cd:sequence> -    <cd:string value="stelhoofdtekstenin"/> +    <cd:string value="setupheadertexts"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -3479,9 +3467,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelvoettekstenin" file="page-txt.tex"> +<cd:command name="setupfootertexts" file="page-txt.tex">    <cd:sequence> -    <cd:string value="stelvoettekstenin"/> +    <cd:string value="setupfootertexts"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -3506,9 +3494,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelteksttekstenin" file="page-txt.tex"> +<cd:command name="setuptexttexts" file="page-txt.tex">    <cd:sequence> -    <cd:string value="stelteksttekstenin"/> +    <cd:string value="setuptexttexts"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -3533,9 +3521,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelboventekstenin" file="page-txt.tex"> +<cd:command name="setuptoptexts" file="page-txt.tex">    <cd:sequence> -    <cd:string value="stelboventekstenin"/> +    <cd:string value="setuptoptexts"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -3560,9 +3548,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelondertekstenin" file="page-txt.tex"> +<cd:command name="setupbottomtexts" file="page-txt.tex">    <cd:sequence> -    <cd:string value="stelondertekstenin"/> +    <cd:string value="setupbottomtexts"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -3587,9 +3575,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definieermarkering" file="core-mar.tex"> +<cd:command name="definemarking" file="core-mar.tex">    <cd:sequence> -    <cd:string value="definieermarkering"/> +    <cd:string value="definemarking"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3601,9 +3589,9 @@    </cd:arguments>  </cd:command> -<cd:command name="koppelmarkering" file="core-sec.tex"> +<cd:command name="couplemarking" file="core-sec.tex">    <cd:sequence> -    <cd:string value="koppelmarkering"/> +    <cd:string value="couplemarking"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3615,9 +3603,9 @@    </cd:arguments>  </cd:command> -<cd:command name="ontkoppelmarkering" file="core-mar.tex"> +<cd:command name="decouplemarking" file="core-mar.tex">    <cd:sequence> -    <cd:string value="ontkoppelmarkering"/> +    <cd:string value="decouplemarking"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3626,9 +3614,9 @@    </cd:arguments>  </cd:command> -<cd:command name="resetmarkering" file="core-mar.tex"> +<cd:command name="resetmarking" file="core-mar.tex">    <cd:sequence> -    <cd:string value="resetmarkering"/> +    <cd:string value="resetmarking"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3637,9 +3625,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelmarkeringin" file="core-mar.tex"> +<cd:command name="setupmarking" file="core-mar.tex">    <cd:sequence> -    <cd:string value="stelmarkeringin"/> +    <cd:string value="setupmarking"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3661,9 +3649,9 @@    </cd:arguments>  </cd:command> -<cd:command name="markeer" file="core-mar.tex"> +<cd:command name="marking" file="core-mar.tex">    <cd:sequence> -    <cd:string value="markeer"/> +    <cd:string value="marking"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3673,9 +3661,9 @@    </cd:arguments>  </cd:command> -<cd:command name="haalmarkering" file="core-mar.tex"> +<cd:command name="getmarking" file="core-mar.tex">    <cd:sequence> -    <cd:string value="haalmarkering"/> +    <cd:string value="getmarking"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3692,18 +3680,18 @@    </cd:arguments>  </cd:command> -<cd:command name="geenmarkering" file="core-mar.tex"> +<cd:command name="nomarking" file="core-mar.tex">    <cd:sequence> -    <cd:string value="geenmarkering"/> +    <cd:string value="nomarking"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="stellayoutin" file="page-ini.tex"> +<cd:command name="setuplayout" file="page-ini.tex">    <cd:sequence> -    <cd:string value="stellayoutin"/> +    <cd:string value="setuplayout"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -3865,9 +3853,9 @@    </cd:arguments>  </cd:command> -<cd:command name="paslayoutaan" file="page-lay.tex"> +<cd:command name="adaptlayout" file="page-lay.tex">    <cd:sequence> -    <cd:string value="paslayoutaan"/> +    <cd:string value="adaptlayout"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -3885,27 +3873,27 @@    </cd:arguments>  </cd:command> -<cd:command name="toongrid" file="page-ini.tex"> +<cd:command name="showgrid" file="page-ini.tex">    <cd:sequence> -    <cd:string value="toongrid"/> +    <cd:string value="showgrid"/>    </cd:sequence>  </cd:command> -<cd:command name="plaatsopgrid" file="core-grd.tex"> +<cd:command name="placeongrid" file="core-grd.tex">    <cd:sequence> -    <cd:string value="plaatsopgrid"/> +    <cd:string value="placeongrid"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> -      <cd:inherit name="verplaatsopgrid"/> +      <cd:inherit name="moveongrid"/>      </cd:keywords>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="verplaatsopgrid" file="core-grd.tex"> +<cd:command name="moveongrid" file="core-grd.tex">    <cd:sequence> -    <cd:string value="verplaatsopgrid"/> +    <cd:string value="moveongrid"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -3940,9 +3928,9 @@    </cd:arguments>  </cd:command> -<cd:command name="omgeving" type="environment"> +<cd:command name="environment" type="environment">    <cd:sequence> -    <cd:string value="omgeving"/> +    <cd:string value="environment"/>    </cd:sequence>    <cd:arguments>      <cd:file/> @@ -3958,24 +3946,24 @@    </cd:arguments>  </cd:command> -<cd:command name="onderdeel" type="environment"> +<cd:command name="component" type="environment">    <cd:sequence> -    <cd:string value="onderdeel"/> +    <cd:string value="component"/>    </cd:sequence>    <cd:arguments>      <cd:file/>    </cd:arguments>  </cd:command> -<cd:command name="geenfilesmeer"> +<cd:command name="nomorefiles">    <cd:sequence> -    <cd:string value="geenfilesmeer"/> +    <cd:string value="nomorefiles"/>    </cd:sequence>  </cd:command> -<cd:command name="stelinterliniein"> +<cd:command name="setupinterlinespace">    <cd:sequence> -    <cd:string value="stelinterliniein"/> +    <cd:string value="setupinterlinespace"/>    </cd:sequence>    <cd:arguments>      <cd:choice> @@ -4008,9 +3996,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelpaginanummeringin" file="page-num.tex"> +<cd:command name="setuppagenumbering" file="page-num.tex">    <cd:sequence> -    <cd:string value="stelpaginanummeringin"/> +    <cd:string value="setuppagenumbering"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4090,9 +4078,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelsmallerin" file="core-spa.tex"> +<cd:command name="setupnarrower" file="core-spa.tex">    <cd:sequence> -    <cd:string value="stelsmallerin"/> +    <cd:string value="setupnarrower"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4109,9 +4097,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definieer" file="syst-ext.tex"> +<cd:command name="define" file="syst-ext.tex">    <cd:sequence> -    <cd:string value="definieer"/> +    <cd:string value="define"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -4122,18 +4110,18 @@    </cd:arguments>  </cd:command> -<cd:command name="gebruikcommandos" file="core-sys.tex"> +<cd:command name="usecommands" file="core-sys.tex">    <cd:sequence> -    <cd:string value="gebruikcommandos"/> +    <cd:string value="usecommands"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="definieerstartstop" file="core-sys.tex"> +<cd:command name="definestartstop" file="core-sys.tex">    <cd:sequence> -    <cd:string value="definieerstartstop"/> +    <cd:string value="definestartstop"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -4163,9 +4151,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelkoppenin" file="core-sec.tex"> +<cd:command name="setupheads" file="core-sec.tex">    <cd:sequence> -    <cd:string value="stelkoppenin"/> +    <cd:string value="setupheads"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4215,9 +4203,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelblokkopjesin" file="page-flt.tex"> +<cd:command name="setupcaptions" file="page-flt.tex">    <cd:sequence> -    <cd:string value="stelblokkopjesin"/> +    <cd:string value="setupcaptions"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4296,23 +4284,23 @@    </cd:arguments>  </cd:command> -<cd:command name="stelblokkopjein" file="page-flt.tex"> +<cd:command name="setupcaption" file="page-flt.tex">    <cd:sequence> -    <cd:string value="stelblokkopjein"/> +    <cd:string value="setupcaption"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="stelblokkopjesin"/> +      <cd:inherit name="setupcaptions"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stelplaatsblokkenin" file="page-flt.tex"> +<cd:command name="setupfloats" file="page-flt.tex">    <cd:sequence> -    <cd:string value="stelplaatsblokkenin"/> +    <cd:string value="setupfloats"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4389,14 +4377,14 @@          <cd:constant type="normaal"/>          <cd:constant type="regel"/>        </cd:parameter> -      <cd:inherit name="stelomlijndin"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stelplaatsbloksplitsenin" file="page-flt.tex"> +<cd:command name="setupfloatsplitting" file="page-flt.tex">    <cd:sequence> -    <cd:string value="stelplaatsbloksplitsenin"/> +    <cd:string value="setupfloatsplitting"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4414,22 +4402,22 @@    </cd:arguments>  </cd:command> -<cd:command name="splitsplaatsblok" file="page-flt.tex"> +<cd:command name="splitfloat" file="page-flt.tex">    <cd:sequence> -    <cd:string value="splitsplaatsblok"/> +    <cd:string value="splitfloat"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelplaatsbloksplitsenin"/> +      <cd:inherit name="setupfloatsplitting"/>      </cd:assignments>      <cd:content/>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="stelnaastplaatsenin" file="page-ini.tex"> +<cd:command name="setupoppositeplacing" file="page-ini.tex">    <cd:sequence> -    <cd:string value="stelnaastplaatsenin"/> +    <cd:string value="setupoppositeplacing"/>    </cd:sequence>    <cd:arguments>      <cd:assignments> @@ -4454,13 +4442,11 @@    <cd:sequence>      <cd:string value="opposite"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="stelkoppeltekenin" file="core-mis.tex"> +<cd:command name="setuphyphenmark" file="core-mis.tex">    <cd:sequence> -    <cd:string value="stelkoppeltekenin"/> +    <cd:string value="setuphyphenmark"/>    </cd:sequence>    <cd:arguments>      <cd:assignments> @@ -4478,9 +4464,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelpositionerenin" file="page-lyr.tex"> +<cd:command name="setuppositioning" file="page-lyr.tex">    <cd:sequence> -    <cd:string value="stelpositionerenin"/> +    <cd:string value="setuppositioning"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4523,13 +4509,11 @@    <cd:sequence>      <cd:string value="positioning"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="rooster" file="core-spa.tex"> +<cd:command name="grid" file="core-spa.tex">    <cd:sequence> -    <cd:string value="rooster"/> +    <cd:string value="grid"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4584,9 +4568,9 @@    </cd:arguments>  </cd:command> -<cd:command name="pagina" file="page-ini.tex"> +<cd:command name="page" file="page-ini.tex">    <cd:sequence> -    <cd:string value="pagina"/> +    <cd:string value="page"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -4611,9 +4595,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelrefererenin" file="core-ref.tex"> +<cd:command name="setupreferencing" file="core-ref.tex">    <cd:sequence> -    <cd:string value="stelrefererenin"/> +    <cd:string value="setupreferencing"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4667,9 +4651,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelurlin" file="core-ref.tex"> +<cd:command name="setupurl" file="core-ref.tex">    <cd:sequence> -    <cd:string value="stelurlin"/> +    <cd:string value="setupurl"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4697,9 +4681,9 @@    </cd:arguments>  </cd:command> -<cd:command name="schrijfnaarreferentielijst" file="core-lst.tex"> +<cd:command name="writetoreferencelist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="schrijfnaarreferentielijst"/> +    <cd:string value="writetoreferencelist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -4710,9 +4694,9 @@    </cd:arguments>  </cd:command> -<cd:command name="plaatsreferentielijst"> +<cd:command name="placereferencelist">    <cd:sequence> -    <cd:string value="plaatsreferentielijst"/> +    <cd:string value="placereferencelist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -4721,23 +4705,23 @@    </cd:arguments>  </cd:command> -<cd:command name="definieerreferentielijst" file="core-lst.tex"> +<cd:command name="definereferencelist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="definieerreferentielijst"/> +    <cd:string value="definereferencelist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelreferentielijstin"/> +      <cd:inherit name="setupreferencelist"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stelreferentielijstin" file="core-lst.tex"> +<cd:command name="setupreferencelist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="stelreferentielijstin"/> +    <cd:string value="setupreferencelist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -4767,9 +4751,9 @@    </cd:arguments>  </cd:command> -<cd:command name="schrijfnaarlijst" file="core-lst.tex"> +<cd:command name="writetolist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="schrijfnaarlijst"/> +    <cd:string value="writetolist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -4781,9 +4765,9 @@    </cd:arguments>  </cd:command> -<cd:command name="schrijftussenlijst" file="core-lst.tex"> +<cd:command name="writebetweenlist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="schrijftussenlijst"/> +    <cd:string value="writebetweenlist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -4794,18 +4778,18 @@    </cd:arguments>  </cd:command> -<cd:command name="geenlijst" file="core-lst.tex"> +<cd:command name="nolist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="geenlijst"/> +    <cd:string value="nolist"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="lijstsymbool" file="core-lst.tex"> +<cd:command name="listsymbol" file="core-lst.tex">    <cd:sequence> -    <cd:string value="lijstsymbool"/> +    <cd:string value="listsymbol"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -4815,51 +4799,51 @@    </cd:arguments>  </cd:command> -<cd:command name="plaatslijst" file="core-lst.tex"> +<cd:command name="placelist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="plaatslijst"/> +    <cd:string value="placelist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes">        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stellijstin"/> +      <cd:inherit name="setuplist"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="bepaallijstkenmerken" file="core-lst.tex"> +<cd:command name="determinelistcharacteristics" file="core-lst.tex">    <cd:sequence> -    <cd:string value="bepaallijstkenmerken"/> +    <cd:string value="determinelistcharacteristics"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes">        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stellijstin"/> +      <cd:inherit name="setuplist"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="plaatssamengesteldelijst" file="core-lst.tex"> +<cd:command name="placecombinedlist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="plaatssamengesteldelijst"/> +    <cd:string value="placecombinedlist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelsamengesteldelijstin"/> +      <cd:inherit name="setupcombinedlist"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="definieerlijst" file="core-lst.tex"> +<cd:command name="definelist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="definieerlijst"/> +    <cd:string value="definelist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -4869,14 +4853,14 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stellijstin"/> +      <cd:inherit name="setuplist"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stellijstin" file="core-lst.tex"> +<cd:command name="setuplist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="stellijstin"/> +    <cd:string value="setuplist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -5047,14 +5031,14 @@        <cd:parameter name="maxbreedte">          <cd:constant type="cd:dimension"/>        </cd:parameter> -      <cd:inherit name="omlijnd"/> +      <cd:inherit name="framed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="definieersamengesteldelijst" file="core-lst.tex"> +<cd:command name="definecombinedlist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="definieersamengesteldelijst"/> +    <cd:string value="definecombinedlist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -5064,14 +5048,14 @@        <cd:constant type="cd:list"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelsamengesteldelijstin"/> +      <cd:inherit name="setupcombinedlist"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stelsamengesteldelijstin" file="core-lst.tex"> +<cd:command name="setupcombinedlist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="stelsamengesteldelijstin"/> +    <cd:string value="setupcombinedlist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -5086,12 +5070,12 @@          <cd:constant type="cd:section"/>          <cd:constant type="huidige"/>        </cd:parameter> -      <cd:inherit name="stellijstin"/> +      <cd:inherit name="setuplist"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="plaatssamengesteldelijst" generated="yes" file="core-lst.tex"> +<cd:command name="placecombinedlist" generated="yes" file="core-lst.tex">    <cd:sequence>      <cd:string value="plaats"/>      <cd:variable value="combinedlist"/> @@ -5101,7 +5085,7 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelsamengesteldelijstin"/> +      <cd:inherit name="setupcombinedlist"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -5116,14 +5100,14 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="stelsamengesteldelijstin"/> +      <cd:inherit name="setupcombinedlist"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stelnummerenin" file="core-num.tex"> +<cd:command name="setupnumbering" file="core-num.tex">    <cd:sequence> -    <cd:string value="stelnummerenin"/> +    <cd:string value="setupnumbering"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -5199,18 +5183,18 @@    </cd:arguments>  </cd:command> -<cd:command name="publicatie" file="core-mis.tex"> +<cd:command name="publication" file="core-mis.tex">    <cd:sequence> -    <cd:string value="publicatie"/> +    <cd:string value="publication"/>    </cd:sequence>    <cd:arguments>      <cd:reference/>    </cd:arguments>  </cd:command> -<cd:command name="stelpublicatiesin" file="core-mis.tex"> +<cd:command name="setuppublications" file="core-mis.tex">    <cd:sequence> -    <cd:string value="stelpublicatiesin"/> +    <cd:string value="setuppublications"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -5218,14 +5202,14 @@          <cd:constant type="apa"/>          <cd:constant type="normaal"/>        </cd:parameter> -      <cd:inherit name="steldoornummerenin"/> +      <cd:inherit name="setupenumerations"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stelregelsin" file="page-lin.tex"> +<cd:command name="setuplines" file="page-lin.tex">    <cd:sequence> -    <cd:string value="stelregelsin"/> +    <cd:string value="setuplines"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -5252,13 +5236,11 @@    <cd:sequence>      <cd:string value="lines"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="stelparagraafnummerenin" file="page-lin.tex"> +<cd:command name="setupparagraphnumbering" file="page-lin.tex">    <cd:sequence> -    <cd:string value="stelparagraafnummerenin"/> +    <cd:string value="setupparagraphnumbering"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -5285,9 +5267,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelregelnummerenin" file="page-lin.tex"> +<cd:command name="setuplinenumbering" file="page-lin.tex">    <cd:sequence> -    <cd:string value="stelregelnummerenin"/> +    <cd:string value="setuplinenumbering"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -5353,27 +5335,27 @@    </cd:arguments>  </cd:command> -<cd:command name="eenregel" file="page-lin.tex"> +<cd:command name="someline" file="page-lin.tex">    <cd:sequence> -    <cd:string value="eenregel"/> +    <cd:string value="someline"/>    </cd:sequence>    <cd:arguments>      <cd:reference/>    </cd:arguments>  </cd:command> -<cd:command name="inregel" file="page-lin.tex"> +<cd:command name="inline" file="page-lin.tex">    <cd:sequence> -    <cd:string value="inregel"/> +    <cd:string value="inline"/>    </cd:sequence>    <cd:arguments>      <cd:reference/>    </cd:arguments>  </cd:command> -<cd:command name="stelinmargein" file="page-mar.tex"> +<cd:command name="setupinmargin" file="page-mar.tex">    <cd:sequence> -    <cd:string value="stelinmargein"/> +    <cd:string value="setupinmargin"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -5432,14 +5414,14 @@          <cd:constant type="ja"/>          <cd:constant type="nee"/>        </cd:parameter> -      <cd:inherit name="stelomlijndin"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stelpaginanummerin" file="page-num.tex"> +<cd:command name="setuppagenumber" file="page-num.tex">    <cd:sequence> -    <cd:string value="stelpaginanummerin"/> +    <cd:string value="setuppagenumber"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -5455,9 +5437,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelsubpaginanummerin" file="page-num.tex"> +<cd:command name="setupsubpagenumber" file="page-num.tex">    <cd:sequence> -    <cd:string value="stelsubpaginanummerin"/> +    <cd:string value="setupsubpagenumber"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -5474,9 +5456,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelblankoin"> +<cd:command name="setupblank">    <cd:sequence> -    <cd:string value="stelblankoin"/> +    <cd:string value="setupblank"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -5493,23 +5475,23 @@    </cd:arguments>  </cd:command> -<cd:command name="definieerblanko" file="core-spa.tex"> +<cd:command name="defineblank" file="core-spa.tex">    <cd:sequence> -    <cd:string value="definieerblanko"/> +    <cd:string value="defineblank"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:keywords> -      <cd:inherit name="stelblankoin"/> +      <cd:inherit name="setupblank"/>      </cd:keywords>    </cd:arguments>  </cd:command> -<cd:command name="definieerpapierformaat" file="page-lay.tex"> +<cd:command name="definepapersize" file="page-lay.tex">    <cd:sequence> -    <cd:string value="definieerpapierformaat"/> +    <cd:string value="definepapersize"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -5532,9 +5514,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelpapierin" file="page-lay.tex"> +<cd:command name="setuppaper" file="page-lay.tex">    <cd:sequence> -    <cd:string value="stelpapierin"/> +    <cd:string value="setuppaper"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -5570,9 +5552,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelpapierformaatin" file="page-lay.tex"> +<cd:command name="setuppapersize" file="page-lay.tex">    <cd:sequence> -    <cd:string value="stelpapierformaatin"/> +    <cd:string value="setuppapersize"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -5610,9 +5592,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelarrangerenin" file="page-imp.tex"> +<cd:command name="setuparranging" file="page-imp.tex">    <cd:sequence> -    <cd:string value="stelarrangerenin"/> +    <cd:string value="setuparranging"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -5639,26 +5621,26 @@    </cd:arguments>  </cd:command> -<cd:command name="toonprint"> +<cd:command name="showprint">    <cd:sequence> -    <cd:string value="toonprint"/> +    <cd:string value="showprint"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> -      <cd:inherit name="stelpapierformaatin"/> +      <cd:inherit name="setuppapersize"/>      </cd:keywords>      <cd:keywords list="yes"> -      <cd:inherit name="stelpapierformaatin"/> +      <cd:inherit name="setuppapersize"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="stellayoutin"/> +      <cd:inherit name="setuplayout"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="definieerbeeldmerk" file="page-log.tex"> +<cd:command name="definelogo" file="page-log.tex">    <cd:sequence> -    <cd:string value="definieerbeeldmerk"/> +    <cd:string value="definelogo"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -5694,9 +5676,9 @@    </cd:arguments>  </cd:command> -<cd:command name="plaatsbeeldmerken" file="page-log.tex"> +<cd:command name="placelogos" file="page-log.tex">    <cd:sequence> -    <cd:string value="plaatsbeeldmerken"/> +    <cd:string value="placelogos"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -5705,9 +5687,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelwitruimtein"> +<cd:command name="setupwhitespace">    <cd:sequence> -    <cd:string value="stelwitruimtein"/> +    <cd:string value="setupwhitespace"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -5723,9 +5705,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelinspringenin"> +<cd:command name="setupindenting">    <cd:sequence> -    <cd:string value="stelinspringenin"/> +    <cd:string value="setupindenting"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -5740,23 +5722,23 @@    </cd:arguments>  </cd:command> -<cd:command name="definieersectieblok" file="core-sec.tex"> +<cd:command name="definesectionblock" file="core-sec.tex">    <cd:sequence> -    <cd:string value="definieersectieblok"/> +    <cd:string value="definesectionblock"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelsectieblokin"/> +      <cd:inherit name="setupsectionblock"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stelsectieblokin" file="core-sec.tex"> +<cd:command name="setupsectionblock" file="core-sec.tex">    <cd:sequence> -    <cd:string value="stelsectieblokin"/> +    <cd:string value="setupsectionblock"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -5781,9 +5763,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definieersectie" file="core-sec.tex"> +<cd:command name="definesection" file="core-sec.tex">    <cd:sequence> -    <cd:string value="definieersectie"/> +    <cd:string value="definesection"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -5792,9 +5774,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelsectiein" file="core-sec.tex"> +<cd:command name="setupsection" file="core-sec.tex">    <cd:sequence> -    <cd:string value="stelsectiein"/> +    <cd:string value="setupsection"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -5819,9 +5801,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelkopin" file="core-sec.tex"> +<cd:command name="setuphead" file="core-sec.tex">    <cd:sequence> -    <cd:string value="stelkopin"/> +    <cd:string value="setuphead"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -5958,14 +5940,14 @@          <cd:constant type="ja"/>          <cd:constant type="nee"/>        </cd:parameter> -      <cd:inherit name="stelkoppenin"/> +      <cd:inherit name="setupheads"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stelkopnummerin" file="core-sec.tex"> +<cd:command name="setupheadnumber" file="core-sec.tex">    <cd:sequence> -    <cd:string value="stelkopnummerin"/> +    <cd:string value="setupheadnumber"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -5979,9 +5961,9 @@    </cd:arguments>  </cd:command> -<cd:command name="kopnummer"> +<cd:command name="headnumber">    <cd:sequence> -    <cd:string value="kopnummer"/> +    <cd:string value="headnumber"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -5990,9 +5972,9 @@    </cd:arguments>  </cd:command> -<cd:command name="bepaalkopnummer" file="core-sec.tex"> +<cd:command name="determineheadnumber" file="core-sec.tex">    <cd:sequence> -    <cd:string value="bepaalkopnummer"/> +    <cd:string value="determineheadnumber"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6001,9 +5983,9 @@    </cd:arguments>  </cd:command> -<cd:command name="huidigekopnummer" file="core-sec.tex"> +<cd:command name="currentheadnumber" file="core-sec.tex">    <cd:sequence> -    <cd:string value="huidigekopnummer"/> +    <cd:string value="currentheadnumber"/>    </cd:sequence>  </cd:command> @@ -6014,9 +5996,9 @@    </cd:sequence>  </cd:command> -<cd:command name="definieerkop" file="core-sec.tex"> +<cd:command name="definehead" file="core-sec.tex">    <cd:sequence> -    <cd:string value="definieerkop"/> +    <cd:string value="definehead"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6028,9 +6010,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelitemgroepin" file="core-itm.tex"> +<cd:command name="setupitemgroup" file="core-itm.tex">    <cd:sequence> -    <cd:string value="stelitemgroepin"/> +    <cd:string value="setupitemgroup"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6191,14 +6173,14 @@        <cd:constant type="kolommen"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelitemgroepin"/> +      <cd:inherit name="setupitemgroup"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="som"> +<cd:command name="item">    <cd:sequence> -    <cd:string value="som"/> +    <cd:string value="item"/>    </cd:sequence>    <cd:arguments>      <cd:reference optional="yes" list="yes"/> @@ -6232,9 +6214,9 @@    </cd:arguments>  </cd:command> -<cd:command name="kop"> +<cd:command name="head">    <cd:sequence> -    <cd:string value="kop"/> +    <cd:string value="head"/>    </cd:sequence>    <cd:arguments>      <cd:reference optional="yes" list="yes"/> @@ -6275,9 +6257,9 @@    </cd:sequence>  </cd:command> -<cd:command name="definieerregister" file="core-reg.tex"> +<cd:command name="defineregister" file="core-reg.tex">    <cd:sequence> -    <cd:string value="definieerregister"/> +    <cd:string value="defineregister"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6289,9 +6271,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelregisterin" file="core-reg.tex"> +<cd:command name="setupregister" file="core-reg.tex">    <cd:sequence> -    <cd:string value="stelregisterin"/> +    <cd:string value="setupregister"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6434,9 +6416,9 @@    </cd:arguments>  </cd:command> -<cd:command name="schrijfnaarregister" file="core-reg.tex"> +<cd:command name="writetoregister" file="core-reg.tex">    <cd:sequence> -    <cd:string value="schrijfnaarregister"/> +    <cd:string value="writetoregister"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6462,9 +6444,9 @@    </cd:arguments>  </cd:command> -<cd:command name="koppelregister" file="core-reg.tex"> +<cd:command name="coupleregister" file="core-reg.tex">    <cd:sequence> -    <cd:string value="koppelregister"/> +    <cd:string value="coupleregister"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6473,16 +6455,16 @@    </cd:arguments>  </cd:command> -<cd:command name="plaatsregister" file="core-reg.tex"> +<cd:command name="placeregister" file="core-reg.tex">    <cd:sequence> -    <cd:string value="plaatsregister"/> +    <cd:string value="placeregister"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelregisterin"/> +      <cd:inherit name="setupregister"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -6501,33 +6483,33 @@    </cd:arguments>  </cd:command> -<cd:command name="volledigregister" generated="yes" file="core-reg.tex"> +<cd:command name="completeregister" generated="yes" file="core-reg.tex">    <cd:sequence>      <cd:string value="volledige"/>      <cd:variable value="register"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="yes" optional="yes" list="yes"> -      <cd:inherit name="stelregisterin"/> +      <cd:inherit name="setupregister"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="plaatsregister" generated="yes" file="core-reg.tex"> +<cd:command name="placeregister" generated="yes" file="core-reg.tex">    <cd:sequence>      <cd:string value="plaats"/>      <cd:variable value="register"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="yes" optional="yes" list="yes"> -      <cd:inherit name="stelregisterin"/> +      <cd:inherit name="setupregister"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="definieersynoniemen" file="core-syn.tex"> +<cd:command name="definesynonyms" file="core-syn.tex">    <cd:sequence> -    <cd:string value="definieersynoniemen"/> +    <cd:string value="definesynonyms"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6545,9 +6527,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelsynoniemenin" file="core-syn.tex"> +<cd:command name="setupsynonyms" file="core-syn.tex">    <cd:sequence> -    <cd:string value="stelsynoniemenin"/> +    <cd:string value="setupsynonyms"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6644,9 +6626,9 @@    </cd:sequence>  </cd:command> -<cd:command name="definieersorteren" file="core-syn.tex"> +<cd:command name="definesorting" file="core-syn.tex">    <cd:sequence> -    <cd:string value="definieersorteren"/> +    <cd:string value="definesorting"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6661,9 +6643,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelsorterenin" file="core-syn.tex"> +<cd:command name="setupsorting" file="core-syn.tex">    <cd:sequence> -    <cd:string value="stelsorterenin"/> +    <cd:string value="setupsorting"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6739,16 +6721,16 @@    </cd:sequence>  </cd:command> -<cd:command name="definieeropmaak" file="page-mak.tex"> +<cd:command name="definemakeup" file="page-mak.tex">    <cd:sequence> -    <cd:string value="definieeropmaak"/> +    <cd:string value="definemakeup"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="stelopmaakin"/> +      <cd:inherit name="setupmakeup"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -6762,14 +6744,14 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelopmaakin"/> +      <cd:inherit name="setupmakeup"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stelopmaakin" file="page-mak.tex"> +<cd:command name="setupmakeup" file="page-mak.tex">    <cd:sequence> -    <cd:string value="stelopmaakin"/> +    <cd:string value="setupmakeup"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6849,13 +6831,11 @@      <cd:variable value="naam"/>      <cd:string value="opmaak"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="versie"> +<cd:command name="version">    <cd:sequence> -    <cd:string value="versie"/> +    <cd:string value="version"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6866,20 +6846,20 @@    </cd:arguments>  </cd:command> -<cd:command name="huidigedatum"> +<cd:command name="currentdate">    <cd:sequence> -    <cd:string value="huidigedatum"/> +    <cd:string value="currentdate"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> -      <cd:inherit name="datum"/> +      <cd:inherit name="date"/>      </cd:keywords>    </cd:arguments>  </cd:command> -<cd:command name="datum" file="core-con.tex"> +<cd:command name="date" file="core-con.tex">    <cd:sequence> -    <cd:string value="datum"/> +    <cd:string value="date"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> @@ -6898,15 +6878,15 @@    </cd:arguments>  </cd:command> -<cd:command name="kenmerkdatum" file="core-mis.tex"> +<cd:command name="referraldate" file="core-mis.tex">    <cd:sequence> -    <cd:string value="kenmerkdatum"/> +    <cd:string value="referraldate"/>    </cd:sequence>  </cd:command> -<cd:command name="inspringen" file="core-spa.tex"> +<cd:command name="indenting" file="core-spa.tex">    <cd:sequence> -    <cd:string value="inspringen"/> +    <cd:string value="indenting"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -6921,15 +6901,15 @@    </cd:arguments>  </cd:command> -<cd:command name="nietinspringen" file="core-spa.tex"> +<cd:command name="noindenting" file="core-spa.tex">    <cd:sequence> -    <cd:string value="nietinspringen"/> +    <cd:string value="noindenting"/>    </cd:sequence>  </cd:command> -<cd:command name="blanko" file="core-spa.tex"> +<cd:command name="blank" file="core-spa.tex">    <cd:sequence> -    <cd:string value="blanko"/> +    <cd:string value="blank"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -6952,9 +6932,9 @@    </cd:arguments>  </cd:command> -<cd:command name="opelkaar" type="environment" file="core-spa.tex"> +<cd:command name="packed" type="environment" file="core-spa.tex">    <cd:sequence> -    <cd:string value="opelkaar"/> +    <cd:string value="packed"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -6967,21 +6947,17 @@    <cd:sequence>      <cd:string value="unpacked"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="linecorrection" type="environment">    <cd:sequence>      <cd:string value="linecorrection"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="corrigeerwitruimte" file="core-spa.tex"> +<cd:command name="correctwhitespace" file="core-spa.tex">    <cd:sequence> -    <cd:string value="corrigeerwitruimte"/> +    <cd:string value="correctwhitespace"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -6992,16 +6968,12 @@    <cd:sequence>      <cd:string value="postponing"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="lokale" type="environment">    <cd:sequence>      <cd:string value="lokale"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="narrower" type="environment"> @@ -7021,13 +6993,11 @@    <cd:sequence>      <cd:string value="hiding"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="steluitlijnenin" file="core-spa.tex"> +<cd:command name="setupalign" file="core-spa.tex">    <cd:sequence> -    <cd:string value="steluitlijnenin"/> +    <cd:string value="setupalign"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7057,14 +7027,14 @@    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> -      <cd:inherit name="steluitlijnenin"/> +      <cd:inherit name="setupalign"/>      </cd:keywords>    </cd:arguments>  </cd:command> -<cd:command name="stelspatieringin"> +<cd:command name="setupspacing">    <cd:sequence> -    <cd:string value="stelspatieringin"/> +    <cd:string value="setupspacing"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7074,9 +7044,9 @@    </cd:arguments>  </cd:command> -<cd:command name="steltolerantiein" file="core-spa.tex"> +<cd:command name="setuptolerance" file="core-spa.tex">    <cd:sequence> -    <cd:string value="steltolerantiein"/> +    <cd:string value="setuptolerance"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7092,9 +7062,9 @@    </cd:arguments>  </cd:command> -<cd:command name="soortpagina" file="page-ini.tex"> +<cd:command name="pagetype" file="page-ini.tex">    <cd:sequence> -    <cd:string value="soortpagina"/> +    <cd:string value="pagetype"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7103,9 +7073,9 @@    </cd:arguments>  </cd:command> -<cd:command name="verwerkpagina" file="page-ini.tex"> +<cd:command name="processpage" file="page-ini.tex">    <cd:sequence> -    <cd:string value="verwerkpagina"/> +    <cd:string value="processpage"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7118,9 +7088,9 @@    </cd:arguments>  </cd:command> -<cd:command name="koppelpagina" file="page-ini.tex"> +<cd:command name="couplepage" file="page-ini.tex">    <cd:sequence> -    <cd:string value="koppelpagina"/> +    <cd:string value="couplepage"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7140,9 +7110,9 @@    </cd:arguments>  </cd:command> -<cd:command name="positioneer" file="page-lyr.tex"> +<cd:command name="position" file="page-lyr.tex">    <cd:sequence> -    <cd:string value="positioneer"/> +    <cd:string value="position"/>    </cd:sequence>    <cd:arguments>      <cd:position list="yes"/> @@ -7150,9 +7120,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelrastersin" file="core-rul.tex"> +<cd:command name="setupscreens" file="core-rul.tex">    <cd:sequence> -    <cd:string value="stelrastersin"/> +    <cd:string value="setupscreens"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -7174,9 +7144,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelachtergrondenin" file="page-bck.tex"> +<cd:command name="setupbackgrounds" file="page-bck.tex">    <cd:sequence> -    <cd:string value="stelachtergrondenin"/> +    <cd:string value="setupbackgrounds"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -7203,7 +7173,7 @@          <cd:constant type="stop"/>          <cd:variable type="cd:repeat"/>        </cd:parameter> -      <cd:inherit name="stelomlijndin"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -7219,9 +7189,9 @@    </cd:arguments>  </cd:command> -<cd:command name="haalbuffer"> +<cd:command name="getbuffer">    <cd:sequence> -    <cd:string value="haalbuffer"/> +    <cd:string value="getbuffer"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -7241,9 +7211,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definieerbuffer" file="core-buf.tex"> +<cd:command name="definebuffer" file="core-buf.tex">    <cd:sequence> -    <cd:string value="definieerbuffer"/> +    <cd:string value="definebuffer"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7252,9 +7222,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelbufferin" file="core-buf.tex"> +<cd:command name="setupbuffer" file="core-buf.tex">    <cd:sequence> -    <cd:string value="stelbufferin"/> +    <cd:string value="setupbuffer"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -7274,9 +7244,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definieerblok" file="core-buf.tex"> +<cd:command name="defineblock" file="core-buf.tex">    <cd:sequence> -    <cd:string value="definieerblok"/> +    <cd:string value="defineblock"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7285,15 +7255,15 @@    </cd:arguments>  </cd:command> -<cd:command name="geenblokkenmeer" file="core-buf.tex"> +<cd:command name="nomoreblocks" file="core-buf.tex">    <cd:sequence> -    <cd:string value="geenblokkenmeer"/> +    <cd:string value="nomoreblocks"/>    </cd:sequence>  </cd:command> -<cd:command name="verbergblokken" file="core-buf.tex"> +<cd:command name="hideblocks" file="core-buf.tex">    <cd:sequence> -    <cd:string value="verbergblokken"/> +    <cd:string value="hideblocks"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7305,9 +7275,9 @@    </cd:arguments>  </cd:command> -<cd:command name="handhaafblokken" file="core-buf.tex"> +<cd:command name="keepblocks" file="core-buf.tex">    <cd:sequence> -    <cd:string value="handhaafblokken"/> +    <cd:string value="keepblocks"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7320,9 +7290,9 @@    </cd:arguments>  </cd:command> -<cd:command name="gebruikblokken" file="core-buf.tex"> +<cd:command name="useblocks" file="core-buf.tex">    <cd:sequence> -    <cd:string value="gebruikblokken"/> +    <cd:string value="useblocks"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7334,9 +7304,9 @@    </cd:arguments>  </cd:command> -<cd:command name="verwerkblokken" file="core-buf.tex"> +<cd:command name="processblocks" file="core-buf.tex">    <cd:sequence> -    <cd:string value="verwerkblokken"/> +    <cd:string value="processblocks"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7348,9 +7318,9 @@    </cd:arguments>  </cd:command> -<cd:command name="passeerblokken" file="core-buf.tex"> +<cd:command name="bypassblocks" file="core-buf.tex">    <cd:sequence> -    <cd:string value="passeerblokken"/> +    <cd:string value="bypassblocks"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7362,9 +7332,9 @@    </cd:arguments>  </cd:command> -<cd:command name="forceerblokken"> +<cd:command name="forceblocks">    <cd:sequence> -    <cd:string value="forceerblokken"/> +    <cd:string value="forceblocks"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7376,9 +7346,9 @@    </cd:arguments>  </cd:command> -<cd:command name="selecteerblokken" file="core-buf.tex"> +<cd:command name="selectblocks" file="core-buf.tex">    <cd:sequence> -    <cd:string value="selecteerblokken"/> +    <cd:string value="selectblocks"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7396,9 +7366,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelblokin" file="core-buf.tex"> +<cd:command name="setupblock" file="core-buf.tex">    <cd:sequence> -    <cd:string value="stelblokin"/> +    <cd:string value="setupblock"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7435,22 +7405,20 @@    <cd:sequence>      <cd:variable value="formule"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="wiskunde" file="supp-mat.tex"> +<cd:command name="mathematics" file="supp-mat.tex">    <cd:sequence> -    <cd:string value="wiskunde"/> +    <cd:string value="mathematics"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="plaatsformule" file="core-mat.tex"> +<cd:command name="placeformula" file="core-mat.tex">    <cd:sequence> -    <cd:string value="plaatsformule"/> +    <cd:string value="placeformula"/>    </cd:sequence>    <cd:arguments>      <cd:reference optional="yes" list="yes"/> @@ -7459,9 +7427,9 @@    </cd:arguments>  </cd:command> -<cd:command name="plaatssubformule" file="core-mat.tex"> +<cd:command name="placesubformula" file="core-mat.tex">    <cd:sequence> -    <cd:string value="plaatssubformule"/> +    <cd:string value="placesubformula"/>    </cd:sequence>    <cd:arguments>      <cd:reference optional="yes" list="yes"/> @@ -7470,7 +7438,7 @@    </cd:arguments>  </cd:command> -<cd:command name="plaatsplaatsblok" generated="yes" file="page-flt.tex"> +<cd:command name="placefloat" generated="yes" file="page-flt.tex">    <cd:sequence>      <cd:string value="plaats"/>      <cd:variable value="float"/> @@ -7542,9 +7510,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definieerplaatsblok" file="page-flt.tex"> +<cd:command name="definefloat" file="page-flt.tex">    <cd:sequence> -    <cd:string value="definieerplaatsblok"/> +    <cd:string value="definefloat"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7556,9 +7524,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelplaatsblokin" file="page-flt.tex"> +<cd:command name="setupfloat" file="page-flt.tex">    <cd:sequence> -    <cd:string value="stelplaatsblokin"/> +    <cd:string value="setupfloat"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7597,7 +7565,7 @@          <cd:constant type="midden"/>          <cd:constant type="rechts"/>        </cd:parameter> -      <cd:inherit name="stelomlijndin"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -7628,8 +7596,6 @@      <cd:string value="placelistof"/>      <cd:variable value="floats"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="completelistoffloats" generated="yes"> @@ -7637,13 +7603,11 @@      <cd:string value="completelistof"/>      <cd:variable value="floats"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="kenmerk" file="core-mis.tex"> +<cd:command name="referral" file="core-mis.tex">    <cd:sequence> -    <cd:string value="kenmerk"/> +    <cd:string value="referral"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -7669,9 +7633,9 @@    </cd:arguments>  </cd:command> -<cd:command name="selecteerpapier"> +<cd:command name="selectpaper">    <cd:sequence> -    <cd:string value="selecteerpapier"/> +    <cd:string value="selectpaper"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -7683,9 +7647,9 @@    </cd:arguments>  </cd:command> -<cd:command name="koppelpapier"> +<cd:command name="couplepaper">    <cd:sequence> -    <cd:string value="koppelpapier"/> +    <cd:string value="couplepaper"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7705,9 +7669,9 @@    </cd:arguments>  </cd:command> -<cd:command name="breuk" file="core-mis.tex"> +<cd:command name="fraction" file="core-mis.tex">    <cd:sequence> -    <cd:string value="breuk"/> +    <cd:string value="fraction"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -7715,9 +7679,9 @@    </cd:arguments>  </cd:command> -<cd:command name="punten" file="core-mis.tex"> +<cd:command name="periods" file="core-mis.tex">    <cd:sequence> -    <cd:string value="punten"/> +    <cd:string value="periods"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7726,30 +7690,21 @@    </cd:arguments>  </cd:command> -<cd:command name="woonplaats"> -  <cd:sequence> -    <cd:string value="woonplaats"/> -  </cd:sequence> -  <cd:arguments> -    <cd:content/> -  </cd:arguments> -</cd:command> -  <cd:command name="items">    <cd:sequence>      <cd:string value="items"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelitemsin"/> +      <cd:inherit name="setupitems"/>      </cd:assignments>      <cd:content list="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="stelitemsin" file="core-mis.tex"> +<cd:command name="setupitems" file="core-mis.tex">    <cd:sequence> -    <cd:string value="stelitemsin"/> +    <cd:string value="setupitems"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -7796,9 +7751,9 @@    </cd:arguments>  </cd:command> -<cd:command name="citaat" type="environment" file="core-mis.tex"> +<cd:command name="quotation" type="environment" file="core-mis.tex">    <cd:sequence> -    <cd:string value="citaat"/> +    <cd:string value="quotation"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7809,27 +7764,27 @@    </cd:arguments>  </cd:command> -<cd:command name="citaat" file="core-mis.tex"> +<cd:command name="quotation" file="core-mis.tex">    <cd:sequence> -    <cd:string value="citaat"/> +    <cd:string value="quotation"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="citeer" file="core-mis.tex"> +<cd:command name="quote" file="core-mis.tex">    <cd:sequence> -    <cd:string value="citeer"/> +    <cd:string value="quote"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="stelciterenin" file="core-mis.tex"> +<cd:command name="setupquote" file="core-mis.tex">    <cd:sequence> -    <cd:string value="stelciterenin"/> +    <cd:string value="setupquote"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -7860,9 +7815,9 @@    </cd:arguments>  </cd:command> -<cd:command name="toevoegen"> +<cd:command name="adding">    <cd:sequence> -    <cd:string value="toevoegen"/> +    <cd:string value="adding"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7873,9 +7828,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definieeralineas" file="core-mis.tex"> +<cd:command name="defineparagraphs" file="core-mis.tex">    <cd:sequence> -    <cd:string value="definieeralineas"/> +    <cd:string value="defineparagraphs"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7931,13 +7886,11 @@    <cd:sequence>      <cd:variable value="alinea"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="stelalineasin" file="core-mis.tex"> +<cd:command name="setupparagraphs" file="core-mis.tex">    <cd:sequence> -    <cd:string value="stelalineasin"/> +    <cd:string value="setupparagraphs"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -8000,9 +7953,9 @@    </cd:arguments>  </cd:command> -<cd:command name="steltabin" file="core-mis.tex"> +<cd:command name="setuptab" file="core-mis.tex">    <cd:sequence> -    <cd:string value="steltabin"/> +    <cd:string value="setuptab"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -8062,9 +8015,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definieertabulatie" file="core-tbl.tex"> +<cd:command name="definetabulate" file="core-tbl.tex">    <cd:sequence> -    <cd:string value="definieertabulatie"/> +    <cd:string value="definetabulate"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -8088,14 +8041,14 @@        <cd:constant type="cd:text"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="gebruikexternfiguur"/> +      <cd:inherit name="useexternalfigure"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="steltabulatiein" file="core-tbl.tex"> +<cd:command name="setuptabulate" file="core-tbl.tex">    <cd:sequence> -    <cd:string value="steltabulatiein"/> +    <cd:string value="setuptabulate"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -8162,9 +8115,9 @@    </cd:arguments>  </cd:command> -<cd:command name="steltabellenin" file="core-tab.tex"> +<cd:command name="setuptables" file="core-tab.tex">    <cd:sequence> -    <cd:string value="steltabellenin"/> +    <cd:string value="setuptables"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -8269,9 +8222,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definieertabelvorm" file="core-tab.tex"> +<cd:command name="definetabletemplate" file="core-tab.tex">    <cd:sequence> -    <cd:string value="definieertabelvorm"/> +    <cd:string value="definetabletemplate"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -8289,9 +8242,9 @@    </cd:arguments>  </cd:command> -<cd:command name="gebruikexternefiles" file="core-mis.tex"> +<cd:command name="useexternalfiles" file="core-mis.tex">    <cd:sequence> -    <cd:string value="gebruikexternefiles"/> +    <cd:string value="useexternalfiles"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -8312,9 +8265,9 @@    </cd:arguments>  </cd:command> -<cd:command name="gebruikexternefile" file="core-mis.tex"> +<cd:command name="useexternalfile" file="core-mis.tex">    <cd:sequence> -    <cd:string value="gebruikexternefile"/> +    <cd:string value="useexternalfile"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -8338,9 +8291,9 @@    </cd:arguments>  </cd:command> -<cd:command name="gebruikexternfiguur" file="core-fig.tex"> +<cd:command name="useexternalfigure" file="core-fig.tex">    <cd:sequence> -    <cd:string value="gebruikexternfiguur"/> +    <cd:string value="useexternalfigure"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -8423,23 +8376,23 @@    </cd:arguments>  </cd:command> -<cd:command name="externfiguur" file="core-fig.tex"> +<cd:command name="externalfigure" file="core-fig.tex">    <cd:sequence> -    <cd:string value="externfiguur"/> +    <cd:string value="externalfigure"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:file"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="gebruikexternfiguur"/> +      <cd:inherit name="useexternalfigure"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stelexternefigurenin" file="core-fig.tex"> +<cd:command name="setupexternalfigures" file="core-fig.tex">    <cd:sequence> -    <cd:string value="stelexternefigurenin"/> +    <cd:string value="setupexternalfigures"/>    </cd:sequence>    <cd:arguments>      <cd:assignments> @@ -8481,9 +8434,9 @@    </cd:arguments>  </cd:command> -<cd:command name="toonexternefiguren" file="core-fig.tex"> +<cd:command name="showexternalfigures" file="core-fig.tex">    <cd:sequence> -    <cd:string value="toonexternefiguren"/> +    <cd:string value="showexternalfigures"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> @@ -8496,9 +8449,9 @@    </cd:arguments>  </cd:command> -<cd:command name="gebruikexterngeluidsfragment" file="core-fig.tex"> +<cd:command name="useexternalsoundtrack" file="core-fig.tex">    <cd:sequence> -    <cd:string value="gebruikexterngeluidsfragment"/> +    <cd:string value="useexternalsoundtrack"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -8535,9 +8488,9 @@    </cd:arguments>  </cd:command> -<cd:command name="geg" type="environment"> +<cd:command name="fact" type="environment">    <cd:sequence> -    <cd:string value="geg"/> +    <cd:string value="fact"/>    </cd:sequence>    <cd:arguments>      <cd:tex command="fact"/> @@ -8548,21 +8501,21 @@    </cd:arguments>  </cd:command> -<cd:command name="roteer" file="core-mis.tex"> +<cd:command name="rotate" file="core-mis.tex">    <cd:sequence> -    <cd:string value="roteer"/> +    <cd:string value="rotate"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelroterenin"/> +      <cd:inherit name="setuprotate"/>      </cd:assignments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="stelroterenin" file="core-mis.tex"> +<cd:command name="setuprotate" file="core-mis.tex">    <cd:sequence> -    <cd:string value="stelroterenin"/> +    <cd:string value="setuprotate"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -8576,23 +8529,23 @@          <cd:constant type="ruim"/>          <cd:constant type="diepte"/>        </cd:parameter> -      <cd:inherit name="stelomlijndin"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="spiegel" file="core-mis.tex"> +<cd:command name="mirror" file="core-mis.tex">    <cd:sequence> -    <cd:string value="spiegel"/> +    <cd:string value="mirror"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="schaal" file="core-mis.tex"> +<cd:command name="scale" file="core-mis.tex">    <cd:sequence> -    <cd:string value="schaal"/> +    <cd:string value="scale"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> @@ -8607,9 +8560,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelcombinatiesin" file="core-mis.tex"> +<cd:command name="setupcombinations" file="core-mis.tex">    <cd:sequence> -    <cd:string value="stelcombinatiesin"/> +    <cd:string value="setupcombinations"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -8674,9 +8627,9 @@    </cd:arguments>  </cd:command> -<cd:command name="plaatsnaastelkaar" file="core-mis.tex"> +<cd:command name="placesidebyside" file="core-mis.tex">    <cd:sequence> -    <cd:string value="plaatsnaastelkaar"/> +    <cd:string value="placesidebyside"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -8684,9 +8637,9 @@    </cd:arguments>  </cd:command> -<cd:command name="plaatsonderelkaar" file="core-mis.tex"> +<cd:command name="placeontopofeachother" file="core-mis.tex">    <cd:sequence> -    <cd:string value="plaatsonderelkaar"/> +    <cd:string value="placeontopofeachother"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -8715,9 +8668,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelinteractieschermin" file="core-int.tex"> +<cd:command name="setupinteractionscreen" file="core-int.tex">    <cd:sequence> -    <cd:string value="stelinteractieschermin"/> +    <cd:string value="setupinteractionscreen"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" list="yes"> @@ -8757,17 +8710,15 @@    </cd:arguments>  </cd:command> -<cd:command name="scherm" file="core-int.tex"> +<cd:command name="screen" file="core-int.tex">    <cd:sequence> -    <cd:string value="scherm"/> +    <cd:string value="screen"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="stelpaginaovergangenin" file="core-int.tex"> +<cd:command name="setuppagetransitions" file="core-int.tex">    <cd:sequence> -    <cd:string value="stelpaginaovergangenin"/> +    <cd:string value="setuppagetransitions"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -8777,9 +8728,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelinteractiein" file="core-nav.tex"> +<cd:command name="setupinteraction" file="core-nav.tex">    <cd:sequence> -    <cd:string value="stelinteractiein"/> +    <cd:string value="setupinteraction"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" list="yes"> @@ -8871,9 +8822,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definieerinteractiemenu" file="core-int.tex"> +<cd:command name="defineinteractionmenu" file="core-int.tex">    <cd:sequence> -    <cd:string value="definieerinteractiemenu"/> +    <cd:string value="defineinteractionmenu"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive" list="yes"> @@ -8952,14 +8903,14 @@          <cd:constant type="ja"/>          <cd:constant type="nee"/>        </cd:parameter> -      <cd:inherit name="stelomlijndin"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="definieerinteractiemenu" file="core-int.tex"> +<cd:command name="defineinteractionmenu" file="core-int.tex">    <cd:sequence> -    <cd:string value="definieerinteractiemenu"/> +    <cd:string value="defineinteractionmenu"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -8977,14 +8928,14 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelinteractiemenuin"/> +      <cd:inherit name="setupinteractionmenu"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="interactiemenu" type="environment"> +<cd:command name="interactionmenu" type="environment">    <cd:sequence> -    <cd:string value="interactiemenu"/> +    <cd:string value="interactionmenu"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -8993,9 +8944,9 @@    </cd:arguments>  </cd:command> -<cd:command name="blokkeerinteractiemenu" file="core-int.tex"> +<cd:command name="disableinteractionmenu" file="core-int.tex">    <cd:sequence> -    <cd:string value="blokkeerinteractiemenu"/> +    <cd:string value="disableinteractionmenu"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -9009,9 +8960,9 @@    </cd:arguments>  </cd:command> -<cd:command name="gebruikexterndocument" file="core-ref.tex"> +<cd:command name="useexternaldocument" file="core-ref.tex">    <cd:sequence> -    <cd:string value="gebruikexterndocument"/> +    <cd:string value="useexternaldocument"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -9026,9 +8977,9 @@    </cd:arguments>  </cd:command> -<cd:command name="gebruikURL" file="core-ref.tex"> +<cd:command name="useURL" file="core-ref.tex">    <cd:sequence> -    <cd:string value="gebruikURL"/> +    <cd:string value="useURL"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -9046,9 +8997,9 @@    </cd:arguments>  </cd:command> -<cd:command name="koppeldocument" file="core-ref.tex"> +<cd:command name="coupledocument" file="core-ref.tex">    <cd:sequence> -    <cd:string value="koppeldocument"/> +    <cd:string value="coupledocument"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -9063,33 +9014,33 @@    </cd:arguments>  </cd:command> -<cd:command name="uit" file="core-ref.tex"> +<cd:command name="from" file="core-ref.tex">    <cd:sequence> -    <cd:string value="uit"/> +    <cd:string value="from"/>    </cd:sequence>    <cd:arguments>      <cd:reference interactive="exclusive"/>    </cd:arguments>  </cd:command> -<cd:command name="interactiebalk"> +<cd:command name="interactionbar">    <cd:sequence> -    <cd:string value="interactiebalk"/> +    <cd:string value="interactionbar"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" list="yes"> -      <cd:inherit name="stelinteractiebalkin"/> +      <cd:inherit name="setupinteractionbar"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="interactiebuttons" file="core-ref.tex"> +<cd:command name="interactionbuttons" file="core-ref.tex">    <cd:sequence> -    <cd:string value="interactiebuttons"/> +    <cd:string value="interactionbuttons"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" optional="yes" list="yes"> -      <cd:inherit name="stelinteractiebalkin"/> +      <cd:inherit name="setupinteractionbar"/>      </cd:assignments>      <cd:keywords list="yes">        <cd:constant type="cd:name"/> @@ -9097,9 +9048,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelinteractiebalkin" file="core-int.tex"> +<cd:command name="setupinteractionbar" file="core-int.tex">    <cd:sequence> -    <cd:string value="stelinteractiebalkin"/> +    <cd:string value="setupinteractionbar"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" list="yes"> @@ -9142,30 +9093,26 @@          <cd:constant type="middel"/>          <cd:constant type="groot"/>        </cd:parameter> -      <cd:inherit name="stelomlijndin"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="synchroniseer" file="core-int.tex"> +<cd:command name="synchronize" file="core-int.tex">    <cd:sequence> -    <cd:string value="synchroniseer"/> +    <cd:string value="synchronize"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="synchronization" type="environment">    <cd:sequence>      <cd:string value="synchronization"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="stelsynchronisatiebalkin" file="core-int.tex"> +<cd:command name="setupsynchronizationbar" file="core-int.tex">    <cd:sequence> -    <cd:string value="stelsynchronisatiebalkin"/> +    <cd:string value="setupsynchronizationbar"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" list="yes"> @@ -9194,14 +9141,14 @@        <cd:parameter name="kleur">          <cd:constant type="cd:name"/>        </cd:parameter> -      <cd:inherit name="stelomlijndin"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="synchronisatiebalk" file="core-int.tex"> +<cd:command name="synchronizationbar" file="core-int.tex">    <cd:sequence> -    <cd:string value="synchronisatiebalk"/> +    <cd:string value="synchronizationbar"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -9212,14 +9159,14 @@          <cd:constant type="pagina"/>          <cd:constant type="lokaal"/>        </cd:parameter> -      <cd:inherit name="stelsynchronisatiebalkin"/> +      <cd:inherit name="setupsynchronizationbar"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stelsynchronisatiein" file="core-int.tex"> +<cd:command name="setupsynchronization" file="core-int.tex">    <cd:sequence> -    <cd:string value="stelsynchronisatiein"/> +    <cd:string value="setupsynchronization"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" list="yes"> @@ -9231,9 +9178,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definieerprofiel" file="core-int.tex"> +<cd:command name="defineprofile" file="core-int.tex">    <cd:sequence> -    <cd:string value="definieerprofiel"/> +    <cd:string value="defineprofile"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive" list="yes"> @@ -9245,9 +9192,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelprofielenin" file="core-int.tex"> +<cd:command name="setupprofiles" file="core-int.tex">    <cd:sequence> -    <cd:string value="stelprofielenin"/> +    <cd:string value="setupprofiles"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" list="yes"> @@ -9269,9 +9216,9 @@    </cd:arguments>  </cd:command> -<cd:command name="volgprofiel" file="core-int.tex"> +<cd:command name="followprofile" file="core-int.tex">    <cd:sequence> -    <cd:string value="volgprofiel"/> +    <cd:string value="followprofile"/>    </cd:sequence>    <cd:arguments>      <cd:content interactive="exclusive"/> @@ -9281,9 +9228,9 @@    </cd:arguments>  </cd:command> -<cd:command name="plaatsbookmarks" file="core-int.tex"> +<cd:command name="placebookmarks" file="core-int.tex">    <cd:sequence> -    <cd:string value="plaatsbookmarks"/> +    <cd:string value="placebookmarks"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -9306,9 +9253,9 @@    </cd:arguments>  </cd:command> -<cd:command name="versie" type="environment"> +<cd:command name="version" type="environment">    <cd:sequence> -    <cd:string value="versie"/> +    <cd:string value="version"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive" list="yes"> @@ -9317,9 +9264,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelversiesin" file="core-int.tex"> +<cd:command name="setupversions" file="core-int.tex">    <cd:sequence> -    <cd:string value="stelversiesin"/> +    <cd:string value="setupversions"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -9340,23 +9287,21 @@    </cd:arguments>  </cd:command> -<cd:command name="markeerversie" file="core-int.tex"> +<cd:command name="markversion" file="core-int.tex">    <cd:sequence> -    <cd:string value="markeerversie"/> +    <cd:string value="markversion"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="selecteerversie" file="core-int.tex"> +<cd:command name="selectversion" file="core-int.tex">    <cd:sequence> -    <cd:string value="selecteerversie"/> +    <cd:string value="selectversion"/>    </cd:sequence>  </cd:command> -<cd:command name="definieerversie" file="core-int.tex"> +<cd:command name="defineversion" file="core-int.tex">    <cd:sequence> -    <cd:string value="definieerversie"/> +    <cd:string value="defineversion"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9368,9 +9313,9 @@    </cd:arguments>  </cd:command> -<cd:command name="volgversie" file="core-int.tex"> +<cd:command name="followversion" file="core-int.tex">    <cd:sequence> -    <cd:string value="volgversie"/> +    <cd:string value="followversion"/>    </cd:sequence>    <cd:arguments>      <cd:content interactive="exclusive"/> @@ -9380,9 +9325,9 @@    </cd:arguments>  </cd:command> -<cd:command name="volgprofielversie" file="core-int.tex"> +<cd:command name="followprofileversion" file="core-int.tex">    <cd:sequence> -    <cd:string value="volgprofielversie"/> +    <cd:string value="followprofileversion"/>    </cd:sequence>    <cd:arguments>      <cd:content interactive="exclusive"/> @@ -9395,9 +9340,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definieerprogramma" file="core-ref.tex"> +<cd:command name="defineprogram" file="core-ref.tex">    <cd:sequence> -    <cd:string value="definieerprogramma"/> +    <cd:string value="defineprogram"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -9412,9 +9357,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelprogrammasin" file="core-ref.tex"> +<cd:command name="setupprograms" file="core-ref.tex">    <cd:sequence> -    <cd:string value="stelprogrammasin"/> +    <cd:string value="setupprograms"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" list="yes"> @@ -9425,9 +9370,9 @@    </cd:arguments>  </cd:command> -<cd:command name="programma" file="core-ref.tex"> +<cd:command name="program" file="core-ref.tex">    <cd:sequence> -    <cd:string value="programma"/> +    <cd:string value="program"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -9465,9 +9410,9 @@  <!-- remark skipped --> -<cd:command name="naar" file="core-ref.tex"> +<cd:command name="goto" file="core-ref.tex">    <cd:sequence> -    <cd:string value="naar"/> +    <cd:string value="goto"/>    </cd:sequence>    <cd:arguments>      <cd:content interactive="exclusive"/> @@ -9476,9 +9421,9 @@    </cd:arguments>  </cd:command> -<cd:command name="naarbox" file="core-ref.tex"> +<cd:command name="gotobox" file="core-ref.tex">    <cd:sequence> -    <cd:string value="naarbox"/> +    <cd:string value="gotobox"/>    </cd:sequence>    <cd:arguments>      <cd:content interactive="exclusive"/> @@ -9492,16 +9437,16 @@    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" optional="yes" list="yes"> -      <cd:inherit name="stelbuttonsin"/> +      <cd:inherit name="setupbuttons"/>      </cd:assignments>      <cd:content/>      <cd:reference list="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="stelbuttonsin" file="core-ref.tex"> +<cd:command name="setupbuttons" file="core-ref.tex">    <cd:sequence> -    <cd:string value="stelbuttonsin"/> +    <cd:string value="setupbuttons"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -9509,16 +9454,16 @@          <cd:constant type="start"/>          <cd:constant type="stop"/>        </cd:parameter> -      <cd:inherit name="stelomlijndin"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command>  <!-- menubutton skipped --> -<cd:command name="stelcommentaarin" file="core-int.tex"> +<cd:command name="setupcomment" file="core-int.tex">    <cd:sequence> -    <cd:string value="stelcommentaarin"/> +    <cd:string value="setupcomment"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -9566,38 +9511,38 @@    </cd:arguments>  </cd:command> -<cd:command name="commentaar" type="environment"> +<cd:command name="comment" type="environment">    <cd:sequence> -    <cd:string value="commentaar"/> +    <cd:string value="comment"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes">        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelcommentaarin"/> +      <cd:inherit name="setupcomment"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="commentaar"> +<cd:command name="comment">    <cd:sequence> -    <cd:string value="commentaar"/> +    <cd:string value="comment"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes">        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelcommentaarin"/> +      <cd:inherit name="setupcomment"/>      </cd:assignments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="definieerveld" file="core-fld.tex"> +<cd:command name="definefield" file="core-fld.tex">    <cd:sequence> -    <cd:string value="definieerveld"/> +    <cd:string value="definefield"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9618,9 +9563,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definieersubveld" file="core-fld.tex"> +<cd:command name="definesubfield" file="core-fld.tex">    <cd:sequence> -    <cd:string value="definieersubveld"/> +    <cd:string value="definesubfield"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9635,9 +9580,9 @@    </cd:arguments>  </cd:command> -<cd:command name="copieerveld" file="core-fld.tex"> +<cd:command name="copyfield" file="core-fld.tex">    <cd:sequence> -    <cd:string value="copieerveld"/> +    <cd:string value="copyfield"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9649,9 +9594,9 @@    </cd:arguments>  </cd:command> -<cd:command name="kloonveld" file="core-fld.tex"> +<cd:command name="clonefield" file="core-fld.tex">    <cd:sequence> -    <cd:string value="kloonveld"/> +    <cd:string value="clonefield"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9669,9 +9614,9 @@    </cd:arguments>  </cd:command> -<cd:command name="veld" file="core-fld.tex"> +<cd:command name="field" file="core-fld.tex">    <cd:sequence> -    <cd:string value="veld"/> +    <cd:string value="field"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9680,9 +9625,9 @@    </cd:arguments>  </cd:command> -<cd:command name="passendveld" file="core-fld.tex"> +<cd:command name="fitfield" file="core-fld.tex">    <cd:sequence> -    <cd:string value="passendveld"/> +    <cd:string value="fitfield"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9691,9 +9636,9 @@    </cd:arguments>  </cd:command> -<cd:command name="invulveld" file="core-fld.tex"> +<cd:command name="fillinfield" file="core-fld.tex">    <cd:sequence> -    <cd:string value="invulveld"/> +    <cd:string value="fillinfield"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -9703,9 +9648,9 @@    </cd:arguments>  </cd:command> -<cd:command name="suggestie" file="core-fld.tex"> +<cd:command name="tooltip" file="core-fld.tex">    <cd:sequence> -    <cd:string value="suggestie"/> +    <cd:string value="tooltip"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -9718,9 +9663,9 @@    </cd:arguments>  </cd:command> -<cd:command name="toonvelden" file="core-fld.tex"> +<cd:command name="showfields" file="core-fld.tex">    <cd:sequence> -    <cd:string value="toonvelden"/> +    <cd:string value="showfields"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -9729,15 +9674,15 @@    </cd:arguments>  </cd:command> -<cd:command name="registreervelden" file="core-fld.tex"> +<cd:command name="logfields" file="core-fld.tex">    <cd:sequence> -    <cd:string value="registreervelden"/> +    <cd:string value="logfields"/>    </cd:sequence>  </cd:command> -<cd:command name="stelveldin" file="core-fld.tex"> +<cd:command name="setupfield" file="core-fld.tex">    <cd:sequence> -    <cd:string value="stelveldin"/> +    <cd:string value="setupfield"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9750,7 +9695,7 @@        <cd:constant type="kader"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="stelveldenin"/> +      <cd:inherit name="setupfields"/>      </cd:assignments>      <cd:assignments list="yes">      </cd:assignments> @@ -9759,9 +9704,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelveldenin" file="core-fld.tex"> +<cd:command name="setupfields" file="core-fld.tex">    <cd:sequence> -    <cd:string value="stelveldenin"/> +    <cd:string value="setupfields"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -9847,7 +9792,7 @@        <cd:parameter name="veldachtergrondkleur">          <cd:constant type="cd:name"/>        </cd:parameter> -      <cd:inherit name="omlijnd"/> +      <cd:inherit name="framed"/>      </cd:assignments>      <cd:assignments list="yes">      </cd:assignments> @@ -9856,9 +9801,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelformulierenin" file="core-fld.tex"> +<cd:command name="setupforms" file="core-fld.tex">    <cd:sequence> -    <cd:string value="stelformulierenin"/> +    <cd:string value="setupforms"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -9870,9 +9815,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definieerveldstapel" file="core-fld.tex"> +<cd:command name="definefieldstack" file="core-fld.tex">    <cd:sequence> -    <cd:string value="definieerveldstapel"/> +    <cd:string value="definefieldstack"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9882,14 +9827,14 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="stelveldenin"/> +      <cd:inherit name="setupfields"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="veldstapel" file="core-fld.tex"> +<cd:command name="fieldstack" file="core-fld.tex">    <cd:sequence> -    <cd:string value="veldstapel"/> +    <cd:string value="fieldstack"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9899,7 +9844,7 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelveldenin"/> +      <cd:inherit name="setupfields"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -9910,15 +9855,15 @@    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelclipin"/> +      <cd:inherit name="setupclipping"/>      </cd:assignments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="stelclipin" file="core-fig.tex"> +<cd:command name="setupclipping" file="core-fig.tex">    <cd:sequence> -    <cd:string value="stelclipin"/> +    <cd:string value="setupclipping"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -9953,9 +9898,9 @@    </cd:arguments>  </cd:command> -<cd:command name="plaatslegenda"> +<cd:command name="placelegend">    <cd:sequence> -    <cd:string value="plaatslegenda"/> +    <cd:string value="placelegend"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -9963,9 +9908,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stellegendain"> +<cd:command name="setuplegend">    <cd:sequence> -    <cd:string value="stellegendain"/> +    <cd:string value="setuplegend"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -9999,23 +9944,23 @@    </cd:arguments>  </cd:command> -<cd:command name="definieerlijn"> +<cd:command name="definerule">    <cd:sequence> -    <cd:string value="definieerlijn"/> +    <cd:string value="definerule"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="stellijnin"/> +      <cd:inherit name="setuprule"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="plaatslijn"> +<cd:command name="placerule">    <cd:sequence> -    <cd:string value="plaatslijn"/> +    <cd:string value="placerule"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -10024,9 +9969,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stellijnin"> +<cd:command name="setuprule">    <cd:sequence> -    <cd:string value="stellijnin"/> +    <cd:string value="setuprule"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -10055,13 +10000,13 @@    </cd:arguments>  </cd:command> -<cd:command name="definieertekstvariabele"> +<cd:command name="definetextvariable">    <cd:sequence> -    <cd:string value="definieertekstvariabele"/> +    <cd:string value="definetextvariable"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> -      <cd:inherit name="steltekstvariabelein"/> +      <cd:inherit name="setuptextvariable"/>      </cd:keywords>      <cd:keywords optional="yes">      </cd:keywords> @@ -10070,9 +10015,9 @@    </cd:arguments>  </cd:command> -<cd:command name="steltekstvariabelein"> +<cd:command name="setuptextvariable">    <cd:sequence> -    <cd:string value="steltekstvariabelein"/> +    <cd:string value="setuptextvariable"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -10101,9 +10046,9 @@    </cd:arguments>  </cd:command> -<cd:command name="kentekstvariabeletoe"> +<cd:command name="settextvariable">    <cd:sequence> -    <cd:string value="kentekstvariabeletoe"/> +    <cd:string value="settextvariable"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -10115,9 +10060,9 @@    </cd:arguments>  </cd:command> -<cd:command name="plaatstekstvariabele"> +<cd:command name="placetextvariable">    <cd:sequence> -    <cd:string value="plaatstekstvariabele"/> +    <cd:string value="placetextvariable"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -10126,9 +10071,9 @@    </cd:arguments>  </cd:command> -<cd:command name="tekstvariabele"> +<cd:command name="textvariable">    <cd:sequence> -    <cd:string value="tekstvariabele"/> +    <cd:string value="textvariable"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -10149,7 +10094,7 @@        <cd:constant type="cd:file"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelinterliniein"/> +      <cd:inherit name="setupinterlinespace"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -10165,37 +10110,37 @@    </cd:arguments>  </cd:command> -<cd:command name="definieertekstpositie"> +<cd:command name="definetextposition">    <cd:sequence> -    <cd:string value="definieertekstpositie"/> +    <cd:string value="definetextposition"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="stelpositionerenin"/> +      <cd:inherit name="setuppositioning"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="steltekstpositiein"> +<cd:command name="setuptextposition">    <cd:sequence> -    <cd:string value="steltekstpositiein"/> +    <cd:string value="setuptextposition"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="stelpositionerenin"/> +      <cd:inherit name="setuppositioning"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="positioneertekst"> +<cd:command name="positiontext">    <cd:sequence> -    <cd:string value="positioneertekst"/> +    <cd:string value="positiontext"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -10205,9 +10150,9 @@    </cd:arguments>  </cd:command> -<cd:command name="stelstrutin" file="core-spa.tex"> +<cd:command name="setupstrut" file="core-spa.tex">    <cd:sequence> -    <cd:string value="stelstrutin"/> +    <cd:string value="setupstrut"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> diff --git a/tex/context/interface/cont-ro.xml b/tex/context/interface/cont-ro.xml index 416b6b962..f57bb921d 100644 --- a/tex/context/interface/cont-ro.xml +++ b/tex/context/interface/cont-ro.xml @@ -1,10 +1,10 @@  <?xml version="1.0"?> -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2004.11.17"> -<cd:command name="instalarelimba" file="lang-ini.tex"> +<cd:command name="installlanguage" file="lang-ini.tex">    <cd:sequence> -    <cd:string value="instalarelimba"/> +    <cd:string value="installlanguage"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -56,9 +56,9 @@    </cd:arguments>  </cd:command> -<cd:command name="setarelimba" file="lang-ini.tex"> +<cd:command name="setuplanguage" file="lang-ini.tex">    <cd:sequence> -    <cd:string value="setarelimba"/> +    <cd:string value="setuplanguage"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -72,14 +72,14 @@        <cd:constant type=".."/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="instalarelimba"/> +      <cd:inherit name="installlanguage"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="limba"> +<cd:command name="language">    <cd:sequence> -    <cd:string value="limba"/> +    <cd:string value="language"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -95,9 +95,9 @@    </cd:arguments>  </cd:command> -<cd:command name="limbaprincipala" file="lang-ini.tex"> +<cd:command name="mainlanguage" file="lang-ini.tex">    <cd:sequence> -    <cd:string value="limbaprincipala"/> +    <cd:string value="mainlanguage"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -113,9 +113,9 @@    </cd:arguments>  </cd:command> -<cd:command name="traduce" file="lang-lab.tex"> +<cd:command name="translate" file="lang-lab.tex">    <cd:sequence> -    <cd:string value="traduce"/> +    <cd:string value="translate"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -126,9 +126,9 @@    </cd:arguments>  </cd:command> -<cd:command name="folosestecodificarea" file="enco-ini.tex"> +<cd:command name="useencoding" file="enco-ini.tex">    <cd:sequence> -    <cd:string value="folosestecodificarea"/> +    <cd:string value="useencoding"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -137,9 +137,9 @@    </cd:arguments>  </cd:command> -<cd:command name="folosestespeciale" file="spec-ini.tex"> +<cd:command name="usespecials" file="spec-ini.tex">    <cd:sequence> -    <cd:string value="folosestespeciale"/> +    <cd:string value="usespecials"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -149,9 +149,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definesteoutput" file="spec-ini.tex"> +<cd:command name="defineoutput" file="spec-ini.tex">    <cd:sequence> -    <cd:string value="definesteoutput"/> +    <cd:string value="defineoutput"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -163,9 +163,9 @@    </cd:arguments>  </cd:command> -<cd:command name="setareoutput" file="spec-ini.tex"> +<cd:command name="setupoutput" file="spec-ini.tex">    <cd:sequence> -    <cd:string value="setareoutput"/> +    <cd:string value="setupoutput"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -174,9 +174,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definestemediulfonttext" file="font-ini.tex"> +<cd:command name="definebodyfontenvironment" file="font-ini.tex">    <cd:sequence> -    <cd:string value="definestemediulfonttext"/> +    <cd:string value="definebodyfontenvironment"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -211,34 +211,34 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazamediulfonttext" file="font-ini.tex"> +<cd:command name="setupbodyfontenvironment" file="font-ini.tex">    <cd:sequence> -    <cd:string value="seteazamediulfonttext"/> +    <cd:string value="setupbodyfontenvironment"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> -      <cd:inherit name="seteazafonttext"/> +      <cd:inherit name="setupbodyfont"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="seteazafonttext"/> +      <cd:inherit name="setupbodyfont"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="afiseazamediufonttext"> +<cd:command name="showbodyfontenvironment">    <cd:sequence> -    <cd:string value="afiseazamediufonttext"/> +    <cd:string value="showbodyfontenvironment"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> -      <cd:inherit name="seteazafonttext"/> +      <cd:inherit name="setupbodyfont"/>      </cd:keywords>    </cd:arguments>  </cd:command> -<cd:command name="definestefonttext" file="font-ini.tex"> +<cd:command name="definebodyfont" file="font-ini.tex">    <cd:sequence> -    <cd:string value="definestefonttext"/> +    <cd:string value="definebodyfont"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -299,20 +299,20 @@    </cd:arguments>  </cd:command> -<cd:command name="afiseazafonttext"> +<cd:command name="showbodyfont">    <cd:sequence> -    <cd:string value="afiseazafonttext"/> +    <cd:string value="showbodyfont"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> -      <cd:inherit name="seteazafonttext"/> +      <cd:inherit name="setupbodyfont"/>      </cd:keywords>    </cd:arguments>  </cd:command> -<cd:command name="seteazafonttext"> +<cd:command name="setupbodyfont">    <cd:sequence> -    <cd:string value="seteazafonttext"/> +    <cd:string value="setupbodyfont"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -335,9 +335,9 @@    </cd:arguments>  </cd:command> -<cd:command name="trecilafonttext" file="font-ini.tex"> +<cd:command name="switchtobodyfont" file="font-ini.tex">    <cd:sequence> -    <cd:string value="trecilafonttext"/> +    <cd:string value="switchtobodyfont"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -351,9 +351,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definestefont" file="font-ini.tex"> +<cd:command name="definefont" file="font-ini.tex">    <cd:sequence> -    <cd:string value="definestefont"/> +    <cd:string value="definefont"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -365,9 +365,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazastrut" file="core-spa.tex"> +<cd:command name="setupstrut" file="core-spa.tex">    <cd:sequence> -    <cd:string value="seteazastrut"/> +    <cd:string value="setupstrut"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -379,9 +379,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazaculoare" file="colo-ini.tex"> +<cd:command name="setupcolor" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="seteazaculoare"/> +    <cd:string value="setupcolor"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -390,9 +390,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazaculori" file="colo-ini.tex"> +<cd:command name="setupcolors" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="seteazaculori"/> +    <cd:string value="setupcolors"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -448,9 +448,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definesteculoare" file="colo-ini.tex"> +<cd:command name="definecolor" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="definesteculoare"/> +    <cd:string value="definecolor"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -485,9 +485,9 @@    </cd:arguments>  </cd:command> -<cd:command name="culoare" type="environment" file="colo-ini.tex"> +<cd:command name="color" type="environment" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="culoare"/> +    <cd:string value="color"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -496,9 +496,9 @@    </cd:arguments>  </cd:command> -<cd:command name="culoare" file="colo-ini.tex"> +<cd:command name="color" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="culoare"/> +    <cd:string value="color"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -508,9 +508,9 @@    </cd:arguments>  </cd:command> -<cd:command name="culoaregri" file="colo-ini.tex"> +<cd:command name="graycolor" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="culoaregri"/> +    <cd:string value="graycolor"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -519,9 +519,9 @@    </cd:arguments>  </cd:command> -<cd:command name="afiseazaculoare"> +<cd:command name="showcolor">    <cd:sequence> -    <cd:string value="afiseazaculoare"/> +    <cd:string value="showcolor"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -530,9 +530,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definestepaleta" file="colo-ini.tex"> +<cd:command name="definepalet" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="definestepaleta"/> +    <cd:string value="definepalet"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -546,9 +546,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazapaleta" file="colo-ini.tex"> +<cd:command name="setuppalet" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="seteazapaleta"/> +    <cd:string value="setuppalet"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -557,9 +557,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definestegrupculori" file="colo-ini.tex"> +<cd:command name="definecolorgroup" file="colo-ini.tex">    <cd:sequence> -    <cd:string value="definestegrupculori"/> +    <cd:string value="definecolorgroup"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -575,9 +575,9 @@    </cd:arguments>  </cd:command> -<cd:command name="afiseazapaleta"> +<cd:command name="showpalet">    <cd:sequence> -    <cd:string value="afiseazapaleta"/> +    <cd:string value="showpalet"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -592,9 +592,9 @@    </cd:arguments>  </cd:command> -<cd:command name="afiseazagrupculoare"> +<cd:command name="showcolorgroup">    <cd:sequence> -    <cd:string value="afiseazagrupculoare"/> +    <cd:string value="showcolorgroup"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -610,9 +610,9 @@    </cd:arguments>  </cd:command> -<cd:command name="comparapaleta"> +<cd:command name="comparepalet">    <cd:sequence> -    <cd:string value="comparapaleta"/> +    <cd:string value="comparepalet"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -621,9 +621,9 @@    </cd:arguments>  </cd:command> -<cd:command name="comparagrupculoare"> +<cd:command name="comparecolorgroup">    <cd:sequence> -    <cd:string value="comparagrupculoare"/> +    <cd:string value="comparecolorgroup"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -632,9 +632,9 @@    </cd:arguments>  </cd:command> -<cd:command name="afiseazamakeup" file="supp-vis.tex"> +<cd:command name="showmakeup" file="supp-vis.tex">    <cd:sequence> -    <cd:string value="afiseazamakeup"/> +    <cd:string value="showmakeup"/>    </cd:sequence>  </cd:command> @@ -647,14 +647,14 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="seteazatype"/> +      <cd:inherit name="setuptype"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="seteazatype" file="core-ver.tex"> +<cd:command name="setuptype" file="core-ver.tex">    <cd:sequence> -    <cd:string value="seteazatype"/> +    <cd:string value="setuptype"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -720,9 +720,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definestetyping" file="core-ver.tex"> +<cd:command name="definetyping" file="core-ver.tex">    <cd:sequence> -    <cd:string value="definestetyping"/> +    <cd:string value="definetyping"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -731,14 +731,14 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="seteazatyping"/> +      <cd:inherit name="setuptyping"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="seteazatyping" file="core-ver.tex"> +<cd:command name="setuptyping" file="core-ver.tex">    <cd:sequence> -    <cd:string value="seteazatyping"/> +    <cd:string value="setuptyping"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -838,8 +838,6 @@    <cd:sequence>      <cd:variable value="typing"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="typefile" file="verb-ini.tex"> @@ -854,9 +852,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazanotasubsol" file="core-not.tex"> +<cd:command name="setupfootnotes" file="core-not.tex">    <cd:sequence> -    <cd:string value="seteazanotasubsol"/> +    <cd:string value="setupfootnotes"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -962,20 +960,20 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazadefinireanotasubsol" file="core-not.tex"> +<cd:command name="setupfootnotedefinition" file="core-not.tex">    <cd:sequence> -    <cd:string value="seteazadefinireanotasubsol"/> +    <cd:string value="setupfootnotedefinition"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> -      <cd:inherit name="definestedescriere"/> +      <cd:inherit name="definedescription"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="notasubsol" file="core-not.tex"> +<cd:command name="footnote" file="core-not.tex">    <cd:sequence> -    <cd:string value="notasubsol"/> +    <cd:string value="footnote"/>    </cd:sequence>    <cd:arguments>      <cd:reference optional="yes"/> @@ -993,9 +991,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nota" file="core-not.tex"> +<cd:command name="note" file="core-not.tex">    <cd:sequence> -    <cd:string value="nota"/> +    <cd:string value="note"/>    </cd:sequence>    <cd:arguments>      <cd:reference interactive="yes"/> @@ -1006,35 +1004,33 @@    <cd:sequence>      <cd:string value="localfootnotes"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="punenotesubsollocale" file="core-not.tex"> +<cd:command name="placelocalfootnotes" file="core-not.tex">    <cd:sequence> -    <cd:string value="punenotesubsollocale"/> +    <cd:string value="placelocalfootnotes"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="seteazanotasubsol"/> +      <cd:inherit name="setupfootnotes"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="punenotesubsol" file="core-not.tex"> +<cd:command name="placefootnotes" file="core-not.tex">    <cd:sequence> -    <cd:string value="punenotesubsol"/> +    <cd:string value="placefootnotes"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="seteazanotasubsol"/> +      <cd:inherit name="setupfootnotes"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="seteazasublinie" file="core-fnt.tex"> +<cd:command name="setupunderbar" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="seteazasublinie"/> +    <cd:string value="setupunderbar"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -1059,117 +1055,117 @@    </cd:arguments>  </cd:command> -<cd:command name="sublinie" file="core-fnt.tex"> +<cd:command name="underbar" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="sublinie"/> +    <cd:string value="underbar"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="sublinii" file="core-fnt.tex"> +<cd:command name="underbars" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="sublinii"/> +    <cd:string value="underbars"/>    </cd:sequence>    <cd:arguments>      <cd:word list="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="barasus" file="core-fnt.tex"> +<cd:command name="overbar" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="barasus"/> +    <cd:string value="overbar"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="supralinie" file="core-fnt.tex"> +<cd:command name="overbars" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="supralinie"/> +    <cd:string value="overbars"/>    </cd:sequence>    <cd:arguments>      <cd:word list="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="liniepeste" file="core-fnt.tex"> +<cd:command name="overstrike" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="liniepeste"/> +    <cd:string value="overstrike"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="liniipeste" file="core-fnt.tex"> +<cd:command name="overstrikes" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="liniipeste"/> +    <cd:string value="overstrikes"/>    </cd:sequence>    <cd:arguments>      <cd:word list="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="numereromane" file="core-con.tex"> +<cd:command name="romannumerals" file="core-con.tex">    <cd:sequence> -    <cd:string value="numereromane"/> +    <cd:string value="romannumerals"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="Numereromane" file="core-con.tex"> +<cd:command name="Romannumerals" file="core-con.tex">    <cd:sequence> -    <cd:string value="Numereromane"/> +    <cd:string value="Romannumerals"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="numere" file="core-con.tex"> +<cd:command name="numbers" file="core-con.tex">    <cd:sequence> -    <cd:string value="numere"/> +    <cd:string value="numbers"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="litera" file="core-con.tex"> +<cd:command name="character" file="core-con.tex">    <cd:sequence> -    <cd:string value="litera"/> +    <cd:string value="character"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="Litera" file="core-con.tex"> +<cd:command name="Character" file="core-con.tex">    <cd:sequence> -    <cd:string value="Litera"/> +    <cd:string value="Character"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="litere" file="core-con.tex"> +<cd:command name="characters" file="core-con.tex">    <cd:sequence> -    <cd:string value="litere"/> +    <cd:string value="characters"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="Litere" file="core-con.tex"> +<cd:command name="Characters" file="core-con.tex">    <cd:sequence> -    <cd:string value="Litere"/> +    <cd:string value="Characters"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -1185,45 +1181,45 @@    </cd:arguments>  </cd:command> -<cd:command name="luna" file="core-con.tex"> +<cd:command name="month" file="core-con.tex">    <cd:sequence> -    <cd:string value="luna"/> +    <cd:string value="month"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="LUNA" file="core-con.tex"> +<cd:command name="MONTH" file="core-con.tex">    <cd:sequence> -    <cd:string value="LUNA"/> +    <cd:string value="MONTH"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="zidinsaptamana" file="core-con.tex"> +<cd:command name="weekday" file="core-con.tex">    <cd:sequence> -    <cd:string value="zidinsaptamana"/> +    <cd:string value="weekday"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="ZIDINSAPTAMANA" file="core-con.tex"> +<cd:command name="WEEKDAY" file="core-con.tex">    <cd:sequence> -    <cd:string value="ZIDINSAPTAMANA"/> +    <cd:string value="WEEKDAY"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="seteazamajuscule" file="core-fnt.tex"> +<cd:command name="setupcapitals" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="seteazamajuscule"/> +    <cd:string value="setupcapitals"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -1284,54 +1280,54 @@    </cd:arguments>  </cd:command> -<cd:command name="CUVANT" file="core-fnt.tex"> +<cd:command name="WORD" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="CUVANT"/> +    <cd:string value="WORD"/>    </cd:sequence>    <cd:arguments>      <cd:word/>    </cd:arguments>  </cd:command> -<cd:command name="CUVINTE" file="core-fnt.tex"> +<cd:command name="WORDS" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="CUVINTE"/> +    <cd:string value="WORDS"/>    </cd:sequence>    <cd:arguments>      <cd:word list="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="Cuvant" file="core-fnt.tex"> +<cd:command name="Word" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="Cuvant"/> +    <cd:string value="Word"/>    </cd:sequence>    <cd:arguments>      <cd:word/>    </cd:arguments>  </cd:command> -<cd:command name="Cuvinte" file="core-fnt.tex"> +<cd:command name="Words" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="Cuvinte"/> +    <cd:string value="Words"/>    </cd:sequence>    <cd:arguments>      <cd:word list="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="intins" file="core-fnt.tex"> +<cd:command name="stretched" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="intins"/> +    <cd:string value="stretched"/>    </cd:sequence>    <cd:arguments>      <cd:word/>    </cd:arguments>  </cd:command> -<cd:command name="definestesimbol" file="symb-ini.tex"> +<cd:command name="definesymbol" file="symb-ini.tex">    <cd:sequence> -    <cd:string value="definestesimbol"/> +    <cd:string value="definesymbol"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1343,9 +1339,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definestesimbolfigura" file="symb-ini.tex"> +<cd:command name="definefiguresymbol" file="symb-ini.tex">    <cd:sequence> -    <cd:string value="definestesimbolfigura"/> +    <cd:string value="definefiguresymbol"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1355,14 +1351,14 @@        <cd:constant type="cd:text"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="figuraexterna"/> +      <cd:inherit name="externalfigure"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="simbol" file="symb-ini.tex"> +<cd:command name="symbol" file="symb-ini.tex">    <cd:sequence> -    <cd:string value="simbol"/> +    <cd:string value="symbol"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -1385,9 +1381,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazasimbol" file="symb-ini.tex"> +<cd:command name="setupsymbolset" file="symb-ini.tex">    <cd:sequence> -    <cd:string value="seteazasimbol"/> +    <cd:string value="setupsymbolset"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1396,9 +1392,9 @@    </cd:arguments>  </cd:command> -<cd:command name="folosestesimboluri" file="symb-ini.tex"> +<cd:command name="usesymbols" file="symb-ini.tex">    <cd:sequence> -    <cd:string value="folosestesimboluri"/> +    <cd:string value="usesymbols"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1407,9 +1403,9 @@    </cd:arguments>  </cd:command> -<cd:command name="afiseazasetsimboluri"> +<cd:command name="showsymbolset">    <cd:sequence> -    <cd:string value="afiseazasetsimboluri"/> +    <cd:string value="showsymbolset"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1418,9 +1414,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definesteconversie" file="core-con.tex"> +<cd:command name="defineconversion" file="core-con.tex">    <cd:sequence> -    <cd:string value="definesteconversie"/> +    <cd:string value="defineconversion"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1433,9 +1429,9 @@    </cd:arguments>  </cd:command> -<cd:command name="convertestenumar" file="core-con.tex"> +<cd:command name="convertnumber" file="core-con.tex">    <cd:sequence> -    <cd:string value="convertestenumar"/> +    <cd:string value="convertnumber"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -1443,9 +1439,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazatexttitlu" file="lang-lab.tex"> +<cd:command name="setupheadtext" file="lang-lab.tex">    <cd:sequence> -    <cd:string value="seteazatexttitlu"/> +    <cd:string value="setupheadtext"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -1466,9 +1462,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazatexteticheta" file="lang-lab.tex"> +<cd:command name="setuplabeltext" file="lang-lab.tex">    <cd:sequence> -    <cd:string value="seteazatexteticheta"/> +    <cd:string value="setuplabeltext"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -1489,27 +1485,27 @@    </cd:arguments>  </cd:command> -<cd:command name="texttitlu" file="lang-lab.tex"> +<cd:command name="headtext" file="lang-lab.tex">    <cd:sequence> -    <cd:string value="texttitlu"/> +    <cd:string value="headtext"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="texteticheta"> +<cd:command name="labeltext">    <cd:sequence> -    <cd:string value="texteticheta"/> +    <cd:string value="labeltext"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="seteazaliniimargine" file="core-rul.tex"> +<cd:command name="setupmarginrules" file="core-rul.tex">    <cd:sequence> -    <cd:string value="seteazaliniimargine"/> +    <cd:string value="setupmarginrules"/>    </cd:sequence>    <cd:arguments>      <cd:assignments> @@ -1523,9 +1519,9 @@    </cd:arguments>  </cd:command> -<cd:command name="liniemargine" type="environment"> +<cd:command name="marginrule" type="environment">    <cd:sequence> -    <cd:string value="liniemargine"/> +    <cd:string value="marginrule"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1534,9 +1530,9 @@    </cd:arguments>  </cd:command> -<cd:command name="liniemargine"> +<cd:command name="marginrule">    <cd:sequence> -    <cd:string value="liniemargine"/> +    <cd:string value="marginrule"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1546,9 +1542,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazagrosimelinie" file="core-rul.tex"> +<cd:command name="setuplinewidth" file="core-rul.tex">    <cd:sequence> -    <cd:string value="seteazagrosimelinie"/> +    <cd:string value="setuplinewidth"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -1557,9 +1553,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazainconjurat" file="core-rul.tex"> +<cd:command name="setupframed" file="core-rul.tex">    <cd:sequence> -    <cd:string value="seteazainconjurat"/> +    <cd:string value="setupframed"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -1707,7 +1703,7 @@    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="seteazainconjurat"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>      <cd:content/>    </cd:arguments> @@ -1719,26 +1715,26 @@    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="seteazainconjurat"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="liniisubtiri" file="core-rul.tex"> +<cd:command name="thinrules" file="core-rul.tex">    <cd:sequence> -    <cd:string value="liniisubtiri"/> +    <cd:string value="thinrules"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes"> -      <cd:inherit name="seteazaliniesubtire"/> +      <cd:inherit name="setupthinrules"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="seteazaliniesubtire" file="core-rul.tex"> +<cd:command name="setupthinrules" file="core-rul.tex">    <cd:sequence> -    <cd:string value="seteazaliniesubtire"/> +    <cd:string value="setupthinrules"/>    </cd:sequence>    <cd:arguments>      <cd:assignments> @@ -1795,49 +1791,49 @@    </cd:arguments>  </cd:command> -<cd:command name="firdepar" file="core-rul.tex"> +<cd:command name="hairline" file="core-rul.tex">    <cd:sequence> -    <cd:string value="firdepar"/> +    <cd:string value="hairline"/>    </cd:sequence>  </cd:command> -<cd:command name="liniesubtire" file="core-rul.tex"> +<cd:command name="thinrule" file="core-rul.tex">    <cd:sequence> -    <cd:string value="liniesubtire"/> +    <cd:string value="thinrule"/>    </cd:sequence>  </cd:command> -<cd:command name="definestetextinconjurat" file="core-rul.tex"> +<cd:command name="defineframedtext" file="core-rul.tex">    <cd:sequence> -    <cd:string value="definestetextinconjurat"/> +    <cd:string value="defineframedtext"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="definestetexteinconjurate"/> +      <cd:inherit name="setupframedtexts"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="definesteinconjurare" file="core-rul.tex"> +<cd:command name="defineframed" file="core-rul.tex">    <cd:sequence> -    <cd:string value="definesteinconjurare"/> +    <cd:string value="defineframed"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="definestetexteinconjurate"/> +      <cd:inherit name="setupframedtexts"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="definestetexteinconjurate" file="core-rul.tex"> +<cd:command name="setupframedtexts" file="core-rul.tex">    <cd:sequence> -    <cd:string value="definestetexteinconjurate"/> +    <cd:string value="setupframedtexts"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -1891,7 +1887,7 @@          <cd:constant type="centru"/>          <cd:constant type="niciunul"/>        </cd:parameter> -      <cd:inherit name="seteazainconjurat"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -1908,7 +1904,7 @@        <cd:constant type="niciunul"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="definestetexteinconjurate"/> +      <cd:inherit name="setupframedtexts"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -1919,28 +1915,26 @@    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="definestetexteinconjurate"/> +      <cd:inherit name="setupframedtexts"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="fundal" type="environment"> +<cd:command name="background" type="environment">    <cd:sequence> -    <cd:string value="fundal"/> +    <cd:string value="background"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="fundal"> +<cd:command name="background">    <cd:sequence> -    <cd:string value="fundal"/> +    <cd:string value="background"/>    </cd:sequence>  </cd:command> -<cd:command name="seteazafundal" file="core-rul.tex"> +<cd:command name="setupbackground" file="core-rul.tex">    <cd:sequence> -    <cd:string value="seteazafundal"/> +    <cd:string value="setupbackground"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -1966,40 +1960,40 @@          <cd:constant type="start"/>          <cd:constant type="stop"/>        </cd:parameter> -      <cd:inherit name="seteazainconjurat"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="rigleumplere"> +<cd:command name="fillinrules">    <cd:sequence> -    <cd:string value="rigleumplere"/> +    <cd:string value="fillinrules"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="seteazarigleumplere"/> +      <cd:inherit name="setupfillinrules"/>      </cd:assignments>      <cd:content/>      <cd:content optional="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="textumplere"> +<cd:command name="fillintext">    <cd:sequence> -    <cd:string value="textumplere"/> +    <cd:string value="fillintext"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="seteazarigleumplere"/> +      <cd:inherit name="setupfillinrules"/>      </cd:assignments>      <cd:content/>      <cd:content optional="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="seteazarigleumplere" file="core-rul.tex"> +<cd:command name="setupfillinrules" file="core-rul.tex">    <cd:sequence> -    <cd:string value="seteazarigleumplere"/> +    <cd:string value="setupfillinrules"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -2042,21 +2036,21 @@    </cd:arguments>  </cd:command> -<cd:command name="linieumplere"> +<cd:command name="fillinline">    <cd:sequence> -    <cd:string value="linieumplere"/> +    <cd:string value="fillinline"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="seteazaliniiumplere"/> +      <cd:inherit name="setupfillinlines"/>      </cd:assignments>      <cd:nothing/>    </cd:arguments>  </cd:command> -<cd:command name="seteazaliniiumplere" file="core-rul.tex"> +<cd:command name="setupfillinlines" file="core-rul.tex">    <cd:sequence> -    <cd:string value="seteazaliniiumplere"/> +    <cd:string value="setupfillinlines"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -2079,9 +2073,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazarigletext" file="core-rul.tex"> +<cd:command name="setuptextrules" file="core-rul.tex">    <cd:sequence> -    <cd:string value="seteazarigletext"/> +    <cd:string value="setuptextrules"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -2131,9 +2125,9 @@    </cd:arguments>  </cd:command> -<cd:command name="riglatext" file="core-rul.tex"> +<cd:command name="textrule" file="core-rul.tex">    <cd:sequence> -    <cd:string value="riglatext"/> +    <cd:string value="textrule"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2144,9 +2138,9 @@    </cd:arguments>  </cd:command> -<cd:command name="riglatext" type="environment" file="core-rul.tex"> +<cd:command name="textrule" type="environment" file="core-rul.tex">    <cd:sequence> -    <cd:string value="riglatext"/> +    <cd:string value="textrule"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2157,31 +2151,31 @@    </cd:arguments>  </cd:command> -<cd:command name="linieneagra" file="core-rul.tex"> +<cd:command name="blackrule" file="core-rul.tex">    <cd:sequence> -    <cd:string value="linieneagra"/> +    <cd:string value="blackrule"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="seteazaliniinegre"/> +      <cd:inherit name="setupblackrules"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="liniinegre" file="core-rul.tex"> +<cd:command name="blackrules" file="core-rul.tex">    <cd:sequence> -    <cd:string value="liniinegre"/> +    <cd:string value="blackrules"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> -      <cd:inherit name="seteazaliniinegre"/> +      <cd:inherit name="setupblackrules"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="seteazaliniinegre" file="core-rul.tex"> +<cd:command name="setupblackrules" file="core-rul.tex">    <cd:sequence> -    <cd:string value="seteazaliniinegre"/> +    <cd:string value="setupblackrules"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -2211,9 +2205,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definesteoverlay" file="core-rul.tex"> +<cd:command name="defineoverlay" file="core-rul.tex">    <cd:sequence> -    <cd:string value="definesteoverlay"/> +    <cd:string value="defineoverlay"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -2225,9 +2219,9 @@    </cd:arguments>  </cd:command> -<cd:command name="folosestemodul"> +<cd:command name="usemodule">    <cd:sequence> -    <cd:string value="folosestemodul"/> +    <cd:string value="usemodule"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -2247,9 +2241,9 @@    </cd:arguments>  </cd:command> -<cd:command name="nutesta"> +<cd:command name="donttest">    <cd:sequence> -    <cd:string value="nutesta"/> +    <cd:string value="donttest"/>    </cd:sequence>  </cd:command> @@ -2257,13 +2251,11 @@    <cd:sequence>      <cd:string value="localenvironment"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="seteazasistem" file="core-sys.tex"> +<cd:command name="setupsystem" file="core-sys.tex">    <cd:sequence> -    <cd:string value="seteazasistem"/> +    <cd:string value="setupsystem"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -2299,27 +2291,27 @@    </cd:arguments>  </cd:command> -<cd:command name="jos" file="core-fnt.tex"> +<cd:command name="low" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="jos"/> +    <cd:string value="low"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="inalt" file="core-fnt.tex"> +<cd:command name="high" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="inalt"/> +    <cd:string value="high"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="jossus" file="core-fnt.tex"> +<cd:command name="lohi" file="core-fnt.tex">    <cd:sequence> -    <cd:string value="jossus"/> +    <cd:string value="lohi"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2330,9 +2322,9 @@    </cd:arguments>  </cd:command> -<cd:command name="afiseazarama"> +<cd:command name="showframe">    <cd:sequence> -    <cd:string value="afiseazarama"/> +    <cd:string value="showframe"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2343,45 +2335,45 @@    </cd:arguments>  </cd:command> -<cd:command name="aliniatstanga" file="core-spa.tex"> +<cd:command name="leftaligned" file="core-spa.tex">    <cd:sequence> -    <cd:string value="aliniatstanga"/> +    <cd:string value="leftaligned"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="aliniatdreapta" file="core-spa.tex"> +<cd:command name="rightaligned" file="core-spa.tex">    <cd:sequence> -    <cd:string value="aliniatdreapta"/> +    <cd:string value="rightaligned"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="aliniatcentru" file="core-spa.tex"> +<cd:command name="midaligned" file="core-spa.tex">    <cd:sequence> -    <cd:string value="aliniatcentru"/> +    <cd:string value="midaligned"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="cuvantdreapta" file="core-spa.tex"> +<cd:command name="wordright" file="core-spa.tex">    <cd:sequence> -    <cd:string value="cuvantdreapta"/> +    <cd:string value="wordright"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="marginal" file="core-sec.tex"> +<cd:command name="inmargin" file="core-sec.tex">    <cd:sequence> -    <cd:string value="marginal"/> +    <cd:string value="inmargin"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2394,9 +2386,9 @@    </cd:arguments>  </cd:command> -<cd:command name="inaltamargine" file="page-mar.tex"> +<cd:command name="inothermargin" file="page-mar.tex">    <cd:sequence> -    <cd:string value="inaltamargine"/> +    <cd:string value="inothermargin"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2409,9 +2401,9 @@    </cd:arguments>  </cd:command> -<cd:command name="instanga"> +<cd:command name="inleft">    <cd:sequence> -    <cd:string value="instanga"/> +    <cd:string value="inleft"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2424,9 +2416,9 @@    </cd:arguments>  </cd:command> -<cd:command name="indreapta"> +<cd:command name="inright">    <cd:sequence> -    <cd:string value="indreapta"/> +    <cd:string value="inright"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2469,33 +2461,33 @@    </cd:arguments>  </cd:command> -<cd:command name="coloana"> +<cd:command name="column">    <cd:sequence> -    <cd:string value="coloana"/> +    <cd:string value="column"/>    </cd:sequence>  </cd:command> -<cd:command name="afiseazastruts" file="core-spa.tex"> +<cd:command name="showstruts" file="core-spa.tex">    <cd:sequence> -    <cd:string value="afiseazastruts"/> +    <cd:string value="showstruts"/>    </cd:sequence>  </cd:command> -<cd:command name="afiseazasetari"> +<cd:command name="showsetups">    <cd:sequence> -    <cd:string value="afiseazasetari"/> +    <cd:string value="showsetups"/>    </cd:sequence>  </cd:command> -<cd:command name="afiseazaaspect"> +<cd:command name="showlayout">    <cd:sequence> -    <cd:string value="afiseazaaspect"/> +    <cd:string value="showlayout"/>    </cd:sequence>  </cd:command> -<cd:command name="textmarginal" file="page-mar.tex"> +<cd:command name="margintext" file="page-mar.tex">    <cd:sequence> -    <cd:string value="textmarginal"/> +    <cd:string value="margintext"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -2508,9 +2500,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazablocurimarginale" file="page-flt.tex"> +<cd:command name="setupmarginblocks" file="page-flt.tex">    <cd:sequence> -    <cd:string value="seteazablocurimarginale"/> +    <cd:string value="setupmarginblocks"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -2568,8 +2560,6 @@    <cd:sequence>      <cd:string value="marginblock"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="part" file="core-sec.tex"> @@ -2683,9 +2673,9 @@    </cd:arguments>  </cd:command> -<cd:command name="la"> +<cd:command name="at">    <cd:sequence> -    <cd:string value="la"/> +    <cd:string value="at"/>    </cd:sequence>    <cd:arguments>      <cd:content interactive="yes"/> @@ -2694,9 +2684,9 @@    </cd:arguments>  </cd:command> -<cd:command name="despre"> +<cd:command name="about">    <cd:sequence> -    <cd:string value="despre"/> +    <cd:string value="about"/>    </cd:sequence>    <cd:arguments>      <cd:content interactive="yes"/> @@ -2704,9 +2694,9 @@    </cd:arguments>  </cd:command> -<cd:command name="undeva" file="core-ref.tex"> +<cd:command name="somewhere" file="core-ref.tex">    <cd:sequence> -    <cd:string value="undeva"/> +    <cd:string value="somewhere"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -2715,9 +2705,9 @@    </cd:arguments>  </cd:command> -<cd:command name="lapagina" file="core-ref.tex"> +<cd:command name="atpage" file="core-ref.tex">    <cd:sequence> -    <cd:string value="lapagina"/> +    <cd:string value="atpage"/>    </cd:sequence>    <cd:arguments>      <cd:reference/> @@ -2740,9 +2730,9 @@    </cd:arguments>  </cd:command> -<cd:command name="referintatext" file="core-ref.tex"> +<cd:command name="textreference" file="core-ref.tex">    <cd:sequence> -    <cd:string value="referintatext"/> +    <cd:string value="textreference"/>    </cd:sequence>    <cd:arguments>      <cd:reference/> @@ -2750,18 +2740,18 @@    </cd:arguments>  </cd:command> -<cd:command name="referintapagina" file="core-ref.tex"> +<cd:command name="pagereference" file="core-ref.tex">    <cd:sequence> -    <cd:string value="referintapagina"/> +    <cd:string value="pagereference"/>    </cd:sequence>    <cd:arguments>      <cd:reference/>    </cd:arguments>  </cd:command> -<cd:command name="referinta" file="core-ref.tex"> +<cd:command name="reference" file="core-ref.tex">    <cd:sequence> -    <cd:string value="referinta"/> +    <cd:string value="reference"/>    </cd:sequence>    <cd:arguments>      <cd:reference/> @@ -2769,9 +2759,9 @@    </cd:arguments>  </cd:command> -<cd:command name="folosestereferinte" file="core-ref.tex"> +<cd:command name="usereferences" file="core-ref.tex">    <cd:sequence> -    <cd:string value="folosestereferinte"/> +    <cd:string value="usereferences"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -2780,9 +2770,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definestereferinte" file="core-ref.tex"> +<cd:command name="definereference" file="core-ref.tex">    <cd:sequence> -    <cd:string value="definestereferinte"/> +    <cd:string value="definereference"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -2792,9 +2782,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definesteformatreferinte" file="core-ref.tex"> +<cd:command name="definereferenceformat" file="core-ref.tex">    <cd:sequence> -    <cd:string value="definesteformatreferinte"/> +    <cd:string value="definereferenceformat"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -2839,9 +2829,9 @@    </cd:arguments>  </cd:command> -<cd:command name="injos" file="core-spa.tex"> +<cd:command name="godown" file="core-spa.tex">    <cd:sequence> -    <cd:string value="injos"/> +    <cd:string value="godown"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -2850,15 +2840,15 @@    </cd:arguments>  </cd:command> -<cd:command name="spatiualb" file="core-spa.tex"> +<cd:command name="whitespace" file="core-spa.tex">    <cd:sequence> -    <cd:string value="spatiualb"/> +    <cd:string value="whitespace"/>    </cd:sequence>  </cd:command> -<cd:command name="faraspatiualb" file="core-spa.tex"> +<cd:command name="nowhitespace" file="core-spa.tex">    <cd:sequence> -    <cd:string value="faraspatiualb"/> +    <cd:string value="nowhitespace"/>    </cd:sequence>  </cd:command> @@ -2868,15 +2858,15 @@    </cd:sequence>  </cd:command> -<cd:command name="spatiu" file="syst-pln.tex"> +<cd:command name="space" file="syst-pln.tex">    <cd:sequence> -    <cd:string value="spatiu"/> +    <cd:string value="space"/>    </cd:sequence>  </cd:command> -<cd:command name="spatiifixate" file="core-spa.tex"> +<cd:command name="fixedspaces" file="core-spa.tex">    <cd:sequence> -    <cd:string value="spatiifixate"/> +    <cd:string value="fixedspaces"/>    </cd:sequence>  </cd:command> @@ -2891,21 +2881,21 @@    </cd:arguments>  </cd:command> -<cd:command name="faraspatiu" file="core-spa.tex"> +<cd:command name="nospace" file="core-spa.tex">    <cd:sequence> -    <cd:string value="faraspatiu"/> +    <cd:string value="nospace"/>    </cd:sequence>  </cd:command> -<cd:command name="impachetat" file="core-spa.tex"> +<cd:command name="packed" file="core-spa.tex">    <cd:sequence> -    <cd:string value="impachetat"/> +    <cd:string value="packed"/>    </cd:sequence>  </cd:command> -<cd:command name="seteazadescriere" file="core-des.tex"> +<cd:command name="setupdescriptions" file="core-des.tex">    <cd:sequence> -    <cd:string value="seteazadescriere"/> +    <cd:string value="setupdescriptions"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -3004,23 +2994,23 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazaenumerare" file="core-des.tex"> +<cd:command name="setupenumerations" file="core-des.tex">    <cd:sequence> -    <cd:string value="seteazaenumerare"/> +    <cd:string value="setupenumerations"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes">        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="definestedescriere"/> +      <cd:inherit name="definedescription"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="definesteenumerare" file="core-des.tex"> +<cd:command name="defineenumeration" file="core-des.tex">    <cd:sequence> -    <cd:string value="definesteenumerare"/> +    <cd:string value="defineenumeration"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -3030,7 +3020,7 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="seteazaenumerare"/> +      <cd:inherit name="setupenumerations"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -3048,20 +3038,18 @@    <cd:sequence>      <cd:variable value="enumeration"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="definestedescriere" file="core-des.tex"> +<cd:command name="definedescription" file="core-des.tex">    <cd:sequence> -    <cd:string value="definestedescriere"/> +    <cd:string value="definedescription"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="seteazadescriere"/> +      <cd:inherit name="setupdescriptions"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -3085,9 +3073,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazaaliniate" file="core-des.tex"> +<cd:command name="setupindentations" file="core-des.tex">    <cd:sequence> -    <cd:string value="seteazaaliniate"/> +    <cd:string value="setupindentations"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -3140,16 +3128,16 @@    </cd:arguments>  </cd:command> -<cd:command name="definestealiat" file="core-des.tex"> +<cd:command name="defineindenting" file="core-des.tex">    <cd:sequence> -    <cd:string value="definestealiat"/> +    <cd:string value="defineindenting"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="seteazaaliniate"/> +      <cd:inherit name="setupindentations"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -3163,9 +3151,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definesteeticheta" file="core-des.tex"> +<cd:command name="definelabel" file="core-des.tex">    <cd:sequence> -    <cd:string value="definesteeticheta"/> +    <cd:string value="definelabel"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3219,9 +3207,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazacoloane" file="page-mul.tex"> +<cd:command name="setupcolumns" file="page-mul.tex">    <cd:sequence> -    <cd:string value="seteazacoloane"/> +    <cd:string value="setupcolumns"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -3273,7 +3261,7 @@          <cd:constant type="stanga"/>          <cd:constant type="dreapta"/>        </cd:parameter> -      <cd:inherit name="seteazainconjurat"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -3284,14 +3272,14 @@    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="seteazacoloane"/> +      <cd:inherit name="setupcolumns"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="definestetext" file="page-txt.tex"> +<cd:command name="definetext" file="page-txt.tex">    <cd:sequence> -    <cd:string value="definestetext"/> +    <cd:string value="definetext"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3313,9 +3301,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazaantet" file="page-txt.tex"> +<cd:command name="setupheader" file="page-txt.tex">    <cd:sequence> -    <cd:string value="seteazaantet"/> +    <cd:string value="setupheader"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -3384,77 +3372,77 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazasubsol" file="page-txt.tex"> +<cd:command name="setupfooter" file="page-txt.tex">    <cd:sequence> -    <cd:string value="seteazasubsol"/> +    <cd:string value="setupfooter"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> -      <cd:inherit name="seteazaantet"/> +      <cd:inherit name="setupheader"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="seteazaantet"/> +      <cd:inherit name="setupheader"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="seteazatext" file="page-txt.tex"> +<cd:command name="setuptext" file="page-txt.tex">    <cd:sequence> -    <cd:string value="seteazatext"/> +    <cd:string value="setuptext"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> -      <cd:inherit name="seteazaantet"/> +      <cd:inherit name="setupheader"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="seteazaantet"/> +      <cd:inherit name="setupheader"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="seteazasus" file="page-txt.tex"> +<cd:command name="setuptop" file="page-txt.tex">    <cd:sequence> -    <cd:string value="seteazasus"/> +    <cd:string value="setuptop"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> -      <cd:inherit name="seteazaantet"/> +      <cd:inherit name="setupheader"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="seteazaantet"/> +      <cd:inherit name="setupheader"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="seteazajos" file="page-txt.tex"> +<cd:command name="setupbottom" file="page-txt.tex">    <cd:sequence> -    <cd:string value="seteazajos"/> +    <cd:string value="setupbottom"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> -      <cd:inherit name="seteazaantet"/> +      <cd:inherit name="setupheader"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="seteazaantet"/> +      <cd:inherit name="setupheader"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="faraliniiantetsisubsol" file="page-txt.tex"> +<cd:command name="noheaderandfooterlines" file="page-txt.tex">    <cd:sequence> -    <cd:string value="faraliniiantetsisubsol"/> +    <cd:string value="noheaderandfooterlines"/>    </cd:sequence>  </cd:command> -<cd:command name="faraliniisussijos" file="page-txt.tex"> +<cd:command name="notopandbottomlines" file="page-txt.tex">    <cd:sequence> -    <cd:string value="faraliniisussijos"/> +    <cd:string value="notopandbottomlines"/>    </cd:sequence>  </cd:command> -<cd:command name="seteazatexteantet" file="page-txt.tex"> +<cd:command name="setupheadertexts" file="page-txt.tex">    <cd:sequence> -    <cd:string value="seteazatexteantet"/> +    <cd:string value="setupheadertexts"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -3479,9 +3467,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazatextesubsol" file="page-txt.tex"> +<cd:command name="setupfootertexts" file="page-txt.tex">    <cd:sequence> -    <cd:string value="seteazatextesubsol"/> +    <cd:string value="setupfootertexts"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -3506,9 +3494,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazatextetext" file="page-txt.tex"> +<cd:command name="setuptexttexts" file="page-txt.tex">    <cd:sequence> -    <cd:string value="seteazatextetext"/> +    <cd:string value="setuptexttexts"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -3533,9 +3521,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazatextesus" file="page-txt.tex"> +<cd:command name="setuptoptexts" file="page-txt.tex">    <cd:sequence> -    <cd:string value="seteazatextesus"/> +    <cd:string value="setuptoptexts"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -3560,9 +3548,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazatextejos" file="page-txt.tex"> +<cd:command name="setupbottomtexts" file="page-txt.tex">    <cd:sequence> -    <cd:string value="seteazatextejos"/> +    <cd:string value="setupbottomtexts"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -3587,9 +3575,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definestemarcaje" file="core-mar.tex"> +<cd:command name="definemarking" file="core-mar.tex">    <cd:sequence> -    <cd:string value="definestemarcaje"/> +    <cd:string value="definemarking"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3601,9 +3589,9 @@    </cd:arguments>  </cd:command> -<cd:command name="cupleazamarcaje" file="core-sec.tex"> +<cd:command name="couplemarking" file="core-sec.tex">    <cd:sequence> -    <cd:string value="cupleazamarcaje"/> +    <cd:string value="couplemarking"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3615,9 +3603,9 @@    </cd:arguments>  </cd:command> -<cd:command name="decupleazamarcaje" file="core-mar.tex"> +<cd:command name="decouplemarking" file="core-mar.tex">    <cd:sequence> -    <cd:string value="decupleazamarcaje"/> +    <cd:string value="decouplemarking"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3626,9 +3614,9 @@    </cd:arguments>  </cd:command> -<cd:command name="reseteazamarcaje" file="core-mar.tex"> +<cd:command name="resetmarking" file="core-mar.tex">    <cd:sequence> -    <cd:string value="reseteazamarcaje"/> +    <cd:string value="resetmarking"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3637,9 +3625,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazamarcaje" file="core-mar.tex"> +<cd:command name="setupmarking" file="core-mar.tex">    <cd:sequence> -    <cd:string value="seteazamarcaje"/> +    <cd:string value="setupmarking"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3661,9 +3649,9 @@    </cd:arguments>  </cd:command> -<cd:command name="marcaje" file="core-mar.tex"> +<cd:command name="marking" file="core-mar.tex">    <cd:sequence> -    <cd:string value="marcaje"/> +    <cd:string value="marking"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3673,9 +3661,9 @@    </cd:arguments>  </cd:command> -<cd:command name="adumarcaje" file="core-mar.tex"> +<cd:command name="getmarking" file="core-mar.tex">    <cd:sequence> -    <cd:string value="adumarcaje"/> +    <cd:string value="getmarking"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -3692,18 +3680,18 @@    </cd:arguments>  </cd:command> -<cd:command name="faramarcaje" file="core-mar.tex"> +<cd:command name="nomarking" file="core-mar.tex">    <cd:sequence> -    <cd:string value="faramarcaje"/> +    <cd:string value="nomarking"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="seteazaaspect" file="page-ini.tex"> +<cd:command name="setuplayout" file="page-ini.tex">    <cd:sequence> -    <cd:string value="seteazaaspect"/> +    <cd:string value="setuplayout"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -3865,9 +3853,9 @@    </cd:arguments>  </cd:command> -<cd:command name="adapteazaaspect" file="page-lay.tex"> +<cd:command name="adaptlayout" file="page-lay.tex">    <cd:sequence> -    <cd:string value="adapteazaaspect"/> +    <cd:string value="adaptlayout"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -3885,27 +3873,27 @@    </cd:arguments>  </cd:command> -<cd:command name="afiseazagrid" file="page-ini.tex"> +<cd:command name="showgrid" file="page-ini.tex">    <cd:sequence> -    <cd:string value="afiseazagrid"/> +    <cd:string value="showgrid"/>    </cd:sequence>  </cd:command> -<cd:command name="plaseazapegrid" file="core-grd.tex"> +<cd:command name="placeongrid" file="core-grd.tex">    <cd:sequence> -    <cd:string value="plaseazapegrid"/> +    <cd:string value="placeongrid"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> -      <cd:inherit name="mutapegrid"/> +      <cd:inherit name="moveongrid"/>      </cd:keywords>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="mutapegrid" file="core-grd.tex"> +<cd:command name="moveongrid" file="core-grd.tex">    <cd:sequence> -    <cd:string value="mutapegrid"/> +    <cd:string value="moveongrid"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -3931,18 +3919,18 @@    </cd:arguments>  </cd:command> -<cd:command name="proiect" type="environment"> +<cd:command name="project" type="environment">    <cd:sequence> -    <cd:string value="proiect"/> +    <cd:string value="project"/>    </cd:sequence>    <cd:arguments>      <cd:file/>    </cd:arguments>  </cd:command> -<cd:command name="mediu" type="environment"> +<cd:command name="environment" type="environment">    <cd:sequence> -    <cd:string value="mediu"/> +    <cd:string value="environment"/>    </cd:sequence>    <cd:arguments>      <cd:file/> @@ -3958,24 +3946,24 @@    </cd:arguments>  </cd:command> -<cd:command name="componenta" type="environment"> +<cd:command name="component" type="environment">    <cd:sequence> -    <cd:string value="componenta"/> +    <cd:string value="component"/>    </cd:sequence>    <cd:arguments>      <cd:file/>    </cd:arguments>  </cd:command> -<cd:command name="farafisiere"> +<cd:command name="nomorefiles">    <cd:sequence> -    <cd:string value="farafisiere"/> +    <cd:string value="nomorefiles"/>    </cd:sequence>  </cd:command> -<cd:command name="seteazaspatiuinterliniar"> +<cd:command name="setupinterlinespace">    <cd:sequence> -    <cd:string value="seteazaspatiuinterliniar"/> +    <cd:string value="setupinterlinespace"/>    </cd:sequence>    <cd:arguments>      <cd:choice> @@ -4008,9 +3996,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazanumerotarepagina" file="page-num.tex"> +<cd:command name="setuppagenumbering" file="page-num.tex">    <cd:sequence> -    <cd:string value="seteazanumerotarepagina"/> +    <cd:string value="setuppagenumbering"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4090,9 +4078,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazaingust" file="core-spa.tex"> +<cd:command name="setupnarrower" file="core-spa.tex">    <cd:sequence> -    <cd:string value="seteazaingust"/> +    <cd:string value="setupnarrower"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4109,9 +4097,9 @@    </cd:arguments>  </cd:command> -<cd:command name="defineste" file="syst-ext.tex"> +<cd:command name="define" file="syst-ext.tex">    <cd:sequence> -    <cd:string value="defineste"/> +    <cd:string value="define"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -4122,18 +4110,18 @@    </cd:arguments>  </cd:command> -<cd:command name="folosestecomenzi" file="core-sys.tex"> +<cd:command name="usecommands" file="core-sys.tex">    <cd:sequence> -    <cd:string value="folosestecomenzi"/> +    <cd:string value="usecommands"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="definestestartstop" file="core-sys.tex"> +<cd:command name="definestartstop" file="core-sys.tex">    <cd:sequence> -    <cd:string value="definestestartstop"/> +    <cd:string value="definestartstop"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -4163,9 +4151,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazatitluri" file="core-sec.tex"> +<cd:command name="setupheads" file="core-sec.tex">    <cd:sequence> -    <cd:string value="seteazatitluri"/> +    <cd:string value="setupheads"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4215,9 +4203,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazalegendele" file="page-flt.tex"> +<cd:command name="setupcaptions" file="page-flt.tex">    <cd:sequence> -    <cd:string value="seteazalegendele"/> +    <cd:string value="setupcaptions"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4296,23 +4284,23 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazalegenda" file="page-flt.tex"> +<cd:command name="setupcaption" file="page-flt.tex">    <cd:sequence> -    <cd:string value="seteazalegenda"/> +    <cd:string value="setupcaption"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="seteazalegendele"/> +      <cd:inherit name="setupcaptions"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="seteazafloats" file="page-flt.tex"> +<cd:command name="setupfloats" file="page-flt.tex">    <cd:sequence> -    <cd:string value="seteazafloats"/> +    <cd:string value="setupfloats"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4389,14 +4377,14 @@          <cd:constant type="normal"/>          <cd:constant type="linie"/>        </cd:parameter> -      <cd:inherit name="seteazainconjurat"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="seteazaimpartireafloat" file="page-flt.tex"> +<cd:command name="setupfloatsplitting" file="page-flt.tex">    <cd:sequence> -    <cd:string value="seteazaimpartireafloat"/> +    <cd:string value="setupfloatsplitting"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4414,22 +4402,22 @@    </cd:arguments>  </cd:command> -<cd:command name="impartefloat" file="page-flt.tex"> +<cd:command name="splitfloat" file="page-flt.tex">    <cd:sequence> -    <cd:string value="impartefloat"/> +    <cd:string value="splitfloat"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="seteazaimpartireafloat"/> +      <cd:inherit name="setupfloatsplitting"/>      </cd:assignments>      <cd:content/>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="seteazaplasareaopozita" file="page-ini.tex"> +<cd:command name="setupoppositeplacing" file="page-ini.tex">    <cd:sequence> -    <cd:string value="seteazaplasareaopozita"/> +    <cd:string value="setupoppositeplacing"/>    </cd:sequence>    <cd:arguments>      <cd:assignments> @@ -4454,13 +4442,11 @@    <cd:sequence>      <cd:string value="opposite"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="seteazaliniesilabe" file="core-mis.tex"> +<cd:command name="setuphyphenmark" file="core-mis.tex">    <cd:sequence> -    <cd:string value="seteazaliniesilabe"/> +    <cd:string value="setuphyphenmark"/>    </cd:sequence>    <cd:arguments>      <cd:assignments> @@ -4478,9 +4464,9 @@    </cd:arguments>  </cd:command> -<cd:command name="setarepozitie" file="page-lyr.tex"> +<cd:command name="setuppositioning" file="page-lyr.tex">    <cd:sequence> -    <cd:string value="setarepozitie"/> +    <cd:string value="setuppositioning"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4523,8 +4509,6 @@    <cd:sequence>      <cd:string value="positioning"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="grid" file="core-spa.tex"> @@ -4584,9 +4568,9 @@    </cd:arguments>  </cd:command> -<cd:command name="pagina" file="page-ini.tex"> +<cd:command name="page" file="page-ini.tex">    <cd:sequence> -    <cd:string value="pagina"/> +    <cd:string value="page"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -4611,9 +4595,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazareferinte" file="core-ref.tex"> +<cd:command name="setupreferencing" file="core-ref.tex">    <cd:sequence> -    <cd:string value="seteazareferinte"/> +    <cd:string value="setupreferencing"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4667,9 +4651,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazaurl" file="core-ref.tex"> +<cd:command name="setupurl" file="core-ref.tex">    <cd:sequence> -    <cd:string value="seteazaurl"/> +    <cd:string value="setupurl"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -4697,9 +4681,9 @@    </cd:arguments>  </cd:command> -<cd:command name="scrieinlistareferinte" file="core-lst.tex"> +<cd:command name="writetoreferencelist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="scrieinlistareferinte"/> +    <cd:string value="writetoreferencelist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -4710,9 +4694,9 @@    </cd:arguments>  </cd:command> -<cd:command name="punelistareferinte"> +<cd:command name="placereferencelist">    <cd:sequence> -    <cd:string value="punelistareferinte"/> +    <cd:string value="placereferencelist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -4721,23 +4705,23 @@    </cd:arguments>  </cd:command> -<cd:command name="definestelistareferinte" file="core-lst.tex"> +<cd:command name="definereferencelist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="definestelistareferinte"/> +    <cd:string value="definereferencelist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="seteazalistareferinte"/> +      <cd:inherit name="setupreferencelist"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="seteazalistareferinte" file="core-lst.tex"> +<cd:command name="setupreferencelist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="seteazalistareferinte"/> +    <cd:string value="setupreferencelist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -4767,9 +4751,9 @@    </cd:arguments>  </cd:command> -<cd:command name="scrieinlista" file="core-lst.tex"> +<cd:command name="writetolist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="scrieinlista"/> +    <cd:string value="writetolist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -4781,9 +4765,9 @@    </cd:arguments>  </cd:command> -<cd:command name="scrieintreliste" file="core-lst.tex"> +<cd:command name="writebetweenlist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="scrieintreliste"/> +    <cd:string value="writebetweenlist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -4794,9 +4778,9 @@    </cd:arguments>  </cd:command> -<cd:command name="faralista" file="core-lst.tex"> +<cd:command name="nolist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="faralista"/> +    <cd:string value="nolist"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -4815,51 +4799,51 @@    </cd:arguments>  </cd:command> -<cd:command name="punelista" file="core-lst.tex"> +<cd:command name="placelist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="punelista"/> +    <cd:string value="placelist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes">        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="seteazalista"/> +      <cd:inherit name="setuplist"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="determinacaracteristicilelistei" file="core-lst.tex"> +<cd:command name="determinelistcharacteristics" file="core-lst.tex">    <cd:sequence> -    <cd:string value="determinacaracteristicilelistei"/> +    <cd:string value="determinelistcharacteristics"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes">        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="seteazalista"/> +      <cd:inherit name="setuplist"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="punelistacombinata" file="core-lst.tex"> +<cd:command name="placecombinedlist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="punelistacombinata"/> +    <cd:string value="placecombinedlist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="seteazalistacombinata"/> +      <cd:inherit name="setupcombinedlist"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="definestelista" file="core-lst.tex"> +<cd:command name="definelist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="definestelista"/> +    <cd:string value="definelist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -4869,14 +4853,14 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="seteazalista"/> +      <cd:inherit name="setuplist"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="seteazalista" file="core-lst.tex"> +<cd:command name="setuplist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="seteazalista"/> +    <cd:string value="setuplist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -5052,9 +5036,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definestelistacombinata" file="core-lst.tex"> +<cd:command name="definecombinedlist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="definestelistacombinata"/> +    <cd:string value="definecombinedlist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -5064,14 +5048,14 @@        <cd:constant type="cd:list"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="seteazalistacombinata"/> +      <cd:inherit name="setupcombinedlist"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="seteazalistacombinata" file="core-lst.tex"> +<cd:command name="setupcombinedlist" file="core-lst.tex">    <cd:sequence> -    <cd:string value="seteazalistacombinata"/> +    <cd:string value="setupcombinedlist"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -5086,12 +5070,12 @@          <cd:constant type="cd:section"/>          <cd:constant type="curent"/>        </cd:parameter> -      <cd:inherit name="seteazalista"/> +      <cd:inherit name="setuplist"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="punelistacombinata" generated="yes" file="core-lst.tex"> +<cd:command name="placecombinedlist" generated="yes" file="core-lst.tex">    <cd:sequence>      <cd:string value="pune"/>      <cd:variable value="combinedlist"/> @@ -5101,7 +5085,7 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="seteazalistacombinata"/> +      <cd:inherit name="setupcombinedlist"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -5116,14 +5100,14 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="seteazalistacombinata"/> +      <cd:inherit name="setupcombinedlist"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="seteazanumerotare" file="core-num.tex"> +<cd:command name="setupnumbering" file="core-num.tex">    <cd:sequence> -    <cd:string value="seteazanumerotare"/> +    <cd:string value="setupnumbering"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -5199,18 +5183,18 @@    </cd:arguments>  </cd:command> -<cd:command name="publicatie" file="core-mis.tex"> +<cd:command name="publication" file="core-mis.tex">    <cd:sequence> -    <cd:string value="publicatie"/> +    <cd:string value="publication"/>    </cd:sequence>    <cd:arguments>      <cd:reference/>    </cd:arguments>  </cd:command> -<cd:command name="seteazapublicatii" file="core-mis.tex"> +<cd:command name="setuppublications" file="core-mis.tex">    <cd:sequence> -    <cd:string value="seteazapublicatii"/> +    <cd:string value="setuppublications"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -5218,14 +5202,14 @@          <cd:constant type="apa"/>          <cd:constant type="normal"/>        </cd:parameter> -      <cd:inherit name="seteazaenumerare"/> +      <cd:inherit name="setupenumerations"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="seteazalinii" file="page-lin.tex"> +<cd:command name="setuplines" file="page-lin.tex">    <cd:sequence> -    <cd:string value="seteazalinii"/> +    <cd:string value="setuplines"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -5252,13 +5236,11 @@    <cd:sequence>      <cd:string value="lines"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="seteazanumerotareparagrafe" file="page-lin.tex"> +<cd:command name="setupparagraphnumbering" file="page-lin.tex">    <cd:sequence> -    <cd:string value="seteazanumerotareparagrafe"/> +    <cd:string value="setupparagraphnumbering"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -5285,9 +5267,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazanumerotarelinii" file="page-lin.tex"> +<cd:command name="setuplinenumbering" file="page-lin.tex">    <cd:sequence> -    <cd:string value="seteazanumerotarelinii"/> +    <cd:string value="setuplinenumbering"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -5353,27 +5335,27 @@    </cd:arguments>  </cd:command> -<cd:command name="olinie" file="page-lin.tex"> +<cd:command name="someline" file="page-lin.tex">    <cd:sequence> -    <cd:string value="olinie"/> +    <cd:string value="someline"/>    </cd:sequence>    <cd:arguments>      <cd:reference/>    </cd:arguments>  </cd:command> -<cd:command name="inlinie" file="page-lin.tex"> +<cd:command name="inline" file="page-lin.tex">    <cd:sequence> -    <cd:string value="inlinie"/> +    <cd:string value="inline"/>    </cd:sequence>    <cd:arguments>      <cd:reference/>    </cd:arguments>  </cd:command> -<cd:command name="seteazamarginal" file="page-mar.tex"> +<cd:command name="setupinmargin" file="page-mar.tex">    <cd:sequence> -    <cd:string value="seteazamarginal"/> +    <cd:string value="setupinmargin"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -5432,14 +5414,14 @@          <cd:constant type="da"/>          <cd:constant type="nu"/>        </cd:parameter> -      <cd:inherit name="seteazainconjurat"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="seteazanumarpagina" file="page-num.tex"> +<cd:command name="setuppagenumber" file="page-num.tex">    <cd:sequence> -    <cd:string value="seteazanumarpagina"/> +    <cd:string value="setuppagenumber"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -5455,9 +5437,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazanumarsubpagina" file="page-num.tex"> +<cd:command name="setupsubpagenumber" file="page-num.tex">    <cd:sequence> -    <cd:string value="seteazanumarsubpagina"/> +    <cd:string value="setupsubpagenumber"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -5474,9 +5456,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazablanc"> +<cd:command name="setupblank">    <cd:sequence> -    <cd:string value="seteazablanc"/> +    <cd:string value="setupblank"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -5493,23 +5475,23 @@    </cd:arguments>  </cd:command> -<cd:command name="definesteblanc" file="core-spa.tex"> +<cd:command name="defineblank" file="core-spa.tex">    <cd:sequence> -    <cd:string value="definesteblanc"/> +    <cd:string value="defineblank"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:keywords> -      <cd:inherit name="seteazablanc"/> +      <cd:inherit name="setupblank"/>      </cd:keywords>    </cd:arguments>  </cd:command> -<cd:command name="definestedimensiunehartie" file="page-lay.tex"> +<cd:command name="definepapersize" file="page-lay.tex">    <cd:sequence> -    <cd:string value="definestedimensiunehartie"/> +    <cd:string value="definepapersize"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -5570,9 +5552,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazadimensiunihartie" file="page-lay.tex"> +<cd:command name="setuppapersize" file="page-lay.tex">    <cd:sequence> -    <cd:string value="seteazadimensiunihartie"/> +    <cd:string value="setuppapersize"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -5610,9 +5592,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazaaranjareapag" file="page-imp.tex"> +<cd:command name="setuparranging" file="page-imp.tex">    <cd:sequence> -    <cd:string value="seteazaaranjareapag"/> +    <cd:string value="setuparranging"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -5639,26 +5621,26 @@    </cd:arguments>  </cd:command> -<cd:command name="afiseazatiparire"> +<cd:command name="showprint">    <cd:sequence> -    <cd:string value="afiseazatiparire"/> +    <cd:string value="showprint"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> -      <cd:inherit name="seteazadimensiunihartie"/> +      <cd:inherit name="setuppapersize"/>      </cd:keywords>      <cd:keywords list="yes"> -      <cd:inherit name="seteazadimensiunihartie"/> +      <cd:inherit name="setuppapersize"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="seteazaaspect"/> +      <cd:inherit name="setuplayout"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="definestelogo" file="page-log.tex"> +<cd:command name="definelogo" file="page-log.tex">    <cd:sequence> -    <cd:string value="definestelogo"/> +    <cd:string value="definelogo"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -5694,9 +5676,9 @@    </cd:arguments>  </cd:command> -<cd:command name="punelogouri" file="page-log.tex"> +<cd:command name="placelogos" file="page-log.tex">    <cd:sequence> -    <cd:string value="punelogouri"/> +    <cd:string value="placelogos"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -5705,9 +5687,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazaspatiualb"> +<cd:command name="setupwhitespace">    <cd:sequence> -    <cd:string value="seteazaspatiualb"/> +    <cd:string value="setupwhitespace"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -5723,9 +5705,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazaaliniat"> +<cd:command name="setupindenting">    <cd:sequence> -    <cd:string value="seteazaaliniat"/> +    <cd:string value="setupindenting"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -5740,23 +5722,23 @@    </cd:arguments>  </cd:command> -<cd:command name="definesteblocsectiune" file="core-sec.tex"> +<cd:command name="definesectionblock" file="core-sec.tex">    <cd:sequence> -    <cd:string value="definesteblocsectiune"/> +    <cd:string value="definesectionblock"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="seteazablocsectiune"/> +      <cd:inherit name="setupsectionblock"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="seteazablocsectiune" file="core-sec.tex"> +<cd:command name="setupsectionblock" file="core-sec.tex">    <cd:sequence> -    <cd:string value="seteazablocsectiune"/> +    <cd:string value="setupsectionblock"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -5781,9 +5763,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definestesectiune" file="core-sec.tex"> +<cd:command name="definesection" file="core-sec.tex">    <cd:sequence> -    <cd:string value="definestesectiune"/> +    <cd:string value="definesection"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -5792,9 +5774,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazasectiune" file="core-sec.tex"> +<cd:command name="setupsection" file="core-sec.tex">    <cd:sequence> -    <cd:string value="seteazasectiune"/> +    <cd:string value="setupsection"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -5819,9 +5801,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazatitlu" file="core-sec.tex"> +<cd:command name="setuphead" file="core-sec.tex">    <cd:sequence> -    <cd:string value="seteazatitlu"/> +    <cd:string value="setuphead"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -5958,14 +5940,14 @@          <cd:constant type="da"/>          <cd:constant type="nu"/>        </cd:parameter> -      <cd:inherit name="seteazatitluri"/> +      <cd:inherit name="setupheads"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="seteazanumartitlu" file="core-sec.tex"> +<cd:command name="setupheadnumber" file="core-sec.tex">    <cd:sequence> -    <cd:string value="seteazanumartitlu"/> +    <cd:string value="setupheadnumber"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -5979,9 +5961,9 @@    </cd:arguments>  </cd:command> -<cd:command name="numartitlu"> +<cd:command name="headnumber">    <cd:sequence> -    <cd:string value="numartitlu"/> +    <cd:string value="headnumber"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -5990,9 +5972,9 @@    </cd:arguments>  </cd:command> -<cd:command name="determinanumartitlu" file="core-sec.tex"> +<cd:command name="determineheadnumber" file="core-sec.tex">    <cd:sequence> -    <cd:string value="determinanumartitlu"/> +    <cd:string value="determineheadnumber"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6001,9 +5983,9 @@    </cd:arguments>  </cd:command> -<cd:command name="numartitlucurent" file="core-sec.tex"> +<cd:command name="currentheadnumber" file="core-sec.tex">    <cd:sequence> -    <cd:string value="numartitlucurent"/> +    <cd:string value="currentheadnumber"/>    </cd:sequence>  </cd:command> @@ -6014,9 +5996,9 @@    </cd:sequence>  </cd:command> -<cd:command name="definesteantet" file="core-sec.tex"> +<cd:command name="definehead" file="core-sec.tex">    <cd:sequence> -    <cd:string value="definesteantet"/> +    <cd:string value="definehead"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6196,9 +6178,9 @@    </cd:arguments>  </cd:command> -<cd:command name="element"> +<cd:command name="item">    <cd:sequence> -    <cd:string value="element"/> +    <cd:string value="item"/>    </cd:sequence>    <cd:arguments>      <cd:reference optional="yes" list="yes"/> @@ -6214,9 +6196,9 @@    </cd:arguments>  </cd:command> -<cd:command name="el"> +<cd:command name="its">    <cd:sequence> -    <cd:string value="el"/> +    <cd:string value="its"/>    </cd:sequence>    <cd:arguments>      <cd:reference optional="yes" list="yes"/> @@ -6232,9 +6214,9 @@    </cd:arguments>  </cd:command> -<cd:command name="titlu"> +<cd:command name="head">    <cd:sequence> -    <cd:string value="titlu"/> +    <cd:string value="head"/>    </cd:sequence>    <cd:arguments>      <cd:reference optional="yes" list="yes"/> @@ -6260,9 +6242,9 @@    </cd:arguments>  </cd:command> -<cd:command name="sim" file="core-itm.tex"> +<cd:command name="sym" file="core-itm.tex">    <cd:sequence> -    <cd:string value="sim"/> +    <cd:string value="sym"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -6275,9 +6257,9 @@    </cd:sequence>  </cd:command> -<cd:command name="definesteregistru" file="core-reg.tex"> +<cd:command name="defineregister" file="core-reg.tex">    <cd:sequence> -    <cd:string value="definesteregistru"/> +    <cd:string value="defineregister"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6289,9 +6271,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazaregistru" file="core-reg.tex"> +<cd:command name="setupregister" file="core-reg.tex">    <cd:sequence> -    <cd:string value="seteazaregistru"/> +    <cd:string value="setupregister"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6434,9 +6416,9 @@    </cd:arguments>  </cd:command> -<cd:command name="scrieinregistru" file="core-reg.tex"> +<cd:command name="writetoregister" file="core-reg.tex">    <cd:sequence> -    <cd:string value="scrieinregistru"/> +    <cd:string value="writetoregister"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6462,9 +6444,9 @@    </cd:arguments>  </cd:command> -<cd:command name="cupleazaregistru" file="core-reg.tex"> +<cd:command name="coupleregister" file="core-reg.tex">    <cd:sequence> -    <cd:string value="cupleazaregistru"/> +    <cd:string value="coupleregister"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6473,16 +6455,16 @@    </cd:arguments>  </cd:command> -<cd:command name="puneregistru" file="core-reg.tex"> +<cd:command name="placeregister" file="core-reg.tex">    <cd:sequence> -    <cd:string value="puneregistru"/> +    <cd:string value="placeregister"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="seteazaregistru"/> +      <cd:inherit name="setupregister"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -6508,26 +6490,26 @@    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="yes" optional="yes" list="yes"> -      <cd:inherit name="seteazaregistru"/> +      <cd:inherit name="setupregister"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="puneregistru" generated="yes" file="core-reg.tex"> +<cd:command name="placeregister" generated="yes" file="core-reg.tex">    <cd:sequence>      <cd:string value="pune"/>      <cd:variable value="registru"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="yes" optional="yes" list="yes"> -      <cd:inherit name="seteazaregistru"/> +      <cd:inherit name="setupregister"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="definestesinonim" file="core-syn.tex"> +<cd:command name="definesynonyms" file="core-syn.tex">    <cd:sequence> -    <cd:string value="definestesinonim"/> +    <cd:string value="definesynonyms"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6545,9 +6527,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazasinonime" file="core-syn.tex"> +<cd:command name="setupsynonyms" file="core-syn.tex">    <cd:sequence> -    <cd:string value="seteazasinonime"/> +    <cd:string value="setupsynonyms"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6644,9 +6626,9 @@    </cd:sequence>  </cd:command> -<cd:command name="definestesortare" file="core-syn.tex"> +<cd:command name="definesorting" file="core-syn.tex">    <cd:sequence> -    <cd:string value="definestesortare"/> +    <cd:string value="definesorting"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6661,9 +6643,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazasortare" file="core-syn.tex"> +<cd:command name="setupsorting" file="core-syn.tex">    <cd:sequence> -    <cd:string value="seteazasortare"/> +    <cd:string value="setupsorting"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6739,16 +6721,16 @@    </cd:sequence>  </cd:command> -<cd:command name="definestemakeup" file="page-mak.tex"> +<cd:command name="definemakeup" file="page-mak.tex">    <cd:sequence> -    <cd:string value="definestemakeup"/> +    <cd:string value="definemakeup"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="seteazamakeup"/> +      <cd:inherit name="setupmakeup"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -6762,14 +6744,14 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="seteazamakeup"/> +      <cd:inherit name="setupmakeup"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="seteazamakeup" file="page-mak.tex"> +<cd:command name="setupmakeup" file="page-mak.tex">    <cd:sequence> -    <cd:string value="seteazamakeup"/> +    <cd:string value="setupmakeup"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6849,13 +6831,11 @@      <cd:variable value="nume"/>      <cd:string value="makeup"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="versiune"> +<cd:command name="version">    <cd:sequence> -    <cd:string value="versiune"/> +    <cd:string value="version"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -6866,20 +6846,20 @@    </cd:arguments>  </cd:command> -<cd:command name="datacurenta"> +<cd:command name="currentdate">    <cd:sequence> -    <cd:string value="datacurenta"/> +    <cd:string value="currentdate"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> -      <cd:inherit name="data"/> +      <cd:inherit name="date"/>      </cd:keywords>    </cd:arguments>  </cd:command> -<cd:command name="data" file="core-con.tex"> +<cd:command name="date" file="core-con.tex">    <cd:sequence> -    <cd:string value="data"/> +    <cd:string value="date"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> @@ -6898,15 +6878,15 @@    </cd:arguments>  </cd:command> -<cd:command name="datareferit" file="core-mis.tex"> +<cd:command name="referraldate" file="core-mis.tex">    <cd:sequence> -    <cd:string value="datareferit"/> +    <cd:string value="referraldate"/>    </cd:sequence>  </cd:command> -<cd:command name="aliniat" file="core-spa.tex"> +<cd:command name="indenting" file="core-spa.tex">    <cd:sequence> -    <cd:string value="aliniat"/> +    <cd:string value="indenting"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -6921,15 +6901,15 @@    </cd:arguments>  </cd:command> -<cd:command name="faraaliniat" file="core-spa.tex"> +<cd:command name="noindenting" file="core-spa.tex">    <cd:sequence> -    <cd:string value="faraaliniat"/> +    <cd:string value="noindenting"/>    </cd:sequence>  </cd:command> -<cd:command name="blanc" file="core-spa.tex"> +<cd:command name="blank" file="core-spa.tex">    <cd:sequence> -    <cd:string value="blanc"/> +    <cd:string value="blank"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -6952,9 +6932,9 @@    </cd:arguments>  </cd:command> -<cd:command name="impachetat" type="environment" file="core-spa.tex"> +<cd:command name="packed" type="environment" file="core-spa.tex">    <cd:sequence> -    <cd:string value="impachetat"/> +    <cd:string value="packed"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -6967,21 +6947,17 @@    <cd:sequence>      <cd:string value="unpacked"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="linecorrection" type="environment">    <cd:sequence>      <cd:string value="linecorrection"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="corecteazaspatiualb" file="core-spa.tex"> +<cd:command name="correctwhitespace" file="core-spa.tex">    <cd:sequence> -    <cd:string value="corecteazaspatiualb"/> +    <cd:string value="correctwhitespace"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -6992,16 +6968,12 @@    <cd:sequence>      <cd:string value="postponing"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="local" type="environment">    <cd:sequence>      <cd:string value="local"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="narrower" type="environment"> @@ -7021,13 +6993,11 @@    <cd:sequence>      <cd:string value="hiding"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="seteazaalinierea" file="core-spa.tex"> +<cd:command name="setupalign" file="core-spa.tex">    <cd:sequence> -    <cd:string value="seteazaalinierea"/> +    <cd:string value="setupalign"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7057,14 +7027,14 @@    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> -      <cd:inherit name="seteazaalinierea"/> +      <cd:inherit name="setupalign"/>      </cd:keywords>    </cd:arguments>  </cd:command> -<cd:command name="seteazaspatiu"> +<cd:command name="setupspacing">    <cd:sequence> -    <cd:string value="seteazaspatiu"/> +    <cd:string value="setupspacing"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7074,9 +7044,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazatoleranta" file="core-spa.tex"> +<cd:command name="setuptolerance" file="core-spa.tex">    <cd:sequence> -    <cd:string value="seteazatoleranta"/> +    <cd:string value="setuptolerance"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7092,9 +7062,9 @@    </cd:arguments>  </cd:command> -<cd:command name="tippagina" file="page-ini.tex"> +<cd:command name="pagetype" file="page-ini.tex">    <cd:sequence> -    <cd:string value="tippagina"/> +    <cd:string value="pagetype"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7103,9 +7073,9 @@    </cd:arguments>  </cd:command> -<cd:command name="proceseazapagina" file="page-ini.tex"> +<cd:command name="processpage" file="page-ini.tex">    <cd:sequence> -    <cd:string value="proceseazapagina"/> +    <cd:string value="processpage"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7118,9 +7088,9 @@    </cd:arguments>  </cd:command> -<cd:command name="paginadubla" file="page-ini.tex"> +<cd:command name="couplepage" file="page-ini.tex">    <cd:sequence> -    <cd:string value="paginadubla"/> +    <cd:string value="couplepage"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7140,9 +7110,9 @@    </cd:arguments>  </cd:command> -<cd:command name="pozitie" file="page-lyr.tex"> +<cd:command name="position" file="page-lyr.tex">    <cd:sequence> -    <cd:string value="pozitie"/> +    <cd:string value="position"/>    </cd:sequence>    <cd:arguments>      <cd:position list="yes"/> @@ -7150,9 +7120,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazaecrane" file="core-rul.tex"> +<cd:command name="setupscreens" file="core-rul.tex">    <cd:sequence> -    <cd:string value="seteazaecrane"/> +    <cd:string value="setupscreens"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -7174,9 +7144,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazafundaluri" file="page-bck.tex"> +<cd:command name="setupbackgrounds" file="page-bck.tex">    <cd:sequence> -    <cd:string value="seteazafundaluri"/> +    <cd:string value="setupbackgrounds"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -7203,7 +7173,7 @@          <cd:constant type="stop"/>          <cd:variable type="cd:repeat"/>        </cd:parameter> -      <cd:inherit name="seteazainconjurat"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -7219,9 +7189,9 @@    </cd:arguments>  </cd:command> -<cd:command name="adubuffer"> +<cd:command name="getbuffer">    <cd:sequence> -    <cd:string value="adubuffer"/> +    <cd:string value="getbuffer"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -7230,9 +7200,9 @@    </cd:arguments>  </cd:command> -<cd:command name="scriebuffer" file="core-buf.tex"> +<cd:command name="typebuffer" file="core-buf.tex">    <cd:sequence> -    <cd:string value="scriebuffer"/> +    <cd:string value="typebuffer"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7241,9 +7211,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definestebuffer" file="core-buf.tex"> +<cd:command name="definebuffer" file="core-buf.tex">    <cd:sequence> -    <cd:string value="definestebuffer"/> +    <cd:string value="definebuffer"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7252,9 +7222,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazabuffer" file="core-buf.tex"> +<cd:command name="setupbuffer" file="core-buf.tex">    <cd:sequence> -    <cd:string value="seteazabuffer"/> +    <cd:string value="setupbuffer"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -7274,9 +7244,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definestebloc" file="core-buf.tex"> +<cd:command name="defineblock" file="core-buf.tex">    <cd:sequence> -    <cd:string value="definestebloc"/> +    <cd:string value="defineblock"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7285,15 +7255,15 @@    </cd:arguments>  </cd:command> -<cd:command name="gatablocuri" file="core-buf.tex"> +<cd:command name="nomoreblocks" file="core-buf.tex">    <cd:sequence> -    <cd:string value="gatablocuri"/> +    <cd:string value="nomoreblocks"/>    </cd:sequence>  </cd:command> -<cd:command name="ascundeblocuri" file="core-buf.tex"> +<cd:command name="hideblocks" file="core-buf.tex">    <cd:sequence> -    <cd:string value="ascundeblocuri"/> +    <cd:string value="hideblocks"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7305,9 +7275,9 @@    </cd:arguments>  </cd:command> -<cd:command name="pastreazablocuri" file="core-buf.tex"> +<cd:command name="keepblocks" file="core-buf.tex">    <cd:sequence> -    <cd:string value="pastreazablocuri"/> +    <cd:string value="keepblocks"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7320,9 +7290,9 @@    </cd:arguments>  </cd:command> -<cd:command name="folosestebloc" file="core-buf.tex"> +<cd:command name="useblocks" file="core-buf.tex">    <cd:sequence> -    <cd:string value="folosestebloc"/> +    <cd:string value="useblocks"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7334,9 +7304,9 @@    </cd:arguments>  </cd:command> -<cd:command name="proceseazabloc" file="core-buf.tex"> +<cd:command name="processblocks" file="core-buf.tex">    <cd:sequence> -    <cd:string value="proceseazabloc"/> +    <cd:string value="processblocks"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7348,9 +7318,9 @@    </cd:arguments>  </cd:command> -<cd:command name="saripesteblocuri" file="core-buf.tex"> +<cd:command name="bypassblocks" file="core-buf.tex">    <cd:sequence> -    <cd:string value="saripesteblocuri"/> +    <cd:string value="bypassblocks"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7362,9 +7332,9 @@    </cd:arguments>  </cd:command> -<cd:command name="forteazablocuri"> +<cd:command name="forceblocks">    <cd:sequence> -    <cd:string value="forteazablocuri"/> +    <cd:string value="forceblocks"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7376,9 +7346,9 @@    </cd:arguments>  </cd:command> -<cd:command name="selecteazablocuri" file="core-buf.tex"> +<cd:command name="selectblocks" file="core-buf.tex">    <cd:sequence> -    <cd:string value="selecteazablocuri"/> +    <cd:string value="selectblocks"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7396,9 +7366,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazabloc" file="core-buf.tex"> +<cd:command name="setupblock" file="core-buf.tex">    <cd:sequence> -    <cd:string value="seteazabloc"/> +    <cd:string value="setupblock"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7435,22 +7405,20 @@    <cd:sequence>      <cd:variable value="formula"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="matematica" file="supp-mat.tex"> +<cd:command name="mathematics" file="supp-mat.tex">    <cd:sequence> -    <cd:string value="matematica"/> +    <cd:string value="mathematics"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="puneformula" file="core-mat.tex"> +<cd:command name="placeformula" file="core-mat.tex">    <cd:sequence> -    <cd:string value="puneformula"/> +    <cd:string value="placeformula"/>    </cd:sequence>    <cd:arguments>      <cd:reference optional="yes" list="yes"/> @@ -7459,9 +7427,9 @@    </cd:arguments>  </cd:command> -<cd:command name="punesubformula" file="core-mat.tex"> +<cd:command name="placesubformula" file="core-mat.tex">    <cd:sequence> -    <cd:string value="punesubformula"/> +    <cd:string value="placesubformula"/>    </cd:sequence>    <cd:arguments>      <cd:reference optional="yes" list="yes"/> @@ -7542,9 +7510,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definestefloat" file="page-flt.tex"> +<cd:command name="definefloat" file="page-flt.tex">    <cd:sequence> -    <cd:string value="definestefloat"/> +    <cd:string value="definefloat"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7556,9 +7524,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazafloat" file="page-flt.tex"> +<cd:command name="setupfloat" file="page-flt.tex">    <cd:sequence> -    <cd:string value="seteazafloat"/> +    <cd:string value="setupfloat"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7597,7 +7565,7 @@          <cd:constant type="centru"/>          <cd:constant type="dreapta"/>        </cd:parameter> -      <cd:inherit name="seteazainconjurat"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -7628,8 +7596,6 @@      <cd:string value="placelistof"/>      <cd:variable value="floats"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="completelistoffloats" generated="yes"> @@ -7637,13 +7603,11 @@      <cd:string value="completelistof"/>      <cd:variable value="floats"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="referit" file="core-mis.tex"> +<cd:command name="referral" file="core-mis.tex">    <cd:sequence> -    <cd:string value="referit"/> +    <cd:string value="referral"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -7669,9 +7633,9 @@    </cd:arguments>  </cd:command> -<cd:command name="selecteazahartie"> +<cd:command name="selectpaper">    <cd:sequence> -    <cd:string value="selecteazahartie"/> +    <cd:string value="selectpaper"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -7683,9 +7647,9 @@    </cd:arguments>  </cd:command> -<cd:command name="hartiedubla"> +<cd:command name="couplepaper">    <cd:sequence> -    <cd:string value="hartiedubla"/> +    <cd:string value="couplepaper"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7705,9 +7669,9 @@    </cd:arguments>  </cd:command> -<cd:command name="fractie" file="core-mis.tex"> +<cd:command name="fraction" file="core-mis.tex">    <cd:sequence> -    <cd:string value="fractie"/> +    <cd:string value="fraction"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -7715,9 +7679,9 @@    </cd:arguments>  </cd:command> -<cd:command name="puncte" file="core-mis.tex"> +<cd:command name="periods" file="core-mis.tex">    <cd:sequence> -    <cd:string value="puncte"/> +    <cd:string value="periods"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7726,30 +7690,21 @@    </cd:arguments>  </cd:command> -<cd:command name="domiciliu"> -  <cd:sequence> -    <cd:string value="domiciliu"/> -  </cd:sequence> -  <cd:arguments> -    <cd:content/> -  </cd:arguments> -</cd:command> - -<cd:command name="element"> +<cd:command name="items">    <cd:sequence> -    <cd:string value="element"/> +    <cd:string value="items"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="seteazaelemente"/> +      <cd:inherit name="setupitems"/>      </cd:assignments>      <cd:content list="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="seteazaelemente" file="core-mis.tex"> +<cd:command name="setupitems" file="core-mis.tex">    <cd:sequence> -    <cd:string value="seteazaelemente"/> +    <cd:string value="setupitems"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -7796,9 +7751,9 @@    </cd:arguments>  </cd:command> -<cd:command name="citat" type="environment" file="core-mis.tex"> +<cd:command name="quotation" type="environment" file="core-mis.tex">    <cd:sequence> -    <cd:string value="citat"/> +    <cd:string value="quotation"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -7809,27 +7764,27 @@    </cd:arguments>  </cd:command> -<cd:command name="citat" file="core-mis.tex"> +<cd:command name="quotation" file="core-mis.tex">    <cd:sequence> -    <cd:string value="citat"/> +    <cd:string value="quotation"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="minicitat" file="core-mis.tex"> +<cd:command name="quote" file="core-mis.tex">    <cd:sequence> -    <cd:string value="minicitat"/> +    <cd:string value="quote"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="seteazaminicitat" file="core-mis.tex"> +<cd:command name="setupquote" file="core-mis.tex">    <cd:sequence> -    <cd:string value="seteazaminicitat"/> +    <cd:string value="setupquote"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -7860,9 +7815,9 @@    </cd:arguments>  </cd:command> -<cd:command name="adauga"> +<cd:command name="adding">    <cd:sequence> -    <cd:string value="adauga"/> +    <cd:string value="adding"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7873,9 +7828,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definesteparagraf" file="core-mis.tex"> +<cd:command name="defineparagraphs" file="core-mis.tex">    <cd:sequence> -    <cd:string value="definesteparagraf"/> +    <cd:string value="defineparagraphs"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -7931,13 +7886,11 @@    <cd:sequence>      <cd:variable value="paragraf"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="seteazaparagrafe" file="core-mis.tex"> +<cd:command name="setupparagraphs" file="core-mis.tex">    <cd:sequence> -    <cd:string value="seteazaparagrafe"/> +    <cd:string value="setupparagraphs"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -8000,9 +7953,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazatab" file="core-mis.tex"> +<cd:command name="setuptab" file="core-mis.tex">    <cd:sequence> -    <cd:string value="seteazatab"/> +    <cd:string value="setuptab"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -8051,9 +8004,9 @@    </cd:arguments>  </cd:command> -<cd:command name="etichete"> +<cd:command name="labels">    <cd:sequence> -    <cd:string value="etichete"/> +    <cd:string value="labels"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -8062,9 +8015,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definestetabulatori" file="core-tbl.tex"> +<cd:command name="definetabulate" file="core-tbl.tex">    <cd:sequence> -    <cd:string value="definestetabulatori"/> +    <cd:string value="definetabulate"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -8088,14 +8041,14 @@        <cd:constant type="cd:text"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="folosestefiguraexterna"/> +      <cd:inherit name="useexternalfigure"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="seteazatabulatori" file="core-tbl.tex"> +<cd:command name="setuptabulate" file="core-tbl.tex">    <cd:sequence> -    <cd:string value="seteazatabulatori"/> +    <cd:string value="setuptabulate"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -8162,9 +8115,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazatabele" file="core-tab.tex"> +<cd:command name="setuptables" file="core-tab.tex">    <cd:sequence> -    <cd:string value="seteazatabele"/> +    <cd:string value="setuptables"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -8269,9 +8222,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definestesablontabel" file="core-tab.tex"> +<cd:command name="definetabletemplate" file="core-tab.tex">    <cd:sequence> -    <cd:string value="definestesablontabel"/> +    <cd:string value="definetabletemplate"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -8289,9 +8242,9 @@    </cd:arguments>  </cd:command> -<cd:command name="folosestefisiereexterne" file="core-mis.tex"> +<cd:command name="useexternalfiles" file="core-mis.tex">    <cd:sequence> -    <cd:string value="folosestefisiereexterne"/> +    <cd:string value="useexternalfiles"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -8312,9 +8265,9 @@    </cd:arguments>  </cd:command> -<cd:command name="folosestefisierextern" file="core-mis.tex"> +<cd:command name="useexternalfile" file="core-mis.tex">    <cd:sequence> -    <cd:string value="folosestefisierextern"/> +    <cd:string value="useexternalfile"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -8338,9 +8291,9 @@    </cd:arguments>  </cd:command> -<cd:command name="folosestefiguraexterna" file="core-fig.tex"> +<cd:command name="useexternalfigure" file="core-fig.tex">    <cd:sequence> -    <cd:string value="folosestefiguraexterna"/> +    <cd:string value="useexternalfigure"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -8423,23 +8376,23 @@    </cd:arguments>  </cd:command> -<cd:command name="figuraexterna" file="core-fig.tex"> +<cd:command name="externalfigure" file="core-fig.tex">    <cd:sequence> -    <cd:string value="figuraexterna"/> +    <cd:string value="externalfigure"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:file"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="folosestefiguraexterna"/> +      <cd:inherit name="useexternalfigure"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="seteazafiguriexterne" file="core-fig.tex"> +<cd:command name="setupexternalfigures" file="core-fig.tex">    <cd:sequence> -    <cd:string value="seteazafiguriexterne"/> +    <cd:string value="setupexternalfigures"/>    </cd:sequence>    <cd:arguments>      <cd:assignments> @@ -8481,9 +8434,9 @@    </cd:arguments>  </cd:command> -<cd:command name="afiseazafiguriexterne" file="core-fig.tex"> +<cd:command name="showexternalfigures" file="core-fig.tex">    <cd:sequence> -    <cd:string value="afiseazafiguriexterne"/> +    <cd:string value="showexternalfigures"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> @@ -8496,9 +8449,9 @@    </cd:arguments>  </cd:command> -<cd:command name="folosestemuzicaexterna" file="core-fig.tex"> +<cd:command name="useexternalsoundtrack" file="core-fig.tex">    <cd:sequence> -    <cd:string value="folosestemuzicaexterna"/> +    <cd:string value="useexternalsoundtrack"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -8548,21 +8501,21 @@    </cd:arguments>  </cd:command> -<cd:command name="roteste" file="core-mis.tex"> +<cd:command name="rotate" file="core-mis.tex">    <cd:sequence> -    <cd:string value="roteste"/> +    <cd:string value="rotate"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="seteazarotare"/> +      <cd:inherit name="setuprotate"/>      </cd:assignments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="seteazarotare" file="core-mis.tex"> +<cd:command name="setuprotate" file="core-mis.tex">    <cd:sequence> -    <cd:string value="seteazarotare"/> +    <cd:string value="setuprotate"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -8576,23 +8529,23 @@          <cd:constant type="broad"/>          <cd:constant type="adancime"/>        </cd:parameter> -      <cd:inherit name="seteazainconjurat"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="reflexie" file="core-mis.tex"> +<cd:command name="mirror" file="core-mis.tex">    <cd:sequence> -    <cd:string value="reflexie"/> +    <cd:string value="mirror"/>    </cd:sequence>    <cd:arguments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="scala" file="core-mis.tex"> +<cd:command name="scale" file="core-mis.tex">    <cd:sequence> -    <cd:string value="scala"/> +    <cd:string value="scale"/>    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> @@ -8607,9 +8560,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazacombinari" file="core-mis.tex"> +<cd:command name="setupcombinations" file="core-mis.tex">    <cd:sequence> -    <cd:string value="seteazacombinari"/> +    <cd:string value="setupcombinations"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -8674,9 +8627,9 @@    </cd:arguments>  </cd:command> -<cd:command name="punefatainfata" file="core-mis.tex"> +<cd:command name="placesidebyside" file="core-mis.tex">    <cd:sequence> -    <cd:string value="punefatainfata"/> +    <cd:string value="placesidebyside"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -8684,9 +8637,9 @@    </cd:arguments>  </cd:command> -<cd:command name="punedeasuprafiecareia" file="core-mis.tex"> +<cd:command name="placeontopofeachother" file="core-mis.tex">    <cd:sequence> -    <cd:string value="punedeasuprafiecareia"/> +    <cd:string value="placeontopofeachother"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -8715,9 +8668,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazaecraninteractiune" file="core-int.tex"> +<cd:command name="setupinteractionscreen" file="core-int.tex">    <cd:sequence> -    <cd:string value="seteazaecraninteractiune"/> +    <cd:string value="setupinteractionscreen"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" list="yes"> @@ -8757,17 +8710,15 @@    </cd:arguments>  </cd:command> -<cd:command name="ecran" file="core-int.tex"> +<cd:command name="screen" file="core-int.tex">    <cd:sequence> -    <cd:string value="ecran"/> +    <cd:string value="screen"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="seteazatranzitiepagina" file="core-int.tex"> +<cd:command name="setuppagetransitions" file="core-int.tex">    <cd:sequence> -    <cd:string value="seteazatranzitiepagina"/> +    <cd:string value="setuppagetransitions"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -8777,9 +8728,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazainteractiunea" file="core-nav.tex"> +<cd:command name="setupinteraction" file="core-nav.tex">    <cd:sequence> -    <cd:string value="seteazainteractiunea"/> +    <cd:string value="setupinteraction"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" list="yes"> @@ -8871,9 +8822,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definestemeniuinteractiune" file="core-int.tex"> +<cd:command name="defineinteractionmenu" file="core-int.tex">    <cd:sequence> -    <cd:string value="definestemeniuinteractiune"/> +    <cd:string value="defineinteractionmenu"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive" list="yes"> @@ -8952,14 +8903,14 @@          <cd:constant type="da"/>          <cd:constant type="nu"/>        </cd:parameter> -      <cd:inherit name="seteazainconjurat"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="definestemeniuinteractiune" file="core-int.tex"> +<cd:command name="defineinteractionmenu" file="core-int.tex">    <cd:sequence> -    <cd:string value="definestemeniuinteractiune"/> +    <cd:string value="defineinteractionmenu"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -8977,14 +8928,14 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="seteazameniuinteractiune"/> +      <cd:inherit name="setupinteractionmenu"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="meniuinteractiune" type="environment"> +<cd:command name="interactionmenu" type="environment">    <cd:sequence> -    <cd:string value="meniuinteractiune"/> +    <cd:string value="interactionmenu"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -8993,9 +8944,9 @@    </cd:arguments>  </cd:command> -<cd:command name="dezactiveazameniuinteractiune" file="core-int.tex"> +<cd:command name="disableinteractionmenu" file="core-int.tex">    <cd:sequence> -    <cd:string value="dezactiveazameniuinteractiune"/> +    <cd:string value="disableinteractionmenu"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -9009,9 +8960,9 @@    </cd:arguments>  </cd:command> -<cd:command name="folosestedocumentextern" file="core-ref.tex"> +<cd:command name="useexternaldocument" file="core-ref.tex">    <cd:sequence> -    <cd:string value="folosestedocumentextern"/> +    <cd:string value="useexternaldocument"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -9026,9 +8977,9 @@    </cd:arguments>  </cd:command> -<cd:command name="folosesteURL" file="core-ref.tex"> +<cd:command name="useURL" file="core-ref.tex">    <cd:sequence> -    <cd:string value="folosesteURL"/> +    <cd:string value="useURL"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -9046,9 +8997,9 @@    </cd:arguments>  </cd:command> -<cd:command name="cupleazadocument" file="core-ref.tex"> +<cd:command name="coupledocument" file="core-ref.tex">    <cd:sequence> -    <cd:string value="cupleazadocument"/> +    <cd:string value="coupledocument"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -9063,33 +9014,33 @@    </cd:arguments>  </cd:command> -<cd:command name="din" file="core-ref.tex"> +<cd:command name="from" file="core-ref.tex">    <cd:sequence> -    <cd:string value="din"/> +    <cd:string value="from"/>    </cd:sequence>    <cd:arguments>      <cd:reference interactive="exclusive"/>    </cd:arguments>  </cd:command> -<cd:command name="barainteractiune"> +<cd:command name="interactionbar">    <cd:sequence> -    <cd:string value="barainteractiune"/> +    <cd:string value="interactionbar"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" list="yes"> -      <cd:inherit name="seteazabarainteractiune"/> +      <cd:inherit name="setupinteractionbar"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="butoaneinteractiune" file="core-ref.tex"> +<cd:command name="interactionbuttons" file="core-ref.tex">    <cd:sequence> -    <cd:string value="butoaneinteractiune"/> +    <cd:string value="interactionbuttons"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" optional="yes" list="yes"> -      <cd:inherit name="seteazabarainteractiune"/> +      <cd:inherit name="setupinteractionbar"/>      </cd:assignments>      <cd:keywords list="yes">        <cd:constant type="cd:name"/> @@ -9097,9 +9048,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazabarainteractiune" file="core-int.tex"> +<cd:command name="setupinteractionbar" file="core-int.tex">    <cd:sequence> -    <cd:string value="seteazabarainteractiune"/> +    <cd:string value="setupinteractionbar"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" list="yes"> @@ -9142,30 +9093,26 @@          <cd:constant type="mediu"/>          <cd:constant type="mare"/>        </cd:parameter> -      <cd:inherit name="seteazainconjurat"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="sincronizeaza" file="core-int.tex"> +<cd:command name="synchronize" file="core-int.tex">    <cd:sequence> -    <cd:string value="sincronizeaza"/> +    <cd:string value="synchronize"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command>  <cd:command name="synchronization" type="environment">    <cd:sequence>      <cd:string value="synchronization"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="setarebarasincronizare" file="core-int.tex"> +<cd:command name="setupsynchronizationbar" file="core-int.tex">    <cd:sequence> -    <cd:string value="setarebarasincronizare"/> +    <cd:string value="setupsynchronizationbar"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" list="yes"> @@ -9194,14 +9141,14 @@        <cd:parameter name="culoare">          <cd:constant type="cd:name"/>        </cd:parameter> -      <cd:inherit name="seteazainconjurat"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="barasincronizare" file="core-int.tex"> +<cd:command name="synchronizationbar" file="core-int.tex">    <cd:sequence> -    <cd:string value="barasincronizare"/> +    <cd:string value="synchronizationbar"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -9212,14 +9159,14 @@          <cd:constant type="pagina"/>          <cd:constant type="local"/>        </cd:parameter> -      <cd:inherit name="setarebarasincronizare"/> +      <cd:inherit name="setupsynchronizationbar"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="setaresincronizare" file="core-int.tex"> +<cd:command name="setupsynchronization" file="core-int.tex">    <cd:sequence> -    <cd:string value="setaresincronizare"/> +    <cd:string value="setupsynchronization"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" list="yes"> @@ -9231,9 +9178,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definesteprofil" file="core-int.tex"> +<cd:command name="defineprofile" file="core-int.tex">    <cd:sequence> -    <cd:string value="definesteprofil"/> +    <cd:string value="defineprofile"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive" list="yes"> @@ -9245,9 +9192,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazaprofile" file="core-int.tex"> +<cd:command name="setupprofiles" file="core-int.tex">    <cd:sequence> -    <cd:string value="seteazaprofile"/> +    <cd:string value="setupprofiles"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" list="yes"> @@ -9269,9 +9216,9 @@    </cd:arguments>  </cd:command> -<cd:command name="urmeazaprofil" file="core-int.tex"> +<cd:command name="followprofile" file="core-int.tex">    <cd:sequence> -    <cd:string value="urmeazaprofil"/> +    <cd:string value="followprofile"/>    </cd:sequence>    <cd:arguments>      <cd:content interactive="exclusive"/> @@ -9281,9 +9228,9 @@    </cd:arguments>  </cd:command> -<cd:command name="plaseazasemnecarte" file="core-int.tex"> +<cd:command name="placebookmarks" file="core-int.tex">    <cd:sequence> -    <cd:string value="plaseazasemnecarte"/> +    <cd:string value="placebookmarks"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -9294,9 +9241,9 @@    </cd:arguments>  </cd:command> -<cd:command name="semncarte"> +<cd:command name="bookmark">    <cd:sequence> -    <cd:string value="semncarte"/> +    <cd:string value="bookmark"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -9306,9 +9253,9 @@    </cd:arguments>  </cd:command> -<cd:command name="versiune" type="environment"> +<cd:command name="version" type="environment">    <cd:sequence> -    <cd:string value="versiune"/> +    <cd:string value="version"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive" list="yes"> @@ -9317,9 +9264,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazaversiuni" file="core-int.tex"> +<cd:command name="setupversions" file="core-int.tex">    <cd:sequence> -    <cd:string value="seteazaversiuni"/> +    <cd:string value="setupversions"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -9340,23 +9287,21 @@    </cd:arguments>  </cd:command> -<cd:command name="marcheazaversiune" file="core-int.tex"> +<cd:command name="markversion" file="core-int.tex">    <cd:sequence> -    <cd:string value="marcheazaversiune"/> +    <cd:string value="markversion"/>    </cd:sequence> -  <cd:arguments> -  </cd:arguments>  </cd:command> -<cd:command name="selecteazaversiune" file="core-int.tex"> +<cd:command name="selectversion" file="core-int.tex">    <cd:sequence> -    <cd:string value="selecteazaversiune"/> +    <cd:string value="selectversion"/>    </cd:sequence>  </cd:command> -<cd:command name="definesteversiune" file="core-int.tex"> +<cd:command name="defineversion" file="core-int.tex">    <cd:sequence> -    <cd:string value="definesteversiune"/> +    <cd:string value="defineversion"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9368,9 +9313,9 @@    </cd:arguments>  </cd:command> -<cd:command name="urmeazaversiune" file="core-int.tex"> +<cd:command name="followversion" file="core-int.tex">    <cd:sequence> -    <cd:string value="urmeazaversiune"/> +    <cd:string value="followversion"/>    </cd:sequence>    <cd:arguments>      <cd:content interactive="exclusive"/> @@ -9380,9 +9325,9 @@    </cd:arguments>  </cd:command> -<cd:command name="urmeazaversiuneprofil" file="core-int.tex"> +<cd:command name="followprofileversion" file="core-int.tex">    <cd:sequence> -    <cd:string value="urmeazaversiuneprofil"/> +    <cd:string value="followprofileversion"/>    </cd:sequence>    <cd:arguments>      <cd:content interactive="exclusive"/> @@ -9395,9 +9340,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definesteprogram" file="core-ref.tex"> +<cd:command name="defineprogram" file="core-ref.tex">    <cd:sequence> -    <cd:string value="definesteprogram"/> +    <cd:string value="defineprogram"/>    </cd:sequence>    <cd:arguments>      <cd:keywords interactive="exclusive"> @@ -9412,9 +9357,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazaprograme" file="core-ref.tex"> +<cd:command name="setupprograms" file="core-ref.tex">    <cd:sequence> -    <cd:string value="seteazaprograme"/> +    <cd:string value="setupprograms"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" list="yes"> @@ -9465,9 +9410,9 @@  <!-- remark skipped --> -<cd:command name="dute" file="core-ref.tex"> +<cd:command name="goto" file="core-ref.tex">    <cd:sequence> -    <cd:string value="dute"/> +    <cd:string value="goto"/>    </cd:sequence>    <cd:arguments>      <cd:content interactive="exclusive"/> @@ -9476,9 +9421,9 @@    </cd:arguments>  </cd:command> -<cd:command name="dutebox" file="core-ref.tex"> +<cd:command name="gotobox" file="core-ref.tex">    <cd:sequence> -    <cd:string value="dutebox"/> +    <cd:string value="gotobox"/>    </cd:sequence>    <cd:arguments>      <cd:content interactive="exclusive"/> @@ -9486,22 +9431,22 @@    </cd:arguments>  </cd:command> -<cd:command name="buton"> +<cd:command name="button">    <cd:sequence> -    <cd:string value="buton"/> +    <cd:string value="button"/>    </cd:sequence>    <cd:arguments>      <cd:assignments interactive="exclusive" optional="yes" list="yes"> -      <cd:inherit name="seteazabutoane"/> +      <cd:inherit name="setupbuttons"/>      </cd:assignments>      <cd:content/>      <cd:reference list="yes"/>    </cd:arguments>  </cd:command> -<cd:command name="seteazabutoane" file="core-ref.tex"> +<cd:command name="setupbuttons" file="core-ref.tex">    <cd:sequence> -    <cd:string value="seteazabutoane"/> +    <cd:string value="setupbuttons"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -9509,16 +9454,16 @@          <cd:constant type="start"/>          <cd:constant type="stop"/>        </cd:parameter> -      <cd:inherit name="seteazainconjurat"/> +      <cd:inherit name="setupframed"/>      </cd:assignments>    </cd:arguments>  </cd:command>  <!-- menubutton skipped --> -<cd:command name="seteazacomentariu" file="core-int.tex"> +<cd:command name="setupcomment" file="core-int.tex">    <cd:sequence> -    <cd:string value="seteazacomentariu"/> +    <cd:string value="setupcomment"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -9566,38 +9511,38 @@    </cd:arguments>  </cd:command> -<cd:command name="comentariu" type="environment"> +<cd:command name="comment" type="environment">    <cd:sequence> -    <cd:string value="comentariu"/> +    <cd:string value="comment"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes">        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="seteazacomentariu"/> +      <cd:inherit name="setupcomment"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="comentariu"> +<cd:command name="comment">    <cd:sequence> -    <cd:string value="comentariu"/> +    <cd:string value="comment"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes">        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="seteazacomentariu"/> +      <cd:inherit name="setupcomment"/>      </cd:assignments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="definestecamp" file="core-fld.tex"> +<cd:command name="definefield" file="core-fld.tex">    <cd:sequence> -    <cd:string value="definestecamp"/> +    <cd:string value="definefield"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9618,9 +9563,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definestesubcamp" file="core-fld.tex"> +<cd:command name="definesubfield" file="core-fld.tex">    <cd:sequence> -    <cd:string value="definestesubcamp"/> +    <cd:string value="definesubfield"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9635,9 +9580,9 @@    </cd:arguments>  </cd:command> -<cd:command name="copiazacamp" file="core-fld.tex"> +<cd:command name="copyfield" file="core-fld.tex">    <cd:sequence> -    <cd:string value="copiazacamp"/> +    <cd:string value="copyfield"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9649,9 +9594,9 @@    </cd:arguments>  </cd:command> -<cd:command name="cloneazacamp" file="core-fld.tex"> +<cd:command name="clonefield" file="core-fld.tex">    <cd:sequence> -    <cd:string value="cloneazacamp"/> +    <cd:string value="clonefield"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9669,9 +9614,9 @@    </cd:arguments>  </cd:command> -<cd:command name="camp" file="core-fld.tex"> +<cd:command name="field" file="core-fld.tex">    <cd:sequence> -    <cd:string value="camp"/> +    <cd:string value="field"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9680,9 +9625,9 @@    </cd:arguments>  </cd:command> -<cd:command name="potrivestecamp" file="core-fld.tex"> +<cd:command name="fitfield" file="core-fld.tex">    <cd:sequence> -    <cd:string value="potrivestecamp"/> +    <cd:string value="fitfield"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9691,9 +9636,9 @@    </cd:arguments>  </cd:command> -<cd:command name="campumplere" file="core-fld.tex"> +<cd:command name="fillinfield" file="core-fld.tex">    <cd:sequence> -    <cd:string value="campumplere"/> +    <cd:string value="fillinfield"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes"> @@ -9718,9 +9663,9 @@    </cd:arguments>  </cd:command> -<cd:command name="afiseazacampuri" file="core-fld.tex"> +<cd:command name="showfields" file="core-fld.tex">    <cd:sequence> -    <cd:string value="afiseazacampuri"/> +    <cd:string value="showfields"/>    </cd:sequence>    <cd:arguments>      <cd:keywords optional="yes" list="yes"> @@ -9729,15 +9674,15 @@    </cd:arguments>  </cd:command> -<cd:command name="logcampuri" file="core-fld.tex"> +<cd:command name="logfields" file="core-fld.tex">    <cd:sequence> -    <cd:string value="logcampuri"/> +    <cd:string value="logfields"/>    </cd:sequence>  </cd:command> -<cd:command name="seteazacamp" file="core-fld.tex"> +<cd:command name="setupfield" file="core-fld.tex">    <cd:sequence> -    <cd:string value="seteazacamp"/> +    <cd:string value="setupfield"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9750,7 +9695,7 @@        <cd:constant type="incadrat"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="seteazacampuri"/> +      <cd:inherit name="setupfields"/>      </cd:assignments>      <cd:assignments list="yes">      </cd:assignments> @@ -9759,9 +9704,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazacampuri" file="core-fld.tex"> +<cd:command name="setupfields" file="core-fld.tex">    <cd:sequence> -    <cd:string value="seteazacampuri"/> +    <cd:string value="setupfields"/>    </cd:sequence>    <cd:arguments>      <cd:keywords list="yes"> @@ -9856,9 +9801,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazaformulare" file="core-fld.tex"> +<cd:command name="setupforms" file="core-fld.tex">    <cd:sequence> -    <cd:string value="seteazaformulare"/> +    <cd:string value="setupforms"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -9870,9 +9815,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definestestivacampuri" file="core-fld.tex"> +<cd:command name="definefieldstack" file="core-fld.tex">    <cd:sequence> -    <cd:string value="definestestivacampuri"/> +    <cd:string value="definefieldstack"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9882,14 +9827,14 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="seteazacampuri"/> +      <cd:inherit name="setupfields"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="stivacampuri" file="core-fld.tex"> +<cd:command name="fieldstack" file="core-fld.tex">    <cd:sequence> -    <cd:string value="stivacampuri"/> +    <cd:string value="fieldstack"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -9899,7 +9844,7 @@        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="seteazacampuri"/> +      <cd:inherit name="setupfields"/>      </cd:assignments>    </cd:arguments>  </cd:command> @@ -9910,15 +9855,15 @@    </cd:sequence>    <cd:arguments>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="seteazaclipping"/> +      <cd:inherit name="setupclipping"/>      </cd:assignments>      <cd:content/>    </cd:arguments>  </cd:command> -<cd:command name="seteazaclipping" file="core-fig.tex"> +<cd:command name="setupclipping" file="core-fig.tex">    <cd:sequence> -    <cd:string value="seteazaclipping"/> +    <cd:string value="setupclipping"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -9953,9 +9898,9 @@    </cd:arguments>  </cd:command> -<cd:command name="punelegenda"> +<cd:command name="placelegend">    <cd:sequence> -    <cd:string value="punelegenda"/> +    <cd:string value="placelegend"/>    </cd:sequence>    <cd:arguments>      <cd:content/> @@ -9963,9 +9908,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazalegenda"> +<cd:command name="setuplegend">    <cd:sequence> -    <cd:string value="seteazalegenda"/> +    <cd:string value="setuplegend"/>    </cd:sequence>    <cd:arguments>      <cd:assignments list="yes"> @@ -9999,23 +9944,23 @@    </cd:arguments>  </cd:command> -<cd:command name="definesterigla"> +<cd:command name="definerule">    <cd:sequence> -    <cd:string value="definesterigla"/> +    <cd:string value="definerule"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="seteazarigla"/> +      <cd:inherit name="setuprule"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="punerigla"> +<cd:command name="placerule">    <cd:sequence> -    <cd:string value="punerigla"/> +    <cd:string value="placerule"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -10024,9 +9969,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazarigla"> +<cd:command name="setuprule">    <cd:sequence> -    <cd:string value="seteazarigla"/> +    <cd:string value="setuprule"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -10055,13 +10000,13 @@    </cd:arguments>  </cd:command> -<cd:command name="definestevariabilatext"> +<cd:command name="definetextvariable">    <cd:sequence> -    <cd:string value="definestevariabilatext"/> +    <cd:string value="definetextvariable"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> -      <cd:inherit name="seteazavariabilatext"/> +      <cd:inherit name="setuptextvariable"/>      </cd:keywords>      <cd:keywords optional="yes">      </cd:keywords> @@ -10070,9 +10015,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazavariabilatext"> +<cd:command name="setuptextvariable">    <cd:sequence> -    <cd:string value="seteazavariabilatext"/> +    <cd:string value="setuptextvariable"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -10101,9 +10046,9 @@    </cd:arguments>  </cd:command> -<cd:command name="setvariabilatext"> +<cd:command name="settextvariable">    <cd:sequence> -    <cd:string value="setvariabilatext"/> +    <cd:string value="settextvariable"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -10115,9 +10060,9 @@    </cd:arguments>  </cd:command> -<cd:command name="punevariabilatext"> +<cd:command name="placetextvariable">    <cd:sequence> -    <cd:string value="punevariabilatext"/> +    <cd:string value="placetextvariable"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -10126,9 +10071,9 @@    </cd:arguments>  </cd:command> -<cd:command name="variabilatext"> +<cd:command name="textvariable">    <cd:sequence> -    <cd:string value="variabilatext"/> +    <cd:string value="textvariable"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -10137,9 +10082,9 @@    </cd:arguments>  </cd:command> -<cd:command name="definestefontraw"> +<cd:command name="definerawfont">    <cd:sequence> -    <cd:string value="definestefontraw"/> +    <cd:string value="definerawfont"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -10149,14 +10094,14 @@        <cd:constant type="cd:file"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="seteazaspatiuinterliniar"/> +      <cd:inherit name="setupinterlinespace"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="trecilafontraw"> +<cd:command name="switchtorawfont">    <cd:sequence> -    <cd:string value="trecilafontraw"/> +    <cd:string value="switchtorawfont"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -10165,37 +10110,37 @@    </cd:arguments>  </cd:command> -<cd:command name="definestepozitietext"> +<cd:command name="definetextposition">    <cd:sequence> -    <cd:string value="definestepozitietext"/> +    <cd:string value="definetextposition"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments optional="yes" list="yes"> -      <cd:inherit name="setarepozitie"/> +      <cd:inherit name="setuppositioning"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="seteazapozitietext"> +<cd:command name="setuptextposition">    <cd:sequence> -    <cd:string value="seteazapozitietext"/> +    <cd:string value="setuptextposition"/>    </cd:sequence>    <cd:arguments>      <cd:keywords>        <cd:constant type="cd:name"/>      </cd:keywords>      <cd:assignments list="yes"> -      <cd:inherit name="setarepozitie"/> +      <cd:inherit name="setuppositioning"/>      </cd:assignments>    </cd:arguments>  </cd:command> -<cd:command name="pozitietext"> +<cd:command name="positiontext">    <cd:sequence> -    <cd:string value="pozitietext"/> +    <cd:string value="positiontext"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> @@ -10205,9 +10150,9 @@    </cd:arguments>  </cd:command> -<cd:command name="seteazastrut" file="core-spa.tex"> +<cd:command name="setupstrut" file="core-spa.tex">    <cd:sequence> -    <cd:string value="seteazastrut"/> +    <cd:string value="setupstrut"/>    </cd:sequence>    <cd:arguments>      <cd:keywords> diff --git a/tex/context/interface/keys-cz.xml b/tex/context/interface/keys-cz.xml index 45e6fbaeb..b29c2e64e 100644 --- a/tex/context/interface/keys-cz.xml +++ b/tex/context/interface/keys-cz.xml @@ -1,6 +1,6 @@  <?xml version="1.0"?> -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2004.11.16"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2004.11.22">    <cd:variables>      <cd:variable name="one" value="jedna"/> diff --git a/tex/context/interface/keys-de.xml b/tex/context/interface/keys-de.xml index 75a9707b8..b3f772a1a 100644 --- a/tex/context/interface/keys-de.xml +++ b/tex/context/interface/keys-de.xml @@ -1,6 +1,6 @@  <?xml version="1.0"?> -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2004.11.16"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2004.11.22">    <cd:variables>      <cd:variable name="one" value="eins"/> diff --git a/tex/context/interface/keys-en.xml b/tex/context/interface/keys-en.xml index 9c96ec88d..a736cfceb 100644 --- a/tex/context/interface/keys-en.xml +++ b/tex/context/interface/keys-en.xml @@ -1,6 +1,6 @@  <?xml version="1.0"?> -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2004.11.16"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2004.11.22">    <cd:variables>      <cd:variable name="one" value="one"/> diff --git a/tex/context/interface/keys-it.xml b/tex/context/interface/keys-it.xml index 17c7efb39..3827e7126 100644 --- a/tex/context/interface/keys-it.xml +++ b/tex/context/interface/keys-it.xml @@ -1,6 +1,6 @@  <?xml version="1.0"?> -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2004.11.16"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2004.11.22">    <cd:variables>      <cd:variable name="one" value="uno"/> diff --git a/tex/context/interface/keys-nl.xml b/tex/context/interface/keys-nl.xml index a7ffdf695..851c11888 100644 --- a/tex/context/interface/keys-nl.xml +++ b/tex/context/interface/keys-nl.xml @@ -1,6 +1,6 @@  <?xml version="1.0"?> -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2004.11.16"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2004.11.22">    <cd:variables>      <cd:variable name="one" value="een"/> diff --git a/tex/context/interface/keys-ro.xml b/tex/context/interface/keys-ro.xml index 4f16a5ac0..90d7c10ba 100644 --- a/tex/context/interface/keys-ro.xml +++ b/tex/context/interface/keys-ro.xml @@ -1,6 +1,6 @@  <?xml version="1.0"?> -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2004.11.16"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2004.11.22">    <cd:variables>      <cd:variable name="one" value="unu"/> diff --git a/tex/context/user/cont-sys.rme b/tex/context/user/cont-sys.rme index ad48b73fb..a37731782 100644 --- a/tex/context/user/cont-sys.rme +++ b/tex/context/user/cont-sys.rme @@ -60,12 +60,14 @@  % \preloadmapfile[ec-base.map]  % \preloadmapfile[8r-base.map]  % \preloadmapfile[qx-base.map] +% \preloadmapfile[t5-base.map]  % \preloadmapfile[texnansi-base.map]  % \preloadmapfile[original-ams-cmr.map]  % \preloadmapfile[original-ams-euler.map]  % \preloadmapfile[original-public-lm.map]  % \preloadmapfile[original-public-plr.map]  % \preloadmapfile[original-public-csr.map] +% \preloadmapfile[original-public-vnr.map]  %  % (2) otherwise, use this if you have a fast machine  % @@ -79,12 +81,14 @@  \loadmapfile[ec-base.map]  \loadmapfile[8r-base.map]  \loadmapfile[qx-base.map] +\loadmapfile[t5-base.map]  \loadmapfile[texnansi-base.map]  \loadmapfile[original-ams-cmr.map]  \loadmapfile[original-ams-euler.map]  \loadmapfile[original-public-lm.map]  \loadmapfile[original-public-plr.map]  \loadmapfile[original-public-csr.map] +\loadmapfile[original-public-vnr.map]  \loadmapfile[texnansi-public-lm.map]  \loadmapfile[ec-public-lm.map]  | 
