From 544b2c55be62f99f9a509d534c245c0551445c49 Mon Sep 17 00:00:00 2001
From: Jim Evins <evins@snaught.com>
Date: Sun, 14 Dec 2003 05:35:23 +0000
Subject: [PATCH] Added 2 user submitted templates.  Did a little cleanup of
 the avery-iso and zweckform-iso files.

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@374 f5e0f49d-192f-0410-a22d-a8d8700d0965
---
 glabels2/AUTHORS                          |  2 +
 glabels2/data/avery-iso-templates.xml     | 67 +++++++++++++----------
 glabels2/data/zweckform-iso-templates.xml | 59 +++++++++++---------
 3 files changed, 75 insertions(+), 53 deletions(-)

diff --git a/glabels2/AUTHORS b/glabels2/AUTHORS
index ae05d481..98fec176 100644
--- a/glabels2/AUTHORS
+++ b/glabels2/AUTHORS
@@ -120,5 +120,7 @@ particular products (I apologize if I have missed anybody):
 	Niels
         Ernst W. Winter
 	regis rampnoux	
+	Sven Salzwedel
+	Dick Middleton
 
 And many others for their many helpful suggestions and bug reports -- thanks.
diff --git a/glabels2/data/avery-iso-templates.xml b/glabels2/data/avery-iso-templates.xml
index 5f317647..6ca00d48 100644
--- a/glabels2/data/avery-iso-templates.xml
+++ b/glabels2/data/avery-iso-templates.xml
@@ -9,133 +9,144 @@
   <!-- =================================================================== -->
   <!-- Avery 7160 family: Mailing labels, 63.5 x 38.1 mm, 21 per sheet     -->
   <!-- =================================================================== -->
-  <Template name="Avery 7160" size="A4" _description="Mailing labels">
+  <Template name="Avery   7160" size="A4" _description="Mailing labels">
     <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>
-    <Alias name="Avery L7160"/>
-    <Alias name="Avery J8160"/>
+    <Alias name="Avery  L7160"/>
+    <Alias name="Avery  J8160"/>
   </Template>
 
   <!-- =================================================================== -->
   <!-- Avery 7161 family: Mailing labels, 63.5 x 46.6 mm, 18 per sheet     -->
   <!-- =================================================================== -->
-  <Template name="Avery 7161" size="A4" _description="Mailing labels">
+  <Template name="Avery   7161" size="A4" _description="Mailing labels">
     <Label-rectangle id="0" width="180.2" height="132.6" round="7">
       <Markup-margin size="5"/>
       <Layout nx="3" ny="6" x0="21" y0="23" dx="186.9" dy="132.5"/>
     </Label-rectangle>
-    <Alias name="Avery L7161"/>
-    <Alias name="Avery J8161"/>
+    <Alias name="Avery  L7161"/>
+    <Alias name="Avery  J8161"/>
   </Template>
 
   <!-- ================================================================== -->  
   <!-- Avery 7162 family: Mailing labels, 99.1 x 33.9 mm, 16 per sheet    -->  
   <!-- ================================================================== -->  
-  <Template name="Avery 7162" size="A4" _description="Mailing labels">  
+  <Template name="Avery   7162" size="A4" _description="Mailing labels">  
     <Label-rectangle id="0" width="280.9" height="96.1" round="5">  
       <Markup-margin size="5"/>
       <Layout nx="2" ny="8" x0="11.3" y0="36.8" dx="290.5" dy="96.1"/>  
     </Label-rectangle>  
-    <Alias name="Avery L7162"/>  
+    <Alias name="Avery  L7162"/>  
   </Template>
 
   <!-- =================================================================== -->
   <!-- Avery 7163 family: Mailing labels, 99.1 x 38.1 mm, 14 per sheet     -->
   <!-- =================================================================== -->
-  <Template name="Avery 7163" size="A4" _description="Mailing labels">
+  <Template name="Avery   7163" size="A4" _description="Mailing labels">
     <Label-rectangle id="0" width="280.9" height="108" round="5">
       <Markup-margin size="5"/>
       <Layout nx="2" ny="7" x0="9.5" y0="43" dx="292" dy="108"/>
     </Label-rectangle>
