From: Jim Evins <evins@snaught.com>
Date: Wed, 30 Dec 2009 07:34:34 +0000 (-0500)
Subject: Reorganizing template database
X-Git-Tag: glabels-2_3_0~102
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=90cd31f442b5d0d115ea72fe828414ad32c9e944;p=glabels

Reorganizing template database

Split out uline-us-templates.xml from avery-us-templates.xml.  Also removed
the single "IP Invent It!" alias.  I could not find this brand online -- I
assume it was a mis-identification -- this was a single alias for full-sheet
labels which is so generic anyway.
---

diff --git a/templates/Makefile.am b/templates/Makefile.am
index 36bfe5b0..df138d9a 100644
--- a/templates/Makefile.am
+++ b/templates/Makefile.am
@@ -20,6 +20,7 @@ templates_DATA = \
 	misc-us-templates.xml \
 	misc-iso-templates.xml \
 	misc-other-templates.xml \
+	uline-us-templates.xml \
 	worldlabel-us-templates.xml \
 	zweckform-iso-templates.xml
 
diff --git a/templates/avery-us-templates.xml b/templates/avery-us-templates.xml
index e8594260..5a672707 100644
--- a/templates/avery-us-templates.xml
+++ b/templates/avery-us-templates.xml
@@ -96,8 +96,6 @@
       <Markup-margin size="9pt"/>
       <Layout nx="1" ny="2" x0="0in" y0="0in" dx="0in" dy="5.5in"/>
     </Label-rectangle>
-    <!-- Look alikes -->
-    <Alias brand="ULine" part="S-5044"/>
   </Template>
 
   <Template brand="Avery" part="5526" equiv="5126"/>
@@ -708,8 +706,6 @@
       <Markup-margin size="0.0625in"/>
       <Layout nx="1" ny="1" x0="0" y0="0" dx="0" dy="0"/>
     </Label-rectangle>
-    <!-- Look alikes -->
-    <Alias brand="IP Invent It!" part="#00064-3"/>
   </Template>
 
   <Template brand="Avery" part="3114" equiv="8165"/>
diff --git a/templates/uline-us-templates.xml b/templates/uline-us-templates.xml
new file mode 100644
index 00000000..f9eca6ee
--- /dev/null
+++ b/templates/uline-us-templates.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+
+<!--
+  uline-us-templates.xml
+  This file is a part of the glabels template database.
+ 
+  Copyright (c) 2001-2009 Jim Evins
+ 
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation
+  files (the "Software"), to deal in the Software without
+  restriction, including without limitation the rights to use,
+  copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the
+  Software is furnished to do so, subject to the following
+  conditions:
+ 
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+ 
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+  OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+  HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+  OTHER DEALINGS IN THE SOFTWARE.
+-->
+
+<Glabels-templates>
+
+
+  <!-- ******************************************************************** -->
+  <!-- ******************************************************************** -->
+  <!--                                                                      -->
+  <!-- Uline US-Letter products                                             -->
+  <!--                                                                      -->
+  <!-- ******************************************************************** -->
+  <!-- ******************************************************************** -->
+
+
+  <Template brand="Uline" part="S-5044" size="US-Letter" _description="Shipping Labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta category="mail"/>
+    <Label-rectangle id="0" width="8.5in" height="5.5in" round="0in" x_waste="0in" y_waste="0in">
+      <Markup-margin size="9pt"/>
+      <Layout nx="1" ny="2" x0="0in" y0="0in" dx="0in" dy="5.5in"/>
+    </Label-rectangle>
+  </Template>
+
+
+</Glabels-templates>
+
+
+
+
diff --git a/templates/vendors.xml b/templates/vendors.xml
index 887d07ff..dd8b3cf7 100644
--- a/templates/vendors.xml
+++ b/templates/vendors.xml
@@ -35,6 +35,7 @@
   <Vendor name="Dymo"           url="http://global.dymo.com/"         />
   <Vendor name="Maco"           url="http://www.maco.com/"            />
   <Vendor name="Online Labels"  url="http://www.onlinelabels.com/"    />
+  <Vendor name="Uline"          url="http://www.uline.com/"           />
   <Vendor name="Worldlabel"     url="http://www.worldlabel.com/"      />
   <Vendor name="Zweckform"      url="http://www.avery-zweckform.com/" />