Added templates that have been collecting dust in my inbox.

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

diff --git a/glabels2/AUTHORS b/glabels2/AUTHORS
index 14bc4559a036607bf7e0e04d0d3a09dd78091d69..0f29c4de8acd0a29ecc2b40872bb980caee3329f 100644 (file)
--- a/glabels2/AUTHORS
+++ b/glabels2/AUTHORS
@@ -101,5 +101,9 @@ particular products:
        Nigel Titley <nigel@titley.com>
        Sean 'Shaleh' Perry <shalehperry@attbi.com>
        Anthony Brockman <anthonybrockman@yahoo.com.au>
+       Thorsten Hirsch <t.hirsch@web.de>
+       John Ross <rossjohn@us.ibm.com>
+       Mike Machado <mike@innercite.com>
+       Rob Elshire <relshire@uiuc.edu>
 
 And many others for their many helpful suggestions and bug reports -- thanks.

diff --git a/glabels2/TODO b/glabels2/TODO
index 48266bccd9b5e86ccec3096fa6bbde2fdd60bc38..96123324427e8ceb03a8f4d4f87d27cbabbeb2dc 100644 (file)
--- a/glabels2/TODO
+++ b/glabels2/TODO
@@ -1,4 +1,9 @@
 
+General
+-------
+
+- Validate and clean up label templates:
+
 
 Development plan
 ----------------

diff --git a/glabels2/data/avery-us-templates.xml b/glabels2/data/avery-us-templates.xml
index 44837d13342d24bdb49c2d5a3a7fb962d997ed5c..1d9f3263facb14840cf155deeaae1e2939f8c334 100644 (file)
--- a/glabels2/data/avery-us-templates.xml
+++ b/glabels2/data/avery-us-templates.xml
@@ -105,6 +105,7 @@
       <Markup-margin size="5"/>
       <Layout nx="2" ny="3" x0="13" y0="36" dx="301" dy="234"/>
     </Label-rectangle>
+    <Alias name="Avery 5264"/>
     <Alias name="Avery 8164"/>
   </Template>
 

diff --git a/glabels2/data/misc-iso-templates.xml b/glabels2/data/misc-iso-templates.xml
index a863f86f7a4c93865e621a121d30e5b4f4d6d0a9..cf807fb00132e50fd87b70d3d6f367614ac69472 100644 (file)
--- a/glabels2/data/misc-iso-templates.xml
+++ b/glabels2/data/misc-iso-templates.xml
@@ -253,6 +253,15 @@
     </Label-cd>
   </Template>
 
+  <!-- ===================================================================-->
+  <!-- Viking 02204 Etiketten, 21 per sheet                               -->
+  <!-- ===================================================================-->
+  <Template name="Viking 02204" size="A4" _description="Etiketten">
+    <Label-rectangle id="0" width="198" height="120" round="0">
+      <Markup-margin size="5"/>
+      <Layout nx="3" ny="7" x0="0" y0="0" dx="198" dy="120"/>
+    </Label-rectangle>
+  </Template>
 
 
   <!-- ******************************************************************** -->

diff --git a/glabels2/data/misc-us-templates.xml b/glabels2/data/misc-us-templates.xml
index db6c676521161d68e083f41a33d3270febe24f02..fb063767da88e8fa183415d040cdbf256c487e85 100644 (file)
--- a/glabels2/data/misc-us-templates.xml
+++ b/glabels2/data/misc-us-templates.xml
@@ -146,7 +146,25 @@
     </Label-cd>
   </Template>
 
+  <!-- =================================================================== -->
+  <!-- Netc Label Stock: DLT Labels, (www.netclabels.com), 30 per sheet    -->
+  <!-- =================================================================== -->
+  <Template name="Netc 749303-70001 " size="US-Letter" _description="DLT Labels">
+    <Label-rectangle id="0" width="162" height="59.4" round="0">
+      <Markup-margin size="18"/>
+      <Layout nx="3" ny="10" x0="36" y0="45" dx="189" dy="72"/>
+    </Label-rectangle>
+  </Template>
 
+  <!-- =================================================================== -->
+  <!-- Tough-Tags TTLW-2016 Microtube labels, 85 per sheet.                -->
+  <!-- =================================================================== -->
+  <Template name="Tough-Tags TTLW-2016" size="US-Letter" _description="Microtube labels">
+    <Label-rectangle id="0" width="92.16" height="36" round="5">
+      <Markup-margin size="5"/>
+      <Layout nx="5" ny="17" x0="68" y0="4.17" dx="100.8" dy="45.3"/>
+    </Label-rectangle>
+  </Template> 
 
 </Glabels-templates>