-    <Alias name="Avery L7163"/>
+    <Alias name="Avery  L7163"/>
   </Template>
 
   <!-- =================================================================== -->
   <!-- Avery 7164 family: Address labels, 63.50 x 71.98 mm, 12 per sheet   -->
   <!-- =================================================================== -->
-  <Template name="Avery 7164" size="A4" _description="Address labels">
+  <Template name="Avery   7164" size="A4" _description="Address labels">
     <Label-rectangle id="0" width="180" height="204.038" round="8.5">
       <Markup-margin size="5"/>
       <Layout nx="3" ny="4" x0="20.84" y0="10" dx="187.08" dy="204.038"/>
     </Label-rectangle>
-    <Alias name="Avery J8164"/>
-    <Alias name="Avery L7164"/>
+    <Alias name="Avery  J8164"/>
+    <Alias name="Avery  L7164"/>
     <Alias name="Biltema 23-756"/>
   </Template>
 
   <!-- =================================================================== -->
   <!-- Avery 7169 family: shipping labels, 99.1 x 139.0 mm, 4 per sheet    -->
   <!-- =================================================================== -->
-  <Template name="Avery L7169" size="A4" _description="Shipping labels">
+  <Template name="Avery   7169" size="A4" _description="Shipping labels">
     <Label-rectangle id="0" width="280.9" height="394.0" round="6">
       <Markup-margin size="6"/>
       <Layout nx="2" ny="2" x0="14.2" y0="20.0" dx="287.7" dy="394.0"/>
     </Label-rectangle>
-    <Alias name="Avery 7169"/>
+    <Alias name="Avery  L7169"/>
   </Template>
 
   <!-- =================================================================== -->
   <!-- Avery 7414 family: Business Cards, 52mm x 90mm, 10 per sheet        -->
   <!-- =================================================================== -->
-  <Template name="Avery L7414" size="A4" _description="Business Cards">
+  <Template name="Avery   7414" size="A4" _description="Business Cards">
     <Label-rectangle id="0" width="255.1" height="147.4" round="0">
       <Markup-margin size="5"/>
       <Layout nx="2" ny="5" x0="42.51" y0="52.44" dx="255.1" dy="147.4"/>
     </Label-rectangle>
+    <Alias name="Avery  L7414"/>
+  </Template>
+
+  <!-- =================================================================== -->
+  <!-- Avery 7664 family: Diskette Labels, 70mm x 71.9 mm, 8 per sheet     -->
+  <!-- =================================================================== -->
+  <Template name="Avery   7664" size="A4" description="Diskette Labels">
+    <Label-rectangle id="0" width="70mm" height="71.9mm" round="2.5mm">
+      <Markup-margin size="5"/>
+      <Layout nx="2" ny="4" x0="17mm" y0="5mm" dx="104.5mm" dy="72mm"/> 
+    </Label-rectangle>
+    <Alias name="Avery  L7664"/>
   </Template>
 
   <!-- =================================================================== -->
   <!-- Avery 8414 family: Business Cards, 50.8 x 87.0 mm, 10 per sheet     -->
   <!-- =================================================================== -->
-  <Template name="Avery 8414" size="A4" _description="Business Cards">
+  <Template name="Avery   8414" size="A4" _description="Business Cards">
     <Label-rectangle id="0" width="246.6" height="144" round="0">
       <Markup-margin size="5"/>
       <Layout nx="2" ny="5" x0="42" y0="57.890" dx="264" dy="144"/>
     </Label-rectangle>
-    <Alias name="Avery J8414"/>
+    <Alias name="Avery  J8414"/>
   </Template>
 
   <!-- =================================================================== -->
   <!-- Avery 8651 family: Mailing labels, 38.1 x 21.2 mm, 65 per sheet     -->
   <!-- =================================================================== -->
