Reconciled label database with 2.2 branch

Merged recent template additions from 2.2 branch + some cleanup.

diff --git a/AUTHORS b/AUTHORS
index a6a829cc4d2baf700fd12d74b3d83f8e36e59aaa..cbcb03bc6b3d156ce165295dcc38c7399fb3b9a5 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -152,6 +152,8 @@ particular products (I apologize if I have missed anybody):
        Oliver Friedrich
        Dr. Oliver Thiel
        Jonas Stein
+       Thomas Eggers
+       Marina Delic
        Russell Knighton
        Anthony Mark Morningstar
 

diff --git a/templates/Makefile.am b/templates/Makefile.am
index d7c81d127661af11e90d5dfbea1f185cd60e600a..fb88cedf8d62b1282c90be0a58a7843b906ac052 100644 (file)
--- a/templates/Makefile.am
+++ b/templates/Makefile.am
@@ -20,6 +20,7 @@ templates_DATA = \
        misc-us-templates.xml \
        misc-iso-templates.xml \
        misc-other-templates.xml \
+       pearl-iso-templates.xml \
        uline-us-templates.xml \
        worldlabel-us-templates.xml \
        zweckform-iso-templates.xml

diff --git a/templates/glabels-2.3.dtd b/templates/glabels-2.3.dtd
index 56cf2742b20fad6e5b45b8b707826e395dbbec20..e791a134a704c70a62b048a140eefabd48ae7062 100644 (file)
--- a/templates/glabels-2.3.dtd
+++ b/templates/glabels-2.3.dtd
@@ -186,6 +186,7 @@
 <!ATTLIST Meta
                  product_url     %STRING_TYPE;           #IMPLIED
                  category        %STRING_TYPE;           #IMPLIED
+                 print           %STRING_TYPE;           #IMPLIED
 >
 
 <!ELEMENT Label-rectangle ((%markup_element;)*, Layout+)>
@@ -250,7 +251,7 @@
                  y1              %LENGTH_TYPE;           #REQUIRED
                  w               %LENGTH_TYPE;           #REQUIRED
                  h               %LENGTH_TYPE;           #REQUIRED
-                 r               %LENGTH_TYPE;           #REQUIRED
+                 r               %LENGTH_TYPE;           "0 pt"
 >
 
 <!ELEMENT Layout EMPTY>

diff --git a/templates/misc-iso-templates.xml b/templates/misc-iso-templates.xml
index 021baaa19e3c3469c9557df154c07718ef856707..ff075c7de4e6cdcd46277ee22a5e80a87c7bccfc 100644 (file)
--- a/templates/misc-iso-templates.xml
+++ b/templates/misc-iso-templates.xml
@@ -239,7 +239,7 @@
   <!-- =================================================================== -->
   <!-- APLI 01293:  General Labels.                                        -->
   <!-- =================================================================== -->
-  <Template brand="Apli" part="01293" size="A4" _description="General Labels">
+  <Template brand="APLI" part="01293" size="A4" _description="General Labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="198.425pt" height="94.3937pt" round="0pt" x_waste="0pt" y_waste="0pt">
       <Markup-margin size="0pt"/>
@@ -631,7 +631,30 @@
     </Label-rectangle>
   </Template>
 
+  <!-- =================================================================== -->
+  <!-- Geha Z53.  Address Labels.                                         -->
+  <!-- =================================================================== -->
+  <Template brand="Geha" part="Z53" size="A4" _description="Address Labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.geha.de/index.php?id=1047&amp;pid=30767"/>
+    <Label-rectangle id="0" width="99.1mm" height="38.1mm" round="0.2mm" x_waste="0mm" y_waste="0mm">
+      <Markup-margin size="3.2mm"/>
+      <Layout nx="2" ny="7" x0="3mm" y0="15.9mm" dx="101.6mm" dy="38.1mm"/>
+    </Label-rectangle>
+  </Template>
 
+  <!-- =================================================================== -->
+  <!-- Staples STAP14 Mailing Labels.                                      -->
+  <!-- =================================================================== -->
+  <Template brand="Staples" part="STAP14" size="A4" _description="Mailing Labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Label-rectangle id="0" width="99mm" height="38mm" round="2mm" x_waste="0mm" y_waste="0mm">
+      <Markup-margin size="3mm"/>
+      <Layout nx="2" ny="7" x0="5mm" y0="15mm" dx="102mm" dy="38mm"/>
+    </Label-rectangle>
+  </Template>
 
   <!-- ******************************************************************** -->
   <!-- Misc. A6 products.                                                   -->