commit context 2011.05.18

git-svn-id: svn://tug.org/texlive/trunk@22719 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 91 insertions, 15 deletions

diff --git a/Master/texmf-dist/tex/context/interface/cont-de.xml b/Master/texmf-dist/tex/context/interface/cont-de.xml
index 6ba3e691ed5..61441dd9ca0 100644
--- a/Master/texmf-dist/tex/context/interface/cont-de.xml
+++ b/Master/texmf-dist/tex/context/interface/cont-de.xml
@@ -1,13 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?> <!-- versions:
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- versions:
 
     comment  : user interface definitions of ConTeXt
 
-    authors  : Hans Hagen, Taco Hoekwater, Patrick Gundlach
+    authors  : Hans Hagen, Taco Hoekwater, Patrick Gundlach, Wolfgang Schuster, and others
 
     versions : 2004.11.17 : initial version
                2006.08.02 : define + resolve
 
 -->
+
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2006.08.02">
 
   <cd:define name="align">
@@ -869,6 +872,15 @@
         <cd:parameter name="farbe">
           <cd:constant type="cd:name" default=""/>
         </cd:parameter>
+        <cd:parameter name="links">
+          <cd:constant type="cd:command"/>
+        </cd:parameter>
+        <cd:parameter name="rechts">
+          <cd:constant type="cd:command"/>
+        </cd:parameter>
+        <cd:parameter name="befehl">
+          <cd:constant type="cd:command"/>
+        </cd:parameter>
       </cd:assignments>
     </cd:arguments>
   </cd:command>
@@ -1148,6 +1160,10 @@
           <cd:constant type="ja"/>
           <cd:constant type="nein"/>
         </cd:parameter>
+        <cd:parameter name="absatz">
+          <cd:constant type="ja"/>
+          <cd:constant type="nein" default="yes"/>
+        </cd:parameter>
         <cd:parameter name="faktor">
           <cd:constant type="cd:number"/>
         </cd:parameter>
@@ -3166,6 +3182,10 @@
         <cd:parameter name="befehl">
           <cd:constant type="cd:command"/>
         </cd:parameter>
+        <cd:parameter name="bildschirm">
+          <cd:constant type="ja" default="yes"/>
+          <cd:constant type="nein"/>
+        </cd:parameter>
       </cd:assignments>
     </cd:arguments>
   </cd:command>
@@ -4893,8 +4913,14 @@
         <cd:constant type="cd:section"/>
         <cd:constant type="cd:name"/>
       </cd:keywords>
-      <cd:content n="2"/>
+      <cd:assignments n="2" list="yes">
+        <cd:parameter name="platz">
+          <cd:constant type="hier"/>
+          <cd:constant type="kein"/>
+        </cd:parameter>
+      </cd:assignments>
       <cd:content n="3"/>
+      <cd:content n="4"/>
     </cd:arguments>
   </cd:command>
 
@@ -4907,7 +4933,13 @@
         <cd:constant type="cd:section"/>
         <cd:constant type="cd:name"/>
       </cd:keywords>
-      <cd:content n="2"/>
+      <cd:assignments n="2" list="yes">
+        <cd:parameter name="platz">
+          <cd:constant type="hier"/>
+          <cd:constant type="kein"/>
+        </cd:parameter>
+      </cd:assignments>
+      <cd:content n="3"/>
     </cd:arguments>
   </cd:command>
 
@@ -5025,7 +5057,7 @@
           <cd:constant type="intro"/>
           <cd:constant type="alles"/>
         </cd:parameter>
-        <cd:parameter name="seitenbegrenzung">
+        <cd:parameter name="extras">
           <cd:constant type="cd:list"/>
         </cd:parameter>
         <cd:parameter name="stil">
@@ -5056,10 +5088,11 @@
           <cd:constant type="cd:oneargument"/>
         </cd:parameter>
         <cd:parameter name="interaktion">
-          <cd:constant type="cd:sectionnumber"/>
-          <cd:constant type="cd:text"/>
+          <cd:constant type="abschnittsnummer"/>
+          <cd:constant type="text"/>
           <cd:constant type="seitennummer"/>
           <cd:constant type="alles"/>
