autoupdate via tlmgr generate updmap

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

10 files changed, 656 insertions, 129 deletions

diff --git a/Master/texmf/fonts/map/dvipdfm/updmap/dvipdfm.map b/Master/texmf/fonts/map/dvipdfm/updmap/dvipdfm.map
index 2cd2ed2b66b..188c856397e 100644
--- a/Master/texmf/fonts/map/dvipdfm/updmap/dvipdfm.map
+++ b/Master/texmf/fonts/map/dvipdfm/updmap/dvipdfm.map
@@ -2546,6 +2546,66 @@ fvsb8r 8r fvsb8a
 fvsbo8r 8r fvsbo8a
 fvsr8r 8r fvsr8a
 fvsro8r 8r fvsro8a
+fxbb-8r 8r fxbb
+fxbb-xb-00 xb-00 fxbb
+fxbb-xb-01 xb-01 fxbb
+fxbb-xb-02 xb-02 fxbb
+fxbb-xb-03 xb-03 fxbb
+fxbb-xb-04 xb-04 fxbb
+fxbb-xb-05 xb-05 fxbb
+fxbb-xb-06 xb-06 fxbb
+fxbb-xb-07 xb-07 fxbb
+fxbb-xb-09 xb-09 fxbb
+fxbb-xb-1e xb-1e fxbb
+fxbb-xb-1f xb-1f fxbb
+fxbb-xb-20 xb-20 fxbb
+fxbb-xb-21 xb-21 fxbb
+fxbb-xb-22 xb-22 fxbb
+fxbb-xb-23 xb-23 fxbb
+fxbb-xb-24 xb-24 fxbb
+fxbb-xb-25 xb-25 fxbb
+fxbb-xb-26 xb-26 fxbb
+fxbb-xb-27 xb-27 fxbb
+fxbb-xb-2c xb-2c fxbb
+fxbb-xb-8x xb-8x fxbb
+fxbb-xb-a7 xb-a7 fxbb
+fxbb-xb-e0 xb-e0 fxbb
+fxbb-xb-e1 xb-e1 fxbb
+fxbb-xb-f6 xb-f6 fxbb
+fxbb-xb-fb xb-fb fxbb
+fxbb-xb-ff xb-ff fxbb
+fxbb-xb-t1 xb-t1 fxbb
+fxbb-xb-ts1 xb-ts1 fxbb
+fxbr-8r 8r fxbr
+fxbr-xb-00 xb-00 fxbr
+fxbr-xb-01 xb-01 fxbr
+fxbr-xb-02 xb-02 fxbr
+fxbr-xb-03 xb-03 fxbr
+fxbr-xb-04 xb-04 fxbr
+fxbr-xb-05 xb-05 fxbr
+fxbr-xb-06 xb-06 fxbr
+fxbr-xb-07 xb-07 fxbr
+fxbr-xb-09 xb-09 fxbr
+fxbr-xb-1e xb-1e fxbr
+fxbr-xb-1f xb-1f fxbr
+fxbr-xb-20 xb-20 fxbr
+fxbr-xb-21 xb-21 fxbr
+fxbr-xb-22 xb-22 fxbr
+fxbr-xb-23 xb-23 fxbr
+fxbr-xb-24 xb-24 fxbr
+fxbr-xb-25 xb-25 fxbr
+fxbr-xb-26 xb-26 fxbr
+fxbr-xb-27 xb-27 fxbr
+fxbr-xb-2c xb-2c fxbr
+fxbr-xb-8x xb-8x fxbr
+fxbr-xb-a7 xb-a7 fxbr
+fxbr-xb-e0 xb-e0 fxbr
+fxbr-xb-e1 xb-e1 fxbr
+fxbr-xb-f6 xb-f6 fxbr
+fxbr-xb-fb xb-fb fxbr
+fxbr-xb-ff xb-ff fxbr
+fxbr-xb-t1 xb-t1 fxbr
+fxbr-xb-ts1 xb-ts1 fxbr
 fxlb-8r 8r fxlb
 fxlb-xl-00 xl-00 fxlb
 fxlb-xl-01 xl-01 fxlb
@@ -2576,8 +2636,6 @@ fxlb-xl-f6 xl-f6 fxlb
 fxlb-xl-fb xl-fb fxlb
 fxlb-xl-ff xl-ff fxlb
 fxlb-xl-infsup xl-infsup fxlb
-fxlb-xl-lgi xl-lgi fxlb
-fxlb-xl-lgr xl-lgr fxlb
 fxlb-xl-t1 xl-t1 fxlb
 fxlb-xl-ts1 xl-ts1 fxlb
 fxlbi-8r 8r fxlbi
@@ -2610,8 +2668,6 @@ fxlbi-xl-f6 xl-f6 fxlbi
 fxlbi-xl-fb xl-fb fxlbi
 fxlbi-xl-ff xl-ff fxlbi
 fxlbi-xl-infsup xl-infsup fxlbi
-fxlbi-xl-lgi xl-lgi fxlbi
-fxlbi-xl-lgr xl-lgr fxlbi
 fxlbi-xl-t1 xl-t1 fxlbi
 fxlbi-xl-ts1 xl-ts1 fxlbi
 fxlr-8r 8r fxlr
@@ -2644,8 +2700,6 @@ fxlr-xl-f6 xl-f6 fxlr
 fxlr-xl-fb xl-fb fxlr
 fxlr-xl-ff xl-ff fxlr
 fxlr-xl-infsup xl-infsup fxlr
-fxlr-xl-lgi xl-lgi fxlr
-fxlr-xl-lgr xl-lgr fxlr
 fxlr-xl-t1 xl-t1 fxlr
 fxlr-xl-ts1 xl-ts1 fxlr
 fxlri-8r 8r fxlri
@@ -2677,8 +2731,6 @@ fxlri-xl-f6 xl-f6 fxlri
 fxlri-xl-fb xl-fb fxlri
 fxlri-xl-ff xl-ff fxlri
 fxlri-xl-infsup xl-infsup fxlri
-fxlri-xl-lgi xl-lgi fxlri
-fxlri-xl-lgr xl-lgr fxlri
 fxlri-xl-t1 xl-t1 fxlri
 fxlri-xl-ts1 xl-ts1 fxlri
 gartemisiab6r artemisiael GFSArtemisia-Bold
diff --git a/Master/texmf/fonts/map/dvipdfm/updmap/dvipdfm_dl14.map b/Master/texmf/fonts/map/dvipdfm/updmap/dvipdfm_dl14.map
index 2cd2ed2b66b..188c856397e 100644
--- a/Master/texmf/fonts/map/dvipdfm/updmap/dvipdfm_dl14.map
+++ b/Master/texmf/fonts/map/dvipdfm/updmap/dvipdfm_dl14.map
@@ -2546,6 +2546,66 @@ fvsb8r 8r fvsb8a
 fvsbo8r 8r fvsbo8a
 fvsr8r 8r fvsr8a
 fvsro8r 8r fvsro8a
+fxbb-8r 8r fxbb
+fxbb-xb-00 xb-00 fxbb
+fxbb-xb-01 xb-01 fxbb
+fxbb-xb-02 xb-02 fxbb
+fxbb-xb-03 xb-03 fxbb
+fxbb-xb-04 xb-04 fxbb
+fxbb-xb-05 xb-05 fxbb
+fxbb-xb-06 xb-06 fxbb
+fxbb-xb-07 xb-07 fxbb
+fxbb-xb-09 xb-09 fxbb
+fxbb-xb-1e xb-1e fxbb
+fxbb-xb-1f xb-1f fxbb
+fxbb-xb-20 xb-20 fxbb
+fxbb-xb-21 xb-21 fxbb
+fxbb-xb-22 xb-22 fxbb
+fxbb-xb-23 xb-23 fxbb
+fxbb-xb-24 xb-24 fxbb
+fxbb-xb-25 xb-25 fxbb
+fxbb-xb-26 xb-26 fxbb
+fxbb-xb-27 xb-27 fxbb
+fxbb-xb-2c xb-2c fxbb
+fxbb-xb-8x xb-8x fxbb
+fxbb-xb-a7 xb-a7 fxbb
+fxbb-xb-e0 xb-e0 fxbb
+fxbb-xb-e1 xb-e1 fxbb
+fxbb-xb-f6 xb-f6 fxbb
+fxbb-xb-fb xb-fb fxbb
+fxbb-xb-ff xb-ff fxbb
+fxbb-xb-t1 xb-t1 fxbb
+fxbb-xb-ts1 xb-ts1 fxbb
+fxbr-8r 8r fxbr
+fxbr-xb-00 xb-00 fxbr
+fxbr-xb-01 xb-01 fxbr
+fxbr-xb-02 xb-02 fxbr
+fxbr-xb-03 xb-03 fxbr
+fxbr-xb-04 xb-04 fxbr
+fxbr-xb-05 xb-05 fxbr
+fxbr-xb-06 xb-06 fxbr
+fxbr-xb-07 xb-07 fxbr
+fxbr-xb-09 xb-09 fxbr
+fxbr-xb-1e xb-1e fxbr
+fxbr-xb-1f xb-1f fxbr
+fxbr-xb-20 xb-20 fxbr
+fxbr-xb-21 xb-21 fxbr
+fxbr-xb-22 xb-22 fxbr
+fxbr-xb-23 xb-23 fxbr
+fxbr-xb-24 xb-24 fxbr
+fxbr-xb-25 xb-25 fxbr
+fxbr-xb-26 xb-26 fxbr
+fxbr-xb-27 xb-27 fxbr
+fxbr-xb-2c xb-2c fxbr
+fxbr-xb-8x xb-8x fxbr
+fxbr-xb-a7 xb-a7 fxbr
+fxbr-xb-e0 xb-e0 fxbr
+fxbr-xb-e1 xb-e1 fxbr
+fxbr-xb-f6 xb-f6 fxbr
+fxbr-xb-fb xb-fb fxbr
+fxbr-xb-ff xb-ff fxbr
+fxbr-xb-t1 xb-t1 fxbr
+fxbr-xb-ts1 xb-ts1 fxbr
 fxlb-8r 8r fxlb
 fxlb-xl-00 xl-00 fxlb
 fxlb-xl-01 xl-01 fxlb
@@ -2576,8 +2636,6 @@ fxlb-xl-f6 xl-f6 fxlb
 fxlb-xl-fb xl-fb fxlb
 fxlb-xl-ff xl-ff fxlb
 fxlb-xl-infsup xl-infsup fxlb
-fxlb-xl-lgi xl-lgi fxlb
-fxlb-xl-lgr xl-lgr fxlb
 fxlb-xl-t1 xl-t1 fxlb
 fxlb-xl-ts1 xl-ts1 fxlb
 fxlbi-8r 8r fxlbi
@@ -2610,8 +2668,6 @@ fxlbi-xl-f6 xl-f6 fxlbi
 fxlbi-xl-fb xl-fb fxlbi
 fxlbi-xl-ff xl-ff fxlbi
 fxlbi-xl-infsup xl-infsup fxlbi
-fxlbi-xl-lgi xl-lgi fxlbi
-fxlbi-xl-lgr xl-lgr fxlbi
 fxlbi-xl-t1 xl-t1 fxlbi
 fxlbi-xl-ts1 xl-ts1 fxlbi
 fxlr-8r 8r fxlr
@@ -2644,8 +2700,6 @@ fxlr-xl-f6 xl-f6 fxlr
 fxlr-xl-fb xl-fb fxlr
 fxlr-xl-ff xl-ff fxlr
 fxlr-xl-infsup xl-infsup fxlr
-fxlr-xl-lgi xl-lgi fxlr
-fxlr-xl-lgr xl-lgr fxlr
 fxlr-xl-t1 xl-t1 fxlr
 fxlr-xl-ts1 xl-ts1 fxlr
 fxlri-8r 8r fxlri
@@ -2677,8 +2731,6 @@ fxlri-xl-f6 xl-f6 fxlri
 fxlri-xl-fb xl-fb fxlri
 fxlri-xl-ff xl-ff fxlri
 fxlri-xl-infsup xl-infsup fxlri
-fxlri-xl-lgi xl-lgi fxlri
-fxlri-xl-lgr xl-lgr fxlri
 fxlri-xl-t1 xl-t1 fxlri
 fxlri-xl-ts1 xl-ts1 fxlri
 gartemisiab6r artemisiael GFSArtemisia-Bold
diff --git a/Master/texmf/fonts/map/dvipdfm/updmap/dvipdfm_ndl14.map b/Master/texmf/fonts/map/dvipdfm/updmap/dvipdfm_ndl14.map
index ebc3f5dbc55..becd54261cd 100644
--- a/Master/texmf/fonts/map/dvipdfm/updmap/dvipdfm_ndl14.map
+++ b/Master/texmf/fonts/map/dvipdfm/updmap/dvipdfm_ndl14.map
@@ -2546,6 +2546,66 @@ fvsb8r 8r fvsb8a
 fvsbo8r 8r fvsbo8a
 fvsr8r 8r fvsr8a
 fvsro8r 8r fvsro8a
+fxbb-8r 8r fxbb
+fxbb-xb-00 xb-00 fxbb
+fxbb-xb-01 xb-01 fxbb
+fxbb-xb-02 xb-02 fxbb
+fxbb-xb-03 xb-03 fxbb
+fxbb-xb-04 xb-04 fxbb
+fxbb-xb-05 xb-05 fxbb
+fxbb-xb-06 xb-06 fxbb
+fxbb-xb-07 xb-07 fxbb
+fxbb-xb-09 xb-09 fxbb
+fxbb-xb-1e xb-1e fxbb
+fxbb-xb-1f xb-1f fxbb
+fxbb-xb-20 xb-20 fxbb
+fxbb-xb-21 xb-21 fxbb
+fxbb-xb-22 xb-22 fxbb
+fxbb-xb-23 xb-23 fxbb
+fxbb-xb-24 xb-24 fxbb
+fxbb-xb-25 xb-25 fxbb
+fxbb-xb-26 xb-26 fxbb
+fxbb-xb-27 xb-27 fxbb
+fxbb-xb-2c xb-2c fxbb
+fxbb-xb-8x xb-8x fxbb
+fxbb-xb-a7 xb-a7 fxbb
+fxbb-xb-e0 xb-e0 fxbb
+fxbb-xb-e1 xb-e1 fxbb
+fxbb-xb-f6 xb-f6 fxbb
+fxbb-xb-fb xb-fb fxbb
+fxbb-xb-ff xb-ff fxbb
+fxbb-xb-t1 xb-t1 fxbb
+fxbb-xb-ts1 xb-ts1 fxbb
+fxbr-8r 8r fxbr
+fxbr-xb-00 xb-00 fxbr
+fxbr-xb-01 xb-01 fxbr
+fxbr-xb-02 xb-02 fxbr
+fxbr-xb-03 xb-03 fxbr
+fxbr-xb-04 xb-04 fxbr
+fxbr-xb-05 xb-05 fxbr
+fxbr-xb-06 xb-06 fxbr
+fxbr-xb-07 xb-07 fxbr
+fxbr-xb-09 xb-09 fxbr
+fxbr-xb-1e xb-1e fxbr
+fxbr-xb-1f xb-1f fxbr
+fxbr-xb-20 xb-20 fxbr
+fxbr-xb-21 xb-21 fxbr
+fxbr-xb-22 xb-22 fxbr
+fxbr-xb-23 xb-23 fxbr
+fxbr-xb-24 xb-24 fxbr
+fxbr-xb-25 xb-25 fxbr
+fxbr-xb-26 xb-26 fxbr
+fxbr-xb-27 xb-27 fxbr
+fxbr-xb-2c xb-2c fxbr
+fxbr-xb-8x xb-8x fxbr
+fxbr-xb-a7 xb-a7 fxbr
+fxbr-xb-e0 xb-e0 fxbr
+fxbr-xb-e1 xb-e1 fxbr
+fxbr-xb-f6 xb-f6 fxbr
+fxbr-xb-fb xb-fb fxbr
+fxbr-xb-ff xb-ff fxbr
+fxbr-xb-t1 xb-t1 fxbr
+fxbr-xb-ts1 xb-ts1 fxbr
 fxlb-8r 8r fxlb
 fxlb-xl-00 xl-00 fxlb
 fxlb-xl-01 xl-01 fxlb
@@ -2576,8 +2636,6 @@ fxlb-xl-f6 xl-f6 fxlb
 fxlb-xl-fb xl-fb fxlb
 fxlb-xl-ff xl-ff fxlb
 fxlb-xl-infsup xl-infsup fxlb
-fxlb-xl-lgi xl-lgi fxlb
-fxlb-xl-lgr xl-lgr fxlb
 fxlb-xl-t1 xl-t1 fxlb
 fxlb-xl-ts1 xl-ts1 fxlb
 fxlbi-8r 8r fxlbi
@@ -2610,8 +2668,6 @@ fxlbi-xl-f6 xl-f6 fxlbi
 fxlbi-xl-fb xl-fb fxlbi
 fxlbi-xl-ff xl-ff fxlbi
 fxlbi-xl-infsup xl-infsup fxlbi
-fxlbi-xl-lgi xl-lgi fxlbi
-fxlbi-xl-lgr xl-lgr fxlbi
 fxlbi-xl-t1 xl-t1 fxlbi
 fxlbi-xl-ts1 xl-ts1 fxlbi
 fxlr-8r 8r fxlr
@@ -2644,8 +2700,6 @@ fxlr-xl-f6 xl-f6 fxlr
 fxlr-xl-fb xl-fb fxlr
 fxlr-xl-ff xl-ff fxlr
 fxlr-xl-infsup xl-infsup fxlr
-fxlr-xl-lgi xl-lgi fxlr
-fxlr-xl-lgr xl-lgr fxlr
 fxlr-xl-t1 xl-t1 fxlr
 fxlr-xl-ts1 xl-ts1 fxlr
 fxlri-8r 8r fxlri
@@ -2677,8 +2731,6 @@ fxlri-xl-f6 xl-f6 fxlri
 fxlri-xl-fb xl-fb fxlri
 fxlri-xl-ff xl-ff fxlri
 fxlri-xl-infsup xl-infsup fxlri
-fxlri-xl-lgi xl-lgi fxlri
-fxlri-xl-lgr xl-lgr fxlri
 fxlri-xl-t1 xl-t1 fxlri
 fxlri-xl-ts1 xl-ts1 fxlri
 gartemisiab6r artemisiael GFSArtemisia-Bold
diff --git a/Master/texmf/fonts/map/dvips/updmap/ps2pk.map b/Master/texmf/fonts/map/dvips/updmap/ps2pk.map
index 7b4f61d6308..03b85b3c165 100644
--- a/Master/texmf/fonts/map/dvips/updmap/ps2pk.map
+++ b/Master/texmf/fonts/map/dvips/updmap/ps2pk.map
@@ -3,6 +3,7 @@
 %   and run updmap to recreate this file.
 % A log of the updmap run that has created this file is available here:
 %   /tmp/web2c/updmap.log
+
 ASCII ASCII <ASCII.pfb
 Acorn AcornInitials <Acorn.pfb
 AlphaDia ChessAlphaDiagram <AlphaDia.pfb
@@ -2242,8 +2243,8 @@ fgdb8z Garuda-Bold "C90Encoding ReEncodeFont" <c90.enc <garuda_b.pfb
 fgdbo8z Garuda-BoldOblique "C90Encoding ReEncodeFont" <c90.enc <garuda_bo.pfb
 fgdo8z Garuda-Oblique "C90Encoding ReEncodeFont" <c90.enc <garuda_o.pfb
 fgdr8z Garuda "C90Encoding ReEncodeFont" <c90.enc <garuda.pfb
-fgeit10 TeX-fgeit10 <fgeit10.pfb
-fgerm10 TeX-fgerm10 <fgerm10.pfb
+fgeit10 fgeit10 <fgeit10.pfb
+fgerm10 fgerm10 <fgerm10.pfb
 fibb84 FIBB84 <fibb84.pfb
 fibo84 IbycusHTG-Regular ".167 SlantFont" <fibr84.pfb
 fibr84 IbycusHTG-Regular <fibr84.pfb
