diff options
author | Karl Berry <karl@freefriends.org> | 2006-11-18 01:37:52 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2006-11-18 01:37:52 +0000 |
commit | 5c91b9f8a88e06f057a6a08b0a755a224d08e019 (patch) | |
tree | 57cfafb6bd6c146dcdfc911dbef8db622c6476bd /Master/texmf-dist/tex/context/interface | |
parent | 983736c2ab572e9a860c74f0f781b3decd282f13 (diff) |
context 17nov06 update
git-svn-id: svn://tug.org/texlive/trunk@2449 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/context/interface')
-rw-r--r-- | Master/texmf-dist/tex/context/interface/cont-cz.xml | 137 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/interface/cont-de.xml | 137 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/interface/cont-en.xml | 137 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/interface/cont-fr.xml | 139 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/interface/cont-it.xml | 137 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/interface/cont-nl.xml | 137 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/interface/cont-ro.xml | 137 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/interface/keys-cz.xml | 11 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/interface/keys-de.xml | 11 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/interface/keys-en.xml | 11 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/interface/keys-fr.xml | 15 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/interface/keys-it.xml | 11 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/interface/keys-nl.xml | 11 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/interface/keys-ro.xml | 11 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/interface/t-bib.xml | 7 |
15 files changed, 843 insertions, 206 deletions
diff --git a/Master/texmf-dist/tex/context/interface/cont-cz.xml b/Master/texmf-dist/tex/context/interface/cont-cz.xml index 50e15bb31b0..8ec1415b9b5 100644 --- a/Master/texmf-dist/tex/context/interface/cont-cz.xml +++ b/Master/texmf-dist/tex/context/interface/cont-cz.xml @@ -59,22 +59,36 @@ </cd:define> <cd:define name="language"> - <cd:constant type="nl"/> - <cd:constant type="fr"/> - <cd:constant type="en"/> - <cd:constant type="uk"/> - <cd:constant type="de"/> - <cd:constant type="es"/> - <cd:constant type="cz"/> - <cd:constant type=".."/> + <cd:constant type="nl"/> + <cd:constant type="fr"/> + <cd:constant type="en"/> + <cd:constant type="uk"/> + <cd:constant type="de"/> + <cd:constant type="es"/> + <cd:constant type="cz"/> + <cd:constant type=".."/> </cd:define> <cd:define name="texts"> - <cd:constant type="cd:text"/> - <cd:constant type="cd:section"/> - <cd:constant type="datum"/> - <cd:constant type="cd:mark"/> - <cd:constant type="cislostranky"/> + <cd:constant type="cd:text"/> + <cd:constant type="cd:section"/> + <cd:constant type="datum"/> + <cd:constant type="cd:mark"/> + <cd:constant type="cislostranky"/> +</cd:define> + +<cd:define name="layout-h"> + <cd:constant type="text" default="yes"/> + <cd:constant type="marginalie"/> + <cd:constant type="hrana"/> +</cd:define> + +<cd:define name="layout-v"> + <cd:constant type="vrsek"/> + <cd:constant type="zahlavi"/> + <cd:constant type="text" default="yes"/> + <cd:constant type="upati"/> + <cd:constant type="spodek"/> </cd:define> <cd:command name="installlanguage" file="lang-ini.tex"> @@ -1626,6 +1640,7 @@ <cd:constant type="vrsek"/> <cd:constant type="nastred"/> <cd:constant type="spodek"/> + <cd:constant type="drzet"/> </cd:parameter> <cd:parameter name="volba"> <cd:constant type="zadny"/> @@ -1731,6 +1746,9 @@ <cd:parameter name="foregroundstyle"> <cd:resolve name="style"/> </cd:parameter> + <cd:parameter name="tloustkalinky"> + <cd:constant type="cd:dimension"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -3390,9 +3408,7 @@ </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="cd:text" default="yes"/> - <cd:constant type="marginalie"/> - <cd:constant type="hrana"/> + <cd:resolve name="layout-h"/> </cd:keywords> <cd:keywords> <cd:resolve name="texts"/> @@ -3409,9 +3425,7 @@ </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="cd:text" default="yes"/> - <cd:constant type="marginalie"/> - <cd:constant type="hrana"/> + <cd:resolve name="layout-h"/> </cd:keywords> <cd:keywords> <cd:resolve name="texts"/> @@ -3428,9 +3442,7 @@ </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="cd:text" default="yes"/> - <cd:constant type="marginalie"/> - <cd:constant type="hrana"/> + <cd:resolve name="layout-h"/> </cd:keywords> <cd:keywords> <cd:resolve name="texts"/> @@ -3447,9 +3459,7 @@ </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="cd:text" default="yes"/> - <cd:constant type="marginalie"/> - <cd:constant type="hrana"/> + <cd:resolve name="layout-h"/> </cd:keywords> <cd:keywords> <cd:resolve name="texts"/> @@ -3466,9 +3476,7 @@ </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="cd:text" default="yes"/> - <cd:constant type="marginalie"/> - <cd:constant type="hrana"/> + <cd:resolve name="layout-h"/> </cd:keywords> <cd:keywords> <cd:resolve name="texts"/> @@ -3479,6 +3487,48 @@ </cd:arguments> </cd:command> +<cd:command name="settextcontent" file="page-txt.tex"> + <cd:sequence> + <cd:string value="settextcontent"/> + </cd:sequence> + <cd:arguments> + <cd:keywords> + <cd:resolve name="layout-v"/> + </cd:keywords> + <cd:keywords> + <cd:resolve name="layout-h"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:resolve name="texts"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:resolve name="texts"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:resolve name="texts"/> + </cd:keywords> + </cd:arguments> +</cd:command> + +<cd:command name="resettextcontent" file="page-txt.tex"> + <cd:sequence> + <cd:string value="resettextcontent"/> + </cd:sequence> + <cd:arguments> + <cd:keywords> + <cd:resolve name="layout-v"/> + </cd:keywords> + <cd:keywords> + <cd:resolve name="layout-h"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:constant name="lefttext"/> + <cd:constant name="middletext"/> + <cd:constant name="righttext"/> + </cd:keywords> + </cd:arguments> +</cd:command> + <cd:command name="definemarking" file="core-mar.tex"> <cd:sequence> <cd:string value="definujznaceni"/> @@ -3774,6 +3824,21 @@ <cd:sequence> <cd:string value="ukazmrizku"/> </cd:sequence> + <cd:arguments> + <cd:keywords optional="yes" list="yes"> + <cd:constant type="reset"/> + <cd:constant type="vrsek"/> + <cd:constant type="spodek"/> + <cd:constant type="zadny"/> + <cd:constant type="vse"/> + <cd:constant type="radky"/> + <cd:constant type="ramecek"/> + <cd:constant type="nonumber"/> + <cd:constant type="vpravo"/> + <cd:constant type="vlevo"/> + </cd:keywords> + <cd:content/> + </cd:arguments> </cd:command> <cd:command name="placeongrid" file="core-grd.tex"> @@ -4106,6 +4171,15 @@ <cd:constant type="vysoko"/> <cd:constant type="nizko"/> <cd:constant type="nastred"/> + <cd:constant type="vlevo"/> + <cd:constant type="nastred"/> + <cd:constant type="vpravo"/> + <cd:constant type="lefthanging"/> + <cd:constant type="righthanging"/> + <cd:constant type="levyokraj"/> + <cd:constant type="pravyokraj"/> + <cd:constant type="innermargin"/> + <cd:constant type="outermargin"/> </cd:parameter> <cd:parameter name="sirka"> <cd:constant type="prizpusobive"/> @@ -5034,6 +5108,12 @@ <cd:constant type="ano"/> <cd:constant type="ne"/> </cd:parameter> + <cd:parameter name="zarovnani"> + <cd:constant type="flushleft"/> + <cd:constant type="flushright"/> + <cd:constant type="nastred"/> + <cd:constant type="center"/> + </cd:parameter> <cd:parameter name="levyokraj"> <cd:constant type="cd:dimension"/> </cd:parameter> @@ -5471,6 +5551,7 @@ <cd:constant type="otoceno"/> <cd:constant type="dvoustranny"/> <cd:constant type="negativ"/> + <cd:constant type="pozadi"/> <cd:constant type="90"/> <cd:constant type="180"/> <cd:constant type="270"/> diff --git a/Master/texmf-dist/tex/context/interface/cont-de.xml b/Master/texmf-dist/tex/context/interface/cont-de.xml index 21221582c7a..2268f5418ee 100644 --- a/Master/texmf-dist/tex/context/interface/cont-de.xml +++ b/Master/texmf-dist/tex/context/interface/cont-de.xml @@ -59,22 +59,36 @@ </cd:define> <cd:define name="language"> - <cd:constant type="nl"/> - <cd:constant type="fr"/> - <cd:constant type="en"/> - <cd:constant type="uk"/> - <cd:constant type="de"/> - <cd:constant type="es"/> - <cd:constant type="cz"/> - <cd:constant type=".."/> + <cd:constant type="nl"/> + <cd:constant type="fr"/> + <cd:constant type="en"/> + <cd:constant type="uk"/> + <cd:constant type="de"/> + <cd:constant type="es"/> + <cd:constant type="cz"/> + <cd:constant type=".."/> </cd:define> <cd:define name="texts"> - <cd:constant type="cd:text"/> - <cd:constant type="cd:section"/> - <cd:constant type="datum"/> - <cd:constant type="cd:mark"/> - <cd:constant type="seitennummer"/> + <cd:constant type="cd:text"/> + <cd:constant type="cd:section"/> + <cd:constant type="datum"/> + <cd:constant type="cd:mark"/> + <cd:constant type="seitennummer"/> +</cd:define> + +<cd:define name="layout-h"> + <cd:constant type="text" default="yes"/> + <cd:constant type="marginalie"/> + <cd:constant type="kante"/> +</cd:define> + +<cd:define name="layout-v"> + <cd:constant type="oben"/> + <cd:constant type="kopfzeile"/> + <cd:constant type="text" default="yes"/> + <cd:constant type="fusszeile"/> + <cd:constant type="unten"/> </cd:define> <cd:command name="installlanguage" file="lang-ini.tex"> @@ -1626,6 +1640,7 @@ <cd:constant type="oben"/> <cd:constant type="mittig"/> <cd:constant type="unten"/> + <cd:constant type="behalte"/> </cd:parameter> <cd:parameter name="option"> <cd:constant type="kein"/> @@ -1731,6 +1746,9 @@ <cd:parameter name="foregroundstyle"> <cd:resolve name="style"/> </cd:parameter> + <cd:parameter name="liniendicke"> + <cd:constant type="cd:dimension"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -3390,9 +3408,7 @@ </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="cd:text" default="yes"/> - <cd:constant type="marginalie"/> - <cd:constant type="kante"/> + <cd:resolve name="layout-h"/> </cd:keywords> <cd:keywords> <cd:resolve name="texts"/> @@ -3409,9 +3425,7 @@ </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="cd:text" default="yes"/> - <cd:constant type="marginalie"/> - <cd:constant type="kante"/> + <cd:resolve name="layout-h"/> </cd:keywords> <cd:keywords> <cd:resolve name="texts"/> @@ -3428,9 +3442,7 @@ </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="cd:text" default="yes"/> - <cd:constant type="marginalie"/> - <cd:constant type="kante"/> + <cd:resolve name="layout-h"/> </cd:keywords> <cd:keywords> <cd:resolve name="texts"/> @@ -3447,9 +3459,7 @@ </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="cd:text" default="yes"/> - <cd:constant type="marginalie"/> - <cd:constant type="kante"/> + <cd:resolve name="layout-h"/> </cd:keywords> <cd:keywords> <cd:resolve name="texts"/> @@ -3466,9 +3476,7 @@ </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="cd:text" default="yes"/> - <cd:constant type="marginalie"/> - <cd:constant type="kante"/> + <cd:resolve name="layout-h"/> </cd:keywords> <cd:keywords> <cd:resolve name="texts"/> @@ -3479,6 +3487,48 @@ </cd:arguments> </cd:command> +<cd:command name="settextcontent" file="page-txt.tex"> + <cd:sequence> + <cd:string value="settext"/> + </cd:sequence> + <cd:arguments> + <cd:keywords> + <cd:resolve name="layout-v"/> + </cd:keywords> + <cd:keywords> + <cd:resolve name="layout-h"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:resolve name="texts"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:resolve name="texts"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:resolve name="texts"/> + </cd:keywords> + </cd:arguments> +</cd:command> + +<cd:command name="resettextcontent" file="page-txt.tex"> + <cd:sequence> + <cd:string value="resettextcontent"/> + </cd:sequence> + <cd:arguments> + <cd:keywords> + <cd:resolve name="layout-v"/> + </cd:keywords> + <cd:keywords> + <cd:resolve name="layout-h"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:constant name="lefttext"/> + <cd:constant name="middletext"/> + <cd:constant name="righttext"/> + </cd:keywords> + </cd:arguments> +</cd:command> + <cd:command name="definemarking" file="core-mar.tex"> <cd:sequence> <cd:string value="definierebeschriftung"/> @@ -3774,6 +3824,21 @@ <cd:sequence> <cd:string value="zeigegitter"/> </cd:sequence> + <cd:arguments> + <cd:keywords optional="yes" list="yes"> + <cd:constant type="zuruecksetzten"/> + <cd:constant type="oben"/> + <cd:constant type="unten"/> + <cd:constant type="kein"/> + <cd:constant type="alles"/> + <cd:constant type="zeilen"/> + <cd:constant type="rahmen"/> + <cd:constant type="nonumber"/> + <cd:constant type="rechts"/> + <cd:constant type="links"/> + </cd:keywords> + <cd:content/> + </cd:arguments> </cd:command> <cd:command name="placeongrid" file="core-grd.tex"> @@ -4106,6 +4171,15 @@ <cd:constant type="hoch"/> <cd:constant type="tief"/> <cd:constant type="mittig"/> + <cd:constant type="links"/> + <cd:constant type="mittig"/> + <cd:constant type="rechts"/> + <cd:constant type="lefthanging"/> + <cd:constant type="righthanging"/> + <cd:constant type="linkerrand"/> + <cd:constant type="rechterrand"/> + <cd:constant type="innermargin"/> + <cd:constant type="outermargin"/> </cd:parameter> <cd:parameter name="breite"> <cd:constant type="passend"/> @@ -5034,6 +5108,12 @@ <cd:constant type="ja"/> <cd:constant type="nein"/> </cd:parameter> + <cd:parameter name="ausrichtung"> + <cd:constant type="flushleft"/> + <cd:constant type="flushright"/> + <cd:constant type="mittig"/> + <cd:constant type="center"/> + </cd:parameter> <cd:parameter name="linkerrand"> <cd:constant type="cd:dimension"/> </cd:parameter> @@ -5471,6 +5551,7 @@ <cd:constant type="gedreht"/> <cd:constant type="doppelseitig"/> <cd:constant type="negativ"/> + <cd:constant type="hintergrund"/> <cd:constant type="90"/> <cd:constant type="180"/> <cd:constant type="270"/> diff --git a/Master/texmf-dist/tex/context/interface/cont-en.xml b/Master/texmf-dist/tex/context/interface/cont-en.xml index b44992b8fa8..45ddc571830 100644 --- a/Master/texmf-dist/tex/context/interface/cont-en.xml +++ b/Master/texmf-dist/tex/context/interface/cont-en.xml @@ -59,22 +59,36 @@ </cd:define> <cd:define name="language"> - <cd:constant type="nl"/> - <cd:constant type="fr"/> - <cd:constant type="en"/> - <cd:constant type="uk"/> - <cd:constant type="de"/> - <cd:constant type="es"/> - <cd:constant type="cz"/> - <cd:constant type=".."/> + <cd:constant type="nl"/> + <cd:constant type="fr"/> + <cd:constant type="en"/> + <cd:constant type="uk"/> + <cd:constant type="de"/> + <cd:constant type="es"/> + <cd:constant type="cz"/> + <cd:constant type=".."/> </cd:define> <cd:define name="texts"> - <cd:constant type="cd:text"/> - <cd:constant type="cd:section"/> - <cd:constant type="date"/> - <cd:constant type="cd:mark"/> - <cd:constant type="pagenumber"/> + <cd:constant type="cd:text"/> + <cd:constant type="cd:section"/> + <cd:constant type="date"/> + <cd:constant type="cd:mark"/> + <cd:constant type="pagenumber"/> +</cd:define> + +<cd:define name="layout-h"> + <cd:constant type="text" default="yes"/> + <cd:constant type="margin"/> + <cd:constant type="edge"/> +</cd:define> + +<cd:define name="layout-v"> + <cd:constant type="top"/> + <cd:constant type="header"/> + <cd:constant type="text" default="yes"/> + <cd:constant type="footer"/> + <cd:constant type="bottom"/> </cd:define> <cd:command name="installlanguage" file="lang-ini.tex"> @@ -1626,6 +1640,7 @@ <cd:constant type="top"/> <cd:constant type="middle"/> <cd:constant type="bottom"/> + <cd:constant type="keep"/> </cd:parameter> <cd:parameter name="option"> <cd:constant type="none"/> @@ -1731,6 +1746,9 @@ <cd:parameter name="foregroundstyle"> <cd:resolve name="style"/> </cd:parameter> + <cd:parameter name="rulethickness"> + <cd:constant type="cd:dimension"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -3390,9 +3408,7 @@ </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="cd:text" default="yes"/> - <cd:constant type="margin"/> - <cd:constant type="edge"/> + <cd:resolve name="layout-h"/> </cd:keywords> <cd:keywords> <cd:resolve name="texts"/> @@ -3409,9 +3425,7 @@ </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="cd:text" default="yes"/> - <cd:constant type="margin"/> - <cd:constant type="edge"/> + <cd:resolve name="layout-h"/> </cd:keywords> <cd:keywords> <cd:resolve name="texts"/> @@ -3428,9 +3442,7 @@ </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="cd:text" default="yes"/> - <cd:constant type="margin"/> - <cd:constant type="edge"/> + <cd:resolve name="layout-h"/> </cd:keywords> <cd:keywords> <cd:resolve name="texts"/> @@ -3447,9 +3459,7 @@ </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="cd:text" default="yes"/> - <cd:constant type="margin"/> - <cd:constant type="edge"/> + <cd:resolve name="layout-h"/> </cd:keywords> <cd:keywords> <cd:resolve name="texts"/> @@ -3466,9 +3476,7 @@ </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="cd:text" default="yes"/> - <cd:constant type="margin"/> - <cd:constant type="edge"/> + <cd:resolve name="layout-h"/> </cd:keywords> <cd:keywords> <cd:resolve name="texts"/> @@ -3479,6 +3487,48 @@ </cd:arguments> </cd:command> +<cd:command name="settextcontent" file="page-txt.tex"> + <cd:sequence> + <cd:string value="settextcontent"/> + </cd:sequence> + <cd:arguments> + <cd:keywords> + <cd:resolve name="layout-v"/> + </cd:keywords> + <cd:keywords> + <cd:resolve name="layout-h"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:resolve name="texts"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:resolve name="texts"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:resolve name="texts"/> + </cd:keywords> + </cd:arguments> +</cd:command> + +<cd:command name="resettextcontent" file="page-txt.tex"> + <cd:sequence> + <cd:string value="resettextcontent"/> + </cd:sequence> + <cd:arguments> + <cd:keywords> + <cd:resolve name="layout-v"/> + </cd:keywords> + <cd:keywords> + <cd:resolve name="layout-h"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:constant name="lefttext"/> + <cd:constant name="middletext"/> + <cd:constant name="righttext"/> + </cd:keywords> + </cd:arguments> +</cd:command> + <cd:command name="definemarking" file="core-mar.tex"> <cd:sequence> <cd:string value="definemarking"/> @@ -3774,6 +3824,21 @@ <cd:sequence> <cd:string value="showgrid"/> </cd:sequence> + <cd:arguments> + <cd:keywords optional="yes" list="yes"> + <cd:constant type="reset"/> + <cd:constant type="top"/> + <cd:constant type="bottom"/> + <cd:constant type="none"/> + <cd:constant type="all"/> + <cd:constant type="lines"/> + <cd:constant type="frame"/> + <cd:constant type="nonumber"/> + <cd:constant type="right"/> + <cd:constant type="left"/> + </cd:keywords> + <cd:content/> + </cd:arguments> </cd:command> <cd:command name="placeongrid" file="core-grd.tex"> @@ -4106,6 +4171,15 @@ <cd:constant type="high"/> <cd:constant type="low"/> <cd:constant type="middle"/> + <cd:constant type="left"/> + <cd:constant type="middle"/> + <cd:constant type="right"/> + <cd:constant type="lefthanging"/> + <cd:constant type="righthanging"/> + <cd:constant type="leftmargin"/> + <cd:constant type="rightmargin"/> + <cd:constant type="innermargin"/> + <cd:constant type="outermargin"/> </cd:parameter> <cd:parameter name="width"> <cd:constant type="fit"/> @@ -5034,6 +5108,12 @@ <cd:constant type="yes"/> <cd:constant type="no"/> </cd:parameter> + <cd:parameter name="align"> + <cd:constant type="flushleft"/> + <cd:constant type="flushright"/> + <cd:constant type="middle"/> + <cd:constant type="center"/> + </cd:parameter> <cd:parameter name="leftmargin"> <cd:constant type="cd:dimension"/> </cd:parameter> @@ -5471,6 +5551,7 @@ <cd:constant type="rotated"/> <cd:constant type="doublesided"/> <cd:constant type="negative"/> + <cd:constant type="background"/> <cd:constant type="90"/> <cd:constant type="180"/> <cd:constant type="270"/> diff --git a/Master/texmf-dist/tex/context/interface/cont-fr.xml b/Master/texmf-dist/tex/context/interface/cont-fr.xml index 4cacc10a502..04c9b4692e3 100644 --- a/Master/texmf-dist/tex/context/interface/cont-fr.xml +++ b/Master/texmf-dist/tex/context/interface/cont-fr.xml @@ -59,22 +59,36 @@ </cd:define> <cd:define name="language"> - <cd:constant type="nl"/> - <cd:constant type="fr"/> - <cd:constant type="en"/> - <cd:constant type="uk"/> - <cd:constant type="de"/> - <cd:constant type="es"/> - <cd:constant type="cz"/> - <cd:constant type=".."/> + <cd:constant type="nl"/> + <cd:constant type="fr"/> + <cd:constant type="en"/> + <cd:constant type="uk"/> + <cd:constant type="de"/> + <cd:constant type="es"/> + <cd:constant type="cz"/> + <cd:constant type=".."/> </cd:define> <cd:define name="texts"> - <cd:constant type="cd:text"/> - <cd:constant type="cd:section"/> - <cd:constant type="date"/> - <cd:constant type="cd:mark"/> - <cd:constant type="numeropage"/> + <cd:constant type="cd:text"/> + <cd:constant type="cd:section"/> + <cd:constant type="date"/> + <cd:constant type="cd:mark"/> + <cd:constant type="numeropage"/> +</cd:define> + +<cd:define name="layout-h"> + <cd:constant type="texte" default="yes"/> + <cd:constant type="marge"/> + <cd:constant type="bord"/> +</cd:define> + +<cd:define name="layout-v"> + <cd:constant type="sup"/> + <cd:constant type="entete"/> + <cd:constant type="texte" default="yes"/> + <cd:constant type="pdp"/> + <cd:constant type="inf"/> </cd:define> <cd:command name="installlanguage" file="lang-ini.tex"> @@ -1626,6 +1640,7 @@ <cd:constant type="sup"/> <cd:constant type="milieu"/> <cd:constant type="inf"/> + <cd:constant type="maintient"/> </cd:parameter> <cd:parameter name="option"> <cd:constant type="rien"/> @@ -1731,6 +1746,9 @@ <cd:parameter name="stylepremierplan"> <cd:resolve name="style"/> </cd:parameter> + <cd:parameter name="epaisseurligne"> + <cd:constant type="cd:dimension"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -3390,9 +3408,7 @@ </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="cd:text" default="yes"/> - <cd:constant type="marge"/> - <cd:constant type="bord"/> + <cd:resolve name="layout-h"/> </cd:keywords> <cd:keywords> <cd:resolve name="texts"/> @@ -3409,9 +3425,7 @@ </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="cd:text" default="yes"/> - <cd:constant type="marge"/> - <cd:constant type="bord"/> + <cd:resolve name="layout-h"/> </cd:keywords> <cd:keywords> <cd:resolve name="texts"/> @@ -3428,9 +3442,7 @@ </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="cd:text" default="yes"/> - <cd:constant type="marge"/> - <cd:constant type="bord"/> + <cd:resolve name="layout-h"/> </cd:keywords> <cd:keywords> <cd:resolve name="texts"/> @@ -3447,9 +3459,7 @@ </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="cd:text" default="yes"/> - <cd:constant type="marge"/> - <cd:constant type="bord"/> + <cd:resolve name="layout-h"/> </cd:keywords> <cd:keywords> <cd:resolve name="texts"/> @@ -3466,9 +3476,7 @@ </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="cd:text" default="yes"/> - <cd:constant type="marge"/> - <cd:constant type="bord"/> + <cd:resolve name="layout-h"/> </cd:keywords> <cd:keywords> <cd:resolve name="texts"/> @@ -3479,6 +3487,48 @@ </cd:arguments> </cd:command> +<cd:command name="settextcontent" file="page-txt.tex"> + <cd:sequence> + <cd:string value="settext"/> + </cd:sequence> + <cd:arguments> + <cd:keywords> + <cd:resolve name="layout-v"/> + </cd:keywords> + <cd:keywords> + <cd:resolve name="layout-h"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:resolve name="texts"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:resolve name="texts"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:resolve name="texts"/> + </cd:keywords> + </cd:arguments> +</cd:command> + +<cd:command name="resettextcontent" file="page-txt.tex"> + <cd:sequence> + <cd:string value="resettextcontent"/> + </cd:sequence> + <cd:arguments> + <cd:keywords> + <cd:resolve name="layout-v"/> + </cd:keywords> + <cd:keywords> + <cd:resolve name="layout-h"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:constant name="lefttext"/> + <cd:constant name="middletext"/> + <cd:constant name="righttext"/> + </cd:keywords> + </cd:arguments> +</cd:command> + <cd:command name="definemarking" file="core-mar.tex"> <cd:sequence> <cd:string value="definitmarquage"/> @@ -3636,7 +3686,7 @@ <cd:parameter name="inf"> <cd:constant type="cd:dimension"/> </cd:parameter> - <cd:parameter name="brodgauche"> + <cd:parameter name="bordgauche"> <cd:constant type="cd:dimension"/> </cd:parameter> <cd:parameter name="borddroit"> @@ -3774,6 +3824,21 @@ <cd:sequence> <cd:string value="montregrille"/> </cd:sequence> + <cd:arguments> + <cd:keywords optional="yes" list="yes"> + <cd:constant type="raz"/> + <cd:constant type="sup"/> + <cd:constant type="inf"/> + <cd:constant type="rien"/> + <cd:constant type="tout"/> + <cd:constant type="lignes"/> + <cd:constant type="cadre"/> + <cd:constant type="sansnumero"/> + <cd:constant type="droite"/> + <cd:constant type="gauche"/> + </cd:keywords> + <cd:content/> + </cd:arguments> </cd:command> <cd:command name="placeongrid" file="core-grd.tex"> @@ -4106,6 +4171,15 @@ <cd:constant type="haut"/> <cd:constant type="bas"/> <cd:constant type="milieu"/> + <cd:constant type="gauche"/> + <cd:constant type="milieu"/> + <cd:constant type="droite"/> + <cd:constant type="lefthanging"/> + <cd:constant type="righthanging"/> + <cd:constant type="margegauche"/> + <cd:constant type="margedroite"/> + <cd:constant type="margeinterieure"/> + <cd:constant type="margeexterieure"/> </cd:parameter> <cd:parameter name="largeur"> <cd:constant type="adapte"/> @@ -5034,6 +5108,12 @@ <cd:constant type="oui"/> <cd:constant type="non"/> </cd:parameter> + <cd:parameter name="alignement"> + <cd:constant type="flushleft"/> + <cd:constant type="flushright"/> + <cd:constant type="milieu"/> + <cd:constant type="center"/> + </cd:parameter> <cd:parameter name="margegauche"> <cd:constant type="cd:dimension"/> </cd:parameter> @@ -5471,6 +5551,7 @@ <cd:constant type="tourne"/> <cd:constant type="rectoverso"/> <cd:constant type="negatif"/> + <cd:constant type="arriereplan"/> <cd:constant type="90"/> <cd:constant type="180"/> <cd:constant type="270"/> diff --git a/Master/texmf-dist/tex/context/interface/cont-it.xml b/Master/texmf-dist/tex/context/interface/cont-it.xml index d69165d5234..25a2c03566a 100644 --- a/Master/texmf-dist/tex/context/interface/cont-it.xml +++ b/Master/texmf-dist/tex/context/interface/cont-it.xml @@ -59,22 +59,36 @@ </cd:define> <cd:define name="language"> - <cd:constant type="nl"/> - <cd:constant type="fr"/> - <cd:constant type="en"/> - <cd:constant type="uk"/> - <cd:constant type="de"/> - <cd:constant type="es"/> - <cd:constant type="cz"/> - <cd:constant type=".."/> + <cd:constant type="nl"/> + <cd:constant type="fr"/> + <cd:constant type="en"/> + <cd:constant type="uk"/> + <cd:constant type="de"/> + <cd:constant type="es"/> + <cd:constant type="cz"/> + <cd:constant type=".."/> </cd:define> <cd:define name="texts"> - <cd:constant type="cd:text"/> - <cd:constant type="cd:section"/> - <cd:constant type="data"/> - <cd:constant type="cd:mark"/> - <cd:constant type="numeropagina"/> + <cd:constant type="cd:text"/> + <cd:constant type="cd:section"/> + <cd:constant type="data"/> + <cd:constant type="cd:mark"/> + <cd:constant type="numeropagina"/> +</cd:define> + +<cd:define name="layout-h"> + <cd:constant type="testo" default="yes"/> + <cd:constant type="margine"/> + <cd:constant type="bordo"/> +</cd:define> + +<cd:define name="layout-v"> + <cd:constant type="cima"/> + <cd:constant type="intestazione"/> + <cd:constant type="testo" default="yes"/> + <cd:constant type="piedipagina"/> + <cd:constant type="fondo"/> </cd:define> <cd:command name="installlanguage" file="lang-ini.tex"> @@ -1626,6 +1640,7 @@ <cd:constant type="cima"/> <cd:constant type="centro"/> <cd:constant type="fondo"/> + <cd:constant type="mantieni"/> </cd:parameter> <cd:parameter name="opzione"> <cd:constant type="nessuno"/> @@ -1731,6 +1746,9 @@ <cd:parameter name="foregroundstyle"> <cd:resolve name="style"/> </cd:parameter> + <cd:parameter name="spessorelinea"> + <cd:constant type="cd:dimension"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -3390,9 +3408,7 @@ </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="cd:text" default="yes"/> - <cd:constant type="margine"/> - <cd:constant type="bordo"/> + <cd:resolve name="layout-h"/> </cd:keywords> <cd:keywords> <cd:resolve name="texts"/> @@ -3409,9 +3425,7 @@ </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="cd:text" default="yes"/> - <cd:constant type="margine"/> - <cd:constant type="bordo"/> + <cd:resolve name="layout-h"/> </cd:keywords> <cd:keywords> <cd:resolve name="texts"/> @@ -3428,9 +3442,7 @@ </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="cd:text" default="yes"/> - <cd:constant type="margine"/> - <cd:constant type="bordo"/> + <cd:resolve name="layout-h"/> </cd:keywords> <cd:keywords> <cd:resolve name="texts"/> @@ -3447,9 +3459,7 @@ </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="cd:text" default="yes"/> - <cd:constant type="margine"/> - <cd:constant type="bordo"/> + <cd:resolve name="layout-h"/> </cd:keywords> <cd:keywords> <cd:resolve name="texts"/> @@ -3466,9 +3476,7 @@ </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="cd:text" default="yes"/> - <cd:constant type="margine"/> - <cd:constant type="bordo"/> + <cd:resolve name="layout-h"/> </cd:keywords> <cd:keywords> <cd:resolve name="texts"/> @@ -3479,6 +3487,48 @@ </cd:arguments> </cd:command> +<cd:command name="settextcontent" file="page-txt.tex"> + <cd:sequence> + <cd:string value="settext"/> + </cd:sequence> + <cd:arguments> + <cd:keywords> + <cd:resolve name="layout-v"/> + </cd:keywords> + <cd:keywords> + <cd:resolve name="layout-h"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:resolve name="texts"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:resolve name="texts"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:resolve name="texts"/> + </cd:keywords> + </cd:arguments> +</cd:command> + +<cd:command name="resettextcontent" file="page-txt.tex"> + <cd:sequence> + <cd:string value="resettextcontent"/> + </cd:sequence> + <cd:arguments> + <cd:keywords> + <cd:resolve name="layout-v"/> + </cd:keywords> + <cd:keywords> + <cd:resolve name="layout-h"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:constant name="lefttext"/> + <cd:constant name="middletext"/> + <cd:constant name="righttext"/> + </cd:keywords> + </cd:arguments> +</cd:command> + <cd:command name="definemarking" file="core-mar.tex"> <cd:sequence> <cd:string value="definiscimarcatura"/> @@ -3774,6 +3824,21 @@ <cd:sequence> <cd:string value="mostragriglia"/> </cd:sequence> + <cd:arguments> + <cd:keywords optional="yes" list="yes"> + <cd:constant type="reimposta"/> + <cd:constant type="cima"/> + <cd:constant type="fondo"/> + <cd:constant type="nessuno"/> + <cd:constant type="tutti"/> + <cd:constant type="righe"/> + <cd:constant type="cornice"/> + <cd:constant type="nonumber"/> + <cd:constant type="destra"/> + <cd:constant type="sinistra"/> + </cd:keywords> + <cd:content/> + </cd:arguments> </cd:command> <cd:command name="placeongrid" file="core-grd.tex"> @@ -4106,6 +4171,15 @@ <cd:constant type="alto"/> <cd:constant type="basso"/> <cd:constant type="centro"/> + <cd:constant type="sinistra"/> + <cd:constant type="centro"/> + <cd:constant type="destra"/> + <cd:constant type="lefthanging"/> + <cd:constant type="righthanging"/> + <cd:constant type="marginesinistro"/> + <cd:constant type="marginedestro"/> + <cd:constant type="margineinterno"/> + <cd:constant type="margineesterno"/> </cd:parameter> <cd:parameter name="ampiezza"> <cd:constant type="adatta"/> @@ -5034,6 +5108,12 @@ <cd:constant type="si"/> <cd:constant type="no"/> </cd:parameter> + <cd:parameter name="allinea"> + <cd:constant type="flushleft"/> + <cd:constant type="flushright"/> + <cd:constant type="centro"/> + <cd:constant type="center"/> + </cd:parameter> <cd:parameter name="marginesinistro"> <cd:constant type="cd:dimension"/> </cd:parameter> @@ -5471,6 +5551,7 @@ <cd:constant type="ruotato"/> <cd:constant type="doppiafaccia"/> <cd:constant type="negativo"/> + <cd:constant type="sfondo"/> <cd:constant type="90"/> <cd:constant type="180"/> <cd:constant type="270"/> diff --git a/Master/texmf-dist/tex/context/interface/cont-nl.xml b/Master/texmf-dist/tex/context/interface/cont-nl.xml index b75ad033b92..e8e3f067bd5 100644 --- a/Master/texmf-dist/tex/context/interface/cont-nl.xml +++ b/Master/texmf-dist/tex/context/interface/cont-nl.xml @@ -59,22 +59,36 @@ </cd:define> <cd:define name="language"> - <cd:constant type="nl"/> - <cd:constant type="fr"/> - <cd:constant type="en"/> - <cd:constant type="uk"/> - <cd:constant type="de"/> - <cd:constant type="es"/> - <cd:constant type="cz"/> - <cd:constant type=".."/> + <cd:constant type="nl"/> + <cd:constant type="fr"/> + <cd:constant type="en"/> + <cd:constant type="uk"/> + <cd:constant type="de"/> + <cd:constant type="es"/> + <cd:constant type="cz"/> + <cd:constant type=".."/> </cd:define> <cd:define name="texts"> - <cd:constant type="cd:text"/> - <cd:constant type="cd:section"/> - <cd:constant type="datum"/> - <cd:constant type="cd:mark"/> - <cd:constant type="paginanummer"/> + <cd:constant type="cd:text"/> + <cd:constant type="cd:section"/> + <cd:constant type="datum"/> + <cd:constant type="cd:mark"/> + <cd:constant type="paginanummer"/> +</cd:define> + +<cd:define name="layout-h"> + <cd:constant type="tekst" default="yes"/> + <cd:constant type="marge"/> + <cd:constant type="rand"/> +</cd:define> + +<cd:define name="layout-v"> + <cd:constant type="boven"/> + <cd:constant type="hoofd"/> + <cd:constant type="tekst" default="yes"/> + <cd:constant type="voet"/> + <cd:constant type="onder"/> </cd:define> <cd:command name="installlanguage" file="lang-ini.tex"> @@ -1626,6 +1640,7 @@ <cd:constant type="boven"/> <cd:constant type="midden"/> <cd:constant type="onder"/> + <cd:constant type="handhaaf"/> </cd:parameter> <cd:parameter name="optie"> <cd:constant type="geen"/> @@ -1731,6 +1746,9 @@ <cd:parameter name="voorgrondletter"> <cd:resolve name="style"/> </cd:parameter> + <cd:parameter name="lijndikte"> + <cd:constant type="cd:dimension"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -3390,9 +3408,7 @@ </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="cd:text" default="yes"/> - <cd:constant type="marge"/> - <cd:constant type="rand"/> + <cd:resolve name="layout-h"/> </cd:keywords> <cd:keywords> <cd:resolve name="texts"/> @@ -3409,9 +3425,7 @@ </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="cd:text" default="yes"/> - <cd:constant type="marge"/> - <cd:constant type="rand"/> + <cd:resolve name="layout-h"/> </cd:keywords> <cd:keywords> <cd:resolve name="texts"/> @@ -3428,9 +3442,7 @@ </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="cd:text" default="yes"/> - <cd:constant type="marge"/> - <cd:constant type="rand"/> + <cd:resolve name="layout-h"/> </cd:keywords> <cd:keywords> <cd:resolve name="texts"/> @@ -3447,9 +3459,7 @@ </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="cd:text" default="yes"/> - <cd:constant type="marge"/> - <cd:constant type="rand"/> + <cd:resolve name="layout-h"/> </cd:keywords> <cd:keywords> <cd:resolve name="texts"/> @@ -3466,9 +3476,7 @@ </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="cd:text" default="yes"/> - <cd:constant type="marge"/> - <cd:constant type="rand"/> + <cd:resolve name="layout-h"/> </cd:keywords> <cd:keywords> <cd:resolve name="texts"/> @@ -3479,6 +3487,48 @@ </cd:arguments> </cd:command> +<cd:command name="settextcontent" file="page-txt.tex"> + <cd:sequence> + <cd:string value="steltekstinhoudin"/> + </cd:sequence> + <cd:arguments> + <cd:keywords> + <cd:resolve name="layout-v"/> + </cd:keywords> + <cd:keywords> + <cd:resolve name="layout-h"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:resolve name="texts"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:resolve name="texts"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:resolve name="texts"/> + </cd:keywords> + </cd:arguments> +</cd:command> + +<cd:command name="resettextcontent" file="page-txt.tex"> + <cd:sequence> + <cd:string value="resettextcontent"/> + </cd:sequence> + <cd:arguments> + <cd:keywords> + <cd:resolve name="layout-v"/> + </cd:keywords> + <cd:keywords> + <cd:resolve name="layout-h"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:constant name="lefttext"/> + <cd:constant name="middletext"/> + <cd:constant name="righttext"/> + </cd:keywords> + </cd:arguments> +</cd:command> + <cd:command name="definemarking" file="core-mar.tex"> <cd:sequence> <cd:string value="definieermarkering"/> @@ -3774,6 +3824,21 @@ <cd:sequence> <cd:string value="toongrid"/> </cd:sequence> + <cd:arguments> + <cd:keywords optional="yes" list="yes"> + <cd:constant type="reset"/> + <cd:constant type="boven"/> + <cd:constant type="onder"/> + <cd:constant type="geen"/> + <cd:constant type="alles"/> + <cd:constant type="regels"/> + <cd:constant type="kader"/> + <cd:constant type="geennummer"/> + <cd:constant type="rechts"/> + <cd:constant type="links"/> + </cd:keywords> + <cd:content/> + </cd:arguments> </cd:command> <cd:command name="placeongrid" file="core-grd.tex"> @@ -4106,6 +4171,15 @@ <cd:constant type="hoog"/> <cd:constant type="laag"/> <cd:constant type="midden"/> + <cd:constant type="links"/> + <cd:constant type="midden"/> + <cd:constant type="rechts"/> + <cd:constant type="linkshangend"/> + <cd:constant type="rechtshangend"/> + <cd:constant type="linkermarge"/> + <cd:constant type="rechtermarge"/> + <cd:constant type="binnenmarge"/> + <cd:constant type="buitenmarge"/> </cd:parameter> <cd:parameter name="breedte"> <cd:constant type="passend"/> @@ -5034,6 +5108,12 @@ <cd:constant type="ja"/> <cd:constant type="nee"/> </cd:parameter> + <cd:parameter name="uitlijnen"> + <cd:constant type="lijnlinks"/> + <cd:constant type="lijnrechts"/> + <cd:constant type="midden"/> + <cd:constant type="centreer"/> + </cd:parameter> <cd:parameter name="linkermarge"> <cd:constant type="cd:dimension"/> </cd:parameter> @@ -5471,6 +5551,7 @@ <cd:constant type="geroteerd"/> <cd:constant type="dubbelzijdig"/> <cd:constant type="negatief"/> + <cd:constant type="achtergrond"/> <cd:constant type="90"/> <cd:constant type="180"/> <cd:constant type="270"/> diff --git a/Master/texmf-dist/tex/context/interface/cont-ro.xml b/Master/texmf-dist/tex/context/interface/cont-ro.xml index 9d2eae7fdb9..e8df14520bb 100644 --- a/Master/texmf-dist/tex/context/interface/cont-ro.xml +++ b/Master/texmf-dist/tex/context/interface/cont-ro.xml @@ -59,22 +59,36 @@ </cd:define> <cd:define name="language"> - <cd:constant type="nl"/> - <cd:constant type="fr"/> - <cd:constant type="en"/> - <cd:constant type="uk"/> - <cd:constant type="de"/> - <cd:constant type="es"/> - <cd:constant type="cz"/> - <cd:constant type=".."/> + <cd:constant type="nl"/> + <cd:constant type="fr"/> + <cd:constant type="en"/> + <cd:constant type="uk"/> + <cd:constant type="de"/> + <cd:constant type="es"/> + <cd:constant type="cz"/> + <cd:constant type=".."/> </cd:define> <cd:define name="texts"> - <cd:constant type="cd:text"/> - <cd:constant type="cd:section"/> - <cd:constant type="data"/> - <cd:constant type="cd:mark"/> - <cd:constant type="numarpagina"/> + <cd:constant type="cd:text"/> + <cd:constant type="cd:section"/> + <cd:constant type="data"/> + <cd:constant type="cd:mark"/> + <cd:constant type="numarpagina"/> +</cd:define> + +<cd:define name="layout-h"> + <cd:constant type="text" default="yes"/> + <cd:constant type="margine"/> + <cd:constant type="bordura"/> +</cd:define> + +<cd:define name="layout-v"> + <cd:constant type="sus"/> + <cd:constant type="antet"/> + <cd:constant type="text" default="yes"/> + <cd:constant type="subsol"/> + <cd:constant type="subsol"/> </cd:define> <cd:command name="installlanguage" file="lang-ini.tex"> @@ -1626,6 +1640,7 @@ <cd:constant type="sus"/> <cd:constant type="centru"/> <cd:constant type="subsol"/> + <cd:constant type="mentine"/> </cd:parameter> <cd:parameter name="optiune"> <cd:constant type="niciunul"/> @@ -1731,6 +1746,9 @@ <cd:parameter name="foregroundstyle"> <cd:resolve name="style"/> </cd:parameter> + <cd:parameter name="grosimerigla"> + <cd:constant type="cd:dimension"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -3390,9 +3408,7 @@ </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="cd:text" default="yes"/> - <cd:constant type="margine"/> - <cd:constant type="bordura"/> + <cd:resolve name="layout-h"/> </cd:keywords> <cd:keywords> <cd:resolve name="texts"/> @@ -3409,9 +3425,7 @@ </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="cd:text" default="yes"/> - <cd:constant type="margine"/> - <cd:constant type="bordura"/> + <cd:resolve name="layout-h"/> </cd:keywords> <cd:keywords> <cd:resolve name="texts"/> @@ -3428,9 +3442,7 @@ </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="cd:text" default="yes"/> - <cd:constant type="margine"/> - <cd:constant type="bordura"/> + <cd:resolve name="layout-h"/> </cd:keywords> <cd:keywords> <cd:resolve name="texts"/> @@ -3447,9 +3459,7 @@ </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="cd:text" default="yes"/> - <cd:constant type="margine"/> - <cd:constant type="bordura"/> + <cd:resolve name="layout-h"/> </cd:keywords> <cd:keywords> <cd:resolve name="texts"/> @@ -3466,9 +3476,7 @@ </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="cd:text" default="yes"/> - <cd:constant type="margine"/> - <cd:constant type="bordura"/> + <cd:resolve name="layout-h"/> </cd:keywords> <cd:keywords> <cd:resolve name="texts"/> @@ -3479,6 +3487,48 @@ </cd:arguments> </cd:command> +<cd:command name="settextcontent" file="page-txt.tex"> + <cd:sequence> + <cd:string value="settextcontent"/> + </cd:sequence> + <cd:arguments> + <cd:keywords> + <cd:resolve name="layout-v"/> + </cd:keywords> + <cd:keywords> + <cd:resolve name="layout-h"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:resolve name="texts"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:resolve name="texts"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:resolve name="texts"/> + </cd:keywords> + </cd:arguments> +</cd:command> + +<cd:command name="resettextcontent" file="page-txt.tex"> + <cd:sequence> + <cd:string value="resettextcontent"/> + </cd:sequence> + <cd:arguments> + <cd:keywords> + <cd:resolve name="layout-v"/> + </cd:keywords> + <cd:keywords> + <cd:resolve name="layout-h"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:constant name="lefttext"/> + <cd:constant name="middletext"/> + <cd:constant name="righttext"/> + </cd:keywords> + </cd:arguments> +</cd:command> + <cd:command name="definemarking" file="core-mar.tex"> <cd:sequence> <cd:string value="definestemarcaje"/> @@ -3774,6 +3824,21 @@ <cd:sequence> <cd:string value="afiseazagrid"/> </cd:sequence> + <cd:arguments> + <cd:keywords optional="yes" list="yes"> + <cd:constant type="reset"/> + <cd:constant type="sus"/> + <cd:constant type="subsol"/> + <cd:constant type="niciunul"/> + <cd:constant type="tot"/> + <cd:constant type="linii"/> + <cd:constant type="incadrat"/> + <cd:constant type="nonumber"/> + <cd:constant type="dreapta"/> + <cd:constant type="stanga"/> + </cd:keywords> + <cd:content/> + </cd:arguments> </cd:command> <cd:command name="placeongrid" file="core-grd.tex"> @@ -4106,6 +4171,15 @@ <cd:constant type="inalt"/> <cd:constant type="jos"/> <cd:constant type="centru"/> + <cd:constant type="stanga"/> + <cd:constant type="centru"/> + <cd:constant type="dreapta"/> + <cd:constant type="lefthanging"/> + <cd:constant type="righthanging"/> + <cd:constant type="marginestanga"/> + <cd:constant type="marginedreapta"/> + <cd:constant type="innermargin"/> + <cd:constant type="outermargin"/> </cd:parameter> <cd:parameter name="latime"> <cd:constant type="ajustat"/> @@ -5034,6 +5108,12 @@ <cd:constant type="da"/> <cd:constant type="nu"/> </cd:parameter> + <cd:parameter name="aliniere"> + <cd:constant type="flushleft"/> + <cd:constant type="flushright"/> + <cd:constant type="centru"/> + <cd:constant type="center"/> + </cd:parameter> <cd:parameter name="marginestanga"> <cd:constant type="cd:dimension"/> </cd:parameter> @@ -5471,6 +5551,7 @@ <cd:constant type="rotat"/> <cd:constant type="douafete"/> <cd:constant type="negativ"/> + <cd:constant type="fundal"/> <cd:constant type="90"/> <cd:constant type="180"/> <cd:constant type="270"/> diff --git a/Master/texmf-dist/tex/context/interface/keys-cz.xml b/Master/texmf-dist/tex/context/interface/keys-cz.xml index 13b363f09ae..2ff97c87612 100644 --- a/Master/texmf-dist/tex/context/interface/keys-cz.xml +++ b/Master/texmf-dist/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="2006.08.08 21:51"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2006.11.17 19:52"> <cd:variables> <cd:variable name="one" value="jedna"/> @@ -87,6 +87,8 @@ <cd:variable name="flushleft" value="flushleft"/> <cd:variable name="flushright" value="flushright"/> <cd:variable name="center" value="center"/> + <cd:variable name="flushouter" value="flushouter"/> + <cd:variable name="flushinner" value="flushinner"/> </cd:variables> <cd:variables> @@ -96,6 +98,7 @@ <cd:variables> <cd:variable name="formula" value="rovnice"/> + <cd:variable name="subformula" value="subrovnice"/> <cd:variable name="formulae" value="rovnice"/> <cd:variable name="figure" value="obrazek"/> <cd:variable name="figures" value="obrazky"/> @@ -627,9 +630,11 @@ <cd:variable name="left" value="vlevo"/> <cd:variable name="local" value="lokalne"/> <cd:variable name="new" value="novy"/> + <cd:variable name="old" value="old"/> <cd:variable name="MONTH" value="MESIC"/> <cd:variable name="month" value="mesic"/> <cd:variable name="mar" value="mar"/> + <cd:variable name="item" value="polozka"/> <cd:variable name="marking" value="znaceni"/> <cd:variable name="margin" value="marginalie"/> <cd:variable name="max" value="max"/> @@ -784,6 +789,8 @@ <cd:variable name="xml" value="xml"/> <cd:variable name="enumeration" value="vycet"/> <cd:variable name="description" value="popis"/> + <cd:variable name="lefthanging" value="lefthanging"/> + <cd:variable name="righthanging" value="righthanging"/> </cd:variables> <cd:constants> @@ -1192,6 +1199,8 @@ <cd:command name="subpagenumber" value="subpagenumber"/> <cd:command name="setuptext" value="nastavtext"/> <cd:command name="setuptexttexts" value="nastavtexttexty"/> + <cd:command name="settextcontent" value="settextcontent"/> + <cd:command name="resettext" value="resettextcontent"/> <cd:command name="definetext" value="definujtext"/> <cd:command name="pagenumber" value="cislostrany"/> <cd:command name="completepagenumber" value="completepagenumber"/> diff --git a/Master/texmf-dist/tex/context/interface/keys-de.xml b/Master/texmf-dist/tex/context/interface/keys-de.xml index 598bf64fb9b..fb1e35eaf7f 100644 --- a/Master/texmf-dist/tex/context/interface/keys-de.xml +++ b/Master/texmf-dist/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="2006.08.08 21:51"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2006.11.17 19:52"> <cd:variables> <cd:variable name="one" value="eins"/> @@ -87,6 +87,8 @@ <cd:variable name="flushleft" value="flushleft"/> <cd:variable name="flushright" value="flushright"/> <cd:variable name="center" value="center"/> + <cd:variable name="flushouter" value="flushouter"/> + <cd:variable name="flushinner" value="flushinner"/> </cd:variables> <cd:variables> @@ -96,6 +98,7 @@ <cd:variables> <cd:variable name="formula" value="formel"/> + <cd:variable name="subformula" value="subformel"/> <cd:variable name="formulae" value="formeln"/> <cd:variable name="figure" value="abbildung"/> <cd:variable name="figures" value="abbildungen"/> @@ -627,9 +630,11 @@ <cd:variable name="left" value="links"/> <cd:variable name="local" value="lokal"/> <cd:variable name="new" value="neu"/> + <cd:variable name="old" value="old"/> <cd:variable name="MONTH" value="MONAT"/> <cd:variable name="month" value="monat"/> <cd:variable name="mar" value="mar"/> + <cd:variable name="item" value="pos"/> <cd:variable name="marking" value="beschriftung"/> <cd:variable name="margin" value="marginalie"/> <cd:variable name="max" value="max"/> @@ -784,6 +789,8 @@ <cd:variable name="xml" value="xml"/> <cd:variable name="enumeration" value="nummerierung"/> <cd:variable name="description" value="beschreibung"/> + <cd:variable name="lefthanging" value="lefthanging"/> + <cd:variable name="righthanging" value="righthanging"/> </cd:variables> <cd:constants> @@ -1192,6 +1199,8 @@ <cd:command name="subpagenumber" value="subpagenumber"/> <cd:command name="setuptext" value="stelletextein"/> <cd:command name="setuptexttexts" value="stelletexttexteein"/> + <cd:command name="settextcontent" value="settext"/> + <cd:command name="resettext" value="resettextcontent"/> <cd:command name="definetext" value="definieretext"/> <cd:command name="pagenumber" value="seitenummer"/> <cd:command name="completepagenumber" value="completepagenumber"/> diff --git a/Master/texmf-dist/tex/context/interface/keys-en.xml b/Master/texmf-dist/tex/context/interface/keys-en.xml index 5fc33fb5ab2..f515dffa8a8 100644 --- a/Master/texmf-dist/tex/context/interface/keys-en.xml +++ b/Master/texmf-dist/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="2006.08.08 21:51"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2006.11.17 19:52"> <cd:variables> <cd:variable name="one" value="one"/> @@ -87,6 +87,8 @@ <cd:variable name="flushleft" value="flushleft"/> <cd:variable name="flushright" value="flushright"/> <cd:variable name="center" value="center"/> + <cd:variable name="flushouter" value="flushouter"/> + <cd:variable name="flushinner" value="flushinner"/> </cd:variables> <cd:variables> @@ -96,6 +98,7 @@ <cd:variables> <cd:variable name="formula" value="formula"/> + <cd:variable name="subformula" value="subformula"/> <cd:variable name="formulae" value="formulae"/> <cd:variable name="figure" value="figure"/> <cd:variable name="figures" value="figures"/> @@ -627,9 +630,11 @@ <cd:variable name="left" value="left"/> <cd:variable name="local" value="local"/> <cd:variable name="new" value="new"/> + <cd:variable name="old" value="old"/> <cd:variable name="MONTH" value="MONTH"/> <cd:variable name="month" value="month"/> <cd:variable name="mar" value="mar"/> + <cd:variable name="item" value="item"/> <cd:variable name="marking" value="marking"/> <cd:variable name="margin" value="margin"/> <cd:variable name="max" value="max"/> @@ -784,6 +789,8 @@ <cd:variable name="xml" value="xml"/> <cd:variable name="enumeration" value="enumeration"/> <cd:variable name="description" value="description"/> + <cd:variable name="lefthanging" value="lefthanging"/> + <cd:variable name="righthanging" value="righthanging"/> </cd:variables> <cd:constants> @@ -1192,6 +1199,8 @@ <cd:command name="subpagenumber" value="subpagenumber"/> <cd:command name="setuptext" value="setuptext"/> <cd:command name="setuptexttexts" value="setuptexttexts"/> + <cd:command name="settextcontent" value="settextcontent"/> + <cd:command name="resettext" value="resettextcontent"/> <cd:command name="definetext" value="definetext"/> <cd:command name="pagenumber" value="pagenumber"/> <cd:command name="completepagenumber" value="completepagenumber"/> diff --git a/Master/texmf-dist/tex/context/interface/keys-fr.xml b/Master/texmf-dist/tex/context/interface/keys-fr.xml index 4fa12b0a5fb..0c332407ac7 100644 --- a/Master/texmf-dist/tex/context/interface/keys-fr.xml +++ b/Master/texmf-dist/tex/context/interface/keys-fr.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="fr" version="2006.08.08 21:51"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="fr" version="2006.11.17 19:52"> <cd:variables> <cd:variable name="one" value="un"/> @@ -87,6 +87,8 @@ <cd:variable name="flushleft" value="flushleft"/> <cd:variable name="flushright" value="flushright"/> <cd:variable name="center" value="center"/> + <cd:variable name="flushouter" value="flushouter"/> + <cd:variable name="flushinner" value="flushinner"/> </cd:variables> <cd:variables> @@ -96,6 +98,7 @@ <cd:variables> <cd:variable name="formula" value="formule"/> + <cd:variable name="subformula" value="subformule"/> <cd:variable name="formulae" value="formules"/> <cd:variable name="figure" value="figure"/> <cd:variable name="figures" value="figures"/> @@ -281,7 +284,7 @@ <cd:constant name="leftmargin" value="margegauche"/> <cd:constant name="leftmargindistance" value="distancemargegauche"/> <cd:constant name="leftoffset" value="decalagegauche"/> - <cd:constant name="leftedge" value="brodgauche"/> + <cd:constant name="leftedge" value="bordgauche"/> <cd:constant name="leftedgedistance" value="distancebordgauche"/> <cd:constant name="lefttext" value="textegauche"/> <cd:constant name="left" value="gauche"/> @@ -627,9 +630,11 @@ <cd:variable name="left" value="gauche"/> <cd:variable name="local" value="local"/> <cd:variable name="new" value="nouveau"/> + <cd:variable name="old" value="old"/> <cd:variable name="MONTH" value="MOIS"/> <cd:variable name="month" value="mois"/> <cd:variable name="mar" value="mar"/> + <cd:variable name="item" value="element"/> <cd:variable name="marking" value="marquage"/> <cd:variable name="margin" value="marge"/> <cd:variable name="max" value="max"/> @@ -784,6 +789,8 @@ <cd:variable name="xml" value="xml"/> <cd:variable name="enumeration" value="enumeration"/> <cd:variable name="description" value="description"/> + <cd:variable name="lefthanging" value="lefthanging"/> + <cd:variable name="righthanging" value="righthanging"/> </cd:variables> <cd:constants> @@ -1192,6 +1199,8 @@ <cd:command name="subpagenumber" value="sousnumeropage"/> <cd:command name="setuptext" value="regletexte"/> <cd:command name="setuptexttexts" value="regletextestexte"/> + <cd:command name="settextcontent" value="settext"/> + <cd:command name="resettext" value="resettextcontent"/> <cd:command name="definetext" value="definittexte"/> <cd:command name="pagenumber" value="numeropage"/> <cd:command name="completepagenumber" value="completenumeropage"/> @@ -1568,7 +1577,7 @@ <cd:command name="leftmargindistance" value="distancemargegauche"/> <cd:command name="rightmargindistance" value="distancemargedroite"/> <cd:command name="edgewidth" value="largeurbord"/> - <cd:command name="leftedgewidth" value="largeurbrodgauche"/> + <cd:command name="leftedgewidth" value="largeurbordgauche"/> <cd:command name="rightedgewidth" value="largeurborddroit"/> <cd:command name="edgedistance" value="distancebord"/> <cd:command name="leftedgedistance" value="distancebordgauche"/> diff --git a/Master/texmf-dist/tex/context/interface/keys-it.xml b/Master/texmf-dist/tex/context/interface/keys-it.xml index e659a0df724..6091fe8ee95 100644 --- a/Master/texmf-dist/tex/context/interface/keys-it.xml +++ b/Master/texmf-dist/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="2006.08.08 21:51"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2006.11.17 19:52"> <cd:variables> <cd:variable name="one" value="uno"/> @@ -87,6 +87,8 @@ <cd:variable name="flushleft" value="flushleft"/> <cd:variable name="flushright" value="flushright"/> <cd:variable name="center" value="center"/> + <cd:variable name="flushouter" value="flushouter"/> + <cd:variable name="flushinner" value="flushinner"/> </cd:variables> <cd:variables> @@ -96,6 +98,7 @@ <cd:variables> <cd:variable name="formula" value="formula"/> + <cd:variable name="subformula" value="subformula"/> <cd:variable name="formulae" value="formule"/> <cd:variable name="figure" value="figura"/> <cd:variable name="figures" value="figure"/> @@ -627,9 +630,11 @@ <cd:variable name="left" value="sinistra"/> <cd:variable name="local" value="locale"/> <cd:variable name="new" value="nuovo"/> + <cd:variable name="old" value="old"/> <cd:variable name="MONTH" value="MESE"/> <cd:variable name="month" value="mese"/> <cd:variable name="mar" value="mar"/> + <cd:variable name="item" value="elemento"/> <cd:variable name="marking" value="marcatura"/> <cd:variable name="margin" value="margine"/> <cd:variable name="max" value="max"/> @@ -784,6 +789,8 @@ <cd:variable name="xml" value="xml"/> <cd:variable name="enumeration" value="enumerazione"/> <cd:variable name="description" value="descrizione"/> + <cd:variable name="lefthanging" value="lefthanging"/> + <cd:variable name="righthanging" value="righthanging"/> </cd:variables> <cd:constants> @@ -1192,6 +1199,8 @@ <cd:command name="subpagenumber" value="subpagenumber"/> <cd:command name="setuptext" value="impostatesto"/> <cd:command name="setuptexttexts" value="impostatestotesti"/> + <cd:command name="settextcontent" value="settext"/> + <cd:command name="resettext" value="resettextcontent"/> <cd:command name="definetext" value="definiscitesto"/> <cd:command name="pagenumber" value="numeropagina"/> <cd:command name="completepagenumber" value="numeropaginacompleto"/> diff --git a/Master/texmf-dist/tex/context/interface/keys-nl.xml b/Master/texmf-dist/tex/context/interface/keys-nl.xml index 71c954ec3a4..7f238cdf6f0 100644 --- a/Master/texmf-dist/tex/context/interface/keys-nl.xml +++ b/Master/texmf-dist/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="2006.08.08 21:51"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2006.11.17 19:52"> <cd:variables> <cd:variable name="one" value="een"/> @@ -87,6 +87,8 @@ <cd:variable name="flushleft" value="lijnlinks"/> <cd:variable name="flushright" value="lijnrechts"/> <cd:variable name="center" value="centreer"/> + <cd:variable name="flushouter" value="lijnbuiten"/> + <cd:variable name="flushinner" value="lijnbinnen"/> </cd:variables> <cd:variables> @@ -96,6 +98,7 @@ <cd:variables> <cd:variable name="formula" value="formule"/> + <cd:variable name="subformula" value="subformule"/> <cd:variable name="formulae" value="formules"/> <cd:variable name="figure" value="figuur"/> <cd:variable name="figures" value="figuren"/> @@ -627,9 +630,11 @@ <cd:variable name="left" value="links"/> <cd:variable name="local" value="lokaal"/> <cd:variable name="new" value="nieuw"/> + <cd:variable name="old" value="oud"/> <cd:variable name="MONTH" value="MAAND"/> <cd:variable name="month" value="maand"/> <cd:variable name="mar" value="mar"/> + <cd:variable name="item" value="som"/> <cd:variable name="marking" value="markering"/> <cd:variable name="margin" value="marge"/> <cd:variable name="max" value="max"/> @@ -784,6 +789,8 @@ <cd:variable name="xml" value="xml"/> <cd:variable name="enumeration" value="doornummering"/> <cd:variable name="description" value="doordefinitie"/> + <cd:variable name="lefthanging" value="linkshangend"/> + <cd:variable name="righthanging" value="rechtshangend"/> </cd:variables> <cd:constants> @@ -1192,6 +1199,8 @@ <cd:command name="subpagenumber" value="subpaginanummer"/> <cd:command name="setuptext" value="steltekstin"/> <cd:command name="setuptexttexts" value="stelteksttekstenin"/> + <cd:command name="settextcontent" value="steltekstinhoudin"/> + <cd:command name="resettext" value="resettekstinhoud"/> <cd:command name="definetext" value="definieertekst"/> <cd:command name="pagenumber" value="paginanummer"/> <cd:command name="completepagenumber" value="volledigepaginanummer"/> diff --git a/Master/texmf-dist/tex/context/interface/keys-ro.xml b/Master/texmf-dist/tex/context/interface/keys-ro.xml index 159e06014ce..80a061a1708 100644 --- a/Master/texmf-dist/tex/context/interface/keys-ro.xml +++ b/Master/texmf-dist/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="2006.08.08 21:51"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2006.11.17 19:52"> <cd:variables> <cd:variable name="one" value="unu"/> @@ -87,6 +87,8 @@ <cd:variable name="flushleft" value="flushleft"/> <cd:variable name="flushright" value="flushright"/> <cd:variable name="center" value="center"/> + <cd:variable name="flushouter" value="flushouter"/> + <cd:variable name="flushinner" value="flushinner"/> </cd:variables> <cd:variables> @@ -96,6 +98,7 @@ <cd:variables> <cd:variable name="formula" value="formula"/> + <cd:variable name="subformula" value="subformula"/> <cd:variable name="formulae" value="formule"/> <cd:variable name="figure" value="figura"/> <cd:variable name="figures" value="figure"/> @@ -627,9 +630,11 @@ <cd:variable name="left" value="stanga"/> <cd:variable name="local" value="local"/> <cd:variable name="new" value="nou"/> + <cd:variable name="old" value="old"/> <cd:variable name="MONTH" value="LUNA"/> <cd:variable name="month" value="luna"/> <cd:variable name="mar" value="mar"/> + <cd:variable name="item" value="element"/> <cd:variable name="marking" value="marcaje"/> <cd:variable name="margin" value="margine"/> <cd:variable name="max" value="max"/> @@ -784,6 +789,8 @@ <cd:variable name="xml" value="xml"/> <cd:variable name="enumeration" value="enumerare"/> <cd:variable name="description" value="descriere"/> + <cd:variable name="lefthanging" value="lefthanging"/> + <cd:variable name="righthanging" value="righthanging"/> </cd:variables> <cd:constants> @@ -1192,6 +1199,8 @@ <cd:command name="subpagenumber" value="subpagenumber"/> <cd:command name="setuptext" value="seteazatext"/> <cd:command name="setuptexttexts" value="seteazatextetext"/> + <cd:command name="settextcontent" value="settextcontent"/> + <cd:command name="resettext" value="resettextcontent"/> <cd:command name="definetext" value="definestetext"/> <cd:command name="pagenumber" value="numarpagina"/> <cd:command name="completepagenumber" value="completeazanumarpagina"/> diff --git a/Master/texmf-dist/tex/context/interface/t-bib.xml b/Master/texmf-dist/tex/context/interface/t-bib.xml index dc7bd38f43a..d22933d3aa9 100644 --- a/Master/texmf-dist/tex/context/interface/t-bib.xml +++ b/Master/texmf-dist/tex/context/interface/t-bib.xml @@ -76,6 +76,10 @@ <cd:parameter name="title"> <cd:constant type="cd:command"/> </cd:parameter> + <cd:parameter name="maybeyear"> + <cd:constant type="off"/> + <cd:constant type="on" default="yes"/> + </cd:parameter> <cd:parameter name="criterium"> <cd:constant type="cd:section"/> <cd:constant type="local"/> @@ -254,6 +258,9 @@ </cd:sequence> <cd:arguments> <cd:assignments list="yes"> + <cd:parameter name="bibtex"> + <cd:constant type="cd:text"/> + </cd:parameter> <cd:parameter name="database"> <cd:constant type="cd:file"/> </cd:parameter> |