missing #'s

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

1 files changed, 25 insertions, 6 deletions

diff --git a/Build/tools/Tpm.pm b/Build/tools/Tpm.pm
index 7d0c879ab96..8e710fe861f 100644
--- a/Build/tools/Tpm.pm
+++ b/Build/tools/Tpm.pm
@@ -116,7 +116,9 @@ $IgnoredFiles = "("
   . ")";
 
 # The so-called engines
-my @engines = ("aleph", "enctex", "eomega", "metafont", "metapost", "omega", "pdftex", "pdfetex", "tex", "vtex",
+my @engines = (
+               "aleph", "enctex", "eomega", "metafont", "metapost",
+               "omega", "pdftex", "pdfetex", "tex", "vtex", 
 	       "bibtex", "context", "dvipdfm", "dvips", "ispell",
 	       "makeindex","mft", "psutils", "tex4ht", "texdoctk",
 	       "ttf2pk");
@@ -170,8 +172,8 @@ my $Catalogue;
 # ? knuthotherfonts:halftone
 # makedtx:makedtx not working!
 # ? oberdiek:twoopt, tabularht, tabularkv, settobox, refcount, alphalph, chemar
-r, classlist, dvipscol, engord, hypbmsec, hypcap, ifdraft, ifpdf, ifvtexm pagese
-l, pdfcolmk pdfcrypt, pdflscape (somehing missing???)
+# r, classlist, dvipscol, engord, hypbmsec, hypcap, ifdraft, ifpdf, ifvtexm pagese
+# l, pdfcolmk pdfcrypt, pdflscape (somehing missing???)
 my %Tpm2Catalogue = (
       "ctib" => "ctib4tex",
       "CJK" => "cjk",
@@ -1289,6 +1291,7 @@ sub buildPatternsPackage {
   my @doc_patterns = ( );
   my @source_patterns = ( );
 
+  # 
   # Usually the package name and the directory name match.
   # Here are the special cases when they don't.
   if (&FileUtils::member(${name}, @engines)) {
@@ -1350,6 +1353,7 @@ sub buildPatternsPackage {
 
     }
 
+  # 
   } elsif (&FileUtils::member(${name}, @formats)) {
     print "special format patterns for $name\n" if $::opt_debug;
     # if our $name is one of the formats
@@ -1386,11 +1390,22 @@ sub buildPatternsPackage {
       push @run_patterns, $texmf . "/tex/fontinst/*/*";
     }
     
+  # 
   } elsif (&FileUtils::member(${name}, @vendors)) {
     print "special vendor patterns for $name\n" if $::opt_debug;
     push @run_patterns, $texmf . "/dvips/${name}/*";
     
-    map { push @run_patterns, $texmf . "/fonts/$_/${name}/*"; } @fonttypes;
+    if ($name eq "groff") {
+      # Exception for groff: we do not want subdirectories (e.g.,
+      # times), we only want actual files (psyrgo.tfm).  Let groff/times
+      # end up in times.tpm.
+      map { push @run_patterns, "$texmf/fonts/$_/${name}/*.*"; }
+      @fonttypes;      
+    } else {
+      # Everything but groff:
+      map { push @run_patterns, "$texmf/fonts/$_/${name}/*"; }
+      @fonttypes;
+    }
 
     map { 
       my $e = $_;
@@ -1410,6 +1425,7 @@ sub buildPatternsPackage {
     # Exception for vntex: doc is in doc/generic instead of doc/fonts.
     push @doc_patterns, ( $texmf . "/doc/generic/$name/*" );  # vntex
 
+  # 
   } else {
     print "normal patterns for $name\n" if $::opt_debug;
     map {
@@ -1438,12 +1454,15 @@ sub buildPatternsPackage {
     push @doc_patterns, $texmf . "/doc/${name}/*";
     push @source_patterns, $texmf . "/source/${name}/*";
     
-    # Exception for fontname: it has its own odd map files.
+    # Exceptions for fontname and glyphlist: their own odd map files.
     if ($name eq 'fontname') {
-      push @run_patterns, $texmf . "/fonts/map/${name}/*";
+      push @run_patterns, "$texmf/fonts/map/${name}/*";
+    } elsif ($name eq 'glyphlist') {
+      push @run_patterns, "$texmf/fonts/map/${name}/*";
     }
   }
   
+  #  common to all.
   map {
     my $v = $_;
     map {