Added Canon Type J CD/DVD Tray template.

diff --git a/AUTHORS b/AUTHORS
index acd7006d63d99cbaa1dfc12a647009dd51bd4877..6e63ae7da9a8d60112642ff38ee09a02c06c1642 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -174,5 +174,7 @@ particular products (I apologize if I have missed anybody):
        Manoj Kumar Choudhary
        Gorden Tabibi
        Gebhard Moser
+       Bao
+       Gernot Hassenpflug
        
 And many others for their many helpful suggestions and bug reports -- thanks.

diff --git a/templates/Makefile.am b/templates/Makefile.am
index a0231715e8aea20cb094771a94cbe8df78725390..59e1db456cd3e3a214de1120f0ed46f700139392 100644 (file)
--- a/templates/Makefile.am
+++ b/templates/Makefile.am
@@ -16,6 +16,7 @@ templates_DATA = \
        avery-iso-templates.xml \
        avery-other-templates.xml \
        brother-other-templates.xml \
+       canon-other-templates.xml \
        databecker-iso-templates.xml \
        dataline-iso-templates.xml      \
        decadry-iso-templates.xml \

diff --git a/templates/canon-other-templates.xml b/templates/canon-other-templates.xml
new file mode 100644 (file)
index 0000000..c3f181f
--- /dev/null
+++ b/templates/canon-other-templates.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+
+<Glabels-templates>
+
+
+  <!-- =================================================================== -->
+  <!-- Type J CD/DVD Tray.                                                 -->
+  <!-- =================================================================== -->
+  <Template brand="Canon" part="Type J Tray" size="Other" width="135mm" height="295mm" _description="CD/DVD Tray">
+    <Label-cd id="0" radius="59mm" hole="11mm" waste="2mm">
+      <Markup-margin size="3.175mm"/>
+      <Layout nx="1" ny="1" x0="5.6mm" y0="58.5mm" dx="122mm" dy="122mm"/>
+    </Label-cd>
+  </Template>
+
+  <Template brand="Canon" part="MX920 CD Tray"  equiv="Type J Tray"/>
+  <Template brand="Canon" part="MG5400 CD Tray" equiv="Type J Tray"/>
+  <Template brand="Canon" part="MG6300 CD Tray" equiv="Type J Tray"/>
+  <Template brand="Canon" part="MG6500 CD Tray" equiv="Type J Tray"/>
+  <Template brand="Canon" part="iP7200 CD Tray" equiv="Type J Tray"/>
+
+
+</Glabels-templates>

diff --git a/templates/vendors.xml b/templates/vendors.xml
index f3fe152f7d1f679e4bdfc3ecedeb52c52c2aef53..ea830b5c1a9d0335879a90539f25bbc6d0e7d9ca 100644 (file)
--- a/templates/vendors.xml
+++ b/templates/vendors.xml
@@ -7,6 +7,7 @@
   <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="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/"                                   />