@@ -2546,6 +2547,66 @@ fvsb8r BeraSans-Bold "TeXBase1Encoding ReEncodeFont" <8r.enc <fvsb8a.pfb
 fvsbo8r BeraSans-BoldOblique "TeXBase1Encoding ReEncodeFont" <8r.enc <fvsbo8a.pfb
 fvsr8r BeraSans-Roman "TeXBase1Encoding ReEncodeFont" <8r.enc <fvsr8a.pfb
 fvsro8r BeraSans-Oblique "TeXBase1Encoding ReEncodeFont" <8r.enc <fvsro8a.pfb
+fxbb-8r LinBiolinumB "TeXBase1Encoding ReEncodeFont" <8r.enc <fxbb.pfb
+fxbb-xb-00 LinBiolinumB "xb00Encoding ReEncodeFont" <xb-00.enc <fxbb.pfb
+fxbb-xb-01 LinBiolinumB "xb01Encoding ReEncodeFont" <xb-01.enc <fxbb.pfb
+fxbb-xb-02 LinBiolinumB "xb02Encoding ReEncodeFont" <xb-02.enc <fxbb.pfb
+fxbb-xb-03 LinBiolinumB "xb03Encoding ReEncodeFont" <xb-03.enc <fxbb.pfb
+fxbb-xb-04 LinBiolinumB "xb04Encoding ReEncodeFont" <xb-04.enc <fxbb.pfb
+fxbb-xb-05 LinBiolinumB "xb05Encoding ReEncodeFont" <xb-05.enc <fxbb.pfb
+fxbb-xb-06 LinBiolinumB "xb06Encoding ReEncodeFont" <xb-06.enc <fxbb.pfb
+fxbb-xb-07 LinBiolinumB "xb07Encoding ReEncodeFont" <xb-07.enc <fxbb.pfb
+fxbb-xb-09 LinBiolinumB "xb09Encoding ReEncodeFont" <xb-09.enc <fxbb.pfb
+fxbb-xb-1e LinBiolinumB "xb1EEncoding ReEncodeFont" <xb-1e.enc <fxbb.pfb
+fxbb-xb-1f LinBiolinumB "xb1FEncoding ReEncodeFont" <xb-1f.enc <fxbb.pfb
+fxbb-xb-20 LinBiolinumB "xb20Encoding ReEncodeFont" <xb-20.enc <fxbb.pfb
+fxbb-xb-21 LinBiolinumB "xb21Encoding ReEncodeFont" <xb-21.enc <fxbb.pfb
+fxbb-xb-22 LinBiolinumB "xb22Encoding ReEncodeFont" <xb-22.enc <fxbb.pfb
+fxbb-xb-23 LinBiolinumB "xb23Encoding ReEncodeFont" <xb-23.enc <fxbb.pfb
+fxbb-xb-24 LinBiolinumB "xb24Encoding ReEncodeFont" <xb-24.enc <fxbb.pfb
+fxbb-xb-25 LinBiolinumB "xb25Encoding ReEncodeFont" <xb-25.enc <fxbb.pfb
+fxbb-xb-26 LinBiolinumB "xb26Encoding ReEncodeFont" <xb-26.enc <fxbb.pfb
+fxbb-xb-27 LinBiolinumB "xb27Encoding ReEncodeFont" <xb-27.enc <fxbb.pfb
+fxbb-xb-2c LinBiolinumB "xb2CEncoding ReEncodeFont" <xb-2c.enc <fxbb.pfb
+fxbb-xb-8x LinBiolinumB "xbExpertEncoding ReEncodeFont" <xb-8x.enc <fxbb.pfb
+fxbb-xb-a7 LinBiolinumB "xbA7Encoding ReEncodeFont" <xb-a7.enc <fxbb.pfb
+fxbb-xb-e0 LinBiolinumB "xbE0Encoding ReEncodeFont" <xb-e0.enc <fxbb.pfb
+fxbb-xb-e1 LinBiolinumB "xbE1Encoding ReEncodeFont" <xb-e1.enc <fxbb.pfb
+fxbb-xb-f6 LinBiolinumB "xbF6Encoding ReEncodeFont" <xb-f6.enc <fxbb.pfb
+fxbb-xb-fb LinBiolinumB "xbFBEncoding ReEncodeFont" <xb-fb.enc <fxbb.pfb
+fxbb-xb-ff LinBiolinumB "xbFFEncoding ReEncodeFont" <xb-ff.enc <fxbb.pfb
+fxbb-xb-t1 LinBiolinumB "xbT1Encoding ReEncodeFont" <xb-t1.enc <fxbb.pfb
+fxbb-xb-ts1 LinBiolinumB "xbTS1Encoding ReEncodeFont" <xb-ts1.enc <fxbb.pfb
+fxbr-8r LinBiolinum "TeXBase1Encoding ReEncodeFont" <8r.enc <fxbr.pfb
+fxbr-xb-00 LinBiolinum "xb00Encoding ReEncodeFont" <xb-00.enc <fxbr.pfb
+fxbr-xb-01 LinBiolinum "xb01Encoding ReEncodeFont" <xb-01.enc <fxbr.pfb
+fxbr-xb-02 LinBiolinum "xb02Encoding ReEncodeFont" <xb-02.enc <fxbr.pfb
+fxbr-xb-03 LinBiolinum "xb03Encoding ReEncodeFont" <xb-03.enc <fxbr.pfb
+fxbr-xb-04 LinBiolinum "xb04Encoding ReEncodeFont" <xb-04.enc <fxbr.pfb
+fxbr-xb-05 LinBiolinum "xb05Encoding ReEncodeFont" <xb-05.enc <fxbr.pfb
+fxbr-xb-06 LinBiolinum "xb06Encoding ReEncodeFont" <xb-06.enc <fxbr.pfb
+fxbr-xb-07 LinBiolinum "xb07Encoding ReEncodeFont" <xb-07.enc <fxbr.pfb
+fxbr-xb-09 LinBiolinum "xb09Encoding ReEncodeFont" <xb-09.enc <fxbr.pfb
+fxbr-xb-1e LinBiolinum "xb1EEncoding ReEncodeFont" <xb-1e.enc <fxbr.pfb
+fxbr-xb-1f LinBiolinum "xb1FEncoding ReEncodeFont" <xb-1f.enc <fxbr.pfb
+fxbr-xb-20 LinBiolinum "xb20Encoding ReEncodeFont" <xb-20.enc <fxbr.pfb
+fxbr-xb-21 LinBiolinum "xb21Encoding ReEncodeFont" <xb-21.enc <fxbr.pfb
+fxbr-xb-22 LinBiolinum "xb22Encoding ReEncodeFont" <xb-22.enc <fxbr.pfb
+fxbr-xb-23 LinBiolinum "xb23Encoding ReEncodeFont" <xb-23.enc <fxbr.pfb
+fxbr-xb-24 LinBiolinum "xb24Encoding ReEncodeFont" <xb-24.enc <fxbr.pfb
+fxbr-xb-25 LinBiolinum "xb25Encoding ReEncodeFont" <xb-25.enc <fxbr.pfb
+fxbr-xb-26 LinBiolinum "xb26Encoding ReEncodeFont" <xb-26.enc <fxbr.pfb
+fxbr-xb-27 LinBiolinum "xb27Encoding ReEncodeFont" <xb-27.enc <fxbr.pfb
+fxbr-xb-2c LinBiolinum "xb2CEncoding ReEncodeFont" <xb-2c.enc <fxbr.pfb
+fxbr-xb-8x LinBiolinum "xbExpertEncoding ReEncodeFont" <xb-8x.enc <fxbr.pfb
+fxbr-xb-a7 LinBiolinum "xbA7Encoding ReEncodeFont" <xb-a7.enc <fxbr.pfb
+fxbr-xb-e0 LinBiolinum "xbE0Encoding ReEncodeFont" <xb-e0.enc <fxbr.pfb
+fxbr-xb-e1 LinBiolinum "xbE1Encoding ReEncodeFont" <xb-e1.enc <fxbr.pfb
+fxbr-xb-f6 LinBiolinum "xbF6Encoding ReEncodeFont" <xb-f6.enc <fxbr.pfb
+fxbr-xb-fb LinBiolinum "xbFBEncoding ReEncodeFont" <xb-fb.enc <fxbr.pfb
+fxbr-xb-ff LinBiolinum "xbFFEncoding ReEncodeFont" <xb-ff.enc <fxbr.pfb
+fxbr-xb-t1 LinBiolinum "xbT1Encoding ReEncodeFont" <xb-t1.enc <fxbr.pfb
+fxbr-xb-ts1 LinBiolinum "xbTS1Encoding ReEncodeFont" <xb-ts1.enc <fxbr.pfb
 fxlb-8r LinLibertineB "TeXBase1Encoding ReEncodeFont" <8r.enc <fxlb.pfb
 fxlb-xl-00 LinLibertineB "xl00Encoding ReEncodeFont" <xl-00.enc <fxlb.pfb
 fxlb-xl-01 LinLibertineB "xl01Encoding ReEncodeFont" <xl-01.enc <fxlb.pfb
@@ -2569,15 +2630,13 @@ fxlb-xl-27 LinLibertineB "xl27Encoding ReEncodeFont" <xl-27.enc <fxlb.pfb
 fxlb-xl-2c LinLibertineB "xl2CEncoding ReEncodeFont" <xl-2c.enc <fxlb.pfb
 fxlb-xl-8x LinLibertineB "xlExpertEncoding ReEncodeFont" <xl-8x.enc <fxlb.pfb
 fxlb-xl-a7 LinLibertineB "xlA7Encoding ReEncodeFont" <xl-a7.enc <fxlb.pfb
-fxlb-xl-circle LinLibertineB "xlCircleEncoding ReEncodeFont" <xl-circle.enc <fxlb.pfb
+fxlb-xl-circle LinLibertineB "fontinst-autoenc-xl-circle ReEncodeFont" <xl-circle.enc <fxlb.pfb
 fxlb-xl-e0 LinLibertineB "xlE0Encoding ReEncodeFont" <xl-e0.enc <fxlb.pfb
 fxlb-xl-e1 LinLibertineB "xlE1Encoding ReEncodeFont" <xl-e1.enc <fxlb.pfb
 fxlb-xl-f6 LinLibertineB "xlF6Encoding ReEncodeFont" <xl-f6.enc <fxlb.pfb
 fxlb-xl-fb LinLibertineB "xlFBEncoding ReEncodeFont" <xl-fb.enc <fxlb.pfb
 fxlb-xl-ff LinLibertineB "xlFFEncoding ReEncodeFont" <xl-ff.enc <fxlb.pfb
 fxlb-xl-infsup LinLibertineB "xlinfsupEncoding ReEncodeFont" <xl-infsup.enc <fxlb.pfb
-fxlb-xl-lgi LinLibertineB "xlIbycusHTGEncoding ReEncodeFont" <xl-lgi.enc <fxlb.pfb
-fxlb-xl-lgr LinLibertineB "xlLGREncoding ReEncodeFont" <xl-lgr.enc <fxlb.pfb
 fxlb-xl-t1 LinLibertineB "xlT1Encoding ReEncodeFont" <xl-t1.enc <fxlb.pfb
 fxlb-xl-ts1 LinLibertineB "xlTS1Encoding ReEncodeFont" <xl-ts1.enc <fxlb.pfb
 fxlbi-8r LinLibertineBI "TeXBase1Encoding ReEncodeFont" <8r.enc <fxlbi.pfb
@@ -2603,15 +2662,13 @@ fxlbi-xl-27 LinLibertineBI "xl27Encoding ReEncodeFont" <xl-27.enc <fxlbi.pfb
 fxlbi-xl-2c LinLibertineBI "xl2CEncoding ReEncodeFont" <xl-2c.enc <fxlbi.pfb
 fxlbi-xl-8x LinLibertineBI "xlExpertEncoding ReEncodeFont" <xl-8x.enc <fxlbi.pfb
 fxlbi-xl-a7 LinLibertineBI "xlA7Encoding ReEncodeFont" <xl-a7.enc <fxlbi.pfb
-fxlbi-xl-circle LinLibertineBI "xlCircleEncoding ReEncodeFont" <xl-circle.enc <fxlbi.pfb
+fxlbi-xl-circle LinLibertineBI "fontinst-autoenc-xl-circle ReEncodeFont" <xl-circle.enc <fxlbi.pfb
 fxlbi-xl-e0 LinLibertineBI "xlE0Encoding ReEncodeFont" <xl-e0.enc <fxlbi.pfb
 fxlbi-xl-e1 LinLibertineBI "xlE1Encoding ReEncodeFont" <xl-e1.enc <fxlbi.pfb
 fxlbi-xl-f6 LinLibertineBI "xlF6Encoding ReEncodeFont" <xl-f6.enc <fxlbi.pfb
 fxlbi-xl-fb LinLibertineBI "xlFBEncoding ReEncodeFont" <xl-fb.enc <fxlbi.pfb
 fxlbi-xl-ff LinLibertineBI "xlFFEncoding ReEncodeFont" <xl-ff.enc <fxlbi.pfb
 fxlbi-xl-infsup LinLibertineBI "xlinfsupEncoding ReEncodeFont" <xl-infsup.enc <fxlbi.pfb
-fxlbi-xl-lgi LinLibertineBI "xlIbycusHTGEncoding ReEncodeFont" <xl-lgi.enc <fxlbi.pfb
-fxlbi-xl-lgr LinLibertineBI "xlLGREncoding ReEncodeFont" <xl-lgr.enc <fxlbi.pfb
 fxlbi-xl-t1 LinLibertineBI "xlT1Encoding ReEncodeFont" <xl-t1.enc <fxlbi.pfb
 fxlbi-xl-ts1 LinLibertineBI "xlTS1Encoding ReEncodeFont" <xl-ts1.enc <fxlbi.pfb
 fxlr-8r LinLibertine "TeXBase1Encoding ReEncodeFont" <8r.enc <fxlr.pfb
@@ -2637,15 +2694,13 @@ fxlr-xl-27 LinLibertine "xl27Encoding ReEncodeFont" <xl-27.enc <fxlr.pfb
 fxlr-xl-2c LinLibertine "xl2CEncoding ReEncodeFont" <xl-2c.enc <fxlr.pfb
 fxlr-xl-8x LinLibertine "xlExpertEncoding ReEncodeFont" <xl-8x.enc <fxlr.pfb
 fxlr-xl-a7 LinLibertine "xlA7Encoding ReEncodeFont" <xl-a7.enc <fxlr.pfb
-fxlr-xl-circle LinLibertine "xlCircleEncoding ReEncodeFont" <xl-circle.enc <fxlr.pfb
+fxlr-xl-circle LinLibertine "fontinst-autoenc-xl-circle ReEncodeFont" <xl-circle.enc <fxlr.pfb
 fxlr-xl-e0 LinLibertine "xlE0Encoding ReEncodeFont" <xl-e0.enc <fxlr.pfb
 fxlr-xl-e1 LinLibertine "xlE1Encoding ReEncodeFont" <xl-e1.enc <fxlr.pfb
 fxlr-xl-f6 LinLibertine "xlF6Encoding ReEncodeFont" <xl-f6.enc <fxlr.pfb
 fxlr-xl-fb LinLibertine "xlFBEncoding ReEncodeFont" <xl-fb.enc <fxlr.pfb
 fxlr-xl-ff LinLibertine "xlFFEncoding ReEncodeFont" <xl-ff.enc <fxlr.pfb
 fxlr-xl-infsup LinLibertine "xlinfsupEncoding ReEncodeFont" <xl-infsup.enc <fxlr.pfb
-fxlr-xl-lgi LinLibertine "xlIbycusHTGEncoding ReEncodeFont" <xl-lgi.enc <fxlr.pfb
-fxlr-xl-lgr LinLibertine "xlLGREncoding ReEncodeFont" <xl-lgr.enc <fxlr.pfb
 fxlr-xl-t1 LinLibertine "xlT1Encoding ReEncodeFont" <xl-t1.enc <fxlr.pfb
 fxlr-xl-ts1 LinLibertine "xlTS1Encoding ReEncodeFont" <xl-ts1.enc <fxlr.pfb
 fxlri-8r LinLibertineI "TeXBase1Encoding ReEncodeFont" <8r.enc <fxlri.pfb
@@ -2677,8 +2732,6 @@ fxlri-xl-f6 LinLibertineI "xlF6Encoding ReEncodeFont" <xl-f6.enc <fxlri.pfb
 fxlri-xl-fb LinLibertineI "xlFBEncoding ReEncodeFont" <xl-fb.enc <fxlri.pfb
 fxlri-xl-ff LinLibertineI "xlFFEncoding ReEncodeFont" <xl-ff.enc <fxlri.pfb
 fxlri-xl-infsup LinLibertineI "xlinfsupEncoding ReEncodeFont" <xl-infsup.enc <fxlri.pfb
-fxlri-xl-lgi LinLibertineI "xlIbycusHTGEncoding ReEncodeFont" <xl-lgi.enc <fxlri.pfb
-fxlri-xl-lgr LinLibertineI "xlLGREncoding ReEncodeFont" <xl-lgr.enc <fxlri.pfb
 fxlri-xl-t1 LinLibertineI "xlT1Encoding ReEncodeFont" <xl-t1.enc <fxlri.pfb
 fxlri-xl-ts1 LinLibertineI "xlTS1Encoding ReEncodeFont" <xl-ts1.enc <fxlri.pfb
 gartemisiab6r GFSArtemisia-Bold "artemisiael ReEncodeFont" <artemisiael.enc <GFSArtemisia-Bold.pfb
@@ -4020,7 +4073,7 @@ jkpexa Kp--M-Exa-Regular <jkpexa.pfb
 jkpkbsc Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkpkbsc.pfb
 jkpkbscsl Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpkbsc.pfb
 jkpkbxsc Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-large-sc.enc <jkpkbsc.pfb
-jkpkbxscsl Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpkbsc.pfb
+jkpkbxscsl Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpkbsc.pfb 
 jkpkmsc Kp-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkpkmsc.pfb
 jkpkmscsl Kp-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpkmsc.pfb
 jkplbex Kp-Light-M-Ex-Medium <jkplbex.pfb
@@ -4089,7 +4142,7 @@ jkpmia Kp--M-Regular <jkpmia.pfb
 jkpmit8r Kp-Italic <8r.enc <jkpmit8a.pfb "TeXBase1Encoding ReEncodeFont" 
 jkpmitc Kp-Companion-Italic <jkpmitc.pfb
 jkpmite Kp-Expert-Italic "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpmite.pfb
-jkpmn8r Kp-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpmn8a.pfb
+jkpmn8r Kp-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpmn8a.pfb 
 jkpmnc Kp-Companion-Regular <jkpmnc.pfb
 jkpmne Kp-Expert-Regular "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpmne.pfb
 jkpmsc8r Kp-SmallCaps-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpmsc8a.pfb
diff --git a/Master/texmf/fonts/map/dvips/updmap/psfonts.map b/Master/texmf/fonts/map/dvips/updmap/psfonts.map
index 48f7022f80e..971b3b2958a 100644
--- a/Master/texmf/fonts/map/dvips/updmap/psfonts.map
+++ b/Master/texmf/fonts/map/dvips/updmap/psfonts.map
@@ -3,6 +3,7 @@
 %   and run updmap to recreate this file.
 % A log of the updmap run that has created this file is available here:
 %   /tmp/web2c/updmap.log
+
 ASCII ASCII <ASCII.pfb
 Acorn AcornInitials <Acorn.pfb
 AlphaDia ChessAlphaDiagram <AlphaDia.pfb
@@ -2242,8 +2243,8 @@ fgdb8z Garuda-Bold "C90Encoding ReEncodeFont" <c90.enc <garuda_b.pfb
 fgdbo8z Garuda-BoldOblique "C90Encoding ReEncodeFont" <c90.enc <garuda_bo.pfb
 fgdo8z Garuda-Oblique "C90Encoding ReEncodeFont" <c90.enc <garuda_o.pfb
 fgdr8z Garuda "C90Encoding ReEncodeFont" <c90.enc <garuda.pfb
-fgeit10 TeX-fgeit10 <fgeit10.pfb
-fgerm10 TeX-fgerm10 <fgerm10.pfb
+fgeit10 fgeit10 <fgeit10.pfb
+fgerm10 fgerm10 <fgerm10.pfb
 fibb84 FIBB84 <fibb84.pfb
 fibo84 IbycusHTG-Regular ".167 SlantFont" <fibr84.pfb
 fibr84 IbycusHTG-Regular <fibr84.pfb
