LogoopenSUSE Build Service > Projects
Sign Up | Log In

View File enscript-1.6.4.dif of Package enscript (Project openSUSE:11.4)

--- .pkgextract
+++ .pkgextract	2005-02-01 13:36:36.000000000 +0100
@@ -0,0 +1,3 @@
+patch -p1 -s --suffix=.CAN-2004-1184 < ../enscript-1.6.4-CAN-2004-1184.patch
+patch -p1 -s --suffix=.CAN-2004-1185 < ../enscript-1.6.4-CAN-2004-1185.patch
+patch -p1 -s --suffix=.CAN-2004-1186 < ../enscript-1.6.4-CAN-2004-1186.patch
--- 885913.txt
+++ 885913.txt	2005-02-01 13:36:36.000000000 +0100
@@ -0,0 +1,291 @@
+		ISO-8859-13 (ISO Latin7) character set
+
+octal	hex	PostScript	HTML entity	character
+----------------------------------------------------------------------
+000	0x00	non-printable
+001	0x01	non-printable
+002	0x02	non-printable
+003	0x03	non-printable
+004	0x04	non-printable
+005	0x05	non-printable
+006	0x06	non-printable
+007	0x07	non-printable
+
+010	0x08	non-printable
+011	0x09	non-printable
+012	0x0a	non-printable
+013	0x0b	non-printable
+014	0x0c	non-printable
+015	0x0d	non-printable
+016	0x0e	non-printable
+017	0x0f	non-printable
+
+020	0x10	non-printable
+021	0x11	non-printable
+022	0x12	non-printable
+023	0x13	non-printable
+024	0x14	non-printable
+025	0x15	non-printable
+026	0x16	non-printable
+027	0x17	non-printable
+
+030	0x18	non-printable
+031	0x19	non-printable
+032	0x1a	non-printable
+033	0x1b	non-printable
+034	0x1c	non-printable
+035	0x1d	non-printable
+036	0x1e	non-printable
+037	0x1f	non-printable
+
+040	0x20	/space
+041	0x21	/exclam
+042	0x22	/quotedbl
+043	0x23	/numbersign
+044	0x24	/dollar
+045	0x25	/percent
+046	0x26	/ampersand
+047	0x27	/quoteright
+
+050	0x28	/parenleft
+051	0x29	/parenright
+052	0x2a	/asterisk
+053	0x2b	/plus
+054	0x2c	/comma
+055	0x2d	/minus
+056	0x2e	/period
+057	0x2f	/slash
+
+060	0x30	/zero
+061	0x31	/one
+062	0x32	/two
+063	0x33	/three
+064	0x34	/four
+065	0x35	/five
+066	0x36	/six
+067	0x37	/seven
+
+070	0x38	/eight
+071	0x39	/nine
+072	0x3a	/colon
+073	0x3b	/semicolon
+074	0x3c	/less
+075	0x3d	/equal
+076	0x3e	/greater
+077	0x3f	/question
+
+0100	0x40	/at
+0101	0x41	/A
+0102	0x42	/B
+0103	0x43	/C
+0104	0x44	/D
+0105	0x45	/E
+0106	0x46	/F
+0107	0x47	/G
+
+0110	0x48	/H
+0111	0x49	/I
+0112	0x4a	/J
+0113	0x4b	/K
+0114	0x4c	/L
+0115	0x4d	/M
+0116	0x4e	/N
+0117	0x4f	/O
+
+0120	0x50	/P
+0121	0x51	/Q
+0122	0x52	/R
+0123	0x53	/S
+0124	0x54	/T
+0125	0x55	/U
+0126	0x56	/V
+0127	0x57	/W
+
+0130	0x58	/X
+0131	0x59	/Y
+0132	0x5a	/Z
+0133	0x5b	/bracketleft
+0134	0x5c	/backslash
+0135	0x5d	/bracketright
+0136	0x5e	/asciicircum
+0137	0x5f	/underscore
+
+0140	0x60	/quoteleft
+0141	0x61	/a
+0142	0x62	/b
+0143	0x63	/c
+0144	0x64	/d
+0145	0x65	/e
+0146	0x66	/f
+0147	0x67	/g
+
+0150	0x68	/h
+0151	0x69	/i
+0152	0x6a	/j
+0153	0x6b	/k
+0154	0x6c	/l
+0155	0x6d	/m
+0156	0x6e	/n
+0157	0x6f	/o
+
+0160	0x70	/p
+0161	0x71	/q
+0162	0x72	/r
+0163	0x73	/s
+0164	0x74	/t
+0165	0x75	/u
+0166	0x76	/v
+0167	0x77	/w
+
+0170	0x78	/x
+0171	0x79	/y
+0172	0x7a	/z
+0173	0x7b	/braceleft
+0174	0x7c	/bar
+0175	0x7d	/braceright
+0176	0x7e	/asciitilde
+0177	0x7f	non-printable
+
+0200	0x80	non-printable
+0201	0x81	non-printable
+0202	0x82	non-printable
+0203	0x83	non-printable
+0204	0x84	non-printable
+0205	0x85	non-printable
+0206	0x86	non-printable
+0207	0x87	non-printable
+
+0210	0x88	non-printable
+0211	0x89	non-printable
+0212	0x8a	non-printable
+0213	0x8b	non-printable
+0214	0x8c	non-printable
+0215	0x8d	non-printable
+0216	0x8e	non-printable
+0217	0x8f	non-printable
+
+0220	0x90	non-printable
+0221	0x91	non-printable
+0222	0x92	non-printable
+0223	0x93	non-printable
+0224	0x94	non-printable
+0225	0x95	non-printable
+0226	0x96	non-printable
+0227	0x97	non-printable
+
+0230	0x98	non-printable
+0231	0x99	non-printable
+0232	0x9a	non-printable
+0233	0x9b	non-printable
+0234	0x9c	non-printable
+0235	0x9d	non-printable
+0236	0x9e	non-printable
+0237	0x9f	non-printable
+
+0240	0xa0	/space
+0241	0xa1	/quotedblright
+0242	0xa2	/cent
+0243	0xa3	/sterling
+0244	0xa4	/currency
+0245	0xa5	/quotedblbase
+0246	0xa6	/brokenbar
+0247	0xa7	/section
+
+0250	0xa8	/Oslash
+0251	0xa9	/copyright
+0252	0xaa	/Rcedilla
+0253	0xab	/guillemotleft
+0254	0xac	/logicalnot
+0255	0xad	/hyphen
+0256	0xae	/registered
+0257	0xaf	/AE
+
+0260	0xb0	/degree
+0261	0xb1	/plusminus
+0262	0xb2	/twosuperior
+0263	0xb3	/threesuperior
+0264	0xb4	/quotedblleft
+0265	0xb5	/mu
+0266	0xb6	/paragraph
+0267	0xb7	/bullet
+
+0270	0xb8	/oslash
+0271	0xb9	/onesuperior
+0272	0xba	/rcedilla
+0273	0xbb	/guillemotright
+0274	0xbc	/onequarter
+0275	0xbd	/onehalf
+0276	0xbe	/threequarters
+0277	0xbf	/ae
+
+0300	0xc0	/Aogonek
+0301	0xc1	/Iogonek
+0302	0xc2	/Amacron
+0303	0xc3	/Cacute
+0304	0xc4	/Adieresis
+0305	0xc5	/Aring
+0306	0xc6	/Eogonek
+0307	0xc7	/Emacron
+
+0310	0xc8	/Ccaron
+0311	0xc9	/Eacute
+0312	0xca	/Zacute
+0313	0xcb	/Edotaccent
+0314	0xcc	/Gcedilla
+0315	0xcd	/Kcedilla
+0316	0xce	/Imacron
+0317	0xcf	/Lcedilla
+
+0320	0xd0	/Scaron
+0321	0xd1	/Nacute
+0322	0xd2	/Ncedilla
+0323	0xd3	/Oacute
+0324	0xd4	/Omacron
+0325	0xd5	/Otilde
+0326	0xd6	/Odieresis
+0327	0xd7	/multiply
+
+0330	0xd8	/Uogonek
+0331	0xd9	/Lslash
+0332	0xda	/Sacute
+0333	0xdb	/Umacron
+0334	0xdc	/Udieresis
+0335	0xdd	/Zdotaccent
+0336	0xde	/Zcaron
+0337	0xdf	/germandbls
+
+0340	0xe0	/aogonek
+0341	0xe1	/iogonek
+0342	0xe2	/amacron
+0343	0xe3	/cacute
+0344	0xe4	/adieresis
+0345	0xe5	/aring
+0346	0xe6	/eogonek
+0347	0xe7	/emacron
+
+0350	0xe8	/ccaron
+0351	0xe9	/eacute
+0352	0xea	/zacute
+0353	0xeb	/edotaccent
+0354	0xec	/gcedilla
+0355	0xed	/kcedilla
+0356	0xee	/imacron
+0357	0xef	/lcedilla
+
+0360	0xf0	/scaron
+0361	0xf1	/nacute
+0362	0xf2	/ncedilla
+0363	0xf3	/oacute
+0364	0xf4	/omacron
+0365	0xf5	/otilde
+0366	0xf6	/odieresis
+0367	0xf7	/divide
+
+0370	0xf8	/uogonek
+0371	0xf9	/lslash
+0372	0xfa	/sacute
+0373	0xfb	/umacron
+0374	0xfc	/udieresis
+0375	0xfd	/zdotaccent
+0376	0xfe	/zcaron
+0377	0xff	/quoteright
--- 885915.txt
+++ 885915.txt	2005-02-01 13:36:36.000000000 +0100
@@ -0,0 +1,291 @@
+		ISO-8859-15 (ISO Latin9) character set
+
+octal	hex	PostScript	HTML entity	character
+----------------------------------------------------------------------
+000	0x00	non-printable
+001	0x01	non-printable
+002	0x02	non-printable
+003	0x03	non-printable
+004	0x04	non-printable
+005	0x05	non-printable
+006	0x06	non-printable
+007	0x07	non-printable
+
+010	0x08	non-printable
+011	0x09	non-printable
+012	0x0a	non-printable
+013	0x0b	non-printable
+014	0x0c	non-printable
+015	0x0d	non-printable
+016	0x0e	non-printable
+017	0x0f	non-printable
+
+020	0x10	non-printable
+021	0x11	non-printable
+022	0x12	non-printable
+023	0x13	non-printable
+024	0x14	non-printable
+025	0x15	non-printable
+026	0x16	non-printable
+027	0x17	non-printable
+
+030	0x18	non-printable
+031	0x19	non-printable
+032	0x1a	non-printable
+033	0x1b	non-printable
+034	0x1c	non-printable
+035	0x1d	non-printable
+036	0x1e	non-printable
+037	0x1f	non-printable
+
+040	0x20	/space
+041	0x21	/exclam
+042	0x22	/quotedbl
+043	0x23	/numbersign
+044	0x24	/dollar
+045	0x25	/percent
+046	0x26	/ampersand
+047	0x27	/quoteright
+
+050	0x28	/parenleft
+051	0x29	/parenright
+052	0x2a	/asterisk
+053	0x2b	/plus
+054	0x2c	/comma
+055	0x2d	/minus
+056	0x2e	/period
+057	0x2f	/slash
+
+060	0x30	/zero
+061	0x31	/one
+062	0x32	/two
+063	0x33	/three
+064	0x34	/four
+065	0x35	/five
+066	0x36	/six
+067	0x37	/seven
+
+070	0x38	/eight
+071	0x39	/nine
+072	0x3a	/colon
+073	0x3b	/semicolon
+074	0x3c	/less
+075	0x3d	/equal
+076	0x3e	/greater
+077	0x3f	/question
+
+0100	0x40	/at
+0101	0x41	/A
+0102	0x42	/B
+0103	0x43	/C
+0104	0x44	/D
+0105	0x45	/E
+0106	0x46	/F
+0107	0x47	/G
+
+0110	0x48	/H
+0111	0x49	/I
+0112	0x4a	/J
+0113	0x4b	/K
+0114	0x4c	/L
+0115	0x4d	/M
+0116	0x4e	/N
+0117	0x4f	/O
+
+0120	0x50	/P
+0121	0x51	/Q
+0122	0x52	/R
+0123	0x53	/S
+0124	0x54	/T
+0125	0x55	/U
+0126	0x56	/V
+0127	0x57	/W
+
+0130	0x58	/X
+0131	0x59	/Y
+0132	0x5a	/Z
+0133	0x5b	/bracketleft
+0134	0x5c	/backslash
+0135	0x5d	/bracketright
+0136	0x5e	/asciicircum
+0137	0x5f	/underscore
+
+0140	0x60	/quoteleft
+0141	0x61	/a
+0142	0x62	/b
+0143	0x63	/c
+0144	0x64	/d
+0145	0x65	/e
+0146	0x66	/f
+0147	0x67	/g
+
+0150	0x68	/h
+0151	0x69	/i
+0152	0x6a	/j
+0153	0x6b	/k
+0154	0x6c	/l
+0155	0x6d	/m
+0156	0x6e	/n
+0157	0x6f	/o
+
+0160	0x70	/p
+0161	0x71	/q
+0162	0x72	/r
+0163	0x73	/s
+0164	0x74	/t
+0165	0x75	/u
+0166	0x76	/v
+0167	0x77	/w
+
+0170	0x78	/x
+0171	0x79	/y
+0172	0x7a	/z
+0173	0x7b	/braceleft
+0174	0x7c	/bar
+0175	0x7d	/braceright
+0176	0x7e	/asciitilde
+0177	0x7f	non-printable
+
+0200	0x80	non-printable
+0201	0x81	non-printable
+0202	0x82	non-printable
+0203	0x83	non-printable
+0204	0x84	non-printable
+0205	0x85	non-printable
+0206	0x86	non-printable
+0207	0x87	non-printable
+
+0210	0x88	non-printable
+0211	0x89	non-printable
+0212	0x8a	non-printable
+0213	0x8b	non-printable
+0214	0x8c	non-printable
+0215	0x8d	non-printable
+0216	0x8e	non-printable
+0217	0x8f	non-printable
+
+0220	0x90	non-printable
+0221	0x91	non-printable
+0222	0x92	non-printable
+0223	0x93	non-printable
+0224	0x94	non-printable
+0225	0x95	non-printable
+0226	0x96	non-printable
+0227	0x97	non-printable
+
+0230	0x98	non-printable
+0231	0x99	non-printable
+0232	0x9a	non-printable
+0233	0x9b	non-printable
+0234	0x9c	non-printable
+0235	0x9d	non-printable
+0236	0x9e	non-printable
+0237	0x9f	non-printable
+
+0240	0xa0	/space
+0241	0xa1	/exclamdown
+0242	0xa2	/cent
+0243	0xa3	/sterling
+0244	0xa4	/Euro
+0245	0xa5	/yen
+0246	0xa6	/Scaron
+0247	0xa7	/section
+
+0250	0xa8	/scaron
+0251	0xa9	/copyright
+0252	0xaa	/ordfeminine
+0253	0xab	/guillemotleft
+0254	0xac	/logicalnot
+0255	0xad	/hyphen
+0256	0xae	/registered
+0257	0xaf	/macron
+
+0260	0xb0	/degree
+0261	0xb1	/plusminus
+0262	0xb2	/twosuperior
+0263	0xb3	/threesuperior
+0264	0xb4	/Zcaron
+0265	0xb5	/mu
+0266	0xb6	/paragraph
+0267	0xb7	/bullet
+
+0270	0xb8	/zcaron
+0271	0xb9	/onesuperior
+0272	0xba	/ordmasculine
+0273	0xbb	/guillemotright
+0274	0xbc	/OE
+0275	0xbd	/oe
+0276	0xbe	/Ydieresis
+0277	0xbf	/questiondown
+
+0300	0xc0	/Agrave
+0301	0xc1	/Aacute
+0302	0xc2	/Acircumflex
+0303	0xc3	/Atilde
+0304	0xc4	/Adieresis
+0305	0xc5	/Aring
+0306	0xc6	/AE
+0307	0xc7	/Ccedilla
+
+0310	0xc8	/Egrave
+0311	0xc9	/Eacute
+0312	0xca	/Ecircumflex
+0313	0xcb	/Edieresis
+0314	0xcc	/Igrave
+0315	0xcd	/Iacute
+0316	0xce	/Icircumflex
+0317	0xcf	/Idieresis
+
+0320	0xd0	/Eth
+0321	0xd1	/Ntilde
+0322	0xd2	/Ograve
+0323	0xd3	/Oacute
+0324	0xd4	/Ocircumflex
+0325	0xd5	/Otilde
+0326	0xd6	/Odieresis
+0327	0xd7	/multiply
+
+0330	0xd8	/Oslash
+0331	0xd9	/Ugrave
+0332	0xda	/Uacute
+0333	0xdb	/Ucircumflex
+0334	0xdc	/Udieresis
+0335	0xdd	/Yacute
+0336	0xde	/Thorn
+0337	0xdf	/germandbls
+
+0340	0xe0	/agrave
+0341	0xe1	/aacute
+0342	0xe2	/acircumflex
+0343	0xe3	/atilde
+0344	0xe4	/adieresis
+0345	0xe5	/aring
+0346	0xe6	/ae
+0347	0xe7	/ccedilla
+
+0350	0xe8	/egrave
+0351	0xe9	/eacute
+0352	0xea	/ecircumflex
+0353	0xeb	/edieresis
+0354	0xec	/igrave
+0355	0xed	/iacute
+0356	0xee	/icircumflex
+0357	0xef	/idieresis
+
+0360	0xf0	/eth
+0361	0xf1	/ntilde
+0362	0xf2	/ograve
+0363	0xf3	/oacute
+0364	0xf4	/ocircumflex
+0365	0xf5	/otilde
+0366	0xf6	/odieresis
+0367	0xf7	/divide
+
+0370	0xf8	/oslash
+0371	0xf9	/ugrave
+0372	0xfa	/uacute
+0373	0xfb	/ucircumflex
+0374	0xfc	/udieresis
+0375	0xfd	/yacute
+0376	0xfe	/thorn
+0377	0xff	/ydieresis
--- configure.in
+++ configure.in	2005-02-01 13:36:36.000000000 +0100
@@ -41,7 +41,20 @@ AC_HAVE_HEADERS(sys/types.h sys/stat.h)
 
 dnl Check some functions.
 AC_CHECK_FUNCS(strchr getcwd)
