From: Jim Evins <evins@snaught.com>
Date: Sun, 17 Feb 2008 04:59:49 +0000 (+0000)
Subject: 2008-02-16  Jim Evins  <evins@snaught.com>
X-Git-Tag: glabels-2_3_0~273
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=41999df6e9a40596e0e6986813b70f3f360c9b0e;p=glabels

2008-02-16  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/misc-us-templates.xml:
		Caught up on user submitted templates.


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

diff --git a/glabels2/AUTHORS b/glabels2/AUTHORS
index 114644b7..56cf049f 100644
--- a/glabels2/AUTHORS
+++ b/glabels2/AUTHORS
@@ -163,5 +163,8 @@ particular products (I apologize if I have missed anybody):
 	Dennis Böckmann
 	Anon
 	D. Leitner
+	Georg Ostertag
+	Manuel Siggen
+	David Huber
 
 And many others for their many helpful suggestions and bug reports -- thanks.
diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index 5c032149..241a39e8 100644
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,12 @@
+2008-02-16  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/misc-us-templates.xml:
+		Caught up on user submitted templates.
+
 2008-02-04  Jim Evins  <evins@snaught.com>
 
 	* src/view-image.c: (update_object_from_editor_cb):
diff --git a/glabels2/data/templates/avery-iso-templates.xml b/glabels2/data/templates/avery-iso-templates.xml
index 23fc5918..60c47536 100644
--- a/glabels2/data/templates/avery-iso-templates.xml
+++ b/glabels2/data/templates/avery-iso-templates.xml
@@ -18,6 +18,17 @@
     </Label-cd>
   </Template>
 
+  <!-- =================================================================== -->
+  <!-- Avery 6121 family: Allround labels.                                 -->
+  <!-- =================================================================== -->
+  <Template brand="Avery" part="6121" size="A4" _description="Allround labels">
+    <Meta category="label"/>
+    <Label-rectangle id="0" width="107.928pt" height="60.12pt" round="0pt" x_waste="0pt" y_waste="0pt">
+      <Markup-margin size="8.496pt"/>
+      <Layout nx="5" ny="13" x0="26.928pt" y0="29.736pt" dx="107.928pt" dy="60.12pt"/>
+    </Label-rectangle>
+  </Template>
+
   <!-- =================================================================== -->
   <!-- Avery 7160 family: Mailing labels, 63.5 x 38.1 mm, 21 per sheet     -->
   <!-- =================================================================== -->
diff --git a/glabels2/data/templates/avery-us-templates.xml b/glabels2/data/templates/avery-us-templates.xml
index 58e897c5..5d8ab14a 100644
--- a/glabels2/data/templates/avery-us-templates.xml
+++ b/glabels2/data/templates/avery-us-templates.xml
@@ -103,6 +103,17 @@
     <Alias brand="Worldlabel" part="OL100"/>
   </Template>
 
+  <!-- =================================================================== -->
+  <!-- Avery 5305 family: Tent Cards, 2_1/2'' x 8_1/2'', 2 per sheet       -->
+  <!-- =================================================================== -->
+  <Template brand="Avery" part="5305" size="US-Letter" _description="Tent Cards">
+    <Meta category="card"/>
+    <Label-rectangle id="0" width="612pt" height="180pt" round="0pt" x_waste="0pt" y_waste="0pt">
+      <Markup-margin size="27pt"/>
+      <Layout nx="1" ny="2" x0="0pt" y0="216pt" dx="0pt" dy="360pt"/>
+    </Label-rectangle>
+  </Template>
+
   <!-- =================================================================== -->
   <!-- Avery 6879 family: Address Labels, 1_1/4'' x 3_3/4'', 12 per sheetx -->
   <!-- =================================================================== -->
diff --git a/glabels2/data/templates/misc-iso-templates.xml b/glabels2/data/templates/misc-iso-templates.xml
index 720a7dce..36b4135f 100644
--- a/glabels2/data/templates/misc-iso-templates.xml
+++ b/glabels2/data/templates/misc-iso-templates.xml
@@ -494,6 +494,17 @@
     </Label-rectangle>
   </Template>
 
+  <!-- =================================================================== -->
+  <!-- Connect KF10647 Mailing Labels..                                    -->
+  <!-- =================================================================== -->
+  <Template brand="Connect" part="KF10647" size="A4" _description="Mailing Labels">
+    <Meta category="label"/>
+    <Meta category="mail"/>
+    <Label-rectangle id="0" width="198.425pt" height="104.882pt" round="0pt" x_waste="0pt" y_waste="0pt">
+      <Markup-margin size="9pt"/>
+      <Layout nx="3" ny="8" x0="7.86772e-17pt" y0="11.3386pt" dx="198.425pt" dy="104.882pt"/>
+    </Label-rectangle>
+  </Template>
 
 
   <!-- ******************************************************************** -->
diff --git a/glabels2/data/templates/misc-us-templates.xml b/glabels2/data/templates/misc-us-templates.xml
index 887eb927..ff5a5808 100644
--- a/glabels2/data/templates/misc-us-templates.xml
+++ b/glabels2/data/templates/misc-us-templates.xml
@@ -205,6 +205,19 @@
     </Label-rectangle>
   </Template>
 
+  <!-- =================================================================== -->
+  <!-- OfficeMax OM99060 Mailing Labels.                                   -->
+  <!-- =================================================================== -->
+  <Template brand="OfficeMax" part="OM99060" size="US-Letter" _description="Mailing Labels">
+    <Meta category="label"/>
+    <Meta category="mail"/>
+    <Label-rectangle id="0" width="203.76pt" height="72pt" round="0pt" x_waste="0pt" y_waste="0pt">
+      <Markup-margin size="12.024pt"/>
+      <Layout nx="3" ny="10" x0="0pt" y0="36pt" dx="203.76pt" dy="72pt"/>
+    </Label-rectangle>
+  </Template>
+
+
 </Glabels-templates>