reverting my mistakes with psnfss from r7978

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

21 files changed, 2 insertions, 143 deletions

diff --git a/Master/texmf-dist/fonts/enc/dvips/psnfss/8r.enc b/Master/texmf-dist/fonts/enc/dvips/psnfss/8r.enc
deleted file mode 100644
index 40dbe904190..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/psnfss/8r.enc
+++ /dev/null
@@ -1,143 +0,0 @@
-% File 8r.enc  TeX Base 1 Encoding  Revision 2.0  2002-10-30
-%
-% @@psencodingfile@{
-%   author    = "S. Rahtz, P. MacKay, Alan Jeffrey, B. Horn, K. Berry,
-%                W. Schmidt, P. Lehman",
-%   version   = "2.0",
-%   date      = "30 October 2002",
-%   filename  = "8r.enc",
-%   email     = "tex-fonts@@tug.org",
-%   docstring = "This is the encoding vector for Type1 and TrueType
-%                fonts to be used with TeX.  This file is part of the
-%                PSNFSS bundle, version 9"
-% @}
-% 
-% The idea is to have all the characters normally included in Type 1 fonts
-% available for typesetting. This is effectively the characters in Adobe
-% Standard encoding, ISO Latin 1, Windows ANSI including the euro symbol,
-% MacRoman, and some extra characters from Lucida.
-% 
-% Character code assignments were made as follows:
-% 
-% (1) the Windows ANSI characters are almost all in their Windows ANSI
-% positions, because some Windows users cannot easily reencode the
-% fonts, and it makes no difference on other systems. The only Windows
-% ANSI characters not available are those that make no sense for
-% typesetting -- rubout (127 decimal), nobreakspace (160), softhyphen
-% (173). quotesingle and grave are moved just because it's such an
-% irritation not having them in TeX positions.
-% 
-% (2) Remaining characters are assigned arbitrarily to the lower part
-% of the range, avoiding 0, 10 and 13 in case we meet dumb software.
-% 
-% (3) Y&Y Lucida Bright includes some extra text characters; in the
-% hopes that other PostScript fonts, perhaps created for public
-% consumption, will include them, they are included starting at 0x12.
-% These are /dotlessj /ff /ffi /ffl.
-% 
-% (4) hyphen appears twice for compatibility with both ASCII and Windows.
-%
-% (5) /Euro was assigned to 128, as in Windows ANSI
-%
-% (6) Missing characters from MacRoman encoding incorporated as follows:
-%
-%     PostScript      MacRoman        TeXBase1
-%     --------------  --------------  --------------
-%     /notequal       173             0x16
-%     /infinity       176             0x17
-%     /lessequal      178             0x18
-%     /greaterequal   179             0x19
-%     /partialdiff    182             0x1A
-%     /summation      183             0x1B
-%     /product        184             0x1C
-%     /pi             185             0x1D
-%     /integral       186             0x81
-%     /Omega          189             0x8D
-%     /radical        195             0x8E
-%     /approxequal    197             0x8F
-%     /Delta          198             0x9D
-%     /lozenge        215             0x9E
-%
-/TeXBase1Encoding [
-% 0x00
- /.notdef /dotaccent /fi /fl
- /fraction /hungarumlaut /Lslash /lslash
- /ogonek /ring /.notdef /breve
- /minus /.notdef /Zcaron /zcaron
-% 0x10
- /caron /dotlessi /dotlessj /ff
- /ffi /ffl /notequal /infinity
- /lessequal /greaterequal /partialdiff /summation
- /product /pi /grave /quotesingle
-% 0x20
- /space /exclam /quotedbl /numbersign
- /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus
- /comma /hyphen /period /slash
-% 0x30
- /zero /one /two /three
- /four /five /six /seven
- /eight /nine /colon /semicolon
- /less /equal /greater /question
-% 0x40
- /at /A /B /C
- /D /E /F /G
- /H /I /J /K
- /L /M /N /O
-% 0x50
- /P /Q /R /S
- /T /U /V /W
- /X /Y /Z /bracketleft
- /backslash /bracketright /asciicircum /underscore
-% 0x60
- /quoteleft /a /b /c
- /d /e /f /g
- /h /i /j /k
- /l /m /n /o
-% 0x70
- /p /q /r /s
- /t /u /v /w
- /x /y /z /braceleft
- /bar /braceright /asciitilde /.notdef
-% 0x80
- /Euro /integral /quotesinglbase /florin
- /quotedblbase /ellipsis /dagger /daggerdbl
- /circumflex /perthousand /Scaron /guilsinglleft
- /OE /Omega /radical /approxequal
-% 0x90
- /.notdef /.notdef /.notdef /quotedblleft
- /quotedblright /bullet /endash /emdash
- /tilde /trademark /scaron /guilsinglright
- /oe /Delta /lozenge /Ydieresis
-% 0xA0
- /.notdef /exclamdown /cent /sterling
- /currency /yen /brokenbar /section
- /dieresis /copyright /ordfeminine /guillemotleft
- /logicalnot /hyphen /registered /macron
-% 0xD0
- /degree /plusminus /twosuperior /threesuperior
- /acute /mu /paragraph /periodcentered
- /cedilla /onesuperior /ordmasculine /guillemotright
- /onequarter /onehalf /threequarters /questiondown
-% 0xC0
- /Agrave /Aacute /Acircumflex /Atilde
- /Adieresis /Aring /AE /Ccedilla
- /Egrave /Eacute /Ecircumflex /Edieresis
- /Igrave /Iacute /Icircumflex /Idieresis
-% 0xD0
- /Eth /Ntilde /Ograve /Oacute
- /Ocircumflex /Otilde /Odieresis /multiply
- /Oslash /Ugrave /Uacute /Ucircumflex
- /Udieresis /Yacute /Thorn /germandbls
-% 0xE0
- /agrave /aacute /acircumflex /atilde
- /adieresis /aring /ae /ccedilla
- /egrave /eacute /ecircumflex /edieresis
- /igrave /iacute /icircumflex /idieresis
-% 0xF0
- /eth /ntilde /ograve /oacute
- /ocircumflex /otilde /odieresis /divide
- /oslash /ugrave /uacute /ucircumflex
- /udieresis /yacute /thorn /ydieresis
-] def
-
diff --git a/Master/texmf-dist/fonts/tfm/public/pazo/fplmb.tfm b/Master/texmf-dist/fonts/tfm/public/pazo/fplmb.tfm
deleted file mode 100644
index 219077e8e35..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/pazo/fplmb.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/pazo/fplmbb.tfm b/Master/texmf-dist/fonts/tfm/public/pazo/fplmbb.tfm
deleted file mode 100644
index 6138764f0f7..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/pazo/fplmbb.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/pazo/fplmbi.tfm b/Master/texmf-dist/fonts/tfm/public/pazo/fplmbi.tfm
deleted file mode 100644
index 23754ef7569..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/pazo/fplmbi.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/pazo/fplmr.tfm b/Master/texmf-dist/fonts/tfm/public/pazo/fplmr.tfm
deleted file mode 100644
index fbabb085c6d..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/pazo/fplmr.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/pazo/fplmri.tfm b/Master/texmf-dist/fonts/tfm/public/pazo/fplmri.tfm
deleted file mode 100644
index 3aba847c84b..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/pazo/fplmri.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/pazo/zplmb7m.tfm b/Master/texmf-dist/fonts/tfm/public/pazo/zplmb7m.tfm
deleted file mode 100644
index 4de1ab0202e..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/pazo/zplmb7m.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/pazo/zplmb7t.tfm b/Master/texmf-dist/fonts/tfm/public/pazo/zplmb7t.tfm
deleted file mode 100644
index 7df494d0354..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/pazo/zplmb7t.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/pazo/zplmb7y.tfm b/Master/texmf-dist/fonts/tfm/public/pazo/zplmb7y.tfm
deleted file mode 100644
index ca894c645f4..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/pazo/zplmb7y.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/pazo/zplmr7m.tfm b/Master/texmf-dist/fonts/tfm/public/pazo/zplmr7m.tfm
deleted file mode 100644
index 20019e5d01e..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/pazo/zplmr7m.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/pazo/zplmr7t.tfm b/Master/texmf-dist/fonts/tfm/public/pazo/zplmr7t.tfm
deleted file mode 100644
index dfe314ddbfc..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/pazo/zplmr7t.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/pazo/zplmr7v.tfm b/Master/texmf-dist/fonts/tfm/public/pazo/zplmr7v.tfm
deleted file mode 100644
index c27d267ca46..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/pazo/zplmr7v.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/pazo/zplmr7y.tfm b/Master/texmf-dist/fonts/tfm/public/pazo/zplmr7y.tfm
deleted file mode 100644
index 03551428f75..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/pazo/zplmr7y.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/pazo/zplmb7m.vf b/Master/texmf-dist/fonts/vf/public/pazo/zplmb7m.vf
deleted file mode 100644
index d9698c4bd77..00000000000
--- a/Master/texmf-dist/fonts/vf/public/pazo/zplmb7m.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/pazo/zplmb7t.vf b/Master/texmf-dist/fonts/vf/public/pazo/zplmb7t.vf
deleted file mode 100644
index 8073b4e8b40..00000000000
--- a/Master/texmf-dist/fonts/vf/public/pazo/zplmb7t.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/pazo/zplmb7y.vf b/Master/texmf-dist/fonts/vf/public/pazo/zplmb7y.vf
deleted file mode 100644
index e12dcb8a787..00000000000
--- a/Master/texmf-dist/fonts/vf/public/pazo/zplmb7y.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/pazo/zplmr7m.vf b/Master/texmf-dist/fonts/vf/public/pazo/zplmr7m.vf
deleted file mode 100644
index 5ee0da01297..00000000000
--- a/Master/texmf-dist/fonts/vf/public/pazo/zplmr7m.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/pazo/zplmr7t.vf b/Master/texmf-dist/fonts/vf/public/pazo/zplmr7t.vf
deleted file mode 100644
index 0416cfa23a5..00000000000
--- a/Master/texmf-dist/fonts/vf/public/pazo/zplmr7t.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/pazo/zplmr7v.vf b/Master/texmf-dist/fonts/vf/public/pazo/zplmr7v.vf
deleted file mode 100644
index 57e8bade10b..00000000000
--- a/Master/texmf-dist/fonts/vf/public/pazo/zplmr7v.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/pazo/zplmr7y.vf b/Master/texmf-dist/fonts/vf/public/pazo/zplmr7y.vf
deleted file mode 100644
index aeec5f7a190..00000000000
--- a/Master/texmf-dist/fonts/vf/public/pazo/zplmr7y.vf
+++ /dev/null
diff --git a/Master/tlpkg/bin/ctan2tds b/Master/tlpkg/bin/ctan2tds
index 61cf03c5e1d..ae9349a8742 100755
--- a/Master/tlpkg/bin/ctan2tds
+++ b/Master/tlpkg/bin/ctan2tds
@@ -297,6 +297,7 @@ chdir $startdir || die "chdir($startdir) failed: $!";  # back to raw
  'psfig',	"die 'skipping, nosell license'",
  'psfragx',	"&MAKEflatten",
  'pslatex',	"&MAKEpslatex",
+ 'psnfss',	"&MAKEpsnfss",
  'psnfss-addons', "die 'skipping, ?'",
  'psnfssx',	"&MAKEflatten",
  'pst-2dplot',	"&MAKEpst",
@@ -3241,6 +3242,7 @@ sub MAKEpsnfss {
   print "\t SPECIAL omit fonts from latex-tds $package\n";
   
   # Start with the usual straight copy.
+  &SYSTEM ("$RM $startdir/$packagedir/TDS_READY");
   &MAKEcopy ();
 
   # Then remove the entire fonts tree.