Added waste attribute to all CD/DVD labels.

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@292 f5e0f49d-192f-0410-a22d-a8d8700d0965

diff --git a/glabels2/data/avery-iso-templates.xml b/glabels2/data/avery-iso-templates.xml
index feb9b81d11e8d18c04be823c79621ee19da13a69..5f31764752167022668acf45d9e08e3c9e48debc 100644 (file)
--- a/glabels2/data/avery-iso-templates.xml
+++ b/glabels2/data/avery-iso-templates.xml
@@ -125,7 +125,7 @@
   <!-- Avery-Zweckform J8676A: CD/DVD Labels 2 per sheet               -->
   <!-- =============================================================== -->
   <Template name="Avery 8676" size="A4" _description="CD/DVD Labels">
-    <Label-cd id="0" radius="166.5" hole="17">
+    <Label-cd id="0" radius="166.5" hole="17" waste="5">
       <Markup-margin size="5"/>
       <Layout nx="1" ny="2" x0="130" y0="59.5" dx="0" dy="388"/>        
     </Label-cd>

diff --git a/glabels2/data/misc-iso-templates.xml b/glabels2/data/misc-iso-templates.xml
index cf807fb00132e50fd87b70d3d6f367614ac69472..a6fada35f78436932d86837ce919bde3c16f0a25 100644 (file)
--- a/glabels2/data/misc-iso-templates.xml
+++ b/glabels2/data/misc-iso-templates.xml
@@ -71,7 +71,7 @@
   <!-- Neato brand CD/DVD Labels (face only), 2 per sheet                 -->
   <!-- ===================================================================-->
   <Template name="Neato A4 CD" size="A4" _description="CD/DVD Labels (face only)">
-    <Label-cd id="0" radius="166.5" hole="58.5">
+    <Label-cd id="0" radius="166.5" hole="58.5" waste="5">
       <Markup-margin size="5"/>
       <Layout nx="1" ny="2" x0="125" y0="68.890" dx="0" dy="360"/>        
     </Label-cd>                                                      
@@ -236,7 +236,7 @@
   <!-- Data Becker CD/DVD Labels (face only), 2 per sheet                 -->
   <!-- ===================================================================-->
   <Template name="DataBecker 0335" size="A4" _description="CD/DVD Labels Standard Format (face only)">
-    <Label-cd id="0" radius="164.409" hole="58.1102">
+    <Label-cd id="0" radius="164.409" hole="58.1102" waste="5">
       <Markup-margin size="5"/>
       <Layout nx="1" ny="2" x0="133.228" y0="46.7716" dx="0" dy="419.527"/>
     </Label-cd>
@@ -247,7 +247,7 @@
   <!-- LeLabel 2001.018 CD/DVD Labels, 1 per sheet                        -->
   <!-- ===================================================================-->
   <Template name="LeLabel 2001.018" size="A4" _description="CD/DVD Labels">
-    <Label-cd id="0" radius="168.08" hole="54.69">
+    <Label-cd id="0" radius="168.08" hole="54.69" waste="5">
       <Markup-margin size="5"/>
       <Layout nx="1" ny="1" x0="128.556" y0="42.52" dx="0" dy="0"/>
     </Label-cd>

diff --git a/glabels2/data/misc-us-templates.xml b/glabels2/data/misc-us-templates.xml
index fb063767da88e8fa183415d040cdbf256c487e85..0552d884b961b1d9c496e9f6ec3834b39d4d0176 100644 (file)
--- a/glabels2/data/misc-us-templates.xml
+++ b/glabels2/data/misc-us-templates.xml
@@ -22,7 +22,7 @@
   <!-- =================================================================== -->
   <Template name="Memorex CD Labels" size="US-Letter"
         _description="CD/DVD Labels">
-    <Label-cd id="0" radius="166.5" hole="58.5">
+    <Label-cd id="0" radius="166.5" hole="58.5" waste="5">
       <Markup-margin size="5"/>
       <Layout nx="1" ny="1" x0="40.5" y0="45" dx="0" dy="0"/>
       <Layout nx="1" ny="1" x0="238.5" y0="414" dx="0" dy="0"/>
@@ -34,7 +34,7 @@
   <!-- =================================================================== -->
   <Template name="Neato USCD2lbl.NTT" size="US-Letter"
          _description="CD/DVD Labels (face only)">
