Added Merax template

diff --git a/AUTHORS b/AUTHORS
index 6618efd40525ee0cfd94c7529ae8fa53124cd9b7..d72db10075dfc6ff0a8d4976dbb4d6829121be18 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -162,6 +162,7 @@ particular products (I apologize if I have missed anybody):
        E. Travis
        Stefan Tauner
        Ralf Moll
+       Kevin Partin
 
 
 And many others for their many helpful suggestions and bug reports -- thanks.

diff --git a/templates/misc-other-templates.xml b/templates/misc-other-templates.xml
index 19197fabd2cfb4d6e40d057777aa3dad1d5cda4d..273b8193b8214258fc0db8cb705041583079f9af 100644 (file)
--- a/templates/misc-other-templates.xml
+++ b/templates/misc-other-templates.xml
@@ -8,6 +8,26 @@
   <!-- ******************************************************************** -->
 
 
+  <!-- ******************************************************************** -->
+  <!-- Merax US-Letter products.                                            -->
+  <!-- ******************************************************************** -->
+
+  <!-- =================================================================== -->
+  <!-- Merax CD Labels                                                     -->
+  <!-- =================================================================== -->
+  <Template brand="Merax" part="CD Labels" size="US-Letter" _description="CD/DVD Labels">
+    <Meta category="label"/>
+    <Meta category="media"/>
+    <Meta product_url="http://www.merax.com/products/Labels/cddvd.html"/>
+    <Label-cd id="0" radius="166.5" hole="58.5" waste="5">
+      <Markup-margin size="5"/>
+      <Layout nx="1" ny="1" x0="33.75" y0="45" dx="0" dy="0"/>
+      <Layout nx="1" ny="1" x0="245.25" y0="411.75" dx="0" dy="0"/>
+    </Label-cd>
+  </Template>
+
+
+
   <!-- ************************* -->
   <!--                           -->
   <!-- OfficeMax                 -->

diff --git a/templates/vendors.xml b/templates/vendors.xml
index bf3938463377795b1067896b73a15f54617d8644..ac6dfaf3d1e589f2be669d0dc52080e94510c9b0 100644 (file)
--- a/templates/vendors.xml
+++ b/templates/vendors.xml
@@ -2,25 +2,26 @@
 
 <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-usa.com/"                      />
-  <Vendor name="Dataline"       url="http://www.esselte-dataline.com/uk/"              />
-  <Vendor name="DECAdry"        url="http://www.decadry.com/"                          />
-  <Vendor name="DataBecker"     url="http://www.databecker.de/shop/zubehoer/index.php" />
-  <Vendor name="Dymo"           url="http://global.dymo.com/"                          />
-  <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="Impact"         url="http://www.impactlabel.com/"                              />
-  <Vendor name="Kingdom"        url="http://www.kingdom.com/Kingdom-Label-Center-s/20.htm"/>
-  <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="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-usa.com/"                       />
+  <Vendor name="Dataline"      url="http://www.esselte-dataline.com/uk/"               />
+  <Vendor name="DECAdry"       url="http://www.decadry.com/"                           />
+  <Vendor name="DataBecker"    url="http://www.databecker.de/shop/zubehoer/index.php"  />
+  <Vendor name="Dymo"          url="http://global.dymo.com/"                           />
+  <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="Impact"                url="http://www.impactlabel.com/"                       />
+  <Vendor name="Kingdom"       url="http://www.kingdom.com/Kingdom-Label-Center-s/20.htm"/>
+  <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="Neato"          url="http://www.neato.com/"                                    />
   <Vendor name="Netc"           url="http://netcllc.com/site/home.php"                 />