2007-08-11 Jim Evins <evins@snaught.com>

	* AUTHORS:
	* data/templates/avery-iso-templates.xml:
	* data/templates/avery-us-templates.xml:
	* data/templates/misc-iso-templates.xml:
	* data/templates/misc-other-templates.xml:
	* data/templates/misc-us-templates.xml:
	* data/templates/zweckform-iso-templates.xml:
		Caught up with backlog of template submissions.

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@664 f5e0f49d-192f-0410-a22d-a8d8700d0965

diff --git a/glabels2/AUTHORS b/glabels2/AUTHORS
index 24ac08e9103d36e936f0e8dac48a33155a3b2f41..15a7625d52c43fca2375fe1d86fdf95f4968ef42 100644 (file)
--- a/glabels2/AUTHORS
+++ b/glabels2/AUTHORS
@@ -151,5 +151,14 @@ particular products (I apologize if I have missed anybody):
        Richard Lance
        Anand Kumria
        Alexandre Sauvé
+       Ironblade
+       Matthias Mailänder
+       Bernhard Walle
+       Stephen Hilliard
+       Alessandro Zummo
+       Herbert Straub
+       Dennis Böckmann
+       Anon
+       D. Leitner
 
 And many others for their many helpful suggestions and bug reports -- thanks.

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index 4ba02d4d6621b9bcd463d2f5a286be1436fceafe..5ddf3515837dbd11d1eb8f441923c47b4803ac00 100644 (file)
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,14 @@
+2007-08-11  Jim Evins  <evins@snaught.com>
+
+       * AUTHORS:
+       * data/templates/avery-iso-templates.xml:
+       * data/templates/avery-us-templates.xml:
+       * data/templates/misc-iso-templates.xml:
+       * data/templates/misc-other-templates.xml:
+       * data/templates/misc-us-templates.xml:
+       * data/templates/zweckform-iso-templates.xml:
+               Caught up with backlog of template submissions.
+
 2007-08-10  Jim Evins  <evins@snaught.com>
 
        * src/bc-postnet.c: (gl_barcode_postnet_new):

diff --git a/glabels2/data/templates/avery-iso-templates.xml b/glabels2/data/templates/avery-iso-templates.xml
index f76de38f74d5397b01d10b51251d178da24d5e47..d701b6279eab16b97e35e966ad53695189b6eca8 100644 (file)
--- a/glabels2/data/templates/avery-iso-templates.xml
+++ b/glabels2/data/templates/avery-iso-templates.xml
@@ -6,6 +6,18 @@
   <!-- Avery A4 products (and look-alikes)                                  -->
   <!-- ******************************************************************** -->
 
+  <!-- =================================================================== -->
+  <!-- Avery L6015 family: CD/DVD Labels, 2 per sheet                      -->
+  <!-- =================================================================== -->
+  <Template name="Avery L6015" size="A4" _description="CD/DVD Labels">
+    <Meta category="label"/>
+    <Meta category="media"/>
+    <Label-cd id="0" radius="165.827pt" hole="58.1102pt" waste="9.07087pt">
+      <Markup-margin size="9pt"/>
+      <Layout nx="1" ny="2" x0="131.811pt" y0="60.6614pt" dx="349.795pt" dy="392.4pt"/>
+    </Label-cd>
+  </Template>
+
   <!-- =================================================================== -->
   <!-- Avery 7160 family: Mailing labels, 63.5 x 38.1 mm, 21 per sheet     -->
   <!-- =================================================================== -->
@@ -131,6 +143,18 @@
     <Alias name="Avery  L7664"/>
   </Template>
 
+  <!-- =================================================================== -->
+  <!-- Avery L7676 family: CD/DVD Labels, 2 per sheet                      -->
+  <!-- =================================================================== -->
+  <Template name="Avery L7676" size="A4" _description="CD/DVD Labels">
+    <Meta category="label"/>
+    <Meta category="media"/>
+    <Label-cd id="0" radius="165.827pt" hole="24.9449pt" waste="5.66929pt">
+      <Markup-margin size="5.66929pt"/>
+      <Layout nx="1" ny="2" x0="131.811pt" y0="62.3622pt" dx="342.992pt" dy="388.346pt"/>
+    </Label-cd>
+  </Template>
+
   <!-- =================================================================== -->
   <!-- Avery 8414 family: Business Cards, 50.8 x 87.0 mm, 10 per sheet     -->
   <!-- =================================================================== -->

diff --git a/glabels2/data/templates/avery-us-templates.xml b/glabels2/data/templates/avery-us-templates.xml
index c4e1fd3f8749d9e9f00d85e09e21275051df189c..9d3cdc573635154b5ef01124f1ac4c978bddaa5d 100644 (file)
--- a/glabels2/data/templates/avery-us-templates.xml
+++ b/glabels2/data/templates/avery-us-templates.xml
@@ -517,6 +517,17 @@
     <Alias name="Worldlabel OL1150"/>
   </Template>
 