@@ -2546,6 +2547,66 @@ fvsb8r BeraSans-Bold "TeXBase1Encoding ReEncodeFont" <8r.enc <fvsb8a.pfb
 fvsbo8r BeraSans-BoldOblique "TeXBase1Encoding ReEncodeFont" <8r.enc <fvsbo8a.pfb
 fvsr8r BeraSans-Roman "TeXBase1Encoding ReEncodeFont" <8r.enc <fvsr8a.pfb
 fvsro8r BeraSans-Oblique "TeXBase1Encoding ReEncodeFont" <8r.enc <fvsro8a.pfb
+fxbb-8r LinBiolinumB "TeXBase1Encoding ReEncodeFont" <8r.enc <fxbb.pfb
+fxbb-xb-00 LinBiolinumB "xb00Encoding ReEncodeFont" <xb-00.enc <fxbb.pfb
+fxbb-xb-01 LinBiolinumB "xb01Encoding ReEncodeFont" <xb-01.enc <fxbb.pfb
+fxbb-xb-02 LinBiolinumB "xb02Encoding ReEncodeFont" <xb-02.enc <fxbb.pfb
+fxbb-xb-03 LinBiolinumB "xb03Encoding ReEncodeFont" <xb-03.enc <fxbb.pfb
+fxbb-xb-04 LinBiolinumB "xb04Encoding ReEncodeFont" <xb-04.enc <fxbb.pfb
+fxbb-xb-05 LinBiolinumB "xb05Encoding ReEncodeFont" <xb-05.enc <fxbb.pfb
+fxbb-xb-06 LinBiolinumB "xb06Encoding ReEncodeFont" <xb-06.enc <fxbb.pfb
+fxbb-xb-07 LinBiolinumB "xb07Encoding ReEncodeFont" <xb-07.enc <fxbb.pfb
+fxbb-xb-09 LinBiolinumB "xb09Encoding ReEncodeFont" <xb-09.enc <fxbb.pfb
+fxbb-xb-1e LinBiolinumB "xb1EEncoding ReEncodeFont" <xb-1e.enc <fxbb.pfb
+fxbb-xb-1f LinBiolinumB "xb1FEncoding ReEncodeFont" <xb-1f.enc <fxbb.pfb
+fxbb-xb-20 LinBiolinumB "xb20Encoding ReEncodeFont" <xb-20.enc <fxbb.pfb
+fxbb-xb-21 LinBiolinumB "xb21Encoding ReEncodeFont" <xb-21.enc <fxbb.pfb
+fxbb-xb-22 LinBiolinumB "xb22Encoding ReEncodeFont" <xb-22.enc <fxbb.pfb
+fxbb-xb-23 LinBiolinumB "xb23Encoding ReEncodeFont" <xb-23.enc <fxbb.pfb
+fxbb-xb-24 LinBiolinumB "xb24Encoding ReEncodeFont" <xb-24.enc <fxbb.pfb
+fxbb-xb-25 LinBiolinumB "xb25Encoding ReEncodeFont" <xb-25.enc <fxbb.pfb
+fxbb-xb-26 LinBiolinumB "xb26Encoding ReEncodeFont" <xb-26.enc <fxbb.pfb
+fxbb-xb-27 LinBiolinumB "xb27Encoding ReEncodeFont" <xb-27.enc <fxbb.pfb
+fxbb-xb-2c LinBiolinumB "xb2CEncoding ReEncodeFont" <xb-2c.enc <fxbb.pfb
+fxbb-xb-8x LinBiolinumB "xbExpertEncoding ReEncodeFont" <xb-8x.enc <fxbb.pfb
+fxbb-xb-a7 LinBiolinumB "xbA7Encoding ReEncodeFont" <xb-a7.enc <fxbb.pfb
+fxbb-xb-e0 LinBiolinumB "xbE0Encoding ReEncodeFont" <xb-e0.enc <fxbb.pfb
+fxbb-xb-e1 LinBiolinumB "xbE1Encoding ReEncodeFont" <xb-e1.enc <fxbb.pfb
+fxbb-xb-f6 LinBiolinumB "xbF6Encoding ReEncodeFont" <xb-f6.enc <fxbb.pfb
+fxbb-xb-fb LinBiolinumB "xbFBEncoding ReEncodeFont" <xb-fb.enc <fxbb.pfb
+fxbb-xb-ff LinBiolinumB "xbFFEncoding ReEncodeFont" <xb-ff.enc <fxbb.pfb
+fxbb-xb-t1 LinBiolinumB "xbT1Encoding ReEncodeFont" <xb-t1.enc <fxbb.pfb
+fxbb-xb-ts1 LinBiolinumB "xbTS1Encoding ReEncodeFont" <xb-ts1.enc <fxbb.pfb
+fxbr-8r LinBiolinum "TeXBase1Encoding ReEncodeFont" <8r.enc <fxbr.pfb
+fxbr-xb-00 LinBiolinum "xb00Encoding ReEncodeFont" <xb-00.enc <fxbr.pfb
+fxbr-xb-01 LinBiolinum "xb01Encoding ReEncodeFont" <xb-01.enc <fxbr.pfb
+fxbr-xb-02 LinBiolinum "xb02Encoding ReEncodeFont" <xb-02.enc <fxbr.pfb
+fxbr-xb-03 LinBiolinum "xb03Encoding ReEncodeFont" <xb-03.enc <fxbr.pfb
+fxbr-xb-04 LinBiolinum "xb04Encoding ReEncodeFont" <xb-04.enc <fxbr.pfb
+fxbr-xb-05 LinBiolinum "xb05Encoding ReEncodeFont" <xb-05.enc <fxbr.pfb
+fxbr-xb-06 LinBiolinum "xb06Encoding ReEncodeFont" <xb-06.enc <fxbr.pfb
+fxbr-xb-07 LinBiolinum "xb07Encoding ReEncodeFont" <xb-07.enc <fxbr.pfb
+fxbr-xb-09 LinBiolinum "xb09Encoding ReEncodeFont" <xb-09.enc <fxbr.pfb
+fxbr-xb-1e LinBiolinum "xb1EEncoding ReEncodeFont" <xb-1e.enc <fxbr.pfb
+fxbr-xb-1f LinBiolinum "xb1FEncoding ReEncodeFont" <xb-1f.enc <fxbr.pfb
+fxbr-xb-20 LinBiolinum "xb20Encoding ReEncodeFont" <xb-20.enc <fxbr.pfb
+fxbr-xb-21 LinBiolinum "xb21Encoding ReEncodeFont" <xb-21.enc <fxbr.pfb
+fxbr-xb-22 LinBiolinum "xb22Encoding ReEncodeFont" <xb-22.enc <fxbr.pfb
+fxbr-xb-23 LinBiolinum "xb23Encoding ReEncodeFont" <xb-23.enc <fxbr.pfb
+fxbr-xb-24 LinBiolinum "xb24Encoding ReEncodeFont" <xb-24.enc <fxbr.pfb
+fxbr-xb-25 LinBiolinum "xb25Encoding ReEncodeFont" <xb-25.enc <fxbr.pfb
+fxbr-xb-26 LinBiolinum "xb26Encoding ReEncodeFont" <xb-26.enc <fxbr.pfb
+fxbr-xb-27 LinBiolinum "xb27Encoding ReEncodeFont" <xb-27.enc <fxbr.pfb
+fxbr-xb-2c LinBiolinum "xb2CEncoding ReEncodeFont" <xb-2c.enc <fxbr.pfb
+fxbr-xb-8x LinBiolinum "xbExpertEncoding ReEncodeFont" <xb-8x.enc <fxbr.pfb
+fxbr-xb-a7 LinBiolinum "xbA7Encoding ReEncodeFont" <xb-a7.enc <fxbr.pfb
+fxbr-xb-e0 LinBiolinum "xbE0Encoding ReEncodeFont" <xb-e0.enc <fxbr.pfb
+fxbr-xb-e1 LinBiolinum "xbE1Encoding ReEncodeFont" <xb-e1.enc <fxbr.pfb
+fxbr-xb-f6 LinBiolinum "xbF6Encoding ReEncodeFont" <xb-f6.enc <fxbr.pfb
+fxbr-xb-fb LinBiolinum "xbFBEncoding ReEncodeFont" <xb-fb.enc <fxbr.pfb
+fxbr-xb-ff LinBiolinum "xbFFEncoding ReEncodeFont" <xb-ff.enc <fxbr.pfb
+fxbr-xb-t1 LinBiolinum "xbT1Encoding ReEncodeFont" <xb-t1.enc <fxbr.pfb
+fxbr-xb-ts1 LinBiolinum "xbTS1Encoding ReEncodeFont" <xb-ts1.enc <fxbr.pfb
 fxlb-8r LinLibertineB "TeXBase1Encoding ReEncodeFont" <8r.enc <fxlb.pfb
 fxlb-xl-00 LinLibertineB "xl00Encoding ReEncodeFont" <xl-00.enc <fxlb.pfb
 fxlb-xl-01 LinLibertineB "xl01Encoding ReEncodeFont" <xl-01.enc <fxlb.pfb
@@ -2569,15 +2630,13 @@ fxlb-xl-27 LinLibertineB "xl27Encoding ReEncodeFont" <xl-27.enc <fxlb.pfb
 fxlb-xl-2c LinLibertineB "xl2CEncoding ReEncodeFont" <xl-2c.enc <fxlb.pfb
 fxlb-xl-8x LinLibertineB "xlExpertEncoding ReEncodeFont" <xl-8x.enc <fxlb.pfb
 fxlb-xl-a7 LinLibertineB "xlA7Encoding ReEncodeFont" <xl-a7.enc <fxlb.pfb
-fxlb-xl-circle LinLibertineB "xlCircleEncoding ReEncodeFont" <xl-circle.enc <fxlb.pfb
+fxlb-xl-circle LinLibertineB "fontinst-autoenc-xl-circle ReEncodeFont" <xl-circle.enc <fxlb.pfb
 fxlb-xl-e0 LinLibertineB "xlE0Encoding ReEncodeFont" <xl-e0.enc <fxlb.pfb
 fxlb-xl-e1 LinLibertineB "xlE1Encoding ReEncodeFont" <xl-e1.enc <fxlb.pfb
 fxlb-xl-f6 LinLibertineB "xlF6Encoding ReEncodeFont" <xl-f6.enc <fxlb.pfb
 fxlb-xl-fb LinLibertineB "xlFBEncoding ReEncodeFont" <xl-fb.enc <fxlb.pfb
 fxlb-xl-ff LinLibertineB "xlFFEncoding ReEncodeFont" <xl-ff.enc <fxlb.pfb
 fxlb-xl-infsup LinLibertineB "xlinfsupEncoding ReEncodeFont" <xl-infsup.enc <fxlb.pfb
-fxlb-xl-lgi LinLibertineB "xlIbycusHTGEncoding ReEncodeFont" <xl-lgi.enc <fxlb.pfb
-fxlb-xl-lgr LinLibertineB "xlLGREncoding ReEncodeFont" <xl-lgr.enc <fxlb.pfb
 fxlb-xl-t1 LinLibertineB "xlT1Encoding ReEncodeFont" <xl-t1.enc <fxlb.pfb
 fxlb-xl-ts1 LinLibertineB "xlTS1Encoding ReEncodeFont" <xl-ts1.enc <fxlb.pfb
 fxlbi-8r LinLibertineBI "TeXBase1Encoding ReEncodeFont" <8r.enc <fxlbi.pfb
@@ -2603,15 +2662,13 @@ fxlbi-xl-27 LinLibertineBI "xl27Encoding ReEncodeFont" <xl-27.enc <fxlbi.pfb
 fxlbi-xl-2c LinLibertineBI "xl2CEncoding ReEncodeFont" <xl-2c.enc <fxlbi.pfb
 fxlbi-xl-8x LinLibertineBI "xlExpertEncoding ReEncodeFont" <xl-8x.enc <fxlbi.pfb
 fxlbi-xl-a7 LinLibertineBI "xlA7Encoding ReEncodeFont" <xl-a7.enc <fxlbi.pfb
-fxlbi-xl-circle LinLibertineBI "xlCircleEncoding ReEncodeFont" <xl-circle.enc <fxlbi.pfb
+fxlbi-xl-circle LinLibertineBI "fontinst-autoenc-xl-circle ReEncodeFont" <xl-circle.enc <fxlbi.pfb
 fxlbi-xl-e0 LinLibertineBI "xlE0Encoding ReEncodeFont" <xl-e0.enc <fxlbi.pfb
 fxlbi-xl-e1 LinLibertineBI "xlE1Encoding ReEncodeFont" <xl-e1.enc <fxlbi.pfb
 fxlbi-xl-f6 LinLibertineBI "xlF6Encoding ReEncodeFont" <xl-f6.enc <fxlbi.pfb
 fxlbi-xl-fb LinLibertineBI "xlFBEncoding ReEncodeFont" <xl-fb.enc <fxlbi.pfb
 fxlbi-xl-ff LinLibertineBI "xlFFEncoding ReEncodeFont" <xl-ff.enc <fxlbi.pfb
 fxlbi-xl-infsup LinLibertineBI "xlinfsupEncoding ReEncodeFont" <xl-infsup.enc <fxlbi.pfb
-fxlbi-xl-lgi LinLibertineBI "xlIbycusHTGEncoding ReEncodeFont" <xl-lgi.enc <fxlbi.pfb
-fxlbi-xl-lgr LinLibertineBI "xlLGREncoding ReEncodeFont" <xl-lgr.enc <fxlbi.pfb
 fxlbi-xl-t1 LinLibertineBI "xlT1Encoding ReEncodeFont" <xl-t1.enc <fxlbi.pfb
 fxlbi-xl-ts1 LinLibertineBI "xlTS1Encoding ReEncodeFont" <xl-ts1.enc <fxlbi.pfb
 fxlr-8r LinLibertine "TeXBase1Encoding ReEncodeFont" <8r.enc <fxlr.pfb
@@ -2637,15 +2694,13 @@ fxlr-xl-27 LinLibertine "xl27Encoding ReEncodeFont" <xl-27.enc <fxlr.pfb
 fxlr-xl-2c LinLibertine "xl2CEncoding ReEncodeFont" <xl-2c.enc <fxlr.pfb
 fxlr-xl-8x LinLibertine "xlExpertEncoding ReEncodeFont" <xl-8x.enc <fxlr.pfb
 fxlr-xl-a7 LinLibertine "xlA7Encoding ReEncodeFont" <xl-a7.enc <fxlr.pfb
-fxlr-xl-circle LinLibertine "xlCircleEncoding ReEncodeFont" <xl-circle.enc <fxlr.pfb
+fxlr-xl-circle LinLibertine "fontinst-autoenc-xl-circle ReEncodeFont" <xl-circle.enc <fxlr.pfb
 fxlr-xl-e0 LinLibertine "xlE0Encoding ReEncodeFont" <xl-e0.enc <fxlr.pfb
 fxlr-xl-e1 LinLibertine "xlE1Encoding ReEncodeFont" <xl-e1.enc <fxlr.pfb
 fxlr-xl-f6 LinLibertine "xlF6Encoding ReEncodeFont" <xl-f6.enc <fxlr.pfb
 fxlr-xl-fb LinLibertine "xlFBEncoding ReEncodeFont" <xl-fb.enc <fxlr.pfb
 fxlr-xl-ff LinLibertine "xlFFEncoding ReEncodeFont" <xl-ff.enc <fxlr.pfb
 fxlr-xl-infsup LinLibertine "xlinfsupEncoding ReEncodeFont" <xl-infsup.enc <fxlr.pfb
-fxlr-xl-lgi LinLibertine "xlIbycusHTGEncoding ReEncodeFont" <xl-lgi.enc <fxlr.pfb
-fxlr-xl-lgr LinLibertine "xlLGREncoding ReEncodeFont" <xl-lgr.enc <fxlr.pfb
 fxlr-xl-t1 LinLibertine "xlT1Encoding ReEncodeFont" <xl-t1.enc <fxlr.pfb
 fxlr-xl-ts1 LinLibertine "xlTS1Encoding ReEncodeFont" <xl-ts1.enc <fxlr.pfb
 fxlri-8r LinLibertineI "TeXBase1Encoding ReEncodeFont" <8r.enc <fxlri.pfb
@@ -2677,8 +2732,6 @@ fxlri-xl-f6 LinLibertineI "xlF6Encoding ReEncodeFont" <xl-f6.enc <fxlri.pfb
 fxlri-xl-fb LinLibertineI "xlFBEncoding ReEncodeFont" <xl-fb.enc <fxlri.pfb
 fxlri-xl-ff LinLibertineI "xlFFEncoding ReEncodeFont" <xl-ff.enc <fxlri.pfb
 fxlri-xl-infsup LinLibertineI "xlinfsupEncoding ReEncodeFont" <xl-infsup.enc <fxlri.pfb
-fxlri-xl-lgi LinLibertineI "xlIbycusHTGEncoding ReEncodeFont" <xl-lgi.enc <fxlri.pfb
-fxlri-xl-lgr LinLibertineI "xlLGREncoding ReEncodeFont" <xl-lgr.enc <fxlri.pfb
 fxlri-xl-t1 LinLibertineI "xlT1Encoding ReEncodeFont" <xl-t1.enc <fxlri.pfb
 fxlri-xl-ts1 LinLibertineI "xlTS1Encoding ReEncodeFont" <xl-ts1.enc <fxlri.pfb
 gartemisiab6r GFSArtemisia-Bold "artemisiael ReEncodeFont" <artemisiael.enc <GFSArtemisia-Bold.pfb
@@ -4020,7 +4073,7 @@ jkpexa Kp--M-Exa-Regular <jkpexa.pfb
 jkpkbsc Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkpkbsc.pfb
 jkpkbscsl Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpkbsc.pfb
 jkpkbxsc Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-large-sc.enc <jkpkbsc.pfb
-jkpkbxscsl Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpkbsc.pfb
+jkpkbxscsl Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpkbsc.pfb 
 jkpkmsc Kp-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkpkmsc.pfb
 jkpkmscsl Kp-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpkmsc.pfb
 jkplbex Kp-Light-M-Ex-Medium <jkplbex.pfb
@@ -4089,7 +4142,7 @@ jkpmia Kp--M-Regular <jkpmia.pfb
 jkpmit8r Kp-Italic <8r.enc <jkpmit8a.pfb "TeXBase1Encoding ReEncodeFont" 
 jkpmitc Kp-Companion-Italic <jkpmitc.pfb
 jkpmite Kp-Expert-Italic "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpmite.pfb
-jkpmn8r Kp-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpmn8a.pfb
+jkpmn8r Kp-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpmn8a.pfb 
 jkpmnc Kp-Companion-Regular <jkpmnc.pfb
 jkpmne Kp-Expert-Regular "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpmne.pfb
 jkpmsc8r Kp-SmallCaps-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpmsc8a.pfb
diff --git a/Master/texmf/fonts/map/dvips/updmap/psfonts_pk.map b/Master/texmf/fonts/map/dvips/updmap/psfonts_pk.map
index 1ad4196daf1..5e14dfc3472 100644
--- a/Master/texmf/fonts/map/dvips/updmap/psfonts_pk.map
+++ b/Master/texmf/fonts/map/dvips/updmap/psfonts_pk.map
@@ -3,6 +3,7 @@
 %   and run updmap to recreate this file.
 % A log of the updmap run that has created this file is available here:
 %   /tmp/web2c/updmap.log
+
 ASCII ASCII <ASCII.pfb
 Acorn AcornInitials <Acorn.pfb
 AlphaDia ChessAlphaDiagram <AlphaDia.pfb
@@ -1424,8 +1425,8 @@ fgdb8z Garuda-Bold "C90Encoding ReEncodeFont" <c90.enc <garuda_b.pfb
 fgdbo8z Garuda-BoldOblique "C90Encoding ReEncodeFont" <c90.enc <garuda_bo.pfb
 fgdo8z Garuda-Oblique "C90Encoding ReEncodeFont" <c90.enc <garuda_o.pfb
 fgdr8z Garuda "C90Encoding ReEncodeFont" <c90.enc <garuda.pfb
