summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/fonts/cm-unicode/Fontmap.CMU.otf (renamed from Master/texmf-dist/fonts/opentype/public/cm-unicode/Fontmap.CMU.otf)0
-rw-r--r--Master/texmf-dist/doc/fonts/cm-unicode/Fontmap.CMU.pfb (renamed from Master/texmf-dist/fonts/type1/public/cm-unicode/Fontmap.CMU.pfb)0
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds49
3 files changed, 26 insertions, 23 deletions
diff --git a/Master/texmf-dist/fonts/opentype/public/cm-unicode/Fontmap.CMU.otf b/Master/texmf-dist/doc/fonts/cm-unicode/Fontmap.CMU.otf
index e0a4b2293cf..e0a4b2293cf 100644
--- a/Master/texmf-dist/fonts/opentype/public/cm-unicode/Fontmap.CMU.otf
+++ b/Master/texmf-dist/doc/fonts/cm-unicode/Fontmap.CMU.otf
diff --git a/Master/texmf-dist/fonts/type1/public/cm-unicode/Fontmap.CMU.pfb b/Master/texmf-dist/doc/fonts/cm-unicode/Fontmap.CMU.pfb
index fb49bd84f93..fb49bd84f93 100644
--- a/Master/texmf-dist/fonts/type1/public/cm-unicode/Fontmap.CMU.pfb
+++ b/Master/texmf-dist/doc/fonts/cm-unicode/Fontmap.CMU.pfb
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 229183f7ca6..24e2e8fb5c9 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1600,47 +1600,50 @@ $standardmapdest = "fonts/map/dvips";
'xetex-itrans' => "fonts/misc/xetex/fontmapping",
);
+$standardafm='\.afm';
+%specialafm = ();
+
$standardvmap='\.ali$';
%specialvmap = ();
$standardenc='\.enc';
%specialenc = ();
-$standardafm='\.afm';
-%specialafm = ();
+$standardocp='\.ocp';
+%specialocp = ();
-$standardpfm='\.pfm';
-%specialpfm = ();
+$standardofm='\.ofm';
+%specialofm = ();
-$standardpfb = '\.pfb|\.inf$';
-%specialpfb = (
- 'dviincl' => 'NULL', # skip 0dviincl.inf, is a README
- 'pigpen' => 'pigpen.pfa',
+$standardotf='\.otf';
+%specialotf = (
+ 'cm-unicode' => '^[^.]*\.otf', # not Fontmap.CMU.otf
);
-$standardttf='\.ttf';
-%specialttf = ();
-
-$standardsfd='\.sfd';
-%specialsfd = ();
-
-$standardotf='\.otf';
-%specialotf = ();
+$standardotp='\.otp';
+%specialotp = ();
$standardovf='\.ovf';
%specialovf = ();
-$standardofm='\.ofm';
-%specialofm = ();
-
$standardovp='\.ovp';
%specialovp = ( 'psfragx', 'NULL',);
-$standardotp='\.otp';
-%specialotp = ();
+$standardpfb = '\.pfb|\.inf$';
+%specialpfb = (
+ 'cm-unicode' => '^[^.]*\.pfb', # not Fontmap.CMU.pfb
+ 'dviincl' => 'NULL', # skip 0dviincl.inf, is a README
+ 'pigpen' => 'pigpen.pfa',
+);
-$standardocp='\.ocp';
-%specialocp = ();
+$standardpfm='\.pfm';
+%specialpfm = ();
+
+$standardsfd='\.sfd';
+%specialsfd = ();
+
+$standardttf='\.ttf';
+%specialttf = ();
# packages which have xmltex files
$standardxmt='\.xmt';