diff options
author | Karl Berry <karl@freefriends.org> | 2009-07-02 00:51:53 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2009-07-02 00:51:53 +0000 |
commit | aa97dbbc74ddb63810f6bbc22fc5119686c25f8f (patch) | |
tree | 77ae330eb1e11bcd29ebd8e95a26e8978aac9b4a | |
parent | 157b2d735467711ec5797123fff172a4bee2a330 (diff) |
avoid amsfonts subpackages being included twice, ditto map entries
git-svn-id: svn://tug.org/texlive/trunk@14055 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/texmf-dist/fonts/map/dvips/cm/cmother-bsr-interpolated.map | 4 | ||||
-rw-r--r-- | Master/texmf-dist/fonts/map/dvips/cm/cmother-bsr.map | 24 | ||||
-rw-r--r-- | Master/texmf-dist/fonts/map/dvips/cm/cmtext-bsr-interpolated.map | 4 | ||||
-rw-r--r-- | Master/texmf-dist/fonts/map/dvips/cm/cmtext-bsr.map | 53 | ||||
-rw-r--r-- | Master/tlpkg/tlpsrc/amsfonts.tlpsrc | 2 | ||||
-rw-r--r-- | Master/tlpkg/tlpsrc/cm.tlpsrc | 4 | ||||
-rw-r--r-- | Master/tlpkg/tlpsrc/cmextra.tlpsrc | 2 | ||||
-rw-r--r-- | Master/tlpkg/tlpsrc/cyrillic.tlpsrc | 8 | ||||
-rw-r--r-- | Master/tlpkg/tlpsrc/euler.tlpsrc | 2 |
9 files changed, 17 insertions, 86 deletions
diff --git a/Master/texmf-dist/fonts/map/dvips/cm/cmother-bsr-interpolated.map b/Master/texmf-dist/fonts/map/dvips/cm/cmother-bsr-interpolated.map deleted file mode 100644 index bc32a932999..00000000000 --- a/Master/texmf-dist/fonts/map/dvips/cm/cmother-bsr-interpolated.map +++ /dev/null @@ -1,4 +0,0 @@ -% Thomas Esser, May 2005. Public domain. -% We usually use ttcmex.map instead of this, so we get a traced 9pt -% font. This file just exists for people who do not use a full TL or teTeX. -cmex9 CMEX10 <cmex10.pfb diff --git a/Master/texmf-dist/fonts/map/dvips/cm/cmother-bsr.map b/Master/texmf-dist/fonts/map/dvips/cm/cmother-bsr.map deleted file mode 100644 index 3aecf898d2c..00000000000 --- a/Master/texmf-dist/fonts/map/dvips/cm/cmother-bsr.map +++ /dev/null @@ -1,24 +0,0 @@ -% Thomas Esser, May 2005. Public domain. -cmbsy10 CMBSY10 <cmbsy10.pfb -cmdunh10 CMDUNH10 <cmdunh10.pfb -cmex10 CMEX10 <cmex10.pfb -cmff10 CMFF10 <cmff10.pfb -cmfi10 CMFI10 <cmfi10.pfb -cmfib8 CMFIB8 <cmfib8.pfb -cmmi10 CMMI10 <cmmi10.pfb -cmmi12 CMMI12 <cmmi12.pfb -cmmi5 CMMI5 <cmmi5.pfb -cmmi6 CMMI6 <cmmi6.pfb -cmmi7 CMMI7 <cmmi7.pfb -cmmi8 CMMI8 <cmmi8.pfb -cmmi9 CMMI9 <cmmi9.pfb -cmmib10 CMMIB10 <cmmib10.pfb -cmsy10 CMSY10 <cmsy10.pfb -cmsy5 CMSY5 <cmsy5.pfb -cmsy6 CMSY6 <cmsy6.pfb -cmsy7 CMSY7 <cmsy7.pfb -cmsy8 CMSY8 <cmsy8.pfb -cmsy9 CMSY9 <cmsy9.pfb -cmtex10 CMTEX10 <cmtex10.pfb -cmtex8 CMTEX8 <cmtex8.pfb -cmtex9 CMTEX9 <cmtex9.pfb diff --git a/Master/texmf-dist/fonts/map/dvips/cm/cmtext-bsr-interpolated.map b/Master/texmf-dist/fonts/map/dvips/cm/cmtext-bsr-interpolated.map index 0fdc358327b..4fb8a0388b9 100644 --- a/Master/texmf-dist/fonts/map/dvips/cm/cmtext-bsr-interpolated.map +++ b/Master/texmf-dist/fonts/map/dvips/cm/cmtext-bsr-interpolated.map @@ -1,4 +1,8 @@ % Thomas Esser, May 2005. Public domain. +% These additional fonts are not part of the official cmextra that is +% part of amsfonts, but are widely available. Knuth distributes .mf +% files (not as part of the official CM), so we need to have Type 1's +% one way or another. cmbxti12 CMBXTI10 <cmbxti10.pfb cmbxti7 CMBXTI10 <cmbxti10.pfb cmitt12 CMITT12 <cmitt10.pfb diff --git a/Master/texmf-dist/fonts/map/dvips/cm/cmtext-bsr.map b/Master/texmf-dist/fonts/map/dvips/cm/cmtext-bsr.map deleted file mode 100644 index a7ff945540d..00000000000 --- a/Master/texmf-dist/fonts/map/dvips/cm/cmtext-bsr.map +++ /dev/null @@ -1,53 +0,0 @@ -% Thomas Esser, May 2005. Public domain. -cmb10 CMB10 <cmb10.pfb -cmbx10 CMBX10 <cmbx10.pfb -cmbx12 CMBX12 <cmbx12.pfb -cmbx5 CMBX5 <cmbx5.pfb -cmbx6 CMBX6 <cmbx6.pfb -cmbx7 CMBX7 <cmbx7.pfb -cmbx8 CMBX8 <cmbx8.pfb -cmbx9 CMBX9 <cmbx9.pfb -cmbxsl10 CMBXSL10 <cmbxsl10.pfb -cmbxti10 CMBXTI10 <cmbxti10.pfb -cmcsc10 CMCSC10 <cmcsc10.pfb -cminch CMINCH <cminch.pfb -cmitt10 CMITT10 <cmitt10.pfb -cmr10 CMR10 <cmr10.pfb -cmr12 CMR12 <cmr12.pfb -cmr17 CMR17 <cmr17.pfb -cmr5 CMR5 <cmr5.pfb -cmr6 CMR6 <cmr6.pfb -cmr7 CMR7 <cmr7.pfb -cmr8 CMR8 <cmr8.pfb -cmr9 CMR9 <cmr9.pfb -cmsl10 CMSL10 <cmsl10.pfb -cmsl12 CMSL12 <cmsl12.pfb -cmsl8 CMSL8 <cmsl8.pfb -cmsl9 CMSL9 <cmsl9.pfb -cmsltt10 CMSLTT10 <cmsltt10.pfb -cmss10 CMSS10 <cmss10.pfb -cmss12 CMSS12 <cmss12.pfb -cmss17 CMSS17 <cmss17.pfb -cmss8 CMSS8 <cmss8.pfb -cmss9 CMSS9 <cmss9.pfb -cmssbx10 CMSSBX10 <cmssbx10.pfb -cmssdc10 CMSSDC10 <cmssdc10.pfb -cmssi10 CMSSI10 <cmssi10.pfb -cmssi12 CMSSI12 <cmssi12.pfb -cmssi17 CMSSI17 <cmssi17.pfb -cmssi8 CMSSI8 <cmssi8.pfb -cmssi9 CMSSI9 <cmssi9.pfb -cmssq8 CMSSQ8 <cmssq8.pfb -cmssqi8 CMSSQI8 <cmssqi8.pfb -cmtcsc10 CMTCSC10 <cmtcsc10.pfb -cmti10 CMTI10 <cmti10.pfb -cmti12 CMTI12 <cmti12.pfb -cmti7 CMTI7 <cmti7.pfb -cmti8 CMTI8 <cmti8.pfb -cmti9 CMTI9 <cmti9.pfb -cmtt10 CMTT10 <cmtt10.pfb -cmtt12 CMTT12 <cmtt12.pfb -cmtt8 CMTT8 <cmtt8.pfb -cmtt9 CMTT9 <cmtt9.pfb -cmu10 CMU10 <cmu10.pfb -cmvtt10 CMVTT10 <cmvtt10.pfb diff --git a/Master/tlpkg/tlpsrc/amsfonts.tlpsrc b/Master/tlpkg/tlpsrc/amsfonts.tlpsrc index 97130d72c85..679bda11550 100644 --- a/Master/tlpkg/tlpsrc/amsfonts.tlpsrc +++ b/Master/tlpkg/tlpsrc/amsfonts.tlpsrc @@ -1,7 +1,7 @@ execute addMixedMap cm.map execute addMixedMap cmextra.map execute addMixedMap cyrillic.map -execute addMap euler.map +execute addMap euler.map execute addMixedMap latxfont.map execute addMixedMap symbols.map diff --git a/Master/tlpkg/tlpsrc/cm.tlpsrc b/Master/tlpkg/tlpsrc/cm.tlpsrc index 9578e3d37e6..cad7ad2e1dd 100644 --- a/Master/tlpkg/tlpsrc/cm.tlpsrc +++ b/Master/tlpkg/tlpsrc/cm.tlpsrc @@ -1,3 +1,3 @@ -execute addMixedMap cmother-bsr.map execute addMixedMap cmtext-bsr-interpolated.map -execute addMixedMap cmtext-bsr.map +runpattern +!d texmf-dist/fonts/afm/public/amsfonts/cm +runpattern +!d texmf-dist/fonts/type1/public/amsfonts/cm diff --git a/Master/tlpkg/tlpsrc/cmextra.tlpsrc b/Master/tlpkg/tlpsrc/cmextra.tlpsrc index e69de29bb2d..9a6326588b4 100644 --- a/Master/tlpkg/tlpsrc/cmextra.tlpsrc +++ b/Master/tlpkg/tlpsrc/cmextra.tlpsrc @@ -0,0 +1,2 @@ +runpattern +!d texmf-dist/fonts/afm/public/amsfonts/cmextra +runpattern +!d texmf-dist/fonts/type1/public/amsfonts/cmextra diff --git a/Master/tlpkg/tlpsrc/cyrillic.tlpsrc b/Master/tlpkg/tlpsrc/cyrillic.tlpsrc index 49a4db0964e..c8abbedccc5 100644 --- a/Master/tlpkg/tlpsrc/cyrillic.tlpsrc +++ b/Master/tlpkg/tlpsrc/cyrillic.tlpsrc @@ -1,4 +1,8 @@ -docpattern +f texmf/doc/man/man1/rubibtex.* -docpattern +f texmf/doc/man/man1/rumakeindex.* binpattern f bin/${ARCH}/rubibtex binpattern f bin/${ARCH}/rumakeindex +# +docpattern +f texmf/doc/man/man1/rubibtex.* +docpattern +f texmf/doc/man/man1/rumakeindex.* +# +runpattern +!d texmf-dist/fonts/afm/public/amsfonts/cyrillic +runpattern +!d texmf-dist/fonts/type1/public/amsfonts/cyrillic diff --git a/Master/tlpkg/tlpsrc/euler.tlpsrc b/Master/tlpkg/tlpsrc/euler.tlpsrc index e69de29bb2d..0caf0bc55fa 100644 --- a/Master/tlpkg/tlpsrc/euler.tlpsrc +++ b/Master/tlpkg/tlpsrc/euler.tlpsrc @@ -0,0 +1,2 @@ +runpattern +!d texmf-dist/fonts/afm/public/amsfonts/euler +runpattern +!d texmf-dist/fonts/type1/public/amsfonts/euler |