summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-07-02 00:51:53 +0000
committerKarl Berry <karl@freefriends.org>2009-07-02 00:51:53 +0000
commitaa97dbbc74ddb63810f6bbc22fc5119686c25f8f (patch)
tree77ae330eb1e11bcd29ebd8e95a26e8978aac9b4a /Master/tlpkg
parent157b2d735467711ec5797123fff172a4bee2a330 (diff)
avoid amsfonts subpackages being included twice, ditto map entries
git-svn-id: svn://tug.org/texlive/trunk@14055 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rw-r--r--Master/tlpkg/tlpsrc/amsfonts.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/cm.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/cmextra.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/cyrillic.tlpsrc8
-rw-r--r--Master/tlpkg/tlpsrc/euler.tlpsrc2
5 files changed, 13 insertions, 5 deletions
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