summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-04-23 23:47:26 +0000
committerKarl Berry <karl@freefriends.org>2017-04-23 23:47:26 +0000
commit331a5170c4387ae90d48be6c6abf9c304a36bbb7 (patch)
tree3ad00221317358d0623fed1196fa0d818bb697b3
parente7a2e7fe7550a84262a059f85a623f7e6c74fa55 (diff)
xdvi paper size updates from pvojta
git-svn-id: svn://tug.org/texlive/trunk@44000 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/texlive/tl_scripts/ChangeLog5
-rwxr-xr-xBuild/source/texk/texlive/tl_scripts/texconfig.sh94
-rw-r--r--Master/tlpkg/TeXLive/TLPaper.pm124
3 files changed, 140 insertions, 83 deletions
diff --git a/Build/source/texk/texlive/tl_scripts/ChangeLog b/Build/source/texk/texlive/tl_scripts/ChangeLog
index 998dc369cb9..0334ba7567f 100644
--- a/Build/source/texk/texlive/tl_scripts/ChangeLog
+++ b/Build/source/texk/texlive/tl_scripts/ChangeLog
@@ -1,3 +1,8 @@
+2017-04-24 Paul Vojta <vojta@math.berkeley.edu>
+
+ * texconfig.sh: xdvi paper size updates (also in TLPaper.pm).
+ Also, no more dvipdfm "config" file.
+
2017-04-16 Karl Berry <karl@tug.org>
* texconfig.sh: remove references to dvipdfm, since it is no
diff --git a/Build/source/texk/texlive/tl_scripts/texconfig.sh b/Build/source/texk/texlive/tl_scripts/texconfig.sh
index 9b6b87c6798..b73e3262a2e 100755
--- a/Build/source/texk/texlive/tl_scripts/texconfig.sh
+++ b/Build/source/texk/texlive/tl_scripts/texconfig.sh
@@ -604,7 +604,7 @@ TeX Live home page: <http://tug.org/texlive/>
echoLocateBinary kpsewhich updmap fmtutil texconfig tex pdftex mktexpk dvips dvipdfmx
echo
echo '=========================== active config files =========================='
- echoLocateCfgfile texmf.cnf updmap.cfg fmtutil.cnf config.ps mktex.cnf XDvi pdftexconfig.tex config | sort -k 2
+ echoLocateCfgfile texmf.cnf updmap.cfg fmtutil.cnf config.ps mktex.cnf XDvi pdftexconfig.tex | sort -k 2
echo
echo '============================= font map files ============================='
for m in psfonts.map pdftex.map ps2pk.map; do
@@ -1183,12 +1183,9 @@ Valid MODE settings:"
Valid PAPER settings:
letter a4"
- p=$2; pXdvi=$2; pDvips=$2
+ p=$2; pDvips=$2
case $2 in
- letter)
- pXdvi=us;;
- a4)
- pXdvi=a4;;
+ letter|a4) ;;
"") echo "$help" >&2; rc=1; return;;
*)
echo "$progname: unknown PAPER \`$2' given as argument for \`$progname paper'" >&2
@@ -1203,7 +1200,7 @@ Valid PAPER settings:
tcBatch dvipdfmx paper $p
fi
if checkForBinary xdvi >/dev/null && tcfmgr --cmd find --file XDvi >/dev/null 2>&1; then
- tcBatch xdvi paper $pXdvi
+ tcBatch xdvi paper $p
fi
if checkForBinary pdftex >/dev/null && tcfmgr --cmd find --file pdftexconfig.tex >/dev/null 2>&1; then
tcBatch pdftex paper $p
@@ -1293,65 +1290,94 @@ Valid PAPER settings:
# handle "xdvi paper PAPER"
xdvi)
tcBatchXdviPapers='us "8.5x11"
+letter "8.5x11"
+ledger "17x11"
+tabloid "11x17"
usr "11x8.5"
legal "8.5x14"
+legalr "14x8.5"
foolscap "13.5x17.0"
-a1 "59.4x84.0cm"
+foolscapr "17.0x13.5"
+a0 "84.1x118.9cm"
+a1 "59.4x84.1cm"
a2 "42.0x59.4cm"
a3 "29.7x42.0cm"
a4 "21.0x29.7cm"
-a5 "14.85x21.0cm"
-a6 "10.5x14.85cm"
-a7 "7.42x10.5cm"
-a1r "84.0x59.4cm"
+a5 "14.8x21.0cm"
+a6 "10.5x14.8cm"
+a7 "7.4x10.5cm"
+a8 "5.2x7.4cm"
+a9 "3.7x5.2cm"
+a10 "2.6x3.7cm"
+a0r "118.9x84.1cm"
+a1r "84.1x59.4cm"
a2r "59.4x42.0cm"
a3r "42.0x29.7cm"
a4r "29.7x21.0cm"
-a5r "21.0x14.85cm"
-a6r "14.85x10.5cm"
-a7r "10.5x7.42cm"
-b1 "70.6x100.0cm"
-b2 "50.0x70.6cm"
+a5r "21.0x14.8cm"
+a6r "14.8x10.5cm"
+a7r "10.5x7.4cm"
+a8r "7.4x5.2cm"
+a9r "5.2x3.7cm"
+a10r "3.7x2.6cm"
+b0 "100.0x141.4cm"
+b1 "70.7x100.0cm"
+b2 "50.0x70.7cm"
b3 "35.3x50.0cm"
b4 "25.0x35.3cm"
b5 "17.6x25.0cm"
-b6 "13.5x17.6cm"
-b7 "8.8x13.5cm"
-b1r "100.0x70.6cm"
-b2r "70.6x50.0cm"
+b6 "12.5x17.6cm"
+b7 "8.8x12.5cm"
+b8 "6.2x8.8cm"
+b9 "4.4x6.2cm"
+b10 "3.1x4.4cm"
+b0r "141.4x100.0cm"
+b1r "100.0x70.7cm"
+b2r "70.7x50.0cm"
b3r "50.0x35.3cm"
b4r "35.3x25.0cm"
b5r "25.0x17.6cm"
-b6r "17.6x13.5cm"
-b7r "13.5x8.8cm"
-c1 "64.8x91.6cm"
+b6r "17.6x12.5cm"
+b7r "12.5x8.8cm"
+b8r "8.8x6.2cm"
+b9r "6.2x4.4cm"
+b10r "4.4x3.1cm"
+c0 "91.7x129.7cm"
+c1 "64.8x91.7cm"
c2 "45.8x64.8cm"
c3 "32.4x45.8cm"
c4 "22.9x32.4cm"
c5 "16.2x22.9cm"
-c6 "11.46x16.2cm"
-c7 "8.1x11.46cm"
-c1r "91.6x64.8cm"
+c6 "11.4x16.2cm"
+c7 "8.1x11.4cm"
+c8 "5.7x8.1cm"
+c9 "4.0x5.7cm"
+c10 "2.8x4.0cm"
+c0r "129.7x91.7cm"
+c1r "91.7x64.8cm"
c2r "64.8x45.8cm"
c3r "45.8x32.4cm"
c4r "32.4x22.9cm"
c5r "22.9x16.2cm"
-c6r "16.2x11.46cm"
-c7r "11.46x8.1cm"'
+c6r "16.2x11.4cm"
+c7r "11.4x8.1cm"
+c8r "8.1x5.7cm"
+c9r "5.7x4.0cm"
+c10r "4.0x2.8cm"'
help="Usage: $progname xdvi paper PAPER
Valid PAPER settings:
- a1 a1r a2 a2r a3 a3r a4 a4r a5 a5r a6 a6r a7 a7r
- b1 b1r b2 b2r b3 b3r b4 b4r b5 b5r b6 b6r b7 b7r
- c1 c1r c2 c2r c3 c3r c4 c4r c5 c5r c6 c6r c7 c7r
- foolscap legal us usr"
+ a0 a0r a1 a1r a2 a2r a3 a3r a4 a4r a5 a5r a6 a6r a7 a7r a8 a8r a9 a9r a10 a10r
+ b0 b0r b1 b1r b2 b2r b3 b3r b4 b4r b5 b5r b6 b6r b7 b7r b8 b8r b9 b9r b10 b10r
+ c0 c0r c1 c1r c2 c2r c3 c3r c4 c4r c5 c5r c6 c6r c7 c7r c8 c8r c9 c9r c10 c10r
+ us letter ledger tabloid usr legal legalr foolscap foolscapr"
case $2 in
paper-list)
echo "$tcBatchXdviPapers"
;;
paper)
case $3 in
- a1|a1r|a2|a2r|a3|a3r|a4|a4r|a5|a5r|a6|a6r|a7|a7r|b1|b1r|b2|b2r|b3|b3r|b4|b4r|b5|b5r|b6|b6r|b7|b7r|c1|c1r|c2|c2r|c3|c3r|c4|c4r|c5|c5r|c6|c6r|c7|c7r|foolscap|legal|us|usr)
+ [abc][0-9]|[abc]10|[abc][0-9]r|[abc]10r|us|letter|ledger|tabloid|usr|legal|legalr|foolscap|foolscapr)
fmgrConfigReplace XDvi paper: "*paper: $3"
;;
"") echo "$help" >&2; rc=1;;
diff --git a/Master/tlpkg/TeXLive/TLPaper.pm b/Master/tlpkg/TeXLive/TLPaper.pm
index b1074ae96e2..e15160be58a 100644
--- a/Master/tlpkg/TeXLive/TLPaper.pm
+++ b/Master/tlpkg/TeXLive/TLPaper.pm
@@ -98,55 +98,81 @@ our %paper_config_name;
my %xdvi_papersize = (
- "a1" => "59.4x84.0cm",
- "a1r" => "84.0x59.4cm",
- "a2" => "42.0x59.4cm",
- "a2r" => "59.4x42.0cm",
- "a3" => "29.7x42.0cm",
- "a3r" => "42.0x29.7cm",
- "a4" => "21.0x29.7cm",
- "a4r" => "29.7x21.0cm",
- "a5" => "14.85x21.0cm",
- "a5r" => "21.0x14.85cm",
- "a6" => "10.5x14.85cm",
- "a6r" => "14.85x10.5cm",
- "a7" => "7.42x10.5cm",
- "a7r" => "10.5x7.42cm",
- "b1" => "70.6x100.0cm",
- "b1r" => "100.0x70.6cm",
- "b2" => "50.0x70.6cm",
- "b2r" => "70.6x50.0cm",
- "b3" => "35.3x50.0cm",
- "b3r" => "50.0x35.3cm",
- "b4" => "25.0x35.3cm",
- "b4r" => "35.3x25.0cm",
- "b5" => "17.6x25.0cm",
- "b5r" => "25.0x17.6cm",
- "b6" => "13.5x17.6cm",
- "b6r" => "17.6x13.5cm",
- "b7" => "8.8x13.5cm",
- "b7r" => "13.5x8.8cm",
- "c1" => "64.8x91.6cm",
- "c1r" => "91.6x64.8cm",
- "c2" => "45.8x64.8cm",
- "c2r" => "64.8x45.8cm",
- "c3" => "32.4x45.8cm",
- "c3r" => "45.8x32.4cm",
- "c4" => "22.9x32.4cm",
- "c4r" => "32.4x22.9cm",
- "c5" => "16.2x22.9cm",
- "c5r" => "22.9x16.2cm",
- "c6" => "11.46x16.2cm",
- "c6r" => "16.2x11.46cm",
- "c7" => "8.1x11.46cm",
- "c7r" => "11.46x8.1cm",
- "foolscap" => "13.5x17.0",
- "ledger" => "17.0x11.0",
- "legal" => "8.5x14",
- "letter" => "8.5x11",
- "tabloid" => "11.0x17.0",
- "us" => "8.5x11",
- "usr" => "11x8.5",
+ a0 => '841x1189mm',
+ a1 => '594x841mm',
+ a2 => '420x594mm',
+ a3 => '297x420mm',
+ a4 => '210x297mm',
+ a5 => '148x210mm',
+ a6 => '105x148mm',
+ a7 => '74x105mm',
+ a8 => '52x74mm',
+ a9 => '37x52mm',
+ a10 => '26x37mm',
+ a0r => '1189x841mm',
+ a1r => '841x594mm',
+ a2r => '594x420mm',
+ a3r => '420x297mm',
+ a4r => '297x210mm',
+ a5r => '210x148mm',
+ a6r => '148x105mm',
+ a7r => '105x74mm',
+ a8r => '74x52mm',
+ a9r => '52x37mm',
+ a10r => '37x26mm',
+ b0 => '1000x1414mm',
+ b1 => '707x1000mm',
+ b2 => '500x707mm',
+ b3 => '353x500mm',
+ b4 => '250x353mm',
+ b5 => '176x250mm',
+ b6 => '125x176mm',
+ b7 => '88x125mm',
+ b8 => '62x88mm',
+ b9 => '44x62mm',
+ b10 => '31x44mm',
+ b0r => '1414x1000mm',
+ b1r => '1000x707mm',
+ b2r => '707x500mm',
+ b3r => '500x353mm',
+ b4r => '353x250mm',
+ b5r => '250x176mm',
+ b6r => '176x125mm',
+ b7r => '125x88mm',
+ b8r => '88x62mm',
+ b9r => '62x44mm',
+ b10r => '44x31mm',
+ c0 => '917x1297mm',
+ c1 => '648x917mm',
+ c2 => '458x648mm',
+ c3 => '324x458mm',
+ c4 => '229x324mm',
+ c5 => '162x229mm',
+ c6 => '114x162mm',
+ c7 => '81x114mm',
+ c8 => '57x81mm',
+ c9 => '40x57mm',
+ c10 => '28x40mm',
+ c0r => '1297x917mm',
+ c1r => '917x648mm',
+ c2r => '648x458mm',
+ c3r => '458x324mm',
+ c4r => '324x229mm',
+ c5r => '229x162mm',
+ c6r => '162x114mm',
+ c7r => '114x81mm',
+ c8r => '81x57mm',
+ c9r => '57x40mm',
+ c10r => '40x28mm',
+ us => '8.5x11',
+ letter => '8.5x11',
+ ledger => '17x11',
+ tabloid => '11x17',
+ usr => '11x8.5',
+ legal => '8.5x14',
+ legalr => '14x8.5',
+ foolscap => '13.5x17.0',
+ foolscapr => '17.0x13.5',
);
my %pdftex_papersize = (