Add Avery L4730 and Cable Lable Co CableBug Labels.

- Includes some whitespace cleanup in vendor.xml and categories.xml.

diff --git a/.gitignore b/.gitignore
index dd44e143e7ac7a11478d60b9961f32c63f982312..156908323edbef4a24ba2c16a7d5b1f693bc1e85 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 *.o
 *.lo
 *.la
+*.sublime-*
 .deps
 .libs
 Makefile

diff --git a/templates/Makefile.am b/templates/Makefile.am
index 59e1db456cd3e3a214de1120f0ed46f700139392..518de2533c9a79e50e7c5fbe986f8c52a5e83e43 100644 (file)
--- a/templates/Makefile.am
+++ b/templates/Makefile.am
@@ -15,6 +15,7 @@ templates_DATA = \
        avery-us-templates.xml \
        avery-iso-templates.xml \
        avery-other-templates.xml \
+       cablelabel-templates.xml \
        brother-other-templates.xml \
        canon-other-templates.xml \
        databecker-iso-templates.xml \

diff --git a/templates/avery-iso-templates.xml b/templates/avery-iso-templates.xml
index 9083776ff95af6e80c99784abf998c9bf166026c..80a0fb4fae962db122f067913dc8c368d9ceb0f6 100644 (file)
--- a/templates/avery-iso-templates.xml
+++ b/templates/avery-iso-templates.xml
@@ -12,6 +12,19 @@
   <!-- ******************************************************************** -->
 
 
+  <!-- =================================================================== -->
+  <!-- Avery L4730 family: Mini Labels                          -->
+  <!-- =================================================================== -->
+  <Template brand="Avery" part="L4730" size="A4" _description="Mini Labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Label-rectangle id="0" width="17.8mm" height="10mm" round="1.6mm" x_waste="0mm" y_waste="0mm">
+      <Markup-margin size="3.2mm"/>
+      <Layout nx="10" ny="27" x0="6mm" y0="13mm" dx="20.3mm" dy="10mm"/>
+    </Label-rectangle>
+  </Template>
+
+
   <!-- =================================================================== -->
   <!-- Avery L4732 family: Mini Labels                                     -->
   <!-- =================================================================== -->

diff --git a/templates/cablelabel-templates.xml b/templates/cablelabel-templates.xml
new file mode 100644 (file)
index 0000000..cbacebe
--- /dev/null
+++ b/templates/cablelabel-templates.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+
+<Glabels-templates>
+
+
+  <!-- ******************************************************************** -->
+  <!-- ******************************************************************** -->
+  <!--                                                                      -->
+  <!-- Cable Label Co A4 products                                           -->
+  <!--                                                                      -->
+  <!-- ******************************************************************** -->
+  <!-- ******************************************************************** -->
+
+
+  <!-- ============================================================ -->
+  <!-- Cable Label Co CableBug: Mini Labels                         -->
+  <!-- ============================================================ -->
+  <Template brand="Cable Label Co" part="CableBug" size="A4" _description="Mini Labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Label-rectangle id="0" width="46.7mm" height="7mm" round="0mm" x_waste="0mm" y_waste="0mm">
+      <Markup-margin size="1mm"/>
+      <Layout nx="4" ny="39" x0="12mm" y0="12mm" dx="46.7mm" dy="7mm"/>
+    </Label-rectangle>
+  </Template>
+
+
+</Glabels-templates>
+
+
+
+

diff --git a/templates/categories.xml b/templates/categories.xml
index 903f37d5e02ef6f0e9aff8b2cb5e5c9e33856363..dff8224e611a312e33e19edd036693277abc66a2 100644 (file)
--- a/templates/categories.xml
+++ b/templates/categories.xml
@@ -7,9 +7,9 @@
   <Category id="elliptical-label" _name="Elliptical labels"/>
   <Category id="square-label"     _name="Square labels"/>
   <Category id="rectangle-label"  _name="Rectangular labels"/>
-  <Category id="card"            _name="Any card"/>
-  <Category id="business-card"   _name="Business cards"/>
-  <Category id="media"           _name="CD/DVD or other media"/>
+  <Category id="card"             _name="Any card"/>
+  <Category id="business-card"    _name="Business cards"/>
+  <Category id="media"            _name="CD/DVD or other media"/>
   <Category id="mail"             _name="Mailing/shipping products"/>
   <Category id="foldable"         _name="Foldable cards"/>
   <Category id="photo"            _name="Photo products"/>

diff --git a/templates/vendors.xml b/templates/vendors.xml
index dabd4e63b89b28a2f2b743a60cdaec19ba2b354b..334caa297f467e9a26e22d81d6c052b8e6057c50 100644 (file)
--- a/templates/vendors.xml
+++ b/templates/vendors.xml
@@ -2,55 +2,56 @@
 
 <Glabels-vendors>
 
