diff options
author | Karl Berry <karl@freefriends.org> | 2011-09-26 17:36:08 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2011-09-26 17:36:08 +0000 |
commit | 36f4773630d68c441e9996e5d26c8c943311e7d1 (patch) | |
tree | de0e24b5881ace8c647c868764170a4d7931e84e | |
parent | 0454199fb8d0690826381492ba9d7eaebf491dec (diff) |
avoid installing conflicting bbding10.mf or dingbat.mf
git-svn-id: svn://tug.org/texlive/trunk@24098 c570f23f-e606-0410-a88d-b1316a301751
l--------- | Master/texmf-dist/doc/latex/niceframe/bbding10.mf | 1 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/niceframe/dingbat.mf (renamed from Master/texmf-dist/fonts/source/public/niceframe/dingbat.mf) | 0 | ||||
-rwxr-xr-x | Master/tlpkg/libexec/ctan2tds | 5 |
3 files changed, 4 insertions, 2 deletions
diff --git a/Master/texmf-dist/doc/latex/niceframe/bbding10.mf b/Master/texmf-dist/doc/latex/niceframe/bbding10.mf new file mode 120000 index 00000000000..9683004c445 --- /dev/null +++ b/Master/texmf-dist/doc/latex/niceframe/bbding10.mf @@ -0,0 +1 @@ +../../../../fonts/bbding/bbding10.mf
\ No newline at end of file diff --git a/Master/texmf-dist/fonts/source/public/niceframe/dingbat.mf b/Master/texmf-dist/doc/latex/niceframe/dingbat.mf index 6d93e280c62..6d93e280c62 100644 --- a/Master/texmf-dist/fonts/source/public/niceframe/dingbat.mf +++ b/Master/texmf-dist/doc/latex/niceframe/dingbat.mf diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index e442d5ad567..467582a7053 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -1883,8 +1883,9 @@ $standardmfinstall = '\.mf$'; 'asaetr' => 'NULL', # cmcscsl10.mf conflict 'astro' => 'astrosym.(cal|cmn|mac|uni|xtr)', 'cmcyr' => '\.mf', - 'ibygrk' => 'ibycus4\.map', # tex|mf source - 'wnri' => $standardmfinstall . '|wnindic\.map', # mf source + 'ibygrk' => 'ibycus4\.map', # tex|mf source + 'niceframe', => '(karta|umrand).*\.mf', # not bbding or dingbat + 'wnri' => $standardmfinstall . '|wnindic\.map',# mf source ); # packages which have dvips header files |