summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/dvipsk/config.ps38
-rw-r--r--Build/source/texk/dvipsk/dvips.texi39
-rwxr-xr-xBuild/source/texk/tetex/texconfig4
-rwxr-xr-xMaster/bin/i386-linux/texconfig4
-rw-r--r--Master/texmf/dvips/config/config.ps38
5 files changed, 62 insertions, 61 deletions
diff --git a/Build/source/texk/dvipsk/config.ps b/Build/source/texk/dvipsk/config.ps
index 3c61d47eb91..b2382474f3e 100644
--- a/Build/source/texk/dvipsk/config.ps
+++ b/Build/source/texk/dvipsk/config.ps
@@ -1,5 +1,5 @@
% config.ps - configuration file for dvips.
-% Tomas Rokicki, Thomas Esser, Karl Berry, et al., 1998, public domain.
+% Tomas Rokicki, Thomas Esser, Karl Berry, et al., 1986ff, public domain.
% Memory available. Download the three-line PostScript file:
% %! Hey, we're PostScript
@@ -54,13 +54,33 @@ j
% 0 0 595 842 is the right bounding box that most applications expect
% for A4. Since dvips always rounds up, choose something slightly smaller.
+@ a4 209.9mm 297.04mm
+@+ ! %%DocumentPaperSizes: a4
+@+ %%BeginPaperSize: a4
+@+ << /PageSize [595 842] >> setpagedevice
+@+ %%EndPaperSize
+
+@ letter 8.5in 11in
+@+ ! %%DocumentPaperSizes: Letter
+@+ %%BeginPaperSize: Letter
+@+ << /PageSize [612 792] >> setpagedevice
+@+ %%EndPaperSize
+
+% these used to be the default paper sizes used, and they did not
+% execute any page size operator, but now it seems there is no reason
+% not to use setpagedevice.
+%
@ a4size 209.9mm 297.04mm
+@+ %%BeginPaperSize: a4
@+ ! %%DocumentPaperSizes: a4
-@+ %%PaperSize: a4
+@+ << /PageSize [595 842] >> setpagedevice
+@+ %%EndPaperSize
@ letterSize 8.5in 11in
@+ ! %%DocumentPaperSizes: Letter
-@+ %%PaperSize: Letter
+@+ %%BeginPaperSize: Letter
+@+ << /PageSize [612 792] >> setpagedevice
+@+ %%EndPaperSize: Letter
@ halfexecutive 133.35mm 184.15mm
@+ ! %%DocumentPaperSizes: halfexecutive
@@ -100,12 +120,6 @@ j
@+ << /PageSize [432 648] >> setpagedevice
@+ %%EndPaperSize
-@ letter 8.5in 11in
-@+ ! %%DocumentPaperSizes: Letter
-@+ %%BeginPaperSize: Letter
-@+ << /PageSize [612 792] >> setpagedevice
-@+ %%EndPaperSize
-
@ quarto 215.19mm 275.17mm
@+ ! %%DocumentPaperSizes: quarto
@+ %%BeginPaperSize: quarto
@@ -178,12 +192,6 @@ j
@+ << /PageSize [842 1190] >> setpagedevice
@+ %%EndPaperSize
-@ a4 209.9mm 297.04mm
-@+ ! %%DocumentPaperSizes: a4
-@+ %%BeginPaperSize: a4
-@+ << /PageSize [595 842] >> setpagedevice
-@+ %%EndPaperSize
-
@ a5 148.52mm 209.9mm
@+ ! %%DocumentPaperSizes: a5
@+ %%BeginPaperSize: a5
diff --git a/Build/source/texk/dvipsk/dvips.texi b/Build/source/texk/dvipsk/dvips.texi
index 5cea561f138..c98741430a8 100644
--- a/Build/source/texk/dvipsk/dvips.texi
+++ b/Build/source/texk/dvipsk/dvips.texi
@@ -1777,29 +1777,21 @@ for both (except maybe specifying both).
The Perl 5 script @file{contrib/mkdvipspapers} in the distribution
directory may help in determining appropriate paper size definitions.
-@cindex a4 paper size, as default
-If your printers are configured to use A4 paper by default, the
-configuration file (probably the global @file{config.ps} in this case)
-should include this as the first @samp{@@} command:
-
-@example
-@@ A4size 210mm 297mm
-@@+ %%PaperSize: A4
-@end example
-
-@noindent
-so that @code{A4size} is used as the default, and not @code{A4} itself;
-thus, no PostScript @code{a4} command is added to the output file,
-unless the user explicitly says to use paper size @samp{a4}. That is,
-by default, no paper size PostScript command should be put in the
-output, but Dvips will still know that the paper size is A4 because
-@samp{A4size} is the first (and therefore default) size in the
-configuration file.
-
-Executing the @samp{letter} or @samp{a4} or other PostScript operators
-cause the document to be nonconforming and can cause it not to print on
-certain printers, so the default paper size should not execute such an
-operator if at all possible.
+@flindex config.ps @r{paper sizes}
+@findex letter @r{paper size}
+@findex a4 @r{paper size}
+The default @code{letter} and @code{a4} paper size definitions in
+@file{config.ps} execute the @code{setpagedevice} operator, which
+always exists. Executing the @samp{letter} or @samp{a4} or other
+PostScript operators cause the document to be nonconforming and thus
+perhaps not to print on certain (unknown) printers, while not
+executing any page size definition at all confuses PostScript
+conversion programs such as @command{ps2pdf}.
+
+@findex letterSize @r{paper size}
+@findex A4size @r{paper size}
+The @code{letterSize} and @code{A4Size} paper size definitions are now
+synonyms for @code{letter} and @code{a4}.
@node Paper trays
@@ -1810,6 +1802,7 @@ operator if at all possible.
@cindex multiple paper trays
@cindex HP4Si printer and paper trays
+@findex bop-hook
Some printers, such as the Hewlett-Packard HP4si, have multiple paper
trays. You can set up Dvips to take advantage of this using the
@code{bop-hook} PostScript variable (@pxref{PostScript hooks}).
diff --git a/Build/source/texk/tetex/texconfig b/Build/source/texk/tetex/texconfig
index 922dc7939e2..d5e690a000f 100755
--- a/Build/source/texk/tetex/texconfig
+++ b/Build/source/texk/tetex/texconfig
@@ -1209,11 +1209,7 @@ Valid PAPER settings:
p=$2; pXdvi=$2; pDvips=$2
case $2 in
- a4)
- pDvips=A4size
- ;;
letter)
- pDvips=letterSize
pXdvi=us
;;
"") echo "$help" >&2; rc=1; return;;
diff --git a/Master/bin/i386-linux/texconfig b/Master/bin/i386-linux/texconfig
index 922dc7939e2..d5e690a000f 100755
--- a/Master/bin/i386-linux/texconfig
+++ b/Master/bin/i386-linux/texconfig
@@ -1209,11 +1209,7 @@ Valid PAPER settings:
p=$2; pXdvi=$2; pDvips=$2
case $2 in
- a4)
- pDvips=A4size
- ;;
letter)
- pDvips=letterSize
pXdvi=us
;;
"") echo "$help" >&2; rc=1; return;;
diff --git a/Master/texmf/dvips/config/config.ps b/Master/texmf/dvips/config/config.ps
index 3c61d47eb91..b2382474f3e 100644
--- a/Master/texmf/dvips/config/config.ps
+++ b/Master/texmf/dvips/config/config.ps
@@ -1,5 +1,5 @@
% config.ps - configuration file for dvips.
-% Tomas Rokicki, Thomas Esser, Karl Berry, et al., 1998, public domain.
+% Tomas Rokicki, Thomas Esser, Karl Berry, et al., 1986ff, public domain.
% Memory available. Download the three-line PostScript file:
% %! Hey, we're PostScript
@@ -54,13 +54,33 @@ j
% 0 0 595 842 is the right bounding box that most applications expect
% for A4. Since dvips always rounds up, choose something slightly smaller.
+@ a4 209.9mm 297.04mm
+@+ ! %%DocumentPaperSizes: a4
+@+ %%BeginPaperSize: a4
+@+ << /PageSize [595 842] >> setpagedevice
+@+ %%EndPaperSize
+
+@ letter 8.5in 11in
+@+ ! %%DocumentPaperSizes: Letter
+@+ %%BeginPaperSize: Letter
+@+ << /PageSize [612 792] >> setpagedevice
+@+ %%EndPaperSize
+
+% these used to be the default paper sizes used, and they did not
+% execute any page size operator, but now it seems there is no reason
+% not to use setpagedevice.
+%
@ a4size 209.9mm 297.04mm
+@+ %%BeginPaperSize: a4
@+ ! %%DocumentPaperSizes: a4
-@+ %%PaperSize: a4
+@+ << /PageSize [595 842] >> setpagedevice
+@+ %%EndPaperSize
@ letterSize 8.5in 11in
@+ ! %%DocumentPaperSizes: Letter
-@+ %%PaperSize: Letter
+@+ %%BeginPaperSize: Letter
+@+ << /PageSize [612 792] >> setpagedevice
+@+ %%EndPaperSize: Letter
@ halfexecutive 133.35mm 184.15mm
@+ ! %%DocumentPaperSizes: halfexecutive
@@ -100,12 +120,6 @@ j
@+ << /PageSize [432 648] >> setpagedevice
@+ %%EndPaperSize
-@ letter 8.5in 11in
-@+ ! %%DocumentPaperSizes: Letter
-@+ %%BeginPaperSize: Letter
-@+ << /PageSize [612 792] >> setpagedevice
-@+ %%EndPaperSize
-
@ quarto 215.19mm 275.17mm
@+ ! %%DocumentPaperSizes: quarto
@+ %%BeginPaperSize: quarto
@@ -178,12 +192,6 @@ j
@+ << /PageSize [842 1190] >> setpagedevice
@+ %%EndPaperSize
-@ a4 209.9mm 297.04mm
-@+ ! %%DocumentPaperSizes: a4
-@+ %%BeginPaperSize: a4
-@+ << /PageSize [595 842] >> setpagedevice
-@+ %%EndPaperSize
-
@ a5 148.52mm 209.9mm
@+ ! %%DocumentPaperSizes: a5
@+ %%BeginPaperSize: a5