2005-04-15 Jim Evins <evins@snaught.com>

	* data/templates/avery-us-templates.xml:
		Added Avery 5388 and 5389 templates provided by Peter L. Berghold.
	* data/templates/misc-iso-templates.xml:
		Added Ryman standard CD/DVD template, provided by Dan Clark.
	* AUTHORS:
		Added acknowledgements for above.

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

diff --git a/glabels2/AUTHORS b/glabels2/AUTHORS
index 9d0f422be06ce1d70eba783e670f67a40a85f450..3e3736237b984a43a1a7d3e26739b94a1a032737 100644 (file)
--- a/glabels2/AUTHORS
+++ b/glabels2/AUTHORS
@@ -148,5 +148,7 @@ particular products (I apologize if I have missed anybody):
        Juan Carlos Valero
        Nick Hill
        Ali Akcaagac
+       Dan Clark
+       Peter L. Berghold
 
 And many others for their many helpful suggestions and bug reports -- thanks.

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index d591ebaafea2ccaf4ab47ca4925bd42629861919..a6124ad18b6394bb5a1de41cb31eda8460991a76 100644 (file)
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,12 @@
+2005-04-15  Jim Evins  <evins@snaught.com>
+
+       * data/templates/avery-us-templates.xml:
+               Added Avery 5388 and 5389 templates provided by Peter L. Berghold.
+       * data/templates/misc-iso-templates.xml:
+               Added Ryman standard CD/DVD template, provided by Dan Clark.
+       * AUTHORS:
+               Added acknowledgements for above.
+       
 2005-04-10  Jim Evins <evins@snaught.com>
 
        * libglabels/xml-paper.c: (gl_xml_paper_parse_paper_node):

diff --git a/glabels2/data/templates/avery-us-templates.xml b/glabels2/data/templates/avery-us-templates.xml
index 4bbe4ee048fed9e4f59294427753a5ae8c23a831..fa5aee7c1013da27e220cf1101bf4b9c41298785 100644 (file)
--- a/glabels2/data/templates/avery-us-templates.xml
+++ b/glabels2/data/templates/avery-us-templates.xml
@@ -298,6 +298,28 @@
     <Alias name="Avery 28877"/>
   </Template>
 
+  <!-- =================================================================== -->
+  <!-- Avery 5388 family: Index Cards, 5'' x 3'', 3 per sheet              -->
+  <!-- =================================================================== -->
+  <Template name="Avery  5388" size="US-Letter" description="Index Cards">
+    <Label-rectangle id="0" width="5in" height="3in" round="0pt" waste="0pt">
+      <Layout nx="1" ny="3" x0="1.75in" y0="1in" dx="5in" dy="3in"/>
+      <Markup-margin size="0.125in"/>
+    </Label-rectangle>
+    <Alias name="Avery  5386"/>
+    <Alias name="Avery  8388"/>
+  </Template>
+
+  <!-- =================================================================== -->
+  <!-- Avery 5389 family: Post Cards, 6'' x 4'', 2 per sheet               -->
+  <!-- =================================================================== -->
+  <Template name="Avery  5389" size="US-Letter" description="Post cards">
+    <Label-rectangle id="0" width="6in" height="4in" round="0pt" waste="0pt">
+      <Layout nx="1" ny="2" x0="1.25in" y0="1.25in" dx="6in" dy="4.5in"/>
+      <Markup-margin size="0.125in"/>
+    </Label-rectangle>
+  </Template>
+
   <!-- =================================================================== -->
   <!-- Avery 8373 family: Business Cards, 2'' x 3_1/2'', 8 per sheet     x -->
   <!-- =================================================================== -->

diff --git a/glabels2/data/templates/misc-iso-templates.xml b/glabels2/data/templates/misc-iso-templates.xml
index ecaef72f00cb84782cd6269311162b0f431c471b..ff81b15318f352c0de3b52ed5fbc3720546da5d7 100644 (file)
--- a/glabels2/data/templates/misc-iso-templates.xml
+++ b/glabels2/data/templates/misc-iso-templates.xml
@@ -346,6 +346,16 @@
     </Label-cd>
   </Template>
 
+  <!-- =================================================================== -->
+  <!-- Ryman Standard CD/DVD Labels.                                       -->
+  <!-- =================================================================== -->
+  <Template name="Ryman Standard CD/DVD" size="A4" _description="CD/DVD Labels">
+    <Label-cd id="0" radius="165.827pt" hole="58.1102pt" waste="9pt">
+      <Markup-margin size="9pt"/>
+      <Layout nx="1" ny="2" x0="131.811pt" y0="60.6614pt" dx="245.622pt" dy="388.346pt"/>
+    </Label-cd>
+  </Template>
+
 
 
   <!-- ******************************************************************** -->