+  <!-- =================================================================== -->
+  <!-- Avery 6570 family: ID Labels.                                       -->
+  <!-- =================================================================== -->
+  <Template name="Avery  6570" size="US-Letter" _description="ID Labels">
+    <Meta category="label"/>
+    <Label-rectangle id="0" width="126pt" height="90pt" round="4.464pt" x_waste="6.768pt" y_waste="0pt">
+      <Markup-margin size="9pt"/>
+      <Layout nx="4" ny="8" x0="36pt" y0="36pt" dx="139.536pt" dy="90pt"/>
+    </Label-rectangle>
+  </Template>
+
   <!-- =================================================================== -->
   <!-- Avery 8165 family: Full-page label, 8_1/2'' x 11'', 1 per sheet   x -->
   <!-- =================================================================== -->
@@ -577,6 +588,18 @@
     <Alias name="Worldlabel OL175"/>
   </Template>
 
+  <!-- =================================================================== -->
+  <!-- Avery 8960 family: CD/DVD Labels.                                   -->
+  <!-- =================================================================== -->
+  <Template name="Avery  8960" size="US-Letter" _description="CD/DVD Labels">
+    <Meta category="label"/>
+    <Meta category="media"/>
+    <Label-cd id="0" radius="166.5pt" hole="14.1732pt" waste="9.07087pt">
+      <Markup-margin size="9pt"/>
+      <Layout nx="1" ny="2" x0="138.898pt" y0="50.1732pt" dx="351.142pt" dy="360pt"/>
+    </Label-cd>
+  </Template>
+
   <!-- =================================================================== -->
   <!-- Avery 3274.1 family: Square stickers, 2_1/2'' x 2_1/2, 9 per sheetx  -->
   <!-- =================================================================== -->

diff --git a/glabels2/data/templates/misc-iso-templates.xml b/glabels2/data/templates/misc-iso-templates.xml
index ca98fb1bc6c032f6b957cf17ea07e5bac427e3e5..10c61eb74bc3cf747aeaf66789afde3454c1df86 100644 (file)
--- a/glabels2/data/templates/misc-iso-templates.xml
+++ b/glabels2/data/templates/misc-iso-templates.xml
@@ -151,6 +151,28 @@
     </Label-rectangle>
   </Template>
  
+  <!-- =================================================================== -->
+  <!-- DATA BECKER 0526 Address Labels.                                    -->
+  <!-- =================================================================== -->
+  <Template name="Databecker 0526" size="A4" _description="Address Labels">
+    <Label-rectangle id="0" width="198.425pt" height="102.047pt" round="0pt" x_waste="0pt" y_waste="0pt">
+      <Markup-margin size="9pt"/>
+      <Layout nx="3" ny="8" x0="3.93386e-16pt" y0="15.5906pt" dx="198.425pt" dy="102.047pt"/>
+    </Label-rectangle>
+  </Template>
+
+  <!-- =================================================================== -->
+  <!-- DATA BECKER 0598 Address Labels.                                    -->
+  <!-- =================================================================== -->
+  <Template name="Databecker 0598" size="A4" _description="Address Labels">
+    <Meta category="label"/>
+    <Meta category="mail"/>
+    <Label-rectangle id="0" width="274.961pt" height="119.906pt" round="0pt" x_waste="0pt" y_waste="0pt">
+      <Markup-margin size="9pt"/>
+      <Layout nx="2" ny="6" x0="23.2441pt" y0="65.1968pt" dx="274.961pt" dy="119.906pt"/>
+    </Label-rectangle>
+  </Template>
+
   <!-- =================================================================== -->
   <!-- Dataline 57125: Business Cards, 54.0 x 86.0 mm, 10 per sheet        -->
   <!-- =================================================================== -->
@@ -448,6 +470,30 @@
     </Label-cd>
   </Template>
 
+  <!-- =================================================================== -->
+  <!-- Staples EU Business Cards Supreme.                                  -->
+  <!-- =================================================================== -->
+  <Template name="Staples EU BC Supreme" size="A4" _description="Business Cards">
+    <Meta category="card"/>
+    <Meta category="business-card"/>
+    <Label-rectangle id="0" width="240.945pt" height="155.906pt" round="0pt" x_waste="0pt" y_waste="0pt">
+      <Markup-margin size="9.07087pt"/>
+      <Layout nx="1" ny="5" x0="42.5197pt" y0="28.3465pt" dx="240.945pt" dy="155.906pt"/>
+      <Layout nx="1" ny="5" x0="311.811pt" y0="28.3465pt" dx="240.945pt" dy="155.906pt"/>
+    </Label-rectangle>
+  </Template>
+
+  <!-- =================================================================== -->
+  <!-- DECAdry OCC 3342 Business Cards.                                    -->
+  <!-- =================================================================== -->
+  <Template name="DECAdry 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>
 
 
 
