Catching up on template submissions.

diff --git a/AUTHORS b/AUTHORS
index c15e68bdb9a78b47a40d7e82d34227d0b1e78901..49edfa153741ea6c7f955da94b6be6e46a7f73a5 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -183,6 +183,8 @@ particular products (I apologize if I have missed anybody):
        Jonas Stein
        Thomas Eggers
        Marina Delic
+       Russell Knighton
+       Anthony Mark Morningstar
 
 
 And many others for their many helpful suggestions and bug reports -- thanks.

diff --git a/data/templates/misc-iso-templates.xml b/data/templates/misc-iso-templates.xml
index d515fa3f3f3b83f03ac4b4bedacb9b7e04ceb980..18d08b12136206a95a373dc9ae36396b59de151a 100644 (file)
--- a/data/templates/misc-iso-templates.xml
+++ b/data/templates/misc-iso-templates.xml
@@ -212,9 +212,9 @@
   </Template>
 
   <!-- ====================================================== -->
-  <!-- Alpi 02793: Business Cards, 50,8 x 90 mm, 10 per sheet -->
+  <!-- APLI 02793: Business Cards, 50,8 x 90 mm, 10 per sheet -->
   <!-- ====================================================== -->
-  <Template brand="Alpi" part="02793" size="A4" _description="Business Cards">
+  <Template brand="APLI" part="02793" size="A4" _description="Business Cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Label-rectangle id="0" width="255.118" height="144" round="0">
@@ -472,6 +472,17 @@
     </Label-cd>
   </Template>
 
+  <!-- =================================================================== -->
+  <!-- Ryman P14 Universal labels.                                         -->
+  <!-- =================================================================== -->
+  <Template brand="Ryman" part="P14" size="A4" _description="Universal Labels">
+    <Meta category="label"/>
+    <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="4.2mm" y0="13.8mm" dx="102mm" dy="38.1mm"/>
+    </Label-rectangle>
+  </Template>
+
   <!-- =================================================================== -->
   <!-- Ryman Standard CD/DVD Labels.                                       -->
   <!-- =================================================================== -->
@@ -533,6 +544,19 @@
     </Label-rectangle>
   </Template>
 
+  <!-- =================================================================== -->
+  <!-- DECAdry DLW-1734: Mailing Labels.                                   -->
+  <!-- =================================================================== -->
+  <Template brand="DECAdry" part="DLW-1734" size="A4" _description="Mailing Labels">
+    <Meta category="label"/>
+    <Meta category="mail"/>
+    <Label-rectangle id="0" width="99.1mm" height="67.7mm" round="2mm" x_waste="0mm" y_waste="0mm">
+      <Markup-margin size="3.175mm"/>
+      <Layout nx="2" ny="4" x0="4.65mm" y0="13.1mm" dx="101.5mm" dy="67.7mm"/>
+    </Label-rectangle>
+    <Alias brand="DECAdry" part="OLW-4734"/>
+  </Template>
+
   <!-- =================================================================== -->
   <!-- DECAdry DLW-1786: Mailing Labels.                                   -->
   <!-- =================================================================== -->
@@ -612,11 +636,11 @@
   <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"/>\r
-    <Label-rectangle id="0" width="99.1mm" height="38.1mm" round="0.2mm" x_waste="0mm" y_waste="0mm">\r
-      <Markup-margin size="3.2mm"/>\r
-      <Layout nx="2" ny="7" x0="3mm" y0="15.9mm" dx="101.6mm" dy="38.1mm"/>\r
-    </Label-rectangle>\r
+    <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>
 
   <!-- =================================================================== -->

diff --git a/data/templates/misc-us-templates.xml b/data/templates/misc-us-templates.xml
index 73bdb62f54ff20dbe8dad0a956be84369e51725c..7b6a05a127bc1006f9614cd35d5ed6e99bb6d723 100644 (file)
--- a/data/templates/misc-us-templates.xml
+++ b/data/templates/misc-us-templates.xml
@@ -71,6 +71,18 @@
     </Label-cd>
   </Template>
 
+  <!-- =================================================================== -->
+  <!-- Neato 69143: Jewel Case Booklet                                     -->
+  <!-- =================================================================== -->
+  <Template brand="Neato" part="69143" size="US-Letter" _description="Jewel Case Booklet">
+    <Meta category="media"/>
+    <Label-rectangle id="0" width="4.75in" height="9.5in" round="0in" x_waste="0in" y_waste="0in">
+      <Markup-margin size="0.125in"/>
+      <Markup-line x1="0in" y1="4.75in" x2="4.75in" y2="4.75in"/>
+      <Layout nx="1" ny="1" x0="1.875in" y0="0.75in" dx="4.75in" dy="9.5in"/>
+    </Label-rectangle>
+  </Template>
+
   <!-- =================================================================== -->
   <!-- CD STOMPER PRO CD Label Refills, (Face Only)                      * -->
   <!-- =================================================================== -->

diff --git a/data/templates/pearl-templates.xml b/data/templates/pearl-templates.xml
index d8b2681da22df698e0e5f5f4072079ddbb437138..52df93d3db8f16d4414d003a986f583e2d4f456d 100644 (file)
--- a/data/templates/pearl-templates.xml
+++ b/data/templates/pearl-templates.xml
@@ -422,8 +422,6 @@
     <Meta category="business-card"/>
     <Meta product_url="http://www.pearl.de/a-VM6253-2013.shtml"/>
     <Label-rectangle id="0" width="85mm" height="54mm" round="0mm" x_waste="1mm" y_waste="2.5mm">
-    <Meta category="card"/>
-    <Meta product_url="http://www.pearl.de/a-VM6253-2013.shtml"/>
       <Markup-margin size="3.2mm"/>
       <Layout nx="2" ny="5" x0="16.5mm" y0="6mm" dx="90mm" dy="55.5mm"/>
     </Label-rectangle>