diff -urN PSCyr.orig/dvips/pscyr/pscyr.map PSCyr/dvips/pscyr/pscyr.map
--- PSCyr.orig/dvips/pscyr/pscyr.map	2004-03-27 02:33:04 +0600
+++ PSCyr/dvips/pscyr/pscyr.map	2004-10-18 18:45:26 +0700
@@ -1,145 +1,145 @@
-facb6a   AcademyPSCyr-Bold "T2AEncoding ReEncodeFont" <t2a.enc <acade3.pfb
+facb6a   AcademyPSCyr-Bold "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <acade3.pfb
 facb8r   AcademyPSCyr-Bold "TeXBase1Encoding ReEncodeFont" <8r.enc <acade3.pfb
-facbo6a  AcademyPSCyr-Bold ".167 SlantFont T2AEncoding ReEncodeFont" <t2a.enc <acade3.pfb
+facbo6a  AcademyPSCyr-Bold ".167 SlantFont T2AEncoding ReEncodeFont" <pscyr-t2a.enc <acade3.pfb
 facbo8r  AcademyPSCyr-Bold ".167 SlantFont TeXBase1Encoding ReEncodeFont" <8r.enc <acade3.pfb
-facr6a   AcademyPSCyr-Regular "T2AEncoding ReEncodeFont" <t2a.enc <acade2.pfb
+facr6a   AcademyPSCyr-Regular "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <acade2.pfb
 facr8r   AcademyPSCyr-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <acade2.pfb
-facri6a  AcademyPSCyr-Italic "T2AEncoding ReEncodeFont" <t2a.enc <acade1.pfb
+facri6a  AcademyPSCyr-Italic "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <acade1.pfb
 facri8r  AcademyPSCyr-Italic "TeXBase1Encoding ReEncodeFont" <8r.enc <acade1.pfb
-facro6a  AcademyPSCyr-Regular ".167 SlantFont T2AEncoding ReEncodeFont" <t2a.enc <acade2.pfb
+facro6a  AcademyPSCyr-Regular ".167 SlantFont T2AEncoding ReEncodeFont" <pscyr-t2a.enc <acade2.pfb
 facro8r  AcademyPSCyr-Regular ".167 SlantFont TeXBase1Encoding ReEncodeFont" <8r.enc <acade2.pfb
-fadr6a   AdvertisementPSCyr "T2AEncoding ReEncodeFont" <t2a.enc <adver4.pfb
+fadr6a   AdvertisementPSCyr "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <adver4.pfb
 fadr8r   AdvertisementPSCyr "TeXBase1Encoding ReEncodeFont" <8r.enc <adver4.pfb
-faqb6a   AntiquaPSCyr-Bold "T2AEncoding ReEncodeFont" <t2a.enc <antiq7.pfb
+faqb6a   AntiquaPSCyr-Bold "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <antiq7.pfb
 faqb8r   AntiquaPSCyr-Bold "TeXBase1Encoding ReEncodeFont" <8r.enc <antiq7.pfb
-faqb6d   AntiquaPSCyr-Bold "T2DEncoding ReEncodeFont" <t2d.enc <antiq7.pfb
-faqbi6a  AntiquaPSCyr-BoldItalic "T2AEncoding ReEncodeFont" <t2a.enc <antiq4.pfb
+faqb6d   AntiquaPSCyr-Bold "T2DEncoding ReEncodeFont" <pscyr-t2d.enc <antiq7.pfb
+faqbi6a  AntiquaPSCyr-BoldItalic "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <antiq4.pfb
 faqbi8r  AntiquaPSCyr-BoldItalic "TeXBase1Encoding ReEncodeFont" <8r.enc <antiq4.pfb
-faqbo6a  AntiquaPSCyr-Bold ".167 SlantFont T2AEncoding ReEncodeFont" <t2a.enc <antiq7.pfb
+faqbo6a  AntiquaPSCyr-Bold ".167 SlantFont T2AEncoding ReEncodeFont" <pscyr-t2a.enc <antiq7.pfb
 faqbo8r  AntiquaPSCyr-Bold ".167 SlantFont TeXBase1Encoding ReEncodeFont" <8r.enc <antiq7.pfb