-fgeit10 TeX-fgeit10 <fgeit10.pfb
-fgerm10 TeX-fgerm10 <fgerm10.pfb
+fgeit10 fgeit10 <fgeit10.pfb
+fgerm10 fgerm10 <fgerm10.pfb
 foekfont <FoekFont.pfb
 fonetika <FonetikaDaniaPallaeRegular.pfb
 fonetikabold <FonetikaDaniaPallaeBold.pfb
@@ -1509,6 +1510,66 @@ fvsb8r BeraSans-Bold "TeXBase1Encoding ReEncodeFont" <8r.enc <fvsb8a.pfb
 fvsbo8r BeraSans-BoldOblique "TeXBase1Encoding ReEncodeFont" <8r.enc <fvsbo8a.pfb
 fvsr8r BeraSans-Roman "TeXBase1Encoding ReEncodeFont" <8r.enc <fvsr8a.pfb
 fvsro8r BeraSans-Oblique "TeXBase1Encoding ReEncodeFont" <8r.enc <fvsro8a.pfb
+fxbb-8r LinBiolinumB "TeXBase1Encoding ReEncodeFont" <8r.enc <fxbb.pfb
+fxbb-xb-00 LinBiolinumB "xb00Encoding ReEncodeFont" <xb-00.enc <fxbb.pfb
+fxbb-xb-01 LinBiolinumB "xb01Encoding ReEncodeFont" <xb-01.enc <fxbb.pfb
+fxbb-xb-02 LinBiolinumB "xb02Encoding ReEncodeFont" <xb-02.enc <fxbb.pfb
+fxbb-xb-03 LinBiolinumB "xb03Encoding ReEncodeFont" <xb-03.enc <fxbb.pfb
+fxbb-xb-04 LinBiolinumB "xb04Encoding ReEncodeFont" <xb-04.enc <fxbb.pfb
+fxbb-xb-05 LinBiolinumB "xb05Encoding ReEncodeFont" <xb-05.enc <fxbb.pfb
+fxbb-xb-06 LinBiolinumB "xb06Encoding ReEncodeFont" <xb-06.enc <fxbb.pfb
+fxbb-xb-07 LinBiolinumB "xb07Encoding ReEncodeFont" <xb-07.enc <fxbb.pfb
+fxbb-xb-09 LinBiolinumB "xb09Encoding ReEncodeFont" <xb-09.enc <fxbb.pfb
+fxbb-xb-1e LinBiolinumB "xb1EEncoding ReEncodeFont" <xb-1e.enc <fxbb.pfb
+fxbb-xb-1f LinBiolinumB "xb1FEncoding ReEncodeFont" <xb-1f.enc <fxbb.pfb
+fxbb-xb-20 LinBiolinumB "xb20Encoding ReEncodeFont" <xb-20.enc <fxbb.pfb
+fxbb-xb-21 LinBiolinumB "xb21Encoding ReEncodeFont" <xb-21.enc <fxbb.pfb
+fxbb-xb-22 LinBiolinumB "xb22Encoding ReEncodeFont" <xb-22.enc <fxbb.pfb
+fxbb-xb-23 LinBiolinumB "xb23Encoding ReEncodeFont" <xb-23.enc <fxbb.pfb
+fxbb-xb-24 LinBiolinumB "xb24Encoding ReEncodeFont" <xb-24.enc <fxbb.pfb
+fxbb-xb-25 LinBiolinumB "xb25Encoding ReEncodeFont" <xb-25.enc <fxbb.pfb
+fxbb-xb-26 LinBiolinumB "xb26Encoding ReEncodeFont" <xb-26.enc <fxbb.pfb
+fxbb-xb-27 LinBiolinumB "xb27Encoding ReEncodeFont" <xb-27.enc <fxbb.pfb
+fxbb-xb-2c LinBiolinumB "xb2CEncoding ReEncodeFont" <xb-2c.enc <fxbb.pfb
+fxbb-xb-8x LinBiolinumB "xbExpertEncoding ReEncodeFont" <xb-8x.enc <fxbb.pfb
+fxbb-xb-a7 LinBiolinumB "xbA7Encoding ReEncodeFont" <xb-a7.enc <fxbb.pfb
+fxbb-xb-e0 LinBiolinumB "xbE0Encoding ReEncodeFont" <xb-e0.enc <fxbb.pfb
+fxbb-xb-e1 LinBiolinumB "xbE1Encoding ReEncodeFont" <xb-e1.enc <fxbb.pfb
+fxbb-xb-f6 LinBiolinumB "xbF6Encoding ReEncodeFont" <xb-f6.enc <fxbb.pfb
+fxbb-xb-fb LinBiolinumB "xbFBEncoding ReEncodeFont" <xb-fb.enc <fxbb.pfb
+fxbb-xb-ff LinBiolinumB "xbFFEncoding ReEncodeFont" <xb-ff.enc <fxbb.pfb
+fxbb-xb-t1 LinBiolinumB "xbT1Encoding ReEncodeFont" <xb-t1.enc <fxbb.pfb
+fxbb-xb-ts1 LinBiolinumB "xbTS1Encoding ReEncodeFont" <xb-ts1.enc <fxbb.pfb
+fxbr-8r LinBiolinum "TeXBase1Encoding ReEncodeFont" <8r.enc <fxbr.pfb
+fxbr-xb-00 LinBiolinum "xb00Encoding ReEncodeFont" <xb-00.enc <fxbr.pfb
+fxbr-xb-01 LinBiolinum "xb01Encoding ReEncodeFont" <xb-01.enc <fxbr.pfb
+fxbr-xb-02 LinBiolinum "xb02Encoding ReEncodeFont" <xb-02.enc <fxbr.pfb
+fxbr-xb-03 LinBiolinum "xb03Encoding ReEncodeFont" <xb-03.enc <fxbr.pfb
+fxbr-xb-04 LinBiolinum "xb04Encoding ReEncodeFont" <xb-04.enc <fxbr.pfb
+fxbr-xb-05 LinBiolinum "xb05Encoding ReEncodeFont" <xb-05.enc <fxbr.pfb
+fxbr-xb-06 LinBiolinum "xb06Encoding ReEncodeFont" <xb-06.enc <fxbr.pfb
+fxbr-xb-07 LinBiolinum "xb07Encoding ReEncodeFont" <xb-07.enc <fxbr.pfb
+fxbr-xb-09 LinBiolinum "xb09Encoding ReEncodeFont" <xb-09.enc <fxbr.pfb
+fxbr-xb-1e LinBiolinum "xb1EEncoding ReEncodeFont" <xb-1e.enc <fxbr.pfb
+fxbr-xb-1f LinBiolinum "xb1FEncoding ReEncodeFont" <xb-1f.enc <fxbr.pfb
+fxbr-xb-20 LinBiolinum "xb20Encoding ReEncodeFont" <xb-20.enc <fxbr.pfb
+fxbr-xb-21 LinBiolinum "xb21Encoding ReEncodeFont" <xb-21.enc <fxbr.pfb
+fxbr-xb-22 LinBiolinum "xb22Encoding ReEncodeFont" <xb-22.enc <fxbr.pfb
+fxbr-xb-23 LinBiolinum "xb23Encoding ReEncodeFont" <xb-23.enc <fxbr.pfb
+fxbr-xb-24 LinBiolinum "xb24Encoding ReEncodeFont" <xb-24.enc <fxbr.pfb
+fxbr-xb-25 LinBiolinum "xb25Encoding ReEncodeFont" <xb-25.enc <fxbr.pfb
+fxbr-xb-26 LinBiolinum "xb26Encoding ReEncodeFont" <xb-26.enc <fxbr.pfb
+fxbr-xb-27 LinBiolinum "xb27Encoding ReEncodeFont" <xb-27.enc <fxbr.pfb
+fxbr-xb-2c LinBiolinum "xb2CEncoding ReEncodeFont" <xb-2c.enc <fxbr.pfb
+fxbr-xb-8x LinBiolinum "xbExpertEncoding ReEncodeFont" <xb-8x.enc <fxbr.pfb
+fxbr-xb-a7 LinBiolinum "xbA7Encoding ReEncodeFont" <xb-a7.enc <fxbr.pfb
+fxbr-xb-e0 LinBiolinum "xbE0Encoding ReEncodeFont" <xb-e0.enc <fxbr.pfb
+fxbr-xb-e1 LinBiolinum "xbE1Encoding ReEncodeFont" <xb-e1.enc <fxbr.pfb
+fxbr-xb-f6 LinBiolinum "xbF6Encoding ReEncodeFont" <xb-f6.enc <fxbr.pfb
+fxbr-xb-fb LinBiolinum "xbFBEncoding ReEncodeFont" <xb-fb.enc <fxbr.pfb
+fxbr-xb-ff LinBiolinum "xbFFEncoding ReEncodeFont" <xb-ff.enc <fxbr.pfb
+fxbr-xb-t1 LinBiolinum "xbT1Encoding ReEncodeFont" <xb-t1.enc <fxbr.pfb
+fxbr-xb-ts1 LinBiolinum "xbTS1Encoding ReEncodeFont" <xb-ts1.enc <fxbr.pfb
 fxlb-8r LinLibertineB "TeXBase1Encoding ReEncodeFont" <8r.enc <fxlb.pfb
 fxlb-xl-00 LinLibertineB "xl00Encoding ReEncodeFont" <xl-00.enc <fxlb.pfb
 fxlb-xl-01 LinLibertineB "xl01Encoding ReEncodeFont" <xl-01.enc <fxlb.pfb
@@ -1532,15 +1593,13 @@ fxlb-xl-27 LinLibertineB "xl27Encoding ReEncodeFont" <xl-27.enc <fxlb.pfb
 fxlb-xl-2c LinLibertineB "xl2CEncoding ReEncodeFont" <xl-2c.enc <fxlb.pfb
 fxlb-xl-8x LinLibertineB "xlExpertEncoding ReEncodeFont" <xl-8x.enc <fxlb.pfb
 fxlb-xl-a7 LinLibertineB "xlA7Encoding ReEncodeFont" <xl-a7.enc <fxlb.pfb
-fxlb-xl-circle LinLibertineB "xlCircleEncoding ReEncodeFont" <xl-circle.enc <fxlb.pfb
+fxlb-xl-circle LinLibertineB "fontinst-autoenc-xl-circle ReEncodeFont" <xl-circle.enc <fxlb.pfb
 fxlb-xl-e0 LinLibertineB "xlE0Encoding ReEncodeFont" <xl-e0.enc <fxlb.pfb
 fxlb-xl-e1 LinLibertineB "xlE1Encoding ReEncodeFont" <xl-e1.enc <fxlb.pfb
 fxlb-xl-f6 LinLibertineB "xlF6Encoding ReEncodeFont" <xl-f6.enc <fxlb.pfb
 fxlb-xl-fb LinLibertineB "xlFBEncoding ReEncodeFont" <xl-fb.enc <fxlb.pfb
 fxlb-xl-ff LinLibertineB "xlFFEncoding ReEncodeFont" <xl-ff.enc <fxlb.pfb
 fxlb-xl-infsup LinLibertineB "xlinfsupEncoding ReEncodeFont" <xl-infsup.enc <fxlb.pfb
-fxlb-xl-lgi LinLibertineB "xlIbycusHTGEncoding ReEncodeFont" <xl-lgi.enc <fxlb.pfb
-fxlb-xl-lgr LinLibertineB "xlLGREncoding ReEncodeFont" <xl-lgr.enc <fxlb.pfb
 fxlb-xl-t1 LinLibertineB "xlT1Encoding ReEncodeFont" <xl-t1.enc <fxlb.pfb
 fxlb-xl-ts1 LinLibertineB "xlTS1Encoding ReEncodeFont" <xl-ts1.enc <fxlb.pfb
 fxlbi-8r LinLibertineBI "TeXBase1Encoding ReEncodeFont" <8r.enc <fxlbi.pfb
@@ -1566,15 +1625,13 @@ fxlbi-xl-27 LinLibertineBI "xl27Encoding ReEncodeFont" <xl-27.enc <fxlbi.pfb
 fxlbi-xl-2c LinLibertineBI "xl2CEncoding ReEncodeFont" <xl-2c.enc <fxlbi.pfb
 fxlbi-xl-8x LinLibertineBI "xlExpertEncoding ReEncodeFont" <xl-8x.enc <fxlbi.pfb
 fxlbi-xl-a7 LinLibertineBI "xlA7Encoding ReEncodeFont" <xl-a7.enc <fxlbi.pfb
-fxlbi-xl-circle LinLibertineBI "xlCircleEncoding ReEncodeFont" <xl-circle.enc <fxlbi.pfb
+fxlbi-xl-circle LinLibertineBI "fontinst-autoenc-xl-circle ReEncodeFont" <xl-circle.enc <fxlbi.pfb
 fxlbi-xl-e0 LinLibertineBI "xlE0Encoding ReEncodeFont" <xl-e0.enc <fxlbi.pfb
 fxlbi-xl-e1 LinLibertineBI "xlE1Encoding ReEncodeFont" <xl-e1.enc <fxlbi.pfb
 fxlbi-xl-f6 LinLibertineBI "xlF6Encoding ReEncodeFont" <xl-f6.enc <fxlbi.pfb
 fxlbi-xl-fb LinLibertineBI "xlFBEncoding ReEncodeFont" <xl-fb.enc <fxlbi.pfb
 fxlbi-xl-ff LinLibertineBI "xlFFEncoding ReEncodeFont" <xl-ff.enc <fxlbi.pfb
 fxlbi-xl-infsup LinLibertineBI "xlinfsupEncoding ReEncodeFont" <xl-infsup.enc <fxlbi.pfb
-fxlbi-xl-lgi LinLibertineBI "xlIbycusHTGEncoding ReEncodeFont" <xl-lgi.enc <fxlbi.pfb
-fxlbi-xl-lgr LinLibertineBI "xlLGREncoding ReEncodeFont" <xl-lgr.enc <fxlbi.pfb
 fxlbi-xl-t1 LinLibertineBI "xlT1Encoding ReEncodeFont" <xl-t1.enc <fxlbi.pfb
 fxlbi-xl-ts1 LinLibertineBI "xlTS1Encoding ReEncodeFont" <xl-ts1.enc <fxlbi.pfb
 fxlr-8r LinLibertine "TeXBase1Encoding ReEncodeFont" <8r.enc <fxlr.pfb
@@ -1600,15 +1657,13 @@ fxlr-xl-27 LinLibertine "xl27Encoding ReEncodeFont" <xl-27.enc <fxlr.pfb
 fxlr-xl-2c LinLibertine "xl2CEncoding ReEncodeFont" <xl-2c.enc <fxlr.pfb
 fxlr-xl-8x LinLibertine "xlExpertEncoding ReEncodeFont" <xl-8x.enc <fxlr.pfb
 fxlr-xl-a7 LinLibertine "xlA7Encoding ReEncodeFont" <xl-a7.enc <fxlr.pfb
-fxlr-xl-circle LinLibertine "xlCircleEncoding ReEncodeFont" <xl-circle.enc <fxlr.pfb
+fxlr-xl-circle LinLibertine "fontinst-autoenc-xl-circle ReEncodeFont" <xl-circle.enc <fxlr.pfb
 fxlr-xl-e0 LinLibertine "xlE0Encoding ReEncodeFont" <xl-e0.enc <fxlr.pfb
 fxlr-xl-e1 LinLibertine "xlE1Encoding ReEncodeFont" <xl-e1.enc <fxlr.pfb
 fxlr-xl-f6 LinLibertine "xlF6Encoding ReEncodeFont" <xl-f6.enc <fxlr.pfb
 fxlr-xl-fb LinLibertine "xlFBEncoding ReEncodeFont" <xl-fb.enc <fxlr.pfb
 fxlr-xl-ff LinLibertine "xlFFEncoding ReEncodeFont" <xl-ff.enc <fxlr.pfb
 fxlr-xl-infsup LinLibertine "xlinfsupEncoding ReEncodeFont" <xl-infsup.enc <fxlr.pfb
-fxlr-xl-lgi LinLibertine "xlIbycusHTGEncoding ReEncodeFont" <xl-lgi.enc <fxlr.pfb
-fxlr-xl-lgr LinLibertine "xlLGREncoding ReEncodeFont" <xl-lgr.enc <fxlr.pfb
 fxlr-xl-t1 LinLibertine "xlT1Encoding ReEncodeFont" <xl-t1.enc <fxlr.pfb
 fxlr-xl-ts1 LinLibertine "xlTS1Encoding ReEncodeFont" <xl-ts1.enc <fxlr.pfb
 fxlri-8r LinLibertineI "TeXBase1Encoding ReEncodeFont" <8r.enc <fxlri.pfb
@@ -1640,8 +1695,6 @@ fxlri-xl-f6 LinLibertineI "xlF6Encoding ReEncodeFont" <xl-f6.enc <fxlri.pfb
 fxlri-xl-fb LinLibertineI "xlFBEncoding ReEncodeFont" <xl-fb.enc <fxlri.pfb
 fxlri-xl-ff LinLibertineI "xlFFEncoding ReEncodeFont" <xl-ff.enc <fxlri.pfb
 fxlri-xl-infsup LinLibertineI "xlinfsupEncoding ReEncodeFont" <xl-infsup.enc <fxlri.pfb
-fxlri-xl-lgi LinLibertineI "xlIbycusHTGEncoding ReEncodeFont" <xl-lgi.enc <fxlri.pfb
-fxlri-xl-lgr LinLibertineI "xlLGREncoding ReEncodeFont" <xl-lgr.enc <fxlri.pfb
 fxlri-xl-t1 LinLibertineI "xlT1Encoding ReEncodeFont" <xl-t1.enc <fxlri.pfb
 fxlri-xl-ts1 LinLibertineI "xlTS1Encoding ReEncodeFont" <xl-ts1.enc <fxlri.pfb
 gartemisiab6r GFSArtemisia-Bold "artemisiael ReEncodeFont" <artemisiael.enc <GFSArtemisia-Bold.pfb
@@ -2007,7 +2060,7 @@ jkpexa Kp--M-Exa-Regular <jkpexa.pfb
 jkpkbsc Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkpkbsc.pfb
 jkpkbscsl Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpkbsc.pfb
 jkpkbxsc Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-large-sc.enc <jkpkbsc.pfb
-jkpkbxscsl Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpkbsc.pfb
+jkpkbxscsl Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpkbsc.pfb 
 jkpkmsc Kp-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkpkmsc.pfb
 jkpkmscsl Kp-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpkmsc.pfb
 jkplbex Kp-Light-M-Ex-Medium <jkplbex.pfb
@@ -2076,7 +2129,7 @@ jkpmia Kp--M-Regular <jkpmia.pfb
 jkpmit8r Kp-Italic <8r.enc <jkpmit8a.pfb "TeXBase1Encoding ReEncodeFont" 
 jkpmitc Kp-Companion-Italic <jkpmitc.pfb
 jkpmite Kp-Expert-Italic "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpmite.pfb
-jkpmn8r Kp-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpmn8a.pfb
+jkpmn8r Kp-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpmn8a.pfb 
 jkpmnc Kp-Companion-Regular <jkpmnc.pfb
 jkpmne Kp-Expert-Regular "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpmne.pfb
 jkpmsc8r Kp-SmallCaps-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpmsc8a.pfb
diff --git a/Master/texmf/fonts/map/dvips/updmap/psfonts_t1.map b/Master/texmf/fonts/map/dvips/updmap/psfonts_t1.map
index 48f7022f80e..971b3b2958a 100644
--- a/Master/texmf/fonts/map/dvips/updmap/psfonts_t1.map
+++ b/Master/texmf/fonts/map/dvips/updmap/psfonts_t1.map
@@ -3,6 +3,7 @@
 %   and run updmap to recreate this file.
 % A log of the updmap run that has created this file is available here:
 %   /tmp/web2c/updmap.log
+
 ASCII ASCII <ASCII.pfb
 Acorn AcornInitials <Acorn.pfb
 AlphaDia ChessAlphaDiagram <AlphaDia.pfb
@@ -2242,8 +2243,8 @@ fgdb8z Garuda-Bold "C90Encoding ReEncodeFont" <c90.enc <garuda_b.pfb
 fgdbo8z Garuda-BoldOblique "C90Encoding ReEncodeFont" <c90.enc <garuda_bo.pfb
 fgdo8z Garuda-Oblique "C90Encoding ReEncodeFont" <c90.enc <garuda_o.pfb
 fgdr8z Garuda "C90Encoding ReEncodeFont" <c90.enc <garuda.pfb
