selphy_print/misc-patches/multicut-5.2.11dev.diff

Index: src/main/print-olympus.c
===================================================================
RCS file: /cvsroot/gimp-print/print/src/main/print-olympus.c,v
retrieving revision 1.192
diff -u -r1.192 print-olympus.c
--- src/main/print-olympus.c	22 Jun 2015 23:02:43 -0000	1.192
+++ src/main/print-olympus.c	22 Jun 2015 23:04:08 -0000
@@ -46,6 +46,7 @@
    it. Be warned that you will also need a patch to papers.xml to define
    the additional paper types. */
 /* #define MULTICUT */
+#define MULTICUT
 
 #define DYESUB_FEATURE_NONE		 0x00000000
 #define DYESUB_FEATURE_FULL_WIDTH	 0x00000001
Index: src/xml/papers.xml
===================================================================
RCS file: /cvsroot/gimp-print/print/src/xml/papers.xml,v
retrieving revision 1.20
diff -u -r1.20 papers.xml
--- src/xml/papers.xml	22 Jun 2015 23:02:44 -0000	1.20
+++ src/xml/papers.xml	22 Jun 2015 23:04:08 -000
@@ -146,6 +146,12 @@
       <height value="432"/>
       <unit value="english"/>
     </paper>
+    <paper name="2x6_x2">
+      <description translate="value" value="2x6*2"/>
+      <width value="288"/>
+      <height value="432"/>
+      <unit value="english"/>
+    </paper>
     <paper name="w288h432J">
       <description translate="value" value="KG"/>
       <width value="288"/>
@@ -196,6 +202,12 @@
       <height value="504"/>
       <unit value="english-extended"/>
     </paper>
+    <paper name="B7_x2">
+      <description translate="value" value="3.5x5*2"/>
+      <width value="360"/>
+      <height value="504"/>
+      <unit value="english-extended"/>
+    </paper>
     <paper name="w360h504J">
       <description translate="value" value="2L"/>
       <width value="360"/>
@@ -220,6 +232,30 @@
       <height value="576"/>
       <unit value="english-extended"/>
     </paper>
+    <paper name="4x6_x2">
+      <description translate="value" value="4x6*2"/>
+      <width value="432"/>
+      <height value="576"/>
+      <unit value="english-extended"/>
+    </paper>
+    <paper name="2x6_x4">
+      <description translate="value" value="2x6*4"/>
+      <width value="432"/>
+      <height value="576"/>
+      <unit value="english-extended"/>
+    </paper>
+    <paper name="6x6_2x6">
+      <description translate="value" value="6x6+2x6"/>
+      <width value="432"/>
+      <height value="576"/>
+      <unit value="english-extended"/>
+    </paper>    
+    <paper name="4x6_2x6">
+      <description translate="value" value="4x6+2x6"/>
+      <width value="432"/>
+      <height value="432"/>
+      <unit value="english-extended"/>
+    </paper>
     <paper name="w432h612">
       <description translate="value" value="6x8.5"/>
       <width value="432"/>
@@ -232,12 +268,48 @@
       <height value="648"/>
       <unit value="english-extended"/>
     </paper>
+    <paper name="w324h432_x2">
+      <description translate="value" value="4.5x6*2"/>
+      <width value="432"/>
+      <height value="648"/>
+      <unit value="english"/>
+    </paper>
+    <paper name="8x4_x2">
+      <description translate="value" value="8x4*2"/>
+      <width value="576"/>
+      <height value="576"/>
+      <unit value="english-extended"/>
+    </paper>
     <paper name="c8x10">
       <description translate="value" value="8x10"/>
       <width value="576"/>
       <height value="720"/>
       <unit value="english-extended"/>
     </paper>
+    <paper name="8x5_x2">
+      <description translate="value" value="8x5*2"/>
+      <width value="576"/>
+      <height value="720"/>
+      <unit value="english-extended"/>
+    </paper>
+    <paper name="8x6_8x4">
+      <description translate="value" value="8x6+8x4"/>
+      <width value="576"/>
+      <height value="720"/>
+      <unit value="english-extended"/>
+    </paper>
+    <paper name="8x5_8x4">
+      <description translate="value" value="8x6+8x5"/>
+      <width value="576"/>
+      <height value="792"/>
+      <unit value="english-extended"/>
+    </paper>
+    <paper name="8x6_8x5">
+      <description translate="value" value="8x5+8x4"/>
+      <width value="576"/>
+      <height value="648"/>
+      <unit value="english-extended"/>
+    </paper>
     <paper name="c8x10J">
       <description translate="value" value="Rokukire"/>
       <comment value="Same size as 8x10"/>
@@ -293,6 +365,24 @@
       <height value="864"/>
       <unit value="english-extended"/>
     </paper>
+    <paper name="8x6_x2">
+      <description translate="value" value="8x6*2"/>
+      <width value="576"/>
+      <height value="864"/>
+      <unit value="english-extended"/>
+    </paper>
+    <paper name="8x8_8x4">
+      <description translate="value" value="8x8+8x4"/>
+      <width value="576"/>
+      <height value="864"/>
+      <unit value="english-extended"/>
+    </paper>
+    <paper name="8x4_x3">
+      <description translate="value" value="8x4*3"/>
+      <width value="576"/>
+      <height value="864"/>
+      <unit value="english-extended"/>
+    </paper>
     <paper name="w612h864">
       <description translate="value" value="8.5x12"/>
       <comment value="8.5in x 12in"/>