-faqbo6d  AntiquaPSCyr-Bold ".167 SlantFont T2DEncoding ReEncodeFont" <t2d.enc <antiq7.pfb
-faqr6a   AntiquaPSCyr-Regular "T2AEncoding ReEncodeFont" <t2a.enc <antiq6.pfb
+faqbo6d  AntiquaPSCyr-Bold ".167 SlantFont T2DEncoding ReEncodeFont" <pscyr-t2d.enc <antiq7.pfb
+faqr6a   AntiquaPSCyr-Regular "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <antiq6.pfb
 faqr8r   AntiquaPSCyr-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <antiq6.pfb
-faqr6d   AntiquaPSCyr-Regular "T2DEncoding ReEncodeFont" <t2d.enc <antiq6.pfb
-faqri6a  AntiquaPSCyr-Italic "T2AEncoding ReEncodeFont" <t2a.enc <antiq5.pfb
+faqr6d   AntiquaPSCyr-Regular "T2DEncoding ReEncodeFont" <pscyr-t2d.enc <antiq6.pfb
+faqri6a  AntiquaPSCyr-Italic "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <antiq5.pfb
 faqri8r  AntiquaPSCyr-Italic "TeXBase1Encoding ReEncodeFont" <8r.enc <antiq5.pfb
-faqri6d  AntiquaPSCyr-Italic "T2DEncoding ReEncodeFont" <t2d.enc <antiq5.pfb
-faqro6a  AntiquaPSCyr-Regular ".167 SlantFont T2AEncoding ReEncodeFont" <t2a.enc <antiq6.pfb
+faqri6d  AntiquaPSCyr-Italic "T2DEncoding ReEncodeFont" <pscyr-t2d.enc <antiq5.pfb
+faqro6a  AntiquaPSCyr-Regular ".167 SlantFont T2AEncoding ReEncodeFont" <pscyr-t2a.enc <antiq6.pfb
 faqro8r  AntiquaPSCyr-Regular ".167 SlantFont TeXBase1Encoding ReEncodeFont" <8r.enc <antiq6.pfb
-faqro6d  AntiquaPSCyr-Regular ".167 SlantFont T2DEncoding ReEncodeFont" <t2d.enc <antiq6.pfb
-farb6a   ArialMT-Bold "T2AEncoding ReEncodeFont" <t2a.enc <arialbd.pfb
+faqro6d  AntiquaPSCyr-Regular ".167 SlantFont T2DEncoding ReEncodeFont" <pscyr-t2d.enc <antiq6.pfb
+farb6a   ArialMT-Bold "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <arialbd.pfb
 farb8r   ArialMT-Bold "TeXBase1Encoding ReEncodeFont" <8r.enc <arialbd.pfb
-farbe6a  ArialMT-Black "T2AEncoding ReEncodeFont" <t2a.enc <ariale.pfb
+farbe6a  ArialMT-Black "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <ariale.pfb
 farbe8r  ArialMT-Black "TeXBase1Encoding ReEncodeFont" <8r.enc <ariale.pfb
-farbi6a  ArialMT-BoldItalic "T2AEncoding ReEncodeFont" <t2a.enc <arialbi.pfb
+farbi6a  ArialMT-BoldItalic "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <arialbi.pfb
 farbi8r  ArialMT-BoldItalic "TeXBase1Encoding ReEncodeFont" <8r.enc <arialbi.pfb
-farbo6a  ArialMT-Bold ".167 SlantFont T2AEncoding ReEncodeFont" <t2a.enc <arialbd.pfb
+farbo6a  ArialMT-Bold ".167 SlantFont T2AEncoding ReEncodeFont" <pscyr-t2a.enc <arialbd.pfb
 farbo8r  ArialMT-Bold ".167 SlantFont TeXBase1Encoding ReEncodeFont" <8r.enc <arialbd.pfb
-farr6a   ArialMT-Regular "T2AEncoding ReEncodeFont" <t2a.enc <arial.pfb
+farr6a   ArialMT-Regular "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <arial.pfb
 farr8r   ArialMT-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <arial.pfb
-farri6a  ArialMT-Italic "T2AEncoding ReEncodeFont" <t2a.enc <ariali.pfb
+farri6a  ArialMT-Italic "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <ariali.pfb
 farri8r  ArialMT-Italic "TeXBase1Encoding ReEncodeFont" <8r.enc <ariali.pfb