+          <cd:constant type="kein"/>
         </cd:parameter>
         <cd:parameter name="vor">
           <cd:constant type="cd:command"/>
@@ -5142,6 +5175,11 @@
         <cd:parameter name="maxbreite">
           <cd:constant type="cd:dimension"/>
         </cd:parameter>
+        <cd:parameter name="order">
+          <cd:constant type="befehl"/>
+          <cd:constant type="alles"/>
+          <cd:constant type="normal"/>
+        </cd:parameter>
         <cd:inherit name="stelleumrahmtein" n="2"/>
       </cd:assignments>
     </cd:arguments>
@@ -6062,6 +6100,10 @@
           <cd:constant type="ja"/>
           <cd:constant type="nein"/>
         </cd:parameter>
+        <cd:parameter name="interaktion">
+          <cd:constant type="liste"/>
+          <cd:constant type="kein"/>
+        </cd:parameter>
         <cd:inherit name="stelleueberschriftenein" n="1"/>
       </cd:assignments>
     </cd:arguments>
@@ -6855,12 +6897,6 @@
         <cd:parameter name="hoehe">
           <cd:constant type="cd:dimension"/>
         </cd:parameter>
-        <cd:parameter name="voffset">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="hoffset">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
         <cd:parameter name="seite">
           <cd:constant type="links"/>
           <cd:constant type="ja"/>
@@ -8513,6 +8549,11 @@
         <cd:parameter name="prefix">
           <cd:constant type="cd:text"/>
         </cd:parameter>
+        <cd:parameter name="interaktion">
+          <cd:constant type="ja"/>
+          <cd:constant type="nein"/>
+          <!-- more will follow -->
+        </cd:parameter>
       </cd:assignments>
     </cd:arguments>
   </cd:command>
@@ -9319,6 +9360,12 @@
         <cd:constant type="cd:name"/>
         <cd:constant type="alles"/>
       </cd:keywords>
+      <cd:assignments n="3" optional="yes" list="yes">
+        <cd:parameter name="zwinge">
+          <cd:constant type="ja"/>
+          <cd:constant type="nein"/>
+        </cd:parameter>
+      </cd:assignments>
     </cd:arguments>
   </cd:command>
 
@@ -9587,7 +9634,7 @@
 
   <cd:command name="comment" type="environment">
     <cd:sequence>
-      <cd:string value="kommentar"/>
+      <cd:string value="comment"/>
     </cd:sequence>
     <cd:arguments>
       <cd:keywords n="1" optional="yes">
@@ -9601,7 +9648,7 @@
 
   <cd:command name="comment">
     <cd:sequence>
-      <cd:string value="kommentar"/>
+      <cd:string value="comment"/>
     </cd:sequence>
     <cd:arguments>
       <cd:keywords n="1" optional="yes">
@@ -10220,6 +10267,8 @@
     </cd:arguments>
   </cd:command>
 
+  <!-- mkii:
+
   <cd:command name="definefontsynonym" file="font-ini.tex">
     <cd:sequence>
       <cd:string value="defineschriftsynonym"/>
@@ -10248,6 +10297,33 @@
     </cd:arguments>
   </cd:command>
 
+  -->
+
+  <cd:command name="definefontsynonym" file="font-ini.tex">
+    <cd:sequence>
+      <cd:string value="defineschriftsynonym"/>
+    </cd:sequence>
+    <cd:arguments>
+      <cd:keywords n="1">
+        <cd:constant type="cd:text"/>
+      </cd:keywords>
+      <cd:keywords n="2">
+        <cd:constant type="cd:name"/>
+      </cd:keywords>
+      <cd:assignments n="3" optional="yes">
+        <cd:parameter name="fallbacks">
+          <cd:constant type="cd:name"/>
+        </cd:parameter>
+        <cd:parameter name="features">
+          <cd:constant type="cd:name"/>
+        </cd:parameter>
+        <cd:parameter name="goodies">
+          <cd:constant type="cd:name"/>
+        </cd:parameter>
+      </cd:assignments>
+    </cd:arguments>
+  </cd:command>
+
   <cd:command name="setupfontsynonym" file="font-ini.tex">
     <cd:sequence>
       <cd:string value="setupfontsynonym"/>