Merge lp:~philpem/ubuntu/trusty/ptouch-driver/fix-esc-i-a-for-pt-series into lp:ubuntu/trusty/ptouch-driver

[Phil Pemberton]

The rastertoptch filter includes a patch which sends the "ESC i A" (enable cutter) command to any printer which uses this filter. Sadly, this command is only supported on the QL series, so this patch has the effect of breaking printing on most of Brother's P-Touch line (the entire "PT" series).

This branch includes a patch which modifies the code to check the printer command language which is in use. If it is anything other than "ULP" (the QL-series command set), the aforementioned command will not be sent.

[Till Kamppeter (till-kamppeter)]

Patch itself is OK (same as attached to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=740789), I suggest to add "(Closes: #740789, LP: #1287971)" to debian/changelog to auto-close the bug reports.

review: Approve

[Sebastien Bacher (seb128)]

https://launchpad.net/ubuntu/trusty/+source/ptouch-driver/1.3-7ubuntu1

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-12 21:32:52 +0000
+++ debian/changelog	2014-03-04 23:18:29 +0000
@@ -1,3 +1,10 @@
+ptouch-driver (1.3-7ubuntu1) UNRELEASED; urgency=low
+
+  * Add send-esc-i-A-for-QL-only.patch which prevents rastertoptch from
+    sending the "ESC i A" command to printers which do not support it.
+
+ -- Philip Pemberton <[e-mail]>  Tue, 04 Mar 2014 23:04:13 +0000
+
 ptouch-driver (1.3-7) unstable; urgency=low
 
   * Rebuild against pyppd >= 1.0.1

=== added file 'debian/patches/send-esc-i-A-for-QL-only.patch'
--- debian/patches/send-esc-i-A-for-QL-only.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/send-esc-i-A-for-QL-only.patch	2014-03-04 23:18:29 +0000
@@ -0,0 +1,50 @@
+Index: ptouch-driver/rastertoptch.c
+===================================================================
+--- ptouch-driver.orig/rastertoptch.c	2014-03-04 22:51:59.000000000 +0000
++++ ptouch-driver/rastertoptch.c	2014-03-04 22:59:53.000000000 +0000
+@@ -685,7 +685,8 @@
+ inline void
+ emit_feed_cut_mirror (bool do_feed, unsigned feed,
+                       bool do_cut,
+-                      bool do_mirror) {
++                      bool do_mirror,
++                      xfer_t xfer_mode) {
+   /* Determine feed nibble */
+   unsigned feed_nibble;
+   if (do_feed) {
+@@ -698,7 +699,14 @@
+   /* Determine mirror print bit*/
+   unsigned char mirror_bit = do_mirror ? 0x80 : 0x00;
+   /* Combine & emit printer command code */
+-  putchar (ESC); putchar ('i'); putchar ('A'); putchar ((char) (do_cut ? 0x01 : 0x00));
++  if (xfer_mode == ULP) {
++    /* ESC i A is Enable Cutter -- used for QL-560 only, according to
++     * <http://www.undocprint.org/formats/page_description_languages/brother_p-touch>
++     * The QL-560 (actually the whole QL series) uses ULP mode, so we check for that.
++     * The PT2450DX uses RLE and throw an INTERFACE ERROR if it sees this command.
++     */
++    putchar (ESC); putchar ('i'); putchar ('A'); putchar ((char) (do_cut ? 0x01 : 0x00));
++  }
+   putchar (ESC); putchar ('i'); putchar ('M');
+   putchar ((char) (feed & 0x1f) | auto_cut_bit | mirror_bit);
+ }
+@@ -807,7 +815,8 @@
+     /* We only know how to feed after each page */
+     emit_feed_cut_mirror (perform_feed == CUPS_ADVANCE_PAGE, feed,
+                           cut_media == CUPS_CUT_PAGE,
+-                          mirror == CUPS_TRUE);
++                          mirror == CUPS_TRUE,
++                          job_options->pixel_xfer == ULP);
+   /* Set media and quality if label preamble is requested */
+   unsigned page_size_y = new_page_options->page_size [1];
+   unsigned image_height_px = lrint (page_size_y * vres / 72.0);
+@@ -1527,7 +1536,8 @@
+            perform_feed == CUPS_ADVANCE_JOB,
+            new_page_options->feed,
+            cut_media == CUPS_CUT_PAGE || cut_media == CUPS_CUT_JOB,
+-           new_page_options->mirror == CUPS_TRUE);
++           new_page_options->mirror == CUPS_TRUE,
++           job_options->pixel_xfer);
+         /* Emit eject marker */
+         putchar (PTC_EJECT);
+       }

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-09-13 10:00:00 +0000
+++ debian/patches/series	2014-03-04 23:18:29 +0000
@@ -1,2 +1,3 @@
 foomatic-data-fixes.patch
 send-esc-i-A.patch
+send-esc-i-A-for-QL-only.patch