-farro6a  ArialMT-Regular ".167 SlantFont T2AEncoding ReEncodeFont" <t2a.enc <arial.pfb
+farro6a  ArialMT-Regular ".167 SlantFont T2AEncoding ReEncodeFont" <pscyr-t2a.enc <arial.pfb
 farro8r  ArialMT-Regular ".167 SlantFont TeXBase1Encoding ReEncodeFont" <8r.enc <arial.pfb
-fcob6a   CollegePSCyr-Bold "T2AEncoding ReEncodeFont" <t2a.enc <colle10.pfb
+fcob6a   CollegePSCyr-Bold "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <colle10.pfb
 fcob8r   CollegePSCyr-Bold "TeXBase1Encoding ReEncodeFont" <8r.enc <colle10.pfb
-fcobo6a  CollegePSCyr-Bold ".167 SlantFont T2AEncoding ReEncodeFont" <t2a.enc <colle10.pfb
+fcobo6a  CollegePSCyr-Bold ".167 SlantFont T2AEncoding ReEncodeFont" <pscyr-t2a.enc <colle10.pfb
 fcobo8r  CollegePSCyr-Bold ".167 SlantFont TeXBase1Encoding ReEncodeFont" <8r.enc <colle10.pfb
-fcor6a   CollegePSCyr-Regular "T2AEncoding ReEncodeFont" <t2a.enc <colle9.pfb
+fcor6a   CollegePSCyr-Regular "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <colle9.pfb
 fcor8r   CollegePSCyr-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <colle9.pfb
-fcori6a  CollegePSCyr-Italic "T2AEncoding ReEncodeFont" <t2a.enc <colle8.pfb
+fcori6a  CollegePSCyr-Italic "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <colle8.pfb
 fcori8r  CollegePSCyr-Italic "TeXBase1Encoding ReEncodeFont" <8r.enc <colle8.pfb
-fcoro6a  CollegePSCyr-Regular ".167 SlantFont T2AEncoding ReEncodeFont" <t2a.enc <colle9.pfb
+fcoro6a  CollegePSCyr-Regular ".167 SlantFont T2AEncoding ReEncodeFont" <pscyr-t2a.enc <colle9.pfb
 fcoro8r  CollegePSCyr-Regular ".167 SlantFont TeXBase1Encoding ReEncodeFont" <8r.enc <colle9.pfb
-fcpr6a   CooperPSCyr "T2AEncoding ReEncodeFont" <t2a.enc <cooper.pfb
+fcpr6a   CooperPSCyr "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <cooper.pfb
 fcpr8r   CooperPSCyr "TeXBase1Encoding ReEncodeFont" <8r.enc <cooper.pfb
-fcrb6a   CourierNewPSMT-Bold "T2AEncoding ReEncodeFont" <t2a.enc <courbd.pfb
+fcrb6a   CourierNewPSMT-Bold "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <courbd.pfb
 fcrb8r   CourierNewPSMT-Bold "TeXBase1Encoding ReEncodeFont" <8r.enc <courbd.pfb
-fcrbi6a  CourierNewPSMT-BoldItalic "T2AEncoding ReEncodeFont" <t2a.enc <courbi.pfb
+fcrbi6a  CourierNewPSMT-BoldItalic "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <courbi.pfb
 fcrbi8r  CourierNewPSMT-BoldItalic "TeXBase1Encoding ReEncodeFont" <8r.enc <courbi.pfb
-fcrr6a   CourierNewPSMT-Regular "T2AEncoding ReEncodeFont" <t2a.enc <cour.pfb
+fcrr6a   CourierNewPSMT-Regular "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <cour.pfb
 fcrr8r   CourierNewPSMT-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <cour.pfb
-fcrri6a  CourierNewPSMT-Italic "T2AEncoding ReEncodeFont" <t2a.enc <couri.pfb
+fcrri6a  CourierNewPSMT-Italic "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <couri.pfb
 fcrri8r  CourierNewPSMT-Italic "TeXBase1Encoding ReEncodeFont" <8r.enc <couri.pfb
