[subversion-commit] SVN tetex-base commit + diffs: r1469 - tetex-base/trunk/debian

Frank Küster frank at costa.debian.org
Thu Jun 29 17:31:03 UTC 2006


Author: frank
Date: 2006-06-29 17:31:03 +0000 (Thu, 29 Jun 2006)
New Revision: 1469

Modified:
   tetex-base/trunk/debian/searchbase35
Log:
add final information, all is complete!

and make output nicer

Modified: tetex-base/trunk/debian/searchbase35
===================================================================
--- tetex-base/trunk/debian/searchbase35	2006-06-29 11:46:22 UTC (rev 1468)
+++ tetex-base/trunk/debian/searchbase35	2006-06-29 17:31:03 UTC (rev 1469)
@@ -32,31 +32,17 @@
   ExclusionPattern => "1999",
   Filename =>"psnfss-required.txt",
   ListName => "required",
-  Lengths => "15,40,15,30",
+  Lengths => "15,15,40,30",
   Comment => 
 "% These files are required for psnfss
 % according to its file 00readme.txt"
     );
 
 # obsolete stuff
-my %URWdirectaccess = (
-  Title => "%% files to directly access URW fonts",
-  Pattern => "tex/latex/.*\.fd|urw35vf|config\.u|u..\.map",
-  Filename =>"psnfss-urwdirect.txt",
-  ListName => "URWdirect",
-  Lengths => "15,14,40,30",
-  Comment => 
-"% These files can be used to directly access the URW fonts in
-% LaTeX.  This should not be done if the same fonts are also
-% used as a replacement for the base 35 fonts.
-%
-% Ralf suspects that they once could be found in
-% CTAN/fonts/psfonts/urw/."
-);
 my %URWrenamed = (
   Title => "%% URW font files with old names",
   # the pattern matches correctly only after the "good" files have been filtered out!
-  Pattern => "helvetic/uhv.*afm|bookman/ubk.*afm|avantgar/uag.*afm",
+  Pattern => "helvetic/uhv|bookman/ubk|avantgar/uag",
   Filename =>"psnfss-urwrenamed.txt",
   ListName => "URWrenamed",
   Lengths => "15,14,40,30",
@@ -87,15 +73,45 @@
 %"
 );
 
