From 79dbb3d7444f6fc13d114dbf4cc7070ced271398 Mon Sep 17 00:00:00 2001
From: Jim Evins <evins@snaught.com>
Date: Wed, 24 Nov 2010 21:40:56 -0500
Subject: [PATCH] Cleanup of template database.

- Moved "DECAdry" templates to their own file.
- Replaced some deprecated "Alias" tags.
---
 po/POTFILES.in                        |  1 +
 templates/Makefile.am                 |  1 +
 templates/avery-iso-templates.xml     |  3 -
 templates/decadry-iso-templates.xml   | 99 +++++++++++++++++++++++++++
 templates/misc-iso-templates.xml      | 51 --------------
 templates/zweckform-iso-templates.xml |  4 --
 6 files changed, 101 insertions(+), 58 deletions(-)
 create mode 100644 templates/decadry-iso-templates.xml

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 36e9c494..0ec9ba59 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -227,6 +227,7 @@ libglabels/xml-template.h
 [type: gettext/xml]templates/avery-iso-templates.xml
 [type: gettext/xml]templates/avery-other-templates.xml
 [type: gettext/xml]templates/brother-other-templates.xml
+[type: gettext/xml]templates/decadry-iso-templates.xml
 [type: gettext/xml]templates/dymo-other-templates.xml
 [type: gettext/xml]templates/herma-iso-templates.xml
 [type: gettext/xml]templates/jac-iso-templates.xml
diff --git a/templates/Makefile.am b/templates/Makefile.am
index 2383faa6..6a4692e6 100644
--- a/templates/Makefile.am
+++ b/templates/Makefile.am
@@ -15,6 +15,7 @@ templates_DATA = \
 	avery-iso-templates.xml \
 	avery-other-templates.xml \
 	brother-other-templates.xml \
+	decadry-iso-templates.xml \
 	dymo-other-templates.xml \
 	herma-iso-templates.xml \
 	jac-iso-templates.xml \
diff --git a/templates/avery-iso-templates.xml b/templates/avery-iso-templates.xml
index 3ab66e05..db94eeb8 100644
--- a/templates/avery-iso-templates.xml
+++ b/templates/avery-iso-templates.xml
@@ -78,9 +78,6 @@
       <Markup-margin size="5"/>
       <Layout nx="3" ny="7" x0="21.2" y0="43.9" dx="187.2" dy="108.0"/>
     </Label-rectangle>
-    <Alias brand="DECAdry" part="DLW-1731"/>
-    <Alias brand="DECAdry" part="OLW-4731"/>
-    <Alias brand="DECAdry" part="OLW-7131"/>
   </Template>
 
   <Template brand="Avery" part="L7160" equiv="7160"/>
diff --git a/templates/decadry-iso-templates.xml b/templates/decadry-iso-templates.xml
new file mode 100644
index 00000000..754d1ac0
--- /dev/null
+++ b/templates/decadry-iso-templates.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0"?>
+
+<Glabels-templates>
+
+
+  <!-- ******************************************************************** -->
+  <!-- ******************************************************************** -->
+  <!--                                                                      -->
+  <!-- DECAdry A4 products.                                                 -->
+  <!--                                                                      -->
+  <!-- ******************************************************************** -->
+  <!-- ******************************************************************** -->
+
+
+  <!-- =================================================================== -->
+  <!-- DECAdry DLW-1731: Mailing labels, 63.5 x 38.1 mm, 21 per sheet      -->
+  <!-- =================================================================== -->
+  <Template brand="DECAdry" part="DLW-1731" size="A4" _description="Mailing labels">
+    <Meta category="label"/>
+    <Meta category="mail"/>
+    <Label-rectangle id="0" width="181.4" height="108.0" round="5">
+      <Markup-margin size="5"/>
+      <Layout nx="3" ny="7" x0="21.2" y0="43.9" dx="187.2" dy="108.0"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="DECAdry" part="OLW-4731" equiv="DLW-1731"/>
+  <Template brand="DECAdry" part="OLW-7131" equiv="DLW-1731"/>
+
+
+  <!-- =================================================================== -->
+  <!-- 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>
+  </Template>
+
+  <Template brand="DECAdry" part="OLW-4734" equiv="DLW-1734"/>
+
+
+  <!-- =================================================================== -->
+  <!-- DECAdry DLW-1786: Mailing Labels.                                   -->
+  <!-- =================================================================== -->
+  <Template brand="DECAdry" part="DLW-1786" size="A4" _description="Mailing Labels">
+    <Meta category="label"/>
+    <Meta category="mail"/>
+    <Label-rectangle id="0" width="105mm" height="39mm" round="0mm" x_waste="0mm" y_waste="0mm">
+      <Markup-margin size="3.175mm"/>
+      <Layout nx="2" ny="7" x0="0mm" y0="12mm" dx="105mm" dy="39mm"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="DECAdry" part="OLW-4786" equiv="DLW-1786"/>
+
+
+  <!-- =================================================================== -->
+  <!-- DECAdry DLW-1787: Mailing Labels.                                   -->
+  <!-- =================================================================== -->
+  <Template brand="DECAdry" part="DLW-1787" size="A4" _description="Mailing Labels">
+    <Meta category="label"/>
+    <Meta category="mail"/>
+    <Label-rectangle id="0" width="70mm" height="35mm" round="0mm" x_waste="0mm" y_waste="0mm">
+      <Markup-margin size="3.2mm"/>
+      <Layout nx="3" ny="8" x0="0mm" y0="8.5mm" dx="70mm" dy="35mm"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="DECAdry" part="OLW-4787" equiv="DLW-1787"/>
+
+
+  <!-- =================================================================== -->
+  <!-- DECAdry OCC-3342 Business Cards.                                    -->
+  <!-- =================================================================== -->
+  <Template brand="DECAdry" part="OCC-3342" size="A4" _description="Business Cards">
+    <Meta category="card"/>
+    <Meta category="business-card"/>
+    <Label-rectangle id="0" width="240.945pt" height="153.071pt" round="0pt" x_waste="0pt" y_waste="0pt">
+      <Markup-margin size="0pt"/>
+      <Layout nx="2" ny="5" x0="42.5197pt" y0="38.2677pt" dx="269.291pt" dy="153.071pt"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="DECAdry" part="OCB-3327" equiv="OCC-3342"/>
+  <Template brand="DECAdry" part="SCW-2090" equiv="OCC-3342"/>
+  <Template brand="DECAdry" part="DAW-327"  equiv="OCC-3342"/>
+
+
+
+
+</Glabels-templates>
+
+
+
+
diff --git a/templates/misc-iso-templates.xml b/templates/misc-iso-templates.xml
index 642cd19d..09d800d7 100644
--- a/templates/misc-iso-templates.xml
+++ b/templates/misc-iso-templates.xml
@@ -369,57 +369,6 @@
     </Label-rectangle>
   </Template>
 