-ferb6a   ERKurierPSCyr-Bold "T2AEncoding ReEncodeFont" <t2a.enc <ercourb.pfb
+ferb6a   ERKurierPSCyr-Bold "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <ercourb.pfb
 ferb8r   ERKurierPSCyr-Bold "TeXBase1Encoding ReEncodeFont" <8r.enc <ercourb.pfb
-ferbi6a  ERKurierPSCyr-BoldItalic "T2AEncoding ReEncodeFont" <t2a.enc <ercourbi.pfb
+ferbi6a  ERKurierPSCyr-BoldItalic "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <ercourbi.pfb
 ferbi8r  ERKurierPSCyr-BoldItalic "TeXBase1Encoding ReEncodeFont" <8r.enc <ercourbi.pfb
-ferr6a   ERKurierPSCyr-Regular "T2AEncoding ReEncodeFont" <t2a.enc <ercour.pfb
+ferr6a   ERKurierPSCyr-Regular "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <ercour.pfb
 ferr8r   ERKurierPSCyr-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <ercour.pfb
-ferri6a  ERKurierPSCyr-Italic "T2AEncoding ReEncodeFont" <t2a.enc <ercouri.pfb
+ferri6a  ERKurierPSCyr-Italic "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <ercouri.pfb
 ferri8r  ERKurierPSCyr-Italic "TeXBase1Encoding ReEncodeFont" <8r.enc <ercouri.pfb
-fhab6a   HandbookPSCyr-Bold "T2AEncoding ReEncodeFont" <t2a.enc <handb13.pfb
+fhab6a   HandbookPSCyr-Bold "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <handb13.pfb
 fhab8r   HandbookPSCyr-Bold "TeXBase1Encoding ReEncodeFont" <8r.enc <handb13.pfb
-fhabo6a  HandbookPSCyr-Bold ".167 SlantFont T2AEncoding ReEncodeFont" <t2a.enc <handb13.pfb
+fhabo6a  HandbookPSCyr-Bold ".167 SlantFont T2AEncoding ReEncodeFont" <pscyr-t2a.enc <handb13.pfb
 fhabo8r  HandbookPSCyr-Bold ".167 SlantFont TeXBase1Encoding ReEncodeFont" <8r.enc <handb13.pfb
-fhar6a   HandbookPSCyr-Regular "T2AEncoding ReEncodeFont" <t2a.enc <handb12.pfb
+fhar6a   HandbookPSCyr-Regular "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <handb12.pfb
 fhar8r   HandbookPSCyr-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <handb12.pfb
-fhari6a  HandbookPSCyr-Italic "T2AEncoding ReEncodeFont" <t2a.enc <handb11.pfb
+fhari6a  HandbookPSCyr-Italic "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <handb11.pfb
 fhari8r  HandbookPSCyr-Italic "TeXBase1Encoding ReEncodeFont" <8r.enc <handb11.pfb
-fharo6a  HandbookPSCyr-Regular ".167 SlantFont T2AEncoding ReEncodeFont" <t2a.enc <handb12.pfb
+fharo6a  HandbookPSCyr-Regular ".167 SlantFont T2AEncoding ReEncodeFont" <pscyr-t2a.enc <handb12.pfb
 fharo8r  HandbookPSCyr-Regular ".167 SlantFont TeXBase1Encoding ReEncodeFont" <8r.enc <handb12.pfb
-fjnb6a   JournalPSCyr-Bold "T2AEncoding ReEncodeFont" <t2a.enc <journb.pfb
+fjnb6a   JournalPSCyr-Bold "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <journb.pfb
 fjnb8r   JournalPSCyr-Bold "TeXBase1Encoding ReEncodeFont" <8r.enc <journb.pfb
-fjnb6d   JournalPSCyr-Bold "T2DEncoding ReEncodeFont" <t2d.enc <journb.pfb
-fjnbo6a  JournalPSCyr-Bold ".167 SlantFont T2AEncoding ReEncodeFont" <t2a.enc <journb.pfb
+fjnb6d   JournalPSCyr-Bold "T2DEncoding ReEncodeFont" <pscyr-t2d.enc <journb.pfb
+fjnbo6a  JournalPSCyr-Bold ".167 SlantFont T2AEncoding ReEncodeFont" <pscyr-t2a.enc <journb.pfb
 fjnbo8r  JournalPSCyr-Bold ".167 SlantFont TeXBase1Encoding ReEncodeFont" <8r.enc <journb.pfb
