microtype (support for nonfree fonts)

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

1 files changed, 28 insertions, 14 deletions

diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index e8c127f3132..99387fd7c7f 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1615,6 +1615,7 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`);
  'm-tx'                 => '&POSTmtx',
  'mathdesign'           => '&POSTmathdesign',
  'mflogo'               => '&POST_rmsymlink',
+ 'microtype'            => '&POSTmicrotype',
  'moderncv'		=> '&POST_deref_symlink',
  'montex'               => '&POSTmontex',
  'mpfonts'              => '&POSTmpfonts',
@@ -4503,18 +4504,21 @@ sub runjob {
 # 
 # if MORE is true, remove additional files matching something in
 # $moreclean and create a README.TEXLIVE which lists the removed files.
-# As a kludge created for rangen (now used for marvosym), if KILLPATT
-# starts with a directory path (e.g., doc/), we cd to that directory
-# before globbing (and cd back at the end).
+# As a kludge (once used for rangen and marvosym, now for sectionbox and
+# xymtex), if KILLPATT starts with a directory path (e.g., doc/), we cd
+# to that directory before globbing (and cd back at the end).
+# 
+# The NOTCTAN argument is used for microtype, where we have to removed
+# derived files, which don't exist on CTAN.
 # 
 # (Switching all the kill patterns to globs, so we could just use the
 # glob function, seemed too ugly.  And removing the file in a posthook
 # would have meant a separate fn for README.TEXLIVE, also ugly.)
 # 
 sub killfiles {
-   my ($killpatt,$more) = @_;
+   my ($killpatt,$more,$notctan) = @_;
 
-   print "killfiles($killpatt,$more)\n";
+   print "killfiles($killpatt,$more,$notctan)\n";
    return unless $killpatt;
 
    # cd to a leading directory name in KILLPATT.
@@ -4545,13 +4549,6 @@ sub killfiles {
    }  
 
    if ($more && @delfiles) {
-     # get package url on CTAN
-     my $ctan_url = '.';
-     chomp (my $ctan_dir = `tlpkginfo --ctan-dir $packagedir`);
-     if (not $?) {
-       $ctan_dir =~ s!$ctan_root/!!;
-       $ctan_url = " at\n\thttp://mirror.ctan.org/$ctan_dir";
-     }
      # create/update README.TEXLIVE.
      open (RTL, ">README.TEXLIVE") || warn "open(>README.TEXLIVE) failed: $!";
      print RTL <<"EOF";
@@ -4563,10 +4560,21 @@ More info: https://tug.org/texlive/pkgcontrib.html#requirements
 
 If this is a concern, please contact the package maintainer.
 
+EOF
+     if (! $notctan) {
+       # get package url on CTAN
+       my $ctan_url = '.';
+       chomp (my $ctan_dir = `tlpkginfo --ctan-dir $packagedir`);
+       if (not $?) {
+         $ctan_dir =~ s!$ctan_root/!!;
+         $ctan_url = " at\n\thttp://mirror.ctan.org/$ctan_dir";
+       }
+       print <<CTAN;
 You can find these files on CTAN$ctan_url.
 
-EOF
-     foreach my $f (@delfiles) {
+CTAN
+     }
+     for my $f (@delfiles) {
        print RTL "\t$f\n";
      }
      close RTL;
@@ -6776,6 +6784,12 @@ sub POSTmathdesign {
   &mv_with_mkdir ("vf/*", "$DEST/fonts/vf/public/$package");
 }
 
+sub POSTmicrotype {
+  print "POST$package - remove support files for nonfree fonts\n";
+  &xchdir ("$DEST/tex/latex/$package");
+  &killfiles ('mt-(PalatinoLinotype|euroitc|pad).cfg', "more", "notctan");
+}
+
 sub POSTmontex {
   print "POST$package - avoid 00readme case clash\n";
   # these files are no longer used in TL.