[glabels] Minor Cleanup
- From: Jim Evins <jimevins src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glabels] Minor Cleanup
- Date: Wed, 3 Mar 2010 02:51:10 +0000 (UTC)
commit d94c47da20d726831e16f8cd720d64d26ce85d2b
Author: Jim Evins <evins snaught com>
Date: Tue Mar 2 21:47:27 2010 -0500
Minor Cleanup
COPYING.README_FIRST | 7 ++++---
README | 11 ++++++-----
configure.ac | 2 +-
libglabels/xml-template.c | 4 +---
libglabels/xml-vendor.c | 2 --
src/cairo-label-path.c | 2 ++
src/cairo-markup-path.c | 4 +++-
src/label-line.c | 2 +-
src/label-text.c | 2 --
src/template-designer.c | 3 +++
templates/avery-iso-templates.xml | 28 ----------------------------
templates/avery-other-templates.xml | 28 ----------------------------
templates/avery-us-templates.xml | 28 ----------------------------
templates/brother-other-templates.xml | 28 ----------------------------
templates/categories.xml | 28 ----------------------------
templates/dymo-other-templates.xml | 28 ----------------------------
templates/maco-us-templates.xml | 28 ----------------------------
templates/misc-iso-templates.xml | 28 ----------------------------
templates/misc-other-templates.xml | 28 ----------------------------
templates/misc-us-templates.xml | 28 ----------------------------
templates/paper-sizes.xml | 28 ----------------------------
templates/uline-us-templates.xml | 28 ----------------------------
templates/vendors.xml | 28 ----------------------------
templates/worldlabel-us-templates.xml | 28 ----------------------------
templates/zweckform-iso-templates.xml | 28 ----------------------------
25 files changed, 21 insertions(+), 438 deletions(-)
---
diff --git a/COPYING.README_FIRST b/COPYING.README_FIRST
index 06eea6d..0051322 100644
--- a/COPYING.README_FIRST
+++ b/COPYING.README_FIRST
@@ -31,6 +31,7 @@ TEMPLATE DATABASE:
The XML files in the "templates/" subdirectory constitute the glabels
label database. No copyright is claimed on the facts contained within
- the database. However, to clear up any ambiguity, the files themselves
- are licensed using the MIT/X license -- see 'COPYING-TEMPLATES' in this
- directory for details.
+ the database and can be used for any purpose. However, to clear up any
+ ambiguity, the DTD file that defines the format of these files is
+ licensed using the MIT/X license, as close to public domain as one can
+ get -- see 'COPYING-TEMPLATES' in this directory for details.
diff --git a/README b/README
index aadf245..abb1468 100644
--- a/README
+++ b/README
@@ -3,10 +3,11 @@ Copyright
Copyright (C) 2001-2009 Jim Evins
- gLabels contains components copyrighted by others -- see the 'AUTHORS' file in
- this directory.
+ gLabels contains components copyrighted by others -- see the 'AUTHORS' file
+ in this directory.
- For license information see the 'COPYING.README_FIRST' file in this directory.
+ For license information see the 'COPYING.README_FIRST' file in this
+ directory.
@@ -36,8 +37,8 @@ Evolution Data Server 2.28.0+
Optional Barcode Backends
=========================
GNU Barcode 0.98+ (http://www.gnu.org/software/barcode/barcode.html)
-QREncode 3.1.0+ (http://megaui.net/fukuchi/works/qrencode/index.en.html)
-IEC16022 0.2.4+ (http://datenfreihafen.org/projects/iec16022.html)
+QREncode 3.1.0+ (http://megaui.net/fukuchi/works/qrencode/index.en.html)
+IEC16022 0.2.4+ (http://datenfreihafen.org/projects/iec16022.html)
diff --git a/configure.ac b/configure.ac
index ec3665b..d58f8a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.63)
-AC_INIT([glabels],[2.3.pre0svn],[http://sourceforge.net/tracker/?func=add&group_id=46122&atid=445116])
+AC_INIT([glabels],[2.3.pre0git],[http://sourceforge.net/tracker/?func=add&group_id=46122&atid=445116])
AC_CONFIG_SRCDIR(src/glabels.c)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
diff --git a/libglabels/xml-template.c b/libglabels/xml-template.c
index 75b6fec..50ae132 100644
--- a/libglabels/xml-template.c
+++ b/libglabels/xml-template.c
@@ -110,7 +110,6 @@ lgl_xml_template_read_templates_from_file (const gchar *utf8_filename)
{
gchar *filename;
xmlDocPtr templates_doc;
- GList *templates = NULL;
LIBXML_TEST_VERSION;
@@ -400,7 +399,6 @@ xml_parse_label_ellipse_node (xmlNodePtr label_node,
lglTemplate *template)
{
gchar *id;
- gchar *tmp;
gdouble waste;
gdouble w, h;
lglTemplateFrame *frame;
@@ -682,7 +680,7 @@ static void
xml_parse_markup_ellipse_node (xmlNodePtr markup_node,
lglTemplateFrame *frame)
{
- gdouble x1, y1, w, h, r;
+ gdouble x1, y1, w, h;
xmlNodePtr node;
x1 = lgl_xml_get_prop_length (markup_node, "x1", 0);
diff --git a/libglabels/xml-vendor.c b/libglabels/xml-vendor.c
index 153f935..c6ba991 100644
--- a/libglabels/xml-vendor.c
+++ b/libglabels/xml-vendor.c
@@ -148,8 +148,6 @@ lgl_xml_vendor_parse_vendor_node (xmlNodePtr vendor_node)
{
lglVendor *vendor;
gchar *name;
- gchar *url;
-
LIBXML_TEST_VERSION;
diff --git a/src/cairo-label-path.c b/src/cairo-label-path.c
index 0c8de52..9b63aee 100644
--- a/src/cairo-label-path.c
+++ b/src/cairo-label-path.c
@@ -24,6 +24,8 @@
#include <math.h>
+#include "cairo-ellipse-path.h"
+
#include "debug.h"
diff --git a/src/cairo-markup-path.c b/src/cairo-markup-path.c
index 78e8a6d..90ba188 100644
--- a/src/cairo-markup-path.c
+++ b/src/cairo-markup-path.c
@@ -24,6 +24,8 @@
#include <math.h>
+#include "cairo-ellipse-path.h"
+
#include "debug.h"
@@ -204,7 +206,7 @@ gl_cairo_markup_margin_ellipse_path (cairo_t *cr,
{
const lglTemplate *template;
const lglTemplateFrame *frame;
- gdouble w, h, r, m;
+ gdouble w, h, m;
gl_debug (DEBUG_PATH, "START");
diff --git a/src/label-line.c b/src/label-line.c
index 30ee7cf..0b58815 100644
--- a/src/label-line.c
+++ b/src/label-line.c
@@ -208,7 +208,7 @@ set_line_color (glLabelObject *object,
{
if ( checkpoint )
{
- gl_label_object_get_parent (GL_LABEL_OBJECT (lline));
+ label = gl_label_object_get_parent (GL_LABEL_OBJECT (lline));
gl_label_checkpoint (label, _("Line color"));
}
diff --git a/src/label-text.c b/src/label-text.c
index 56270b4..7e6a39c 100644
--- a/src/label-text.c
+++ b/src/label-text.c
@@ -447,8 +447,6 @@ static void
buffer_changed_cb (GtkTextBuffer *textbuffer,
glLabelText *ltext)
{
- glLabel *label;
-
ltext->priv->size_changed = TRUE;
gl_label_object_emit_changed (GL_LABEL_OBJECT(ltext));
diff --git a/src/template-designer.c b/src/template-designer.c
index 95b2162..4f2498c 100644
--- a/src/template-designer.c
+++ b/src/template-designer.c
@@ -1739,6 +1739,9 @@ build_template (glTemplateDesigner *dialog)
w/upp, h/upp,
waste/upp);
break;
+ default:
+ g_assert_not_reached ();
+ break;
}
lgl_template_add_frame (template, frame);
diff --git a/templates/avery-iso-templates.xml b/templates/avery-iso-templates.xml
index 1e41387..433e255 100644
--- a/templates/avery-iso-templates.xml
+++ b/templates/avery-iso-templates.xml
@@ -1,33 +1,5 @@
<?xml version="1.0"?>
-<!--
- avery-iso-templates.xml
- This file is a part of the glabels template database.
-
- Copyright (c) 2001-2009 Jim Evins
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
--->
-
<Glabels-templates>
diff --git a/templates/avery-other-templates.xml b/templates/avery-other-templates.xml
index a068b8c..bb21ef6 100644
--- a/templates/avery-other-templates.xml
+++ b/templates/avery-other-templates.xml
@@ -1,33 +1,5 @@
<?xml version="1.0"?>
-<!--
- avery-other-templates.xml
- This file is a part of the glabels template database.
-
- Copyright (c) 2001-2009 Jim Evins
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
--->
-
<Glabels-templates>
diff --git a/templates/avery-us-templates.xml b/templates/avery-us-templates.xml
index f2da680..3f20820 100644
--- a/templates/avery-us-templates.xml
+++ b/templates/avery-us-templates.xml
@@ -1,33 +1,5 @@
<?xml version="1.0"?>
-<!--
- avery-us-templates.xml
- This file is a part of the glabels template database.
-
- Copyright (c) 2001-2009 Jim Evins
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
--->
-
<Glabels-templates>
diff --git a/templates/brother-other-templates.xml b/templates/brother-other-templates.xml
index 7175f7b..1c6bc83 100644
--- a/templates/brother-other-templates.xml
+++ b/templates/brother-other-templates.xml
@@ -1,33 +1,5 @@
<?xml version="1.0"?>
-<!--
- brother-other-templates.xml
- This file is a part of the glabels template database.
-
- Copyright (c) 2001-2009 Jim Evins
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
--->
-
<Glabels-templates>
<!--
diff --git a/templates/categories.xml b/templates/categories.xml
index 606d05e..6ab4057 100644
--- a/templates/categories.xml
+++ b/templates/categories.xml
@@ -1,33 +1,5 @@
<?xml version="1.0"?>
-<!--
- categories.xml
- This file is a part of the glabels template database.
-
- Copyright (c) 2001-2009 Jim Evins
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
--->
-
<Glabels-categories>
<Category id="label" _name="Any label"/>
diff --git a/templates/dymo-other-templates.xml b/templates/dymo-other-templates.xml
index 49592b5..62c0bd9 100644
--- a/templates/dymo-other-templates.xml
+++ b/templates/dymo-other-templates.xml
@@ -1,33 +1,5 @@
<?xml version="1.0"?>
-<!--
- dymo-other-templates.xml
- This file is a part of the glabels template database.
-
- Copyright (c) 2001-2009 Jim Evins
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
--->
-
<Glabels-templates>
diff --git a/templates/maco-us-templates.xml b/templates/maco-us-templates.xml
index 6054e5f..d48acbd 100644
--- a/templates/maco-us-templates.xml
+++ b/templates/maco-us-templates.xml
@@ -1,33 +1,5 @@
<?xml version="1.0"?>
-<!--
- maco-us-templates.xml
- This file is a part of the glabels template database.
-
- Copyright (c) 2001-2009 Jim Evins
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
--->
-
<Glabels-templates>
diff --git a/templates/misc-iso-templates.xml b/templates/misc-iso-templates.xml
index b24c818..ba2d105 100644
--- a/templates/misc-iso-templates.xml
+++ b/templates/misc-iso-templates.xml
@@ -1,33 +1,5 @@
<?xml version="1.0"?>
-<!--
- misc-iso-templates.xml
- This file is a part of the glabels template database.
-
- Copyright (c) 2001-2009 Jim Evins
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
--->
-
<Glabels-templates>
diff --git a/templates/misc-other-templates.xml b/templates/misc-other-templates.xml
index b1a1c96..00f385c 100644
--- a/templates/misc-other-templates.xml
+++ b/templates/misc-other-templates.xml
@@ -1,33 +1,5 @@
<?xml version="1.0"?>
-<!--
- misc-other-templates.xml
- This file is a part of the glabels template database.
-
- Copyright (c) 2001-2009 Jim Evins
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
--->
-
<Glabels-templates>
diff --git a/templates/misc-us-templates.xml b/templates/misc-us-templates.xml
index 4df17ac..85b66ac 100644
--- a/templates/misc-us-templates.xml
+++ b/templates/misc-us-templates.xml
@@ -1,33 +1,5 @@
<?xml version="1.0"?>
-<!--
- misc-us-templates.xml
- This file is a part of the glabels template database.
-
- Copyright (c) 2001-2009 Jim Evins
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
--->
-
<Glabels-templates>
diff --git a/templates/paper-sizes.xml b/templates/paper-sizes.xml
index 2d5ac68..e1049d8 100644
--- a/templates/paper-sizes.xml
+++ b/templates/paper-sizes.xml
@@ -1,33 +1,5 @@
<?xml version="1.0"?>
-<!--
- paper-sizes.xml
- This file is a part of the glabels template database.
-
- Copyright (c) 2001-2009 Jim Evins
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
--->
-
<Glabels-paper-sizes>
<!-- Most popular (at top of list) -->
diff --git a/templates/uline-us-templates.xml b/templates/uline-us-templates.xml
index f9eca6e..4fe1246 100644
--- a/templates/uline-us-templates.xml
+++ b/templates/uline-us-templates.xml
@@ -1,33 +1,5 @@
<?xml version="1.0"?>
-<!--
- uline-us-templates.xml
- This file is a part of the glabels template database.
-
- Copyright (c) 2001-2009 Jim Evins
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
--->
-
<Glabels-templates>
diff --git a/templates/vendors.xml b/templates/vendors.xml
index dd8b3cf..f4a2faf 100644
--- a/templates/vendors.xml
+++ b/templates/vendors.xml
@@ -1,33 +1,5 @@
<?xml version="1.0"?>
-<!--
- vendors.xml
- This file is a part of the glabels template database.
-
- Copyright (c) 2001-2009 Jim Evins
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
--->
-
<Glabels-vendors>
<Vendor name="Avery" url="http://www.avery.com/"; />
diff --git a/templates/worldlabel-us-templates.xml b/templates/worldlabel-us-templates.xml
index 6898a21..1af2198 100644
--- a/templates/worldlabel-us-templates.xml
+++ b/templates/worldlabel-us-templates.xml
@@ -1,33 +1,5 @@
<?xml version="1.0"?>
-<!--
- worldlabel-us-templates.xml
- This file is a part of the glabels template database.
-
- Copyright (c) 2001-2009 Jim Evins
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
--->
-
<Glabels-templates>
diff --git a/templates/zweckform-iso-templates.xml b/templates/zweckform-iso-templates.xml
index e177230..0b334f3 100644
--- a/templates/zweckform-iso-templates.xml
+++ b/templates/zweckform-iso-templates.xml
@@ -1,33 +1,5 @@
<?xml version="1.0"?>
-<!--
- zweckform-iso-templates.xml
- This file is a part of the glabels template database.
-
- Copyright (c) 2001-2009 Jim Evins
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
--->
-
<Glabels-templates>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