-  <!-- =================================================================== -->
-  <!-- DECAdry OCC 3342 Business Cards.                                    -->
-  <!-- =================================================================== -->
-  <Template brand="DECAdry" part="OCC 3342" size="A4" _description="Business Cards">
-    <Meta category="card"/>
-    <Meta category="business-card"/>
-    <Label-rectangle id="0" width="240.945pt" height="153.071pt" round="0pt" x_waste="0pt" y_waste="0pt">
-      <Markup-margin size="0pt"/>
-      <Layout nx="2" ny="5" x0="42.5197pt" y0="38.2677pt" dx="269.291pt" dy="153.071pt"/>
-    </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.                                   -->
-  <!-- =================================================================== -->
-  <Template brand="DECAdry" part="DLW-1786" size="A4" _description="Mailing Labels">
-    <Meta category="label"/>
-    <Meta category="mail"/>
-    <Label-rectangle id="0" width="105mm" height="39mm" round="0mm" x_waste="0mm" y_waste="0mm">
-      <Markup-margin size="3.175mm"/>
-      <Layout nx="2" ny="7" x0="0mm" y0="12mm" dx="105mm" dy="39mm"/>
-    </Label-rectangle>
-    <Alias brand="DECAdry" part="OLW-4786"/>
-  </Template>
-
-  <!-- =================================================================== -->
-  <!-- DECAdry DLW-1787: Mailing Labels.                                   -->
-  <!-- =================================================================== -->
-  <Template brand="DECAdry" part="DLW-1787" size="A4" _description="Mailing Labels">
-    <Meta category="label"/>
-    <Meta category="mail"/>
-    <Label-rectangle id="0" width="70mm" height="35mm" round="0mm" x_waste="0mm" y_waste="0mm">
-      <Markup-margin size="3.2mm"/>
-      <Layout nx="3" ny="8" x0="0mm" y0="8.5mm" dx="70mm" dy="35mm"/>
-    </Label-rectangle>
-    <Alias brand="DECAdry" part="OLW-4787"/>
-  </Template>
-
   <!-- =================================================================== -->
   <!-- Connect KF10647 Mailing Labels..                                    -->
   <!-- =================================================================== -->
diff --git a/templates/zweckform-iso-templates.xml b/templates/zweckform-iso-templates.xml
index b807fcfb..a7ee09e9 100644
--- a/templates/zweckform-iso-templates.xml
+++ b/templates/zweckform-iso-templates.xml
@@ -243,10 +243,6 @@
       <Markup-margin size="5"/>
       <Layout nx="2" ny="5" x0="40" y0="40" dx="269" dy="153"/>
     </Label-rectangle>
-    <Alias brand="DECAdry" part="SCW-2090"/>
-    <Alias brand="DECAdry" part="OCB-3327"/>
-    <Alias brand="DECAdry" part="OCC-3342"/>
-    <Alias brand="DECAdry" part="DAW-327"/>
   </Template>
 
 
-- 
2.39.5