unknown paper size must come before nopaper in config.ps

git-svn-id: svn://tug.org/texlive/trunk@15465 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 128 insertions, 112 deletions

diff --git a/Build/source/texk/dvipsk/ChangeLog b/Build/source/texk/dvipsk/ChangeLog
index 786aaf95a92..516a51185b0 100644
--- a/Build/source/texk/dvipsk/ChangeLog
+++ b/Build/source/texk/dvipsk/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-26  Karl Berry  <karl@tug.org>
+
+	* config/config.ps (unknown): move to before nopaper; else
+	nonstandard paper sizes, e.g., with the geometry package,
+	end up unrecognized.
+
 2009-07-17  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* writet1.c (t1_flush_cs): cast ptr diff to unsigned long for
diff --git a/Build/source/texk/dvipsk/config.ps b/Build/source/texk/dvipsk/config.ps
index c0c7a80817c..0d47766406e 100644
--- a/Build/source/texk/dvipsk/config.ps
+++ b/Build/source/texk/dvipsk/config.ps
@@ -64,6 +64,8 @@ j
 % If you need to have no paper size stuff in the output at all, e.g., if
 % you are producing a multi-page document for further processing, use
 % -tnopaper (defined at end).  (With a single-page document, you can use -E.)
+%
+% emacs-page
 
 @ a4 210mm 297mm
 @+ ! %%DocumentPaperSizes: a4
@@ -584,12 +586,19 @@ j
 @+ if
 @+ %%EndPaperSize
 
-% use -t nopaper to get no paper size stuff in the output at all.
-@ nopaper 0in 0in
-@+ % nopaper
-
 % use -t unknown with a \special{papersize=...} for a nonstandard page size.
 @ unknown 0in 0in
+@+ % dvips-unknown
 @+ statusdict /setpageparams known { hsize vsize 0 1 statusdict begin {
 @+ setpageparams } stopped end } { true } ifelse { statusdict /setpage known
 @+ { hsize vsize 1 statusdict begin { setpage } stopped pop end } if } if
+
+% use -t nopaper to get no paper size stuff in the output at all.
+% This should remain as the last thing in the file, because the first
+% 0in 0in entry is chosen when there is nothing better; ordinarily, we
+% want to that to be "unknown", so that the correct nonstandard paper
+% size is output, instead of just being omitted.
+% http://groups.google.com/group/fr.comp.text.tex/browse_thread/thread/1b08961cf9b8a5ab/6b1d0b32443905e3
+% and mactex mailing list thread from 24 Sep 2009 11:36:26.
+@ nopaper 0in 0in
+@+ % dvips-nopaper
diff --git a/Build/source/texk/dvipsk/dvips.info b/Build/source/texk/dvipsk/dvips.info
index 34fd77e32aa..007024dca84 100644
--- a/Build/source/texk/dvipsk/dvips.info
+++ b/Build/source/texk/dvipsk/dvips.info
@@ -1,7 +1,7 @@
 This is ../../../texk/dvipsk/dvips.info, produced by makeinfo version
 4.13 from ../../../texk/dvipsk/dvips.texi.
 
-This manual documents Dvips version 5.98 (June 2009), a program to
+This manual documents Dvips version 5.98 (September 2009), a program to
 translate a DVI file into PostScript.  You may freely use, modify
 and/or distribute this file.
 
@@ -18,7 +18,7 @@ File: dvips.info,  Node: Top,  Next: Why Dvips,  Up: (dir)
 Dvips
 *****
 
-This manual documents Dvips version 5.98 (June 2009), a program to
+This manual documents Dvips version 5.98 (September 2009), a program to
 translate a DVI file into PostScript.  You may freely use, modify
 and/or distribute this file.
 
@@ -1486,24 +1486,24 @@ For example:
    When Dvips has a paper format name given on the command line, it
 looks for a match by the NAME; when it has a `papersize' special, it
 looks for a match by dimensions.  The best match found (from the paper
-size information in the configuration file) is used.  If nothing
-matches, a warning is printed and the first paper size is used.  The
-dimensions must match within 5bp.  Landscape mode for all paper sizes
-is automatically supported.
+size information in the configuration file) is used.  The dimensions
+must match within 5bp.
+
+   If nothing matches, a warning is printed and the first paper size
+with zero dimensions is used; this should be the `unknown' paper size
+definition mentioned below, resulting in the actual dimensions being
+used.
+
+   Landscape mode for all paper sizes is automatically supported.
 
    If your printer has a command to set a special paper size, then give
 dimensions of `0in 0in'; the PostScript code that sets the paper size
 can refer to the dimensions the user requested as `hsize' and `vsize';
 these will be macros defined in the PostScript that return the
