2005-10-24 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/zweckform-iso-templates.xml:
		Collected all template changes and submissions since last
		release.

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

diff --git a/glabels2/AUTHORS b/glabels2/AUTHORS
index d911e8e66c4c219a6c183ae7ba4ba377f371ab9a..b3a63e1dddd2e2ebaf952334e938607eb26ac523 100644 (file)
--- a/glabels2/AUTHORS
+++ b/glabels2/AUTHORS
@@ -152,5 +152,11 @@ particular products (I apologize if I have missed anybody):
        Peter L. Berghold
        Vitaly Lipatov
        Steve Saxon
+       Roman Kreisel
+       Steve Reppucci
+       Lionel CONS
+       Richard Lance
+       Anand Kumria
+       Alexandre Sauvé
 
 And many others for their many helpful suggestions and bug reports -- thanks.

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index 7a71a796280e8bac46b84c99fd20766f39c773bd..bd2eaa6e74e5c96a48e63fb0958a19c72b848a8f 100644 (file)
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,13 @@
+2005-10-24  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/zweckform-iso-templates.xml:
+               Collected all template changes and submissions since last
+               release.
+
 2005-10-23  Jim Evins  <evins@snaught.com>
 
        * configure.in:

diff --git a/glabels2/data/templates/avery-iso-templates.xml b/glabels2/data/templates/avery-iso-templates.xml
index 9973e398e36715b3b92cff65741ca70a03dabe14..aa9ad16bebdd1bac8545f237077d2da8d9fa0ad3 100644 (file)
--- a/glabels2/data/templates/avery-iso-templates.xml
+++ b/glabels2/data/templates/avery-iso-templates.xml
@@ -17,6 +17,7 @@
     <Alias name="Avery  L7160"/>
     <Alias name="Avery  J8160"/>
     <Alias name="DECAdry DLW-1731"/>
+    <Alias name="DECAdry OLW-4731"/>
     <Alias name="DECAdry OLW-7131"/>
   </Template>
 
@@ -204,16 +205,16 @@
   <!-- ============================================================ -->
   <!-- Avery 32015: Business Cards                                  -->
   <!-- ============================================================ -->
-  <Template name="Zweckform 32015" size="A4" _description="Business Cards">
+  <Template name="Avery 32015" size="A4" _description="Business Cards">
     <Label-rectangle id="0" width="85mm" height="54mm" round="0mm">
       <Markup-margin size="5mm"/>
       <Layout nx="2" ny="4" x0="17mm" y0="31.5mm" dx="91mm" dy="60mm"/>
     </Label-rectangle>
+    <Alias name="Avery C32015"/>
     <Alias name="Zwekform 32015"/>
   </Template>
 
 
-
 </Glabels-templates>
 
 

diff --git a/glabels2/data/templates/avery-us-templates.xml b/glabels2/data/templates/avery-us-templates.xml
index fa5aee7c1013da27e220cf1101bf4b9c41298785..53f1bd34bfc82351ddf10f2ef35615417947f727 100644 (file)
--- a/glabels2/data/templates/avery-us-templates.xml
+++ b/glabels2/data/templates/avery-us-templates.xml
@@ -205,6 +205,17 @@
     <Alias name="Avery  8197"/>
   </Template>
 
+  <!-- =================================================================== -->
+  <!-- Avery 5294 family: Round Labels, 12 per sheet.                      -->
+  <!-- =================================================================== -->
+  <Template name="Avery  5294" size="US-Letter" description="Round Labels">
+    <Label-round id="0" radius="90pt" waste="0pt">
+      <Markup-margin size="7.2pt"/>
+      <Layout nx="3" ny="4" x0="15.12pt" y0="30.6pt" dx="198pt" dy="181.08pt"/>
+    </Label-round>
+    <Alias name="Maco ML-1225"/>
+  </Template>
+
   <!-- =================================================================== -->
   <!-- Avery 6490 family: Diskette Labels, 2_11/16'' x 2'', 15 per sheet x -->
   <!-- =================================================================== -->

diff --git a/glabels2/data/templates/misc-iso-templates.xml b/glabels2/data/templates/misc-iso-templates.xml
index 0b128e574fac1213f4433b98cc6c495a0a304620..8163df5e887bc29ce1c0e09dab386af0a0abae67 100644 (file)
--- a/glabels2/data/templates/misc-iso-templates.xml
+++ b/glabels2/data/templates/misc-iso-templates.xml
@@ -6,6 +6,18 @@
   <!-- Misc. A4 products.                                                   -->
   <!-- ******************************************************************** -->
 
+  <!-- =================================================================== -->
+  <!-- Sigel LP 800/LP 801/LP 802: Business Cards, 55.0 x 85.0 mm, 10 per sheet   -->
+  <!-- =================================================================== -->
+  <Template name="Sigel LP 800" size="A4" _description="Business Cards">
+    <Label-rectangle id="0" width="85.0mm" height="55.0mm" round="0">
+      <Markup-margin size="5"/>
+      <Layout nx="2" ny="5" x0="15.0mm" y0="10.0mm" dx="95.0mm" dy="55.0mm"/>
+    </Label-rectangle>
+    <Alias name="Sigel LP 801"/>
+    <Alias name="Sigel LP 802"/>
+  </Template>
+
   <!-- =================================================================== -->
   <!-- Sigel DP 830/DP 930: Business Cards, 55.0 x 85.0 mm, 10 per sheet   -->
   <!-- =================================================================== -->
@@ -117,6 +129,16 @@
     </Label-rectangle>
   </Template>
  
+  <!-- =================================================================== -->
+  <!-- Dataline 57125: Business Cards, 54.0 x 86.0 mm, 10 per sheet        -->
+  <!-- =================================================================== -->
+  <Template name="Dataline 57125" size="A4" _description="Business Cards">
+    <Label-rectangle id="0" width="86.00mm" height="54.00mm" round="0">
+      <Markup-margin size="0mm"/>
+      <Layout nx="2" ny="5" x0="16mm" y0="11mm" dx="91mm" dy="55.625mm"/>
+    </Label-rectangle>
+  </Template>
+
   <!-- =================================================================== -->
   <!-- Hema Etiketten: 65 x 38 mm, 21 per sheet                            -->
   <!-- =================================================================== -->

diff --git a/glabels2/data/templates/zweckform-iso-templates.xml b/glabels2/data/templates/zweckform-iso-templates.xml
index 5c896001fdac5b66ecc53c7cd3faecd224f406c2..d2c664141382624a22a5eb8ec9b22de23e860f3c 100644 (file)
--- a/glabels2/data/templates/zweckform-iso-templates.xml
+++ b/glabels2/data/templates/zweckform-iso-templates.xml
@@ -96,6 +96,16 @@
     </Label-rectangle>
   </Template>
 
+  <!-- =================================================================== -->
+  <!-- Zweckform 3474: Address Labels, 70 x 37 mm, 24 per sheet            -->
+  <!-- =================================================================== -->
+  <Template name="Zweckform  3474" size="A4" _description="Address Labels">
+    <Label-rectangle id="0" width="70mm" height="37mm" round="0">
+      <Markup-margin size="0"/>
+      <Layout nx="3" ny="8" x0="0" y0="0" dx="70mm" dy="37mm"/>
+    </Label-rectangle>
+  </Template>
+
   <!-- =================================================================== -->
   <!-- Zweckform 3475: Address Labels, 70 x 30 mm, 24 per sheet            -->
   <!-- =================================================================== -->