-my %IBMafm = (
+my %lw35obs = (
+  Title => "%% Obsolete files that were in lw35nfss.zip in 1999",
+  Pattern => "1999-lw35nfss.zip",
+  Filename =>"psnfss-lw35obs.txt",
+  ListName => "lw35obs",
+  Lengths => "12,18,35,30",
+  Comment => 
+"% These files should be removed because they have been
+% removed upstream.."
+);
+
+# external stuff
+my %URWdirectaccess = (
+  Title => "%% files to directly access URW fonts",
+  Pattern => "tex/latex/.*\.fd|urw35vf|config\.u|u..\.map",
+  Filename =>"psnfss-urwdirect.txt",
+  ListName => "URWdirect",
+  Lengths => "15,14,40,30",
+  Comment => 
+"% These files can be used to directly access the URW fonts in
+% LaTeX.  This should not be done if the same fonts are also
+% used as a replacement for the base 35 fonts.
+%
+% Ralf suspects that they once could be found in
+% CTAN/fonts/psfonts/urw/."
+);
+
+my %IBM = (
   Title => "%% IBM afm files without corresponding fonts",
-  Pattern => "afm/ibm/times",
+  Pattern => "afm/ibm/times|fonts/psfonts/courier|fonts/type1/adobe/courier/",
   Filename =>"psnfss-ibm.txt",
   ListName => "IBMafm",
-  Lengths => "15,14,40,30",
+  Lengths => "15,15,40,30",
   Comment => 
-"% These are afm files for Times (tn) and TimesNewRoman (nt).  They
-% are useless in this context, because no Type1 files are available."
+"% These are afm files for Times (tn), TimesNewRoman (nt), and
+% afm and pfb files for Courier (misnamed as adobe Courier).
+% The Times fonts are useless in this context, because no Type1
+% files are available, and for Courier the license does not allow
+% modification."
 );
 
 my %Adobephvl = (
@@ -103,40 +119,29 @@
   Pattern => "adobe/helvetic/phvl",
   Filename =>"psnfss-phvl.txt",
   ListName => "phvl",
-  Lengths => "15,14,40,30",
+  Lengths => "15,20,30,30",
   Comment => 
 "% These are afm, tfm and vf files for Adobe Helvetica light (phvl).  They
 % are useless in this context, because no Type1 files are available."
 );
 
-my %lw35obs = (
-  Title => "%% Obsolete files that were in lw35nfss.zip in 1999",
-  Pattern => "1999-lw35nfss.zip",
-  Filename =>"psnfss-lw35obs.txt",
-  ListName => "lw35obs",
-  Lengths => "12,35,18,30",
-  Comment => 
-"% ."
-);
-
 my %psnfssxLY1 = (
   Title => "%% Support for LY1 encoding from psnfssx",
   Pattern => "ly1-min.zip",
   Filename =>"psnfss-ly1.txt",
   ListName => "ly1",
-  Lengths => "12,35,18,30",
+  Lengths => "12,18,35,30",
   Comment => 
 "% These files from psnfssx can be used for files in ly1 encoding.  They are
 % not needed for psnfss proper and should be in a separate tpm."
 );
 
-# external stuff
 my %PCLnfss = (
   Title => "%% Font metrics for PCL printer fonts",
   Pattern => "pclnfss",
   Filename =>"psnfss-pclnfss.txt",
   ListName => "pclnfss",
-  Lengths => "15,40,1,30",
+  Lengths => "15,5,45,30",
   Comment => 
 "% These files can be used to create PCL printer files
 % and are only useful if one has a PCL printer and a 
@@ -146,13 +151,58 @@
 % pclnfss.tpm and included in collection-fontsextra."
 );
 
+my %cspsfonts = (
+  Title => "%% metrics and virtual fonts from csTeX",
+  Pattern => "cspsfonts.tar.gz",
+  Filename =>"psnfss-csps.txt",
+  ListName => "csps",
+  Lengths => "12,18,35,30",
+  Comment => 
+"% These files are needed for csTeX and csLaTeX, but not for
+% normal psnfss usage."
+);
 
+my %psnfssSource = (
+  Title => "%% files from the psnfss source distribution",
+  Pattern => "psnfss-source",
+  Filename =>"psnfss-psnfss-source.txt",
+  ListName => "PSNFSSsource",
+  Lengths => "12,1,50,30",
+  Comment => 
+"% These files are needed to recreate the metrics and the basis for
+% the fd files (to be manually extended) for psnfss.  They are not
+% for processing (La)TeX files."
+);
+
+my %augsburg = (
+  Title => "%% metrics and virtual font for the obsolete dvi and dvilw drivers",
+  Pattern => "dvi-augsburg",
+  Filename =>"psnfss-augsburg.txt",
+  ListName => "augsburg",
+  Lengths => "12,1,50,30",
+  Comment => 
+"% These files are from the dvi-augsburg distribution which
+% provides the dvi and dvilw drivers for amiga, atari and DOS.
+% They are useful only in rare cases and do not have a license statement."
+);
+
+my %pslatex = (
+  Title => "%% afm files to create metrics for pslatex",
+  Pattern => "m/l/c/pslatex/",
+  Filename =>"psnfss-pslatex.txt",
+  ListName => "pslatex",
+  Lengths => "12,18,35,30",
+  Comment => 
+"% These afm files should be installed along with the tfm files generated
+% from them, i.e. be put into pslatex.tpm."
+);
+
 my %NoCategory = (
   Title => "%% Files with no category",
   Pattern => "",
   Filename =>"psnfss-nocategory.txt",
   ListName => "nocategory",
-  Lengths => "15,40,1,30",
+  Lengths => "15,20,40,30",
   Comment => 
 "% These files have not yet been classified"
     );
@@ -161,7 +211,8 @@
 
 
 my @categories = (\%psnfssRequired, \%URWdirectaccess, \%PCLnfss,
-\%URWrenamed, \%IBMafm, \%Adobephvl, \%lw35obs, \%psnfssxLY1);
+\%URWrenamed, \%IBM, \%Adobephvl, \%lw35obs, \%psnfssxLY1,
+\%cspsfonts, \%psnfssSource, \%augsburg, \%pslatex);
 
 my $tpmDir = "texmf-dist/tpm/";
 