-fgeit10 TeX-fgeit10 <fgeit10.pfb
-fgerm10 TeX-fgerm10 <fgerm10.pfb
+fgeit10 fgeit10 <fgeit10.pfb
+fgerm10 fgerm10 <fgerm10.pfb
 fibb84 FIBB84 <fibb84.pfb
 fibo84 IbycusHTG-Regular ".167 SlantFont" <fibr84.pfb
 fibr84 IbycusHTG-Regular <fibr84.pfb
@@ -2546,6 +2547,66 @@ fvsb8r BeraSans-Bold "TeXBase1Encoding ReEncodeFont" <8r.enc <fvsb8a.pfb
 fvsbo8r BeraSans-BoldOblique "TeXBase1Encoding ReEncodeFont" <8r.enc <fvsbo8a.pfb
 fvsr8r BeraSans-Roman "TeXBase1Encoding ReEncodeFont" <8r.enc <fvsr8a.pfb
 fvsro8r BeraSans-Oblique "TeXBase1Encoding ReEncodeFont" <8r.enc <fvsro8a.pfb
+fxbb-8r LinBiolinumB "TeXBase1Encoding ReEncodeFont" <8r.enc <fxbb.pfb
+fxbb-xb-00 LinBiolinumB "xb00Encoding ReEncodeFont" <xb-00.enc <fxbb.pfb
+fxbb-xb-01 LinBiolinumB "xb01Encoding ReEncodeFont" <xb-01.enc <fxbb.pfb
+fxbb-xb-02 LinBiolinumB "xb02Encoding ReEncodeFont" <xb-02.enc <fxbb.pfb
+fxbb-xb-03 LinBiolinumB "xb03Encoding ReEncodeFont" <xb-03.enc <fxbb.pfb
+fxbb-xb-04 LinBiolinumB "xb04Encoding ReEncodeFont" <xb-04.enc <fxbb.pfb
+fxbb-xb-05 LinBiolinumB "xb05Encoding ReEncodeFont" <xb-05.enc <fxbb.pfb
+fxbb-xb-06 LinBiolinumB "xb06Encoding ReEncodeFont" <xb-06.enc <fxbb.pfb
+fxbb-xb-07 LinBiolinumB "xb07Encoding ReEncodeFont" <xb-07.enc <fxbb.pfb
+fxbb-xb-09 LinBiolinumB "xb09Encoding ReEncodeFont" <xb-09.enc <fxbb.pfb
+fxbb-xb-1e LinBiolinumB "xb1EEncoding ReEncodeFont" <xb-1e.enc <fxbb.pfb
+fxbb-xb-1f LinBiolinumB "xb1FEncoding ReEncodeFont" <xb-1f.enc <fxbb.pfb
+fxbb-xb-20 LinBiolinumB "xb20Encoding ReEncodeFont" <xb-20.enc <fxbb.pfb
+fxbb-xb-21 LinBiolinumB "xb21Encoding ReEncodeFont" <xb-21.enc <fxbb.pfb
+fxbb-xb-22 LinBiolinumB "xb22Encoding ReEncodeFont" <xb-22.enc <fxbb.pfb
+fxbb-xb-23 LinBiolinumB "xb23Encoding ReEncodeFont" <xb-23.enc <fxbb.pfb
+fxbb-xb-24 LinBiolinumB "xb24Encoding ReEncodeFont" <xb-24.enc <fxbb.pfb
+fxbb-xb-25 LinBiolinumB "xb25Encoding ReEncodeFont" <xb-25.enc <fxbb.pfb
+fxbb-xb-26 LinBiolinumB "xb26Encoding ReEncodeFont" <xb-26.enc <fxbb.pfb
+fxbb-xb-27 LinBiolinumB "xb27Encoding ReEncodeFont" <xb-27.enc <fxbb.pfb
+fxbb-xb-2c LinBiolinumB "xb2CEncoding ReEncodeFont" <xb-2c.enc <fxbb.pfb
+fxbb-xb-8x LinBiolinumB "xbExpertEncoding ReEncodeFont" <xb-8x.enc <fxbb.pfb
+fxbb-xb-a7 LinBiolinumB "xbA7Encoding ReEncodeFont" <xb-a7.enc <fxbb.pfb
+fxbb-xb-e0 LinBiolinumB "xbE0Encoding ReEncodeFont" <xb-e0.enc <fxbb.pfb
+fxbb-xb-e1 LinBiolinumB "xbE1Encoding ReEncodeFont" <xb-e1.enc <fxbb.pfb
+fxbb-xb-f6 LinBiolinumB "xbF6Encoding ReEncodeFont" <xb-f6.enc <fxbb.pfb
+fxbb-xb-fb LinBiolinumB "xbFBEncoding ReEncodeFont" <xb-fb.enc <fxbb.pfb
+fxbb-xb-ff LinBiolinumB "xbFFEncoding ReEncodeFont" <xb-ff.enc <fxbb.pfb
+fxbb-xb-t1 LinBiolinumB "xbT1Encoding ReEncodeFont" <xb-t1.enc <fxbb.pfb
+fxbb-xb-ts1 LinBiolinumB "xbTS1Encoding ReEncodeFont" <xb-ts1.enc <fxbb.pfb
+fxbr-8r LinBiolinum "TeXBase1Encoding ReEncodeFont" <8r.enc <fxbr.pfb
+fxbr-xb-00 LinBiolinum "xb00Encoding ReEncodeFont" <xb-00.enc <fxbr.pfb
+fxbr-xb-01 LinBiolinum "xb01Encoding ReEncodeFont" <xb-01.enc <fxbr.pfb
+fxbr-xb-02 LinBiolinum "xb02Encoding ReEncodeFont" <xb-02.enc <fxbr.pfb
+fxbr-xb-03 LinBiolinum "xb03Encoding ReEncodeFont" <xb-03.enc <fxbr.pfb
+fxbr-xb-04 LinBiolinum "xb04Encoding ReEncodeFont" <xb-04.enc <fxbr.pfb
+fxbr-xb-05 LinBiolinum "xb05Encoding ReEncodeFont" <xb-05.enc <fxbr.pfb
+fxbr-xb-06 LinBiolinum "xb06Encoding ReEncodeFont" <xb-06.enc <fxbr.pfb
+fxbr-xb-07 LinBiolinum "xb07Encoding ReEncodeFont" <xb-07.enc <fxbr.pfb
+fxbr-xb-09 LinBiolinum "xb09Encoding ReEncodeFont" <xb-09.enc <fxbr.pfb
+fxbr-xb-1e LinBiolinum "xb1EEncoding ReEncodeFont" <xb-1e.enc <fxbr.pfb
+fxbr-xb-1f LinBiolinum "xb1FEncoding ReEncodeFont" <xb-1f.enc <fxbr.pfb
+fxbr-xb-20 LinBiolinum "xb20Encoding ReEncodeFont" <xb-20.enc <fxbr.pfb
+fxbr-xb-21 LinBiolinum "xb21Encoding ReEncodeFont" <xb-21.enc <fxbr.pfb
+fxbr-xb-22 LinBiolinum "xb22Encoding ReEncodeFont" <xb-22.enc <fxbr.pfb
+fxbr-xb-23 LinBiolinum "xb23Encoding ReEncodeFont" <xb-23.enc <fxbr.pfb
+fxbr-xb-24 LinBiolinum "xb24Encoding ReEncodeFont" <xb-24.enc <fxbr.pfb
+fxbr-xb-25 LinBiolinum "xb25Encoding ReEncodeFont" <xb-25.enc <fxbr.pfb
+fxbr-xb-26 LinBiolinum "xb26Encoding ReEncodeFont" <xb-26.enc <fxbr.pfb
+fxbr-xb-27 LinBiolinum "xb27Encoding ReEncodeFont" <xb-27.enc <fxbr.pfb
+fxbr-xb-2c LinBiolinum "xb2CEncoding ReEncodeFont" <xb-2c.enc <fxbr.pfb
+fxbr-xb-8x LinBiolinum "xbExpertEncoding ReEncodeFont" <xb-8x.enc <fxbr.pfb
+fxbr-xb-a7 LinBiolinum "xbA7Encoding ReEncodeFont" <xb-a7.enc <fxbr.pfb
+fxbr-xb-e0 LinBiolinum "xbE0Encoding ReEncodeFont" <xb-e0.enc <fxbr.pfb
+fxbr-xb-e1 LinBiolinum "xbE1Encoding ReEncodeFont" <xb-e1.enc <fxbr.pfb
+fxbr-xb-f6 LinBiolinum "xbF6Encoding ReEncodeFont" <xb-f6.enc <fxbr.pfb
+fxbr-xb-fb LinBiolinum "xbFBEncoding ReEncodeFont" <xb-fb.enc <fxbr.pfb
+fxbr-xb-ff LinBiolinum "xbFFEncoding ReEncodeFont" <xb-ff.enc <fxbr.pfb
+fxbr-xb-t1 LinBiolinum "xbT1Encoding ReEncodeFont" <xb-t1.enc <fxbr.pfb
+fxbr-xb-ts1 LinBiolinum "xbTS1Encoding ReEncodeFont" <xb-ts1.enc <fxbr.pfb
 fxlb-8r LinLibertineB "TeXBase1Encoding ReEncodeFont" <8r.enc <fxlb.pfb
 fxlb-xl-00 LinLibertineB "xl00Encoding ReEncodeFont" <xl-00.enc <fxlb.pfb
 fxlb-xl-01 LinLibertineB "xl01Encoding ReEncodeFont" <xl-01.enc <fxlb.pfb
@@ -2569,15 +2630,13 @@ fxlb-xl-27 LinLibertineB "xl27Encoding ReEncodeFont" <xl-27.enc <fxlb.pfb
 fxlb-xl-2c LinLibertineB "xl2CEncoding ReEncodeFont" <xl-2c.enc <fxlb.pfb
 fxlb-xl-8x LinLibertineB "xlExpertEncoding ReEncodeFont" <xl-8x.enc <fxlb.pfb
 fxlb-xl-a7 LinLibertineB "xlA7Encoding ReEncodeFont" <xl-a7.enc <fxlb.pfb
-fxlb-xl-circle LinLibertineB "xlCircleEncoding ReEncodeFont" <xl-circle.enc <fxlb.pfb
+fxlb-xl-circle LinLibertineB "fontinst-autoenc-xl-circle ReEncodeFont" <xl-circle.enc <fxlb.pfb
 fxlb-xl-e0 LinLibertineB "xlE0Encoding ReEncodeFont" <xl-e0.enc <fxlb.pfb
 fxlb-xl-e1 LinLibertineB "xlE1Encoding ReEncodeFont" <xl-e1.enc <fxlb.pfb
 fxlb-xl-f6 LinLibertineB "xlF6Encoding ReEncodeFont" <xl-f6.enc <fxlb.pfb
 fxlb-xl-fb LinLibertineB "xlFBEncoding ReEncodeFont" <xl-fb.enc <fxlb.pfb
 fxlb-xl-ff LinLibertineB "xlFFEncoding ReEncodeFont" <xl-ff.enc <fxlb.pfb
 fxlb-xl-infsup LinLibertineB "xlinfsupEncoding ReEncodeFont" <xl-infsup.enc <fxlb.pfb
-fxlb-xl-lgi LinLibertineB "xlIbycusHTGEncoding ReEncodeFont" <xl-lgi.enc <fxlb.pfb
-fxlb-xl-lgr LinLibertineB "xlLGREncoding ReEncodeFont" <xl-lgr.enc <fxlb.pfb
 fxlb-xl-t1 LinLibertineB "xlT1Encoding ReEncodeFont" <xl-t1.enc <fxlb.pfb
 fxlb-xl-ts1 LinLibertineB "xlTS1Encoding ReEncodeFont" <xl-ts1.enc <fxlb.pfb
 fxlbi-8r LinLibertineBI "TeXBase1Encoding ReEncodeFont" <8r.enc <fxlbi.pfb
@@ -2603,15 +2662,13 @@ fxlbi-xl-27 LinLibertineBI "xl27Encoding ReEncodeFont" <xl-27.enc <fxlbi.pfb
 fxlbi-xl-2c LinLibertineBI "xl2CEncoding ReEncodeFont" <xl-2c.enc <fxlbi.pfb
 fxlbi-xl-8x LinLibertineBI "xlExpertEncoding ReEncodeFont" <xl-8x.enc <fxlbi.pfb
 fxlbi-xl-a7 LinLibertineBI "xlA7Encoding ReEncodeFont" <xl-a7.enc <fxlbi.pfb
-fxlbi-xl-circle LinLibertineBI "xlCircleEncoding ReEncodeFont" <xl-circle.enc <fxlbi.pfb
+fxlbi-xl-circle LinLibertineBI "fontinst-autoenc-xl-circle ReEncodeFont" <xl-circle.enc <fxlbi.pfb
 fxlbi-xl-e0 LinLibertineBI "xlE0Encoding ReEncodeFont" <xl-e0.enc <fxlbi.pfb
 fxlbi-xl-e1 LinLibertineBI "xlE1Encoding ReEncodeFont" <xl-e1.enc <fxlbi.pfb
 fxlbi-xl-f6 LinLibertineBI "xlF6Encoding ReEncodeFont" <xl-f6.enc <fxlbi.pfb
 fxlbi-xl-fb LinLibertineBI "xlFBEncoding ReEncodeFont" <xl-fb.enc <fxlbi.pfb
 fxlbi-xl-ff LinLibertineBI "xlFFEncoding ReEncodeFont" <xl-ff.enc <fxlbi.pfb
 fxlbi-xl-infsup LinLibertineBI "xlinfsupEncoding ReEncodeFont" <xl-infsup.enc <fxlbi.pfb
-fxlbi-xl-lgi LinLibertineBI "xlIbycusHTGEncoding ReEncodeFont" <xl-lgi.enc <fxlbi.pfb
-fxlbi-xl-lgr LinLibertineBI "xlLGREncoding ReEncodeFont" <xl-lgr.enc <fxlbi.pfb
 fxlbi-xl-t1 LinLibertineBI "xlT1Encoding ReEncodeFont" <xl-t1.enc <fxlbi.pfb
 fxlbi-xl-ts1 LinLibertineBI "xlTS1Encoding ReEncodeFont" <xl-ts1.enc <fxlbi.pfb
 fxlr-8r LinLibertine "TeXBase1Encoding ReEncodeFont" <8r.enc <fxlr.pfb
@@ -2637,15 +2694,13 @@ fxlr-xl-27 LinLibertine "xl27Encoding ReEncodeFont" <xl-27.enc <fxlr.pfb
 fxlr-xl-2c LinLibertine "xl2CEncoding ReEncodeFont" <xl-2c.enc <fxlr.pfb
 fxlr-xl-8x LinLibertine "xlExpertEncoding ReEncodeFont" <xl-8x.enc <fxlr.pfb
 fxlr-xl-a7 LinLibertine "xlA7Encoding ReEncodeFont" <xl-a7.enc <fxlr.pfb
-fxlr-xl-circle LinLibertine "xlCircleEncoding ReEncodeFont" <xl-circle.enc <fxlr.pfb
+fxlr-xl-circle LinLibertine "fontinst-autoenc-xl-circle ReEncodeFont" <xl-circle.enc <fxlr.pfb
 fxlr-xl-e0 LinLibertine "xlE0Encoding ReEncodeFont" <xl-e0.enc <fxlr.pfb
 fxlr-xl-e1 LinLibertine "xlE1Encoding ReEncodeFont" <xl-e1.enc <fxlr.pfb
 fxlr-xl-f6 LinLibertine "xlF6Encoding ReEncodeFont" <xl-f6.enc <fxlr.pfb
 fxlr-xl-fb LinLibertine "xlFBEncoding ReEncodeFont" <xl-fb.enc <fxlr.pfb
 fxlr-xl-ff LinLibertine "xlFFEncoding ReEncodeFont" <xl-ff.enc <fxlr.pfb
 fxlr-xl-infsup LinLibertine "xlinfsupEncoding ReEncodeFont" <xl-infsup.enc <fxlr.pfb
-fxlr-xl-lgi LinLibertine "xlIbycusHTGEncoding ReEncodeFont" <xl-lgi.enc <fxlr.pfb
-fxlr-xl-lgr LinLibertine "xlLGREncoding ReEncodeFont" <xl-lgr.enc <fxlr.pfb
 fxlr-xl-t1 LinLibertine "xlT1Encoding ReEncodeFont" <xl-t1.enc <fxlr.pfb
 fxlr-xl-ts1 LinLibertine "xlTS1Encoding ReEncodeFont" <xl-ts1.enc <fxlr.pfb
 fxlri-8r LinLibertineI "TeXBase1Encoding ReEncodeFont" <8r.enc <fxlri.pfb
@@ -2677,8 +2732,6 @@ fxlri-xl-f6 LinLibertineI "xlF6Encoding ReEncodeFont" <xl-f6.enc <fxlri.pfb
 fxlri-xl-fb LinLibertineI "xlFBEncoding ReEncodeFont" <xl-fb.enc <fxlri.pfb
 fxlri-xl-ff LinLibertineI "xlFFEncoding ReEncodeFont" <xl-ff.enc <fxlri.pfb
 fxlri-xl-infsup LinLibertineI "xlinfsupEncoding ReEncodeFont" <xl-infsup.enc <fxlri.pfb
-fxlri-xl-lgi LinLibertineI "xlIbycusHTGEncoding ReEncodeFont" <xl-lgi.enc <fxlri.pfb
-fxlri-xl-lgr LinLibertineI "xlLGREncoding ReEncodeFont" <xl-lgr.enc <fxlri.pfb
 fxlri-xl-t1 LinLibertineI "xlT1Encoding ReEncodeFont" <xl-t1.enc <fxlri.pfb
 fxlri-xl-ts1 LinLibertineI "xlTS1Encoding ReEncodeFont" <xl-ts1.enc <fxlri.pfb
 gartemisiab6r GFSArtemisia-Bold "artemisiael ReEncodeFont" <artemisiael.enc <GFSArtemisia-Bold.pfb
@@ -4020,7 +4073,7 @@ jkpexa Kp--M-Exa-Regular <jkpexa.pfb
 jkpkbsc Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkpkbsc.pfb
 jkpkbscsl Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpkbsc.pfb
 jkpkbxsc Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-large-sc.enc <jkpkbsc.pfb
-jkpkbxscsl Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpkbsc.pfb
+jkpkbxscsl Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpkbsc.pfb 
 jkpkmsc Kp-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkpkmsc.pfb
 jkpkmscsl Kp-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpkmsc.pfb
 jkplbex Kp-Light-M-Ex-Medium <jkplbex.pfb
@@ -4089,7 +4142,7 @@ jkpmia Kp--M-Regular <jkpmia.pfb
 jkpmit8r Kp-Italic <8r.enc <jkpmit8a.pfb "TeXBase1Encoding ReEncodeFont" 
 jkpmitc Kp-Companion-Italic <jkpmitc.pfb
 jkpmite Kp-Expert-Italic "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpmite.pfb
-jkpmn8r Kp-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpmn8a.pfb
+jkpmn8r Kp-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpmn8a.pfb 
 jkpmnc Kp-Companion-Regular <jkpmnc.pfb
 jkpmne Kp-Expert-Regular "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpmne.pfb
 jkpmsc8r Kp-SmallCaps-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpmsc8a.pfb
diff --git a/Master/texmf/fonts/map/pdftex/updmap/pdftex.map b/Master/texmf/fonts/map/pdftex/updmap/pdftex.map
index 3fccbb83f60..f9bf38dd352 100644
--- a/Master/texmf/fonts/map/pdftex/updmap/pdftex.map
+++ b/Master/texmf/fonts/map/pdftex/updmap/pdftex.map
@@ -3,6 +3,7 @@
 %   and run updmap to recreate this file.
 % A log of the updmap run that has created this file is available here:
 %   /tmp/web2c/updmap.log
+
 ASCII ASCII <ASCII.pfb
 Acorn AcornInitials <Acorn.pfb
 AlphaDia ChessAlphaDiagram <AlphaDia.pfb
