Added simple envelope support

Added several envelope sizes to page-sizes.xml.  Also reversed the rotation
direction when printing rotated labels to better match the orientation of
envelope feeders.

diff --git a/src/print.c b/src/print.c
index 2006e0eee64954f41109ad3c9a4355b6b18a69d1..7707eb3acc189c33d1bf2101646ef5f144cce17c 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -509,15 +509,15 @@ print_label (PrintInfo     *pi,
        /* of the current label */
        cairo_translate (pi->cr, x, y);
 
-       clip_to_outline (pi, label);
+       //clip_to_outline (pi, label);
 
        cairo_save (pi->cr);
 
         /* Special transformations. */
        if (label->rotate_flag) {
                gl_debug (DEBUG_PRINT, "Rotate flag set");
-               cairo_rotate (pi->cr, -M_PI/2.0);
-               cairo_translate (pi->cr, -width, 0.0);
+               cairo_rotate (pi->cr, M_PI/2.0);
+               cairo_translate (pi->cr, 0.0, -height);
        }
        if ( reverse_flag ) {
                cairo_translate (pi->cr, width, 0.0);

diff --git a/templates/paper-sizes.xml b/templates/paper-sizes.xml
index b02102107a28b2b4cf7d55e7501e40080202ddf7..2d5ac68f0d6b9aec5ea070d1a268ad3512a6d572 100644 (file)
--- a/templates/paper-sizes.xml
+++ b/templates/paper-sizes.xml
@@ -31,11 +31,11 @@
 <Glabels-paper-sizes>
 
   <!-- Most popular (at top of list) -->
-  <Paper-size id="US-Letter"    _name="US Letter"    pwg_size="na_letter"    width="8.5in" height="11in"/>
   <Paper-size id="A4"           _name="A4"           pwg_size="iso_a4"       width="210mm" height="297mm"/>
+  <Paper-size id="US-Letter"    _name="US Letter"    pwg_size="na_letter"    width="8.5in" height="11in"/>
 
   <!-- Other US paper sizes -->
-  <Paper-size id="US-Legal"     _name="US Legal"     pwg_size="na_legal"     width="8.5in" height="14in"/>
+  <Paper-size id="US-Legal"     _name="US Legal"     pwg_size="na_legal"     width="8.5in"  height="14in"/>
   <Paper-size id="US-Executive" _name="US Executive" pwg_size="na_executive" width="7.25in" height="10.5in"/>
 
   <!-- Other ISO A series sizes -->
@@ -63,4 +63,11 @@
   <Paper-size id="B9"           _name="B9"           pwg_size="iso_b9"       width="44mm"   height="62mm"/>
   <Paper-size id="B10"          _name="B10"          pwg_size="iso_b10"      width="31mm"   height="44mm"/>
 
+  <!-- Envelopes -->
+  <Paper-size id="number10"     _name="#10 Envelope"     pwg_size="na_number-10" width="4.125in" height="9.5in"/>
+  <Paper-size id="monarch"      _name="Monarch Envelope" pwg_size="na_monarch"   width="3.875in" height="7.5in"/>
+  <Paper-size id="c5"           _name="C5"               pwg_size="iso_c5"       width="162mm"   height="229mm"/>
+  <Paper-size id="c6"           _name="C6"               pwg_size="iso_c6"       width="114mm"   height="162mm"/>
+  <Paper-size id="dl"           _name="DL"               pwg_size="iso_dl"       width="110mm"   height="220mm"/>
+
 </Glabels-paper-sizes>