-  <Vendor name="Agipa"         url="http://www.apli-agipa.com/"                        />
-  <Vendor name="APLI"          url="http://www.apli.com/softwareyplantillas/apli_soft.aspx"/>
-  <Vendor name="Ascom"         url="http://www.hovat.co.uk/hovat_labelling.html"       />
-  <Vendor name="Avery"         url="http://www.avery.com/"                             />
-  <Vendor name="Brother"       url="http://www.brother.com/"                           />
-  <Vendor name="Canon"          url="http://www.canon.com/"                             />
-  <Vendor name="Dataline"      url="http://www.esselte-dataline.com/uk/"               />
-  <Vendor name="DECAdry"       url="http://www.decadry.com/"                           />
-  <Vendor name="Desmat"                url="www.desmat.com/"                                   />
-  <Vendor name="DataBecker"    url="http://www.databecker.de/shop/zubehoer/index.php"  />
-  <Vendor name="Dymo"          url="http://global.dymo.com/"                           />
-  <Vendor name="Endisch"       url="http://www.endihaft.de/en/"                        />
-  <Vendor name="Geha"          url="http://www.geha.de/index.php?id=1041"              />
-  <Vendor name="Great Gizmos"  url="http://www.greatgizmos.co.uk/product_ranges.html"  />
-  <Vendor name="Hema"          url="http://hema.nl/nl-nl/winkel/kantoor/papier.aspx"   />
-  <Vendor name="Hama"          url="http://www.hama.de/produkte/pc_+_notebook/buerobedarf/index.hsp"   />
-  <Vendor name="Herma"         url="http://www.herma.de/"                              />
-  <Vendor name="Igepa"         url="http://www.igepagroup.com/"                        />
-  <Vendor name="Impact"                url="http://www.impactlabel.com/"                       />
-  <Vendor name="Kingdom"       url="http://www.kingdom.com/Kingdom-Label-Center-s/20.htm"/>
-  <Vendor name="Kores"         url="http://www.kores.com/products/"                    />
-  <Vendor name="JAC"           url="http://www.tagswiss.ch/deutsch/Etiketten/"         />
-  <Vendor name="Maco"          url="http://www.maco.com/"                              />
-  <Vendor name="Memorex"       url="http://www.memorex.com/en-us/Accessories/Disc-Labeling/"/>
-  <Vendor name="Merax"         url="http://www.merax.com/"/>
-  <Vendor name="Meritline"      url="http://www.meritline.com/"                                />
-  <Vendor name="Micro Application"      url="http://www.microapp.com/"                 />
-  <Vendor name="Mayspies"       url="http://www.mayspies.com/"                         />
-  <Vendor name="Neato"          url="http://www.neato.com/"                                    />
-  <Vendor name="Netc"           url="http://netcllc.com/site/home.php"                 />
-  <Vendor name="OfficeMax"      url="http://www.officemax.com/office-supplies/paper"   />
-  <Vendor name="Online Labels"  url="http://www.onlinelabels.com/"                     />
-  <Vendor name="PEARL"          url="http://www.pearl.de/"                                     />
-  <Vendor name="Pressit"        url="http://www.pressit.com/label-applicator-systems.html"/>
-  <Vendor name="Poundland"      url="http://www.poundland.co.uk/"                      />
-  <Vendor name="Q_CONNECT"      url="http://www.q-connect.com/"                                />
-  <Vendor name="Rayfilm"       url="http://www.rayfilm.cz/en/"                         />
-  <Vendor name="Ryman"          url="http://www.ryman.co.uk/"                          />
-  <Vendor name="Sanwa"         url="http://www.sanwapaper.com/"                        />
-  <Vendor name="Sattleford"     url="http://www.pearl.de/"                                     />
-  <Vendor name="SheetLabels"    url="http://www.sheet-labels.com/"                                     />
-  <Vendor name="Sigel"          url="http://www.sigel.de/de_de/"                       />
-  <Vendor name="Southworth"     url="http://shop.southworth.com/cats.php?cat=1"                />
-  <Vendor name="Staples"        url="http://www.staples.de/burobedarf-2"               />
-  <Vendor name="Stomper"        url="http://www.cdstomper.com/"                                />
-  <Vendor name="Uline"          url="http://www.uline.com/"                            />
-  <Vendor name="Viking"         url="http://www.viking.de/"                            />
-  <Vendor name="Worldlabel"     url="http://www.worldlabel.com/"                       />
-  <Vendor name="Your Design"    url="http://www.pearl.de/"                                     />
-  <Vendor name="Zweckform"      url="http://www.avery-zweckform.com/"                  />
+  <Vendor name="Agipa"              url="http://www.apli-agipa.com/"/>
+  <Vendor name="APLI"               url="http://www.apli.com/softwareyplantillas/apli_soft.aspx"/>
+  <Vendor name="Ascom"              url="http://www.hovat.co.uk/hovat_labelling.html"/>
+  <Vendor name="Avery"              url="http://www.avery.com/"/>
+  <Vendor name="Brother"            url="http://www.brother.com/"/>
+  <Vendor name="Canon"              url="http://www.canon.com/"/>
+  <Vendor name="Cable Label Co"     url="http://www.thecablelabelco.co.uk/"/>
+  <Vendor name="Dataline"           url="http://www.esselte-dataline.com/uk/"/>
+  <Vendor name="DECAdry"            url="http://www.decadry.com/"/>
+  <Vendor name="Desmat"             url="www.desmat.com/"/>
+  <Vendor name="DataBecker"         url="http://www.databecker.de/shop/zubehoer/index.php"/>
+  <Vendor name="Dymo"               url="http://global.dymo.com/"/>
+  <Vendor name="Endisch"            url="http://www.endihaft.de/en/"/>
+  <Vendor name="Geha"               url="http://www.geha.de/index.php?id=1041"/>
+  <Vendor name="Great Gizmos"       url="http://www.greatgizmos.co.uk/product_ranges.html"/>
+  <Vendor name="Hema"               url="http://hema.nl/nl-nl/winkel/kantoor/papier.aspx"/>
+  <Vendor name="Hama"               url="http://www.hama.de/produkte/pc_+_notebook/buerobedarf/index.hsp"/>
+  <Vendor name="Herma"              url="http://www.herma.de/"/>
+  <Vendor name="Igepa"              url="http://www.igepagroup.com/"/>
+  <Vendor name="Impact"             url="http://www.impactlabel.com/"/>
+  <Vendor name="Kingdom"            url="http://www.kingdom.com/Kingdom-Label-Center-s/20.htm"/>
+  <Vendor name="Kores"              url="http://www.kores.com/products/"/>
+  <Vendor name="JAC"                url="http://www.tagswiss.ch/deutsch/Etiketten/"/>
+  <Vendor name="Maco"               url="http://www.maco.com/"/>
+  <Vendor name="Memorex"            url="http://www.memorex.com/en-us/Accessories/Disc-Labeling/"/>
+  <Vendor name="Merax"              url="http://www.merax.com/"/>
+  <Vendor name="Meritline"          url="http://www.meritline.com/"/>
+  <Vendor name="Micro Application"  url="http://www.microapp.com/"/>
+  <Vendor name="Mayspies"           url="http://www.mayspies.com/"/>
+  <Vendor name="Neato"              url="http://www.neato.com/"/>
+  <Vendor name="Netc"               url="http://netcllc.com/site/home.php"/>
+  <Vendor name="OfficeMax"          url="http://www.officemax.com/office-supplies/paper"/>
+  <Vendor name="Online Labels"      url="http://www.onlinelabels.com/"/>
+  <Vendor name="PEARL"              url="http://www.pearl.de/"/>
+  <Vendor name="Pressit"            url="http://www.pressit.com/label-applicator-systems.html"/>
+  <Vendor name="Poundland"          url="http://www.poundland.co.uk/"/>
+  <Vendor name="Q_CONNECT"          url="http://www.q-connect.com/"/>
+  <Vendor name="Rayfilm"            url="http://www.rayfilm.cz/en/"/>
+  <Vendor name="Ryman"              url="http://www.ryman.co.uk/"/>
+  <Vendor name="Sanwa"              url="http://www.sanwapaper.com/"/>
+  <Vendor name="Sattleford"         url="http://www.pearl.de/"/>
+  <Vendor name="SheetLabels"        url="http://www.sheet-labels.com/"/>
+  <Vendor name="Sigel"              url="http://www.sigel.de/de_de/"/>
+  <Vendor name="Southworth"         url="http://shop.southworth.com/cats.php?cat=1"/>
+  <Vendor name="Staples"            url="http://www.staples.de/burobedarf-2"/>
+  <Vendor name="Stomper"            url="http://www.cdstomper.com/"/>
+  <Vendor name="Uline"              url="http://www.uline.com/"/>
+  <Vendor name="Viking"             url="http://www.viking.de/"/>
+  <Vendor name="Worldlabel"         url="http://www.worldlabel.com/"/>
+  <Vendor name="Your Design"        url="http://www.pearl.de/"/>
+  <Vendor name="Zweckform"          url="http://www.avery-zweckform.com/"/>
 
 </Glabels-vendors>