@@ -476,8 +522,8 @@
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Label-rectangle id="0" width="90mm" height="50mm" round="0">
-      <Layout nx="3" ny="8" x0="14mm" y0="10mm" dx="90mm" dy="50mm"/>
       <Markup-margin size="5pt"/>
+      <Layout nx="3" ny="8" x0="14mm" y0="10mm" dx="90mm" dy="50mm"/>
     </Label-rectangle>
   </Template>
 
@@ -485,8 +531,8 @@
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Label-rectangle id="0" width="50mm" height="90mm" round="0">
-      <Layout nx="4" ny="3" x0="5mm" y0="13mm" dx="50mm" dy="90mm"/>
       <Markup-margin size="5pt"/>
+      <Layout nx="4" ny="3" x0="5mm" y0="13mm" dx="50mm" dy="90mm"/>
     </Label-rectangle>
   </Template>
 

diff --git a/glabels2/data/templates/misc-other-templates.xml b/glabels2/data/templates/misc-other-templates.xml
index 440b6604fbdbce0d5f0e11467ea485d2cdbb74c9..c32c8fe0c32c601c4dfd4193ea44dbaae28f0ba8 100644 (file)
--- a/glabels2/data/templates/misc-other-templates.xml
+++ b/glabels2/data/templates/misc-other-templates.xml
@@ -18,5 +18,16 @@
     </Label-rectangle>
   </Template>
 
+  <!-- =================================================================== -->
+  <!-- Dymo 99102 Large Address labels.                                    -->
+  <!-- =================================================================== -->
+  <Template name="Dymo 99012" size="Other" width="102.047pt" height="252.283pt" _description="Large Address Labels">
+    <Meta category="label"/>
+    <Label-rectangle id="0" width="102.047pt" height="252.283pt" round="0pt" x_waste="0pt" y_waste="0pt">
+      <Markup-margin size="0pt"/>
+      <Layout nx="1" ny="1" x0="0pt" y0="0pt" dx="102.047pt" dy="252.283pt"/>
+    </Label-rectangle>
+  </Template>
+
 
 </Glabels-templates>

diff --git a/glabels2/data/templates/misc-us-templates.xml b/glabels2/data/templates/misc-us-templates.xml
index cde5cd41adc3110bcc31b48f57a38d30ea065f1f..e2c1779ccbbbd98d20f1b681eeec56278d5dd0d7 100644 (file)
--- a/glabels2/data/templates/misc-us-templates.xml
+++ b/glabels2/data/templates/misc-us-templates.xml
@@ -40,7 +40,7 @@
          _description="CD/DVD Labels (face only)">
     <Meta category="label"/>
     <Meta category="media"/>
-    <Label-cd id="0" radius="166.5" hole="58.5" waste="5">
+    <Label-cd id="0" radius="166.5" hole="58.5" waste="9">
       <Markup-margin size="5"/>
       <Layout nx="1" ny="2" x0="139.5" y0="49.5" dx="0" dy="360"/>
     </Label-cd>

diff --git a/glabels2/data/templates/zweckform-iso-templates.xml b/glabels2/data/templates/zweckform-iso-templates.xml
index ce498271fcaadba08953b0371d3dff82431591df..412662aa1805f2da3446efc07c3ea30fba47a973 100644 (file)
--- a/glabels2/data/templates/zweckform-iso-templates.xml
+++ b/glabels2/data/templates/zweckform-iso-templates.xml
@@ -206,7 +206,7 @@
   <!-- =================================================================== -->
   <!-- Zweckform 4760: File Labels, 192 x 38 mm, 7 per sheet               -->
   <!-- =================================================================== -->
-  <Template name="Zweckform  4760" size="A4" description="File Back Labels">
+  <Template name="Zweckform  4760" size="A4" _description="File Back Labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="544.252pt" height="107.717pt" round="5.66929pt" waste="0pt">
       <Markup-margin size="9pt"/>
@@ -214,6 +214,17 @@
     </Label-rectangle>
   </Template>
 
+  <!-- =================================================================== -->
+  <!-- Zweckform 3348: Adress Labels.                                      -->
+  <!-- =================================================================== -->
+  <Template name="Zweckform  3348" size="A4" _description="Address Labels">
+    <Meta category="label"/>
+    <Meta category="mail"/>
+    <Label-rectangle id="0" width="189.921pt" height="107.717pt" round="0pt" x_waste="0pt" y_waste="0pt">
+      <Markup-margin size="9pt"/>
+      <Layout nx="3" ny="7" x0="5.66929pt" y0="56.6929pt" dx="198.425pt" dy="107.717pt"/>
+    </Label-rectangle>
+  </Template>
 
 </Glabels-templates>