2008-04-04 Jim Evins <evins@snaught.com>

	* data/templates/brother-other-templates.xml:
		Added categories to existing templates.
	* data/templates/misc-other-templates.xml:
		Moved dymo templates to their own file.
	* data/templates/Makefile.am:
	* data/templates/dymo-other-templates.xml:
		Additional dymo templates provided by Harald Welte <laforge@gnumonks.org>.
	* AUTHORS:
		Acknowledgement for above templates.

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@765 f5e0f49d-192f-0410-a22d-a8d8700d0965

diff --git a/glabels2/AUTHORS b/glabels2/AUTHORS
index 56cf049fe1832dfe31bad7bc56f9292a9c1e7a08..425cccb0b8cfc46b635fe7d5ac429616c90ffe0a 100644 (file)
--- a/glabels2/AUTHORS
+++ b/glabels2/AUTHORS
@@ -166,5 +166,6 @@ particular products (I apologize if I have missed anybody):
        Georg Ostertag
        Manuel Siggen
        David Huber
+       Harald Welte
 
 And many others for their many helpful suggestions and bug reports -- thanks.

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index a27e0e7fd973e3859f453fa432e1e6aa084971b1..5dc209ea5c4d7b6e16b207fc6ed297e0dc7d076c 100644 (file)
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,15 @@
+2008-04-04  Jim Evins  <evins@snaught.com>
+
+       * data/templates/brother-other-templates.xml:
+               Added categories to existing templates.
+       * data/templates/misc-other-templates.xml:
+               Moved dymo templates to their own file.
+       * data/templates/Makefile.am:
+       * data/templates/dymo-other-templates.xml:
+               Additional dymo templates provided by Harald Welte <laforge@gnumonks.org>.
+       * AUTHORS:
+               Acknowledgement for above templates.
+
 2008-03-24  Jim Evins  <evins@snaught.com>
 
        * src/xml-label.c: (xml_doc_to_label):

diff --git a/glabels2/data/templates/Makefile.am b/glabels2/data/templates/Makefile.am
index 71b1f50b993c116d181d573cfec0f5fd3953331a..236c93f5841fa102bd5e0ce99e9ce1762992e22a 100644 (file)
--- a/glabels2/data/templates/Makefile.am
+++ b/glabels2/data/templates/Makefile.am
@@ -10,6 +10,7 @@ templates_DATA = \
        avery-other-templates.xml \
        zweckform-iso-templates.xml \
        brother-other-templates.xml \
+       dymo-other-templates.xml \
        misc-us-templates.xml \
        misc-iso-templates.xml \
        misc-other-templates.xml

diff --git a/glabels2/data/templates/brother-other-templates.xml b/glabels2/data/templates/brother-other-templates.xml
index 2158f9800144f31103fe920d33fb0bfac18cd8d5..799195f4eb9775bb9d692e4abb235910a08ecdd2 100644 (file)
--- a/glabels2/data/templates/brother-other-templates.xml
+++ b/glabels2/data/templates/brother-other-templates.xml
@@ -20,6 +20,8 @@
   -->
 
   <Template brand="Brother" part="DK-1201" size="Other" width="25.91mm" height="83.90mm" description="Standard Address Labels 29mm x 90mm">
+    <Meta category="label"/>
+    <Meta category="mail"/>
     <Label-rectangle id="0" width="25.91mm" height="83.90mm" round="0" x_waste="0" y_waste="0">
       <Markup-rect x1="-1.5mm" y1="-3mm" w="29mm" h="90mm" r="1.5mm" />
       <Layout nx="1" ny="1" x0="0" y0="0" dx="0" dy="0"/>
@@ -27,6 +29,8 @@
   </Template>
 
   <Template brand="Brother" part="DK-1202" size="Other" width="58.93mm" height="93.20mm" description="Shipping Labels 62mm x 100mm">
+    <Meta category="label"/>
+    <Meta category="mail"/>
     <Label-rectangle id="0" width="58.93mm" height="93.20mm" round="0" x_waste="0" y_waste="0">
       <Markup-rect x1="-1.5mm" y1="-3mm" w="62mm" h="100mm" r="1.5mm" />
       <Layout nx="1" ny="1" x0="0" y0="0" dx="0" dy="0"/>
@@ -34,6 +38,7 @@
   </Template>
 
   <Template brand="Brother" part="DK-1204" size="Other" width="13.97mm" height="47.92mm" description="Multi Purpose Labels 17mm x 54mm">
+    <Meta category="label"/>
     <Label-rectangle id="0" width="13.97mm" height="47.92mm" round="0" x_waste="0" y_waste="0">
       <Markup-rect x1="-1.5mm" y1="-3mm" w="17mm" h="54mm" r="1.5mm" />
       <Layout nx="1" ny="1" x0="0" y0="0" dx="0" dy="0"/>