@@ -2242,8 +2243,8 @@ fgdb8z Garuda-Bold "C90Encoding ReEncodeFont" <c90.enc <garuda_b.pfb
 fgdbo8z Garuda-BoldOblique "C90Encoding ReEncodeFont" <c90.enc <garuda_bo.pfb
 fgdo8z Garuda-Oblique "C90Encoding ReEncodeFont" <c90.enc <garuda_o.pfb
 fgdr8z Garuda "C90Encoding ReEncodeFont" <c90.enc <garuda.pfb
-fgeit10 TeX-fgeit10 <fgeit10.pfb
-fgerm10 TeX-fgerm10 <fgerm10.pfb
+fgeit10 fgeit10 <fgeit10.pfb
+fgerm10 fgerm10 <fgerm10.pfb
 fibb84 FIBB84 <fibb84.pfb
 fibo84 IbycusHTG-Regular ".167 SlantFont" <fibr84.pfb
 fibr84 IbycusHTG-Regular <fibr84.pfb
@@ -2546,6 +2547,66 @@ fvsb8r BeraSans-Bold "TeXBase1Encoding ReEncodeFont" <8r.enc <fvsb8a.pfb
 fvsbo8r BeraSans-BoldOblique "TeXBase1Encoding ReEncodeFont" <8r.enc <fvsbo8a.pfb
 fvsr8r BeraSans-Roman "TeXBase1Encoding ReEncodeFont" <8r.enc <fvsr8a.pfb
 fvsro8r BeraSans-Oblique "TeXBase1Encoding ReEncodeFont" <8r.enc <fvsro8a.pfb
+fxbb-8r LinBiolinumB "TeXBase1Encoding ReEncodeFont" <8r.enc <fxbb.pfb
+fxbb-xb-00 LinBiolinumB "xb00Encoding ReEncodeFont" <xb-00.enc <fxbb.pfb
+fxbb-xb-01 LinBiolinumB "xb01Encoding ReEncodeFont" <xb-01.enc <fxbb.pfb
+fxbb-xb-02 LinBiolinumB "xb02Encoding ReEncodeFont" <xb-02.enc <fxbb.pfb
+fxbb-xb-03 LinBiolinumB "xb03Encoding ReEncodeFont" <xb-03.enc <fxbb.pfb
+fxbb-xb-04 LinBiolinumB "xb04Encoding ReEncodeFont" <xb-04.enc <fxbb.pfb
+fxbb-xb-05 LinBiolinumB "xb05Encoding ReEncodeFont" <xb-05.enc <fxbb.pfb
+fxbb-xb-06 LinBiolinumB "xb06Encoding ReEncodeFont" <xb-06.enc <fxbb.pfb
+fxbb-xb-07 LinBiolinumB "xb07Encoding ReEncodeFont" <xb-07.enc <fxbb.pfb
+fxbb-xb-09 LinBiolinumB "xb09Encoding ReEncodeFont" <xb-09.enc <fxbb.pfb
+fxbb-xb-1e LinBiolinumB "xb1EEncoding ReEncodeFont" <xb-1e.enc <fxbb.pfb
+fxbb-xb-1f LinBiolinumB "xb1FEncoding ReEncodeFont" <xb-1f.enc <fxbb.pfb
+fxbb-xb-20 LinBiolinumB "xb20Encoding ReEncodeFont" <xb-20.enc <fxbb.pfb
+fxbb-xb-21 LinBiolinumB "xb21Encoding ReEncodeFont" <xb-21.enc <fxbb.pfb
+fxbb-xb-22 LinBiolinumB "xb22Encoding ReEncodeFont" <xb-22.enc <fxbb.pfb
+fxbb-xb-23 LinBiolinumB "xb23Encoding ReEncodeFont" <xb-23.enc <fxbb.pfb
+fxbb-xb-24 LinBiolinumB "xb24Encoding ReEncodeFont" <xb-24.enc <fxbb.pfb
+fxbb-xb-25 LinBiolinumB "xb25Encoding ReEncodeFont" <xb-25.enc <fxbb.pfb
+fxbb-xb-26 LinBiolinumB "xb26Encoding ReEncodeFont" <xb-26.enc <fxbb.pfb
+fxbb-xb-27 LinBiolinumB "xb27Encoding ReEncodeFont" <xb-27.enc <fxbb.pfb
+fxbb-xb-2c LinBiolinumB "xb2CEncoding ReEncodeFont" <xb-2c.enc <fxbb.pfb
+fxbb-xb-8x LinBiolinumB "xbExpertEncoding ReEncodeFont" <xb-8x.enc <fxbb.pfb
+fxbb-xb-a7 LinBiolinumB "xbA7Encoding ReEncodeFont" <xb-a7.enc <fxbb.pfb
+fxbb-xb-e0 LinBiolinumB "xbE0Encoding ReEncodeFont" <xb-e0.enc <fxbb.pfb
+fxbb-xb-e1 LinBiolinumB "xbE1Encoding ReEncodeFont" <xb-e1.enc <fxbb.pfb
+fxbb-xb-f6 LinBiolinumB "xbF6Encoding ReEncodeFont" <xb-f6.enc <fxbb.pfb
+fxbb-xb-fb LinBiolinumB "xbFBEncoding ReEncodeFont" <xb-fb.enc <fxbb.pfb
+fxbb-xb-ff LinBiolinumB "xbFFEncoding ReEncodeFont" <xb-ff.enc <fxbb.pfb
+fxbb-xb-t1 LinBiolinumB "xbT1Encoding ReEncodeFont" <xb-t1.enc <fxbb.pfb
+fxbb-xb-ts1 LinBiolinumB "xbTS1Encoding ReEncodeFont" <xb-ts1.enc <fxbb.pfb
+fxbr-8r LinBiolinum "TeXBase1Encoding ReEncodeFont" <8r.enc <fxbr.pfb
+fxbr-xb-00 LinBiolinum "xb00Encoding ReEncodeFont" <xb-00.enc <fxbr.pfb
+fxbr-xb-01 LinBiolinum "xb01Encoding ReEncodeFont" <xb-01.enc <fxbr.pfb
+fxbr-xb-02 LinBiolinum "xb02Encoding ReEncodeFont" <xb-02.enc <fxbr.pfb
+fxbr-xb-03 LinBiolinum "xb03Encoding ReEncodeFont" <xb-03.enc <fxbr.pfb
+fxbr-xb-04 LinBiolinum "xb04Encoding ReEncodeFont" <xb-04.enc <fxbr.pfb
+fxbr-xb-05 LinBiolinum "xb05Encoding ReEncodeFont" <xb-05.enc <fxbr.pfb
+fxbr-xb-06 LinBiolinum "xb06Encoding ReEncodeFont" <xb-06.enc <fxbr.pfb
+fxbr-xb-07 LinBiolinum "xb07Encoding ReEncodeFont" <xb-07.enc <fxbr.pfb
+fxbr-xb-09 LinBiolinum "xb09Encoding ReEncodeFont" <xb-09.enc <fxbr.pfb
+fxbr-xb-1e LinBiolinum "xb1EEncoding ReEncodeFont" <xb-1e.enc <fxbr.pfb
+fxbr-xb-1f LinBiolinum "xb1FEncoding ReEncodeFont" <xb-1f.enc <fxbr.pfb
+fxbr-xb-20 LinBiolinum "xb20Encoding ReEncodeFont" <xb-20.enc <fxbr.pfb
+fxbr-xb-21 LinBiolinum "xb21Encoding ReEncodeFont" <xb-21.enc <fxbr.pfb
+fxbr-xb-22 LinBiolinum "xb22Encoding ReEncodeFont" <xb-22.enc <fxbr.pfb
+fxbr-xb-23 LinBiolinum "xb23Encoding ReEncodeFont" <xb-23.enc <fxbr.pfb
+fxbr-xb-24 LinBiolinum "xb24Encoding ReEncodeFont" <xb-24.enc <fxbr.pfb
+fxbr-xb-25 LinBiolinum "xb25Encoding ReEncodeFont" <xb-25.enc <fxbr.pfb
+fxbr-xb-26 LinBiolinum "xb26Encoding ReEncodeFont" <xb-26.enc <fxbr.pfb
+fxbr-xb-27 LinBiolinum "xb27Encoding ReEncodeFont" <xb-27.enc <fxbr.pfb
+fxbr-xb-2c LinBiolinum "xb2CEncoding ReEncodeFont" <xb-2c.enc <fxbr.pfb
+fxbr-xb-8x LinBiolinum "xbExpertEncoding ReEncodeFont" <xb-8x.enc <fxbr.pfb
+fxbr-xb-a7 LinBiolinum "xbA7Encoding ReEncodeFont" <xb-a7.enc <fxbr.pfb
+fxbr-xb-e0 LinBiolinum "xbE0Encoding ReEncodeFont" <xb-e0.enc <fxbr.pfb
+fxbr-xb-e1 LinBiolinum "xbE1Encoding ReEncodeFont" <xb-e1.enc <fxbr.pfb
+fxbr-xb-f6 LinBiolinum "xbF6Encoding ReEncodeFont" <xb-f6.enc <fxbr.pfb
+fxbr-xb-fb LinBiolinum "xbFBEncoding ReEncodeFont" <xb-fb.enc <fxbr.pfb
+fxbr-xb-ff LinBiolinum "xbFFEncoding ReEncodeFont" <xb-ff.enc <fxbr.pfb
+fxbr-xb-t1 LinBiolinum "xbT1Encoding ReEncodeFont" <xb-t1.enc <fxbr.pfb
+fxbr-xb-ts1 LinBiolinum "xbTS1Encoding ReEncodeFont" <xb-ts1.enc <fxbr.pfb
 fxlb-8r LinLibertineB "TeXBase1Encoding ReEncodeFont" <8r.enc <fxlb.pfb
 fxlb-xl-00 LinLibertineB "xl00Encoding ReEncodeFont" <xl-00.enc <fxlb.pfb
 fxlb-xl-01 LinLibertineB "xl01Encoding ReEncodeFont" <xl-01.enc <fxlb.pfb
@@ -2569,15 +2630,13 @@ fxlb-xl-27 LinLibertineB "xl27Encoding ReEncodeFont" <xl-27.enc <fxlb.pfb
 fxlb-xl-2c LinLibertineB "xl2CEncoding ReEncodeFont" <xl-2c.enc <fxlb.pfb
 fxlb-xl-8x LinLibertineB "xlExpertEncoding ReEncodeFont" <xl-8x.enc <fxlb.pfb
 fxlb-xl-a7 LinLibertineB "xlA7Encoding ReEncodeFont" <xl-a7.enc <fxlb.pfb
-fxlb-xl-circle LinLibertineB "xlCircleEncoding ReEncodeFont" <xl-circle.enc <fxlb.pfb
+fxlb-xl-circle LinLibertineB "fontinst-autoenc-xl-circle ReEncodeFont" <xl-circle.enc <fxlb.pfb
 fxlb-xl-e0 LinLibertineB "xlE0Encoding ReEncodeFont" <xl-e0.enc <fxlb.pfb
 fxlb-xl-e1 LinLibertineB "xlE1Encoding ReEncodeFont" <xl-e1.enc <fxlb.pfb
 fxlb-xl-f6 LinLibertineB "xlF6Encoding ReEncodeFont" <xl-f6.enc <fxlb.pfb
 fxlb-xl-fb LinLibertineB "xlFBEncoding ReEncodeFont" <xl-fb.enc <fxlb.pfb
 fxlb-xl-ff LinLibertineB "xlFFEncoding ReEncodeFont" <xl-ff.enc <fxlb.pfb
 fxlb-xl-infsup LinLibertineB "xlinfsupEncoding ReEncodeFont" <xl-infsup.enc <fxlb.pfb
-fxlb-xl-lgi LinLibertineB "xlIbycusHTGEncoding ReEncodeFont" <xl-lgi.enc <fxlb.pfb
-fxlb-xl-lgr LinLibertineB "xlLGREncoding ReEncodeFont" <xl-lgr.enc <fxlb.pfb
 fxlb-xl-t1 LinLibertineB "xlT1Encoding ReEncodeFont" <xl-t1.enc <fxlb.pfb
 fxlb-xl-ts1 LinLibertineB "xlTS1Encoding ReEncodeFont" <xl-ts1.enc <fxlb.pfb
 fxlbi-8r LinLibertineBI "TeXBase1Encoding ReEncodeFont" <8r.enc <fxlbi.pfb
@@ -2603,15 +2662,13 @@ fxlbi-xl-27 LinLibertineBI "xl27Encoding ReEncodeFont" <xl-27.enc <fxlbi.pfb
 fxlbi-xl-2c LinLibertineBI "xl2CEncoding ReEncodeFont" <xl-2c.enc <fxlbi.pfb
 fxlbi-xl-8x LinLibertineBI "xlExpertEncoding ReEncodeFont" <xl-8x.enc <fxlbi.pfb
 fxlbi-xl-a7 LinLibertineBI "xlA7Encoding ReEncodeFont" <xl-a7.enc <fxlbi.pfb
-fxlbi-xl-circle LinLibertineBI "xlCircleEncoding ReEncodeFont" <xl-circle.enc <fxlbi.pfb
+fxlbi-xl-circle LinLibertineBI "fontinst-autoenc-xl-circle ReEncodeFont" <xl-circle.enc <fxlbi.pfb
 fxlbi-xl-e0 LinLibertineBI "xlE0Encoding ReEncodeFont" <xl-e0.enc <fxlbi.pfb
 fxlbi-xl-e1 LinLibertineBI "xlE1Encoding ReEncodeFont" <xl-e1.enc <fxlbi.pfb
 fxlbi-xl-f6 LinLibertineBI "xlF6Encoding ReEncodeFont" <xl-f6.enc <fxlbi.pfb
 fxlbi-xl-fb LinLibertineBI "xlFBEncoding ReEncodeFont" <xl-fb.enc <fxlbi.pfb
 fxlbi-xl-ff LinLibertineBI "xlFFEncoding ReEncodeFont" <xl-ff.enc <fxlbi.pfb
 fxlbi-xl-infsup LinLibertineBI "xlinfsupEncoding ReEncodeFont" <xl-infsup.enc <fxlbi.pfb
-fxlbi-xl-lgi LinLibertineBI "xlIbycusHTGEncoding ReEncodeFont" <xl-lgi.enc <fxlbi.pfb
-fxlbi-xl-lgr LinLibertineBI "xlLGREncoding ReEncodeFont" <xl-lgr.enc <fxlbi.pfb
 fxlbi-xl-t1 LinLibertineBI "xlT1Encoding ReEncodeFont" <xl-t1.enc <fxlbi.pfb
 fxlbi-xl-ts1 LinLibertineBI "xlTS1Encoding ReEncodeFont" <xl-ts1.enc <fxlbi.pfb
 fxlr-8r LinLibertine "TeXBase1Encoding ReEncodeFont" <8r.enc <fxlr.pfb
@@ -2637,15 +2694,13 @@ fxlr-xl-27 LinLibertine "xl27Encoding ReEncodeFont" <xl-27.enc <fxlr.pfb
 fxlr-xl-2c LinLibertine "xl2CEncoding ReEncodeFont" <xl-2c.enc <fxlr.pfb
 fxlr-xl-8x LinLibertine "xlExpertEncoding ReEncodeFont" <xl-8x.enc <fxlr.pfb
 fxlr-xl-a7 LinLibertine "xlA7Encoding ReEncodeFont" <xl-a7.enc <fxlr.pfb
-fxlr-xl-circle LinLibertine "xlCircleEncoding ReEncodeFont" <xl-circle.enc <fxlr.pfb
+fxlr-xl-circle LinLibertine "fontinst-autoenc-xl-circle ReEncodeFont" <xl-circle.enc <fxlr.pfb
 fxlr-xl-e0 LinLibertine "xlE0Encoding ReEncodeFont" <xl-e0.enc <fxlr.pfb
 fxlr-xl-e1 LinLibertine "xlE1Encoding ReEncodeFont" <xl-e1.enc <fxlr.pfb
 fxlr-xl-f6 LinLibertine "xlF6Encoding ReEncodeFont" <xl-f6.enc <fxlr.pfb
 fxlr-xl-fb LinLibertine "xlFBEncoding ReEncodeFont" <xl-fb.enc <fxlr.pfb
 fxlr-xl-ff LinLibertine "xlFFEncoding ReEncodeFont" <xl-ff.enc <fxlr.pfb
 fxlr-xl-infsup LinLibertine "xlinfsupEncoding ReEncodeFont" <xl-infsup.enc <fxlr.pfb
-fxlr-xl-lgi LinLibertine "xlIbycusHTGEncoding ReEncodeFont" <xl-lgi.enc <fxlr.pfb
-fxlr-xl-lgr LinLibertine "xlLGREncoding ReEncodeFont" <xl-lgr.enc <fxlr.pfb
 fxlr-xl-t1 LinLibertine "xlT1Encoding ReEncodeFont" <xl-t1.enc <fxlr.pfb
 fxlr-xl-ts1 LinLibertine "xlTS1Encoding ReEncodeFont" <xl-ts1.enc <fxlr.pfb
 fxlri-8r LinLibertineI "TeXBase1Encoding ReEncodeFont" <8r.enc <fxlri.pfb
@@ -2677,8 +2732,6 @@ fxlri-xl-f6 LinLibertineI "xlF6Encoding ReEncodeFont" <xl-f6.enc <fxlri.pfb
 fxlri-xl-fb LinLibertineI "xlFBEncoding ReEncodeFont" <xl-fb.enc <fxlri.pfb
 fxlri-xl-ff LinLibertineI "xlFFEncoding ReEncodeFont" <xl-ff.enc <fxlri.pfb
 fxlri-xl-infsup LinLibertineI "xlinfsupEncoding ReEncodeFont" <xl-infsup.enc <fxlri.pfb
-fxlri-xl-lgi LinLibertineI "xlIbycusHTGEncoding ReEncodeFont" <xl-lgi.enc <fxlri.pfb
-fxlri-xl-lgr LinLibertineI "xlLGREncoding ReEncodeFont" <xl-lgr.enc <fxlri.pfb
 fxlri-xl-t1 LinLibertineI "xlT1Encoding ReEncodeFont" <xl-t1.enc <fxlri.pfb
 fxlri-xl-ts1 LinLibertineI "xlTS1Encoding ReEncodeFont" <xl-ts1.enc <fxlri.pfb
 gartemisiab6r GFSArtemisia-Bold "artemisiael ReEncodeFont" <artemisiael.enc <GFSArtemisia-Bold.pfb
@@ -4020,7 +4073,7 @@ jkpexa Kp--M-Exa-Regular <jkpexa.pfb
 jkpkbsc Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkpkbsc.pfb
 jkpkbscsl Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpkbsc.pfb
 jkpkbxsc Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-large-sc.enc <jkpkbsc.pfb
-jkpkbxscsl Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpkbsc.pfb
+jkpkbxscsl Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpkbsc.pfb 
 jkpkmsc Kp-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkpkmsc.pfb
 jkpkmscsl Kp-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpkmsc.pfb
 jkplbex Kp-Light-M-Ex-Medium <jkplbex.pfb
@@ -4089,7 +4142,7 @@ jkpmia Kp--M-Regular <jkpmia.pfb
 jkpmit8r Kp-Italic <8r.enc <jkpmit8a.pfb "TeXBase1Encoding ReEncodeFont" 
 jkpmitc Kp-Companion-Italic <jkpmitc.pfb
 jkpmite Kp-Expert-Italic "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpmite.pfb
-jkpmn8r Kp-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpmn8a.pfb
+jkpmn8r Kp-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpmn8a.pfb 
 jkpmnc Kp-Companion-Regular <jkpmnc.pfb
 jkpmne Kp-Expert-Regular "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpmne.pfb
 jkpmsc8r Kp-SmallCaps-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpmsc8a.pfb
diff --git a/Master/texmf/fonts/map/pdftex/updmap/pdftex_dl14.map b/Master/texmf/fonts/map/pdftex/updmap/pdftex_dl14.map
index 3fccbb83f60..f9bf38dd352 100644
--- a/Master/texmf/fonts/map/pdftex/updmap/pdftex_dl14.map
+++ b/Master/texmf/fonts/map/pdftex/updmap/pdftex_dl14.map
@@ -3,6 +3,7 @@
 %   and run updmap to recreate this file.
 % A log of the updmap run that has created this file is available here:
 %   /tmp/web2c/updmap.log
