diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2011-07-26 14:14:39 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2011-07-26 14:14:39 +0000 |
commit | 7bb989e1bc4feb460274849e6ea092ee79f16044 (patch) | |
tree | 3d435821cd104c0cedea016a6346a1aabd5fb72e /Build/source/texk/dvipsk | |
parent | 8d4af963a232f6c2cdbf510179c05af4140d3264 (diff) |
pTeX requires independent options -noomega and -noptex
git-svn-id: svn://tug.org/texlive/trunk@23231 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipsk')
-rw-r--r-- | Build/source/texk/dvipsk/ChangeLog | 7 | ||||
-rw-r--r-- | Build/source/texk/dvipsk/bbox.c | 4 | ||||
-rw-r--r-- | Build/source/texk/dvipsk/dopage.c | 4 | ||||
-rw-r--r-- | Build/source/texk/dvipsk/dvips.1 | 6 | ||||
-rw-r--r-- | Build/source/texk/dvipsk/dvips.c | 4 | ||||
-rw-r--r-- | Build/source/texk/dvipsk/dvips.help | 2 | ||||
-rw-r--r-- | Build/source/texk/dvipsk/dvips.info | 8 | ||||
-rw-r--r-- | Build/source/texk/dvipsk/dvips.texi | 4 | ||||
-rw-r--r-- | Build/source/texk/dvipsk/pprescan.c | 4 | ||||
-rw-r--r-- | Build/source/texk/dvipsk/scanpage.c | 4 |
10 files changed, 27 insertions, 20 deletions
diff --git a/Build/source/texk/dvipsk/ChangeLog b/Build/source/texk/dvipsk/ChangeLog index 7c3f2a03d5c..5bdb01fe436 100644 --- a/Build/source/texk/dvipsk/ChangeLog +++ b/Build/source/texk/dvipsk/ChangeLog @@ -1,3 +1,10 @@ +2011-07-26 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + * bbox.c, dopage.c, dvips.c, pprescan.c, scanpage.c, dvips.1, + dvips.help, dvips.info and dvips.texi: pTeX with otf package + by S. Saito requires set2, put2, and independent options + -noomega and -noptex. + 2011-06-16 Peter Breitenlohner <peb@mppmu.mpg.de> * afm2tfm.c (openfiles), resident.c (residentfont): Allow diff --git a/Build/source/texk/dvipsk/bbox.c b/Build/source/texk/dvipsk/bbox.c index eeab1585a69..55553d78a29 100644 --- a/Build/source/texk/dvipsk/bbox.c +++ b/Build/source/texk/dvipsk/bbox.c @@ -318,13 +318,13 @@ case 130: /* set3 */ charmove = 1; goto dochar; case 134: /* put2 */ - if (noomega) error("! synch"); + if (noomega && noptex) error("! synch"); mychar = dvibyte(); mychar = (mychar << 8) + dvibyte(); charmove = 0; goto dochar; case 129: /* set2 */ - if (noomega) error("! synch"); + if (noomega && noptex) error("! synch"); mychar = dvibyte(); mychar = (mychar << 8) + dvibyte(); charmove = 1; diff --git a/Build/source/texk/dvipsk/dopage.c b/Build/source/texk/dvipsk/dopage.c index 019300f8c85..991ca72a859 100644 --- a/Build/source/texk/dvipsk/dopage.c +++ b/Build/source/texk/dvipsk/dopage.c @@ -98,13 +98,13 @@ case 130: /* set3 */ charmove = 1; goto dochar; case 134: /* put2 */ - if (noomega) error("! synch"); + if (noomega && noptex) error("! synch"); mychar = dvibyte(); mychar = (mychar << 8) + dvibyte(); charmove = 0; goto dochar; case 129: /* set2 */ - if (noomega) error("! synch"); + if (noomega && noptex) error("! synch"); mychar = dvibyte(); mychar = (mychar << 8) + dvibyte(); charmove = 1; diff --git a/Build/source/texk/dvipsk/dvips.1 b/Build/source/texk/dvipsk/dvips.1 index 2fd3cadbdf9..c8bd77995d4 100644 --- a/Build/source/texk/dvipsk/dvips.1 +++ b/Build/source/texk/dvipsk/dvips.1 @@ -244,13 +244,13 @@ PostScript printers. Old versions of TranScript in particular cannot handle modern Encapsulated PostScript. .TP .BR -noomega -This will disable the use of Omega and pTeX extensions when interpreting DVI +This will disable the use of Omega extensions when interpreting DVI files. By default, the additional opcodes .I 129 and .I 134 -are recognized by dvips as Omega extensions and interpreted as requests to -set 2-byte characters. +are recognized by dvips as Omega or pTeX extensions and interpreted as +requests to set 2-byte characters. .TP .BR -noptex This will disable the use of pTeX extensions when interpreting DVI files. diff --git a/Build/source/texk/dvipsk/dvips.c b/Build/source/texk/dvipsk/dvips.c index 21486d03ae1..24e80684e5f 100644 --- a/Build/source/texk/dvipsk/dvips.c +++ b/Build/source/texk/dvipsk/dvips.c @@ -279,7 +279,7 @@ static const char *helparr[] = { "-m* Manual feed -M* Don't make fonts", "-mode s Metafont device name", "-n # Maximum number of pages -N* No structured comments", -"-noomega Disable Omega and pTeX extensions", +"-noomega Disable Omega extensions", "-noptex Disable pTeX extensions", "-o f Output file -O c Set/change paper offset", #if defined(MSDOS) || defined(OS2) @@ -821,7 +821,7 @@ case 'm' : break; case 'n' : if (STREQ (p, "oomega")) { - noomega = noptex = 1; + noomega = 1; } else if (STREQ (p, "optex")) { noptex = 1; } else { diff --git a/Build/source/texk/dvipsk/dvips.help b/Build/source/texk/dvipsk/dvips.help index 51636887d51..d7d687bfaf2 100644 --- a/Build/source/texk/dvipsk/dvips.help +++ b/Build/source/texk/dvipsk/dvips.help @@ -18,7 +18,7 @@ Options: -m* Manual feed -M* Don't make fonts -mode s Metafont device name -n # Maximum number of pages -N* No structured comments --noomega Disable Omega and pTeX extensions +-noomega Disable Omega extensions -noptex Disable pTeX extensions -o f Output file -O c Set/change paper offset -p # First page -P s Load config.$s diff --git a/Build/source/texk/dvipsk/dvips.info b/Build/source/texk/dvipsk/dvips.info index a614183e1d8..755070bd3e3 100644 --- a/Build/source/texk/dvipsk/dvips.info +++ b/Build/source/texk/dvipsk/dvips.info @@ -584,7 +584,7 @@ Options: -m* Manual feed -M* Don't make fonts -mode s Metafont device name -n # Maximum number of pages -N* No structured comments --noomega Disable Omega and pTeX extensions +-noomega Disable Omega extensions -noptex Disable pTeX extensions -o f Output file -O c Set/change paper offset -p # First page -P s Load config.$s @@ -810,9 +810,9 @@ reversal, use `-r0'. Such options are marked with a trailing `*'. movement, etc., in PostScript viewers such as Ghostview. `-noomega' - Disable the use of Omega and pTeX extensions when interpreting DVI + Disable the use of Omega extensions when interpreting DVI files. By default, the additional opcodes `129' and `134' are - recognized by Dvips as Omega extensions and interpreted as + recognized by Dvips as Omega or pTeX extensions and interpreted as requests to set 2-byte characters. `-noptex' @@ -3777,7 +3777,7 @@ File: dvips.info, Node: Index, Prev: Color, Up: Top Index ***** - + * Menu: * ! special (literal PS header): Literal headers. (line 6) diff --git a/Build/source/texk/dvipsk/dvips.texi b/Build/source/texk/dvipsk/dvips.texi index 0eca7fe7acf..99874a3a67a 100644 --- a/Build/source/texk/dvipsk/dvips.texi +++ b/Build/source/texk/dvipsk/dvips.texi @@ -921,9 +921,9 @@ such as Ghostview. @opindex -noomega @cindex Omega extensions @cindex p@TeX{} extensions -Disable the use of Omega and p@TeX{} extensions when interpreting DVI +Disable the use of Omega extensions when interpreting DVI files. By default, the additional opcodes @samp{129} and @samp{134} -are recognized by Dvips as Omega extensions and interpreted as +are recognized by Dvips as Omega or p@TeX{} extensions and interpreted as requests to set 2-byte characters. @item -noptex diff --git a/Build/source/texk/dvipsk/pprescan.c b/Build/source/texk/dvipsk/pprescan.c index 2e26e23a8e3..71d0889e4fc 100644 --- a/Build/source/texk/dvipsk/pprescan.c +++ b/Build/source/texk/dvipsk/pprescan.c @@ -99,9 +99,9 @@ case 130: case 135: /* set3, put3 */ mychar = (mychar << 8) + dvibyte(); goto dochar; case 129: case 134: /* set2, put2 */ - if (noomega) { + if (noomega && noptex) { sprintf(errbuf, - "! DVI file contains unexpected Omega command (%d)",cmd); + "! DVI file contains unexpected command (%d)",cmd); error(errbuf); } mychar = dvibyte(); mychar = (mychar << 8) + dvibyte(); diff --git a/Build/source/texk/dvipsk/scanpage.c b/Build/source/texk/dvipsk/scanpage.c index 9315950bf83..824a8f5143f 100644 --- a/Build/source/texk/dvipsk/scanpage.c +++ b/Build/source/texk/dvipsk/scanpage.c @@ -175,9 +175,9 @@ case 130: case 135: /* set3, put3 */ mychar = (mychar << 8) + dvibyte(); goto dochar; case 129: case 134: /* set2, put2 */ - if (noomega) { + if (noomega && noptex) { sprintf(errbuf, - "! DVI file contains unexpected Omega command (%d)",cmd); + "! DVI file contains unexpected command (%d)",cmd); error(errbuf); } mychar = dvibyte(); mychar = (mychar << 8) + dvibyte(); |