-requested size in default PostScript units.  Virtually all of the
-PostScript commands you use here are device-dependent and degrade the
-portability of the file; that is why the default first paper size entry
-should not send any PostScript commands down (although a structured
-comment or two would be okay).  Also, some printers want
+requested size in default PostScript units.  Also, some printers want
 `BeginPaperSize' comments and paper size setting commands; others (such
 as the NeXT) want `PaperSize' comments and they will handle setting the
-paper size.  There is no solution I could find that works for both
-(except maybe specifying both).
+paper size.  So paper size entries should typically specify both.
 
    When using a paper size that is not already defined in `config.ps',
 you probably want to say `-t unknown' on the command line; the
@@ -4703,82 +4703,82 @@ Index
 
 
 Tag Table:
-Node: Top559
-Node: Why Dvips1303
-Node: Installation4751
-Node: config.ps installation5889
-Node: PostScript font installation8431
-Node: Ghostscript installation11305
-Node: Diagnosing problems12402
-Node: Debug options13497
-Node: No output14700
-Node: Small or inverted16168
-Node: Printer errors16887
-Node: Long documents fail18219
-Node: Including graphics fails18560
-Node: Invoking Dvips19798
-Node: Basic usage20389
-Node: Command-line options21373
-Node: Option summary21822
-Node: Option details23984
-Node: Environment variables42988
-Node: Config files45947
-Node: Configuration file searching46630
-Node: Configuration file commands49930
-Node: Paper size and landscape57043
-Node: papersize special58641
-Node: Config file paper sizes60050
-Node: Paper trays64359
-Node: Interaction with PostScript65693
-Node: PostScript figures66346
-Node: Bounding box67072
-Node: \includegraphics70443
-Node: EPSF macros72734
-Node: EPSF scaling74704
-Node: EPSF clipping77274
-Node: psfile special77916
-Node: Dynamic creation of graphics80309
-Node: Fonts in figures81627
-Node: Header files83287
-Node: Including headers from TeX84493
-Node: Including headers from the command line86527
-Node: Headers and memory usage87627
-Node: Literal PS88337
-Node: " special88919
-Node: ps special89660
-Node: Literal headers91158
-Node: PostScript hooks91873
-Node: Literal examples93963
-Node: Hypertext95415
-Node: Hypertext caveats96973
-Node: Hypertext specials101370
-Node: PostScript fonts104004
-Node: Font concepts105120
-Node: Metric files106287
-Node: Glyph files109113
-Node: Virtual fonts111469
-Node: Encodings113359
-Node: PostScript typesetting115741
-Node: Making a font available118823
-Node: Invoking afm2tfm123853
-Node: Changing font encodings124823
-Node: Changing TeX encodings125613
-Node: Changing PostScript encodings126713
-Node: Changing both encodings128057
-Node: Reencoding with Afm2tfm128730
-Node: Encoding file format131834
-Node: Special font effects136037
-Node: Afm2tfm options138300
-Node: psfonts.map141285
-Node: Color146017
-Node: Color macro files147061
-Node: User-definable colors150259
-Node: Color subtleties151534
-Node: Ted Turner153185
-Node: Color device configuration154410
-Node: Color support details156852
-Node: Color specifications157230
-Node: Color specials158633
-Node: Index160762
+Node: Top564
+Node: Why Dvips1313
+Node: Installation4761
+Node: config.ps installation5899
+Node: PostScript font installation8441
+Node: Ghostscript installation11315
+Node: Diagnosing problems12412
+Node: Debug options13507
+Node: No output14710
+Node: Small or inverted16178
+Node: Printer errors16897
+Node: Long documents fail18229
+Node: Including graphics fails18570
+Node: Invoking Dvips19808
+Node: Basic usage20399
+Node: Command-line options21383
+Node: Option summary21832
+Node: Option details23994
+Node: Environment variables42998
+Node: Config files45957
+Node: Configuration file searching46640
+Node: Configuration file commands49940
+Node: Paper size and landscape57053
+Node: papersize special58651
+Node: Config file paper sizes60060
+Node: Paper trays64215
+Node: Interaction with PostScript65549
+Node: PostScript figures66202
+Node: Bounding box66928
+Node: \includegraphics70299
+Node: EPSF macros72590
+Node: EPSF scaling74560
+Node: EPSF clipping77130
+Node: psfile special77772
+Node: Dynamic creation of graphics80165
+Node: Fonts in figures81483
+Node: Header files83143
+Node: Including headers from TeX84349
+Node: Including headers from the command line86383
+Node: Headers and memory usage87483
+Node: Literal PS88193
+Node: " special88775
+Node: ps special89516
+Node: Literal headers91014
+Node: PostScript hooks91729
+Node: Literal examples93819
+Node: Hypertext95271
+Node: Hypertext caveats96829
+Node: Hypertext specials101226
+Node: PostScript fonts103860
+Node: Font concepts104976
+Node: Metric files106143
+Node: Glyph files108969
+Node: Virtual fonts111325
+Node: Encodings113215
+Node: PostScript typesetting115597
+Node: Making a font available118679
+Node: Invoking afm2tfm123709
+Node: Changing font encodings124679
+Node: Changing TeX encodings125469
+Node: Changing PostScript encodings126569
+Node: Changing both encodings127913
+Node: Reencoding with Afm2tfm128586
+Node: Encoding file format131690
+Node: Special font effects135893
+Node: Afm2tfm options138156
+Node: psfonts.map141141
+Node: Color145873
+Node: Color macro files146917
+Node: User-definable colors150115
+Node: Color subtleties151390
+Node: Ted Turner153041
+Node: Color device configuration154266
+Node: Color support details156708
+Node: Color specifications157086
+Node: Color specials158489
+Node: Index160618
 
 End Tag Table
