2009-04-29 Jim Evins <evins@purple>

	* data/templates/avery-iso-templates.xml:
	* data/templates/misc-iso-templates.xml:
	* data/templates/misc-us-templates.xml:
		Caught up on user submitted templates.
	* AUTHORS:
		Acknowledgements for above templates.

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

diff --git a/glabels2/AUTHORS b/glabels2/AUTHORS
index f3b5c592ecc449a6fb6e82c54f1c78c3d2557fbd..d83a63f5f09798f8102ae3d6edca7ce083d29ce5 100644 (file)
--- a/glabels2/AUTHORS
+++ b/glabels2/AUTHORS
@@ -176,6 +176,7 @@ particular products (I apologize if I have missed anybody):
        Koen Wybo
        Mark Moeller
        Bertus W.
+       Oliver Friedrich
 
 
 And many others for their many helpful suggestions and bug reports -- thanks.

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index 72048dad6ac0c818419273e3c712c3de66748152..20fe08902f81fb757071bfb931030d930b5739c0 100644 (file)
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,12 @@
+2009-04-29  Jim Evins  <evins@purple>
+
+       * data/templates/avery-iso-templates.xml:
+       * data/templates/misc-iso-templates.xml:
+       * data/templates/misc-us-templates.xml:
+               Caught up on user submitted templates.
+       * AUTHORS:
+               Acknowledgements for above templates.
+
 2009-04-29  Jim Evins  <evins@purple>
 
        * po/de.po:

diff --git a/glabels2/data/templates/avery-iso-templates.xml b/glabels2/data/templates/avery-iso-templates.xml
index 5865f08b5a29e0450afeb563dc4700b641533c9d..b6bd85d812bb2409d5e9c7b01b1cea326fec0d99 100644 (file)
--- a/glabels2/data/templates/avery-iso-templates.xml
+++ b/glabels2/data/templates/avery-iso-templates.xml
@@ -6,6 +6,18 @@
   <!-- Avery A4 products (and look-alikes)                                  -->
   <!-- ******************************************************************** -->
 
+  <!-- =================================================================== -->
+  <!-- Avery L4732 family: Mini Labels                                     -->
+  <!-- =================================================================== -->
+  <Template brand="Avery" part="L4732" size="A4" description="Mini Labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Label-rectangle id="0" width="35.6mm" height="16.9mm" round="1.5mm" x_waste="0mm" y_waste="0mm">
+      <Markup-margin size="1mm"/>
+      <Layout nx="5" ny="16" x0="11mm" y0="13mm" dx="38.1mm" dy="16.9mm"/>
+    </Label-rectangle>
+  </Template>
+
   <!-- =================================================================== -->
   <!-- Avery L6015 family: CD/DVD Labels, 2 per sheet                      -->
   <!-- =================================================================== -->

diff --git a/glabels2/data/templates/misc-iso-templates.xml b/glabels2/data/templates/misc-iso-templates.xml
index cdc41e816d3f8b410a1797e6442501a12bda5dee..e19424b1465ae27c85e4ff6602823000ecd1b345 100644 (file)
--- a/glabels2/data/templates/misc-iso-templates.xml
+++ b/glabels2/data/templates/misc-iso-templates.xml
@@ -469,6 +469,18 @@
     </Label-cd>
   </Template>
 
+  <!-- =================================================================== -->
+  <!-- Ryman 0215016061 CD/DVD Labels.                                     -->
+  <!-- =================================================================== -->
+  <Template brand="Ryman" part="0215016061" size="A4" description="CD/DVD Labels">
+    <Meta category="label"/>
+    <Meta category="media"/>
+    <Label-cd id="0" radius="165.827pt" hole="24.0945pt" waste="8.50394pt">
+      <Markup-margin size="0pt"/>
+      <Layout nx="1" ny="2" x0="131.811pt" y0="60.6614pt" dx="348.661pt" dy="388.346pt"/>
+    </Label-cd>
+  </Template>
+
   <!-- =================================================================== -->
   <!-- Fellows 04715 CD/DVD Labels (Face only).                            -->
   <!-- =================================================================== -->

diff --git a/glabels2/data/templates/misc-us-templates.xml b/glabels2/data/templates/misc-us-templates.xml
index ff5a5808d9b1383d2be26e974a6eaf079fd48f9e..bf41985f2ffd589cd38025dbc141dc2d8642e367 100644 (file)
--- a/glabels2/data/templates/misc-us-templates.xml
+++ b/glabels2/data/templates/misc-us-templates.xml
@@ -217,6 +217,17 @@
     </Label-rectangle>
   </Template>
 
+  <!-- =================================================================== -->
+  <!-- Online Labels OL1025 Round Labels.                                  -->
+  <!-- =================================================================== -->
+  <Template brand="Online Labels" part="OL1025" size="US-Letter" description="Round Labels">
+    <Meta category="label"/>
+    <Meta category="round-label"/>
+    <Label-round id="0" radius="0.5in" waste="0.062in">
+      <Markup-margin size="0.125in"/>
+      <Layout nx="7" ny="9" x0="0.375in" y0="0.5in" dx="1.125in" dy="1.125in"/>
+    </Label-round>
+  </Template>
 
 </Glabels-templates>