From 20808aa3eca1b58fd8a8818699ce6afeaaedea1c Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Thu, 6 May 2004 03:35:18 +0000 Subject: [PATCH] 2004-05-05 Jim Evins * 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 --- glabels2/AUTHORS | 1 + glabels2/ChangeLog | 15 ++++++++++ glabels2/data/avery-iso-templates.xml | 12 ++++++++ glabels2/data/glabels-2.0.dtd | 6 ++-- glabels2/data/zweckform-iso-templates.xml | 34 +++++++++++++++++++++-- glabels2/libglabels/xml-template.c | 10 +++---- 6 files changed, 69 insertions(+), 9 deletions(-) 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 + + * 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 * 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 @@ + + + + + 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 @@ - + 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 @@ - + + + + + + + + + + + + + + + + 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); + } + } /*--------------------------------------------------------------------------*/ -- 2.39.5