From: Jim Evins <evins@snaught.com>
Date: Thu, 6 May 2004 03:35:18 +0000 (+0000)
Subject: 2004-05-05  Jim Evins  <evins@snaught.com>
X-Git-Tag: glabels-2_3_0~473
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=20808aa3eca1b58fd8a8818699ce6afeaaedea1c;p=glabels

2004-05-05  Jim Evins  <evins@snaught.com>

        * data/glabels-2.0.dtd:
                Broke DTD previously when adding new barcode types that contain
a
                plus sign (+).  Simply changed the BC_STYLE_TYPE entity to "CDATA"
                to avoid the problem.
        * data/avery-iso-templates.xml:
        * data/zweckform-iso-templates.xml:
        * AUTHORS:
                Added templates for Avery 7165, Zweckform 3688, 4732, and 6021.
 Templates
                provided by Frank Altpeter.
        * libglabels/xml-template.c: (xml_create_label_node):
                Reordered markup and layout sub-nodes so that resulting templates will
                validate against DTD.


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

diff --git a/glabels2/AUTHORS b/glabels2/AUTHORS
index d7bc9fbe..387d23ef 100644
--- a/glabels2/AUTHORS
+++ b/glabels2/AUTHORS
@@ -135,5 +135,6 @@ particular products (I apologize if I have missed anybody):
 	Thomas Vill
 	Fred Bacon
 	JBadger
+	Frank Altpeter
 
 And many others for their many helpful suggestions and bug reports -- thanks.
diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index 7d5b875b..505e068e 100644
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,18 @@
+2004-05-05  Jim Evins  <evins@snaught.com>
+
+	* data/glabels-2.0.dtd:
+		Broke DTD previously when adding new barcode types that contain a
+		plus sign (+).  Simply changed the BC_STYLE_TYPE entity to "CDATA"
+		to avoid the problem.
+	* data/avery-iso-templates.xml:
+	* data/zweckform-iso-templates.xml:
+	* AUTHORS:
+		Added templates for Avery 7165, Zweckform 3688, 4732, and 6021.  Templates
+		provided by Frank Altpeter.
+	* libglabels/xml-template.c: (xml_create_label_node):
+		Reordered markup and layout sub-nodes so that resulting templates will
+		validate against DTD.
+
 2004-03-13  Jim Evins  <evins@snaught.com>
 
 	* src/object-editor-size-page.c: (gl_object_editor_prepare_size_page):
diff --git a/glabels2/data/avery-iso-templates.xml b/glabels2/data/avery-iso-templates.xml
index 2c7b96bb..80c90f1c 100644
--- a/glabels2/data/avery-iso-templates.xml
+++ b/glabels2/data/avery-iso-templates.xml
@@ -67,6 +67,18 @@
     <Alias name="Biltema 23-756"/>
   </Template>
 
+  <!-- =================================================================== -->
+  <!-- Avery 7165 family: Address labels                                   -->
+  <!-- =================================================================== -->
+  <Template name="Avery  7165" size="A4" description="Address Labels">
+    <Label-rectangle id="0" width="280.8pt" height="191.991pt" round="0pt" waste="0pt">
+      <Markup-margin size="5.66929pt"/>
+      <Layout nx="2" ny="4" x0="13.2378pt" y0="36.9638pt" dx="288.113pt" dy="191.991pt"/>
+    </Label-rectangle>
+    <Alias name="Avery  J8165"/>
+    <Alias name="Avery  L7165"/>
+  </Template>
+
   <!-- =================================================================== -->
   <!-- Avery 7169 family: shipping labels, 99.1 x 139.0 mm, 4 per sheet    -->
   <!-- =================================================================== -->
diff --git a/glabels2/data/glabels-2.0.dtd b/glabels2/data/glabels-2.0.dtd
index 872e3317..af088b40 100644
--- a/glabels2/data/glabels-2.0.dtd
+++ b/glabels2/data/glabels-2.0.dtd
@@ -16,7 +16,9 @@
 <!ENTITY % FONT_WEIGHT_TYPE   "(Regular | Bold)">
 
 <!-- Barcode related enumerations/types -->
-<!ENTITY % BC_STYLE_TYPE      "(POSTNET    |
+<!ENTITY % BC_STYLE_TYPE      "CDATA">
+                              <!-- one of:
+                              "(POSTNET    |
                                 POSTNET-5  |
                                 POSTNET-9  |
                                 POSTNET-11 |
@@ -44,7 +46,7 @@
                                 CBR        |
                                 MSI        |
                                 PLS)"
