diff options
| -rw-r--r-- | Build/source/texk/dvipsk/ChangeLog | 16 | ||||
| -rw-r--r-- | Build/source/texk/dvipsk/bitmapenc.c | 161 | ||||
| -rw-r--r-- | Build/source/texk/dvipsk/download.c | 3 | ||||
| -rw-r--r-- | Build/source/texk/dvipsk/dvips-all.enc | 39 | ||||
| -rw-r--r-- | Build/source/texk/dvipsk/dvips.c | 20 | ||||
| -rw-r--r-- | Build/source/texk/dvipsk/dvips.info | 484 | ||||
| -rw-r--r-- | Build/source/texk/dvipsk/dvips.texi | 35 | ||||
| -rw-r--r-- | Build/source/texk/dvipsk/protos.h | 3 | ||||
| -rw-r--r-- | Build/source/texk/dvipsk/resident.c | 19 |
9 files changed, 504 insertions, 276 deletions
diff --git a/Build/source/texk/dvipsk/ChangeLog b/Build/source/texk/dvipsk/ChangeLog index aceb7d57645..1f24c381c45 100644 --- a/Build/source/texk/dvipsk/ChangeLog +++ b/Build/source/texk/dvipsk/ChangeLog @@ -1,3 +1,19 @@ +2020-01-29 Tomas Rokicki <rokicki@gmail.com> + + * bitmapenc.c (struct bmenc): new member existsbm. + (parseencodingfile): rename from parseencoding; change calls. + (trytoparseenc), + (parseenc): new fns. + (addbmenc): call parseenc. + (getencoding_seq): change type to struct bmenc. + (downloadbmencoding): check that every defined character has a name. + (doubleout): take double instead of float. + * dvips-all.enc: more fonts. + * dvips.c (-bitmapfontenc): rename option from -J. + * dvips.texi: adjust documentation. + * resident.c (get_defaults): new case b for bitmapfontenc, + renamed from J. + 2020-01-16 Karl Berry <karl@freefriends.org> * afm2tfm.c, diff --git a/Build/source/texk/dvipsk/bitmapenc.c b/Build/source/texk/dvipsk/bitmapenc.c index c8ee318416d..717d51c2abe 100644 --- a/Build/source/texk/dvipsk/bitmapenc.c +++ b/Build/source/texk/dvipsk/bitmapenc.c @@ -72,6 +72,7 @@ struct bmenc { const char **enc ; // the encoding itself int downloaded_seq ; // -1: not downloaded; else, sequence number struct bmenc *next ; // next encoding in linear linked list + unsigned char existsbm[32] ; // a bitmap of characters with names } ; static struct bmenc *bmlist ; /* @@ -172,7 +173,7 @@ static void add_encline(const char *encline) { * for later lookup, and always return 0. Otherwise we just expect a * single encoding and we store that away. */ -static const char **parseencoding(FILE *f, int use_all) { +static const char **parseencodingfile(FILE *f, int use_all) { char encbuf[MAX_LINE_LENGTH+1] ; size_t i ; for (i=0; i<sizeof(encbuf); i++) @@ -259,6 +260,116 @@ static int eqencoding(const char **a, const char **b) { return 1 ; } /* + * Try to parse an encoding to identify which names exist and which don't. + * If we can't trivially parse it we just mark all names as existing. + * We properly parse the following types of tokens: + * [ (at start) ] (at end) : ignored + * /name + * digits { /.notdef } repeat + * + * In all cases the spaces and linebreaks are arbitrary. + * + * The state machine works as follows: + * + * 'B': begin; expect [ + * 'N': between entries; expect name or digits or ] + * 'E': finished (saw ]); expect nothing more + * '#': just saw digits; expect only { + * '{': just saw {; expect only name and should be /.notdef + * 'L': just saw a name inside {}; expect only } + * '}': just saw }; expect only repeat + */ +static int trytoparseenc(struct bmenc *bme) { + int i ; + const char **enc = bme->enc ; + const char *p ; + int seenchars = 0 ; + int num = 0 ; + char state = 'B' ; + for (i=0; i<32; i++) + bme->existsbm[i] = 255 ; + while (*enc != 0) { + p = *enc ; + enc++ ; + while (*p && *p <= ' ') + p++ ; + while (*p != 0) { + switch (state) { +case 'B': if (*p != '[') return 0 ; + p++ ; + state = 'N' ; + break ; +case 'N': if (*p == ']') { + p++ ; + state = 'E' ; + } else if (*p == '/') { + if (seenchars >= 256) + return 0 ; + if (strncmp(p, "/.notdef", 8) == 0 && + (p[8] <= ' ' || index("{}[]<>()%/", p[8]) == 0)) { + bme->existsbm[seenchars>>3] &= ~(1<<(seenchars & 7)) ; + } + // see PostScript language reference manual syntax for this + p++ ; + while (*p > ' ' && index("{}[]<>()%/", *p) == 0) + p++ ; + seenchars++ ; + } else if ('0' <= *p && *p <= '9') { + num = 0 ; + while (num < 256 && '0' <= *p && *p <= '9') + num = 10 * num + *p++ - '0' ; + state = '#' ; + } else + return 0 ; + break ; +case '#': if (*p != '{') return 0 ; + p++ ; + state = '{' ; + break ; +case '{': if (strncmp(p, "/.notdef", 8) != 0) + return 0 ; + p += 8 ; + if (*p > ' ' && index("{}[]<>()%/", *p) == 0) + return 0 ; + while (num > 0) { + if (seenchars >= 256) + return 0 ; + bme->existsbm[seenchars>>3] &= ~(1<<(seenchars & 7)) ; + seenchars++ ; + num-- ; + } + state = 'L' ; + break ; +case 'L': if (*p != '}') + return 0 ; + p++ ; + state = '}' ; + break ; +case '}': if (strncmp(p, "repeat", 6) != 0) + return 0 ; + p += 6 ; + state = 'N' ; + break ; +default: + error("! internal error in encoding vector parse") ; + } + while (*p && *p <= ' ') + p++ ; + } + } + if (seenchars != 256) + return 0 ; + return 1 ; +} +static void parseenc(struct bmenc *bme) { + int i ; + if (trytoparseenc(bme) == 0) { + printf("Failed to parse it.\n") ; + for (i=0; i<32; i++) + bme->existsbm[i] = 255 ; + } +} +/* * Add an encoding to our list of deduplicated encodings. */ struct bmenc *addbmenc(const char **enc) { @@ -266,6 +377,7 @@ struct bmenc *addbmenc(const char **enc) { r->downloaded_seq = -1 ; r->enc = enc ; r->next = bmlist ; + parseenc(r) ; bmlist = r ; return r ; } @@ -289,7 +401,7 @@ static struct bmenc *deduplicateencoding(const char **enc) { static const char **bitmap_enc_load(const char *fontname, int use_all) { FILE *f = bitmap_enc_search(use_all ? "all" : fontname) ; if (f != 0) { - const char **r = parseencoding(f, use_all) ; + const char **r = parseencodingfile(f, use_all) ; fclose(f) ; return r ; } @@ -361,13 +473,32 @@ static void downloadenc(struct bmenc *enc) { * used to do instead (don't give it an encoding or resize or * rescale). */ -static int getencoding_seq(const char *fontname) ; -int downloadbmencoding(const char *name, double scale, - int llx, int lly, int urx, int ury) { +static struct bmenc *getencoding_seq(const char *fontname) ; +int downloadbmencoding(const char *name, double scale, fontdesctype *curfnt) { int slop; - int seq = getencoding_seq(name) ; - if (seq < 0) + int i ; + int seq ; + int llx = curfnt->llx ; + int lly = curfnt->lly ; + int urx = curfnt->urx ; + int ury = curfnt->ury ; + struct bmenc *bme = getencoding_seq(name) ; + if (bme == 0) return -1 ; + seq = bme->downloaded_seq ; +/* + * Check that every character defined in the font has a name in the + * PostScript vector, and complain if this is not the case. + */ + for (i=0; i<256 && i<curfnt->maxchars; i++) { + if ((curfnt->chardesc[i].flags2 & EXISTS) && + !(bme->existsbm[i>>3] & (1 << (i & 7)))) { + fprintf(stderr, +"Can't use PostScript encoding vector for font %s; character %d has no name.\n", + name, i) ; + return -1 ; + } + } cmdout("IEn") ; cmdout("S") ; psnameout("/IEn") ; @@ -443,14 +574,14 @@ static void bmenc_warn(const char *fontname, const char *msg) { * -1; this font may not work as well for copy/paste and text search. */ static int tried_all = 0 ; // have we tried to load dvips-all.enc -static int getencoding_seq(const char *fontname) { +static struct bmenc *getencoding_seq(const char *fontname) { struct bmenc *enc = 0 ; struct bmfontenc *p = bmfontenclist ; for (; p!=0; p=p->next) if (strcmp(fontname, p->fontname) == 0) { enc = p->enc ; if (enc == 0) // remember failures - return -1 ; + return 0 ; break ; } // not in list; try to load it from a file @@ -473,6 +604,7 @@ static int getencoding_seq(const char *fontname) { p->fontname = strdup(fontname) ; p->enc = enc ; p->next = bmfontenclist ; +// parseenc(enc) ; bmfontenclist = p ; } if (enc == 0) { @@ -480,10 +612,10 @@ static int getencoding_seq(const char *fontname) { bmenc_warn(fontname, "no encoding found") ; warned_about_missing_encoding = 2 ; } - return -1 ; // don't download an encoding + return 0 ; // don't download an encoding } downloadenc(enc) ; - return enc->downloaded_seq ; + return enc ; } #ifdef STANDALONE /* @@ -505,7 +637,7 @@ void newline() { idok = 1 ; pos = 0 ; } -void doubleout(float f) { +void doubleout(double f) { printf("%g", f) ; pos += 8 ; } @@ -549,9 +681,10 @@ void specialout(char c) { int main(int argc, char *argv[]) { bmenc_startsection() ; for (int i=1; i<argc; i++) { - int r = getencoding_seq(argv[i]) ; + struct bmenc *r = getencoding_seq(argv[i]) ; + int seq = r ? r->downloaded_seq : -1 ; printf("\n") ; - printf("Result for %s is %d\n", argv[i], r) ; + printf("Result for %s is %d\n", argv[i], seq) ; } } #endif diff --git a/Build/source/texk/dvipsk/download.c b/Build/source/texk/dvipsk/download.c index ba5ab913100..37b86c7eab9 100644 --- a/Build/source/texk/dvipsk/download.c +++ b/Build/source/texk/dvipsk/download.c @@ -304,8 +304,7 @@ download(charusetype *p, int psfont) scale = fontscale * DPI / 72.0 ; seq = -1 ; if (encodetype3) - seq = downloadbmencoding(curfnt->name, scale, - curfnt->llx, curfnt->lly, curfnt->urx, curfnt->ury) ; + seq = downloadbmencoding(curfnt->name, scale, curfnt) ; cmdout(name); numout((integer)numcc); numout((integer)maxcc + 1); diff --git a/Build/source/texk/dvipsk/dvips-all.enc b/Build/source/texk/dvipsk/dvips-all.enc index 44f2b4c1f00..4cc1e2e4347 100644 --- a/Build/source/texk/dvipsk/dvips-all.enc +++ b/Build/source/texk/dvipsk/dvips-all.enc @@ -670,6 +670,8 @@ bbold9: /S/T/U/V/W/X/Y/Z/bracketleft/backslash/bracketright/langle/rangle/quoteleft /a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/endash/bar/emdash /quotedbleright/omega 128{/.notdef}repeat] +ccmi10: +ccmic9: cmbrmb10: cmbrmi10: cmbrmi8: @@ -729,10 +731,21 @@ repeat/Lcaron 3{/.notdef}repeat/Scaron/.notdef/Tcaron/.notdef/.notdef/Zcaron /.notdef/ecaron/iacute/.notdef/dcaron/.notdef/.notdef/ncaron/oacute /ocircumflex/.notdef/odieresis/.notdef/rcaron/uring/uacute/.notdef/udieresis /yacute/quotedblbase/csquotedblright] +cccsc10: +ccr5: cmcsc10: cmcsc8: cmcsc9: cmr5: +punk10: +punk12: +punk20: +punkbx20: +punkbxx20: +punksl20: +punkslx20: +punkz20: +ttmc10: [/Gamma/Delta/Theta/Lambda/Xi/Pi/Sigma/Upsilon/Phi/Psi/Omega/arrowup /arrowdown/quotesingle/exclamdown/questiondown/dotlessi/dotlessj/grave/acute /caron/breve/macron/ring/cedilla/germandbls/ae/oe/oslash/AE/OE/Oslash @@ -761,6 +774,7 @@ repeat/Lslash/Nacute 5{/.notdef}repeat/Sacute 7{/.notdef}repeat/Zacute /guillemotright/.notdef/sacute 7{/.notdef}repeat/zacute/.notdef/zdotaccent 23 {/.notdef}repeat/Oacute 31{/.notdef}repeat/oacute 11{/.notdef}repeat /quotedblbase] +cmntt10: cmsltt10: cmsltt9: cmtcsc10: @@ -768,6 +782,7 @@ cmtt10: cmtt12: cmtt8: cmtt9: +cmttsq14: [/Gamma/Delta/Theta/Lambda/Xi/Pi/Sigma/Upsilon/Phi/Psi/Omega/arrowup /arrowdown/quotesingle/exclamdown/questiondown/dotlessi/dotlessj/grave/acute /caron/breve/macron/ring/cedilla/germandbls/ae/oe/oslash/AE/OE/Oslash @@ -966,6 +981,14 @@ repeat/lcaron/.notdef/.notdef/agrave/scaron/.notdef/tcaron/.notdef/.notdef /ecaron/iacute/.notdef/dcaron/.notdef/.notdef/ncaron/oacute/ocircumflex /.notdef/odieresis/.notdef/rcaron/uring/uacute/.notdef/udieresis/yacute /quotedblbase/csquotedblright] +ccn10: +ccr10: +ccr7: +ccr8: +ccr9: +ccsl10: +ccsl9: +ccslc9: cmb10: cmbr10: cmbr17: @@ -983,9 +1006,12 @@ cmbx6: cmbx7: cmbx8: cmbx9: +cmbxcd10: cmbxsl10: cmdunh10: +cmhFv: cmr10: +cmr10mod: cmr12: cmr17: cmr6: @@ -1018,16 +1044,23 @@ cmssi12: cmssi17: cmssi8: cmssi9: +cmsslu30: cmssq8: cmssqi8: cmssu10: cmssxicsc10: +cmtitl: cmtl10: cmvtt10: +f36: +geom10: lcmss8: lcmssb8: lcmssi8: pcmi10: +xbmc10: +xmas0: +xmas1: [/Gamma/Delta/Theta/Lambda/Xi/Pi/Sigma/Upsilon/Phi/Psi/Omega/ff/fi/fl/ffi /ffl/dotlessi/dotlessj/grave/acute/caron/breve/macron/ring/cedilla /germandbls/ae/oe/oslash/AE/OE/Oslash/suppress/exclam/quotedblright @@ -1102,6 +1135,8 @@ plvtt10: /lslash/nacute/.notdef/.notdef/guillemotleft/guillemotright/.notdef/sacute 7 {/.notdef}repeat/zacute/.notdef/zdotaccent 23{/.notdef}repeat/Oacute 31{ /.notdef}repeat/oacute 11{/.notdef}repeat/quotedblbase] +bible12: +ccti10: cmbxti10: cmbxti12: cmbxti7: @@ -1748,6 +1783,7 @@ xylubt12: /d97/d98/d99/d100/d101/d102/d103/d104/d105/d106/d107/d108/d109/d110/d111 /d112/d113/d114/d115/d116/d117/d118/d119/d120/d121/d122/d123/d124/d125/d126 /d127 128{/.notdef}repeat] +cmntex10: cmtex10: cmtex8: cmtex9: @@ -4530,6 +4566,9 @@ cmsy6: cmsy7: cmsy8: cmsy9: +cmsytt10: +euxm10: +euxm7: [/minus/periodcentered/multiply/asteriskmath/divide/diamondmath/plusminus /minusplus/circleplus/circleminus/circlemultiply/circledivide/circledot /circlecopyrt/openbullet/bullet/equivasymptotic/equivalence/reflexsubset diff --git a/Build/source/texk/dvipsk/dvips.c b/Build/source/texk/dvipsk/dvips.c index a52a0f02c56..ca4d0f6ccfd 100644 --- a/Build/source/texk/dvipsk/dvips.c +++ b/Build/source/texk/dvipsk/dvips.c @@ -286,6 +286,7 @@ static const char *helparr[] = { "Options:", "-a* Conserve memory, not time -A Print only odd (TeX) pages", "-b # Page copies, for posters e.g. -B Print only even (TeX) pages", +"-bitmapfontenc [on,off,strict] control bitmap font encoding", "-c # Uncollated copies -C # Collated copies", "-d # Debugging -D # Resolution", "-e # Maxdrift value -E* Try to create EPSF", @@ -295,7 +296,7 @@ static const char *helparr[] = { #endif "-h f Add header file", "-i* Separate file per section", -"-j* Download fonts partially -J* Include encodings for bitmap fonts", +"-j* Download fonts partially", "-k* Print crop marks -K* Pull comments from inclusions", "-l # Last page -L* Last special papersize wins", "-m* Manual feed -M* Don't make fonts", @@ -753,6 +754,20 @@ case 'a': dopprescan = (*p != '0'); break; case 'b': + if (strcmp(p, "itmapfontenc") == 0) { + p = argv[++i] ; + if (strcmp(p, "off") == 0) { + bitmapencopt(0) ; // disable bitmap font enc feature + } else if (strcmp(p, "on") == 0) { + bitmapencopt(1) ; // try to include bitmap font encs + } else if (strcmp(p, "strict") == 0) { + bitmapencopt(2) ; // issue warnings for missing encs + } else { + error( + "! -bitmapfontenc option only supports off, on, and strict") ; + } + break ; + } if (*p == 0 && argv[i+1]) p = argv[++i]; if (sscanf(p, "%d", &pagecopies)==0) @@ -833,9 +848,6 @@ case 'i': case 'j': partialdownload = (*p != '0'); break; -case 'J': - bitmapencopt(*p > ' ' ? (*p - '0') : 0) ; - break ; case 'k': cropmarks = (*p != '0'); break; diff --git a/Build/source/texk/dvipsk/dvips.info b/Build/source/texk/dvipsk/dvips.info index 3db9b657f02..9556053fede 100644 --- a/Build/source/texk/dvipsk/dvips.info +++ b/Build/source/texk/dvipsk/dvips.info @@ -1,4 +1,4 @@ -This is dvips.info, produced by makeinfo version 5.1 from dvips.texi. +This is dvips.info, produced by makeinfo version 6.7 from dvips.texi. This manual documents Dvips version 2020.1 (January 2020), a program to translate a DVI file into PostScript. You may freely use, modify and/or @@ -425,9 +425,9 @@ environment variables, and command-line options. * Menu: * Basic usage:: -* Command-line options:: -* Environment variables:: -* Config files:: +* Command-line options:: +* Environment variables:: +* Config files:: File: dvips.info, Node: Basic usage, Next: Command-line options, Up: Invoking Dvips @@ -559,6 +559,11 @@ reversal, use '-r0'. Such options are marked with a trailing '*'. Print only the even pages. This option uses TeX page numbers, not physical page numbers. +'-bitmapfontenc OPTION' + Turns bitmap font encoding to 'off', 'on' (no warnings for missing + bitmap font encodings), or 'strict' (with warnings for missing + bitmap font encodings). + '-c NUM' Generate NUM consecutive copies of every page, i.e., the output is uncollated. This merely sets the builtin PostScript variable @@ -670,11 +675,6 @@ reversal, use '-r0'. Such options are marked with a trailing '*'. operation (*note Debug options::). You can also control partial downloading on a per-font basis (*note psfonts.map::). -'-J NUM' - Download encodings for bitmapped fonts. This flag has three - possible values: '-J0' (to turn it off), '-J' or '-J1' (to turn it - on with no warnings), or '-J2' (to turn it on and enable warnings). - '-k*' Print crop marks. This option increases the paper size (which should be specified, either with a paper size special or with the @@ -703,7 +703,7 @@ reversal, use '-r0'. Such options are marked with a trailing '*'. '-L*' By default or with '-L1', the last 'papersize' special wins; with - '-L0', the first special wins. *Note 'papersize' special::. + '-L0', the first special wins. *Note papersize special::. '-m*' Specify manual feed, if supported by the output device. @@ -779,7 +779,7 @@ reversal, use '-r0'. Such options are marked with a trailing '*'. '-O X-OFFSET,Y-OFFSET' Move the origin by X-OFFSET,Y-OFFSET, a comma-separated pair of - dimensions such as '.1in,-.3cm' (*note 'papersize' special::). The + dimensions such as '.1in,-.3cm' (*note papersize special::). The origin of the page is shifted from the default position (of one inch down, one inch to the right from the upper left corner of the paper) by this amount. This is usually best specified in the @@ -877,7 +877,7 @@ reversal, use '-r0'. Such options are marked with a trailing '*'. '-T HSIZE,VSIZE' Set the paper size to (HSIZE,VSIZE), a comma-separated pair of - dimensions such as '.1in,-.3cm' (*note 'papersize' special::). It + dimensions such as '.1in,-.3cm' (*note papersize special::). It overrides any paper size special in the DVI file. Be careful, as the paper size will stick to a predefined size if there is one close enough. To disable this behavior, use '-tunknown'. @@ -1124,6 +1124,11 @@ There is no provision for continuation lines. 'b #COPIES' Multiple copies. Same as '-b', *note Option details::. +'bitmapfontenc OPTION' + Turns bitmap font encoding to 'off', 'on' (no warnings for missing + bitmap font encodings), or 'strict' (with warnings for missing + bitmap font encodings). + 'c FILENAME' Include FILENAME as an additional configuration file, read immediately. @@ -1164,9 +1169,6 @@ There is no provision for continuation lines. Partially download Type 1 fonts. Same as '-j', *note Option details::. -'J*' - Enable bitmap font encoding. Same as '-J', *note Option details::. - 'K*' Remove comments from included PostScript files. Same as '-K', *note Option details::. @@ -1338,12 +1340,12 @@ attempt to override it manually. * Menu: -* 'papersize' special:: Specifying the paper size in TeX. +* papersize special:: Specifying the paper size in TeX. * Config file paper sizes:: Specifying printer- and site-specific sizes. * Paper trays:: Changing paper trays automatically. -File: dvips.info, Node: 'papersize' special, Next: Config file paper sizes, Up: Paper size and landscape +File: dvips.info, Node: papersize special, Next: Config file paper sizes, Up: Paper size and landscape 4.1 'papersize' special ======================= @@ -1386,7 +1388,7 @@ the first special wins--this was the behavior of Dvips prior to the 2017 release. -File: dvips.info, Node: Config file paper sizes, Next: Paper trays, Prev: 'papersize' special, Up: Paper size and landscape +File: dvips.info, Node: Config file paper sizes, Next: Paper trays, Prev: papersize special, Up: Paper size and landscape 4.2 Configuration file paper size command ========================================= @@ -1730,8 +1732,8 @@ terminal when it processes each figure, give the command: * Menu: -* EPSF scaling:: -* EPSF clipping:: +* EPSF scaling:: +* EPSF clipping:: File: dvips.info, Node: EPSF scaling, Next: EPSF clipping, Up: EPSF macros @@ -2003,8 +2005,8 @@ header files are included. * Menu: -* Including headers from TeX:: -* Including headers from the command line:: +* Including headers from TeX:: +* Including headers from the command line:: * Headers and memory usage:: @@ -2700,16 +2702,18 @@ File: dvips.info, Node: Bitmap font encodings, Next: PostScript typesetting, To dvips, bitmapped fonts do not have any notion of linguistics; they are simply a vector of glyphs. By comparison, PostScript fonts are -required to contain an encoding vector that at the least provides glyph +required to contain an encoding vector that at least provides glyph names; these names can permit PostScript and PDF viewers to extract legible text from Postscript and PDF output. - Unlike previous versions, dvips versions 2019 and later add glyph + Unlike previous versions, dvips versions 2020 and later add glyph naming information to Type 3 bitmapped fonts (if they can locate such information) as an Encoding vector. This provides some support for search, for copy and paste, and even some limited support for -accessibility. The -J command line option and J configuration option -enables and disables this functionality; by default it is enabled. +accessibility. The 'bitmapfontenc' command line option (*note Option +details:: and 'bitmapfontenc' configuration option (*note Configuration +file commands::) enable and disable this functionality; by default it is +set to enabled, without warnings. To do this, dvips must find encoding information for the bitmapped fonts. It does this by first searching for a font-specific encoding @@ -3779,7 +3783,7 @@ Index * %*Font: Fonts in figures. (line 6) * (atend), bounding box specification: Bounding box. (line 28) * +PSMAPFILE: Configuration file commands. - (line 124) + (line 126) * -: Option details. (line 11) * - as output filename: Option details. (line 247) * --help: Option summary. (line 7) @@ -3790,21 +3794,21 @@ Index * -a <1>: Afm2tfm options. (line 33) * -B: Option details. (line 37) * -b NUM: Option details. (line 31) -* -c NUM: Option details. (line 41) -* -C NUM: Option details. (line 46) +* -bitmapfontenc OPTION: Option details. (line 41) +* -c NUM: Option details. (line 46) +* -C NUM: Option details. (line 51) * -c RATIO: Afm2tfm options. (line 43) -* -d NUM: Option details. (line 52) -* -D NUM: Option details. (line 58) -* -E: Option details. (line 82) -* -e NUM: Option details. (line 71) +* -d NUM: Option details. (line 57) +* -D NUM: Option details. (line 63) +* -E: Option details. (line 87) +* -e NUM: Option details. (line 76) * -e RATIO: Afm2tfm options. (line 47) -* -f: Option details. (line 98) -* -F: Option details. (line 110) -* -G: Option details. (line 117) -* -h NAME: Option details. (line 122) -* -i: Option details. (line 127) -* -J for bitmap font encoding: Option details. (line 152) -* -j for partial font downloading: Option details. (line 146) +* -f: Option details. (line 103) +* -F: Option details. (line 115) +* -G: Option details. (line 122) +* -h NAME: Option details. (line 127) +* -i: Option details. (line 132) +* -j for partial font downloading: Option details. (line 151) * -K: Option details. (line 165) * -k for cropmarks: Option details. (line 157) * -L: Option details. (line 183) @@ -3856,7 +3860,7 @@ Index * -z: Hypertext. (line 6) * -Z for compressing bitmap fonts: Option details. (line 416) * -z for recognizing hyperdvi: Option details. (line 410) -* '..'-relative filenames: Option details. (line 317) +* ..-relative filenames: Option details. (line 317) * .afm Adobe metric files: Metric files. (line 26) * .dvipsrc, searched for: Configuration file searching. (line 14) @@ -3875,7 +3879,7 @@ Index * .pro prologue files: Header files. (line 12) * .tfm TeX font metric files: Metric files. (line 31) * /#copies: Option details. (line 31) -* /#copies <1>: Option details. (line 41) +* /#copies <1>: Option details. (line 46) * /magscale: EPSF scaling. (line 66) * 612 792 bounding box size: Bounding box. (line 43) * 8r encoding, and extra characters: Changing PostScript encodings. @@ -3920,13 +3924,13 @@ Index * A4size paper size: Config file paper sizes. (line 90) * absolute filenames, disabling: Option details. (line 317) -* absolute page number, and '-l': Option details. (line 174) -* absolute page number, and '-p': Option details. (line 277) +* absolute page number, and -l: Option details. (line 174) +* absolute page number, and -p: Option details. (line 277) * accent height adjustment, omitting: Afm2tfm options. (line 33) * accents, in wrong position: Reencoding with Afm2tfm. (line 32) * accents, wrong: Afm2tfm options. (line 17) -* accuracy in positioning: Option details. (line 71) +* accuracy in positioning: Option details. (line 76) * afm files: Metric files. (line 26) * afm2tfm: Making a font available. (line 46) @@ -3937,7 +3941,7 @@ Index * Aladdin Ghostscript: Ghostscript installation. (line 6) * Anderson, Laurie: Hypertext specials. (line 42) -* angle ('psfile' special option): psfile special. (line 36) +* angle (psfile special option): psfile special. (line 36) * arcs: Glyph files. (line 17) * ASCII character codes, used by PostScript: PostScript typesetting. (line 31) @@ -3954,9 +3958,12 @@ Index * big points: Bounding box. (line 11) * binary files, not supported: Including graphics fails. (line 23) +* bitmap font encoding: Option details. (line 41) * bitmap font encodings: Bitmap font encodings. (line 6) * bitmap fonts: Glyph files. (line 30) +* bitmapfontenc config command (bitmap font encoding): Configuration file commands. + (line 27) * bop undefined error: Printer errors. (line 6) * bop-hook: Paper trays. (line 6) * bop-hook <1>: EPSF scaling. (line 74) @@ -3967,14 +3974,14 @@ Index * bounding box, comment for: Bounding box. (line 6) * bounding box, defined: Bounding box. (line 11) * bounding box, determining: Bounding box. (line 37) -* bounding box, finding tight: Option details. (line 82) +* bounding box, finding tight: Option details. (line 87) * bounding box, for bitmap fonts: Bitmap font encodings. - (line 42) + (line 44) * bounding box, inaccurate: EPSF clipping. (line 6) * bounding box, supplying to TeX: \includegraphics. (line 36) * bounding box, supplying to TeX <1>: EPSF macros. (line 26) * c config command (include another config file): Configuration file commands. - (line 27) + (line 32) * changing PostScript encodings: Changing PostScript encodings. (line 6) * changing TeX encodings: Changing TeX encodings. @@ -3985,11 +3992,11 @@ Index (line 6) * CharStrings Type 1 dictionary: PostScript typesetting. (line 51) -* clip ('psfile' special option): psfile special. (line 39) +* clip (psfile special option): psfile special. (line 39) * clipping of EPSF: EPSF clipping. (line 6) * CODINGSCHEME: Reencoding with Afm2tfm. (line 51) -* collated copies: Option details. (line 46) +* collated copies: Option details. (line 51) * color: Color. (line 6) * color configuration: Color device configuration. (line 6) @@ -4044,40 +4051,40 @@ Index * configuration, of Dvips: Installation. (line 6) * continuation lines, not supported: Configuration file commands. (line 13) -* control-D: Option details. (line 110) +* control-D: Option details. (line 115) * coordinate system, for bitmap fonts: Bitmap font encodings. - (line 42) -* copies, collated: Option details. (line 46) + (line 44) +* copies, collated: Option details. (line 51) * copies, duplicated page bodies: Option details. (line 31) -* copies, uncollated: Option details. (line 41) +* copies, uncollated: Option details. (line 46) * Crayola crayon box: Color macro files. (line 16) * crop.pro: Option details. (line 157) * cropmarks: Option details. (line 157) * current font, in PostScript: PostScript typesetting. (line 35) * D config command (dpi): Configuration file commands. - (line 31) + (line 36) * dated output: PostScript hooks. (line 16) * datestamp, in output: Configuration file commands. - (line 37) + (line 42) * debugging: Diagnosing problems. (line 6) -* debugging <1>: Option details. (line 52) +* debugging <1>: Option details. (line 57) * debugging options: Debug options. (line 6) * default resolutions: Configuration file commands. - (line 145) + (line 147) * default_texsizes Make variable: Configuration file commands. - (line 161) + (line 163) * Deutsch, Peter: Ghostscript installation. (line 6) * device dependency, and virtual fonts: Configuration file commands. - (line 184) -* dictionary, 'CharStrings': PostScript typesetting. + (line 186) +* dictionary, CharStrings: PostScript typesetting. (line 51) * dictionary, PostScript language: PostScript typesetting. (line 35) -* dictionary, 'SDict': Literal headers. (line 6) -* dictionary, 'userdict': Header files. (line 21) -* distillation, and '-z': Option details. (line 410) +* dictionary, SDict: Literal headers. (line 6) +* dictionary, userdict: Header files. (line 21) +* distillation, and -z: Option details. (line 410) * distiller, for PDF files: Hypertext. (line 11) * dot accent: Reencoding with Afm2tfm. (line 32) @@ -4093,6 +4100,8 @@ Index * dvihps, hyperdvi to PostScript: Hypertext. (line 21) * Dvips configuration file options: Configuration file commands. (line 6) +* dvips-all.enc: Bitmap font encodings. + (line 21) * dvips.enc: Encodings. (line 35) * DVIPSDEBUG: Environment variables. (line 17) @@ -4101,7 +4110,7 @@ Index * DVIPSHEADERS: Environment variables. (line 31) * DVIPSHEADERS, overrides H: Configuration file commands. - (line 55) + (line 60) * DVIPSMAKEPK: Environment variables. (line 35) * DVIPSRC: Environment variables. @@ -4109,13 +4118,13 @@ Index * DVIPSSIZES: Environment variables. (line 46) * DVIPSSIZES, overrides R: Configuration file commands. - (line 158) + (line 160) * dynamic creation of graphics: Dynamic creation of graphics. (line 6) * e config command (maxdrift): Configuration file commands. - (line 34) + (line 39) * E config command (shell escape): Configuration file commands. - (line 37) + (line 42) * efficiency, and fonts: Making a font available. (line 104) * ehandler.ps: No output. (line 12) @@ -4136,12 +4145,12 @@ Index * end-hook: PostScript hooks. (line 11) * environment variables: Environment variables. (line 6) -* EOF: Option details. (line 110) +* EOF: Option details. (line 115) * eop-hook: PostScript hooks. (line 11) * EPS, and Ghostview: Ghostscript installation. (line 12) * EPSF macros: EPSF macros. (line 6) -* EPSF, generating: Option details. (line 82) +* EPSF, generating: Option details. (line 87) * epsf.sty: EPSF macros. (line 15) * epsf.tex: EPSF macros. (line 13) * Epson printers: Ghostscript installation. @@ -4160,20 +4169,20 @@ Index * extra characters, accessing: Changing PostScript encodings. (line 18) * f config command (filter): Configuration file commands. - (line 45) + (line 50) * F config command (filter): Configuration file commands. - (line 45) + (line 50) * failure, and printer errors: Printer errors. (line 6) * failure, of long documents: Long documents fail. (line 6) * failure, to include graphics: Including graphics fails. (line 6) * failure, to print at all: No output. (line 6) * fallback resolutions: Configuration file commands. - (line 145) + (line 147) * figures and fonts: Fonts in figures. (line 6) * figures, natural size: EPSF macros. (line 38) * figures, scaling: EPSF scaling. (line 6) -* filter, running as a: Option details. (line 98) +* filter, running as a: Option details. (line 103) * first page printed: Option details. (line 277) * font concepts: Font concepts. (line 6) * font encodings, bitmap: Bitmap font encodings. @@ -4201,18 +4210,18 @@ Index * fonts, system PostScript: PostScript font installation. (line 11) * G config command (character shifting): Configuration file commands. - (line 48) + (line 53) * gf files: Glyph files. (line 41) * gftopk: Glyph files. (line 41) * Ghostscript installation: Ghostscript installation. (line 6) * ghostview: Ghostscript installation. (line 12) -* Ghostview, and no 'N': Ghostscript installation. +* Ghostview, and no N: Ghostscript installation. (line 12) * glyph files: Glyph files. (line 6) * GLYPHFONTS, overrides P: Configuration file commands. - (line 133) + (line 135) * gnuplot: Dynamic creation of graphics. (line 25) * graphics inclusion fails: Including graphics fails. @@ -4222,14 +4231,14 @@ Index * gsave/grestore, and literal PS: Literal examples. (line 27) * gsftopk: Option details. (line 384) * h config command (download additional header): Configuration file commands. - (line 52) + (line 57) * H config command (PostScript header path): Configuration file commands. - (line 55) + (line 60) * Hafner, Jim: Color. (line 6) -* header file, downloading: Option details. (line 122) +* header file, downloading: Option details. (line 127) * header files, defined: Header files. (line 6) * header path, defining: Configuration file commands. - (line 55) + (line 60) * header=FILE \special: Including headers from TeX. (line 6) * headers and memory usage: Headers and memory usage. @@ -4240,15 +4249,15 @@ Index (line 6) * hints: PostScript typesetting. (line 55) -* hoffset ('psfile' special option): psfile special. (line 18) +* hoffset (psfile special option): psfile special. (line 18) * HP4Si printer and paper trays: Paper trays. (line 6) * href: Hypertext specials. (line 32) -* hscale ('psfile' special option): psfile special. (line 30) -* hsize ('psfile' special option): psfile special. (line 24) +* hscale (psfile special option): psfile special. (line 30) +* hsize (psfile special option): psfile special. (line 24) * html specials: Hypertext. (line 6) -* html specials, and '-z': Option details. (line 410) -* 'http://www.win.tue.nl/~dickie/idvi': Hypertext. (line 21) -* 'http://xxx.lanl.gov/hypertex': Hypertext. (line 21) +* html specials, and -z: Option details. (line 410) +* http://www.win.tue.nl/~dickie/idvi: Hypertext. (line 21) +* http://xxx.lanl.gov/hypertex: Hypertext. (line 21) * Hungarian umlaut: Reencoding with Afm2tfm. (line 32) * hyperdvi extensions, enabling: Option details. (line 410) @@ -4258,7 +4267,7 @@ Index * hypertext specials: Hypertext specials. (line 6) * hypertext support: Hypertext. (line 6) * i config command (pages/section): Configuration file commands. - (line 59) + (line 64) * idvi Java DVI reader: Hypertext. (line 21) * Illustrator, workaround for: Including graphics fails. (line 10) @@ -4269,7 +4278,7 @@ Index (line 6) * including headers in TeX: Including headers from TeX. (line 6) -* installation of 'config.ps': config.ps installation. +* installation of config.ps: config.ps installation. (line 6) * installation of PostScript fonts: PostScript font installation. (line 6) @@ -4280,28 +4289,26 @@ Index (line 6) * inverted output: Small or inverted. (line 6) * invoking Dvips: Invoking Dvips. (line 6) -* J config command (bitmap font encoding): Configuration file commands. - (line 67) * j config command (partial font downloading): Configuration file commands. - (line 63) + (line 68) * Java DVI reader: Hypertext. (line 21) * Jeffrey, Alan: Invoking afm2tfm. (line 13) * K config command (comment removal): Configuration file commands. - (line 70) + (line 72) * kerning, defined: Metric files. (line 15) * KPATHSEA_DEBUG: Environment variables. (line 18) * L config command (last paper size wins): Configuration file commands. - (line 74) + (line 76) * landscape orientation, defined: Paper size and landscape. (line 11) * landscape papertype: Option details. (line 337) -* landscape, as '\special': 'papersize' special. (line 16) +* landscape, as \special: papersize special. (line 16) * last page printed: Option details. (line 174) -* last-resort font scaling, with 'DVIPSSIZES': Environment variables. +* last-resort font scaling, with DVIPSSIZES: Environment variables. (line 47) -* last-resort scaling, with 'R': Configuration file commands. - (line 145) +* last-resort scaling, with R: Configuration file commands. + (line 147) * ledger papertype: Option details. (line 337) * legal papertype: Option details. (line 337) * letter paper size: Config file paper sizes. @@ -4320,15 +4327,15 @@ Index * literal headers: Literal headers. (line 6) * literal PostScript, examples: Literal examples. (line 6) * literal PostScript, using: Literal PS. (line 6) -* llx ('psfile' special option): psfile special. (line 42) -* lly ('psfile' special option): psfile special. (line 42) +* llx (psfile special option): psfile special. (line 42) +* lly (psfile special option): psfile special. (line 42) * long documents not printing: Long documents fail. (line 6) -* low characters, shifting: Option details. (line 117) +* low characters, shifting: Option details. (line 122) * lpr spooler, MS-DOS emulation: Option details. (line 247) * m config command (available memory): Configuration file commands. - (line 78) + (line 80) * M config command (mf mode): Configuration file commands. - (line 105) + (line 107) * macros for color: Color macro files. (line 6) * macros for epsf inclusion: \includegraphics. (line 6) * macros for epsf inclusion <1>: EPSF macros. (line 6) @@ -4337,11 +4344,11 @@ Index * magnification, vertical: Option details. (line 403) * mailcap and hypertext: Hypertext specials. (line 53) * manual feed: Option details. (line 187) -* maxdrift: Option details. (line 71) +* maxdrift: Option details. (line 76) * maximum pages printed: Option details. (line 209) * media: Option details. (line 337) * memory available: Configuration file commands. - (line 78) + (line 80) * memory of printer exhausted: Printer errors. (line 14) * memory usage, and headers: Headers and memory usage. (line 6) @@ -4365,22 +4372,22 @@ Index * mode name, specifying: Option details. (line 190) * mtpk: Option details. (line 384) * multiple master fonts: psfonts.map. (line 60) -* multiple output files: Option details. (line 127) +* multiple output files: Option details. (line 132) * multiple paper trays: Paper trays. (line 6) * Murphy, Tim: Hypertext specials. (line 20) * N config command (disable EPS): Configuration file commands. - (line 108) + (line 110) * name: Hypertext specials. (line 41) * narrow fonts: psfonts.map. (line 19) * no output at all: No output. (line 6) -* non-printing characters, shifting: Option details. (line 117) +* non-printing characters, shifting: Option details. (line 122) * non-resident fonts: psfonts.map. (line 6) -* nopaper, paper format for '-t': Config file paper sizes. +* nopaper, paper format for -t: Config file paper sizes. (line 74) * o config command (output destination): Configuration file commands. - (line 113) + (line 115) * O config command (page offsets): Configuration file commands. - (line 121) + (line 123) * oblique fonts: Special font effects. (line 6) * octal character codes: Afm2tfm options. (line 51) @@ -4399,16 +4406,16 @@ Index * output file, sectioning of: Headers and memory usage. (line 6) * output file, setting: Configuration file commands. - (line 113) -* output files, multiple: Option details. (line 127) + (line 115) +* output files, multiple: Option details. (line 132) * output, inverted: Small or inverted. (line 6) * output, none: No output. (line 6) * output, redirecting: Option details. (line 242) * output, too small: Small or inverted. (line 6) * p config command (font aliases): Configuration file commands. - (line 124) + (line 126) * P config command (PK path): Configuration file commands. - (line 133) + (line 135) * page range: Option details. (line 286) * page, first printed: Option details. (line 277) * page, last printed: Option details. (line 174) @@ -4424,9 +4431,9 @@ Index (line 6) * paper trays: Paper trays. (line 6) * paper type: Option details. (line 337) -* papersize special: 'papersize' special. (line 6) -* papersize special, and no '-t': Option details. (line 337) -* 'papersize' special, first vs. last: Option details. (line 183) +* papersize special: papersize special. (line 6) +* papersize special, and no -t: Option details. (line 337) +* papersize special, first vs. last: Option details. (line 183) * partial font downloading: psfonts.map. (line 55) * PDF files, font quality: Hypertext caveats. (line 6) * PDF files, making: Ghostscript installation. @@ -4440,19 +4447,19 @@ Index * pfm files: Metric files. (line 48) * Phaser printer, used for color calibration: Color device configuration. (line 18) -* physical page number, and '-l': Option details. (line 174) -* physical page number, and '-p': Option details. (line 277) -* physical page number, and 'bop-hook': PostScript hooks. (line 26) -* pipes, not readable: Option details. (line 98) +* physical page number, and -l: Option details. (line 174) +* physical page number, and -p: Option details. (line 277) +* physical page number, and bop-hook: PostScript hooks. (line 26) +* pipes, not readable: Option details. (line 103) * pk files: Glyph files. (line 35) * PKFONTS, overrides P: Configuration file commands. - (line 133) -* plotfile, 'ps' subspecial: ps special. (line 29) + (line 135) +* plotfile, ps subspecial: ps special. (line 29) * pltotf: Metric files. (line 39) * popen for output: Option details. (line 247) * portrait orientation, defined: Paper size and landscape. (line 11) -* positioning accuracy: Option details. (line 71) +* positioning accuracy: Option details. (line 76) * post code after headers: Including headers from TeX. (line 28) * PostScript code, literal: Literal PS. (line 6) @@ -4461,7 +4468,7 @@ Index (line 6) * PostScript font alias file: Option details. (line 364) * PostScript font alias file <1>: Configuration file commands. - (line 124) + (line 126) * PostScript fonts: PostScript fonts. (line 6) * PostScript fonts, installing: PostScript font installation. (line 6) @@ -4487,13 +4494,13 @@ Index (line 14) * printer errors: Printer errors. (line 6) * printer memory: Configuration file commands. - (line 78) + (line 80) * printer memory exhausted: Printer errors. (line 14) * printer offset: Option details. (line 259) * PRINTER, and config file searching: Configuration file searching. (line 36) -* PRINTER, avoided with '-f': Option details. (line 98) -* printer, driving directly: Option details. (line 110) +* PRINTER, avoided with -f: Option details. (line 103) +* printer, driving directly: Option details. (line 115) * problems: Diagnosing problems. (line 6) * property list files: Metric files. (line 39) * prototype printer configuration file: config.ps installation. @@ -4511,14 +4518,14 @@ Index * pTeX extensions: Option details. (line 220) * pTeX extensions <1>: Option details. (line 226) * q config command (quiet): Configuration file commands. - (line 139) + (line 141) * Q config command (quiet): Configuration file commands. - (line 139) + (line 141) * quiet operation: Option details. (line 310) * R config command (fallback resolution): Configuration file commands. - (line 145) + (line 147) * r config command (page reversal): Configuration file commands. - (line 142) + (line 144) * raw tfm files: Afm2tfm options. (line 17) * reencode/*.enc: Encodings. (line 35) * reencoding: Reencoding with Afm2tfm. @@ -4531,19 +4538,19 @@ Index * resident fonts, different in different printers: Option details. (line 364) * resident fonts, different in different printers <1>: Configuration file commands. - (line 124) + (line 126) * resolution: Option details. (line 400) * resolution <1>: Option details. (line 407) -* resolution, setting: Option details. (line 58) +* resolution, setting: Option details. (line 63) * reverse pagination: Option details. (line 314) -* rhi ('psfile' special option): psfile special. (line 46) +* rhi (psfile special option): psfile special. (line 46) * Rokicki, Tomas: Why Dvips. (line 60) * rotate.tex: ps special. (line 33) -* rwi ('psfile' special option): psfile special. (line 46) +* rwi (psfile special option): psfile special. (line 46) * s config command (global save/restore): Configuration file commands. - (line 167) + (line 169) * S config command (pict path): Configuration file commands. - (line 170) + (line 172) * save/restore, and inverted output: Small or inverted. (line 6) * save/restore, and literal PS: Literal examples. (line 27) * save/restore, and specials: ps special. (line 6) @@ -4561,11 +4568,11 @@ Index (line 6) * sections of output file, and memory: Headers and memory usage. (line 6) -* sections output, in separate files: Option details. (line 127) +* sections output, in separate files: Option details. (line 132) * security: Option details. (line 317) * shell command execution, disabling: Option details. (line 317) * shell escape, in config file: Configuration file commands. - (line 37) + (line 42) * Shinko CHC-S446i printer: No output. (line 14) * show PostScript operator: PostScript typesetting. (line 23) @@ -4583,9 +4590,9 @@ Index * spaces, dropped trailing: Hypertext caveats. (line 54) * specials, hypertext: Hypertext specials. (line 6) * splines: Glyph files. (line 17) -* spooler, lacking: Option details. (line 110) +* spooler, lacking: Option details. (line 115) * spooling to lpr on MS-DOS: Option details. (line 247) -* standard I/O: Option details. (line 98) +* standard I/O: Option details. (line 103) * standard input, reading options from: Option details. (line 11) * standard output, output to: Option details. (line 242) * standard PostScript, required by Ghostview: Ghostscript installation. @@ -4593,9 +4600,9 @@ Index * start-hook: PostScript hooks. (line 11) * structured comments: Option details. (line 212) * system in config file: Configuration file commands. - (line 37) + (line 42) * T config command (TFM path): Configuration file commands. - (line 175) + (line 177) * Tektronix Phaser printer, used for color calibration: Color device configuration. (line 18) * testpage.tex: Option details. (line 266) @@ -4606,11 +4613,11 @@ Index * TEXCONFIG: Environment variables. (line 55) * TEXFONTS, overrides P: Configuration file commands. - (line 133) + (line 135) * TEXFONTS, overrides T: Configuration file commands. - (line 175) + (line 177) * TEXINPUTS, overrides S: Configuration file commands. - (line 170) + (line 172) * texmext.enc: Encodings. (line 35) * TEXMFOUTPUT: Option details. (line 202) * texmital.enc: Encodings. (line 35) @@ -4620,19 +4627,19 @@ Index * TEXPICTS: Environment variables. (line 62) * TEXPICTS, overrides S: Configuration file commands. - (line 170) + (line 172) * TEXPKS, overrides P: Configuration file commands. - (line 133) + (line 135) * TEXSIZES, overrides R: Configuration file commands. - (line 158) + (line 160) * text in figures, chopped off: EPSF clipping. (line 6) * tfm files: Metric files. (line 31) * TFMFONTS, overrides T: Configuration file commands. - (line 175) + (line 177) * tftopl: Metric files. (line 39) * Theisen, Tim: Ghostscript installation. (line 12) -* tight bounding box, finding: Option details. (line 82) +* tight bounding box, finding: Option details. (line 87) * too-small output: Small or inverted. (line 6) * trademark character, accessing: Changing PostScript encodings. (line 18) @@ -4644,57 +4651,57 @@ Index * typesetting in PostScript: PostScript typesetting. (line 6) * U config command (Xerox 4045): Configuration file commands. - (line 180) -* uncollated copies: Option details. (line 41) + (line 182) +* uncollated copies: Option details. (line 46) * uncompressing PostScript: Dynamic creation of graphics. (line 6) * uniform resource locator: Hypertext specials. (line 20) -* unknown, paper format for '-t': 'papersize' special. (line 29) -* unknown, paper format for '-t' <1>: Config file paper sizes. +* unknown, paper format for -t: papersize special. (line 29) +* unknown, paper format for -t <1>: Config file paper sizes. (line 69) * URL, definition: Hypertext specials. (line 27) * URL, extended for TeX: Hypertext specials. (line 20) -* urx ('psfile' special option): psfile special. (line 42) -* ury ('psfile' special option): psfile special. (line 42) +* urx (psfile special option): psfile special. (line 42) +* ury (psfile special option): psfile special. (line 42) * usage, basic: Basic usage. (line 6) * user-definable colors: User-definable colors. (line 6) * userdict, and dictionary files: Header files. (line 21) -* userdict, used for header files: Option details. (line 122) +* userdict, used for header files: Option details. (line 127) * V config command (vf path): Configuration file commands. - (line 184) + (line 186) * verbose EPSF processing: EPSF macros. (line 46) * vf files: Virtual fonts. (line 16) * virtual font expansion: Virtual fonts. (line 33) * virtual font path: Configuration file commands. - (line 184) + (line 186) * virtual fonts: Virtual fonts. (line 6) * virtual fonts, creating: Invoking afm2tfm. (line 13) * VM exhausted: Printer errors. (line 14) * VMusage: Headers and memory usage. (line 12) -* voffset ('psfile' special option): psfile special. (line 21) +* voffset (psfile special option): psfile special. (line 21) * vpl files: Virtual fonts. (line 16) * vptovf: Making a font available. (line 52) -* vscale ('psfile' special option): psfile special. (line 33) -* vsize ('psfile' special option): psfile special. (line 27) +* vscale (psfile special option): psfile special. (line 33) +* vsize (psfile special option): psfile special. (line 27) * W config command (emit warning): Configuration file commands. - (line 189) + (line 191) * warning messages, defining: Configuration file commands. - (line 189) + (line 191) * warnings, suppressing: Option details. (line 310) * whole font downloading: psfonts.map. (line 60) * wide fonts: psfonts.map. (line 19) * X config command (horizontal resolution): Configuration file commands. - (line 196) + (line 198) * Xerox 4045: Option details. (line 372) * Y config command (vertical resolution): Configuration file commands. - (line 199) + (line 201) * Z config command (compress fonts): Configuration file commands. - (line 202) + (line 204) * z config command (secure mode): Configuration file commands. - (line 205) + (line 207) @@ -4713,69 +4720,74 @@ Node: Printer errors14032 Node: Long documents fail15364 Node: Including graphics fails15705 Node: Invoking Dvips16944 -Node: Basic usage17566 -Node: Command-line options18570 -Node: Option summary19018 -Node: Option details21267 -Node: Environment variables41266 -Node: Config files44127 -Node: Configuration file searching44797 -Node: Configuration file commands47994 -Node: Paper size and landscape55854 -Node: 'papersize' special57481 -Node: Config file paper sizes59191 -Node: Paper trays63349 -Node: Interaction with PostScript64683 -Node: PostScript figures65336 -Node: Bounding box66062 -Node: \includegraphics69434 -Node: EPSF macros71727 -Node: EPSF scaling73727 -Node: EPSF clipping76297 -Node: psfile special76939 -Node: Dynamic creation of graphics79331 -Node: Fonts in figures80649 -Node: Header files82299 -Node: Including headers from TeX83509 -Node: Including headers from the command line85547 -Node: Headers and memory usage86646 -Node: Literal PS87857 -Node: " special88439 -Node: ps special89180 -Node: Literal headers90678 -Node: PostScript hooks91387 -Node: Literal examples93483 -Node: Hypertext94937 -Node: Hypertext caveats96166 -Node: Hypertext specials100554 -Node: PostScript fonts103188 -Node: Font concepts104305 -Node: Metric files105535 -Node: Glyph files108315 -Node: Virtual fonts110674 -Node: Encodings112500 -Node: Bitmap font encodings114902 -Node: PostScript typesetting117324 -Node: Making a font available120421 -Node: Invoking afm2tfm125455 -Node: Changing font encodings126472 -Node: Changing TeX encodings127263 -Node: Changing PostScript encodings128365 -Node: Changing both encodings129709 -Node: Reencoding with Afm2tfm130383 -Node: Encoding file format133486 -Node: Special font effects137690 -Node: Afm2tfm options139950 -Node: psfonts.map143475 -Node: Color148205 -Node: Color macro files149249 -Node: User-definable colors152442 -Node: Color subtleties153718 -Node: Ted Turner155370 -Node: Color device configuration156595 -Node: Color support details159039 -Node: Color specifications159417 -Node: Color specials160821 -Node: Index162950 +Node: Basic usage17535 +Node: Command-line options18539 +Node: Option summary18987 +Node: Option details21236 +Node: Environment variables41202 +Node: Config files44063 +Node: Configuration file searching44733 +Node: Configuration file commands47930 +Node: Paper size and landscape55904 +Node: papersize special57529 +Node: Config file paper sizes59237 +Node: Paper trays63393 +Node: Interaction with PostScript64727 +Node: PostScript figures65380 +Node: Bounding box66106 +Node: \includegraphics69478 +Node: EPSF macros71771 +Node: EPSF scaling73740 +Node: EPSF clipping76310 +Node: psfile special76952 +Node: Dynamic creation of graphics79344 +Node: Fonts in figures80662 +Node: Header files82312 +Node: Including headers from TeX83518 +Node: Including headers from the command line85556 +Node: Headers and memory usage86655 +Node: Literal PS87866 +Node: " special88448 +Node: ps special89189 +Node: Literal headers90687 +Node: PostScript hooks91396 +Node: Literal examples93492 +Node: Hypertext94946 +Node: Hypertext caveats96175 +Node: Hypertext specials100563 +Node: PostScript fonts103197 +Node: Font concepts104314 +Node: Metric files105544 +Node: Glyph files108324 +Node: Virtual fonts110683 +Node: Encodings112509 +Node: Bitmap font encodings114911 +Node: PostScript typesetting117441 +Node: Making a font available120538 +Node: Invoking afm2tfm125572 +Node: Changing font encodings126589 +Node: Changing TeX encodings127380 +Node: Changing PostScript encodings128482 +Node: Changing both encodings129826 +Node: Reencoding with Afm2tfm130500 +Node: Encoding file format133603 +Node: Special font effects137807 +Node: Afm2tfm options140067 +Node: psfonts.map143592 +Node: Color148322 +Node: Color macro files149366 +Node: User-definable colors152559 +Node: Color subtleties153835 +Node: Ted Turner155487 +Node: Color device configuration156712 +Node: Color support details159156 +Node: Color specifications159534 +Node: Color specials160938 +Node: Index163067 End Tag Table + + +Local Variables: +coding: utf-8 +End: diff --git a/Build/source/texk/dvipsk/dvips.texi b/Build/source/texk/dvipsk/dvips.texi index f66f0334925..b9a6b81a65d 100644 --- a/Build/source/texk/dvipsk/dvips.texi +++ b/Build/source/texk/dvipsk/dvips.texi @@ -592,6 +592,13 @@ do color separations or other neat tricks. Print only the even pages. This option uses @TeX{} page numbers, not physical page numbers. +@item -bitmapfontenc @var{option} +@opindex -bitmapfontenc @var{option} +@cindex bitmap font encoding +Turns bitmap font encoding to @samp{off}, @samp{on} (no warnings +for missing bitmap font encodings), or @samp{strict} (with warnings +for missing bitmap font encodings). + @item -c @var{num} @opindex -c @var{num} @vindex /#copies @@ -739,13 +746,6 @@ default in the current release. Some debugging flags trace this operation (@pxref{Debug options}). You can also control partial downloading on a per-font basis (@pxref{psfonts.map}). -@item -J @var{num} -@opindex -J @r{for bitmap font encoding} -Download encodings for bitmapped fonts. This flag has -three possible values: @samp{-J0} (to turn it off), @samp{-J} or @samp{-J1} -(to turn it on with no warnings), or @samp{-J2} (to turn it on and -enable warnings). - @item -k* @opindex -k @r{for cropmarks} @cindex cropmarks @@ -1345,6 +1345,12 @@ Memory conservation. Same as @samp{-a}, @pxref{Option details}. @opindex b @r{config command (#copies)} Multiple copies. Same as @samp{-b}, @pxref{Option details}. +@item bitmapfontenc @var{option} +@opindex bitmapfontenc @r{config command (bitmap font encoding)} +Turns bitmap font encoding to @samp{off}, @samp{on} (no warnings +for missing bitmap font encodings), or @samp{strict} (with warnings +for missing bitmap font encodings). + @item c @var{filename} @opindex c @r{config command (include another config file)} Include @var{filename} as an additional configuration file, read @@ -1399,10 +1405,6 @@ details}. @opindex j @r{config command (partial font downloading)} Partially download Type 1 fonts. Same as @samp{-j}, @pxref{Option details}. -@item J* -@opindex J @r{config command (bitmap font encoding)} -Enable bitmap font encoding. Same as @samp{-J}, @pxref{Option details}. - @item K* @opindex K @r{config command (comment removal)} Remove comments from included PostScript files. Same as @samp{-K}, @@ -3392,17 +3394,20 @@ italics, and @file{texmsym.enc} for math symbols. To dvips, bitmapped fonts do not have any notion of linguistics; they are simply a vector of glyphs. By comparison, PostScript fonts are -required to contain an encoding vector that at the least provides +required to contain an encoding vector that at least provides glyph names; these names can permit PostScript and PDF viewers to extract legible text from Postscript and PDF output. -Unlike previous versions, dvips versions 2019 and later add glyph +Unlike previous versions, dvips versions 2020 and later add glyph naming information to Type 3 bitmapped fonts (if they can locate such information) as an Encoding vector. This provides some support for search, for copy and paste, and even some limited support for -accessibility. The -J command line option and J configuration option -enables and disables this functionality; by default it is enabled. +accessibility. The @samp{bitmapfontenc} command line option +(@pxref{Option details} and @code{bitmapfontenc} configuration option +(@pxref{Configuration file commands}) enable and disable this +functionality; by default it is set to enabled, without warnings. +@flindex dvips-all.enc To do this, dvips must find encoding information for the bitmapped fonts. It does this by first searching for a font-specific encoding file; for instance, for cmr10, it will search for @file{dvips-cmr10.enc} diff --git a/Build/source/texk/dvipsk/protos.h b/Build/source/texk/dvipsk/protos.h index 5d27a364fb3..3de2aedd139 100644 --- a/Build/source/texk/dvipsk/protos.h +++ b/Build/source/texk/dvipsk/protos.h @@ -17,8 +17,7 @@ extern void findbb(int bop); /* prototypes for functions from bitmapenc.c */ extern void bmenc_startsection(void) ; extern void bitmapencopt(int) ; -extern int downloadbmencoding(const char *name, double scale, - int llx, int lly, int urx, int ury) ; +extern int downloadbmencoding(const char *name, double scale, fontdesctype *curfnt) ; extern void finishbitmapencoding(const char *name, double scale) ; /* prototypes for functions from color.c */ diff --git a/Build/source/texk/dvipsk/resident.c b/Build/source/texk/dvipsk/resident.c index 8814334f50d..10df9d6de33 100644 --- a/Build/source/texk/dvipsk/resident.c +++ b/Build/source/texk/dvipsk/resident.c @@ -460,6 +460,22 @@ case 'a' : dopprescan = (was_inline[1] != '0'); break; case 'b': + if (strncmp(was_inline, "bitmapfontenc", 13) == 0) { + char *p = was_inline + 13 ; + while (*p && *p <= ' ') + p++ ; + if (strncmp(p, "off", 3) == 0) { + bitmapencopt(0) ; // disable bitmap font enc feature + } else if (strncmp(p, "on", 2) == 0) { + bitmapencopt(1) ; // try to include bitmap font encs + } else if (strncmp(p, "strict", 6) == 0) { + bitmapencopt(2) ; // issue warnings for missing encs + } else { + error( + "! bitmapfontenc config file option only supports on, off, and strict") ; + } + break ; + } #ifdef SHORTINT if (sscanf(was_inline+1, "%ld", &pagecopies) != 1) bad_config("missing pagecopies to b"); @@ -752,9 +768,6 @@ case 'i' : case 'I': noenv = (was_inline[1] != '0'); break; -case 'J': - bitmapencopt(was_inline[1] > ' ' ? was_inline[1]-'0' : 1) ; - break ; case 'N' : disablecomments = (was_inline[1] != '0'); break; |