+
 ASCII ASCII <ASCII.pfb
 Acorn AcornInitials <Acorn.pfb
 AlphaDia ChessAlphaDiagram <AlphaDia.pfb
@@ -2242,8 +2243,8 @@ fgdb8z Garuda-Bold "C90Encoding ReEncodeFont" <c90.enc <garuda_b.pfb
 fgdbo8z Garuda-BoldOblique "C90Encoding ReEncodeFont" <c90.enc <garuda_bo.pfb
 fgdo8z Garuda-Oblique "C90Encoding ReEncodeFont" <c90.enc <garuda_o.pfb
 fgdr8z Garuda "C90Encoding ReEncodeFont" <c90.enc <garuda.pfb
-fgeit10 TeX-fgeit10 <fgeit10.pfb
-fgerm10 TeX-fgerm10 <fgerm10.pfb
+fgeit10 fgeit10 <fgeit10.pfb
+fgerm10 fgerm10 <fgerm10.pfb
 fibb84 FIBB84 <fibb84.pfb
 fibo84 IbycusHTG-Regular ".167 SlantFont" <fibr84.pfb
 fibr84 IbycusHTG-Regular <fibr84.pfb
@@ -2546,6 +2547,66 @@ fvsb8r BeraSans-Bold "TeXBase1Encoding ReEncodeFont" <8r.enc <fvsb8a.pfb
 fvsbo8r BeraSans-BoldOblique "TeXBase1Encoding ReEncodeFont" <8r.enc <fvsbo8a.pfb
 fvsr8r BeraSans-Roman "TeXBase1Encoding ReEncodeFont" <8r.enc <fvsr8a.pfb
 fvsro8r BeraSans-Oblique "TeXBase1Encoding ReEncodeFont" <8r.enc <fvsro8a.pfb
+fxbb-8r LinBiolinumB "TeXBase1Encoding ReEncodeFont" <8r.enc <fxbb.pfb
+fxbb-xb-00 LinBiolinumB "xb00Encoding ReEncodeFont" <xb-00.enc <fxbb.pfb
+fxbb-xb-01 LinBiolinumB "xb01Encoding ReEncodeFont" <xb-01.enc <fxbb.pfb
+fxbb-xb-02 LinBiolinumB "xb02Encoding ReEncodeFont" <xb-02.enc <fxbb.pfb
+fxbb-xb-03 LinBiolinumB "xb03Encoding ReEncodeFont" <xb-03.enc <fxbb.pfb
+fxbb-xb-04 LinBiolinumB "xb04Encoding ReEncodeFont" <xb-04.enc <fxbb.pfb
+fxbb-xb-05 LinBiolinumB "xb05Encoding ReEncodeFont" <xb-05.enc <fxbb.pfb
+fxbb-xb-06 LinBiolinumB "xb06Encoding ReEncodeFont" <xb-06.enc <fxbb.pfb
+fxbb-xb-07 LinBiolinumB "xb07Encoding ReEncodeFont" <xb-07.enc <fxbb.pfb
+fxbb-xb-09 LinBiolinumB "xb09Encoding ReEncodeFont" <xb-09.enc <fxbb.pfb
+fxbb-xb-1e LinBiolinumB "xb1EEncoding ReEncodeFont" <xb-1e.enc <fxbb.pfb
+fxbb-xb-1f LinBiolinumB "xb1FEncoding ReEncodeFont" <xb-1f.enc <fxbb.pfb
+fxbb-xb-20 LinBiolinumB "xb20Encoding ReEncodeFont" <xb-20.enc <fxbb.pfb
+fxbb-xb-21 LinBiolinumB "xb21Encoding ReEncodeFont" <xb-21.enc <fxbb.pfb
+fxbb-xb-22 LinBiolinumB "xb22Encoding ReEncodeFont" <xb-22.enc <fxbb.pfb
+fxbb-xb-23 LinBiolinumB "xb23Encoding ReEncodeFont" <xb-23.enc <fxbb.pfb
+fxbb-xb-24 LinBiolinumB "xb24Encoding ReEncodeFont" <xb-24.enc <fxbb.pfb
+fxbb-xb-25 LinBiolinumB "xb25Encoding ReEncodeFont" <xb-25.enc <fxbb.pfb
+fxbb-xb-26 LinBiolinumB "xb26Encoding ReEncodeFont" <xb-26.enc <fxbb.pfb
+fxbb-xb-27 LinBiolinumB "xb27Encoding ReEncodeFont" <xb-27.enc <fxbb.pfb
+fxbb-xb-2c LinBiolinumB "xb2CEncoding ReEncodeFont" <xb-2c.enc <fxbb.pfb
+fxbb-xb-8x LinBiolinumB "xbExpertEncoding ReEncodeFont" <xb-8x.enc <fxbb.pfb
+fxbb-xb-a7 LinBiolinumB "xbA7Encoding ReEncodeFont" <xb-a7.enc <fxbb.pfb
+fxbb-xb-e0 LinBiolinumB "xbE0Encoding ReEncodeFont" <xb-e0.enc <fxbb.pfb
+fxbb-xb-e1 LinBiolinumB "xbE1Encoding ReEncodeFont" <xb-e1.enc <fxbb.pfb
+fxbb-xb-f6 LinBiolinumB "xbF6Encoding ReEncodeFont" <xb-f6.enc <fxbb.pfb
+fxbb-xb-fb LinBiolinumB "xbFBEncoding ReEncodeFont" <xb-fb.enc <fxbb.pfb
+fxbb-xb-ff LinBiolinumB "xbFFEncoding ReEncodeFont" <xb-ff.enc <fxbb.pfb
+fxbb-xb-t1 LinBiolinumB "xbT1Encoding ReEncodeFont" <xb-t1.enc <fxbb.pfb
+fxbb-xb-ts1 LinBiolinumB "xbTS1Encoding ReEncodeFont" <xb-ts1.enc <fxbb.pfb
+fxbr-8r LinBiolinum "TeXBase1Encoding ReEncodeFont" <8r.enc <fxbr.pfb
+fxbr-xb-00 LinBiolinum "xb00Encoding ReEncodeFont" <xb-00.enc <fxbr.pfb
+fxbr-xb-01 LinBiolinum "xb01Encoding ReEncodeFont" <xb-01.enc <fxbr.pfb
+fxbr-xb-02 LinBiolinum "xb02Encoding ReEncodeFont" <xb-02.enc <fxbr.pfb
+fxbr-xb-03 LinBiolinum "xb03Encoding ReEncodeFont" <xb-03.enc <fxbr.pfb
+fxbr-xb-04 LinBiolinum "xb04Encoding ReEncodeFont" <xb-04.enc <fxbr.pfb
+fxbr-xb-05 LinBiolinum "xb05Encoding ReEncodeFont" <xb-05.enc <fxbr.pfb
+fxbr-xb-06 LinBiolinum "xb06Encoding ReEncodeFont" <xb-06.enc <fxbr.pfb
+fxbr-xb-07 LinBiolinum "xb07Encoding ReEncodeFont" <xb-07.enc <fxbr.pfb
+fxbr-xb-09 LinBiolinum "xb09Encoding ReEncodeFont" <xb-09.enc <fxbr.pfb
+fxbr-xb-1e LinBiolinum "xb1EEncoding ReEncodeFont" <xb-1e.enc <fxbr.pfb
+fxbr-xb-1f LinBiolinum "xb1FEncoding ReEncodeFont" <xb-1f.enc <fxbr.pfb
+fxbr-xb-20 LinBiolinum "xb20Encoding ReEncodeFont" <xb-20.enc <fxbr.pfb
+fxbr-xb-21 LinBiolinum "xb21Encoding ReEncodeFont" <xb-21.enc <fxbr.pfb
+fxbr-xb-22 LinBiolinum "xb22Encoding ReEncodeFont" <xb-22.enc <fxbr.pfb
+fxbr-xb-23 LinBiolinum "xb23Encoding ReEncodeFont" <xb-23.enc <fxbr.pfb
+fxbr-xb-24 LinBiolinum "xb24Encoding ReEncodeFont" <xb-24.enc <fxbr.pfb
+fxbr-xb-25 LinBiolinum "xb25Encoding ReEncodeFont" <xb-25.enc <fxbr.pfb
+fxbr-xb-26 LinBiolinum "xb26Encoding ReEncodeFont" <xb-26.enc <fxbr.pfb
+fxbr-xb-27 LinBiolinum "xb27Encoding ReEncodeFont" <xb-27.enc <fxbr.pfb
+fxbr-xb-2c LinBiolinum "xb2CEncoding ReEncodeFont" <xb-2c.enc <fxbr.pfb
+fxbr-xb-8x LinBiolinum "xbExpertEncoding ReEncodeFont" <xb-8x.enc <fxbr.pfb
+fxbr-xb-a7 LinBiolinum "xbA7Encoding ReEncodeFont" <xb-a7.enc <fxbr.pfb
+fxbr-xb-e0 LinBiolinum "xbE0Encoding ReEncodeFont" <xb-e0.enc <fxbr.pfb
+fxbr-xb-e1 LinBiolinum "xbE1Encoding ReEncodeFont" <xb-e1.enc <fxbr.pfb
+fxbr-xb-f6 LinBiolinum "xbF6Encoding ReEncodeFont" <xb-f6.enc <fxbr.pfb
+fxbr-xb-fb LinBiolinum "xbFBEncoding ReEncodeFont" <xb-fb.enc <fxbr.pfb
+fxbr-xb-ff LinBiolinum "xbFFEncoding ReEncodeFont" <xb-ff.enc <fxbr.pfb
+fxbr-xb-t1 LinBiolinum "xbT1Encoding ReEncodeFont" <xb-t1.enc <fxbr.pfb
+fxbr-xb-ts1 LinBiolinum "xbTS1Encoding ReEncodeFont" <xb-ts1.enc <fxbr.pfb
 fxlb-8r LinLibertineB "TeXBase1Encoding ReEncodeFont" <8r.enc <fxlb.pfb
 fxlb-xl-00 LinLibertineB "xl00Encoding ReEncodeFont" <xl-00.enc <fxlb.pfb
 fxlb-xl-01 LinLibertineB "xl01Encoding ReEncodeFont" <xl-01.enc <fxlb.pfb
@@ -2569,15 +2630,13 @@ fxlb-xl-27 LinLibertineB "xl27Encoding ReEncodeFont" <xl-27.enc <fxlb.pfb
 fxlb-xl-2c LinLibertineB "xl2CEncoding ReEncodeFont" <xl-2c.enc <fxlb.pfb
 fxlb-xl-8x LinLibertineB "xlExpertEncoding ReEncodeFont" <xl-8x.enc <fxlb.pfb
 fxlb-xl-a7 LinLibertineB "xlA7Encoding ReEncodeFont" <xl-a7.enc <fxlb.pfb
-fxlb-xl-circle LinLibertineB "xlCircleEncoding ReEncodeFont" <xl-circle.enc <fxlb.pfb
+fxlb-xl-circle LinLibertineB "fontinst-autoenc-xl-circle ReEncodeFont" <xl-circle.enc <fxlb.pfb
 fxlb-xl-e0 LinLibertineB "xlE0Encoding ReEncodeFont" <xl-e0.enc <fxlb.pfb
 fxlb-xl-e1 LinLibertineB "xlE1Encoding ReEncodeFont" <xl-e1.enc <fxlb.pfb
 fxlb-xl-f6 LinLibertineB "xlF6Encoding ReEncodeFont" <xl-f6.enc <fxlb.pfb
 fxlb-xl-fb LinLibertineB "xlFBEncoding ReEncodeFont" <xl-fb.enc <fxlb.pfb
 fxlb-xl-ff LinLibertineB "xlFFEncoding ReEncodeFont" <xl-ff.enc <fxlb.pfb
 fxlb-xl-infsup LinLibertineB "xlinfsupEncoding ReEncodeFont" <xl-infsup.enc <fxlb.pfb
-fxlb-xl-lgi LinLibertineB "xlIbycusHTGEncoding ReEncodeFont" <xl-lgi.enc <fxlb.pfb
-fxlb-xl-lgr LinLibertineB "xlLGREncoding ReEncodeFont" <xl-lgr.enc <fxlb.pfb
 fxlb-xl-t1 LinLibertineB "xlT1Encoding ReEncodeFont" <xl-t1.enc <fxlb.pfb
 fxlb-xl-ts1 LinLibertineB "xlTS1Encoding ReEncodeFont" <xl-ts1.enc <fxlb.pfb
 fxlbi-8r LinLibertineBI "TeXBase1Encoding ReEncodeFont" <8r.enc <fxlbi.pfb
@@ -2603,15 +2662,13 @@ fxlbi-xl-27 LinLibertineBI "xl27Encoding ReEncodeFont" <xl-27.enc <fxlbi.pfb
 fxlbi-xl-2c LinLibertineBI "xl2CEncoding ReEncodeFont" <xl-2c.enc <fxlbi.pfb
 fxlbi-xl-8x LinLibertineBI "xlExpertEncoding ReEncodeFont" <xl-8x.enc <fxlbi.pfb
 fxlbi-xl-a7 LinLibertineBI "xlA7Encoding ReEncodeFont" <xl-a7.enc <fxlbi.pfb
-fxlbi-xl-circle LinLibertineBI "xlCircleEncoding ReEncodeFont" <xl-circle.enc <fxlbi.pfb
+fxlbi-xl-circle LinLibertineBI "fontinst-autoenc-xl-circle ReEncodeFont" <xl-circle.enc <fxlbi.pfb
 fxlbi-xl-e0 LinLibertineBI "xlE0Encoding ReEncodeFont" <xl-e0.enc <fxlbi.pfb
 fxlbi-xl-e1 LinLibertineBI "xlE1Encoding ReEncodeFont" <xl-e1.enc <fxlbi.pfb
 fxlbi-xl-f6 LinLibertineBI "xlF6Encoding ReEncodeFont" <xl-f6.enc <fxlbi.pfb
 fxlbi-xl-fb LinLibertineBI "xlFBEncoding ReEncodeFont" <xl-fb.enc <fxlbi.pfb
 fxlbi-xl-ff LinLibertineBI "xlFFEncoding ReEncodeFont" <xl-ff.enc <fxlbi.pfb
 fxlbi-xl-infsup LinLibertineBI "xlinfsupEncoding ReEncodeFont" <xl-infsup.enc <fxlbi.pfb
-fxlbi-xl-lgi LinLibertineBI "xlIbycusHTGEncoding ReEncodeFont" <xl-lgi.enc <fxlbi.pfb
-fxlbi-xl-lgr LinLibertineBI "xlLGREncoding ReEncodeFont" <xl-lgr.enc <fxlbi.pfb
 fxlbi-xl-t1 LinLibertineBI "xlT1Encoding ReEncodeFont" <xl-t1.enc <fxlbi.pfb
 fxlbi-xl-ts1 LinLibertineBI "xlTS1Encoding ReEncodeFont" <xl-ts1.enc <fxlbi.pfb
 fxlr-8r LinLibertine "TeXBase1Encoding ReEncodeFont" <8r.enc <fxlr.pfb
@@ -2637,15 +2694,13 @@ fxlr-xl-27 LinLibertine "xl27Encoding ReEncodeFont" <xl-27.enc <fxlr.pfb
 fxlr-xl-2c LinLibertine "xl2CEncoding ReEncodeFont" <xl-2c.enc <fxlr.pfb
 fxlr-xl-8x LinLibertine "xlExpertEncoding ReEncodeFont" <xl-8x.enc <fxlr.pfb
 fxlr-xl-a7 LinLibertine "xlA7Encoding ReEncodeFont" <xl-a7.enc <fxlr.pfb
-fxlr-xl-circle LinLibertine "xlCircleEncoding ReEncodeFont" <xl-circle.enc <fxlr.pfb
+fxlr-xl-circle LinLibertine "fontinst-autoenc-xl-circle ReEncodeFont" <xl-circle.enc <fxlr.pfb
 fxlr-xl-e0 LinLibertine "xlE0Encoding ReEncodeFont" <xl-e0.enc <fxlr.pfb
 fxlr-xl-e1 LinLibertine "xlE1Encoding ReEncodeFont" <xl-e1.enc <fxlr.pfb
 fxlr-xl-f6 LinLibertine "xlF6Encoding ReEncodeFont" <xl-f6.enc <fxlr.pfb
 fxlr-xl-fb LinLibertine "xlFBEncoding ReEncodeFont" <xl-fb.enc <fxlr.pfb
 fxlr-xl-ff LinLibertine "xlFFEncoding ReEncodeFont" <xl-ff.enc <fxlr.pfb
 fxlr-xl-infsup LinLibertine "xlinfsupEncoding ReEncodeFont" <xl-infsup.enc <fxlr.pfb
-fxlr-xl-lgi LinLibertine "xlIbycusHTGEncoding ReEncodeFont" <xl-lgi.enc <fxlr.pfb
-fxlr-xl-lgr LinLibertine "xlLGREncoding ReEncodeFont" <xl-lgr.enc <fxlr.pfb
 fxlr-xl-t1 LinLibertine "xlT1Encoding ReEncodeFont" <xl-t1.enc <fxlr.pfb
 fxlr-xl-ts1 LinLibertine "xlTS1Encoding ReEncodeFont" <xl-ts1.enc <fxlr.pfb
 fxlri-8r LinLibertineI "TeXBase1Encoding ReEncodeFont" <8r.enc <fxlri.pfb
@@ -2677,8 +2732,6 @@ fxlri-xl-f6 LinLibertineI "xlF6Encoding ReEncodeFont" <xl-f6.enc <fxlri.pfb
 fxlri-xl-fb LinLibertineI "xlFBEncoding ReEncodeFont" <xl-fb.enc <fxlri.pfb
 fxlri-xl-ff LinLibertineI "xlFFEncoding ReEncodeFont" <xl-ff.enc <fxlri.pfb
 fxlri-xl-infsup LinLibertineI "xlinfsupEncoding ReEncodeFont" <xl-infsup.enc <fxlri.pfb
-fxlri-xl-lgi LinLibertineI "xlIbycusHTGEncoding ReEncodeFont" <xl-lgi.enc <fxlri.pfb
-fxlri-xl-lgr LinLibertineI "xlLGREncoding ReEncodeFont" <xl-lgr.enc <fxlri.pfb
 fxlri-xl-t1 LinLibertineI "xlT1Encoding ReEncodeFont" <xl-t1.enc <fxlri.pfb
 fxlri-xl-ts1 LinLibertineI "xlTS1Encoding ReEncodeFont" <xl-ts1.enc <fxlri.pfb
 gartemisiab6r GFSArtemisia-Bold "artemisiael ReEncodeFont" <artemisiael.enc <GFSArtemisia-Bold.pfb
@@ -4020,7 +4073,7 @@ jkpexa Kp--M-Exa-Regular <jkpexa.pfb
 jkpkbsc Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkpkbsc.pfb
 jkpkbscsl Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpkbsc.pfb
 jkpkbxsc Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-large-sc.enc <jkpkbsc.pfb
-jkpkbxscsl Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpkbsc.pfb
+jkpkbxscsl Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpkbsc.pfb 
 jkpkmsc Kp-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkpkmsc.pfb
 jkpkmscsl Kp-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpkmsc.pfb
 jkplbex Kp-Light-M-Ex-Medium <jkplbex.pfb
@@ -4089,7 +4142,7 @@ jkpmia Kp--M-Regular <jkpmia.pfb
 jkpmit8r Kp-Italic <8r.enc <jkpmit8a.pfb "TeXBase1Encoding ReEncodeFont" 
 jkpmitc Kp-Companion-Italic <jkpmitc.pfb
 jkpmite Kp-Expert-Italic "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpmite.pfb
-jkpmn8r Kp-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpmn8a.pfb
+jkpmn8r Kp-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpmn8a.pfb 
 jkpmnc Kp-Companion-Regular <jkpmnc.pfb
 jkpmne Kp-Expert-Regular "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpmne.pfb
 jkpmsc8r Kp-SmallCaps-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpmsc8a.pfb
diff --git a/Master/texmf/fonts/map/pdftex/updmap/pdftex_ndl14.map b/Master/texmf/fonts/map/pdftex/updmap/pdftex_ndl14.map
index 4a29a0aa953..492db1fe3d6 100644
--- a/Master/texmf/fonts/map/pdftex/updmap/pdftex_ndl14.map
+++ b/Master/texmf/fonts/map/pdftex/updmap/pdftex_ndl14.map
@@ -3,6 +3,7 @@
 %   and run updmap to recreate this file.
 % A log of the updmap run that has created this file is available here:
 %   /tmp/web2c/updmap.log
