[subversion-commit] SVN tetex-base commit + diffs: r1462 -
tetex-base/trunk/debian
Frank Küster
frank at costa.debian.org
Tue Jun 27 16:56:31 UTC 2006
Author: frank
Date: 2006-06-27 16:56:30 +0000 (Tue, 27 Jun 2006)
New Revision: 1462
Modified:
tetex-base/trunk/debian/searchbase35
Log:
more categories and comments
Modified: tetex-base/trunk/debian/searchbase35
===================================================================
--- tetex-base/trunk/debian/searchbase35 2006-06-27 16:56:04 UTC (rev 1461)
+++ tetex-base/trunk/debian/searchbase35 2006-06-27 16:56:30 UTC (rev 1462)
@@ -5,14 +5,20 @@
# customization
my @psnfssArchives = ("lw35nfss","freenfss");
-my @otherArchivesZip = ("ly1-min");
+my @otherArchivesZip = ("ly1-min", "1999-lw35nfss");
+
my @otherArchivesTar = ("cspsfonts");
-my $lw35nfss_archive = "/home/frank/area/lw35nfss.zip";
-my $freenfss_archive = "/home/frank/area/freenfss.zip";
-my $cspsfonts_archive = "/home/frank/area/cspsfonts.tar.gz";
-my $ly1min_archive = "/home/frank/area/ly1-min.zip";
+my %CTANarchive = (
+ lw35nfss => {zipfile => "/home/frank/area/lw35nfss.zip"},
+ freenfss => {zipfile => "/home/frank/area/freenfss.zip"},
+ cspsfonts => {zipfile => "/home/frank/area/cspsfonts.tar.gz"},
+ "ly1-min" => {zipfile => "/home/frank/area/ly1-min.zip"},
+ "1999-lw35nfss" => {zipfile => "/home/frank/area/1999-lw35nfss.zip"}
+); # each unnamed hash will get a key "members" whose value is a reference to
+ # a list of files in the archive
+
my $outfile_base = "psnfss";
my @fontlist =
("avantgar", "bookman", "charter", "courier", "helvetic", "ncntrsbk",
@@ -23,6 +29,7 @@
my %psnfssRequired = (
Title => "%% Required PSNFSS fonts",
Pattern => "urw/base35|lw35nfs|freenfss|charter/bch",
+ ExclusionPattern => "1999",
Filename =>"psnfss-required.txt",
ListName => "required",
Lengths => "15,40,15,30",
@@ -46,7 +53,83 @@
% 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",
+ Filename =>"psnfss-urwrenamed.txt",
+ ListName => "URWrenamed",
+ Lengths => "15,14,40,30",
+ Comment =>
+"% These afm and pfb files contain metrics for old versions of URW fonts,
+% and their names are wrong in terms of the Berry Scheme. They are
+% therefore useless duplicates. Many also date from before URW released
+% the fonts under a free license and are thus more-or-less non-free.
+%
+% The renaming relations are as shown below:
+%
+% Face old name => new name
+%
+% ReguItal uhvri8an.afm => uhvbo8ac.afm
+% uhvroc8a.afm => uhvbo8ac.afm
+% ReguCond uhvr8an.afm => uhvr8ac.afm
+% uhvrrc8a.afm => uhvr8ac.afm
+% uhvrrc8a.pfb => uhvr8ac.pfb
+% ReguCondItal uhvboc8a.afm => uhvro8ac.afm
+% uhvroc8a.pfb => uhvro8ac.pfb
+% BoldItal uhvbi8a.afm => uhvbo8a.afm
+% BoldCond uhvb8an.afm => uhvb8ac.afm
+% uhvbrc8a.afm => uhvb8ac.afm
+% uhvbrc8a.pfb => uhvb8ac.pfb
+% BoldCondItal uhvri8an.afm => uhvbo8ac.afm
+% uhvroc8a.afm => uhvbo8ac.afm
+% uhvboc8a.pfb => uhvbo8ac.pfb
+%"
+);
+my %IBMafm = (
+ Title => "%% IBM afm files without corresponding fonts",
+ Pattern => "afm/ibm/times",
+ Filename =>"psnfss-ibm.txt",
+ ListName => "IBMafm",
+ Lengths => "15,14,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."
+);
+
+my %Adobephvl = (
+ Title => "%% Metrics and virtual fonts for Adobe Helvetica light",
+ Pattern => "adobe/helvetic/phvl",
+ Filename =>"psnfss-phvl.txt",
+ ListName => "phvl",
+ Lengths => "15,14,40,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",
+ 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",
@@ -77,7 +160,8 @@
my $noCTAN = "no hit on CTAN";
-my @categories = (\%psnfssRequired, \%URWdirectaccess, \%PCLnfss);
+my @categories = (\%psnfssRequired, \%URWdirectaccess, \%PCLnfss,
+\%URWrenamed, \%IBMafm, \%Adobephvl, \%lw35obs, \%psnfssxLY1);
my $tpmDir = "texmf-dist/tpm/";
@@ -107,13 +191,6 @@
my @lw35nfss;
my @freenfss;
-my %CTANarchive = (
- lw35nfss => {zipfile => $lw35nfss_archive},
- freenfss => {zipfile => $freenfss_archive},
- cspsfonts => {zipfile => $cspsfonts_archive},
- "ly1-min" => {zipfile => $ly1min_archive}
-); # each unnamed hash will get a key "members" whose value is a reference to
- # a list of files in the archive
# read zip archives into memory
@@ -193,7 +270,7 @@
my $basename = basename($file);
my ($hit, $ReturnLine);
- foreach my $archive (@otherArchivesTar, @otherArchivesZip) {
+ foreach my $archive (@otherArchivesZip, @otherArchivesTar) {
if (($hit) = grep {/$file/} @{$CTANarchive{$archive}{members}} ) {
my $zipfile = basename($CTANarchive{$archive}{zipfile});
my $license;
@@ -263,7 +340,12 @@
foreach my $category (@categories) {
# push each matching line onto the category's list
foreach (@{$SortedFilesList{${NoCategory}{ListName}}{$font}}) {
- push @{$SortedFilesList{${$category}{ListName}}{$font}},$_ if ( m(${$category}{Pattern}) );
+ if (m(${$category}{Pattern})) {
+ # does an exclusion pattern exist? If yes, only push the line if it does not match.
+ if (! ${$category}{ExclusionPattern} || ! m(${$category}{ExclusionPattern}) ) {
+ push @{$SortedFilesList{${$category}{ListName}}{$font}},$_ ;
+ };
+ };
}
# now note which lines are in both lists
More information about the Pkg-tetex-commits
mailing list