-AC_REPLACE_FUNCS(strerror memmove memcpy strtoul)
+dnl AC_REPLACE_FUNCS(strerror memmove memcpy strtoul)
+AC_CHECK_FUNC(strerror, AC_DEFINE(HAVE_STRERROR), [
+  AC_LIBOBJ(strerror)
+])
+AC_CHECK_FUNC(memmove, AC_DEFINE(HAVE_MEMMOVE), [
+  AC_LIBOBJ(memmove)
+])
+AC_CHECK_FUNC(memcpy, AC_DEFINE(HAVE_MEMCPY), [
+  AC_LIBOBJ(memcpy)
+])
+AC_CHECK_FUNC(strtoul, AC_DEFINE(HAVE_STRTOUL), [
+  AC_LIBOBJ(strtoul)
+])
+
 AC_FUNC_VPRINTF
 
 dnl -lsun is needed on IRIX-4.0 to get the user passwd entry through
@@ -85,6 +98,23 @@ AC_ARG_WITH(media,
 MEDIA=$ac_cv_value_media
 AC_SUBST(MEDIA)
 
+dnl Define the default input encoding.
+AC_ARG_WITH(encoding,
+[  --with-encoding(=ENCODING) use input encoding (ENCODING), default is latin1],
+  if test "X$withval" != "Xno"; then
+    if test "X$withval" = "Xyes"; then
+      ac_cv_value_encoding='latin1'
+    else
+      ac_cv_value_encoding=$withval
+    fi
+  else
+    ac_cv_value_encoding=${ENCODING-latin1}
+  fi,
+  ac_cv_value_encoding=${ENCODING-latin1}
+)
+ENCODING=$ac_cv_value_encoding
+AC_SUBST(ENCODING)
+
 dnl Find the printer spooler command.
 
 AC_CHECK_PROG(SPOOLER, lpr, lpr)
@@ -117,6 +147,7 @@ AC_SUBST(PSLEVEL)
 dnl Internationalization.
 ALL_LINGUAS="de es fi fr nl ru sl"
 AM_GNU_GETTEXT
+AM_GNU_GETTEXT_VERSION(0.10.35)
 
 dnl Path separator character.
 AC_DEFINE_UNQUOTED(PATH_SEPARATOR, ':')
@@ -160,6 +191,7 @@ echo ""
 echo "Option     Change with configure's option   Current value"
 echo "---------------------------------------------------------"
 echo "Media      --with-media=MEDIA               $MEDIA"
+echo "Encoding   --with-encoding=ENCODING         $ENCODING"
 echo "Spooler    --with-spooler=SPOOLER           $SPOOLER"
 echo "PS level   --with-ps-level=LEVEL            $PSLEVEL"
 echo ""
--- script
+++ script	2005-02-01 13:36:36.000000000 +0100
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+declare -i n=0
+
+while test $n -lt 256 ; do
+    read name
+    if test $n -gt 63 ; then
+	printf '%.4o\t0x%.2x\t' $n $n
+    else
+	printf '%.3o\t0x%.2x\t' $n $n
+    fi
+    if test "$name" = ".notdef" ; then
+	echo -n "non-printable"
+    else
+	echo -n "/$name"
+    fi
+    echo
+    test $((n%8)) -eq 7 -a $n -lt 255 && echo
+    : $((n=n+1))
+done
--- afm/Makefile.am
+++ afm/Makefile.am	2005-02-01 13:36:36.000000000 +0100
@@ -36,11 +36,11 @@ public_fonts = matrix.afm matrix.pfa
 EXTRA_DIST = font.map $(default_afm) $(public_fonts)
 
 install-data-local:
-	$(top_srcdir)/mkinstalldirs $(datadir)/enscript
-	$(top_srcdir)/mkinstalldirs $(datadir)/enscript/afm
+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/enscript
+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/enscript/afm
 	for f in $(EXTRA_DIST); do \
-	  $(INSTALL_DATA) $(srcdir)/$$f $(datadir)/enscript/afm/$$f; \
+	  $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(datadir)/enscript/afm/$$f; \
 	done
 
 uninstall-local:
-	rm -rf $(datadir)/enscript/afm
+	rm -rf $(DESTDIR)$(datadir)/enscript/afm
--- afm/cob.afm
+++ afm/cob.afm	2005-02-01 13:36:36.000000000 +0100
@@ -19,7 +19,7 @@ CapHeight 562
 XHeight 439
 Ascender 626
 Descender -142
-StartCharMetrics 260
+StartCharMetrics 261
 C 32 ; WX 600 ; N space ; B 0 0 0 0 ;
 C 33 ; WX 600 ; N exclam ; B 202 -15 398 572 ;
 C 34 ; WX 600 ; N quotedbl ; B 135 277 465 562 ;
@@ -238,6 +238,7 @@ C -1 ; WX 600 ; N Igrave ; B 77 0 523 78
 C -1 ; WX 600 ; N brokenbar ; B 255 -175 345 675 ;
 C -1 ; WX 600 ; N Oacute ; B 22 -18 578 784 ;
 C -1 ; WX 600 ; N otilde ; B 30 -15 570 636 ;
+C -1 ; WX 600 ; N Euro ; B -2 0 602 562 ;
 C -1 ; WX 600 ; N Yacute ; B 12 0 589 784 ;
 C -1 ; WX 600 ; N lira ; B 72 -28 558 611 ;
 C -1 ; WX 600 ; N Icircumflex ; B 77 0 523 780 ;
@@ -281,7 +282,7 @@ C -1 ; WX 600 ; N aring ; B 35 -15 570 6
 C -1 ; WX 600 ; N yacute ; B -4 -142 601 661 ;
 C -1 ; WX 600 ; N icircumflex ; B 63 0 523 657 ;
 EndCharMetrics
-StartComposites 58
+StartComposites 59
 CC Aacute 2 ; PCC A 0 0 ; PCC acute 30 123 ;
 CC Acircumflex 2 ; PCC A 0 0 ; PCC circumflex -30 123 ;
 CC Adieresis 2 ; PCC A 0 0 ; PCC dieresis -20 123 ;
@@ -332,6 +333,7 @@ CC ocircumflex 2 ; PCC o 0 0 ; PCC circu
 CC odieresis 2 ; PCC o 0 0 ; PCC dieresis 0 0 ;
 CC ograve 2 ; PCC o 0 0 ; PCC grave 0 0 ;
 CC otilde 2 ; PCC o 0 0 ; PCC tilde 0 0 ;
+CC Euro 2 ; PCC C 0 0 ; PCC equal 0 0 ;
 CC scaron 2 ; PCC s 0 0 ; PCC caron 0 0 ;
 CC uacute 2 ; PCC u 0 0 ; PCC acute 0 0 ;
 CC ucircumflex 2 ; PCC u 0 0 ; PCC circumflex -20 0 ;
--- afm/cobo.afm
+++ afm/cobo.afm	2005-02-01 13:36:36.000000000 +0100
@@ -19,7 +19,7 @@ CapHeight 562
 XHeight 439
 Ascender 626
 Descender -142
-StartCharMetrics 260
+StartCharMetrics 261
 C 32 ; WX 600 ; N space ; B 0 0 0 0 ;
 C 33 ; WX 600 ; N exclam ; B 216 -15 495 572 ;
 C 34 ; WX 600 ; N quotedbl ; B 212 277 584 562 ;
@@ -238,6 +238,7 @@ C -1 ; WX 600 ; N Igrave ; B 77 0 642 78
 C -1 ; WX 600 ; N brokenbar ; B 218 -175 488 675 ;
 C -1 ; WX 600 ; N Oacute ; B 74 -18 645 784 ;
 C -1 ; WX 600 ; N otilde ; B 71 -15 642 636 ;
+C -1 ; WX 600 ; N Euro ; B -2 0 721 562 ;
 C -1 ; WX 600 ; N Yacute ; B 109 0 708 784 ;
 C -1 ; WX 600 ; N lira ; B 107 -28 650 611 ;
 C -1 ; WX 600 ; N Icircumflex ; B 77 0 642 780 ;
@@ -281,7 +282,7 @@ C -1 ; WX 600 ; N aring ; B 62 -15 592 6
 C -1 ; WX 600 ; N yacute ; B -20 -142 694 661 ;
 C -1 ; WX 600 ; N icircumflex ; B 77 0 566 657 ;
 EndCharMetrics
-StartComposites 58
+StartComposites 59
 CC Aacute 2 ; PCC A 0 0 ; PCC acute 56 123 ;
 CC Acircumflex 2 ; PCC A 0 0 ; PCC circumflex -4 123 ;
 CC Adieresis 2 ; PCC A 0 0 ; PCC dieresis 6 123 ;
@@ -332,6 +333,7 @@ CC ocircumflex 2 ; PCC o 0 0 ; PCC circu
 CC odieresis 2 ; PCC o 0 0 ; PCC dieresis 0 0 ;
 CC ograve 2 ; PCC o 0 0 ; PCC grave 0 0 ;
 CC otilde 2 ; PCC o 0 0 ; PCC tilde 0 0 ;
+CC Euro 2 ; PCC C 0 0 ; PCC equal 0 0 ;
 CC scaron 2 ; PCC s 0 0 ; PCC caron 0 0 ;
 CC uacute 2 ; PCC u 0 0 ; PCC acute 0 0 ;
 CC ucircumflex 2 ; PCC u 0 0 ; PCC circumflex -20 0 ;
--- afm/com.afm
+++ afm/com.afm	2005-02-01 13:36:36.000000000 +0100
@@ -19,7 +19,7 @@ CapHeight 562
 XHeight 426
 Ascender 629
 Descender -157
-StartCharMetrics 260
+StartCharMetrics 261
 C 32 ; WX 600 ; N space ; B 0 0 0 0 ;
 C 33 ; WX 600 ; N exclam ; B 236 -15 364 572 ;
 C 34 ; WX 600 ; N quotedbl ; B 187 328 413 562 ;
@@ -238,6 +238,7 @@ C -1 ; WX 600 ; N Igrave ; B 96 0 504 79
 C -1 ; WX 600 ; N brokenbar ; B 275 -175 326 675 ;
 C -1 ; WX 600 ; N Oacute ; B 43 -18 557 793 ;
 C -1 ; WX 600 ; N otilde ; B 62 -15 538 606 ;
+C -1 ; WX 600 ; N Euro ; B 4 0 596 562 ;
 C -1 ; WX 600 ; N Yacute ; B 24 0 576 793 ;
 C -1 ; WX 600 ; N lira ; B 73 -21 521 611 ;
 C -1 ; WX 600 ; N Icircumflex ; B 96 0 504 775 ;
@@ -281,7 +282,7 @@ C -1 ; WX 600 ; N aring ; B 53 -15 559 6
 C -1 ; WX 600 ; N yacute ; B 7 -157 592 672 ;
 C -1 ; WX 600 ; N icircumflex ; B 94 0 505 654 ;
 EndCharMetrics
-StartComposites 58
+StartComposites 59
 CC Aacute 2 ; PCC A 0 0 ; PCC acute 20 121 ;
 CC Acircumflex 2 ; PCC A 0 0 ; PCC circumflex -30 121 ;
 CC Adieresis 2 ; PCC A 0 0 ; PCC dieresis -30 136 ;
@@ -332,6 +333,7 @@ CC ocircumflex 2 ; PCC o 0 0 ; PCC circu
 CC odieresis 2 ; PCC o 0 0 ; PCC dieresis 0 0 ;
 CC ograve 2 ; PCC o 0 0 ; PCC grave 0 0 ;
 CC otilde 2 ; PCC o 0 0 ; PCC tilde 0 0 ;
+CC Euro 2 ; PCC C 0 0 ; PCC equal 0 0 ;
 CC scaron 2 ; PCC s 0 0 ; PCC caron 0 0 ;
 CC uacute 2 ; PCC u 0 0 ; PCC acute -10 0 ;
 CC ucircumflex 2 ; PCC u 0 0 ; PCC circumflex -10 0 ;
--- afm/coo.afm
+++ afm/coo.afm	2005-02-01 13:36:36.000000000 +0100
@@ -19,7 +19,7 @@ CapHeight 562
 XHeight 426
 Ascender 629
 Descender -157
-StartCharMetrics 260
+StartCharMetrics 261
 C 32 ; WX 600 ; N space ; B 0 0 0 0 ;
 C 33 ; WX 600 ; N exclam ; B 243 -15 464 572 ;
 C 34 ; WX 600 ; N quotedbl ; B 273 328 532 562 ;
@@ -238,6 +238,7 @@ C -1 ; WX 600 ; N Igrave ; B 96 0 623 79
 C -1 ; WX 600 ; N brokenbar ; B 238 -175 469 675 ;
 C -1 ; WX 600 ; N Oacute ; B 94 -18 638 793 ;
 C -1 ; WX 600 ; N otilde ; B 102 -15 629 606 ;
+C -1 ; WX 600 ; N Euro ; B 4 0 715 562 ;
 C -1 ; WX 600 ; N Yacute ; B 133 0 695 793 ;
 C -1 ; WX 600 ; N lira ; B 118 -21 621 611 ;
 C -1 ; WX 600 ; N Icircumflex ; B 96 0 623 775 ;
@@ -281,7 +282,7 @@ C -1 ; WX 600 ; N aring ; B 76 -15 569 6
 C -1 ; WX 600 ; N yacute ; B -4 -157 683 672 ;
 C -1 ; WX 600 ; N icircumflex ; B 95 0 551 654 ;
 EndCharMetrics
-StartComposites 58
+StartComposites 59
 CC Aacute 2 ; PCC A 0 0 ; PCC acute 46 121 ;
 CC Acircumflex 2 ; PCC A 0 0 ; PCC circumflex -4 121 ;
 CC Adieresis 2 ; PCC A 0 0 ; PCC dieresis -1 136 ;
@@ -332,6 +333,7 @@ CC ocircumflex 2 ; PCC o 0 0 ; PCC circu
 CC odieresis 2 ; PCC o 0 0 ; PCC dieresis 0 0 ;
 CC ograve 2 ; PCC o 0 0 ; PCC grave 0 0 ;
 CC otilde 2 ; PCC o 0 0 ; PCC tilde 0 0 ;
+CC Euro 2 ; PCC C 0 0 ; PCC equal 0 0 ;
 CC scaron 2 ; PCC s 0 0 ; PCC caron 0 0 ;
 CC uacute 2 ; PCC u 0 0 ; PCC acute -10 0 ;
 CC ucircumflex 2 ; PCC u 0 0 ; PCC circumflex -10 0 ;
--- afm/font.map.gs
+++ afm/font.map.gs	2005-02-01 13:36:36.000000000 +0100
@@ -0,0 +1,96 @@
+Bookman-Demi                  pbkd
+Bookman-DemiItalic            pbkdi
+Bookman-Light                 pbkl
+Bookman-LightItalic           pbkli
+CenturySchL-Bold              c059016l
+CenturySchL-BoldItal          c059036l
+CenturySchL-Ital              c059033l
+CenturySchL-Roma              c059013l
+CharterBT-Bold                bchb
+CharterBT-BoldItalic          bchbi
+CharterBT-Italic              bchri
+CharterBT-Roman               bchr
+Courier                       pcrr
+Courier-Bold                  pcrb
+Courier-Bold-Comp             pcrb-c
+Courier-Bold-Ogonki           pcrb-o
+Courier-BoldOblique           pcrbo
+Courier-BoldOblique-Comp      pcrbo-c
+Courier-BoldOblique-Ogonki    pcrbo-o
+Courier-Comp                  pcrr-c
+Courier-Oblique               pcrro
+Courier-Oblique-Comp          pcrro-c
+Courier-Oblique-Ogonki        pcrro-o
+Courier-Ogonki                pcrr-o
+Cyrillic                      fcyr
+Cyrillic-Italic               fcyri
+Dingbats                      d050000l
+Helvetica                     phvr
+Helvetica-Bold                phvb
+Helvetica-Bold-Comp           phvb-c
+Helvetica-Bold-Ogonki         phvb-o
+Helvetica-BoldOblique         phvbo
+Helvetica-BoldOblique-Comp    phvbo-c
+Helvetica-BoldOblique-Ogonki  phvbo-o
+Helvetica-Comp                phvr-c
+Helvetica-Narrow              phvrrn
+Helvetica-Narrow-Bold         phvbrn
+Helvetica-Narrow-BoldOblique  phvbon
+Helvetica-Narrow-Oblique      phvron
+Helvetica-Oblique             phvro
+Helvetica-Oblique-Comp        phvro-c
+Helvetica-Oblique-Ogonki      phvro-o
+Helvetica-Ogonki              phvr-o
+NewCenturySchlbk-Bold         pncb
+NewCenturySchlbk-BoldItalic   pncbi
+NewCenturySchlbk-Italic       pncri
+NewCenturySchlbk-Roman        pncr
+NimbusMonL-Bold               n022004l
+NimbusMonL-BoldObli           n022024l
+NimbusMonL-Regu               n022003l
+NimbusMonL-ReguObli           n022023l
+NimbusRomNo                   n021003l
+NimbusSanL-Bold               n019004l
+NimbusSanL-BoldCond           n019044l
+NimbusSanL-BoldCondItal       n019064l
+NimbusSanL-BoldItal           n019024l
+NimbusSanL-Regu               n019003l
+NimbusSanL-ReguCond           n019043l
+NimbusSanL-ReguCondItal       n019063l
+NimbusSanL-ReguItal           n019023l
+PCFont                        pcfont
+Palatino-Bold                 pplb
+Palatino-BoldItalic           pplbi
+Palatino-Italic               pplri
+Palatino-Roman                pplr
+StandardSymL                  s050000l
+Symbol                        psyr
+Times-Bold                    ptmb
+Times-Bold-Comp               ptmb-c
+Times-Bold-Ogonki             ptmb-o
+Times-BoldItalic              ptmbi
+Times-BoldItalic-Comp         ptmbi-c
+Times-BoldItalic-Ogonki       ptmbi-o
+Times-Italic                  ptmi
+Times-Italic-Comp             ptmri-c
+Times-Italic-Ogonki           ptmri-o
+Times-Roman                   ptmr
+Times-Roman-Comp              ptmr-c
+Times-Roman-Ogonki            ptmr-o
+URWAntiquaT-RegularCondensed  u003043t
+URWBookmanL-DemiBold          b018015l
+URWBookmanL-DemiBoldItal      b018035l
+URWBookmanL-Ligh              b018012l
+URWBookmanL-LighItal          b018032l
+URWChanceryL-MediItal         z003034l
+URWGothicL-Book               a010013l
+URWGothicL-BookObli           a010033l
+URWGothicL-Demi               a010015l
+URWGothicL-DemiObli           a010035l
+URWGroteskT-Bold              u004006t
+URWPalladioL-Bold             p052004l
+URWPalladioL-BoldItal         p052024l
+URWPalladioL-Ital             p052023l
+URWPalladioL-Roma             p052003l
+ZapfChancery-MediumItalic     pzcmi
+ZapfDingbats                  pzdr
--- afm/hv.afm
+++ afm/hv.afm	2005-02-01 13:36:36.000000000 +0100
@@ -19,7 +19,7 @@ CapHeight 718
 XHeight 523
 Ascender 718
 Descender -207
-StartCharMetrics 228
+StartCharMetrics 229
 C 32 ; WX 278 ; N space ; B 0 0 0 0 ;
 C 33 ; WX 278 ; N exclam ; B 90 0 187 718 ;
 C 34 ; WX 355 ; N quotedbl ; B 70 463 285 718 ;
@@ -181,6 +181,7 @@ C -1 ; WX 556 ; N egrave ; B 40 -15 516 
 C -1 ; WX 333 ; N twosuperior ; B 4 281 323 703 ;
 C -1 ; WX 556 ; N eacute ; B 40 -15 516 734 ;
 C -1 ; WX 556 ; N otilde ; B 35 -14 521 722 ;
+C -1 ; WX 833 ; N Euro ; B 73 0 761 718 ;
 C -1 ; WX 667 ; N Aacute ; B 14 0 654 929 ;
 C -1 ; WX 556 ; N ocircumflex ; B 35 -14 521 734 ;
 C -1 ; WX 500 ; N yacute ; B 11 -214 489 734 ;
@@ -549,7 +550,7 @@ KPX z o -15
 KPX z e -15
 EndKernPairs
 EndKernData
-StartComposites 58
+StartComposites 59
 CC Aacute 2 ; PCC A 0 0 ; PCC acute 167 195 ;
 CC Acircumflex 2 ; PCC A 0 0 ; PCC circumflex 167 195 ;
 CC Adieresis 2 ; PCC A 0 0 ; PCC dieresis 167 195 ;
@@ -600,6 +601,7 @@ CC ocircumflex 2 ; PCC o 0 0 ; PCC circu
 CC odieresis 2 ; PCC o 0 0 ; PCC dieresis 112 0 ;
 CC ograve 2 ; PCC o 0 0 ; PCC grave 112 0 ;
 CC otilde 2 ; PCC o 0 0 ; PCC tilde 112 0 ;
+CC Euro 2 ; PCC C 0 0 ; PCC equal 0 0 ;
 CC scaron 2 ; PCC s 0 0 ; PCC caron 84 0 ;
 CC uacute 2 ; PCC u 0 0 ; PCC acute 112 0 ;
 CC ucircumflex 2 ; PCC u 0 0 ; PCC circumflex 112 0 ;
--- afm/hvb.afm
+++ afm/hvb.afm	2005-02-01 13:36:36.000000000 +0100
@@ -19,7 +19,7 @@ CapHeight 718
 XHeight 532
 Ascender 718
 Descender -207
-StartCharMetrics 228
+StartCharMetrics 229
 C 32 ; WX 278 ; N space ; B 0 0 0 0 ;
 C 33 ; WX 333 ; N exclam ; B 90 0 244 718 ;
 C 34 ; WX 474 ; N quotedbl ; B 98 447 376 718 ;
@@ -181,6 +181,7 @@ C -1 ; WX 556 ; N egrave ; B 23 -14 528 
 C -1 ; WX 333 ; N twosuperior ; B 9 283 324 710 ;
 C -1 ; WX 556 ; N eacute ; B 23 -14 528 750 ;
 C -1 ; WX 611 ; N otilde ; B 34 -14 578 737 ;
+C -1 ; WX 833 ; N Euro ; B 69 0 765 718 ;
 C -1 ; WX 722 ; N Aacute ; B 20 0 702 936 ;
 C -1 ; WX 611 ; N ocircumflex ; B 34 -14 578 750 ;
 C -1 ; WX 556 ; N yacute ; B 10 -214 539 750 ;
@@ -507,7 +508,7 @@ KPX y a -30
 KPX z e 10
 EndKernPairs
 EndKernData
-StartComposites 58
+StartComposites 59
 CC Aacute 2 ; PCC A 0 0 ; PCC acute 195 186 ;
 CC Acircumflex 2 ; PCC A 0 0 ; PCC circumflex 195 186 ;
 CC Adieresis 2 ; PCC A 0 0 ; PCC dieresis 195 186 ;
@@ -558,6 +559,7 @@ CC ocircumflex 2 ; PCC o 0 0 ; PCC circu
 CC odieresis 2 ; PCC o 0 0 ; PCC dieresis 139 0 ;
 CC ograve 2 ; PCC o 0 0 ; PCC grave 139 0 ;
 CC otilde 2 ; PCC o 0 0 ; PCC tilde 139 0 ;
+CC Euro 2 ; PCC C 0 0 ; PCC equal 0 0 ;
 CC scaron 2 ; PCC s 0 0 ; PCC caron 112 0 ;
 CC uacute 2 ; PCC u 0 0 ; PCC acute 139 0 ;
 CC ucircumflex 2 ; PCC u 0 0 ; PCC circumflex 139 0 ;
--- afm/hvbo.afm
+++ afm/hvbo.afm	2005-02-01 13:36:36.000000000 +0100
@@ -19,7 +19,7 @@ CapHeight 718
 XHeight 532
 Ascender 718
 Descender -207
-StartCharMetrics 228
+StartCharMetrics 229
 C 32 ; WX 278 ; N space ; B 0 0 0 0 ;
 C 33 ; WX 333 ; N exclam ; B 94 0 397 718 ;
 C 34 ; WX 474 ; N quotedbl ; B 193 447 529 718 ;
@@ -181,6 +181,7 @@ C -1 ; WX 556 ; N egrave ; B 70 -14 593 
 C -1 ; WX 333 ; N twosuperior ; B 69 283 449 710 ;
 C -1 ; WX 556 ; N eacute ; B 70 -14 627 750 ;
 C -1 ; WX 611 ; N otilde ; B 82 -14 646 737 ;
+C -1 ; WX 833 ; N Euro ; B 69 0 918 718 ;
 C -1 ; WX 722 ; N Aacute ; B 20 0 750 936 ;
 C -1 ; WX 611 ; N ocircumflex ; B 82 -14 643 750 ;
 C -1 ; WX 556 ; N yacute ; B 42 -214 652 750 ;
@@ -507,7 +508,7 @@ KPX y a -30
 KPX z e 10
 EndKernPairs
 EndKernData
-StartComposites 58
+StartComposites 59
 CC Aacute 2 ; PCC A 0 0 ; PCC acute 235 186 ;
 CC Acircumflex 2 ; PCC A 0 0 ; PCC circumflex 235 186 ;
 CC Adieresis 2 ; PCC A 0 0 ; PCC dieresis 235 186 ;
@@ -558,6 +559,7 @@ CC ocircumflex 2 ; PCC o 0 0 ; PCC circu
 CC odieresis 2 ; PCC o 0 0 ; PCC dieresis 139 0 ;
 CC ograve 2 ; PCC o 0 0 ; PCC grave 139 0 ;
 CC otilde 2 ; PCC o 0 0 ; PCC tilde 139 0 ;
+CC Euro 2 ; PCC C 0 0 ; PCC equal 0 0 ;
 CC scaron 2 ; PCC s 0 0 ; PCC caron 112 0 ;
 CC uacute 2 ; PCC u 0 0 ; PCC acute 139 0 ;
 CC ucircumflex 2 ; PCC u 0 0 ; PCC circumflex 139 0 ;
--- afm/hvo.afm
+++ afm/hvo.afm	2005-02-01 13:36:36.000000000 +0100
@@ -19,7 +19,7 @@ CapHeight 718
 XHeight 523
 Ascender 718
 Descender -207
-StartCharMetrics 228
+StartCharMetrics 229
 C 32 ; WX 278 ; N space ; B 0 0 0 0 ;
 C 33 ; WX 278 ; N exclam ; B 90 0 340 718 ;
 C 34 ; WX 355 ; N quotedbl ; B 168 463 438 718 ;
@@ -181,6 +181,7 @@ C -1 ; WX 556 ; N egrave ; B 84 -15 578 
 C -1 ; WX 333 ; N twosuperior ; B 64 281 449 703 ;
 C -1 ; WX 556 ; N eacute ; B 84 -15 587 734 ;
 C -1 ; WX 556 ; N otilde ; B 83 -14 602 722 ;
+C -1 ; WX 833 ; N Euro ; B 73 0 914 718 ;
 C -1 ; WX 667 ; N Aacute ; B 14 0 683 929 ;
 C -1 ; WX 556 ; N ocircumflex ; B 83 -14 585 734 ;
 C -1 ; WX 500 ; N yacute ; B 15 -214 600 734 ;
@@ -549,7 +550,7 @@ KPX z o -15
 KPX z e -15
 EndKernPairs
 EndKernData
-StartComposites 58
+StartComposites 59
 CC Aacute 2 ; PCC A 0 0 ; PCC acute 208 195 ;
 CC Acircumflex 2 ; PCC A 0 0 ; PCC circumflex 208 195 ;
 CC Adieresis 2 ; PCC A 0 0 ; PCC dieresis 208 195 ;
@@ -600,6 +601,7 @@ CC ocircumflex 2 ; PCC o 0 0 ; PCC circu
 CC odieresis 2 ; PCC o 0 0 ; PCC dieresis 112 0 ;
 CC ograve 2 ; PCC o 0 0 ; PCC grave 112 0 ;
 CC otilde 2 ; PCC o 0 0 ; PCC tilde 112 0 ;
+CC Euro 2 ; PCC C 0 0 ; PCC equal 0 0 ;
 CC scaron 2 ; PCC s 0 0 ; PCC caron 84 0 ;
 CC uacute 2 ; PCC u 0 0 ; PCC acute 112 0 ;
 CC ucircumflex 2 ; PCC u 0 0 ; PCC circumflex 112 0 ;
--- afm/tib.afm
+++ afm/tib.afm	2005-02-01 13:36:36.000000000 +0100
@@ -19,7 +19,7 @@ CapHeight 676
 XHeight 461
 Ascender 676
 Descender -205
-StartCharMetrics 228
+StartCharMetrics 229
 C 32 ; WX 250 ; N space ; B 0 0 0 0 ;
 C 33 ; WX 333 ; N exclam ; B 81 -13 251 691 ;
 C 34 ; WX 555 ; N quotedbl ; B 83 404 472 691 ;
@@ -181,6 +181,7 @@ C -1 ; WX 444 ; N egrave ; B 25 -14 426 
 C -1 ; WX 300 ; N twosuperior ; B 0 275 300 688 ;
 C -1 ; WX 444 ; N eacute ; B 25 -14 426 713 ;
 C -1 ; WX 500 ; N otilde ; B 25 -14 476 674 ;
+C -1 ; WX 944 ; N Euro ; B 14 0 921 676 ;
 C -1 ; WX 722 ; N Aacute ; B 9 0 689 923 ;
 C -1 ; WX 500 ; N ocircumflex ; B 25 -14 476 704 ;
 C -1 ; WX 500 ; N yacute ; B 16 -205 480 713 ;
@@ -585,7 +586,7 @@ KPX z o 0
 KPX z e 0
 EndKernPairs
 EndKernData
-StartComposites 58
+StartComposites 59
 CC Aacute 2 ; PCC A 0 0 ; PCC acute 188 210 ;
 CC Acircumflex 2 ; PCC A 0 0 ; PCC circumflex 188 210 ;
 CC Adieresis 2 ; PCC A 0 0 ; PCC dieresis 188 210 ;
@@ -636,6 +637,7 @@ CC ocircumflex 2 ; PCC o 0 0 ; PCC circu
 CC odieresis 2 ; PCC o 0 0 ; PCC dieresis 84 0 ;
 CC ograve 2 ; PCC o 0 0 ; PCC grave 84 0 ;
 CC otilde 2 ; PCC o 0 0 ; PCC tilde 84 0 ;
+CC Euro 2 ; PCC C 0 0 ; PCC equal 0 0 ;
 CC scaron 2 ; PCC s 0 0 ; PCC caron 28 0 ;
 CC uacute 2 ; PCC u 0 0 ; PCC acute 105 0 ;
 CC ucircumflex 2 ; PCC u 0 0 ; PCC circumflex 105 0 ;
--- afm/tibi.afm
+++ afm/tibi.afm	2005-02-01 13:36:36.000000000 +0100
@@ -19,7 +19,7 @@ CapHeight 669
 XHeight 462
 Ascender 699
 Descender -205
-StartCharMetrics 228
+StartCharMetrics 229
 C 32 ; WX 250 ; N space ; B 0 0 0 0 ;
 C 33 ; WX 389 ; N exclam ; B 67 -13 370 684 ;
 C 34 ; WX 555 ; N quotedbl ; B 136 398 536 685 ;
@@ -181,6 +181,7 @@ C -1 ; WX 444 ; N egrave ; B 5 -13 398 6
 C -1 ; WX 300 ; N twosuperior ; B 2 274 313 683 ;
 C -1 ; WX 444 ; N eacute ; B 5 -13 435 697 ;
 C -1 ; WX 500 ; N otilde ; B -3 -13 491 655 ;
+C -1 ; WX 889 ; N Euro ; B -29 -12 917 669 ;
 C -1 ; WX 667 ; N Aacute ; B -67 0 593 904 ;
 C -1 ; WX 500 ; N ocircumflex ; B -3 -13 451 690 ;
 C -1 ; WX 444 ; N yacute ; B -94 -205 435 697 ;
@@ -585,7 +586,7 @@ KPX z o 0
 KPX z e 0
 EndKernPairs
 EndKernData
-StartComposites 58
+StartComposites 59
 CC Aacute 2 ; PCC A 0 0 ; PCC acute 172 207 ;
 CC Acircumflex 2 ; PCC A 0 0 ; PCC circumflex 187 207 ;
 CC Adieresis 2 ; PCC A 0 0 ; PCC dieresis 167 207 ;
@@ -636,6 +637,7 @@ CC ocircumflex 2 ; PCC o 0 0 ; PCC circu
 CC odieresis 2 ; PCC o 0 0 ; PCC dieresis 69 0 ;
 CC ograve 2 ; PCC o 0 0 ; PCC grave 74 0 ;
 CC otilde 2 ; PCC o 0 0 ; PCC tilde 84 0 ;
+CC Euro 2 ; PCC C 0 0 ; PCC equal 0 0 ;
 CC scaron 2 ; PCC s 0 0 ; PCC caron 28 0 ;
 CC uacute 2 ; PCC u 0 0 ; PCC acute 112 0 ;
 CC ucircumflex 2 ; PCC u 0 0 ; PCC circumflex 112 0 ;
--- afm/tii.afm
+++ afm/tii.afm	2005-02-01 13:36:36.000000000 +0100
@@ -19,7 +19,7 @@ CapHeight 653
 XHeight 441
 Ascender 683
 Descender -205
-StartCharMetrics 228
+StartCharMetrics 229
 C 32 ; WX 250 ; N space ; B 0 0 0 0 ;
 C 33 ; WX 333 ; N exclam ; B 39 -11 302 667 ;
 C 34 ; WX 420 ; N quotedbl ; B 144 421 432 666 ;
@@ -181,6 +181,7 @@ C -1 ; WX 444 ; N egrave ; B 31 -11 412 
 C -1 ; WX 300 ; N twosuperior ; B 33 271 324 676 ;
 C -1 ; WX 444 ; N eacute ; B 31 -11 459 664 ;
 C -1 ; WX 500 ; N otilde ; B 27 -11 496 624 ;
+C -1 ; WX 833 ; N Euro ; B -18 0 873 653 ;
 C -1 ; WX 611 ; N Aacute ; B -51 0 564 876 ;
 C -1 ; WX 500 ; N ocircumflex ; B 27 -11 468 661 ;
 C -1 ; WX 444 ; N yacute ; B -24 -206 459 664 ;
@@ -585,7 +586,7 @@ KPX z o 0
 KPX z e 0
 EndKernPairs
 EndKernData
-StartComposites 58
+StartComposites 59
 CC Aacute 2 ; PCC A 0 0 ; PCC acute 139 212 ;
 CC Acircumflex 2 ; PCC A 0 0 ; PCC circumflex 144 212 ;
 CC Adieresis 2 ; PCC A 0 0 ; PCC dieresis 139 212 ;
@@ -636,6 +637,7 @@ CC ocircumflex 2 ; PCC o 0 0 ; PCC circu
 CC odieresis 2 ; PCC o 0 0 ; PCC dieresis 84 0 ;
 CC ograve 2 ; PCC o 0 0 ; PCC grave 84 0 ;
 CC otilde 2 ; PCC o 0 0 ; PCC tilde 69 0 ;
+CC Euro 2 ; PCC C 0 0 ; PCC equal 0 0 ;
 CC scaron 2 ; PCC s 0 0 ; PCC caron 28 0 ;
 CC uacute 2 ; PCC u 0 0 ; PCC acute 74 0 ;
 CC ucircumflex 2 ; PCC u 0 0 ; PCC circumflex 74 0 ;
--- afm/tir.afm
+++ afm/tir.afm	2005-02-01 13:36:36.000000000 +0100
@@ -19,7 +19,7 @@ CapHeight 662
 XHeight 450
 Ascender 683
 Descender -217
-StartCharMetrics 228
+StartCharMetrics 229
 C 32 ; WX 250 ; N space ; B 0 0 0 0 ;
 C 33 ; WX 333 ; N exclam ; B 130 -9 238 676 ;
 C 34 ; WX 408 ; N quotedbl ; B 77 431 331 676 ;
@@ -181,6 +181,7 @@ C -1 ; WX 444 ; N egrave ; B 25 -10 424 
 C -1 ; WX 300 ; N twosuperior ; B 1 270 296 676 ;
 C -1 ; WX 444 ; N eacute ; B 25 -10 424 678 ;
 C -1 ; WX 500 ; N otilde ; B 29 -10 470 638 ;
+C -1 ; WX 889 ; N Euro ; B 12 0 863 662 ;
 C -1 ; WX 722 ; N Aacute ; B 15 0 706 890 ;
 C -1 ; WX 500 ; N ocircumflex ; B 29 -10 470 674 ;
 C -1 ; WX 500 ; N yacute ; B 14 -218 475 678 ;
@@ -585,7 +586,7 @@ KPX z o 0
 KPX z e 0
 EndKernPairs
 EndKernData
-StartComposites 58
+StartComposites 59
 CC Aacute 2 ; PCC A 0 0 ; PCC acute 195 212 ;
 CC Acircumflex 2 ; PCC A 0 0 ; PCC circumflex 195 212 ;
 CC Adieresis 2 ; PCC A 0 0 ; PCC dieresis 195 212 ;
@@ -636,6 +637,7 @@ CC ocircumflex 2 ; PCC o 0 0 ; PCC circu
 CC odieresis 2 ; PCC o 0 0 ; PCC dieresis 84 0 ;
 CC ograve 2 ; PCC o 0 0 ; PCC grave 84 0 ;
 CC otilde 2 ; PCC o 0 0 ; PCC tilde 84 0 ;
+CC Euro 2 ; PCC C 0 0 ; PCC equal 0 0 ;
 CC scaron 2 ; PCC s 0 0 ; PCC caron 28 0 ;
 CC uacute 2 ; PCC u 0 0 ; PCC acute 84 0 ;
 CC ucircumflex 2 ; PCC u 0 0 ; PCC circumflex 84 0 ;
--- afmlib/Makefile-encodings
+++ afmlib/Makefile-encodings	2005-02-01 13:36:36.000000000 +0100
@@ -24,7 +24,7 @@
 #
 
 ENCODINGS = e_88591.c e_88592.c e_88593.c e_88594.c e_88595.c \
-e_88597.c e_88599.c e_885910.c e_pc.c e_mac.c e_vms.c e_hp8.c e_koi8.c
+e_88597.c e_88599.c e_885910.c e_885913.c e_885915.c e_pc.c e_mac.c e_vms.c e_hp8.c e_koi8.c
 
 all: $(ENCODINGS)
 
@@ -55,6 +55,12 @@ e_88599.c: make-encoding.pl ../88599.txt
 e_885910.c: make-encoding.pl ../885910.txt
 	./make-encoding.pl ../885910.txt >e_885910.c
 
+e_885913.c: make-encoding.pl ../885913.txt
+	./make-encoding.pl ../885913.txt >e_885913.c
+
+e_885915.c: make-encoding.pl ../885915.txt
+	./make-encoding.pl ../885915.txt >e_885915.c
+
 e_pc.c: make-encoding.pl ../ibmpc.txt
 	./make-encoding.pl ../ibmpc.txt >e_pc.c
 
--- afmlib/Makefile.am
+++ afmlib/Makefile.am	2005-02-01 13:36:36.000000000 +0100
@@ -28,7 +28,7 @@ AUTOMAKE_OPTIONS = ansi2knr
 noinst_LIBRARIES = libafm.a
 libafm_a_SOURCES = afm.c afmparse.c strhash.c e_88591.c e_88592.c	\
 e_88593.c e_88594.c e_88595.c e_88597.c e_88599.c e_885910.c e_pc.c	\
-e_mac.c e_vms.c e_hp8.c e_koi8.c deffont.c
+e_mac.c e_vms.c e_hp8.c e_koi8.c deffont.c e_885913.c e_885915.c
 
 noinst_HEADERS = afm.h afmint.h strhash.h
 
--- afmlib/afm.c
+++ afmlib/afm.c	2005-02-01 13:36:36.000000000 +0100
@@ -649,6 +649,14 @@ afm_font_encoding (AFMFont font, AFMEnco
       apply_encoding (font, afm_885910_encoding, flags);
       break;
 
+    case AFM_ENCODING_ISO_8859_13:
+      apply_encoding (font, afm_885913_encoding, flags);
+      break;
+
+    case AFM_ENCODING_ISO_8859_15:
+      apply_encoding (font, afm_885915_encoding, flags);
+      break;
+
     case AFM_ENCODING_IBMPC:
       apply_encoding (font, afm_ibmpc_encoding, flags);
       break;
--- afmlib/afm.h
+++ afmlib/afm.h	2005-02-01 13:36:36.000000000 +0100
@@ -283,6 +283,8 @@ typedef enum
   AFM_ENCODING_ISO_8859_7,	/* ISO-8859-7 */
   AFM_ENCODING_ISO_8859_9,	/* ISO-8859-9 */
   AFM_ENCODING_ISO_8859_10,	/* ISO-8859-10 */
+  AFM_ENCODING_ISO_8859_13,	/* ISO-8859-13 */
+  AFM_ENCODING_ISO_8859_15,	/* ISO-8859-15 */
   AFM_ENCODING_IBMPC,		/* IBM PC */
   AFM_ENCODING_ASCII,		/* 7 bit ASCII */
   AFM_ENCODING_MAC,		/* Mac */
--- afmlib/afmint.h
+++ afmlib/afmint.h	2005-02-01 13:36:36.000000000 +0100
@@ -258,6 +258,8 @@ extern AFMEncodingTable afm_88595_encodi
 extern AFMEncodingTable afm_88597_encoding[];
 extern AFMEncodingTable afm_88599_encoding[];
 extern AFMEncodingTable afm_885910_encoding[];
+extern AFMEncodingTable afm_885913_encoding[];
+extern AFMEncodingTable afm_885915_encoding[];
 extern AFMEncodingTable afm_ibmpc_encoding[];
 extern AFMEncodingTable afm_mac_encoding[];
 extern AFMEncodingTable afm_vms_encoding[];
--- afmlib/make-encoding.pl
+++ afmlib/make-encoding.pl	2005-02-01 13:36:36.000000000 +0100
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 #
 # Create encoding files from the `*.txt' encoding files.
 # Copyright (c) 1995-1998 Markku Rossi.
--- compat/regex.c
+++ compat/regex.c	2005-02-01 13:36:36.000000000 +0100
@@ -2400,11 +2400,12 @@ regex_compile (pattern, size, syntax, bu
             case ')':
               if (syntax & RE_NO_BK_PARENS) goto normal_backslash;
 
-              if (COMPILE_STACK_EMPTY)
+              if (COMPILE_STACK_EMPTY) {
                 if (syntax & RE_UNMATCHED_RIGHT_PAREN_ORD)
                   goto normal_backslash;
                 else
                   FREE_STACK_RETURN (REG_ERPAREN);
+	      }
 
             handle_close:
               if (fixup_alt_jump)
@@ -2420,11 +2421,12 @@ regex_compile (pattern, size, syntax, bu
                 }
 
               /* See similar code for backslashed left paren above.  */
-              if (COMPILE_STACK_EMPTY)
+              if (COMPILE_STACK_EMPTY) {
                 if (syntax & RE_UNMATCHED_RIGHT_PAREN_ORD)
                   goto normal_char;
                 else
                   FREE_STACK_RETURN (REG_ERPAREN);
+	      }
 
               /* Since we just checked for an empty stack above, this
                  ``can't happen''.  */
--- docs/Makefile.am
+++ docs/Makefile.am	2005-02-01 13:36:36.000000000 +0100
@@ -28,6 +28,7 @@ info_TEXINFOS = enscript.texi
 man_MANS = enscript.1 states.1
 
 EXTRA_DIST = enscript.man states.man FAQ.html clean-nroff.pl texinfo.tex
+AM_INSTALL_PROGRAM_FLAGS = -s
 
 enscript.man.html: enscript.1
 	nroff -man $(srcdir)/enscript.1 | ./clean-nroff.pl > enscript.tmp
--- docs/enscript.man
+++ docs/enscript.man	2007-10-09 18:50:01.290749204 +0200
@@ -60,7 +60,8 @@ overstrikes
 [\f3\-T \f2tabsize\f1]
 [\f3\-u\f1[\f2text\f1]]
 [\f3\-U \f2num\f1]
-[\f3\-W \f2language\f1]
+[\f3\-w \f2language\f1]
+[\f3\-W \f2app\f3,\f2options\f3\f1]
 [\f3\-X \f2encoding\f1]
 [\f2filename\f1 ...]
 
@@ -375,7 +376,7 @@ Tell what \f3enscript\f1 is doing.
 .B \-V, \-\-version
 Print \f3enscript\f1 version information and exit.
 .TP 8
-.B \-W \f1[\f2lang\f1]\f3, \-\-language\f1[\f3=\f2lang\f1]\f3
+.B \-w \f1[\f2lang\f1]\f3, \-\-language\f1[\f3=\f2lang\f1]\f3
 Generate output for the language \f2lang\f1.  The possible values for
 \f2lang\f1 are:
 .RS 8
@@ -396,6 +397,9 @@ generate RTF (Rich Text Format)
 generate ANSI terminal control codes
 .RE
 .TP 8
+.B \-W \f2app\f1,\f2option\f3, \-\-language\f3=\f2app\f1,\f2option\f3
+pass the option \f2option\f3 to helper application \f2app\f3.
+.TP 8
 .B \-X \f2name\f3, \-\-encoding=\f2name\f3
 Use the input encoding \f2name\f1.  Currently \f3enscript\f1 supports
 the following encodings:
@@ -425,6 +429,12 @@ ISO\-8859\-9 (ISO Latin5)
 .B 885910, latin6
 ISO\-8859\-10 (ISO Latin6)
 .TP 8
+.B 885913, latin7
+ISO\-8859\-13 (ISO Latin7)
+.TP 8
+.B 885915, latin9
+ISO\-8859\-15 (ISO Latin9)
+.TP 8
 .B ascii
 7\-bit ascii
 .TP 8
--- lib/Makefile-encodings
+++ lib/Makefile-encodings	2005-02-01 13:36:36.000000000 +0100
@@ -26,7 +26,7 @@
 
 ENCODINGS = ascii.enc asciifise.enc asciidkno.enc ibmpc.enc mac.enc \
 vms.enc hp8.enc koi8.enc 88591.enc 88592.enc 88593.enc 88594.enc \
-88595.enc 88597.enc 88599.enc 885910.enc
+88595.enc 88597.enc 88599.enc 885910.enc 885913.enc 885915.enc
 
 all: $(ENCODINGS)
 
@@ -66,6 +66,12 @@ ibmpc.enc: ../ibmpc.txt
 885910.enc: ../885910.txt
 	./make-encoding.pl ../885910.txt >885910.enc
 
+885913.enc: ../885913.txt
+	./make-encoding.pl ../885913.txt >885913.enc
+
+885915.enc: ../885915.txt
+	./make-encoding.pl ../885915.txt >885915.enc
+
 mac.enc: ../mac.txt
 	./make-encoding.pl ../mac.txt >mac.enc
 
--- lib/Makefile.am
+++ lib/Makefile.am	2005-02-01 13:36:36.000000000 +0100
@@ -28,7 +28,7 @@ pkgdata_DATA = ascii.enc asciifise.enc a
 koi8.enc 88591.enc 88592.enc 88593.enc 88594.enc 88595.enc 88597.enc	\
 88599.enc 885910.enc mac.enc ps.enc pslatin1.enc vms.enc a2ps.hdr	\
 edd.hdr emacs.hdr enscript.hdr enscript-color.hdr frame.hdr mp.hdr	\
-simple.hdr squeeze.hdr enscript.pro
+simple.hdr squeeze.hdr enscript.pro 885913.enc 885915.enc
 
 EXTRA_DIST = enscript.cfg.in $(pkgdata_DATA) Makefile-encodings \
 make-encoding.pl
@@ -38,16 +38,16 @@ CLEANFILES = enscript.cfg
 all-local: enscript.cfg
 
 install-data-local: enscript.cfg
-	$(top_srcdir)/mkinstalldirs $(sysconfdir)
-	if test -r $(sysconfdir)/enscript.cfg; then \
-	  cp $(sysconfdir)/enscript.cfg $(sysconfdir)/enscript.cfg.old; \
+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
+	if test -r $(DESTDIR)$(sysconfdir)/enscript.cfg; then \
+	  cp $(DESTDIR)$(sysconfdir)/enscript.cfg $(DESTDIR)$(sysconfdir)/enscript.cfg.old; \
 	else :; \
 	fi
-	$(INSTALL_DATA) enscript.cfg $(sysconfdir)/enscript.cfg
+	$(INSTALL_DATA) enscript.cfg $(DESTDIR)$(sysconfdir)/enscript.cfg
 
 uninstall-local:
-	rm -f $(sysconfdir)/enscript.cfg
+	rm -f $(DESTDIR)$(sysconfdir)/enscript.cfg
 
 enscript.cfg: $(srcdir)/enscript.cfg.in Makefile
-	sed 's%@DATADIR@%$(datadir)%g; s%@media@%@MEDIA@%g; s%@BINDIR@%$(bindir)%g; s%@spooler@%@SPOOLER@%g; s%@pslevel@%@PSLEVEL@%g' \
+	sed 's%@DATADIR@%$(datadir)%g; s%@media@%@MEDIA@%g; s%@encoding@%@ENCODING@%g; s%@BINDIR@%$(bindir)%g; s%@spooler@%@SPOOLER@%g; s%@pslevel@%@PSLEVEL@%g' \
 	$(srcdir)/enscript.cfg.in >enscript.cfg
--- lib/enscript.cfg.in
+++ lib/enscript.cfg.in	2005-02-01 13:36:36.000000000 +0100
@@ -29,7 +29,7 @@
 AcceptCompositeCharacters: 0
 
 # Lookup path for the AFM files.
-AFMPath: @DATADIR@/enscript/afm:/usr/local/lib/ps:/usr/lib/ps
+AFMPath: @DATADIR@/ghostscript/fonts:@DATADIR@/enscript/afm
 
 # Append ^D character to the end of the output.  Some printers like HP
 # LaserJet 5 require this but the default is `false'.
@@ -42,7 +42,7 @@ AppendCtrlD: 0
 Clean7Bit: 1
 
 # Default input encoding.
-DefaultEncoding: latin1
+DefaultEncoding: @encoding@
 
 # Default fancy header.
 DefaultFancyHeader: enscript
@@ -96,6 +96,38 @@ Media:  Letter		612	792	38	24	574	768
 Media:	A4dj		595	842	24	50	571	818
 Media:  Letterdj        612     792     24      40      588     768
 
+# Define ghostscript page names and their sizes
+Media:	letter		612	792	24	24	574	768
+Media:	note		540	720	24	24	516	696
+Media:	legal		612	1008	24	24	588	984
+Media:	a0		2380	3368	24	24	2356	3344
+Media:	a1		1684	2380	24	24	1660	2356
+Media:	a2		1190	1684	24	24	1166	1660
+Media:	a3		842	1190	24	24	818	1166
+Media:	a4		595	842	24	24	571	818
+Media:	a5		421	595	24	24	397	571
+Media:	a6		297	421	24	24	273	397
+Media:	a7		210	297	24	24	186	273
+Media:	a8		148	210	24	24	124	186
+Media:	a9		105	148	24	24	81	124
+Media:	a10		74	105	24	24	50	81
+Media:	b0		2836	4008	24	24	2812	3984
+Media:	b1		2004	2836	24	24	1980	2812
+Media:	b2		1418	2004	24	24	1394	1980
+Media:	b3		1002	1418	24	24	978	1394
+Media:	b4		709	1002	24	24	685	978
+Media:	b5		501	709	24	24	477	685
+Media:	archE		2592	3456	24	24	2568	3432
+Media:	archD		1728	2592	24	24	1704	2568
+Media:	archC		1296	1728	24	24	1272	1704
+Media:	archB		864	1296	24	24	840	1272
+Media:	archA		648	864	24	24	624	840
+Media:	flsa		612	936	24	24	588	912
+Media:	flse		612	936	24	24	588	912
+Media:	halfletter	396	612	24	24	372	588
+Media:	11x17		792	1224	24	24	768	1200
+Media:	ledger		1224	792	24	24	1200	768
+
 # Spooler option to suppress the job header.
 NoJobHeaderSwitch: -h
 
@@ -130,7 +162,7 @@ QueueParam: -P
 # SetPageDevice: Duplex:true
 
 # Printer spooler command name.
-Spooler: @spooler@
+Spooler: /usr/bin/lpr
 
 # An absolute path to the states program.
 StatesBinary: @BINDIR@/states
--- lib/make-encoding.pl
+++ lib/make-encoding.pl	2005-02-01 13:36:36.000000000 +0100
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 #
 # Create encoding vectors from the `*.txt' encoding files.
 # Copyright (c) 1995-1998 Markku Rossi
--- src/gsint.h
+++ src/gsint.h	2005-02-01 13:36:36.000000000 +0100
@@ -114,6 +114,7 @@ extern double atan2 ___P ((double, doubl
 
 #if HAVE_LC_MESSAGES
 #include <locale.h>
+#include <langinfo.h>
 #endif
 
 #ifndef HAVE_GETCWD
@@ -182,6 +183,8 @@ typedef enum
   ENC_ISO_8859_7,
   ENC_ISO_8859_9,
   ENC_ISO_8859_10,
+  ENC_ISO_8859_13,
+  ENC_ISO_8859_15,
   ENC_ASCII,
   ENC_ASCII_FISE,
   ENC_ASCII_DKNO,
--- src/main.c
+++ src/main.c	2007-10-09 18:35:28.159452385 +0200
@@ -26,6 +26,8 @@
 
 #include "gsint.h"
 #include "getopt.h"
+#include <locale.h>
+#include <limits.h>
 
 /*
  * Prototypes for static functions.
@@ -333,6 +335,7 @@ unsigned int lines_per_page = (unsigned 
  * Send mail notification to user after print job has been completed.
  */
 int mail = 0;
+char *mailto;
 
 /*
  * -M, --media
@@ -799,15 +802,17 @@ double bggray = 1.0;
 
 EncodingRegistry encodings[] =
 {
-  {{"88591", "latin1", NULL},		ENC_ISO_8859_1,		'\n', 8},
-  {{"88592", "latin2", NULL},		ENC_ISO_8859_2,		'\n', 8},
-  {{"88593", "latin3", NULL},		ENC_ISO_8859_3,		'\n', 8},
-  {{"88594", "latin4", NULL},		ENC_ISO_8859_4,		'\n', 8},
-  {{"88595", "cyrillic", NULL},		ENC_ISO_8859_5,		'\n', 8},
-  {{"88597", "greek", NULL},		ENC_ISO_8859_7,		'\n', 8},
-  {{"88599", "latin5", NULL},		ENC_ISO_8859_9,		'\n', 8},
-  {{"885910", "latin6", NULL},		ENC_ISO_8859_10,	'\n', 8},
-  {{"ascii", NULL, NULL},		ENC_ASCII, 		'\n', 8},
+  {{"88591", "latin1", "ISO-8859-1"},	ENC_ISO_8859_1,		'\n', 8},
+  {{"88592", "latin2", "ISO-8859-2"},	ENC_ISO_8859_2,		'\n', 8},
+  {{"88593", "latin3", "ISO-8859-3"},	ENC_ISO_8859_3,		'\n', 8},
+  {{"88594", "latin4", "ISO-8859-4"},	ENC_ISO_8859_4,		'\n', 8},
+  {{"88595", "cyrillic", "ISO-8859-5"},	ENC_ISO_8859_5,		'\n', 8},
+  {{"88597", "greek", "ISO-8859-7"},	ENC_ISO_8859_7,		'\n', 8},
+  {{"88599", "latin5", "ISO-8859-9"},	ENC_ISO_8859_9,		'\n', 8},
+  {{"885910", "latin6", "ISO-8859-10"},	ENC_ISO_8859_10,	'\n', 8},
+  {{"885913", "latin7", "ISO-8859-13"},	ENC_ISO_8859_13,	'\n', 8},
+  {{"885915", "latin9", "ISO-8859-15"},	ENC_ISO_8859_15,	'\n', 8},
+  {{"ascii", NULL, "ANSI_X3.4-1968"},	ENC_ASCII, 		'\n', 8},
   {{"asciifise", "asciifi", "asciise"},	ENC_ASCII_FISE,		'\n', 8},
   {{"asciidkno", "asciidk", "asciino"},	ENC_ASCII_DKNO,		'\n', 8},
   {{"ibmpc", "pc", "dos"},		ENC_IBMPC, 		'\n', 8},
@@ -852,7 +857,7 @@ static struct option long_options[] =
   {"no-page-prefeed",		no_argument,		0, 'K'},
   {"lineprinter",		no_argument,		0, 'l'},
   {"lines-per-page",		required_argument,	0, 'L'},
-  {"mail",			no_argument,		0, 'm'},
+  {"mail",			optional_argument,	0, 'm'},
   {"media",			required_argument,	0, 'M'},
   {"copies",			required_argument,	0, 'n'},
   {"newline",			required_argument,	0, 'N'},
@@ -974,6 +979,10 @@ main (int argc, char *argv[])
 #if HAVE_LC_MESSAGES
   setlocale (LC_MESSAGES, "");
 #endif
+  setlocale (LC_CTYPE, "");
+#ifdef LC_PAPER
+  setlocale (LC_PAPER, "");
+#endif
 #endif
 #if ENABLE_NLS
   bindtextdomain (PACKAGE, LOCALEDIR);
@@ -1848,7 +1857,11 @@ open_output_file ()
       /* Format spooler options. */
       spooler_options[0] = '\0';
       if (mail)
-	strcat (spooler_options, "-m ");
+	{
+	  strcat (spooler_options, "-m ");
+	  strcat (spooler_options, mailto);
+	  strcat (spooler_options, " ");
+	}
       if (no_job_header)
 	{
 	  strcat (spooler_options, no_job_header_switch);
@@ -2011,7 +2024,7 @@ handle_options (int argc, char *argv[])
       int i;
 
       c = getopt_long (argc, argv,
-		       "#:123456789a:A:b:BcC::d:D:e::E::f:F:gGhH::i:I:jJ:kKlL:mM:n:N:o:Op:P:qrRs:S:t:T:u::U:vVW:X:zZ",
+		       "#:123456789a:A:b:BcC::d:D:e::E::f:F:gGhH::i:I:jJ:kKlL:m::M:n:N:o:Op:P:qrRs:S:t:T:u::U:vVw:W:X:zZ",
 		       long_options, &option_index);
 
       if (c == -1)
@@ -2212,6 +2225,10 @@ handle_options (int argc, char *argv[])
 
 	case 'm':		/* send mail upon completion */
 	  mail = 1;
+	  if(optarg)
+	    mailto = (optarg);
+	  else
+	    mailto = (*passwd).pw_name;
 	  break;
 
 	case 'M':		/* select output media */
--- src/util.c
+++ src/util.c	2005-02-01 13:50:21.000000000 +0100
@@ -32,7 +32,7 @@
 
 #define CFG_FATAL(body)						\
   do {								\
-    fprintf (stderr, "%s:%s:%d: ", program, fname, line);	\
+    fprintf (stderr, "%s:%s:%d: ", program, buffer_ptr(&fname), line);	\
     fprintf body;						\
     fprintf (stderr, "\n");					\
     fflush (stderr);						\
@@ -156,6 +156,14 @@ read_config (char *path, char *file)
 	{
 	  token2 = GET_TOKEN (NULL);
 	  CHECK_TOKEN ();
+	  if (!strcasecmp("LC_CTYPE", token2))
+	    {
+	      char * codeset = nl_langinfo(_NL_CTYPE_CODESET_NAME);
+	      if (codeset && !strncasecmp(codeset, "iso", 3))
+		token2 = codeset;
+	      else
+		token2 = "885915";
+	    }
 	  xfree (encoding_name);
 	  encoding_name = xstrdup (token2);
 	}
@@ -170,6 +178,16 @@ read_config (char *path, char *file)
 	{
 	  token2 = GET_TOKEN (NULL);
 	  CHECK_TOKEN ();
+#ifdef LC_PAPER
+	  if (!strcasecmp("LC_PAPER", token2))
+	    {
+	      unsigned int paperheight = (unsigned int)nl_langinfo(_NL_PAPER_HEIGHT);
+	      if (paperheight && paperheight == 279)
+		token2 = "letter";
+	      else
+		token2 = "a4";
+	    }
+#endif
 	  xfree (media_name);
 	  media_name = xstrdup (token2);
 	}
@@ -948,6 +966,16 @@ read_font_info (void)
 					enc_flags);
 	      break;
 
+	    case ENC_ISO_8859_13:
+	      (void) afm_font_encoding (font, AFM_ENCODING_ISO_8859_13,
+					enc_flags);
+	      break;
+
+	    case ENC_ISO_8859_15:
+	      (void) afm_font_encoding (font, AFM_ENCODING_ISO_8859_15,
+					enc_flags);
+	      break;
+
 	    case ENC_ASCII:
 	      (void) afm_font_encoding (font, AFM_ENCODING_ASCII, enc_flags);
 	      break;
--- states/over.in
+++ states/over.in	2005-02-01 13:36:36.000000000 +0100
@@ -2,4 +2,4 @@
 
 librarydir=@LIBRARYDIR@
 
-enscript -E -p- --quiet --language=overstrike $* 2>&1 | less
+enscript -E -p- --quiet --language=overstrike "$@" 2>&1 | less
--- states/hl/Makefile.am
+++ states/hl/Makefile.am	2005-02-01 13:36:36.000000000 +0100
@@ -45,11 +45,11 @@ states = $(misc) $(styles) $(languages) 
 EXTRA_DIST = $(states)
 
 install-data-local:
-	$(top_srcdir)/mkinstalldirs $(datadir)/enscript
-	$(top_srcdir)/mkinstalldirs $(datadir)/enscript/hl
+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/enscript
+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/enscript/hl
 	for f in $(states); do \
-	  $(INSTALL_DATA) $(srcdir)/$$f $(datadir)/enscript/hl/$$f; \
+	  $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(datadir)/enscript/hl/$$f; \
 	done
 
 uninstall-local:
-	rm -rf $(datadir)/enscript/hl
+	rm -rf $(DESTDIR)$(datadir)/enscript/hl