new knuth-local fonts cmntt10, diam12, etc.

git-svn-id: svn://tug.org/texlive/trunk@32831 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 41 insertions, 27 deletions

diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 0cdcd0d19fc..d74b1f1c8b3 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -120,7 +120,7 @@ my @TLP_working = qw(
     clefval cleveref clipboard
     clock clrscode cm-lgc cm-super cm-unicode
     cmap cmarrows cmbright cmcyr
-    cmdstring cmdtrack cmll cmpica cmpj cmsd cmtiup cnbwp cnltx
+    cmdstring cmdtrack cmextra cmll cmpica cmpj cmsd cmtiup cnbwp cnltx
     codedoc codepage codicefiscaleitaliano
     collcell collectbox collref colordoc colorinfo colorsep colortab
     colortbl colorwav colorweb colourchange
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 961a1b6af67..78e578e391b 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -498,7 +498,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'ipa',		"die 'skipping, part of wsuipa'",
  'ipaex-type1',	"&MAKEflatten",
  'isostds',	"die 'skipping, use iso or iso10303'",
- 'itrans',	"die 'skipping, no longer maintained (maybe you mean xetex-itrans?), too complex'",
+ 'itrans',	"die 'skipping, no longer maintained (maybe you want xetex-itrans?), too complex'",
  'itrans-processor',	"die 'skipping, no longer maintained, too complex'",
  'iwona',	"&MAKEcopy",
  'jadetex',	"&MAKEjadetex",
@@ -1104,6 +1104,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'cals'			=> '&PREHOOK_cals',
  'chess'		=> '&PREHOOK_chess',
  'cm-super'		=> '&PREHOOK_cm_super',
+ 'cmextra'		=> '&PREHOOK_cmextra',
  'concrete'		=> '&PREHOOK_concrete',
  'download'		=> '&PREHOOK_savepdf',
  'dynblocks'		=> '&PREHOOK_flatten1',
@@ -1995,6 +1996,7 @@ $standardsource='\.(bat|c|drv|dtx|fea|fdd|ins|sfd)$|configure.*|install-sh';
  'burmese',		'\.pl',
  'carlisle',		'\.dtx|\.ins|ltxtable\.tex',
  'chemarrow',		'\.mp|\.vfb',
+ 'cmextra',		'NULL',
  'concmath-fonts',	'NULL',
  'crossword',		$standardsource . '|AcrossLite',
  'cyrplain',		'NULL',			# all in tex
@@ -2274,6 +2276,7 @@ $standardmf='[0-9]\.mf';
  'cirth',	'cir.*\.mf',
  'clock',	'clock.mf',
  'cmcyr',	'NULL', # already made
+ 'cmextra',	'cm(man|tim)|' . $standardmf,
  'cookingsymbols', 'cookingsymbols\.mf',
  'cmpica',	'cmpic.*\.mf',
  'dancers',	'dancers\.mf',
@@ -3339,6 +3342,20 @@ sub domf {
   &install ($mfdir, $mf_inst_patt);
 }
 
+sub runmf {
+  my ($mfpatt) = @_;
+  print "\t doing runmf for $package ($mfpatt)\n";
+  print "  from filenames: @filenames\n";
+  for my $file (grep (/$mfpatt/, @filenames)) { 
+    ($FileBase,$Filepath,$Filesuffix) = fileparse ($file, "\.[A-z]*");
+    if (! -e "$FileBase.tfm") {
+      print "\t\t Make TFM from $file\n";
+      &runjob ("mktextfm --destdir=`pwd` $FileBase.tfm");
+      &SYSTEM ("$RM *pk");  # not worth the space
+    }
+  }
+}
+
 sub rundvi {
    local($thispatt) = @_;
    $TEX = $specialTEX{$package};
@@ -3490,19 +3507,6 @@ sub buildfilelist {
   closedir (DIR);
 }
 
-sub runmf {
-  my ($mfpatt) = @_;
-  print "\t doing runmf for $package ($mfpatt)\n";
-  for my $file (grep (/$mfpatt/, @filenames)) { 
-    ($FileBase,$Filepath,$Filesuffix) = fileparse ($file, "\.[A-z]*");
-    if (! -e "$FileBase.tfm") {
-      print "\t\t Make TFM from $file\n";
-      &runjob ("mktextfm --destdir=`pwd` $FileBase.tfm");
-      &SYSTEM ("$RM *pk");  # not worth the space
-    }
-  }
-}
-
 sub runfonts {
    $Foundry = $specialfoundry{$package} || $standardfoundry;
    for (grep(/\.vf$/, @filenames)) { 
@@ -4718,6 +4722,16 @@ sub PREHOOK_cm_super {
   &SYSTEM ("$RM -rf dvipdfm");
 }
 
+sub PREHOOK_cmextra {
+  print "PREHOOK_$package - knuth/local/cm is our cmextra\n";
+  #
+  # remove concrete since we have always had that separately.
+  &SYSTEM ("rm cm/cc* cm/odigs.mf");
+  &SYSTEM ("rm cm/ebigop.mf");        # ditto old cmex for euler
+  &SYSTEM ("rm -rf [^c]*");	      # ditto everything non-cm
+  &SYSTEM ("$MV cm/* .");             # flatten for normal setup
+}
+
 sub PREHOOK_concrete {
   print "PREHOOK_$package - instantiate symlinks from symlink\n";
   # would be better done in tlpkginfo --prepare.
@@ -5330,7 +5344,7 @@ sub POSTinteractiveworkbook {
 }
 
 sub POSTjfontmaps {
-  print "\t POST$package - move directories around\n";
+  print "POST$package - move directories around\n";
   # dir "src" content -> run files
   # dir "no_runtime" content  -> source files
   # dir "tool" as a whole -> source files
@@ -5396,12 +5410,12 @@ sub POSTlatex2html {
 }
 
 sub POSTlatex2e_help_texinfo {
-  print "\t POST$package - remove translation subdir\n";
+  print "POST$package - remove translation subdir\n";
   &SYSTEM ("$RM -rf spanish");
 }
 
 sub POSTlhcyr {
-  print "\t POST$package - move to source, avoid dups\n";
+  print "POST$package - move to source, avoid dups\n";
   &xchdir ("$DEST/tex/latex/$package");
   # Sebastian moved tex files to the top level, removed from other dirs.
   # We just follow what he did, years ago.
@@ -5423,29 +5437,28 @@ sub POSTlhcyr {
 }
 
 sub POSTlilyglyphs {
-  print "\t POST$package - move directories around\n";  
+  print "POST$package - move directories around\n";  
   &rename_with_mkdir ("fonts", "$DEST/fonts/opentype/public/$package");
   &rename_with_mkdir ("source", "$DEST/source/luatex/$package");
   &rename_with_mkdir ("tex", "$DEST/tex/lualatex/$package");
 }
 
 sub POSTlistbib {
-  print "\t POST$package - move .doc to .bst\n";
+  print "POST$package - move .doc to .bst\n";
   my $dest = "$DEST/bibtex/bst/$package";  
   &xmkdir ($dest);
   &SYSTEM ("$MV $package.doc $dest/$package.bst");
 }
 
 sub POSTlithuanian {
-  print "\t POST$package - remove old language support\n";
+  print "POST$package - remove old language support, fix .dfu location\n";
   # these files are no longer used in TL.
   &SYSTEM ("$RM language.lt.dat $DEST/tex/latex/lithuanian/language.lt.def");
-  print "\t POST$package - fix location of .dfu file\n";
   &SYSTEM ("$MV $DEST/doc/latex/lithuanian/l7xenc.dfu $DEST/tex/latex/lithuanian/");
 }
 
 sub POSTluatexja {
-  print "\t POST$package - runins, move directories\n";
+  print "POST$package - runins, move directories\n";
   &xchdir ("src");
   {
     local @filenames = glob ("*");  # dynamic redef for runins call.
@@ -5473,7 +5486,7 @@ sub POSTluatexja {
 }
 
 sub POSTmathdesign {
-  print "PREHOOK_$package - mv files\n";
+  print "POST$package - mv files\n";
   &SYSTEM ("$RM non-free/enc/tex*.enc");  # dup of standard enc files
   &SYSTEM ("$RM non-free/enc/7t.enc");
   # one way of merging dirtree A into dirtree B.
@@ -5498,18 +5511,18 @@ sub POSTmusixtex {
 }
 
 sub POSTmontex {
-  print "\t POST$package - avoid 00readme case clash\n";
+  print "POST$package - avoid 00readme case clash\n";
   # these files are no longer used in TL.
   &SYSTEM ("$MV 00readme 00readme.mfinput.km");
 }
 
 sub POSTnumericplots {
-  print "\t POST$package - mv latex subdir\n";
+  print "POST$package - mv latex subdir\n";
   &SYSTEM ("$MV latex $DEST/tex/latex/$package");
 }
 
 sub POSTpas_vc {
-  print "\t POST$package - mv latex subdir, doc files\n";
+  print "POST$package - mv latex subdir, doc files\n";
   &SYSTEM ("$MV latex $DEST/tex/latex/$package");
   &SYSTEM ("$MV $DEST/tex/latex/$package/photo.png .");
   &SYSTEM ("$MV doc/* .");
diff --git a/Master/tlpkg/tlpsrc/cmextra.tlpsrc b/Master/tlpkg/tlpsrc/cmextra.tlpsrc
index 1ea7c75a3d3..95575f5aebe 100644
--- a/Master/tlpkg/tlpsrc/cmextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/cmextra.tlpsrc
@@ -1,3 +1,4 @@
+catalogue knuth-local
 runpattern +!d texmf-dist/fonts/afm/public/amsfonts/cmextra
 runpattern +!d texmf-dist/fonts/source/public/amsfonts/cmextra
 runpattern +!d texmf-dist/fonts/tfm/public/amsfonts/cmextra