-  <Template name="Avery 8651" size="A4" _description="Mini Address">
+  <Template name="Avery   8651" size="A4" _description="Mini Address">
     <Label-rectangle id="0" width="108" height="60.09" round="5">
       <Markup-margin size="5"/>
       <Layout nx="5" ny="13" x0="13.32" y0="30.90" dx="115.09" dy="60.09"/>
     </Label-rectangle>
-    <Alias name="Avery L8651"/>
-    <Alias name="Avery J8651"/>
+    <Alias name="Avery  L8651"/>
+    <Alias name="Avery  J8651"/>
   </Template>
 
   <!-- =================================================================== -->
   <!-- Avery 8666 family: Diskette labels (face only), 70 x 52 mm, 10 per  -->
   <!-- =================================================================== -->
-  <Template name="Avery 8666" size="A4"
-         _description="3.5'' Diskette labels (face only)">
+  <Template name="Avery   8666" size="A4" _description="Diskette labels">
     <Label-rectangle id="0" width="198.4" height="147.4" round="5">
       <Markup-margin size="5"/>
       <Layout nx="2" ny="5" x0="66" y0="53" dx="264" dy="147"/>
     </Label-rectangle>
-    <Alias name="Avery J8666"/>
+    <Alias name="Avery  J8666"/>
   </Template>
 
   <!-- =============================================================== -->
-  <!-- Avery-Zweckform J8676A: CD/DVD Labels 2 per sheet               -->
+  <!-- Avery J8676A: CD/DVD Labels 2 per sheet                         -->
   <!-- =============================================================== -->
-  <Template name="Avery 8676" size="A4" _description="CD/DVD Labels">
+  <Template name="Avery   8676" size="A4" _description="CD/DVD Labels">
     <Label-cd id="0" radius="166.5" hole="17" waste="5">
       <Markup-margin size="5"/>
       <Layout nx="1" ny="2" x0="130" y0="59.5" dx="0" dy="388"/>        
     </Label-cd>
-    <Alias name="Avery J8676"/>
+    <Alias name="Avery  J8676"/>
   </Template>
 
   <!-- =============================================================== -->
   <!-- Avery 18036 Mailing Labels, 70mm x 32mm, 27 per sheet           -->
   <!-- =============================================================== -->
-  <Template name="Avery 18036" size="A4" _description="Mailing Labels">
+  <Template name="Avery  18036" size="A4" _description="Mailing Labels">
     <Label-rectangle id="0" width="198" height="91" round="0">
       <Markup-margin size="10"/>
       <Layout nx="3" ny="9" x0="0" y0="13" dx="198" dy="91"/>
diff --git a/glabels2/data/zweckform-iso-templates.xml b/glabels2/data/zweckform-iso-templates.xml
index d64d6dd9..08256852 100644
--- a/glabels2/data/zweckform-iso-templates.xml
+++ b/glabels2/data/zweckform-iso-templates.xml
@@ -6,23 +6,10 @@
   <!-- Zweckform A4 products                                                -->
   <!-- ******************************************************************** -->
 
-  <!-- =================================================================== -->
-  <!-- Zweckform 32010: Business Cards, 54.0 x 85.0 mm, 10 per sheet       -->
-  <!-- =================================================================== -->
-  <Template name="Zweckform 32010" size="A4" _description="Business Cards">
-    <Label-rectangle id="0" width="240.94" height="153.07" round="0">
-      <Markup-margin size="5"/>
-      <Layout nx="2" ny="5" x0="40" y0="40" dx="269" dy="153"/>
-    </Label-rectangle>
-    <Alias name="DECAdry SCW-2090"/>
-    <Alias name="DECAdry OCB-3327"/>
-    <Alias name="DECAdry DAW-327"/>
-  </Template>
-
   <!-- =================================================================== -->
   <!-- Zweckform 4761: Lever Arch File Labels, 192 x 61 mm, 4 per sheet    -->
   <!-- =================================================================== -->