-fjnbo6d  JournalPSCyr-Bold ".167 SlantFont T2DEncoding ReEncodeFont" <t2d.enc <journb.pfb
-fjnr6a   JournalPSCyr-Regular "T2AEncoding ReEncodeFont" <t2a.enc <journ.pfb
+fjnbo6d  JournalPSCyr-Bold ".167 SlantFont T2DEncoding ReEncodeFont" <pscyr-t2d.enc <journb.pfb
+fjnr6a   JournalPSCyr-Regular "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <journ.pfb
 fjnr8r   JournalPSCyr-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <journ.pfb
-fjnr6d   JournalPSCyr-Regular "T2DEncoding ReEncodeFont" <t2d.enc <journ.pfb
-fjnri6a  JournalPSCyr-Italic "T2AEncoding ReEncodeFont" <t2a.enc <journi.pfb
+fjnr6d   JournalPSCyr-Regular "T2DEncoding ReEncodeFont" <pscyr-t2d.enc <journ.pfb
+fjnri6a  JournalPSCyr-Italic "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <journi.pfb
 fjnri8r  JournalPSCyr-Italic "TeXBase1Encoding ReEncodeFont" <8r.enc <journi.pfb
-fjnri6d  JournalPSCyr-Italic "T2DEncoding ReEncodeFont" <t2d.enc <journi.pfb
-fjnro6a  JournalPSCyr-Regular ".167 SlantFont T2AEncoding ReEncodeFont" <t2a.enc <journ.pfb
+fjnri6d  JournalPSCyr-Italic "T2DEncoding ReEncodeFont" <pscyr-t2d.enc <journi.pfb
+fjnro6a  JournalPSCyr-Regular ".167 SlantFont T2AEncoding ReEncodeFont" <pscyr-t2a.enc <journ.pfb
 fjnro8r  JournalPSCyr-Regular ".167 SlantFont TeXBase1Encoding ReEncodeFont" <8r.enc <journ.pfb
-fjnro6d  JournalPSCyr-Regular ".167 SlantFont T2DEncoding ReEncodeFont" <t2d.enc <journ.pfb
-flzr6a   Lazurski "T2AEncoding ReEncodeFont" <t2a.enc <lazur14.pfb
+fjnro6d  JournalPSCyr-Regular ".167 SlantFont T2DEncoding ReEncodeFont" <pscyr-t2d.enc <journ.pfb
+flzr6a   Lazurski "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <lazur14.pfb
 flzr8r   Lazurski "TeXBase1Encoding ReEncodeFont" <8r.enc <lazur14.pfb
-flzro6a  Lazurski ".167 SlantFont T2AEncoding ReEncodeFont" <t2a.enc <lazur14.pfb
+flzro6a  Lazurski ".167 SlantFont T2AEncoding ReEncodeFont" <pscyr-t2a.enc <lazur14.pfb
 flzro8r  Lazurski ".167 SlantFont TeXBase1Encoding ReEncodeFont" <8r.enc <lazur14.pfb
-fmab6a   MagazinePSCyr-Bold "T2AEncoding ReEncodeFont" <t2a.enc <magaz17.pfb
+fmab6a   MagazinePSCyr-Bold "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <magaz17.pfb
 fmab8r   MagazinePSCyr-Bold "TeXBase1Encoding ReEncodeFont" <8r.enc <magaz17.pfb
-fmabo6a  MagazinePSCyr-Bold ".167 SlantFont T2AEncoding ReEncodeFont" <t2a.enc <magaz17.pfb
+fmabo6a  MagazinePSCyr-Bold ".167 SlantFont T2AEncoding ReEncodeFont" <pscyr-t2a.enc <magaz17.pfb
 fmabo8r  MagazinePSCyr-Bold ".167 SlantFont TeXBase1Encoding ReEncodeFont" <8r.enc <magaz17.pfb
-fmar6a   MagazinePSCyr-Regular "T2AEncoding ReEncodeFont" <t2a.enc <magaz16.pfb
+fmar6a   MagazinePSCyr-Regular "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <magaz16.pfb
 fmar8r   MagazinePSCyr-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <magaz16.pfb
