From MAILER-DAEMON Tue Jan 23 10:30:14 2018 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1ee0Wc-0008C6-M4 for mharc-bug-enscript@gnu.org; Tue, 23 Jan 2018 10:30:14 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36575) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edzXd-00072l-L1 for bug-enscript@gnu.org; Tue, 23 Jan 2018 09:27:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edzXZ-0001KN-GE for bug-enscript@gnu.org; Tue, 23 Jan 2018 09:27:13 -0500 Received: from mx2.suse.de ([195.135.220.15]:34392) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1edzXZ-0001Js-9m for bug-enscript@gnu.org; Tue, 23 Jan 2018 09:27:09 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 42F6EABD9 for ; Tue, 23 Jan 2018 14:27:08 +0000 (UTC) From: Werner Fink To: bug-enscript@gnu.org Date: Tue, 23 Jan 2018 15:26:44 +0100 Message-Id: <20180123142650.4460-3-werner@suse.de> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20180123142650.4460-1-werner@suse.de> References: <20180123142650.4460-1-werner@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 195.135.220.15 X-Mailman-Approved-At: Tue, 23 Jan 2018 10:30:13 -0500 Subject: [bug-enscript] [PATCH 2/8] Add a patch from Josh Zenker for bash highlight X-BeenThere: bug-enscript@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Bug reports for GNU Enscript List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jan 2018 14:27:14 -0000 An escaped double- or single-quotation mark gets treated as the beginning of a string, e.g. ntp_server=`grep '^XNTPD_INITIAL_NTPDATE=' $XNTPD_CFG | awk -F\" '{print $2}'` Signed-off-by: Werner Fink --- states/hl/sh.st | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git states/hl/sh.st states/hl/sh.st index b034f16..39c40ed 100644 --- states/hl/sh.st +++ states/hl/sh.st @@ -2,8 +2,21 @@ * Name: sh * Description: Bourne shell programming language. * Author: Juergen Kahrs + * Josh Zenker */ +state sh_string extends Highlight +{ + /\\\\./ { + language_print ($0); + } + + sh_string_end { + language_print ($0); + return; + } +} + state sh extends HighlightEntry { /* Comments. */ @@ -14,11 +27,25 @@ state sh extends HighlightEntry comment_face (false); } + /* Ignore escaped quotation marks */ + /\\\"/ { + language_print ($0); + } + + /\\\'/ { + language_print ($0); + } + + /\\\`/ { + language_print ($0); + } + /* String constants. */ - /\"/ { + /\"|'/ { + sh_string_end = regexp($0); string_face (true); language_print ($0); - call (c_string); + call (sh_string); string_face (false); } @@ -43,7 +70,7 @@ state sh extends HighlightEntry /* Keywords. */ /\b(CDPATH|HOME|IFS|MAIL((CHECK)?|(PATH)?)|P(ATH|S(1|2))|SH(ACCT|ELL)|\ -break|c(ase|d|ontinue)|do(ne)?|e(cho|lse|sac|val|x(ec|it|port))|f(i|or)|\ +break|c(ase|d|ontinue)|do(ne)?|e(cho|l(if|se)|sac|val|x(ec|it|port))|f(i|or)|\ getopts|hash|i[fn]|limit|newgrp|pwd|re(ad(only)?|turn)|s(et|hift)|\ t(est|hen|imes|rap|ype)|u(limit|mask|n(limit|set))|w(ait|hile))\b/ { keyword_face (true); -- 2.12.3 From MAILER-DAEMON Tue Jan 23 10:30:16 2018 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1ee0We-0008EP-4o for mharc-bug-enscript@gnu.org; Tue, 23 Jan 2018 10:30:16 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36650) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edzXl-00077R-Mj for bug-enscript@gnu.org; Tue, 23 Jan 2018 09:27:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edzXk-0001Tl-IS for bug-enscript@gnu.org; Tue, 23 Jan 2018 09:27:21 -0500 Received: from mx2.suse.de ([195.135.220.15]:34425) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1edzXk-0001Sh-CS for bug-enscript@gnu.org; Tue, 23 Jan 2018 09:27:20 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 60463AAB5 for ; Tue, 23 Jan 2018 14:27:19 +0000 (UTC) From: Werner Fink To: bug-enscript@gnu.org Date: Tue, 23 Jan 2018 15:26:48 +0100 Message-Id: <20180123142650.4460-7-werner@suse.de> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20180123142650.4460-1-werner@suse.de> References: <20180123142650.4460-1-werner@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 195.135.220.15 X-Mailman-Approved-At: Tue, 23 Jan 2018 10:30:13 -0500 Subject: [bug-enscript] [PATCH 6/8] Add optional address for mailto option X-BeenThere: bug-enscript@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Bug reports for GNU Enscript List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jan 2018 14:27:22 -0000 Signed-off-by: Werner Fink --- src/main.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git src/main.c src/main.c index ef8c220..c9f4951 100644 --- src/main.c +++ src/main.c @@ -331,6 +331,7 @@ unsigned int lines_per_page = (unsigned int) -1; * Send mail notification to user after print job has been completed. */ int mail = 0; +char *mailto; /* * -M, --media @@ -852,7 +853,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'}, @@ -1851,7 +1852,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); @@ -2014,7 +2019,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:W: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) @@ -2215,6 +2220,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 */ -- 2.12.3 From MAILER-DAEMON Tue Jan 23 10:30:16 2018 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1ee0We-0008Ed-Af for mharc-bug-enscript@gnu.org; Tue, 23 Jan 2018 10:30:16 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36721) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edzXr-0007Av-7Z for bug-enscript@gnu.org; Tue, 23 Jan 2018 09:27:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edzXp-0001Zg-GY for bug-enscript@gnu.org; Tue, 23 Jan 2018 09:27:27 -0500 Received: from mx2.suse.de ([195.135.220.15]:34452) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1edzXp-0001Xm-6c for bug-enscript@gnu.org; Tue, 23 Jan 2018 09:27:25 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 32C9EAAB5 for ; Tue, 23 Jan 2018 14:27:24 +0000 (UTC) From: Werner Fink To: bug-enscript@gnu.org Date: Tue, 23 Jan 2018 15:26:50 +0100 Message-Id: <20180123142650.4460-9-werner@suse.de> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20180123142650.4460-1-werner@suse.de> References: <20180123142650.4460-1-werner@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 195.135.220.15 X-Mailman-Approved-At: Tue, 23 Jan 2018 10:30:13 -0500 Subject: [bug-enscript] [PATCH 8/8] Simply avoid warnings of modern gcc X-BeenThere: bug-enscript@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Bug reports for GNU Enscript List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jan 2018 14:27:30 -0000 Signed-off-by: Werner Fink --- afmlib/afmparse.c | 2 +- compat/regex.c | 12 ++++++------ compat/xalloc.c | 6 +++--- src/gsint.h | 2 +- src/main.c | 3 ++- src/psgen.c | 30 ++++++++++++++---------------- src/util.c | 10 ++++++---- states/main.c | 2 +- states/utils.c | 2 +- 9 files changed, 35 insertions(+), 34 deletions(-) diff --git afmlib/afmparse.c afmlib/afmparse.c index 7b29620..9bebc70 100644 --- afmlib/afmparse.c +++ afmlib/afmparse.c @@ -620,7 +620,7 @@ static void get_key (AFMHandle handle, ParseCtx *ctx, AFMKey *key_return) { int key; - char msg[256]; + char msg[1024+16]; while (1) { diff --git compat/regex.c compat/regex.c index c6907f3..c059b4b 100644 --- compat/regex.c +++ compat/regex.c @@ -2400,11 +2400,12 @@ regex_compile (pattern, size, syntax, bufp) 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, bufp) } /* 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''. */ @@ -3106,8 +3108,6 @@ re_compile_fastmap (bufp) char *destination; #endif /* We don't push any register information onto the failure stack. */ - unsigned num_regs = 0; - register char *fastmap = bufp->fastmap; unsigned char *pattern = bufp->buffer; unsigned char *p = pattern; @@ -4801,8 +4801,8 @@ re_match_2_internal (bufp, string1, size1, string2, size2, pos, regs, stop) register from the stack, since lowest will == highest in `pop_failure_point'. */ active_reg_t dummy_low_reg, dummy_high_reg; - unsigned char *pdummy; - const char *sdummy; + unsigned char *pdummy __attribute__ ((__unused__)); + const char *sdummy __attribute__ ((__unused__)); DEBUG_PRINT1 ("EXECUTING pop_failure_jump.\n"); POP_FAILURE_POINT (sdummy, pdummy, diff --git compat/xalloc.c compat/xalloc.c index c1ff51f..4194855 100644 --- compat/xalloc.c +++ compat/xalloc.c @@ -67,7 +67,7 @@ xmalloc (size) ptr = malloc (size); if (ptr == NULL) { - fprintf (stderr, _("xmalloc(): couldn't allocate %d bytes\n"), size); + fprintf (stderr, _("xmalloc(): couldn't allocate %zd bytes\n"), size); exit (1); } @@ -85,7 +85,7 @@ xcalloc (num, size) ptr = calloc (num, size); if (ptr == NULL) { - fprintf (stderr, _("xcalloc(): couldn't allocate %d bytes\n"), size); + fprintf (stderr, _("xcalloc(): couldn't allocate %zd bytes\n"), size); exit (1); } @@ -106,7 +106,7 @@ xrealloc (ptr, size) nptr = realloc (ptr, size); if (nptr == NULL) { - fprintf (stderr, _("xrealloc(): couldn't reallocate %d bytes\n"), size); + fprintf (stderr, _("xrealloc(): couldn't reallocate %zd bytes\n"), size); exit (1); } diff --git src/gsint.h src/gsint.h index 81c3257..c59c92c 100644 --- src/gsint.h +++ src/gsint.h @@ -131,7 +131,7 @@ extern double atan2 ___P ((double, double)); (('0' <= (ch) && (ch) <= '9') || (ch) == '.' || (ch) == '-' || (ch) == '+') /* Return the width of the character */ -#define CHAR_WIDTH(ch) (font_widths[(unsigned char) (ch)]) +#define FNT_CHAR_WIDTH(ch) (font_widths[(unsigned char) (ch)]) /* Current point y movement from line to line. */ #define LINESKIP (Fpt.h + baselineskip) diff --git src/main.c src/main.c index c9f4951..b68699b 100644 --- src/main.c +++ src/main.c @@ -1470,7 +1470,8 @@ name width\theight\tllx\tlly\turx\tury\n\ buffer_append (&buffer, enscript_library); buffer_append (&buffer, "/hl/*.st"); - system (buffer_ptr (&buffer)); + if (system (buffer_ptr (&buffer)) < 0) + perror("system"); exit (0); } diff --git src/psgen.c src/psgen.c index 21e4c75..3990659 100644 --- src/psgen.c +++ src/psgen.c @@ -585,8 +585,8 @@ process_file (char *fname_arg, InputStream *is, int is_toc) * Count possible line number spaces. This should be enought for 99999 * lines */ - linenumber_space = CHAR_WIDTH ('0') * 5 + 1.0; - linenumber_margin = CHAR_WIDTH (':') + CHAR_WIDTH ('m'); + linenumber_space = FNT_CHAR_WIDTH ('0') * 5 + 1.0; + linenumber_margin = FNT_CHAR_WIDTH (':') + FNT_CHAR_WIDTH ('m'); /* We got a new input file. */ input_filenum++; @@ -1137,7 +1137,7 @@ large for page\n"), /* Help macros. */ /* Check if character fits to current line. */ -#define FITS_ON_LINE(ch) ((linepos + CHAR_WIDTH (ch) < linew) || col == 0) +#define FITS_ON_LINE(ch) ((linepos + FNT_CHAR_WIDTH (ch) < linew) || col == 0) /* Is line buffer empty? */ #define BUFFER_EMPTY() (bufpos == 0) @@ -1160,13 +1160,13 @@ large for page\n"), #define EMIT(ch) \ do { \ APPEND_CHAR (ch); \ - linepos += CHAR_WIDTH (ch); \ + linepos += FNT_CHAR_WIDTH (ch); \ col++; \ } while (0) #define UNEMIT(ch) \ do { \ - linepos -= CHAR_WIDTH (ch); \ + linepos -= FNT_CHAR_WIDTH (ch); \ col--; \ } while (0) @@ -1690,7 +1690,7 @@ get_next_token (InputStream *is, double linestart, double linepos, { /* Proportional font. */ - double grid = tabsize * CHAR_WIDTH (' '); + double grid = tabsize * FNT_CHAR_WIDTH (' '); col++; /* Move linepos to the next multiple of . */ @@ -1748,9 +1748,9 @@ get_next_token (InputStream *is, double linestart, double linepos, if (ch == bs) { if (BUFFER_EMPTY () || !EXISTS (buffer[bufpos - 1])) - linepos -= CHAR_WIDTH ('m'); + linepos -= FNT_CHAR_WIDTH ('m'); else - linepos -= CHAR_WIDTH (buffer[bufpos - 1]); + linepos -= FNT_CHAR_WIDTH (buffer[bufpos - 1]); done = DONE_DONE; break; @@ -1775,7 +1775,7 @@ get_next_token (InputStream *is, double linestart, double linepos, APPEND_CHAR (buf[i]); /* Update current point counters manually. */ - linepos += CHAR_WIDTH (ch); + linepos += FNT_CHAR_WIDTH (ch); col++; } else if (ch == '(' || ch == ')' || ch == '\\') @@ -1848,7 +1848,7 @@ get_next_token (InputStream *is, double linestart, double linepos, /* Count length. */ for (i = 0; buf[i]; i++) - len += CHAR_WIDTH (buf[i]); + len += FNT_CHAR_WIDTH (buf[i]); if (linepos + len < linew || col == 0) { @@ -2472,7 +2472,7 @@ recognize_eps_file (Token *token) /* No, this BoundingBox comment is corrupted. */ MESSAGE (0, (stderr, _("EPS file \"%s\" contains malformed \ %%%%BoundingBox row:\n\"%.*s\"\n"), - token->u.epsf.filename, strlen (buf) - 1, buf)); + token->u.epsf.filename, (int)(strlen (buf) - 1), buf)); break; } } @@ -2599,7 +2599,7 @@ read_float (InputStream *is, int units, int horizontal) case 'l': /* lines or characters */ if (horizontal) - val *= CHAR_WIDTH ('m'); + val *= FNT_CHAR_WIDTH ('m'); else val *= LINESKIP; break; @@ -2728,7 +2728,7 @@ print_line_number (double x, double y, double space, double margin, int i; char *saved_Fname = ""; FontPoint saved_Fpt; - InputEncoding saved_Fencoding; + InputEncoding saved_Fencoding = 0; saved_Fpt.w = 0.0; saved_Fpt.h = 0.0; @@ -2758,7 +2758,7 @@ print_line_number (double x, double y, double space, double margin, /* Count linenumber string length. */ sprintf (buf, "%d", linenum); for (i = 0; buf[i]; i++) - len += CHAR_WIDTH (buf[i]); + len += FNT_CHAR_WIDTH (buf[i]); /* Print line numbers. */ OUTPUT ((cofp, "%g %g M (%s:) s\n", x + space - len, y, buf)); @@ -2781,8 +2781,6 @@ print_line_number (double x, double y, double space, double margin, * The name of the divert file, shared between divert() and undivert() * functions. */ -static char divertfname[512]; - static void divert () { diff --git src/util.c src/util.c index 5ec7396..25e5e32 100644 --- src/util.c +++ src/util.c @@ -647,7 +647,7 @@ paste_file (char *name, char *suffix) if (j >= sizeof (name) - 1) FATAL ((stderr, _("%s:%d: %%Format: too long name, maxlen=%d"), - buffer_ptr (ctx.fullname), line, sizeof (name) - 1)); + buffer_ptr (ctx.fullname), line, (int)(sizeof (name) - 1))); /* Find the start of the format string. */ for (; buf[i] && isspace (buf[i]); i++) @@ -1388,7 +1388,8 @@ format_user_string (char *context_name, char *str) break; case 'c': /* `%c' trailing component of pwd. */ - getcwd (buf, sizeof (buf)); + if (!getcwd (buf, sizeof (buf))) + perror("getcwd"); cp = strrchr (buf, '/'); if (cp) cp++; @@ -1404,7 +1405,8 @@ format_user_string (char *context_name, char *str) break; case 'd': /* `%d' current working directory */ - getcwd (buf, sizeof (buf)); + if (!getcwd (buf, sizeof (buf))) + perror("getcwd"); APPEND_STR (buf); break; @@ -1872,7 +1874,7 @@ parse_float (char *string, int units, int horizontal) case 'l': if (horizontal) - val *= CHAR_WIDTH ('m'); + val *= FNT_CHAR_WIDTH ('m'); else val *= LINESKIP; break; diff --git states/main.c states/main.c index 1c330dc..b0865f4 100644 --- states/main.c +++ states/main.c @@ -371,7 +371,7 @@ main (argc, argv) if (cp) { path = xmalloc (cp - defs_file + 3); - sprintf (path, ".%c%.*s", PATH_SEPARATOR, cp - defs_file, defs_file); + sprintf (path, ".%c%.*s", PATH_SEPARATOR, (int)(cp - defs_file), defs_file); } else path = "."; diff --git states/utils.c states/utils.c index d4ee9dd..8ce3355 100644 --- states/utils.c +++ states/utils.c @@ -833,7 +833,7 @@ eval_expr (expr, env) { Environment *nenv = NULL; ListItem *i, *e; - List *stmts; + List *stmts __attribute__ ((__unused__)); List *lst; Cons *args_locals; -- 2.12.3 From MAILER-DAEMON Tue Jan 23 10:30:17 2018 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1ee0Wf-0008GH-Hk for mharc-bug-enscript@gnu.org; Tue, 23 Jan 2018 10:30:17 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36563) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edzXc-000725-C1 for bug-enscript@gnu.org; Tue, 23 Jan 2018 09:27:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edzXU-0001D9-Fx for bug-enscript@gnu.org; Tue, 23 Jan 2018 09:27:12 -0500 Received: from mx2.suse.de ([195.135.220.15]:34361) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1edzXU-0001AB-8v for bug-enscript@gnu.org; Tue, 23 Jan 2018 09:27:04 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 2F69EAB02 for ; Tue, 23 Jan 2018 14:27:03 +0000 (UTC) From: Werner Fink To: bug-enscript@gnu.org Date: Tue, 23 Jan 2018 15:26:43 +0100 Message-Id: <20180123142650.4460-2-werner@suse.de> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20180123142650.4460-1-werner@suse.de> References: <20180123142650.4460-1-werner@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 195.135.220.15 X-Mailman-Approved-At: Tue, 23 Jan 2018 10:30:13 -0500 Subject: [bug-enscript] [PATCH 1/8] Add a patch from Josh Zenker to fix perl highlight X-BeenThere: bug-enscript@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Bug reports for GNU Enscript List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jan 2018 14:27:16 -0000 If a hash/pound appears within parentheses, the rest of the line gets highlighted as though it were a comment, e.g. if ($#ARGV + 1 ne $EXPECTED_ARGS) { Signed-off-by: Werner Fink --- states/hl/perl.st | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git states/hl/perl.st states/hl/perl.st index 418a146..161dae1 100644 --- states/hl/perl.st +++ states/hl/perl.st @@ -4,6 +4,7 @@ * * Author: Jim Villani, Logistics Management Institute (jvillani@lmi.org) * perl_pod mods by Gregor Purdy (gregor@focusresearch.com) + * perl_parens by Josh Zenker (josh.zenker@sig.com) */ state perl_pod extends Highlight @@ -58,6 +59,18 @@ state perl_bquot_string extends Highlight } } +state perl_parens extends Highlight +{ + /\\\\./ { + language_print ($0); + } + /\)/ { + language_print ($0); + return; + } +} + + state perl extends HighlightEntry { /* Comments. */ @@ -186,6 +199,12 @@ state perl extends HighlightEntry language_print ($0); call (perl_pod); } + + /* parentheses */ + /\(/ { + language_print ($0); + call (perl_parens); + } } -- 2.12.3 From MAILER-DAEMON Tue Jan 23 10:30:18 2018 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1ee0Wf-0008GY-RV for mharc-bug-enscript@gnu.org; Tue, 23 Jan 2018 10:30:17 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36686) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edzXo-00078z-2f for bug-enscript@gnu.org; Tue, 23 Jan 2018 09:27:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edzXn-0001Wa-2a for bug-enscript@gnu.org; Tue, 23 Jan 2018 09:27:24 -0500 Received: from mx2.suse.de ([195.135.220.15]:34434) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1edzXm-0001Vd-SQ for bug-enscript@gnu.org; Tue, 23 Jan 2018 09:27:22 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id D11FBAAB5 for ; Tue, 23 Jan 2018 14:27:21 +0000 (UTC) From: Werner Fink To: bug-enscript@gnu.org Date: Tue, 23 Jan 2018 15:26:49 +0100 Message-Id: <20180123142650.4460-8-werner@suse.de> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20180123142650.4460-1-werner@suse.de> References: <20180123142650.4460-1-werner@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 195.135.220.15 X-Mailman-Approved-At: Tue, 23 Jan 2018 10:30:13 -0500 Subject: [bug-enscript] [PATCH 7/8] Mention options for helper apps in manual page X-BeenThere: bug-enscript@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Bug reports for GNU Enscript List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jan 2018 14:27:25 -0000 Signed-off-by: Werner Fink --- docs/enscript.man | 3 +++ 1 file changed, 3 insertions(+) diff --git docs/enscript.man docs/enscript.man index 61ce694..364209f 100644 --- docs/enscript.man +++ docs/enscript.man @@ -398,6 +398,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: -- 2.12.3 From MAILER-DAEMON Tue Jan 23 10:30:18 2018 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1ee0Wg-0008HO-8p for mharc-bug-enscript@gnu.org; Tue, 23 Jan 2018 10:30:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36460) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edzXQ-0006va-Mc for bug-enscript@gnu.org; Tue, 23 Jan 2018 09:27:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edzXO-0000vt-PV for bug-enscript@gnu.org; Tue, 23 Jan 2018 09:27:00 -0500 Received: from mx2.suse.de ([195.135.220.15]:34342) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1edzXO-0000rO-Ir for bug-enscript@gnu.org; Tue, 23 Jan 2018 09:26:58 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 0E1A6ADB7 for ; Tue, 23 Jan 2018 14:26:57 +0000 (UTC) From: Werner Fink To: bug-enscript@gnu.org Date: Tue, 23 Jan 2018 15:26:42 +0100 Message-Id: <20180123142650.4460-1-werner@suse.de> X-Mailer: git-send-email 2.12.3 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 195.135.220.15 X-Mailman-Approved-At: Tue, 23 Jan 2018 10:30:13 -0500 Subject: [bug-enscript] Various patches to enhance enscript X-BeenThere: bug-enscript@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Bug reports for GNU Enscript List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jan 2018 14:27:01 -0000 Hi, I'd like to suggest to add some patches I'm using for enscript [PATCH 1/8] Add a patch from Josh Zenker to fix perl highlight [PATCH 2/8] Add a patch from Josh Zenker for bash highlight [PATCH 3/8] Automake 1.12 and up no longer supports pre-ANSI [PATCH 4/8] Add support for baltic locale as well as for Euro [PATCH 5/8] Flexible encoding and support of locale paper size [PATCH 6/8] Add optional address for mailto option [PATCH 7/8] Mention options for helper apps in manual page [PATCH 8/8] Simply avoid warnings of modern gcc Werner From MAILER-DAEMON Tue Jan 23 10:30:18 2018 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1ee0Wg-0008Hn-Hn for mharc-bug-enscript@gnu.org; Tue, 23 Jan 2018 10:30:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36638) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edzXl-00077B-6U for bug-enscript@gnu.org; Tue, 23 Jan 2018 09:27:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edzXg-0001Pd-Et for bug-enscript@gnu.org; Tue, 23 Jan 2018 09:27:21 -0500 Received: from mx2.suse.de ([195.135.220.15]:34413) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1edzXg-0001OJ-0u for bug-enscript@gnu.org; Tue, 23 Jan 2018 09:27:16 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 001B3AAB5 for ; Tue, 23 Jan 2018 14:27:14 +0000 (UTC) From: Werner Fink To: bug-enscript@gnu.org Date: Tue, 23 Jan 2018 15:26:46 +0100 Message-Id: <20180123142650.4460-5-werner@suse.de> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20180123142650.4460-1-werner@suse.de> References: <20180123142650.4460-1-werner@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 195.135.220.15 X-Mailman-Approved-At: Tue, 23 Jan 2018 10:30:13 -0500 Subject: [bug-enscript] [PATCH 4/8] Add support for baltic locale as well as for Euro X-BeenThere: bug-enscript@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Bug reports for GNU Enscript List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jan 2018 14:27:26 -0000 add missing baltic support which is latin7 also known as ISO-8859-13 as well as latin9 aka ISO-8859-15 to support baltic languages as well as the Euro symbol. This requires to provide a ligature for printing the Euro symbol. Signed-off-by: Werner Fink --- 885913.txt | 291 ++++++++++++++++++++++++++++++++++++++++++++++ 885915.txt | 291 ++++++++++++++++++++++++++++++++++++++++++++++ afm/cob.afm | 6 +- afm/cobo.afm | 6 +- afm/com.afm | 6 +- afm/coo.afm | 6 +- afm/hv.afm | 6 +- afm/hvb.afm | 6 +- afm/hvbo.afm | 6 +- afm/hvo.afm | 6 +- afm/tib.afm | 6 +- afm/tibi.afm | 6 +- afm/tii.afm | 6 +- afm/tir.afm | 6 +- afmlib/Makefile-encodings | 8 +- afmlib/Makefile.am | 2 +- afmlib/afm.c | 8 ++ afmlib/afm.h | 2 + afmlib/afmint.h | 2 + afmlib/make-encoding.pl | 2 +- docs/enscript.man | 6 + lib/Makefile-encodings | 8 +- lib/Makefile.am | 2 +- lib/make-encoding.pl | 2 +- src/gsint.h | 3 + src/main.c | 20 ++-- src/util.c | 18 +++ 27 files changed, 698 insertions(+), 39 deletions(-) create mode 100644 885913.txt create mode 100644 885915.txt diff --git 885913.txt 885913.txt new file mode 100644 index 0000000..5714c86 --- /dev/null +++ 885913.txt @@ -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 diff --git 885915.txt 885915.txt new file mode 100644 index 0000000..cce55f8 --- /dev/null +++ 885915.txt @@ -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 diff --git afm/cob.afm afm/cob.afm index 4ade4fa..cf16f6f 100644 --- afm/cob.afm +++ afm/cob.afm @@ -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 784 ; 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 678 ; 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 circumflex 0 0 ; 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 ; diff --git afm/cobo.afm afm/cobo.afm index e0b3940..04d919a 100644 --- afm/cobo.afm +++ afm/cobo.afm @@ -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 784 ; 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 678 ; 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 circumflex 0 0 ; 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 ; diff --git afm/com.afm afm/com.afm index e65ecdf..12196d4 100644 --- afm/com.afm +++ afm/com.afm @@ -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 793 ; 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 627 ; 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 circumflex 0 0 ; 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 ; diff --git afm/coo.afm afm/coo.afm index 79bb0c3..34bb3f2 100644 --- afm/coo.afm +++ afm/coo.afm @@ -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 793 ; 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 627 ; 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 circumflex 0 0 ; 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 ; diff --git afm/hv.afm afm/hv.afm index 80d8cff..477f3a3 100644 --- afm/hv.afm +++ afm/hv.afm @@ -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 734 ; 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 circumflex 112 0 ; 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 ; diff --git afm/hvb.afm afm/hvb.afm index f428198..1cd8d29 100644 --- afm/hvb.afm +++ afm/hvb.afm @@ -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 750 ; 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 circumflex 139 0 ; 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 ; diff --git afm/hvbo.afm afm/hvbo.afm index 0df5aaf..35f472b 100644 --- afm/hvbo.afm +++ afm/hvbo.afm @@ -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 750 ; 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 circumflex 139 0 ; 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 ; diff --git afm/hvo.afm afm/hvo.afm index 4f0476f..6675240 100644 --- afm/hvo.afm +++ afm/hvo.afm @@ -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 734 ; 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 circumflex 112 0 ; 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 ; diff --git afm/tib.afm afm/tib.afm index 6ee7ef6..b6802be 100644 --- afm/tib.afm +++ afm/tib.afm @@ -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 713 ; 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 circumflex 84 0 ; 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 ; diff --git afm/tibi.afm afm/tibi.afm index d329ebb..91b205e 100644 --- afm/tibi.afm +++ afm/tibi.afm @@ -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 697 ; 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 circumflex 84 0 ; 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 ; diff --git afm/tii.afm afm/tii.afm index 1db2cff..6b8de1d 100644 --- afm/tii.afm +++ afm/tii.afm @@ -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 664 ; 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 circumflex 74 0 ; 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 ; diff --git afm/tir.afm afm/tir.afm index 58de46e..768a65f 100644 --- afm/tir.afm +++ afm/tir.afm @@ -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 678 ; 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 circumflex 84 0 ; 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 ; diff --git afmlib/Makefile-encodings afmlib/Makefile-encodings index f68c75b..0d8c8d2 100644 --- afmlib/Makefile-encodings +++ afmlib/Makefile-encodings @@ -22,7 +22,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) @@ -53,6 +53,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 diff --git afmlib/Makefile.am afmlib/Makefile.am index 33db4b0..ed64d2e 100644 --- afmlib/Makefile.am +++ afmlib/Makefile.am @@ -24,7 +24,7 @@ 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 diff --git afmlib/afm.c afmlib/afm.c index 3b82bca..f82dd94 100644 --- afmlib/afm.c +++ afmlib/afm.c @@ -647,6 +647,14 @@ afm_font_encoding (AFMFont font, AFMEncoding enc, unsigned int flags) 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; diff --git afmlib/afm.h afmlib/afm.h index 19855ce..8fd8b5d 100644 --- afmlib/afm.h +++ afmlib/afm.h @@ -281,6 +281,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 */ diff --git afmlib/afmint.h afmlib/afmint.h index 7995ae5..6aedf95 100644 --- afmlib/afmint.h +++ afmlib/afmint.h @@ -256,6 +256,8 @@ extern AFMEncodingTable afm_88595_encoding[]; 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[]; diff --git afmlib/make-encoding.pl afmlib/make-encoding.pl index 2bc615d..a1d3db1 100755 --- afmlib/make-encoding.pl +++ afmlib/make-encoding.pl @@ -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. diff --git docs/enscript.man docs/enscript.man index 7b92eb9..61ce694 100644 --- docs/enscript.man +++ docs/enscript.man @@ -427,6 +427,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 diff --git lib/Makefile-encodings lib/Makefile-encodings index b54da39..a820331 100644 --- lib/Makefile-encodings +++ lib/Makefile-encodings @@ -24,7 +24,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) @@ -64,6 +64,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 diff --git lib/Makefile.am lib/Makefile.am index 3ab98ce..fc40ecd 100644 --- lib/Makefile.am +++ lib/Makefile.am @@ -26,7 +26,7 @@ pkgdata_DATA = ascii.enc asciifise.enc asciidkno.enc hp8.enc ibmpc.enc \ 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 sysconf_DATA = enscript.cfg CLEANFILES = $(sysconf_DATA) diff --git lib/make-encoding.pl lib/make-encoding.pl index 63b2a52..a3b5d51 100755 --- lib/make-encoding.pl +++ lib/make-encoding.pl @@ -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 diff --git src/gsint.h src/gsint.h index 3c2527a..81c3257 100644 --- src/gsint.h +++ src/gsint.h @@ -108,6 +108,7 @@ extern double atan2 ___P ((double, double)); #if HAVE_LC_MESSAGES #include +#include #endif #ifndef HAVE_GETCWD @@ -176,6 +177,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, diff --git src/main.c src/main.c index a9175db..5117b0e 100644 --- src/main.c +++ src/main.c @@ -795,15 +795,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}, diff --git src/util.c src/util.c index a3814c1..26f072c 100644 --- src/util.c +++ src/util.c @@ -157,6 +157,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); } @@ -952,6 +960,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; -- 2.12.3 From MAILER-DAEMON Tue Jan 23 10:30:14 2018 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1ee0Wc-0008CA-PJ for mharc-bug-enscript@gnu.org; Tue, 23 Jan 2018 10:30:14 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36583) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edzXg-000742-01 for bug-enscript@gnu.org; Tue, 23 Jan 2018 09:27:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edzXc-0001M4-7c for bug-enscript@gnu.org; Tue, 23 Jan 2018 09:27:15 -0500 Received: from mx2.suse.de ([195.135.220.15]:34401) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1edzXc-0001LX-0S for bug-enscript@gnu.org; Tue, 23 Jan 2018 09:27:12 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 00BE6ABD9 for ; Tue, 23 Jan 2018 14:27:11 +0000 (UTC) From: Werner Fink To: bug-enscript@gnu.org Date: Tue, 23 Jan 2018 15:26:45 +0100 Message-Id: <20180123142650.4460-4-werner@suse.de> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20180123142650.4460-1-werner@suse.de> References: <20180123142650.4460-1-werner@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 195.135.220.15 X-Mailman-Approved-At: Tue, 23 Jan 2018 10:30:13 -0500 Subject: [bug-enscript] [PATCH 3/8] Automake 1.12 and up no longer supports pre-ANSI X-BeenThere: bug-enscript@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Bug reports for GNU Enscript List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jan 2018 14:27:19 -0000 Signed-off-by: Werner Fink --- configure.ac | 1 - 1 file changed, 1 deletion(-) diff --git configure.ac configure.ac index 465100a..d8659a5 100644 --- configure.ac +++ configure.ac @@ -11,7 +11,6 @@ AC_PROG_INSTALL AC_PROG_CC AC_USE_SYSTEM_EXTENSIONS -AM_C_PROTOTYPES AC_C_CONST AC_FUNC_ALLOCA -- 2.12.3 From MAILER-DAEMON Tue Jan 23 10:30:14 2018 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1ee0Wc-0008CN-SM for mharc-bug-enscript@gnu.org; Tue, 23 Jan 2018 10:30:14 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36658) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edzXm-00077h-1k for bug-enscript@gnu.org; Tue, 23 Jan 2018 09:27:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edzXi-0001Re-H0 for bug-enscript@gnu.org; Tue, 23 Jan 2018 09:27:22 -0500 Received: from mx2.suse.de ([195.135.220.15]:34418) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1edzXi-0001Qp-6o for bug-enscript@gnu.org; Tue, 23 Jan 2018 09:27:18 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 33CE0AAB5 for ; Tue, 23 Jan 2018 14:27:17 +0000 (UTC) From: Werner Fink To: bug-enscript@gnu.org Date: Tue, 23 Jan 2018 15:26:47 +0100 Message-Id: <20180123142650.4460-6-werner@suse.de> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20180123142650.4460-1-werner@suse.de> References: <20180123142650.4460-1-werner@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 195.135.220.15 X-Mailman-Approved-At: Tue, 23 Jan 2018 10:30:13 -0500 Subject: [bug-enscript] [PATCH 5/8] Flexible encoding and support of locale paper size X-BeenThere: bug-enscript@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Bug reports for GNU Enscript List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jan 2018 14:27:25 -0000 as well paper size names known by ghostscript Signed-off-by: Werner Fink --- configure.ac | 18 ++++++++++++++++++ lib/Makefile.am | 1 + lib/enscript.cfg.in | 34 +++++++++++++++++++++++++++++++++- src/main.c | 6 ++++++ src/util.c | 10 ++++++++++ 5 files changed, 68 insertions(+), 1 deletion(-) diff --git configure.ac configure.ac index d8659a5..dbb84d2 100644 --- configure.ac +++ configure.ac @@ -65,6 +65,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) @@ -142,6 +159,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 "" diff --git lib/Makefile.am lib/Makefile.am index fc40ecd..21bfd99 100644 --- lib/Makefile.am +++ lib/Makefile.am @@ -35,6 +35,7 @@ EXTRA_DIST = ChangeLog.old enscript.cfg.in $(pkgdata_DATA) \ Makefile-encodings make-encoding.pl do_subst = sed -e 's%@DATADIR@%$(datadir)%g' \ + -e 's%@encoding@%@ENCODING@%g' \ -e 's%@media@%@MEDIA@%g' \ -e 's%@BINDIR@%$(bindir)%g' \ -e 's%@spooler@%@SPOOLER@%g' \ diff --git lib/enscript.cfg.in lib/enscript.cfg.in index 837613b..10adb3e 100644 --- lib/enscript.cfg.in +++ lib/enscript.cfg.in @@ -40,7 +40,7 @@ AppendCtrlD: 0 Clean7Bit: 1 # Default input encoding. -DefaultEncoding: latin1 +DefaultEncoding: @encoding@ # Default fancy header. DefaultFancyHeader: enscript @@ -94,6 +94,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 diff --git src/main.c src/main.c index 5117b0e..ef8c220 100644 --- src/main.c +++ src/main.c @@ -24,6 +24,8 @@ #include "gsint.h" #include "getopt.h" +#include +#include /* * Prototypes for static functions. @@ -959,6 +961,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); diff --git src/util.c src/util.c index 26f072c..5ec7396 100644 --- src/util.c +++ src/util.c @@ -179,6 +179,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); } -- 2.12.3