From ec145fd643e21e9f640e809b44c1d45591c682d4 Mon Sep 17 00:00:00 2001
From: Jim Evins <evins@snaught.com>
Date: Sun, 9 Feb 2014 23:17:43 -0500
Subject: [PATCH] Added Canon Type J CD/DVD Tray template.

---
 AUTHORS                             |  2 ++
 templates/Makefile.am               |  1 +
 templates/canon-other-templates.xml | 23 +++++++++++++++++++++++
 templates/vendors.xml               |  1 +
 4 files changed, 27 insertions(+)
 create mode 100644 templates/canon-other-templates.xml

diff --git a/AUTHORS b/AUTHORS
index acd7006d..6e63ae7d 100644
--- 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 a0231715..59e1db45 100644
--- 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
index 00000000..c3f181fb
--- /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 f3fe152f..ea830b5c 100644
--- 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/"	         			/>
-- 
2.39.2