@@ -232,6 +283,7 @@
   my $file = basename($_[0]);
  SWITCH: {
    if ($file =~ /^lw35nfss.zip$/ ) { return "license: LPPL"; last SWITCH };
+   if ($file =~ /^1999-lw35nfss.zip$/ ) { return "license: LPPL"; last SWITCH };
    if ($file =~ /^freenfss.zip$/ ) { return "license: LPPL"; last SWITCH };
    if ($file =~ /^cspsfonts.tar.gz$/ ) { return "license: CSTEX (unclear)"; last SWITCH };
    if ($file =~ /^ly1-min.zip$/ ) { return "license: unknown (Carlisle)"; last SWITCH };
@@ -244,7 +296,12 @@
  SWITCH: {
    if ($file =~ m(psnfss-source) ) { return "license: LPPL"; last SWITCH };
    if ($file =~ m(urw/base35) ) { return "license: GPL"; last SWITCH };
-
+   if ($file =~ m(dvi-augsburg) ) { return "no license"; last SWITCH };
+   if ($file =~ m(fonts/psfonts/courier|fonts/type1/adobe/courier) ) { 
+     return "license: IBM/X, no modification"; last SWITCH 
+   };
+   if ($file =~ m(pslatex) ) { return "license: LPPL"; last SWITCH };
+   if ($file =~ m(fonts/charter) ) { return "license: Bitstream, free"; last SWITCH };
    return (30," \t license: unknown");
   };
 };
@@ -259,7 +316,7 @@
       my $zipfile = basename($CTANarchive{$archive}{zipfile});
       my $license;
       $license = getLicensePerArchive($CTANarchive{$archive}{zipfile});
-      $ReturnLine = $basename ."@". $hit ."@". $zipfile ."@". $license;
+      $ReturnLine = $basename ."@". $zipfile ."@". $hit ."@".  $license;
       return($ReturnLine);
     }
   }
@@ -275,7 +332,7 @@
       my $zipfile = basename($CTANarchive{$archive}{zipfile});
       my $license;
       $license = getLicensePerArchive($CTANarchive{$archive}{zipfile});
-      $ReturnLine = $basename ."@". $hit ."@". $zipfile ."@". $license ;
+      $ReturnLine = $basename ."@". $zipfile ."@". $hit ."@".  $license ;
       return($ReturnLine);
     }
   }
@@ -308,7 +365,9 @@
     if ($CTANbyname{$basefile}) { 
       my $license;
       $license = getLicenseFromList($CTANbyname{$basefile});
-      $locline = $basefile ."@". $CTANbyname{$basefile} ."@". " " ."@". "license: unknown";
+      $locline = $license ?
+	$basefile ."@". " " ."@". $CTANbyname{$basefile} ."@". $license :
+	$basefile ."@". " " ."@". $CTANbyname{$basefile} ."@". "license: unknown";
       last FINDLOC
     }
     # now look in some other archives
@@ -322,7 +381,7 @@
 
     # prepend the filename
     $locline = $locline ? $locline
-	: $basefile . "\t\t unknown\t license: unknown\n" ;
+	: $basefile . "\t\t unknown\t license: unknown" ;
 
     # some standard replacements to make lines shorter
     $locline =~ s at macros/latex/contrib/@m/l/c/@;
@@ -388,21 +447,33 @@
  SortFileLists($font);
 };
 
+# main output file
+my $merge_outfile = "psnfss-allcurrent.txt";
+open (MERGEOUT,'>',$merge_outfile) or die "Cannot open $merge_outfile";
+
 # main output loop
 foreach my $category ( @categories, \%NoCategory ) {
   open (OUTLIST,'>', ${$category}{Filename} ) or die "Cannot open ${$category}{Filename}";
   print OUTLIST "\n\n" . ${$category}{Title} . "\n";
+  print MERGEOUT "\n\n" . ${$category}{Title} . "\n";
+
   print OUTLIST "\n" . ${$category}{Comment} . "\n";
+  print MERGEOUT "\n" . ${$category}{Comment} . "\n";
+
   foreach my $font ( @fontlist) {
     next unless (@{$SortedFilesList{${$category}{ListName}}{$font}});
     print OUTLIST "\n% files from $font:\n";
+    print MERGEOUT "\n% files from $font:\n";
     CreateOutList ( $category, $font);
     print OUTLIST @{$SortedFilesList{${$category}{ListName}}{$font}};
+    print MERGEOUT @{$SortedFilesList{${$category}{ListName}}{$font}};
   };
   close OUTLIST;
   print "Wrote ${$category}{Filename}.\n"
 };
 
+print "\nWrote $merge_outfile\n";
+close MERGEOUT;
 
 exit 0;
 




More information about the Pkg-tetex-commits mailing list