-    <Label-cd id="0" radius="166.5" hole="58.5">
+    <Label-cd id="0" radius="166.5" hole="58.5" waste="5">
       <Markup-margin size="5"/>
       <Layout nx="1" ny="2" x0="139.5" y0="49.5" dx="0" dy="360"/>
     </Label-cd>
@@ -56,7 +56,7 @@
   <!-- =================================================================== -->
   <Template name="Neato HandiCD-R" size="US-Letter"
         _description="Business Card CD">
-    <Label-cd id="0" radius="108" width="171" hole="58">
+    <Label-cd id="0" radius="108" width="171" hole="58" waste="5">
       <Markup-margin size="5"/>
       <Layout nx="3" ny="3" x0="36.5" y0="54" dx="184.5" dy="234"/>
     </Label-cd>
@@ -67,7 +67,7 @@
   <!-- =================================================================== -->
   <Template name="Stomper PRO CD" size="US-Letter"
          _description="PRO CD Labels 2-up (face only)">
-    <Label-cd id="0" radius="166.5" hole="58.5">
+    <Label-cd id="0" radius="166.5" hole="58.5" waste="5">
       <Markup-margin size="5"/>
       <Layout nx="1" ny="1" x0="34" y0="43" dx="0" dy="0"/>
       <Layout nx="1" ny="1" x0="245" y0="416" dx="0" dy="0"/>
@@ -96,7 +96,7 @@
   <!-- ===================================================================-->
   <Template name="Meritline Mini-CD" size="US-Letter"
    _description="Mini-CD Labels">
-    <Label-cd id="0" radius="110.5" hole="57.5">
+    <Label-cd id="0" radius="110.5" hole="57.5" waste="5">
       <Markup-margin size="5"/>
       <Layout nx="2" ny="2" x0="48.4" y0="47.6" dx="299.5" dy="481.5"/>
       <Layout nx="1" ny="1" x0="197.3" y0="289.5" dx="0" dy="0"/>
@@ -129,7 +129,7 @@
   <!-- =================================================================== -->
   <Template name="Great Gizmos" size="US-Letter"
          _description="CD/DVD Labels (face only)">
-    <Label-cd id="0" radius="166.5" hole="58.5">
+    <Label-cd id="0" radius="166.5" hole="58.5" waste="5">
       <Markup-margin size="5"/>
       <Layout nx="1" ny="2" x0="139.5" y0="42.52" dx="0" dy="374.17"/>
     </Label-cd>
@@ -140,7 +140,7 @@
   <!-- =================================================================== -->
   <Template name="Imation-SoniX No.5112 15954" size="US-Letter"
          _description="CD/DVD Labels (Face Only)">
-    <Label-cd id="0" radius="167.8" hole="18.5">
+    <Label-cd id="0" radius="167.8" hole="18.5" waste="5">
       <Markup-margin size="5"/>
       <Layout nx="1" ny="1" x0="40.5" y0="370" dx="0" dy="0"/>
     </Label-cd>

diff --git a/glabels2/data/zweckform-iso-templates.xml b/glabels2/data/zweckform-iso-templates.xml
index b3fcf769bdb2ae50694b91273cd238a4414486eb..d64d6dd91730dcf05e885dc42402a96650f43d81 100644 (file)
--- a/glabels2/data/zweckform-iso-templates.xml
+++ b/glabels2/data/zweckform-iso-templates.xml
@@ -43,7 +43,7 @@
   <!-- Zweckform 3654: CD Labels  2 per Template                              -->
   <!-- ====================================================================-->
   <Template name="Zweckform 3654" size="A4" _description="CD/DVD Labels">
-    <Label-cd id="0" radius="165.78" hole="58.09">
+    <Label-cd id="0" radius="165.78" hole="58.09" waste="5">
       <Markup-margin size="5"/>
       <Layout nx="1" ny="2" x0="131.78" y0="58.7998" dx="0" dy="387.97"/>
     </Label-cd>
@@ -123,7 +123,7 @@
   <!-- Zweckform 6015: CD Labels, 2 per Template                           -->
   <!-- =================================================================== -->
    <Template name="Zweckform 6015" size="A4" _description="CD Labels">
-     <Label-cd id="0" radius="165.827" hole="58.110">
+     <Label-cd id="0" radius="165.827" hole="58.110" waste="5">
       <Markup-margin size="5"/>
       <Layout nx="1" ny="2" x0="131.811" y0="60.746" dx="0" dy="388.346"/>
      </Label-cd>