1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110
|
Author:
Description: Added support for gif89, png, ppm*, jfif, and xfig images.
Thanks to Paolo <oopla@users.sf.net>. For more info see #373287
and bug #405237.
Index: hylafax-6.0.6/libhylafax/typerules
===================================================================
--- hylafax-6.0.6.orig/libhylafax/typerules 2012-06-06 02:58:38.000000000 +0200
+++ hylafax-6.0.6/libhylafax/typerules 2012-06-17 14:17:38.437587630 +0200
@@ -98,8 +98,7 @@
0 short 0x4d4d tiff
0 short 0x4949 tiff
#
-0 short 000732 tiff %F/sgi2fax -%f -o %o -v %V\
- -s %s %i
+0 short 000732 error Cannot convert from SGI on Linux
0 short 017436 error packed data support not configured
0 short 017635 error compressed data support not configured
0 short 0x0506 ps showcase -p -f %i
@@ -107,7 +106,11 @@
0 short 0xf702 ps dvips -q -o %o %i
0 string GIF tiff
>3 string 87a tiff gif2tiff -%f -v %V %i %o
->3 string 89a error GIF (version 89a) support not configured
+>3 string 89a ps gif2ps <%i >%o
+0 byte 0x89 ps
+>1 string PNG ps pngtopnm < %i| ppmtopgm | \
+ pnmscale -xysize %w %l | \
+ pnmtops -dpi %R -equalpixels >%o
0 long 0x59a66a95 tiff ras2tiff -%f -v %V %i %o
0 short 0x1b45 pcl
0 short 0x1b25 pcl
@@ -137,25 +140,40 @@
#
0 string begin error uuencoded file support not configured
0 string xbtoa error btoa'd file support not configured
-0 string P1 error PBM file support not configured
-0 string P2 error PGM file support not configured
-0 string P3 error PPM file support not configured
-0 string P4 error PBM "rawbits" file support not configured
-0 string P5 error PGM "rawbits" file support not configured
-0 string P6 error PPM "rawbits" file support not configured
+0 string P1 ps ppmtopgm < %i | \
+ pnmscale -xysize %w %l | \
+ pnmtops -dpi %R -equalpixels > %o
+0 string P2 ps ppmtopgm < %i | \
+ pnmscale -xysize %w %l | \
+ pnmtops -dpi %R -equalpixels > %o
+0 string P3 ps ppmtopgm < %i | \
+ pnmscale -xysize %w %l | \
+ pnmtops -dpi %R -equalpixels > %o
+0 string P4 ps ppmtopgm < %i | \
+ pnmscale -xysize %w %l | \
+ pnmtops -dpi %R -equalpixels > %o
+0 string P5 ps ppmtopgm < %i | \
+ pnmscale -xysize %w %l | \
+ pnmtops -dpi %R -equalpixels > %o
+0 string P5 ps ppmtopgm < %i | \
+ pnmscale -xysize %w %l | \
+ pnmtops -dpi %R -equalpixels > %o
+0 string P6 ps ppmtopgm < %i | \
+ pnmscale -xysize %w %l | \
+ pnmtops -dpi %R -equalpixels > %o
#
0 string WNGZWZSS error Wingz spreadsheet support not configured
0 string #Inventor V error IRIS Inventor file support not configured
>15 string binary error binary IRIS Inventor file support not configured
->15 string ascii ps %F/textfmt -B -f Courier-Bold\
+>15 string ascii ps textfmt -B -f Courier-Bold\
-Ml=0.4in -p 11 -s %s >%o <%i
#
-0 string \x89PNG error PNG support not configured
0 short 0xffd8 error filetype conversion support not configured
->6 string JFIF error JPEG support not configured
+>6 string JFIF ps jpegtopnm < %i| ppmtopgm | \
+ pnmscale -xysize %w %l | \
+ pnmtops -dpi %R -equalpixels > %o
0 short 0xd8ff error filetype conversion support not configured
->6 string JFIF error JPEG support not configured
-0 string #FIG error FIG support not configured
+0 string #FIG ps fig2dev -L ps -p x -M -N -z %s < %i > %o
#
# Japanization (should help other iso-2022 variants too)
@@ -167,8 +185,8 @@
#
# This causes anything else with ascii-only data to be treated as text.
#
-0 ascii x ps %F/textfmt -B -f Courier-Bold\
- -Ml=0.4in -p 11 -s %s >%o <%i
+#0 ascii x ps textfmt -B -f Courier-Bold\
+# -Ml=0.4in -p 11 -s %s >%o <%i
#
# Use enscript, instead of HylaFAX textfmt, for converting text into ps.
@@ -180,11 +198,11 @@
# assigned to the %s macro. Use:
# '-M Letter' (not 'letter', not 'LETTER') for US letter
# '-M A4' (not 'a4') for ISO A4
-#0 ascii x ps enscript -B -f Courier-Bold@11 \
-# --margins=24::60:36 -s 2.2 \
-# -q -M A4 -p %o %i
+0 ascii x ps enscript -B -f Courier-Bold@11 \
+ --margins=24::60:36 -s 2.2 \
+ -q -M A4 -p %o %i
# Support 7-bit text which would otherwise be seen as binary.
#
-#0 byte x ps %F/textfmt -B -f Courier-Bold \
+#0 byte x ps textfmt -B -f Courier-Bold \
# -p 11 -s %s >%o <%i
|