->
+                               -->
 
 <!-- Data encoding method -->
 <!ENTITY % DATA_ENCODING_TYPE "(None | Base64)">
diff --git a/glabels2/data/zweckform-iso-templates.xml b/glabels2/data/zweckform-iso-templates.xml
index aa7b51cf..5c896001 100644
--- a/glabels2/data/zweckform-iso-templates.xml
+++ b/glabels2/data/zweckform-iso-templates.xml
@@ -52,12 +52,32 @@
   <Template name="Zweckform  3669" size="A4" _description="QSL-Karten Etiketten 70mm x 50,8mm">
     <Label-rectangle id="0" width="198.425" height="144" round="0">
       <Markup-margin size="5"/>
-     <Layout nx="3" ny="5" x0="0" y0="61" dx="198.425" dy="144"/>
+      <Layout nx="3" ny="5" x0="0" y0="61" dx="198.425" dy="144"/>
     </Label-rectangle>
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Zweckform 4746: Video Labels, 147,32 x 20 mm, 13 per sheet    -->
+  <!-- Zweckform 3688: Ordnerruecken Labels                                -->
+  <!-- =================================================================== -->
+  <Template name="Zweckform  3688" size="A4" description="File Back Labels">
+    <Label-rectangle id="0" width="544.252pt" height="172.913pt" round="0pt" waste="0pt">
+      <Markup-margin size="9.07087pt"/>
+      <Layout nx="1" ny="4" x0="28.3465pt" y0="76.5354pt" dx="544.252pt" dy="172.913pt"/>
+    </Label-rectangle>
+  </Template>
+
+  <!-- =================================================================== -->
+  <!-- Zweckform 4732: Multi-purpose Stick+Lift labels                     -->
+  <!-- =================================================================== -->
+  <Template name="Zweckform  4732" size="A4" description="Multi-purpose Stick+Lift Labels">
+    <Label-rectangle id="0" width="102.047pt" height="48.189pt" round="5.66929pt" waste="0pt">
+      <Markup-margin size="5.66929pt"/>
+      <Layout nx="5" ny="16" x0="31.1811pt" y0="36.8504pt" dx="107.717pt" dy="48.189pt"/>
+    </Label-rectangle>
+  </Template>
+
+  <!-- =================================================================== -->
+  <!-- Zweckform 4746: Video Labels, 147,32 x 20 mm, 13 per sheet          -->
   <!-- =================================================================== -->
   <Template name="Zweckform  4746" size="A4" _description="Video Labels (back)">
     <Label-rectangle id="0" width="416.6" height="56.6929" round="5">
@@ -126,6 +146,16 @@
      </Label-cd>
    </Template>
 
+  <!-- =================================================================== -->
+  <!-- Zweckform 6021: Allround Labels                                     -->
+  <!-- =================================================================== -->
+  <Template name="Zweckform  6021" size="A4" description="Allround Labels">
+    <Label-rectangle id="0" width="130.392pt" height="47.9055pt" round="0pt" waste="0pt">
+      <Markup-margin size="5pt"/>
+      <Layout nx="4" ny="16" x0="24.0945pt" y0="39.6853pt" dx="136.913pt" dy="47.9055pt"/>
+    </Label-rectangle>
+  </Template>
+
   <!-- =================================================================== -->
   <!-- Zweckform 32010: Business Cards, 54.0 x 85.0 mm, 10 per sheet       -->
   <!-- =================================================================== -->
diff --git a/glabels2/libglabels/xml-template.c b/glabels2/libglabels/xml-template.c
index 809454b8..1532aed0 100644
--- a/glabels2/libglabels/xml-template.c
+++ b/glabels2/libglabels/xml-template.c
@@ -637,11 +637,6 @@ xml_create_label_node (const glTemplateLabelType  *label_type,
 
 	}
 
-	for ( p=label_type->layouts; p != NULL; p=p->next ) {
-		layout = (glTemplateLayout *)p->data;
-		xml_create_layout_node (layout, node, ns);
-	}
-
 	for ( p=label_type->markups; p != NULL; p=p->next ) {
 		markup = (glTemplateMarkup *)p->data;
 		switch (markup->type) {
@@ -660,6 +655,11 @@ xml_create_label_node (const glTemplateLabelType  *label_type,
 		}
 	}
 
+	for ( p=label_type->layouts; p != NULL; p=p->next ) {
+		layout = (glTemplateLayout *)p->data;
+		xml_create_layout_node (layout, node, ns);
+	}
+
 }
 
 /*--------------------------------------------------------------------------*/