diff --git a/Build/source/texk/dvipsk/dvips.texi b/Build/source/texk/dvipsk/dvips.texi
index 904b1541a3d..a08a553be98 100644
--- a/Build/source/texk/dvipsk/dvips.texi
+++ b/Build/source/texk/dvipsk/dvips.texi
@@ -3,7 +3,7 @@
 @settitle Dvips: A DVI-to-PostScript translator
 
 @set version 5.98
-@set month-year June 2009
+@set month-year September 2009
 
 @copying
 This manual documents Dvips version @value{version}
@@ -1781,24 +1781,25 @@ For example:
 When Dvips has a paper format name given on the command line, it looks
 for a match by the @var{name}; when it has a @samp{papersize} special,
 it looks for a match by dimensions.  The best match found (from the
-paper size information in the configuration file) is used.  If nothing
-matches, a warning is printed and the first paper size is used.  The
-dimensions must match within 5bp.  Landscape mode for all paper sizes
-is automatically supported.
+paper size information in the configuration file) is used.  The
+dimensions must match within 5bp.  
+
+If nothing matches, a warning is printed and the first paper size with
+zero dimensions is used; this should be the @code{unknown} paper size
+definition mentioned below, resulting in the actual dimensions being
+used.
+
+Landscape mode for all paper sizes is automatically supported.
 
 If your printer has a command to set a special paper size, then give
 dimensions of @samp{0in 0in}; the PostScript code that sets the paper
-size can refer to the dimensions the user requested as @samp{hsize} and
-@samp{vsize}; these will be macros defined in the PostScript that return
-the requested size in default PostScript units.  Virtually all of the
-PostScript commands you use here are device-dependent and degrade the
-portability of the file; that is why the default first paper size entry
-should not send any PostScript commands down (although a structured
-comment or two would be okay).  Also, some printers want
-@samp{BeginPaperSize} comments and paper size setting commands; others
-(such as the NeXT) want @samp{PaperSize} comments and they will handle
-setting the paper size.  There is no solution I could find that works
-for both (except maybe specifying both).
+size can refer to the dimensions the user requested as @samp{hsize}
+and @samp{vsize}; these will be macros defined in the PostScript that
+return the requested size in default PostScript units.  Also, some
+printers want @samp{BeginPaperSize} comments and paper size setting
+commands; others (such as the NeXT) want @samp{PaperSize} comments and
+they will handle setting the paper size.  So paper size entries should
+typically specify both.
 
 @findex unknown@r{, paper format for @samp{-t}}
 When using a paper size that is not already defined in
@@ -1824,8 +1825,8 @@ definitions.
 Notwithstanding the above, the default @code{letter} and @code{a4}
 paper size definitions in @file{config.ps} execute the
 @code{setpagedevice} operator if it exists (it was defined in
-PostScript Level 2), or the @samp{letter} or @samp{a4} operator if
-they exist (they are nonstandard and thus perhaps cause failures on
+PostScript Level@tie{}2), or the @samp{letter} or @samp{a4} operator
+if they exist (they are nonstandard and thus perhaps cause failures on
 certain (unknown) printers).  Not executing any page size definition
 at all confuses PostScript conversion programs such as
 @command{ps2pdf}, so we want to execute one if we can.