2004-01-20 Jim Evins <evins@snaught.com>

	Catching up on a couple of backlogged user template submissions.

	* data/avery-iso-templates.xml:
		Added "DECAdry OLW-4731" and "DECAdry DLW-1731" aliases for Avery 7160.
		Suggested by Linas Jakucionis.

	* data/zweckform-iso-templates.xml:
		Added Zweckform 4760, submitted by Thomas Vill.

	* AUTHORS:
		Updated to reflect above submissions.

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

diff --git a/glabels2/AUTHORS b/glabels2/AUTHORS
index 04470697cac21e4f6ad84f3001ea0185cc64718e..6dcc5e389e359f3a2171c6c74969b3bc51617c6a 100644 (file)
--- a/glabels2/AUTHORS
+++ b/glabels2/AUTHORS
@@ -125,5 +125,6 @@ particular products (I apologize if I have missed anybody):
        Dick Middleton
        Ian Peake
        Wayne Schuller
+       Thomas Vill
 
 And many others for their many helpful suggestions and bug reports -- thanks.

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index 714c367fc96565db313711b36cc397fc63737a6c..afa27449b4d62619c328af42b23daf3967f52572 100644 (file)
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,17 @@
+2004-01-20  Jim Evins  <evins@snaught.com>
+
+       Catching up on a couple of backlogged user template submissions.
+
+       * data/avery-iso-templates.xml:
+               Added "DECAdry OLW-4731" and "DECAdry DLW-1731" aliases for Avery 7160.
+               Suggested by Linas Jakucionis.
+       
+       * data/zweckform-iso-templates.xml:
+               Added Zweckform 4760, submitted by Thomas Vill.
+
+       * AUTHORS:
+               Updated to reflect above submissions.
+
 2004-01-06  Jim Evins  <evins@snaught.com>
 
        Split-out template.[ch], paper.[ch], xml-template.[ch], xml-paper.[ch], and

diff --git a/glabels2/data/avery-iso-templates.xml b/glabels2/data/avery-iso-templates.xml
index ab4120b9b9fd4940580f1a152f3b29e65307c17f..1d2472008c97b207479afd4fc029eaac869cc70f 100644 (file)
--- a/glabels2/data/avery-iso-templates.xml
+++ b/glabels2/data/avery-iso-templates.xml
@@ -16,6 +16,8 @@
     </Label-rectangle>
     <Alias name="Avery  L7160"/>
     <Alias name="Avery  J8160"/>
+    <Alias name="DECAdry DLW-1731"/>
+    <Alias name="DECAdry OLW-7131"/>
   </Template>
 
   <!-- =================================================================== -->

diff --git a/glabels2/data/zweckform-iso-templates.xml b/glabels2/data/zweckform-iso-templates.xml
index 08256852f5ed2c1248102d0974cbc5460a2abfd2..aa7b51cf65da3d4625c3bf317d3003b4da4ea16a 100644 (file)
--- a/glabels2/data/zweckform-iso-templates.xml
+++ b/glabels2/data/zweckform-iso-templates.xml
@@ -139,6 +139,16 @@
     <Alias name="DECAdry DAW-327"/>
   </Template>
 
+  <!-- =================================================================== -->
+  <!-- Zweckform 4760: File Labels, 192 x 38 mm, 7 per sheet               -->
+  <!-- =================================================================== -->
+  <Template name="Zweckform  4760" size="A4" description="File Back Labels">
+    <Label-rectangle id="0" width="544.252pt" height="107.717pt" round="5.66929pt" waste="0pt">
+      <Markup-margin size="9pt"/>
+      <Layout nx="1" ny="7" x0="25.5118pt" y0="43.7386pt" dx="544.252pt" dy="107.717pt"/>
+    </Label-rectangle>
+  </Template>
+
 
 </Glabels-templates>