-  <Template name="Zweckform 4761" size="A4" _description="Lever Arch File Labels">
+  <Template name="Zweckform  4761" size="A4" _description="Lever Arch File Labels">
     <Label-rectangle id="0" width="544.25" height="172.9" round="5">
       <Markup-margin size="5"/>
       <Layout nx="1" ny="4" x0="25" y0="75" dx="544.25" dy="172.9"/>
@@ -32,7 +19,7 @@
   <!-- =================================================================== -->
   <!-- Zweckform 3651: Rectangular Labels, 52 x 29.5 mm, 40 per sheet      -->
   <!-- =================================================================== -->
-  <Template name="Zweckform 3651" size="A4" _description="Rectangular Labels">
+  <Template name="Zweckform  3651" size="A4" _description="Rectangular Labels">
     <Label-rectangle id="0" width="147.4016" height="83.6220" round="0">  
       <Markup-margin size="5"/>
       <Layout nx="4" ny="10" x0="2.834" y0="2.834" dx="147.4016" dy="83.6220"/>
@@ -42,7 +29,7 @@
   <!-- ====================================================================-->
   <!-- Zweckform 3654: CD Labels  2 per Template                              -->
   <!-- ====================================================================-->
-  <Template name="Zweckform 3654" size="A4" _description="CD/DVD Labels">
+  <Template name="Zweckform  3654" size="A4" _description="CD/DVD Labels">
     <Label-cd id="0" radius="165.78" hole="58.09" waste="5">
       <Markup-margin size="5"/>
       <Layout nx="1" ny="2" x0="131.78" y0="58.7998" dx="0" dy="387.97"/>
@@ -52,7 +39,7 @@
   <!-- =================================================================== -->
   <!-- Zweckform 3659: Rectangular Labels, 97 x 42.125 mm, 12 per sheet    -->
   <!-- =================================================================== -->
-  <Template name="Zweckform 3659" size="A4" _description="Mailing Labels -- 12">
+  <Template name="Zweckform  3659" size="A4" _description="Mailing Labels">
     <Label-rectangle id="0" width="274" height="120.5" round="0">  
       <Markup-margin size="5"/>
       <Layout nx="2" ny="6" x0="22.68" y0="60" dx="274" dy="120.5"/>
@@ -62,7 +49,7 @@
   <!-- =================================================================== -->
   <!-- Zweckform 3669:  Rectangular Labels, 70 x 50.8mm, 15 per sheet      -->
   <!-- =================================================================== -->
-  <Template name="Zweckform 3669" size="A4" _description="QSL-Karten Etiketten 70mm x 50,8mm">
+  <Template name="Zweckform  3669" size="A4" _description="QSL-Karten Etiketten 70mm x 50,8mm">
     <Label-rectangle id="0" width="198.425" height="144" round="0">
       <Markup-margin size="5"/>
      <Layout nx="3" ny="5" x0="0" y0="61" dx="198.425" dy="144"/>
@@ -72,7 +59,7 @@
   <!-- =================================================================== -->
   <!-- Zweckform 4746: Video Labels, 147,32 x 20 mm, 13 per sheet    -->
   <!-- =================================================================== -->
-  <Template name="Zweckform 4746" size="A4" _description="Video Labels (back)">
+  <Template name="Zweckform  4746" size="A4" _description="Video Labels (back)">
     <Label-rectangle id="0" width="416.6" height="56.6929" round="5">
       <Markup-margin size="5"/>
       <Layout nx="1" ny="13" x0="88.8377" y0="52.2425" dx="416.6" dy="56.6929"/>
@@ -80,19 +67,29 @@
   </Template>
   
   <!-- =================================================================== -->
-  <!-- Zweckform 4780: Allround Labels, 48,5 x 25,4 mm, 40 per sheet    -->
+  <!-- Zweckform 4780: Allround Labels, 48,5 x 25,4 mm, 40 per sheet       -->
   <!-- =================================================================== -->
-  <Template name="Zweckform 4780" size="A4" _description="Allround Labels">
+  <Template name="Zweckform  4780" size="A4" _description="Allround Labels">
     <Label-rectangle id="0" width="137.48" height="72" round="0">
       <Markup-margin size="5"/>
       <Layout nx="4" ny="10" x0="23" y0="53.8898" dx="137.48" dy="72"/>
     </Label-rectangle>
   </Template>
 