diff --git a/glabels2/data/templates/dymo-other-templates.xml b/glabels2/data/templates/dymo-other-templates.xml
new file mode 100644 (file)
index 0000000..b1518ce
--- /dev/null
+++ b/glabels2/data/templates/dymo-other-templates.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0"?>
+<Glabels-templates xmlns="http://snaught.com/glabels/2.0/">
+
+
+  <!-- =================================================================== -->
+  <!-- Dymo 99012 Large Address labels.                                    -->
+  <!-- =================================================================== -->
+  <Template brand="Dymo" part="99012" size="Other" width="102.047pt" height="252.283pt" _description="Large Address Labels">
+    <Meta category="label"/>
+    <Meta category="mail"/>
+    <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>
+
+  <!-- =================================================================== -->
+  <!-- Dymo 99010 Address labels.                                          -->
+  <!-- =================================================================== -->
+  <Template brand="Dymo" part="99010" size="Other" width="81pt" height="252pt" _description="Address Labels">
+    <Meta category="label"/>
+    <Meta category="mail"/>
+    <Label-rectangle id="0" width="81pt" height="252pt" round="0pt" x_waste="0pt" y_waste="0pt">
+      <Markup-margin size="0pt"/>
+      <Layout nx="1" ny="1" x0="0pt" y0="0pt" dx="81pt" dy="252pt"/>
+    </Label-rectangle>
+  </Template>
+
+  <!-- =================================================================== -->
+  <!-- Dymo 11355 Return Address labels.                                   -->
+  <!-- =================================================================== -->
+  <Template brand="Dymo" part="11355" size="Other" width="54pt" height="144pt" _description="Return Address Labels">
+    <Meta category="label"/>
+    <Meta category="mail"/>
+    <Label-rectangle id="0" width="54pt" height="144pt" round="0pt" x_waste="0pt" y_waste="0pt">
+      <Markup-margin size="0pt"/>
+      <Layout nx="1" ny="1" x0="0pt" y0="0pt" dx="54pt" dy="144pt"/>
+    </Label-rectangle>
+  </Template>
+
+  <!-- =================================================================== -->
+  <!-- Dymo 99014 Shipping Address labels.                                 -->
+  <!-- =================================================================== -->
+  <Template brand="Dymo" part="99014" size="Other" width="167pt" height="288pt" _description="Shipping Address Labels">
+    <Meta category="label"/>
+    <Meta category="mail"/>
+    <Label-rectangle id="0" width="167pt" height="288pt" round="0pt" x_waste="0pt" y_waste="0pt">
+      <Markup-margin size="0pt"/>
+      <Layout nx="1" ny="1" x0="0pt" y0="0pt" dx="167pt" dy="288pt"/>
+    </Label-rectangle>
+  </Template>
+
+  <!-- =================================================================== -->
+  <!-- Dymo 30327 File Folder labels.                                      -->
+  <!-- =================================================================== -->
+  <Template brand="Dymo" part="30327" size="Other" width="41pt" height="248pt" _description="File Folder">
+    <Meta category="label"/>
+    <Label-rectangle id="0" width="41pt" height="248pt" round="0pt" x_waste="0pt" y_waste="0pt">
+      <Markup-margin size="0pt"/>
+      <Layout nx="1" ny="1" x0="0pt" y0="0pt" dx="41pt" dy="248pt"/>
+    </Label-rectangle>
+  </Template>
+
+  <!-- =================================================================== -->
+  <!-- Dymo 30376 Hanging Folder labels.                                   -->
+  <!-- =================================================================== -->
+  <Template brand="Dymo" part="30376" size="Other" width="41pt" height="144pt" _description="Hanging Folder">
+    <Meta category="label"/>
+    <Label-rectangle id="0" width="41pt" height="144pt" round="0pt" x_waste="0pt" y_waste="0pt">
+      <Markup-margin size="0pt"/>
+      <Layout nx="1" ny="1" x0="0pt" y0="0pt" dx="41pt" dy="144pt"/>
+    </Label-rectangle>
+  </Template>
+
+  <!-- =================================================================== -->
+  <!-- Dymo 30258 3.5" Disk labels.                                        -->
+  <!-- =================================================================== -->
+  <Template brand="Dymo" part="30258" size="Other" width="153pt" height="198pt" _description="3.5in Diskette">
+    <Meta category="label"/>
+    <Meta category="media"/>
+    <Label-rectangle id="0" width="153pt" height="198pt" round="0pt" x_waste="0pt" y_waste="0pt">
+      <Markup-margin size="0pt"/>
+      <Layout nx="1" ny="1" x0="0pt" y0="0pt" dx="153pt" dy="198pt"/>
+    </Label-rectangle>
+  </Template>
+
+</Glabels-templates>

diff --git a/glabels2/data/templates/misc-other-templates.xml b/glabels2/data/templates/misc-other-templates.xml
index ac5cc808393e6ddd8d7a61bb783f4f5222a5ad20..a953fa9d1fe4f4e52ca2e0fafdb179a948bee6f5 100644 (file)
--- a/glabels2/data/templates/misc-other-templates.xml
+++ b/glabels2/data/templates/misc-other-templates.xml
@@ -2,10 +2,6 @@
 <Glabels-templates xmlns="http://snaught.com/glabels/2.0/">
 
 
-  <!-- ******************************************************************** -->
-  <!-- Avery non-standard size products (not US-Letter/Legal or ISO)        -->
-  <!-- ******************************************************************** -->
-
   <!-- =================================================================== -->
   <!-- OfficeMax 86112: Multi-Purpose Labels, 2'' x 4'', 3 per sheet       -->
   <!-- =================================================================== -->
@@ -18,16 +14,6 @@
     </Label-rectangle>
   </Template>
 
-  <!-- =================================================================== -->
-  <!-- Dymo 99102 Large Address labels.                                    -->
-  <!-- =================================================================== -->
-  <Template brand="Dymo" part="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>