+
 ASCII ASCII <ASCII.pfb
 Acorn AcornInitials <Acorn.pfb
 AlphaDia ChessAlphaDiagram <AlphaDia.pfb
@@ -2242,8 +2243,8 @@ fgdb8z Garuda-Bold "C90Encoding ReEncodeFont" <c90.enc <garuda_b.pfb
 fgdbo8z Garuda-BoldOblique "C90Encoding ReEncodeFont" <c90.enc <garuda_bo.pfb
 fgdo8z Garuda-Oblique "C90Encoding ReEncodeFont" <c90.enc <garuda_o.pfb
 fgdr8z Garuda "C90Encoding ReEncodeFont" <c90.enc <garuda.pfb
-fgeit10 TeX-fgeit10 <fgeit10.pfb
-fgerm10 TeX-fgerm10 <fgerm10.pfb
+fgeit10 fgeit10 <fgeit10.pfb
+fgerm10 fgerm10 <fgerm10.pfb
 fibb84 FIBB84 <fibb84.pfb
 fibo84 IbycusHTG-Regular ".167 SlantFont" <fibr84.pfb
 fibr84 IbycusHTG-Regular <fibr84.pfb
@@ -2546,6 +2547,66 @@ fvsb8r BeraSans-Bold "TeXBase1Encoding ReEncodeFont" <8r.enc <fvsb8a.pfb
 fvsbo8r BeraSans-BoldOblique "TeXBase1Encoding ReEncodeFont" <8r.enc <fvsbo8a.pfb
 fvsr8r BeraSans-Roman "TeXBase1Encoding ReEncodeFont" <8r.enc <fvsr8a.pfb
 fvsro8r BeraSans-Oblique "TeXBase1Encoding ReEncodeFont" <8r.enc <fvsro8a.pfb
+fxbb-8r LinBiolinumB "TeXBase1Encoding ReEncodeFont" <8r.enc <fxbb.pfb
+fxbb-xb-00 LinBiolinumB "xb00Encoding ReEncodeFont" <xb-00.enc <fxbb.pfb
+fxbb-xb-01 LinBiolinumB "xb01Encoding ReEncodeFont" <xb-01.enc <fxbb.pfb
+fxbb-xb-02 LinBiolinumB "xb02Encoding ReEncodeFont" <xb-02.enc <fxbb.pfb
+fxbb-xb-03 LinBiolinumB "xb03Encoding ReEncodeFont" <xb-03.enc <fxbb.pfb
+fxbb-xb-04 LinBiolinumB "xb04Encoding ReEncodeFont" <xb-04.enc <fxbb.pfb
+fxbb-xb-05 LinBiolinumB "xb05Encoding ReEncodeFont" <xb-05.enc <fxbb.pfb
+fxbb-xb-06 LinBiolinumB "xb06Encoding ReEncodeFont" <xb-06.enc <fxbb.pfb
+fxbb-xb-07 LinBiolinumB "xb07Encoding ReEncodeFont" <xb-07.enc <fxbb.pfb
+fxbb-xb-09 LinBiolinumB "xb09Encoding ReEncodeFont" <xb-09.enc <fxbb.pfb
+fxbb-xb-1e LinBiolinumB "xb1EEncoding ReEncodeFont" <xb-1e.enc <fxbb.pfb
+fxbb-xb-1f LinBiolinumB "xb1FEncoding ReEncodeFont" <xb-1f.enc <fxbb.pfb
+fxbb-xb-20 LinBiolinumB "xb20Encoding ReEncodeFont" <xb-20.enc <fxbb.pfb
+fxbb-xb-21 LinBiolinumB "xb21Encoding ReEncodeFont" <xb-21.enc <fxbb.pfb
+fxbb-xb-22 LinBiolinumB "xb22Encoding ReEncodeFont" <xb-22.enc <fxbb.pfb
+fxbb-xb-23 LinBiolinumB "xb23Encoding ReEncodeFont" <xb-23.enc <fxbb.pfb
+fxbb-xb-24 LinBiolinumB "xb24Encoding ReEncodeFont" <xb-24.enc <fxbb.pfb
+fxbb-xb-25 LinBiolinumB "xb25Encoding ReEncodeFont" <xb-25.enc <fxbb.pfb
+fxbb-xb-26 LinBiolinumB "xb26Encoding ReEncodeFont" <xb-26.enc <fxbb.pfb
+fxbb-xb-27 LinBiolinumB "xb27Encoding ReEncodeFont" <xb-27.enc <fxbb.pfb
+fxbb-xb-2c LinBiolinumB "xb2CEncoding ReEncodeFont" <xb-2c.enc <fxbb.pfb
+fxbb-xb-8x LinBiolinumB "xbExpertEncoding ReEncodeFont" <xb-8x.enc <fxbb.pfb
+fxbb-xb-a7 LinBiolinumB "xbA7Encoding ReEncodeFont" <xb-a7.enc <fxbb.pfb
+fxbb-xb-e0 LinBiolinumB "xbE0Encoding ReEncodeFont" <xb-e0.enc <fxbb.pfb
+fxbb-xb-e1 LinBiolinumB "xbE1Encoding ReEncodeFont" <xb-e1.enc <fxbb.pfb
+fxbb-xb-f6 LinBiolinumB "xbF6Encoding ReEncodeFont" <xb-f6.enc <fxbb.pfb
+fxbb-xb-fb LinBiolinumB "xbFBEncoding ReEncodeFont" <xb-fb.enc <fxbb.pfb
+fxbb-xb-ff LinBiolinumB "xbFFEncoding ReEncodeFont" <xb-ff.enc <fxbb.pfb
+fxbb-xb-t1 LinBiolinumB "xbT1Encoding ReEncodeFont" <xb-t1.enc <fxbb.pfb
+fxbb-xb-ts1 LinBiolinumB "xbTS1Encoding ReEncodeFont" <xb-ts1.enc <fxbb.pfb
+fxbr-8r LinBiolinum "TeXBase1Encoding ReEncodeFont" <8r.enc <fxbr.pfb
+fxbr-xb-00 LinBiolinum "xb00Encoding ReEncodeFont" <xb-00.enc <fxbr.pfb
+fxbr-xb-01 LinBiolinum "xb01Encoding ReEncodeFont" <xb-01.enc <fxbr.pfb
+fxbr-xb-02 LinBiolinum "xb02Encoding ReEncodeFont" <xb-02.enc <fxbr.pfb
+fxbr-xb-03 LinBiolinum "xb03Encoding ReEncodeFont" <xb-03.enc <fxbr.pfb
+fxbr-xb-04 LinBiolinum "xb04Encoding ReEncodeFont" <xb-04.enc <fxbr.pfb
+fxbr-xb-05 LinBiolinum "xb05Encoding ReEncodeFont" <xb-05.enc <fxbr.pfb
+fxbr-xb-06 LinBiolinum "xb06Encoding ReEncodeFont" <xb-06.enc <fxbr.pfb
+fxbr-xb-07 LinBiolinum "xb07Encoding ReEncodeFont" <xb-07.enc <fxbr.pfb
+fxbr-xb-09 LinBiolinum "xb09Encoding ReEncodeFont" <xb-09.enc <fxbr.pfb
+fxbr-xb-1e LinBiolinum "xb1EEncoding ReEncodeFont" <xb-1e.enc <fxbr.pfb
+fxbr-xb-1f LinBiolinum "xb1FEncoding ReEncodeFont" <xb-1f.enc <fxbr.pfb
+fxbr-xb-20 LinBiolinum "xb20Encoding ReEncodeFont" <xb-20.enc <fxbr.pfb
+fxbr-xb-21 LinBiolinum "xb21Encoding ReEncodeFont" <xb-21.enc <fxbr.pfb
+fxbr-xb-22 LinBiolinum "xb22Encoding ReEncodeFont" <xb-22.enc <fxbr.pfb
+fxbr-xb-23 LinBiolinum "xb23Encoding ReEncodeFont" <xb-23.enc <fxbr.pfb
+fxbr-xb-24 LinBiolinum "xb24Encoding ReEncodeFont" <xb-24.enc <fxbr.pfb
+fxbr-xb-25 LinBiolinum "xb25Encoding ReEncodeFont" <xb-25.enc <fxbr.pfb
+fxbr-xb-26 LinBiolinum "xb26Encoding ReEncodeFont" <xb-26.enc <fxbr.pfb
+fxbr-xb-27 LinBiolinum "xb27Encoding ReEncodeFont" <xb-27.enc <fxbr.pfb
+fxbr-xb-2c LinBiolinum "xb2CEncoding ReEncodeFont" <xb-2c.enc <fxbr.pfb
+fxbr-xb-8x LinBiolinum "xbExpertEncoding ReEncodeFont" <xb-8x.enc <fxbr.pfb
+fxbr-xb-a7 LinBiolinum "xbA7Encoding ReEncodeFont" <xb-a7.enc <fxbr.pfb
+fxbr-xb-e0 LinBiolinum "xbE0Encoding ReEncodeFont" <xb-e0.enc <fxbr.pfb
+fxbr-xb-e1 LinBiolinum "xbE1Encoding ReEncodeFont" <xb-e1.enc <fxbr.pfb
+fxbr-xb-f6 LinBiolinum "xbF6Encoding ReEncodeFont" <xb-f6.enc <fxbr.pfb
+fxbr-xb-fb LinBiolinum "xbFBEncoding ReEncodeFont" <xb-fb.enc <fxbr.pfb
+fxbr-xb-ff LinBiolinum "xbFFEncoding ReEncodeFont" <xb-ff.enc <fxbr.pfb
+fxbr-xb-t1 LinBiolinum "xbT1Encoding ReEncodeFont" <xb-t1.enc <fxbr.pfb
+fxbr-xb-ts1 LinBiolinum "xbTS1Encoding ReEncodeFont" <xb-ts1.enc <fxbr.pfb
 fxlb-8r LinLibertineB "TeXBase1Encoding ReEncodeFont" <8r.enc <fxlb.pfb
 fxlb-xl-00 LinLibertineB "xl00Encoding ReEncodeFont" <xl-00.enc <fxlb.pfb
 fxlb-xl-01 LinLibertineB "xl01Encoding ReEncodeFont" <xl-01.enc <fxlb.pfb
@@ -2569,15 +2630,13 @@ fxlb-xl-27 LinLibertineB "xl27Encoding ReEncodeFont" <xl-27.enc <fxlb.pfb
 fxlb-xl-2c LinLibertineB "xl2CEncoding ReEncodeFont" <xl-2c.enc <fxlb.pfb
 fxlb-xl-8x LinLibertineB "xlExpertEncoding ReEncodeFont" <xl-8x.enc <fxlb.pfb
 fxlb-xl-a7 LinLibertineB "xlA7Encoding ReEncodeFont" <xl-a7.enc <fxlb.pfb
-fxlb-xl-circle LinLibertineB "xlCircleEncoding ReEncodeFont" <xl-circle.enc <fxlb.pfb
+fxlb-xl-circle LinLibertineB "fontinst-autoenc-xl-circle ReEncodeFont" <xl-circle.enc <fxlb.pfb
 fxlb-xl-e0 LinLibertineB "xlE0Encoding ReEncodeFont" <xl-e0.enc <fxlb.pfb
 fxlb-xl-e1 LinLibertineB "xlE1Encoding ReEncodeFont" <xl-e1.enc <fxlb.pfb
 fxlb-xl-f6 LinLibertineB "xlF6Encoding ReEncodeFont" <xl-f6.enc <fxlb.pfb
 fxlb-xl-fb LinLibertineB "xlFBEncoding ReEncodeFont" <xl-fb.enc <fxlb.pfb
 fxlb-xl-ff LinLibertineB "xlFFEncoding ReEncodeFont" <xl-ff.enc <fxlb.pfb
 fxlb-xl-infsup LinLibertineB "xlinfsupEncoding ReEncodeFont" <xl-infsup.enc <fxlb.pfb
-fxlb-xl-lgi LinLibertineB "xlIbycusHTGEncoding ReEncodeFont" <xl-lgi.enc <fxlb.pfb
-fxlb-xl-lgr LinLibertineB "xlLGREncoding ReEncodeFont" <xl-lgr.enc <fxlb.pfb
 fxlb-xl-t1 LinLibertineB "xlT1Encoding ReEncodeFont" <xl-t1.enc <fxlb.pfb
 fxlb-xl-ts1 LinLibertineB "xlTS1Encoding ReEncodeFont" <xl-ts1.enc <fxlb.pfb
 fxlbi-8r LinLibertineBI "TeXBase1Encoding ReEncodeFont" <8r.enc <fxlbi.pfb
@@ -2603,15 +2662,13 @@ fxlbi-xl-27 LinLibertineBI "xl27Encoding ReEncodeFont" <xl-27.enc <fxlbi.pfb
 fxlbi-xl-2c LinLibertineBI "xl2CEncoding ReEncodeFont" <xl-2c.enc <fxlbi.pfb
 fxlbi-xl-8x LinLibertineBI "xlExpertEncoding ReEncodeFont" <xl-8x.enc <fxlbi.pfb
 fxlbi-xl-a7 LinLibertineBI "xlA7Encoding ReEncodeFont" <xl-a7.enc <fxlbi.pfb
-fxlbi-xl-circle LinLibertineBI "xlCircleEncoding ReEncodeFont" <xl-circle.enc <fxlbi.pfb
+fxlbi-xl-circle LinLibertineBI "fontinst-autoenc-xl-circle ReEncodeFont" <xl-circle.enc <fxlbi.pfb
 fxlbi-xl-e0 LinLibertineBI "xlE0Encoding ReEncodeFont" <xl-e0.enc <fxlbi.pfb
 fxlbi-xl-e1 LinLibertineBI "xlE1Encoding ReEncodeFont" <xl-e1.enc <fxlbi.pfb
 fxlbi-xl-f6 LinLibertineBI "xlF6Encoding ReEncodeFont" <xl-f6.enc <fxlbi.pfb
 fxlbi-xl-fb LinLibertineBI "xlFBEncoding ReEncodeFont" <xl-fb.enc <fxlbi.pfb
 fxlbi-xl-ff LinLibertineBI "xlFFEncoding ReEncodeFont" <xl-ff.enc <fxlbi.pfb
 fxlbi-xl-infsup LinLibertineBI "xlinfsupEncoding ReEncodeFont" <xl-infsup.enc <fxlbi.pfb
-fxlbi-xl-lgi LinLibertineBI "xlIbycusHTGEncoding ReEncodeFont" <xl-lgi.enc <fxlbi.pfb
-fxlbi-xl-lgr LinLibertineBI "xlLGREncoding ReEncodeFont" <xl-lgr.enc <fxlbi.pfb
 fxlbi-xl-t1 LinLibertineBI "xlT1Encoding ReEncodeFont" <xl-t1.enc <fxlbi.pfb
 fxlbi-xl-ts1 LinLibertineBI "xlTS1Encoding ReEncodeFont" <xl-ts1.enc <fxlbi.pfb
 fxlr-8r LinLibertine "TeXBase1Encoding ReEncodeFont" <8r.enc <fxlr.pfb
@@ -2637,15 +2694,13 @@ fxlr-xl-27 LinLibertine "xl27Encoding ReEncodeFont" <xl-27.enc <fxlr.pfb
 fxlr-xl-2c LinLibertine "xl2CEncoding ReEncodeFont" <xl-2c.enc <fxlr.pfb
 fxlr-xl-8x LinLibertine "xlExpertEncoding ReEncodeFont" <xl-8x.enc <fxlr.pfb
 fxlr-xl-a7 LinLibertine "xlA7Encoding ReEncodeFont" <xl-a7.enc <fxlr.pfb
-fxlr-xl-circle LinLibertine "xlCircleEncoding ReEncodeFont" <xl-circle.enc <fxlr.pfb
+fxlr-xl-circle LinLibertine "fontinst-autoenc-xl-circle ReEncodeFont" <xl-circle.enc <fxlr.pfb
 fxlr-xl-e0 LinLibertine "xlE0Encoding ReEncodeFont" <xl-e0.enc <fxlr.pfb
 fxlr-xl-e1 LinLibertine "xlE1Encoding ReEncodeFont" <xl-e1.enc <fxlr.pfb
 fxlr-xl-f6 LinLibertine "xlF6Encoding ReEncodeFont" <xl-f6.enc <fxlr.pfb
 fxlr-xl-fb LinLibertine "xlFBEncoding ReEncodeFont" <xl-fb.enc <fxlr.pfb
 fxlr-xl-ff LinLibertine "xlFFEncoding ReEncodeFont" <xl-ff.enc <fxlr.pfb
 fxlr-xl-infsup LinLibertine "xlinfsupEncoding ReEncodeFont" <xl-infsup.enc <fxlr.pfb
-fxlr-xl-lgi LinLibertine "xlIbycusHTGEncoding ReEncodeFont" <xl-lgi.enc <fxlr.pfb
-fxlr-xl-lgr LinLibertine "xlLGREncoding ReEncodeFont" <xl-lgr.enc <fxlr.pfb
 fxlr-xl-t1 LinLibertine "xlT1Encoding ReEncodeFont" <xl-t1.enc <fxlr.pfb
 fxlr-xl-ts1 LinLibertine "xlTS1Encoding ReEncodeFont" <xl-ts1.enc <fxlr.pfb
 fxlri-8r LinLibertineI "TeXBase1Encoding ReEncodeFont" <8r.enc <fxlri.pfb
@@ -2677,8 +2732,6 @@ fxlri-xl-f6 LinLibertineI "xlF6Encoding ReEncodeFont" <xl-f6.enc <fxlri.pfb
 fxlri-xl-fb LinLibertineI "xlFBEncoding ReEncodeFont" <xl-fb.enc <fxlri.pfb
 fxlri-xl-ff LinLibertineI "xlFFEncoding ReEncodeFont" <xl-ff.enc <fxlri.pfb
 fxlri-xl-infsup LinLibertineI "xlinfsupEncoding ReEncodeFont" <xl-infsup.enc <fxlri.pfb
-fxlri-xl-lgi LinLibertineI "xlIbycusHTGEncoding ReEncodeFont" <xl-lgi.enc <fxlri.pfb
-fxlri-xl-lgr LinLibertineI "xlLGREncoding ReEncodeFont" <xl-lgr.enc <fxlri.pfb
 fxlri-xl-t1 LinLibertineI "xlT1Encoding ReEncodeFont" <xl-t1.enc <fxlri.pfb
 fxlri-xl-ts1 LinLibertineI "xlTS1Encoding ReEncodeFont" <xl-ts1.enc <fxlri.pfb
 gartemisiab6r GFSArtemisia-Bold "artemisiael ReEncodeFont" <artemisiael.enc <GFSArtemisia-Bold.pfb
@@ -4020,7 +4073,7 @@ jkpexa Kp--M-Exa-Regular <jkpexa.pfb
 jkpkbsc Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkpkbsc.pfb
 jkpkbscsl Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpkbsc.pfb
 jkpkbxsc Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-large-sc.enc <jkpkbsc.pfb
-jkpkbxscsl Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpkbsc.pfb
+jkpkbxscsl Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpkbsc.pfb 
 jkpkmsc Kp-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkpkmsc.pfb
 jkpkmscsl Kp-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpkmsc.pfb
 jkplbex Kp-Light-M-Ex-Medium <jkplbex.pfb
@@ -4089,7 +4142,7 @@ jkpmia Kp--M-Regular <jkpmia.pfb
 jkpmit8r Kp-Italic <8r.enc <jkpmit8a.pfb "TeXBase1Encoding ReEncodeFont" 
 jkpmitc Kp-Companion-Italic <jkpmitc.pfb
 jkpmite Kp-Expert-Italic "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpmite.pfb
-jkpmn8r Kp-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpmn8a.pfb
+jkpmn8r Kp-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpmn8a.pfb 
 jkpmnc Kp-Companion-Regular <jkpmnc.pfb
 jkpmne Kp-Expert-Regular "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpmne.pfb
 jkpmsc8r Kp-SmallCaps-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpmsc8a.pfb