-fmari6a  MagazinePSCyr-Italic "T2AEncoding ReEncodeFont" <t2a.enc <magaz15.pfb
+fmari6a  MagazinePSCyr-Italic "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <magaz15.pfb
 fmari8r  MagazinePSCyr-Italic "TeXBase1Encoding ReEncodeFont" <8r.enc <magaz15.pfb
-fmaro6a  MagazinePSCyr-Regular ".167 SlantFont T2AEncoding ReEncodeFont" <t2a.enc <magaz16.pfb
+fmaro6a  MagazinePSCyr-Regular ".167 SlantFont T2AEncoding ReEncodeFont" <pscyr-t2a.enc <magaz16.pfb
 fmaro8r  MagazinePSCyr-Regular ".167 SlantFont TeXBase1Encoding ReEncodeFont" <8r.enc <magaz16.pfb
-fsvb6a   SouvenirPSCyr-Bold "T2AEncoding ReEncodeFont" <t2a.enc <souvenb.pfb
+fsvb6a   SouvenirPSCyr-Bold "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <souvenb.pfb
 fsvb8r   SouvenirPSCyr-Bold "TeXBase1Encoding ReEncodeFont" <8r.enc <souvenb.pfb
-fsvbo6a  SouvenirPSCyr-Bold ".167 SlantFont T2AEncoding ReEncodeFont" <t2a.enc <souvenb.pfb
+fsvbo6a  SouvenirPSCyr-Bold ".167 SlantFont T2AEncoding ReEncodeFont" <pscyr-t2a.enc <souvenb.pfb
 fsvbo8r  SouvenirPSCyr-Bold ".167 SlantFont TeXBase1Encoding ReEncodeFont" <8r.enc <souvenb.pfb
-fsvr6a   SouvenirPSCyr-Regular "T2AEncoding ReEncodeFont" <t2a.enc <souven.pfb
+fsvr6a   SouvenirPSCyr-Regular "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <souven.pfb
 fsvr8r   SouvenirPSCyr-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <souven.pfb
-fsvro6a  SouvenirPSCyr-Regular ".167 SlantFont T2AEncoding ReEncodeFont" <t2a.enc <souven.pfb
+fsvro6a  SouvenirPSCyr-Regular ".167 SlantFont T2AEncoding ReEncodeFont" <pscyr-t2a.enc <souven.pfb
 fsvro8r  SouvenirPSCyr-Regular ".167 SlantFont TeXBase1Encoding ReEncodeFont" <8r.enc <souven.pfb
-ftmb6a   TimesNewRomanPSMT-Bold "T2AEncoding ReEncodeFont" <t2a.enc <timesbd.pfb
+ftmb6a   TimesNewRomanPSMT-Bold "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <timesbd.pfb
 ftmb8r   TimesNewRomanPSMT-Bold "TeXBase1Encoding ReEncodeFont" <8r.enc <timesbd.pfb
-ftmbi6a  TimesNewRomanPSMT-BoldItalic "T2AEncoding ReEncodeFont" <t2a.enc <timesbi.pfb
+ftmbi6a  TimesNewRomanPSMT-BoldItalic "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <timesbi.pfb
 ftmbi8r  TimesNewRomanPSMT-BoldItalic "TeXBase1Encoding ReEncodeFont" <8r.enc <timesbi.pfb
-ftmbo6a  TimesNewRomanPSMT-Bold ".167 SlantFont T2AEncoding ReEncodeFont" <t2a.enc <timesbd.pfb
+ftmbo6a  TimesNewRomanPSMT-Bold ".167 SlantFont T2AEncoding ReEncodeFont" <pscyr-t2a.enc <timesbd.pfb
 ftmbo8r  TimesNewRomanPSMT-Bold ".167 SlantFont TeXBase1Encoding ReEncodeFont" <8r.enc <timesbd.pfb
-ftmr6a   TimesNewRomanPSMT-Regular "T2AEncoding ReEncodeFont" <t2a.enc <times.pfb
+ftmr6a   TimesNewRomanPSMT-Regular "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <times.pfb
 ftmr8r   TimesNewRomanPSMT-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <times.pfb