+  <!-- =================================================================== -->
+  <!-- Zweckform 3475: Address Labels, 70 x 30 mm, 24 per sheet            -->
+  <!-- =================================================================== -->
+  <Template name="Zweckform  3475" size="A4" _description="Address Labels">
+    <Label-rectangle id="0" width="198.570" height="102.121" round="0">
+      <Markup-margin size="0"/>
+      <Layout nx="3" ny="8" x0="0" y0="12.566" dx="198.570" dy="102.121"/>
+    </Label-rectangle>
+  </Template>
+
   <!-- =================================================================== -->
   <!-- Zweckform 3490: Rectangular Labels, 70 x 36 mm, 24 per sheet        -->
   <!-- =================================================================== -->
-   <Template name="Zweckform 3490" size="A4" _description="Rectangular Copier Labels">
+   <Template name="Zweckform  3490" size="A4" _description="Rectangular Copier Labels">
      <Label-rectangle id="0" width="198.425" height="102.047" round="0">
       <Markup-margin size="5"/>
       <Layout nx="3" ny="8" x0="" y0="12.557" dx="198.425" dy="102.047"/>
@@ -102,7 +99,7 @@
   <!-- =================================================================== -->
   <!-- Zweckform 4781: Rectangular Labels, 97 x 42.3 mm, 12 per sheet      -->
   <!-- =================================================================== -->
-   <Template name="Zweckform 4781" size="A4" _description="Rectangular Copier Labels">
+   <Template name="Zweckform  4781" size="A4" _description="Rectangular Copier Labels">
      <Label-rectangle id="0" width="274.960" height="119.905" round="0">
       <Markup-margin size="5"/>
       <Layout nx="2" ny="6" x0="22.677" y0="61.030" dx="274.960" dy="119.905"/>
@@ -112,7 +109,7 @@
   <!-- =================================================================== -->
   <!-- Zweckform 6091: Correction and Cover, 64.6 x 33.8 mm, 24 per sheet  -->
   <!-- =================================================================== -->
-   <Template name="Zweckform 6091" size="A4" _description="Correction and Cover-up Labels">
+   <Template name="Zweckform  6091" size="A4" _description="Correction and Cover-up Labels">
      <Label-rectangle id="0" width="183.118" height="95.811" round="0">
       <Markup-margin size="5"/>
       <Layout nx="3" ny="8" x0="22.961" y0="37.502" dx="183.118" dy="95.881"/>
@@ -122,13 +119,25 @@
   <!-- =================================================================== -->
   <!-- Zweckform 6015: CD Labels, 2 per Template                           -->
   <!-- =================================================================== -->
-   <Template name="Zweckform 6015" size="A4" _description="CD Labels">
+   <Template name="Zweckform  6015" size="A4" _description="CD/DVD Labels">
      <Label-cd id="0" radius="165.827" hole="58.110" waste="5">
       <Markup-margin size="5"/>
       <Layout nx="1" ny="2" x0="131.811" y0="60.746" dx="0" dy="388.346"/>
      </Label-cd>
    </Template>
 
+  <!-- =================================================================== -->
+  <!-- Zweckform 32010: Business Cards, 54.0 x 85.0 mm, 10 per sheet       -->
+  <!-- =================================================================== -->
+  <Template name="Zweckform 32010" size="A4" _description="Business Cards">
+    <Label-rectangle id="0" width="240.94" height="153.07" round="0">
+      <Markup-margin size="5"/>
+      <Layout nx="2" ny="5" x0="40" y0="40" dx="269" dy="153"/>
+    </Label-rectangle>
+    <Alias name="DECAdry SCW-2090"/>
+    <Alias name="DECAdry OCB-3327"/>
+    <Alias name="DECAdry DAW-327"/>
+  </Template>
 
 
 </Glabels-templates>
-- 
2.39.5