-ftmri6a  TimesNewRomanPSMT-Italic "T2AEncoding ReEncodeFont" <t2a.enc <timesi.pfb
+ftmri6a  TimesNewRomanPSMT-Italic "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <timesi.pfb
 ftmri8r  TimesNewRomanPSMT-Italic "TeXBase1Encoding ReEncodeFont" <8r.enc <timesi.pfb
-ftmro6a  TimesNewRomanPSMT-Regular ".167 SlantFont T2AEncoding ReEncodeFont" <t2a.enc <times.pfb
+ftmro6a  TimesNewRomanPSMT-Regular ".167 SlantFont T2AEncoding ReEncodeFont" <pscyr-t2a.enc <times.pfb
 ftmro8r  TimesNewRomanPSMT-Regular ".167 SlantFont TeXBase1Encoding ReEncodeFont" <8r.enc <times.pfb
-ftxb6a   TextbookPSCyr-Bold "T2AEncoding ReEncodeFont" <t2a.enc <textb20.pfb
+ftxb6a   TextbookPSCyr-Bold "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <textb20.pfb
 ftxb8r   TextbookPSCyr-Bold "TeXBase1Encoding ReEncodeFont" <8r.enc <textb20.pfb
-ftxb6d   TextbookPSCyr-Bold "T2DEncoding ReEncodeFont" <t2d.enc <textb20.pfb
-ftxbo6a  TextbookPSCyr-Bold ".258 SlantFont T2AEncoding ReEncodeFont" <t2a.enc <textb20.pfb
+ftxb6d   TextbookPSCyr-Bold "T2DEncoding ReEncodeFont" <pscyr-t2d.enc <textb20.pfb
+ftxbo6a  TextbookPSCyr-Bold ".258 SlantFont T2AEncoding ReEncodeFont" <pscyr-t2a.enc <textb20.pfb
 ftxbo8r  TextbookPSCyr-Bold ".258 SlantFont TeXBase1Encoding ReEncodeFont" <8r.enc <textb20.pfb
-ftxbo6d  TextbookPSCyr-Bold ".258 SlantFont T2DEncoding ReEncodeFont" <t2d.enc <textb20.pfb
-ftxr6a   TextbookPSCyr-Regular "T2AEncoding ReEncodeFont" <t2a.enc <textb19.pfb
+ftxbo6d  TextbookPSCyr-Bold ".258 SlantFont T2DEncoding ReEncodeFont" <pscyr-t2d.enc <textb20.pfb
+ftxr6a   TextbookPSCyr-Regular "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <textb19.pfb
 ftxr8r   TextbookPSCyr-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <textb19.pfb
-ftxr6d   TextbookPSCyr-Regular "T2DEncoding ReEncodeFont" <t2d.enc <textb19.pfb
-ftxri6a  TextbookPSCyr-Italic "T2AEncoding ReEncodeFont" <t2a.enc <textb18.pfb
+ftxr6d   TextbookPSCyr-Regular "T2DEncoding ReEncodeFont" <pscyr-t2d.enc <textb19.pfb
+ftxri6a  TextbookPSCyr-Italic "T2AEncoding ReEncodeFont" <pscyr-t2a.enc <textb18.pfb
 ftxri8r  TextbookPSCyr-Italic "TeXBase1Encoding ReEncodeFont" <8r.enc <textb18.pfb
-ftxri6d  TextbookPSCyr-Italic "T2DEncoding ReEncodeFont" <t2d.enc <textb18.pfb
-ftxro6a  TextbookPSCyr-Regular ".258 SlantFont T2AEncoding ReEncodeFont" <t2a.enc <textb19.pfb
+ftxri6d  TextbookPSCyr-Italic "T2DEncoding ReEncodeFont" <pscyr-t2d.enc <textb18.pfb
+ftxro6a  TextbookPSCyr-Regular ".258 SlantFont T2AEncoding ReEncodeFont" <pscyr-t2a.enc <textb19.pfb
 ftxro8r  TextbookPSCyr-Regular ".258 SlantFont TeXBase1Encoding ReEncodeFont" <8r.enc <textb19.pfb
-ftxro6d  TextbookPSCyr-Regular ".258 SlantFont T2DEncoding ReEncodeFont" <t2d.enc <textb19.pfb
+ftxro6d  TextbookPSCyr-Regular ".258 SlantFont T2DEncoding ReEncodeFont" <pscyr-t2d.enc <textb19.pfb
