autoupdate via tlmgr generate updmap

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

10 files changed, 1067 insertions, 1076 deletions

diff --git a/Master/texmf/fonts/map/dvipdfm/updmap/dvipdfm.map b/Master/texmf/fonts/map/dvipdfm/updmap/dvipdfm.map
index 75228dd55ba..2cd2ed2b66b 100644
--- a/Master/texmf/fonts/map/dvipdfm/updmap/dvipdfm.map
+++ b/Master/texmf/fonts/map/dvipdfm/updmap/dvipdfm.map
@@ -3984,19 +3984,19 @@ jkpbex
 jkpbexa
 jkpbit8r 8r jkpbit8a
 jkpbitc
-jkpbite
+jkpbite kpfonts-expert jkpbite
 jkpbmi
 jkpbmia
 jkpbn8r 8r jkpbn8a
 jkpbnc
-jkpbne
+jkpbne kpfonts-expert jkpbne
 jkpbsc8r 8r jkpbsc8a
-jkpbsce
+jkpbsce kpfonts-expert-sc jkpbsce
 jkpbscsl8r 8r jkpbsc8a -s 0.167
-jkpbscsle default jkpbsce -s 0.167
+jkpbscsle kpfonts-expert-sc jkpbsce -s 0.167
 jkpbsl8r 8r jkpbn8a -s 0.167
 jkpbslc default jkpbnc -s 0.167
-jkpbsle default jkpbne -s 0.167
+jkpbsle kpfonts-expert jkpbne -s 0.167
 jkpbsy
 jkpbsya
 jkpbsyb
@@ -4004,82 +4004,82 @@ jkpbsyc
 jkpbsyd
 jkpbxit8r 8r jkpbit8a -e 1.125
 jkpbxitc default jkpbitc -e 1.125
-jkpbxite default jkpbite -e 1.125
+jkpbxite kpfonts-expert jkpbite -e 1.125
 jkpbxn8r 8r jkpbn8a -e 1.125
 jkpbxnc default jkpbnc -e 1.125
-jkpbxne default jkpbne -e 1.125
+jkpbxne kpfonts-expert jkpbne -e 1.125
 jkpbxsc8r 8r jkpbsc8a -e 1.125
-jkpbxsce default jkpbsce -e 1.125
+jkpbxsce kpfonts-expert-sc jkpbsce -e 1.125
 jkpbxscsl8r 8r jkpbsc8a -e 1.125 -s 0.167
-jkpbxscsle default jkpbsce -e 1.125 -s 0.167
+jkpbxscsle kpfonts-expert-sc jkpbsce -e 1.125 -s 0.167
 jkpbxsl8r 8r jkpbn8a -e 1.125 -s 0.167
 jkpbxslc default jkpbnc -e 1.125 -s 0.167
-jkpbxsle default jkpbne -e 1.125 -s 0.167
+jkpbxsle kpfonts-expert jkpbne -e 1.125 -s 0.167
 jkpex
 jkpexa
-jkpkbsc
-jkpkbscsl default jkpkbsc -s 0.167
-jkpkbxsc default jkpkbsc -e 1.125
-jkpkbxscsl default jkpkbsc -e 1.125 -s 0.167
-jkpkmsc
-jkpkmscsl default jkpkmsc -s 0.167
+jkpkbsc kpfonts-large-sc jkpkbsc
+jkpkbscsl kpfonts-large-sc jkpkbsc -s 0.167
+jkpkbxsc kpfonts-large-sc jkpkbsc -e 1.125
+jkpkbxscsl kpfonts-large-sc jkpkbsc -e 1.125 -s 0.167
+jkpkmsc kpfonts-large-sc jkpkmsc
+jkpkmscsl kpfonts-large-sc jkpkmsc -s 0.167
 jkplbex
 jkplbexa
 jkplbit8r 8r jkplbit8a
 jkplbitc
-jkplbite
+jkplbite kpfonts-expert jkplbite
 jkplbmi
 jkplbmia
 jkplbn8r 8r jkplbn8a
 jkplbnc
-jkplbne
+jkplbne kpfonts-expert jkplbne
 jkplbsc8r 8r jkplbsc8a
-jkplbsce
+jkplbsce kpfonts-expert-sc jkplbsce
 jkplbscsl8r 8r jkplbsc8a -s 0.167
-jkplbscsle default jkplbsce -s 0.167
+jkplbscsle kpfonts-expert-sc jkplbsce -s 0.167
 jkplbsl8r 8r jkplbn8a -s 0.167
 jkplbslc default jkplbnc -s 0.167
-jkplbsle default jkplbne -s 0.167
+jkplbsle kpfonts-expert jkplbne -s 0.167
 jkplbsy
 jkplbsyb
 jkplbsyc
 jkplbsyd
 jkplbxit8r 8r jkplbit8a -e 1.125
 jkplbxitc default jkplbitc -e 1.125
-jkplbxite default jkplbite -e 1.125
+jkplbxite kpfonts-expert jkplbite -e 1.125
 jkplbxn8r 8r jkplbn8a -e 1.125
 jkplbxnc default jkplbnc -e 1.125
-jkplbxne default jkplbne -e 1.125
+jkplbxne kpfonts-expert jkplbne -e 1.125
 jkplbxsc8r 8r jkplbsc8a -e 1.125
-jkplbxsce default jkplbsce -e 1.125
+jkplbxsce kpfonts-expert-sc jkplbsce -e 1.125
 jkplbxscsl8r 8r jkplbsc8a -e 1.125 -s 0.167
-jkplbxscsle default jkplbsce -e 1.125 -s 0.167
+jkplbxscsle kpfonts-expert-sc jkplbsce -e 1.125 -s 0.167
 jkplbxsl8r 8r jkplbn8a -e 1.125 -s 0.167
 jkplbxslc default jkplbnc -e 1.125 -s 0.167
-jkplbxsle default jkplbne -e 1.125 -s 0.167
+jkplbxsle kpfonts-expert jkplbne -e 1.125 -s 0.167
 jkplex
 jkplexa
-jkplkbsc
-jkplkbscsl default jkplkbsc -s 0.167
-jkplkbxsc default jkplkbsc -e 1.125
-jkplkbxscsl default jkplkbsc -e 1.125 -s 0.167
-jkplkmsc
-jkplkmscsl default jkplkmsc -s 0.167
+jkplkbsc kpfonts-large-sc jkplkbsc
+jkplkbscsl kpfonts-large-sc jkplkbsc -s 0.167
+jkplkbxsc kpfonts-large-sc jkplkbsc -e 1.125
+jkplkbxscsl kpfonts-large-sc jkplkbsc -e 1.125 -s 0.167
+jkplkmsc kpfonts-large-sc jkplkmsc
+jkplkmscsl kpfonts-large-sc jkplkmsc -s 0.167
 jkplmi
 jkplmia
 jkplmit8r 8r jkplmit8a
 jkplmitc
-jkplmite
+jkplmite kpfonts-expert jkplmite
 jkplmn8r 8r jkplmn8a
 jkplmnc
-jkplmne
+jkplmne kpfonts-expert jkplmne
 jkplmsc8r 8r jkplmsc8a
-jkplmsce
+jkplmsce kpfonts-expert-sc jkplmsce
 jkplmscsl8r 8r jkplmsc8a -s 0.167
-jkplmscsle default jkplmsce -s 0.167
+jkplmscsle kpfonts-expert-sc jkplmsce -s 0.167
 jkplmsl8r 8r jkplmn8a -s 0.167
 jkplmslc default jkplmnc -s 0.167
-jkplmsle default jkplmne -s 0.167
+jkplmsle kpfonts-expert jkplmne -s 0.167
 jkplsy
 jkplsyb
 jkplsyc
@@ -4088,53 +4088,53 @@ jkpmi
 jkpmia
 jkpmit8r 8r jkpmit8a
 jkpmitc
-jkpmite
+jkpmite kpfonts-expert jkpmite
 jkpmn8r 8r jkpmn8a
 jkpmnc
-jkpmne
+jkpmne kpfonts-expert jkpmne
 jkpmsc8r 8r jkpmsc8a
-jkpmsce
+jkpmsce kpfonts-expert-sc jkpmsce
 jkpmscsl8r 8r jkpmsc8a -s 0.167
-jkpmscsle default jkpmsce -s 0.167
+jkpmscsle kpfonts-expert-sc jkpmsce -s 0.167
 jkpmsl8r 8r jkpmn8a -s 0.167
 jkpmslc default jkpmnc -s 0.167
-jkpmsle default jkpmne -s 0.167
+jkpmsle kpfonts-expert jkpmne -s 0.167
 jkpssbn8r 8r jkpssbn8a
 jkpssbnc
-jkpssbne
+jkpssbne kpfonts-expert jkpssbne
 jkpssbsc8r 8r jkpssbsc8a
-jkpssbsce
+jkpssbsce kpfonts-expert-sc jkpssbsce
 jkpssbscsl8r 8r jkpssbsc8a -s 0.167
-jkpssbscsle default jkpssbsce -s 0.167
+jkpssbscsle kpfonts-expert-sc jkpssbsce -s 0.167
 jkpssbsl8r 8r jkpssbn8a -s 0.167
 jkpssbslc default jkpssbnc -s 0.167
-jkpssbsle default jkpssbne -s 0.167
+jkpssbsle kpfonts-expert jkpssbne -s 0.167
 jkpssbxn8r 8r jkpssbn8a -e 1.125
 jkpssbxnc default jkpssbnc -e 1.125
-jkpssbxne default jkpssbne -e 1.125
+jkpssbxne kpfonts-expert jkpssbne -e 1.125
 jkpssbxsc8r 8r jkpssbsc8a -e 1.125
-jkpssbxsce default jkpssbsce -e 1.125
+jkpssbxsce kpfonts-expert-sc jkpssbsce -e 1.125
 jkpssbxscsl8r 8r jkpssbsc8a -e 1.125 -s 0.167
-jkpssbxscsle default jkpssbsce -e 1.125 -s 0.167
+jkpssbxscsle kpfonts-expert-sc jkpssbsce -e 1.125 -s 0.167
 jkpssbxsl8r 8r jkpssbn8a -e 1.125 -s 0.167
 jkpssbxslc default jkpssbnc -e 1.125 -s 0.167
-jkpssbxsle default jkpssbne -e 1.125 -s 0.167
-jkpsskbsc
-jkpsskbscsl default jkpsskbsc -s 0.167
-jkpsskbxsc default jkpsskbsc -e 1.125
-jkpsskbxscsl default jkpsskbsc -e 1.125 -s 0.167
-jkpsskmsc
-jkpsskmscsl default jkpsskmsc -s 0.167
+jkpssbxsle kpfonts-expert jkpssbne -e 1.125 -s 0.167
+jkpsskbsc kpfonts-large-sc jkpsskbsc
+jkpsskbscsl kpfonts-large-sc jkpsskbsc -s 0.167
+jkpsskbxsc kpfonts-large-sc jkpsskbsc -e 1.125
+jkpsskbxscsl kpfonts-large-sc jkpsskbsc -e 1.125 -s 0.167
+jkpsskmsc kpfonts-large-sc jkpsskmsc
+jkpsskmscsl kpfonts-large-sc jkpsskmsc -s 0.167
 jkpssmn8r 8r jkpssmn8a
 jkpssmnc
-jkpssmne
+jkpssmne kpfonts-expert jkpssmne
 jkpssmsc8r 8r jkpssmsc8a
-jkpssmsce
+jkpssmsce kpfonts-expert-sc jkpssmsce
 jkpssmscsl8r 8r jkpssmsc8a -s 0.167
-jkpssmscsle default jkpssmsce -s 0.167
+jkpssmscsle kpfonts-expert-sc jkpssmsce -s 0.167
 jkpssmsl8r 8r jkpssmn8a -s 0.167
 jkpssmslc default jkpssmnc -s 0.167
-jkpssmsle default jkpssmne -s 0.167
+jkpssmsle kpfonts-expert jkpssmne -s 0.167
 jkpsy
 jkpsya
 jkpsyb
@@ -4142,16 +4142,16 @@ jkpsyc
 jkpsyd
 jkpttbn8r 8r jkpttbn8a
 jkpttbnc
-jkpttbne
+jkpttbne kpfonts-expert-tt jkpttbne
 jkpttbsl8r 8r jkpttbn8a -s 0.167
 jkpttbslc default jkpttbnc -s 0.167
-jkpttbsle default jkpttbne -s 0.167
+jkpttbsle kpfonts-expert-tt jkpttbne -s 0.167
 jkpttmn8r 8r jkpttmn8a
 jkpttmnc
-jkpttmne
+jkpttmne kpfonts-expert-tt jkpttmne
 jkpttmsl8r 8r jkpttmn8a -s 0.167
 jkpttmslc default jkpttmnc -s 0.167
-jkpttmsle default jkpttmne -s 0.167
+jkpttmsle kpfonts-expert-tt jkpttmne -s 0.167
 jthb8v t5d Tahoma-Bold
 jthr8v t5d Tahoma
 jvnb8v t5d Verdana-Bold
@@ -9341,7 +9341,6 @@ xyeubt11 default xyeubt10 -e 1.1 -r
 xyeubt12 default xyeubt10 -e 1.2 -r
 yfrak
 ygoth
-yhcmex10 default yhcmex
 ylyb8r 8r ylyb8a
 ylyb8s libris-supp ylyb8a
 ylybi8r 8r ylybi8a
diff --git a/Master/texmf/fonts/map/dvipdfm/updmap/dvipdfm_dl14.map b/Master/texmf/fonts/map/dvipdfm/updmap/dvipdfm_dl14.map
index 75228dd55ba..2cd2ed2b66b 100644
--- a/Master/texmf/fonts/map/dvipdfm/updmap/dvipdfm_dl14.map
+++ b/Master/texmf/fonts/map/dvipdfm/updmap/dvipdfm_dl14.map
@@ -3984,19 +3984,19 @@ jkpbex
 jkpbexa
 jkpbit8r 8r jkpbit8a
 jkpbitc
-jkpbite
+jkpbite kpfonts-expert jkpbite
 jkpbmi
 jkpbmia
 jkpbn8r 8r jkpbn8a
 jkpbnc
-jkpbne
+jkpbne kpfonts-expert jkpbne
 jkpbsc8r 8r jkpbsc8a
-jkpbsce
+jkpbsce kpfonts-expert-sc jkpbsce
 jkpbscsl8r 8r jkpbsc8a -s 0.167
-jkpbscsle default jkpbsce -s 0.167
+jkpbscsle kpfonts-expert-sc jkpbsce -s 0.167
 jkpbsl8r 8r jkpbn8a -s 0.167
 jkpbslc default jkpbnc -s 0.167
-jkpbsle default jkpbne -s 0.167
+jkpbsle kpfonts-expert jkpbne -s 0.167
 jkpbsy
 jkpbsya
 jkpbsyb
@@ -4004,82 +4004,82 @@ jkpbsyc
 jkpbsyd
 jkpbxit8r 8r jkpbit8a -e 1.125
 jkpbxitc default jkpbitc -e 1.125
-jkpbxite default jkpbite -e 1.125
+jkpbxite kpfonts-expert jkpbite -e 1.125
 jkpbxn8r 8r jkpbn8a -e 1.125
 jkpbxnc default jkpbnc -e 1.125
-jkpbxne default jkpbne -e 1.125
+jkpbxne kpfonts-expert jkpbne -e 1.125
 jkpbxsc8r 8r jkpbsc8a -e 1.125
-jkpbxsce default jkpbsce -e 1.125
+jkpbxsce kpfonts-expert-sc jkpbsce -e 1.125
 jkpbxscsl8r 8r jkpbsc8a -e 1.125 -s 0.167
-jkpbxscsle default jkpbsce -e 1.125 -s 0.167
+jkpbxscsle kpfonts-expert-sc jkpbsce -e 1.125 -s 0.167
 jkpbxsl8r 8r jkpbn8a -e 1.125 -s 0.167
 jkpbxslc default jkpbnc -e 1.125 -s 0.167
-jkpbxsle default jkpbne -e 1.125 -s 0.167
+jkpbxsle kpfonts-expert jkpbne -e 1.125 -s 0.167
 jkpex
 jkpexa
-jkpkbsc
-jkpkbscsl default jkpkbsc -s 0.167
-jkpkbxsc default jkpkbsc -e 1.125
-jkpkbxscsl default jkpkbsc -e 1.125 -s 0.167
-jkpkmsc
-jkpkmscsl default jkpkmsc -s 0.167
+jkpkbsc kpfonts-large-sc jkpkbsc
+jkpkbscsl kpfonts-large-sc jkpkbsc -s 0.167
+jkpkbxsc kpfonts-large-sc jkpkbsc -e 1.125
+jkpkbxscsl kpfonts-large-sc jkpkbsc -e 1.125 -s 0.167
+jkpkmsc kpfonts-large-sc jkpkmsc
+jkpkmscsl kpfonts-large-sc jkpkmsc -s 0.167
 jkplbex
 jkplbexa
 jkplbit8r 8r jkplbit8a
 jkplbitc
-jkplbite
+jkplbite kpfonts-expert jkplbite
 jkplbmi
 jkplbmia
 jkplbn8r 8r jkplbn8a
 jkplbnc
-jkplbne
+jkplbne kpfonts-expert jkplbne
 jkplbsc8r 8r jkplbsc8a
-jkplbsce
+jkplbsce kpfonts-expert-sc jkplbsce
 jkplbscsl8r 8r jkplbsc8a -s 0.167
-jkplbscsle default jkplbsce -s 0.167
+jkplbscsle kpfonts-expert-sc jkplbsce -s 0.167
 jkplbsl8r 8r jkplbn8a -s 0.167
 jkplbslc default jkplbnc -s 0.167
-jkplbsle default jkplbne -s 0.167
+jkplbsle kpfonts-expert jkplbne -s 0.167
 jkplbsy
 jkplbsyb
 jkplbsyc
 jkplbsyd
 jkplbxit8r 8r jkplbit8a -e 1.125
 jkplbxitc default jkplbitc -e 1.125
-jkplbxite default jkplbite -e 1.125
+jkplbxite kpfonts-expert jkplbite -e 1.125
 jkplbxn8r 8r jkplbn8a -e 1.125
 jkplbxnc default jkplbnc -e 1.125
-jkplbxne default jkplbne -e 1.125
+jkplbxne kpfonts-expert jkplbne -e 1.125
 jkplbxsc8r 8r jkplbsc8a -e 1.125
-jkplbxsce default jkplbsce -e 1.125
+jkplbxsce kpfonts-expert-sc jkplbsce -e 1.125
 jkplbxscsl8r 8r jkplbsc8a -e 1.125 -s 0.167
-jkplbxscsle default jkplbsce -e 1.125 -s 0.167
+jkplbxscsle kpfonts-expert-sc jkplbsce -e 1.125 -s 0.167
 jkplbxsl8r 8r jkplbn8a -e 1.125 -s 0.167
 jkplbxslc default jkplbnc -e 1.125 -s 0.167
-jkplbxsle default jkplbne -e 1.125 -s 0.167
+jkplbxsle kpfonts-expert jkplbne -e 1.125 -s 0.167
 jkplex
 jkplexa
-jkplkbsc
-jkplkbscsl default jkplkbsc -s 0.167
-jkplkbxsc default jkplkbsc -e 1.125
-jkplkbxscsl default jkplkbsc -e 1.125 -s 0.167
-jkplkmsc
-jkplkmscsl default jkplkmsc -s 0.167
+jkplkbsc kpfonts-large-sc jkplkbsc
+jkplkbscsl kpfonts-large-sc jkplkbsc -s 0.167
+jkplkbxsc kpfonts-large-sc jkplkbsc -e 1.125
+jkplkbxscsl kpfonts-large-sc jkplkbsc -e 1.125 -s 0.167
+jkplkmsc kpfonts-large-sc jkplkmsc
+jkplkmscsl kpfonts-large-sc jkplkmsc -s 0.167
 jkplmi
 jkplmia
 jkplmit8r 8r jkplmit8a
 jkplmitc
-jkplmite
+jkplmite kpfonts-expert jkplmite
 jkplmn8r 8r jkplmn8a
 jkplmnc
-jkplmne
+jkplmne kpfonts-expert jkplmne
 jkplmsc8r 8r jkplmsc8a
-jkplmsce
+jkplmsce kpfonts-expert-sc jkplmsce
 jkplmscsl8r 8r jkplmsc8a -s 0.167
-jkplmscsle default jkplmsce -s 0.167
+jkplmscsle kpfonts-expert-sc jkplmsce -s 0.167
 jkplmsl8r 8r jkplmn8a -s 0.167
 jkplmslc default jkplmnc -s 0.167
-jkplmsle default jkplmne -s 0.167
+jkplmsle kpfonts-expert jkplmne -s 0.167
 jkplsy
 jkplsyb
 jkplsyc
@@ -4088,53 +4088,53 @@ jkpmi
 jkpmia
 jkpmit8r 8r jkpmit8a
 jkpmitc
-jkpmite
+jkpmite kpfonts-expert jkpmite
 jkpmn8r 8r jkpmn8a
 jkpmnc
-jkpmne
+jkpmne kpfonts-expert jkpmne
 jkpmsc8r 8r jkpmsc8a
-jkpmsce
+jkpmsce kpfonts-expert-sc jkpmsce
 jkpmscsl8r 8r jkpmsc8a -s 0.167
-jkpmscsle default jkpmsce -s 0.167
+jkpmscsle kpfonts-expert-sc jkpmsce -s 0.167
 jkpmsl8r 8r jkpmn8a -s 0.167
 jkpmslc default jkpmnc -s 0.167
-jkpmsle default jkpmne -s 0.167
+jkpmsle kpfonts-expert jkpmne -s 0.167
 jkpssbn8r 8r jkpssbn8a
 jkpssbnc
-jkpssbne
+jkpssbne kpfonts-expert jkpssbne
 jkpssbsc8r 8r jkpssbsc8a
-jkpssbsce
+jkpssbsce kpfonts-expert-sc jkpssbsce
 jkpssbscsl8r 8r jkpssbsc8a -s 0.167
-jkpssbscsle default jkpssbsce -s 0.167
+jkpssbscsle kpfonts-expert-sc jkpssbsce -s 0.167
 jkpssbsl8r 8r jkpssbn8a -s 0.167
 jkpssbslc default jkpssbnc -s 0.167
-jkpssbsle default jkpssbne -s 0.167
+jkpssbsle kpfonts-expert jkpssbne -s 0.167
 jkpssbxn8r 8r jkpssbn8a -e 1.125
 jkpssbxnc default jkpssbnc -e 1.125
-jkpssbxne default jkpssbne -e 1.125
+jkpssbxne kpfonts-expert jkpssbne -e 1.125
 jkpssbxsc8r 8r jkpssbsc8a -e 1.125
-jkpssbxsce default jkpssbsce -e 1.125
+jkpssbxsce kpfonts-expert-sc jkpssbsce -e 1.125
 jkpssbxscsl8r 8r jkpssbsc8a -e 1.125 -s 0.167
-jkpssbxscsle default jkpssbsce -e 1.125 -s 0.167
+jkpssbxscsle kpfonts-expert-sc jkpssbsce -e 1.125 -s 0.167
 jkpssbxsl8r 8r jkpssbn8a -e 1.125 -s 0.167
 jkpssbxslc default jkpssbnc -e 1.125 -s 0.167
-jkpssbxsle default jkpssbne -e 1.125 -s 0.167
-jkpsskbsc
-jkpsskbscsl default jkpsskbsc -s 0.167
-jkpsskbxsc default jkpsskbsc -e 1.125
-jkpsskbxscsl default jkpsskbsc -e 1.125 -s 0.167
-jkpsskmsc
-jkpsskmscsl default jkpsskmsc -s 0.167
+jkpssbxsle kpfonts-expert jkpssbne -e 1.125 -s 0.167
+jkpsskbsc kpfonts-large-sc jkpsskbsc
+jkpsskbscsl kpfonts-large-sc jkpsskbsc -s 0.167
+jkpsskbxsc kpfonts-large-sc jkpsskbsc -e 1.125
+jkpsskbxscsl kpfonts-large-sc jkpsskbsc -e 1.125 -s 0.167
+jkpsskmsc kpfonts-large-sc jkpsskmsc
+jkpsskmscsl kpfonts-large-sc jkpsskmsc -s 0.167
 jkpssmn8r 8r jkpssmn8a
 jkpssmnc
-jkpssmne
+jkpssmne kpfonts-expert jkpssmne
 jkpssmsc8r 8r jkpssmsc8a
-jkpssmsce
+jkpssmsce kpfonts-expert-sc jkpssmsce
 jkpssmscsl8r 8r jkpssmsc8a -s 0.167
-jkpssmscsle default jkpssmsce -s 0.167
+jkpssmscsle kpfonts-expert-sc jkpssmsce -s 0.167
 jkpssmsl8r 8r jkpssmn8a -s 0.167
 jkpssmslc default jkpssmnc -s 0.167
-jkpssmsle default jkpssmne -s 0.167
+jkpssmsle kpfonts-expert jkpssmne -s 0.167
 jkpsy
 jkpsya
 jkpsyb
@@ -4142,16 +4142,16 @@ jkpsyc
 jkpsyd
 jkpttbn8r 8r jkpttbn8a
 jkpttbnc
-jkpttbne
+jkpttbne kpfonts-expert-tt jkpttbne
 jkpttbsl8r 8r jkpttbn8a -s 0.167
 jkpttbslc default jkpttbnc -s 0.167
-jkpttbsle default jkpttbne -s 0.167
+jkpttbsle kpfonts-expert-tt jkpttbne -s 0.167
 jkpttmn8r 8r jkpttmn8a
 jkpttmnc
-jkpttmne
+jkpttmne kpfonts-expert-tt jkpttmne
 jkpttmsl8r 8r jkpttmn8a -s 0.167
 jkpttmslc default jkpttmnc -s 0.167
-jkpttmsle default jkpttmne -s 0.167
+jkpttmsle kpfonts-expert-tt jkpttmne -s 0.167
 jthb8v t5d Tahoma-Bold
 jthr8v t5d Tahoma
 jvnb8v t5d Verdana-Bold
@@ -9341,7 +9341,6 @@ xyeubt11 default xyeubt10 -e 1.1 -r
 xyeubt12 default xyeubt10 -e 1.2 -r
 yfrak
 ygoth
-yhcmex10 default yhcmex
 ylyb8r 8r ylyb8a
 ylyb8s libris-supp ylyb8a
 ylybi8r 8r ylybi8a
diff --git a/Master/texmf/fonts/map/dvipdfm/updmap/dvipdfm_ndl14.map b/Master/texmf/fonts/map/dvipdfm/updmap/dvipdfm_ndl14.map
index 71a6fbd46fb..ebc3f5dbc55 100644
--- a/Master/texmf/fonts/map/dvipdfm/updmap/dvipdfm_ndl14.map
+++ b/Master/texmf/fonts/map/dvipdfm/updmap/dvipdfm_ndl14.map
@@ -3984,19 +3984,19 @@ jkpbex
 jkpbexa
 jkpbit8r 8r jkpbit8a
 jkpbitc
-jkpbite
+jkpbite kpfonts-expert jkpbite
 jkpbmi
 jkpbmia
 jkpbn8r 8r jkpbn8a
 jkpbnc
-jkpbne
+jkpbne kpfonts-expert jkpbne
 jkpbsc8r 8r jkpbsc8a
-jkpbsce
+jkpbsce kpfonts-expert-sc jkpbsce
 jkpbscsl8r 8r jkpbsc8a -s 0.167
-jkpbscsle default jkpbsce -s 0.167
+jkpbscsle kpfonts-expert-sc jkpbsce -s 0.167
 jkpbsl8r 8r jkpbn8a -s 0.167
 jkpbslc default jkpbnc -s 0.167
-jkpbsle default jkpbne -s 0.167
+jkpbsle kpfonts-expert jkpbne -s 0.167
 jkpbsy
 jkpbsya
 jkpbsyb
@@ -4004,82 +4004,82 @@ jkpbsyc
 jkpbsyd
 jkpbxit8r 8r jkpbit8a -e 1.125
 jkpbxitc default jkpbitc -e 1.125
-jkpbxite default jkpbite -e 1.125
+jkpbxite kpfonts-expert jkpbite -e 1.125
 jkpbxn8r 8r jkpbn8a -e 1.125
 jkpbxnc default jkpbnc -e 1.125
-jkpbxne default jkpbne -e 1.125
+jkpbxne kpfonts-expert jkpbne -e 1.125
 jkpbxsc8r 8r jkpbsc8a -e 1.125
-jkpbxsce default jkpbsce -e 1.125
+jkpbxsce kpfonts-expert-sc jkpbsce -e 1.125
 jkpbxscsl8r 8r jkpbsc8a -e 1.125 -s 0.167
-jkpbxscsle default jkpbsce -e 1.125 -s 0.167
+jkpbxscsle kpfonts-expert-sc jkpbsce -e 1.125 -s 0.167
 jkpbxsl8r 8r jkpbn8a -e 1.125 -s 0.167
 jkpbxslc default jkpbnc -e 1.125 -s 0.167
-jkpbxsle default jkpbne -e 1.125 -s 0.167
+jkpbxsle kpfonts-expert jkpbne -e 1.125 -s 0.167
 jkpex
 jkpexa
-jkpkbsc
-jkpkbscsl default jkpkbsc -s 0.167
-jkpkbxsc default jkpkbsc -e 1.125
-jkpkbxscsl default jkpkbsc -e 1.125 -s 0.167
-jkpkmsc
-jkpkmscsl default jkpkmsc -s 0.167
+jkpkbsc kpfonts-large-sc jkpkbsc
+jkpkbscsl kpfonts-large-sc jkpkbsc -s 0.167
+jkpkbxsc kpfonts-large-sc jkpkbsc -e 1.125
+jkpkbxscsl kpfonts-large-sc jkpkbsc -e 1.125 -s 0.167
+jkpkmsc kpfonts-large-sc jkpkmsc
+jkpkmscsl kpfonts-large-sc jkpkmsc -s 0.167
 jkplbex
 jkplbexa
 jkplbit8r 8r jkplbit8a
 jkplbitc
-jkplbite
+jkplbite kpfonts-expert jkplbite
 jkplbmi
 jkplbmia
 jkplbn8r 8r jkplbn8a
 jkplbnc
-jkplbne
+jkplbne kpfonts-expert jkplbne
 jkplbsc8r 8r jkplbsc8a
-jkplbsce
+jkplbsce kpfonts-expert-sc jkplbsce
 jkplbscsl8r 8r jkplbsc8a -s 0.167
-jkplbscsle default jkplbsce -s 0.167
+jkplbscsle kpfonts-expert-sc jkplbsce -s 0.167
 jkplbsl8r 8r jkplbn8a -s 0.167
 jkplbslc default jkplbnc -s 0.167
-jkplbsle default jkplbne -s 0.167
+jkplbsle kpfonts-expert jkplbne -s 0.167
 jkplbsy
 jkplbsyb
 jkplbsyc
 jkplbsyd
 jkplbxit8r 8r jkplbit8a -e 1.125
 jkplbxitc default jkplbitc -e 1.125
-jkplbxite default jkplbite -e 1.125
+jkplbxite kpfonts-expert jkplbite -e 1.125
 jkplbxn8r 8r jkplbn8a -e 1.125
 jkplbxnc default jkplbnc -e 1.125
-jkplbxne default jkplbne -e 1.125
+jkplbxne kpfonts-expert jkplbne -e 1.125
 jkplbxsc8r 8r jkplbsc8a -e 1.125
-jkplbxsce default jkplbsce -e 1.125
+jkplbxsce kpfonts-expert-sc jkplbsce -e 1.125
 jkplbxscsl8r 8r jkplbsc8a -e 1.125 -s 0.167
-jkplbxscsle default jkplbsce -e 1.125 -s 0.167
+jkplbxscsle kpfonts-expert-sc jkplbsce -e 1.125 -s 0.167
 jkplbxsl8r 8r jkplbn8a -e 1.125 -s 0.167
 jkplbxslc default jkplbnc -e 1.125 -s 0.167
-jkplbxsle default jkplbne -e 1.125 -s 0.167
+jkplbxsle kpfonts-expert jkplbne -e 1.125 -s 0.167
 jkplex
 jkplexa
-jkplkbsc
-jkplkbscsl default jkplkbsc -s 0.167
-jkplkbxsc default jkplkbsc -e 1.125
-jkplkbxscsl default jkplkbsc -e 1.125 -s 0.167
-jkplkmsc
-jkplkmscsl default jkplkmsc -s 0.167
+jkplkbsc kpfonts-large-sc jkplkbsc
+jkplkbscsl kpfonts-large-sc jkplkbsc -s 0.167
+jkplkbxsc kpfonts-large-sc jkplkbsc -e 1.125
+jkplkbxscsl kpfonts-large-sc jkplkbsc -e 1.125 -s 0.167
+jkplkmsc kpfonts-large-sc jkplkmsc
+jkplkmscsl kpfonts-large-sc jkplkmsc -s 0.167
 jkplmi
 jkplmia
 jkplmit8r 8r jkplmit8a
 jkplmitc
-jkplmite
+jkplmite kpfonts-expert jkplmite
 jkplmn8r 8r jkplmn8a
 jkplmnc
-jkplmne
+jkplmne kpfonts-expert jkplmne
 jkplmsc8r 8r jkplmsc8a
-jkplmsce
+jkplmsce kpfonts-expert-sc jkplmsce
 jkplmscsl8r 8r jkplmsc8a -s 0.167
-jkplmscsle default jkplmsce -s 0.167
+jkplmscsle kpfonts-expert-sc jkplmsce -s 0.167
 jkplmsl8r 8r jkplmn8a -s 0.167
 jkplmslc default jkplmnc -s 0.167
-jkplmsle default jkplmne -s 0.167
+jkplmsle kpfonts-expert jkplmne -s 0.167
 jkplsy
 jkplsyb
 jkplsyc
@@ -4088,53 +4088,53 @@ jkpmi
 jkpmia
 jkpmit8r 8r jkpmit8a
 jkpmitc
-jkpmite
+jkpmite kpfonts-expert jkpmite
 jkpmn8r 8r jkpmn8a
 jkpmnc
-jkpmne
+jkpmne kpfonts-expert jkpmne
 jkpmsc8r 8r jkpmsc8a
-jkpmsce
+jkpmsce kpfonts-expert-sc jkpmsce
 jkpmscsl8r 8r jkpmsc8a -s 0.167
-jkpmscsle default jkpmsce -s 0.167
+jkpmscsle kpfonts-expert-sc jkpmsce -s 0.167
 jkpmsl8r 8r jkpmn8a -s 0.167
 jkpmslc default jkpmnc -s 0.167
-jkpmsle default jkpmne -s 0.167
+jkpmsle kpfonts-expert jkpmne -s 0.167
 jkpssbn8r 8r jkpssbn8a
 jkpssbnc
-jkpssbne
+jkpssbne kpfonts-expert jkpssbne
 jkpssbsc8r 8r jkpssbsc8a
-jkpssbsce
+jkpssbsce kpfonts-expert-sc jkpssbsce
 jkpssbscsl8r 8r jkpssbsc8a -s 0.167
-jkpssbscsle default jkpssbsce -s 0.167
+jkpssbscsle kpfonts-expert-sc jkpssbsce -s 0.167
 jkpssbsl8r 8r jkpssbn8a -s 0.167
 jkpssbslc default jkpssbnc -s 0.167
-jkpssbsle default jkpssbne -s 0.167
+jkpssbsle kpfonts-expert jkpssbne -s 0.167
 jkpssbxn8r 8r jkpssbn8a -e 1.125
 jkpssbxnc default jkpssbnc -e 1.125
-jkpssbxne default jkpssbne -e 1.125
+jkpssbxne kpfonts-expert jkpssbne -e 1.125
 jkpssbxsc8r 8r jkpssbsc8a -e 1.125
-jkpssbxsce default jkpssbsce -e 1.125
+jkpssbxsce kpfonts-expert-sc jkpssbsce -e 1.125
 jkpssbxscsl8r 8r jkpssbsc8a -e 1.125 -s 0.167
-jkpssbxscsle default jkpssbsce -e 1.125 -s 0.167
+jkpssbxscsle kpfonts-expert-sc jkpssbsce -e 1.125 -s 0.167
 jkpssbxsl8r 8r jkpssbn8a -e 1.125 -s 0.167
 jkpssbxslc default jkpssbnc -e 1.125 -s 0.167
-jkpssbxsle default jkpssbne -e 1.125 -s 0.167
-jkpsskbsc
-jkpsskbscsl default jkpsskbsc -s 0.167
-jkpsskbxsc default jkpsskbsc -e 1.125
-jkpsskbxscsl default jkpsskbsc -e 1.125 -s 0.167
-jkpsskmsc
-jkpsskmscsl default jkpsskmsc -s 0.167
+jkpssbxsle kpfonts-expert jkpssbne -e 1.125 -s 0.167
+jkpsskbsc kpfonts-large-sc jkpsskbsc
+jkpsskbscsl kpfonts-large-sc jkpsskbsc -s 0.167
+jkpsskbxsc kpfonts-large-sc jkpsskbsc -e 1.125
+jkpsskbxscsl kpfonts-large-sc jkpsskbsc -e 1.125 -s 0.167
+jkpsskmsc kpfonts-large-sc jkpsskmsc
+jkpsskmscsl kpfonts-large-sc jkpsskmsc -s 0.167
 jkpssmn8r 8r jkpssmn8a
 jkpssmnc
-jkpssmne
+jkpssmne kpfonts-expert jkpssmne
 jkpssmsc8r 8r jkpssmsc8a
-jkpssmsce
+jkpssmsce kpfonts-expert-sc jkpssmsce
 jkpssmscsl8r 8r jkpssmsc8a -s 0.167
-jkpssmscsle default jkpssmsce -s 0.167
+jkpssmscsle kpfonts-expert-sc jkpssmsce -s 0.167
 jkpssmsl8r 8r jkpssmn8a -s 0.167
 jkpssmslc default jkpssmnc -s 0.167
-jkpssmsle default jkpssmne -s 0.167
+jkpssmsle kpfonts-expert jkpssmne -s 0.167
 jkpsy
 jkpsya
 jkpsyb
@@ -4142,16 +4142,16 @@ jkpsyc
 jkpsyd
 jkpttbn8r 8r jkpttbn8a
 jkpttbnc
-jkpttbne
+jkpttbne kpfonts-expert-tt jkpttbne
 jkpttbsl8r 8r jkpttbn8a -s 0.167
 jkpttbslc default jkpttbnc -s 0.167
-jkpttbsle default jkpttbne -s 0.167
+jkpttbsle kpfonts-expert-tt jkpttbne -s 0.167
 jkpttmn8r 8r jkpttmn8a
 jkpttmnc
-jkpttmne
+jkpttmne kpfonts-expert-tt jkpttmne
 jkpttmsl8r 8r jkpttmn8a -s 0.167
 jkpttmslc default jkpttmnc -s 0.167
-jkpttmsle default jkpttmne -s 0.167
+jkpttmsle kpfonts-expert-tt jkpttmne -s 0.167
 jthb8v t5d Tahoma-Bold
 jthr8v t5d Tahoma
 jvnb8v t5d Verdana-Bold
@@ -9341,7 +9341,6 @@ xyeubt11 default xyeubt10 -e 1.1 -r
 xyeubt12 default xyeubt10 -e 1.2 -r
 yfrak
 ygoth
-yhcmex10 default yhcmex
 ylyb8r 8r ylyb8a
 ylyb8s libris-supp ylyb8a
 ylybi8r 8r ylybi8a
diff --git a/Master/texmf/fonts/map/dvips/updmap/ps2pk.map b/Master/texmf/fonts/map/dvips/updmap/ps2pk.map
index 3880643ccb9..7b4f61d6308 100644
--- a/Master/texmf/fonts/map/dvips/updmap/ps2pk.map
+++ b/Master/texmf/fonts/map/dvips/updmap/ps2pk.map
@@ -3982,104 +3982,104 @@ itclq8 ISFLQ8 "TS1Encoding ReEncodeFont" <cm-super-ts1.enc <isflq8.pfb
 itcltt8 ISFLTT8 "TS1Encoding ReEncodeFont" <cm-super-ts1.enc <isfltt8.pfb
 jkpbex Kp--M-Ex-Medium <jkpbex.pfb
 jkpbexa Kp--M-Exa-Medium <jkpbexa.pfb
-jkpbit8r Kp-MediumItalic <8r.enc <jkpbit8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpbit8r Kp-MediumItalic "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpbit8a.pfb
 jkpbitc Kp-Companion-MediumItalic <jkpbitc.pfb
-jkpbite Kp-Expert-MediumItalic <jkpbite.pfb
+jkpbite Kp-Expert-MediumItalic "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpbite.pfb
 jkpbmi Kp--M-MediumItalic <jkpbmi.pfb
 jkpbmia Kp--M-Medium <jkpbmia.pfb
-jkpbn8r Kp-Medium <8r.enc <jkpbn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpbn8r Kp-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpbn8a.pfb
 jkpbnc Kp-Companion-Medium <jkpbnc.pfb
-jkpbne Kp-Expert-Medium <jkpbne.pfb
-jkpbsc8r Kp-Smallcaps-Medium <8r.enc <jkpbsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkpbsce Kp-SC-Expert-Medium <jkpbsce.pfb
-jkpbscsl8r Kp-Smallcaps-Medium <8r.enc <jkpbsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpbscsle Kp-SC-Expert-Medium <jkpbsce.pfb "0.167 SlantFont" 
-jkpbsl8r Kp-Medium <8r.enc <jkpbn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpbslc Kp-Companion-Medium <jkpbnc.pfb "0.167 SlantFont" 
-jkpbsle Kp-Expert-Medium <jkpbne.pfb "0.167 SlantFont" 
+jkpbne Kp-Expert-Medium "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpbne.pfb
+jkpbsc8r Kp-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpbsc8a.pfb
+jkpbsce Kp-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkpbsce.pfb
+jkpbscsl8r Kp-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpbsc8a.pfb
+jkpbscsle Kp-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpbsce.pfb
+jkpbsl8r Kp-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpbn8a.pfb
+jkpbslc Kp-Companion-Medium "0.167 SlantFont" <jkpbnc.pfb
+jkpbsle Kp-Expert-Medium "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkpbne.pfb
 jkpbsy Kp--M-Sy-Medium <jkpbsy.pfb
 jkpbsya Kp--M-Sya-Medium <jkpbsya.pfb
 jkpbsyb Kp--M-Syb-Medium <jkpbsyb.pfb
 jkpbsyc Kp--M-Syc-Medium <jkpbsyc.pfb
 jkpbsyd Kp--M-Syd-Medium <jkpbsyd.pfb
-jkpbxit8r Kp-MediumItalic <8r.enc <jkpbit8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkpbxitc Kp-Companion-MediumItalic <jkpbitc.pfb "1.125 ExtendFont" 
-jkpbxite Kp-Expert-MediumItalic <jkpbite.pfb "1.125 ExtendFont" 
-jkpbxn8r Kp-Medium <8r.enc <jkpbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkpbxnc Kp-Companion-Medium <jkpbnc.pfb "1.125 ExtendFont" 
-jkpbxne Kp-Expert-Medium <jkpbne.pfb "1.125 ExtendFont" 
-jkpbxsc8r Kp-Smallcaps-Medium <8r.enc <jkpbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkpbxsce Kp-SC-Expert-Medium <jkpbsce.pfb "1.125 ExtendFont" 
-jkpbxscsl8r Kp-Smallcaps-Medium <8r.enc <jkpbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkpbxscsle Kp-SC-Expert-Medium <jkpbsce.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpbxsl8r Kp-Medium <8r.enc <jkpbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkpbxslc Kp-Companion-Medium <jkpbnc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpbxsle Kp-Expert-Medium <jkpbne.pfb "1.125 ExtendFont 0.167 SlantFont" 
+jkpbxit8r Kp-MediumItalic "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkpbit8a.pfb
+jkpbxitc Kp-Companion-MediumItalic "1.125 ExtendFont" <jkpbitc.pfb
+jkpbxite Kp-Expert-MediumItalic "KPFonts-Expert ReEncodeFont 1.125 ExtendFont" <kpfonts-expert.enc <jkpbite.pfb
+jkpbxn8r Kp-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkpbn8a.pfb
+jkpbxnc Kp-Companion-Medium "1.125 ExtendFont" <jkpbnc.pfb
+jkpbxne Kp-Expert-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont" <kpfonts-expert.enc <jkpbne.pfb
+jkpbxsc8r Kp-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkpbsc8a.pfb
+jkpbxsce Kp-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-expert-sc.enc <jkpbsce.pfb
+jkpbxscsl8r Kp-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkpbsc8a.pfb
+jkpbxscsle Kp-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpbsce.pfb
+jkpbxsl8r Kp-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkpbn8a.pfb
+jkpbxslc Kp-Companion-Medium "1.125 ExtendFont 0.167 SlantFont" <jkpbnc.pfb
+jkpbxsle Kp-Expert-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert.enc <jkpbne.pfb
 jkpex Kp--M-Ex-Regular <jkpex.pfb
 jkpexa Kp--M-Exa-Regular <jkpexa.pfb
-jkpkbsc Kp-LargeSmallCaps-Medium <jkpkbsc.pfb
-jkpkbscsl Kp-LargeSmallCaps-Medium <jkpkbsc.pfb "0.167 SlantFont" 
-jkpkbxsc Kp-LargeSmallCaps-Medium <jkpkbsc.pfb "1.125 ExtendFont" 
-jkpkbxscsl Kp-LargeSmallCaps-Medium <jkpkbsc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpkmsc Kp-LargeSmallCaps-Regular <jkpkmsc.pfb
-jkpkmscsl Kp-LargeSmallCaps-Regular <jkpkmsc.pfb "0.167 SlantFont" 
+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
+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
 jkplbexa Kp-Light-M-Exa-Medium <jkplbexa.pfb
-jkplbit8r Kp-Light-MediumItalic <8r.enc <jkplbit8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkplbit8r Kp-Light-MediumItalic "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplbit8a.pfb
 jkplbitc Kp-Light-Companion-MediumItalic <jkplbitc.pfb
-jkplbite Kp-Light-Expert-MediumItalic <jkplbite.pfb
+jkplbite Kp-Light-Expert-MediumItalic "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkplbite.pfb
 jkplbmi Kp-Light-M-MediumItalic <jkplbmi.pfb
 jkplbmia Kp-Light-M-Medium <jkplbmia.pfb
-jkplbn8r Kp-Light-Medium <8r.enc <jkplbn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkplbn8r Kp-Light-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplbn8a.pfb
 jkplbnc Kp-Light-Companion-Medium <jkplbnc.pfb
-jkplbne Kp-Light-Expert-Medium <jkplbne.pfb
-jkplbsc8r Kp-Light-Smallcaps-Medium <8r.enc <jkplbsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkplbsce Kp-Light-SC-Expert-Medium <jkplbsce.pfb
-jkplbscsl8r Kp-Light-Smallcaps-Medium <8r.enc <jkplbsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkplbscsle Kp-Light-SC-Expert-Medium <jkplbsce.pfb "0.167 SlantFont" 
-jkplbsl8r Kp-Light-Medium <8r.enc <jkplbn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkplbslc Kp-Light-Companion-Medium <jkplbnc.pfb "0.167 SlantFont" 
-jkplbsle Kp-Light-Expert-Medium <jkplbne.pfb "0.167 SlantFont" 
+jkplbne Kp-Light-Expert-Medium "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkplbne.pfb
+jkplbsc8r Kp-Light-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplbsc8a.pfb
+jkplbsce Kp-Light-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkplbsce.pfb
+jkplbscsl8r Kp-Light-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkplbsc8a.pfb
+jkplbscsle Kp-Light-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkplbsce.pfb
+jkplbsl8r Kp-Light-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkplbn8a.pfb
+jkplbslc Kp-Light-Companion-Medium "0.167 SlantFont" <jkplbnc.pfb
+jkplbsle Kp-Light-Expert-Medium "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkplbne.pfb
 jkplbsy Kp-Light-M-Sy-Medium <jkplbsy.pfb
 jkplbsyb Kp-Light-M-Syb-Medium <jkplbsyb.pfb
 jkplbsyc Kp-Light-M-Syc-Medium <jkplbsyc.pfb
 jkplbsyd Kp-Light-M-Syd-Medium <jkplbsyd.pfb
-jkplbxit8r Kp-Light-MediumItalic <8r.enc <jkplbit8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkplbxitc Kp-Light-Companion-MediumItalic <jkplbitc.pfb "1.125 ExtendFont" 
-jkplbxite Kp-Light-Expert-MediumItalic <jkplbite.pfb "1.125 ExtendFont" 
-jkplbxn8r Kp-Light-Medium <8r.enc <jkplbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkplbxnc Kp-Light-Companion-Medium <jkplbnc.pfb "1.125 ExtendFont" 
-jkplbxne Kp-Light-Expert-Medium <jkplbne.pfb "1.125 ExtendFont" 
-jkplbxsc8r Kp-Light-Smallcaps-Medium <8r.enc <jkplbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkplbxsce Kp-Light-SC-Expert-Medium <jkplbsce.pfb "1.125 ExtendFont" 
-jkplbxscsl8r Kp-Light-Smallcaps-Medium <8r.enc <jkplbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkplbxscsle Kp-Light-SC-Expert-Medium <jkplbsce.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkplbxsl8r Kp-Light-Medium <8r.enc <jkplbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkplbxslc Kp-Light-Companion-Medium <jkplbnc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkplbxsle Kp-Light-Expert-Medium <jkplbne.pfb "1.125 ExtendFont 0.167 SlantFont" 
+jkplbxit8r Kp-Light-MediumItalic "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkplbit8a.pfb
+jkplbxitc Kp-Light-Companion-MediumItalic "1.125 ExtendFont" <jkplbitc.pfb
+jkplbxite Kp-Light-Expert-MediumItalic "KPFonts-Expert ReEncodeFont 1.125 ExtendFont" <kpfonts-expert.enc <jkplbite.pfb
+jkplbxn8r Kp-Light-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkplbn8a.pfb
+jkplbxnc Kp-Light-Companion-Medium "1.125 ExtendFont" <jkplbnc.pfb
+jkplbxne Kp-Light-Expert-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont" <kpfonts-expert.enc <jkplbne.pfb
+jkplbxsc8r Kp-Light-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkplbsc8a.pfb
+jkplbxsce Kp-Light-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-expert-sc.enc <jkplbsce.pfb
+jkplbxscsl8r Kp-Light-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkplbsc8a.pfb
+jkplbxscsle Kp-Light-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkplbsce.pfb
+jkplbxsl8r Kp-Light-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkplbn8a.pfb
+jkplbxslc Kp-Light-Companion-Medium "1.125 ExtendFont 0.167 SlantFont" <jkplbnc.pfb
+jkplbxsle Kp-Light-Expert-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert.enc <jkplbne.pfb
 jkplex Kp-Light-M-Ex-Regular <jkplex.pfb
 jkplexa Kp-Light-M-Exa-Regular <jkplexa.pfb
-jkplkbsc Kp-Light-LargeSmallCaps-Medium <jkplkbsc.pfb
-jkplkbscsl Kp-Light-LargeSmallCaps-Medium <jkplkbsc.pfb "0.167 SlantFont" 
-jkplkbxsc Kp-Light-LargeSmallCaps-Medium <jkplkbsc.pfb "1.125 ExtendFont" 
-jkplkbxscsl Kp-Light-LargeSmallCaps-Medium <jkplkbsc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkplkmsc Kp-Light-LargeSmallCaps-Regular <jkplkmsc.pfb
-jkplkmscsl Kp-Light-LargeSmallCaps-Regular <jkplkmsc.pfb "0.167 SlantFont" 
+jkplkbsc Kp-Light-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkplkbsc.pfb
+jkplkbscsl Kp-Light-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkplkbsc.pfb
+jkplkbxsc Kp-Light-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-large-sc.enc <jkplkbsc.pfb
+jkplkbxscsl Kp-Light-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkplkbsc.pfb
+jkplkmsc Kp-Light-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkplkmsc.pfb
+jkplkmscsl Kp-Light-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkplkmsc.pfb
 jkplmi Kp-Light-M-Italic <jkplmi.pfb
 jkplmia Kp-Light-M-Regular <jkplmia.pfb
-jkplmit8r Kp-Light-Italic <8r.enc <jkplmit8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkplmit8r Kp-Light-Italic "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplmit8a.pfb
 jkplmitc Kp-Light-Companion-Italic <jkplmitc.pfb
-jkplmite Kp-Light-Expert-Italic <jkplmite.pfb
-jkplmn8r Kp-Light-Regular <8r.enc <jkplmn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkplmite Kp-Light-Expert-Italic "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkplmite.pfb
+jkplmn8r Kp-Light-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplmn8a.pfb
 jkplmnc Kp-Light-Companion-Regular <jkplmnc.pfb
-jkplmne Kp-Light-Expert-Regular <jkplmne.pfb
-jkplmsc8r Kp-Light-SmallCaps-Regular <8r.enc <jkplmsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkplmsce Kp-Light-SC-Expert-Regular <jkplmsce.pfb
-jkplmscsl8r Kp-Light-SmallCaps-Regular <8r.enc <jkplmsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkplmscsle Kp-Light-SC-Expert-Regular <jkplmsce.pfb "0.167 SlantFont" 
-jkplmsl8r Kp-Light-Regular <8r.enc <jkplmn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkplmslc Kp-Light-Companion-Regular <jkplmnc.pfb "0.167 SlantFont" 
-jkplmsle Kp-Light-Expert-Regular <jkplmne.pfb "0.167 SlantFont" 
+jkplmne Kp-Light-Expert-Regular "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkplmne.pfb
+jkplmsc8r Kp-Light-SmallCaps-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplmsc8a.pfb
+jkplmsce Kp-Light-SC-Expert-Regular "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkplmsce.pfb
+jkplmscsl8r Kp-Light-SmallCaps-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkplmsc8a.pfb
+jkplmscsle Kp-Light-SC-Expert-Regular "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkplmsce.pfb
+jkplmsl8r Kp-Light-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkplmn8a.pfb
+jkplmslc Kp-Light-Companion-Regular "0.167 SlantFont" <jkplmnc.pfb
+jkplmsle Kp-Light-Expert-Regular "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkplmne.pfb
 jkplsy Kp-Light-M-Sy-Regular <jkplsy.pfb
 jkplsyb Kp-Light-M-Syb-Regular <jkplsyb.pfb
 jkplsyc Kp-Light-M-Syc-Regular <jkplsyc.pfb
@@ -4088,70 +4088,70 @@ jkpmi Kp--M-Italic <jkpmi.pfb
 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 <jkpmite.pfb
-jkpmn8r Kp-Regular <8r.enc <jkpmn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpmite Kp-Expert-Italic "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpmite.pfb
+jkpmn8r Kp-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpmn8a.pfb
 jkpmnc Kp-Companion-Regular <jkpmnc.pfb
-jkpmne Kp-Expert-Regular <jkpmne.pfb
-jkpmsc8r Kp-SmallCaps-Regular <8r.enc <jkpmsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkpmsce Kp-SC-Expert-Regular <jkpmsce.pfb
-jkpmscsl8r Kp-SmallCaps-Regular <8r.enc <jkpmsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpmscsle Kp-SC-Expert-Regular <jkpmsce.pfb "0.167 SlantFont" 
-jkpmsl8r Kp-Regular <8r.enc <jkpmn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpmslc Kp-Companion-Regular <jkpmnc.pfb "0.167 SlantFont" 
-jkpmsle Kp-Expert-Regular <jkpmne.pfb "0.167 SlantFont" 
-jkpssbn8r Sf-Kp-Medium <8r.enc <jkpssbn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpmne Kp-Expert-Regular "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpmne.pfb
+jkpmsc8r Kp-SmallCaps-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpmsc8a.pfb
+jkpmsce Kp-SC-Expert-Regular "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkpmsce.pfb
+jkpmscsl8r Kp-SmallCaps-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpmsc8a.pfb
+jkpmscsle Kp-SC-Expert-Regular "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpmsce.pfb
+jkpmsl8r Kp-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpmn8a.pfb
+jkpmslc Kp-Companion-Regular "0.167 SlantFont" <jkpmnc.pfb
+jkpmsle Kp-Expert-Regular "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkpmne.pfb
+jkpssbn8r Sf-Kp-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpssbn8a.pfb
 jkpssbnc Sf-Kp-Companion-Medium <jkpssbnc.pfb
-jkpssbne Sf-Kp-Exp-Medium <jkpssbne.pfb
-jkpssbsc8r Sf-Kp-Sc-Medium <8r.enc <jkpssbsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkpssbsce Sf-Kp-Sc-Exp-Medium <jkpssbsce.pfb
-jkpssbscsl8r Sf-Kp-Sc-Medium <8r.enc <jkpssbsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpssbscsle Sf-Kp-Sc-Exp-Medium <jkpssbsce.pfb "0.167 SlantFont" 
-jkpssbsl8r Sf-Kp-Medium <8r.enc <jkpssbn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpssbslc Sf-Kp-Companion-Medium <jkpssbnc.pfb "0.167 SlantFont" 
-jkpssbsle Sf-Kp-Exp-Medium <jkpssbne.pfb "0.167 SlantFont" 
-jkpssbxn8r Sf-Kp-Medium <8r.enc <jkpssbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkpssbxnc Sf-Kp-Companion-Medium <jkpssbnc.pfb "1.125 ExtendFont" 
-jkpssbxne Sf-Kp-Exp-Medium <jkpssbne.pfb "1.125 ExtendFont" 
-jkpssbxsc8r Sf-Kp-Sc-Medium <8r.enc <jkpssbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkpssbxsce Sf-Kp-Sc-Exp-Medium <jkpssbsce.pfb "1.125 ExtendFont" 
-jkpssbxscsl8r Sf-Kp-Sc-Medium <8r.enc <jkpssbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkpssbxscsle Sf-Kp-Sc-Exp-Medium <jkpssbsce.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpssbxsl8r Sf-Kp-Medium <8r.enc <jkpssbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkpssbxslc Sf-Kp-Companion-Medium <jkpssbnc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpssbxsle Sf-Kp-Exp-Medium <jkpssbne.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpsskbsc Sf-Kp-LargeSmallCaps-Medium <jkpsskbsc.pfb
-jkpsskbscsl Sf-Kp-LargeSmallCaps-Medium <jkpsskbsc.pfb "0.167 SlantFont" 
-jkpsskbxsc Sf-Kp-LargeSmallCaps-Medium <jkpsskbsc.pfb "1.125 ExtendFont" 
-jkpsskbxscsl Sf-Kp-LargeSmallCaps-Medium <jkpsskbsc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpsskmsc Sf-Kp-LargeSmallCaps-Regular <jkpsskmsc.pfb
-jkpsskmscsl Sf-Kp-LargeSmallCaps-Regular <jkpsskmsc.pfb "0.167 SlantFont" 
-jkpssmn8r Sf-Kp-Regular <8r.enc <jkpssmn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpssbne Sf-Kp-Exp-Medium "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpssbne.pfb
+jkpssbsc8r Sf-Kp-Sc-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpssbsc8a.pfb
+jkpssbsce Sf-Kp-Sc-Exp-Medium "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkpssbsce.pfb
+jkpssbscsl8r Sf-Kp-Sc-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpssbsc8a.pfb
+jkpssbscsle Sf-Kp-Sc-Exp-Medium "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpssbsce.pfb
+jkpssbsl8r Sf-Kp-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpssbn8a.pfb
+jkpssbslc Sf-Kp-Companion-Medium "0.167 SlantFont" <jkpssbnc.pfb
+jkpssbsle Sf-Kp-Exp-Medium "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkpssbne.pfb
+jkpssbxn8r Sf-Kp-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkpssbn8a.pfb
+jkpssbxnc Sf-Kp-Companion-Medium "1.125 ExtendFont" <jkpssbnc.pfb
+jkpssbxne Sf-Kp-Exp-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont" <kpfonts-expert.enc <jkpssbne.pfb
+jkpssbxsc8r Sf-Kp-Sc-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkpssbsc8a.pfb
+jkpssbxsce Sf-Kp-Sc-Exp-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-expert-sc.enc <jkpssbsce.pfb
+jkpssbxscsl8r Sf-Kp-Sc-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkpssbsc8a.pfb
+jkpssbxscsle Sf-Kp-Sc-Exp-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpssbsce.pfb
+jkpssbxsl8r Sf-Kp-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkpssbn8a.pfb
+jkpssbxslc Sf-Kp-Companion-Medium "1.125 ExtendFont 0.167 SlantFont" <jkpssbnc.pfb
+jkpssbxsle Sf-Kp-Exp-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert.enc <jkpssbne.pfb
+jkpsskbsc Sf-Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkpsskbsc.pfb
+jkpsskbscsl Sf-Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpsskbsc.pfb
+jkpsskbxsc Sf-Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-large-sc.enc <jkpsskbsc.pfb
+jkpsskbxscsl Sf-Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpsskbsc.pfb
+jkpsskmsc Sf-Kp-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkpsskmsc.pfb
+jkpsskmscsl Sf-Kp-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpsskmsc.pfb
+jkpssmn8r Sf-Kp-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpssmn8a.pfb
 jkpssmnc Sf-Kp-Comp-Regular <jkpssmnc.pfb
-jkpssmne Sf-Kp-Exp-Regular <jkpssmne.pfb
-jkpssmsc8r Sf-Kp-Sc-Regular <8r.enc <jkpssmsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkpssmsce Sf-Kp-Sc-Exp-Regular <jkpssmsce.pfb
-jkpssmscsl8r Sf-Kp-Sc-Regular <8r.enc <jkpssmsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpssmscsle Sf-Kp-Sc-Exp-Regular <jkpssmsce.pfb "0.167 SlantFont" 
-jkpssmsl8r Sf-Kp-Regular <8r.enc <jkpssmn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpssmslc Sf-Kp-Comp-Regular <jkpssmnc.pfb "0.167 SlantFont" 
-jkpssmsle Sf-Kp-Exp-Regular <jkpssmne.pfb "0.167 SlantFont" 
+jkpssmne Sf-Kp-Exp-Regular "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpssmne.pfb
+jkpssmsc8r Sf-Kp-Sc-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpssmsc8a.pfb
+jkpssmsce Sf-Kp-Sc-Exp-Regular "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkpssmsce.pfb
+jkpssmscsl8r Sf-Kp-Sc-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpssmsc8a.pfb
+jkpssmscsle Sf-Kp-Sc-Exp-Regular "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpssmsce.pfb
+jkpssmsl8r Sf-Kp-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpssmn8a.pfb
+jkpssmslc Sf-Kp-Comp-Regular "0.167 SlantFont" <jkpssmnc.pfb
+jkpssmsle Sf-Kp-Exp-Regular "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkpssmne.pfb
 jkpsy Kp--M-Sy-Regular <jkpsy.pfb
 jkpsya Kp--M-Sya-Regular <jkpsya.pfb
 jkpsyb Kp--M-Syb-Regular <jkpsyb.pfb
 jkpsyc Kp--M-Syc-Regular <jkpsyc.pfb
 jkpsyd Kp--M-Syd-Regular <jkpsyd.pfb
-jkpttbn8r Tt-Kp-Medium <8r.enc <jkpttbn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpttbn8r Tt-Kp-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpttbn8a.pfb
 jkpttbnc Tt-Kp-Comp-Medium <jkpttbnc.pfb
-jkpttbne Tt-Kp-Exp-Medium <jkpttbne.pfb
-jkpttbsl8r Tt-Kp-Medium <8r.enc <jkpttbn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpttbslc Tt-Kp-Comp-Medium <jkpttbnc.pfb "0.167 SlantFont" 
-jkpttbsle Tt-Kp-Exp-Medium <jkpttbne.pfb "0.167 SlantFont" 
-jkpttmn8r Tt-Kp-Regular <8r.enc <jkpttmn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpttbne Tt-Kp-Exp-Medium "KPFonts-Expert-TT ReEncodeFont" <kpfonts-expert-tt.enc <jkpttbne.pfb
+jkpttbsl8r Tt-Kp-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpttbn8a.pfb
+jkpttbslc Tt-Kp-Comp-Medium "0.167 SlantFont" <jkpttbnc.pfb
+jkpttbsle Tt-Kp-Exp-Medium "KPFonts-Expert-TT ReEncodeFont 0.167 SlantFont" <kpfonts-expert-tt.enc <jkpttbne.pfb
+jkpttmn8r Tt-Kp-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpttmn8a.pfb
 jkpttmnc Tt-Kp-Comp-Regular <jkpttmnc.pfb
-jkpttmne Tt-Kp-Exp-Regular <jkpttmne.pfb
-jkpttmsl8r Tt-Kp-Regular <8r.enc <jkpttmn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpttmslc Tt-Kp-Comp-Regular <jkpttmnc.pfb "0.167 SlantFont" 
-jkpttmsle Tt-Kp-Exp-Regular <jkpttmne.pfb "0.167 SlantFont" 
+jkpttmne Tt-Kp-Exp-Regular "KPFonts-Expert-TT ReEncodeFont" <kpfonts-expert-tt.enc <jkpttmne.pfb
+jkpttmsl8r Tt-Kp-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpttmn8a.pfb
+jkpttmslc Tt-Kp-Comp-Regular "0.167 SlantFont" <jkpttmnc.pfb
+jkpttmsle Tt-Kp-Exp-Regular "KPFonts-Expert-TT ReEncodeFont 0.167 SlantFont" <kpfonts-expert-tt.enc <jkpttmne.pfb
 jthb8v Tahoma-Bold "T5DEncoding ReEncodeFont" <t5d.enc <tahomabd.ttf
 jthr8v Tahoma "T5DEncoding ReEncodeFont" <t5d.enc <tahoma.ttf
 jvnb8v Verdana-Bold "T5DEncoding ReEncodeFont" <t5d.enc <verdanab.ttf
@@ -9341,7 +9341,6 @@ xyeubt11 XYEUBT10 "1.1 ExtendFont" <xyeubt10.pfb
 xyeubt12 XYEUBT10 "1.2 ExtendFont" <xyeubt10.pfb
 yfrak yfrak-Regular <yfrak.pfb
 ygoth ygoth-Regular <ygoth.pfb
-yhcmex10 Yhcmex <yhcmex.pfb
 ylyb8r LibrisADFStd-Bold <8r.enc <ylyb8a.pfb "TeXBase1Encoding ReEncodeFont" 
 ylyb8s LibrisADFStd-Bold <libris-supp.enc <ylyb8a.pfb "fontinst-autoenc-libris-supp ReEncodeFont" 
 ylybi8r LibrisADFStd-BoldItalic <8r.enc <ylybi8a.pfb "TeXBase1Encoding ReEncodeFont" 
diff --git a/Master/texmf/fonts/map/dvips/updmap/psfonts.map b/Master/texmf/fonts/map/dvips/updmap/psfonts.map
index 85a0bab32b3..48f7022f80e 100644
--- a/Master/texmf/fonts/map/dvips/updmap/psfonts.map
+++ b/Master/texmf/fonts/map/dvips/updmap/psfonts.map
@@ -3982,104 +3982,104 @@ itclq8 ISFLQ8 "TS1Encoding ReEncodeFont" <cm-super-ts1.enc <isflq8.pfb
 itcltt8 ISFLTT8 "TS1Encoding ReEncodeFont" <cm-super-ts1.enc <isfltt8.pfb
 jkpbex Kp--M-Ex-Medium <jkpbex.pfb
 jkpbexa Kp--M-Exa-Medium <jkpbexa.pfb
-jkpbit8r Kp-MediumItalic <8r.enc <jkpbit8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpbit8r Kp-MediumItalic "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpbit8a.pfb
 jkpbitc Kp-Companion-MediumItalic <jkpbitc.pfb
-jkpbite Kp-Expert-MediumItalic <jkpbite.pfb
+jkpbite Kp-Expert-MediumItalic "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpbite.pfb
 jkpbmi Kp--M-MediumItalic <jkpbmi.pfb
 jkpbmia Kp--M-Medium <jkpbmia.pfb
-jkpbn8r Kp-Medium <8r.enc <jkpbn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpbn8r Kp-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpbn8a.pfb
 jkpbnc Kp-Companion-Medium <jkpbnc.pfb
-jkpbne Kp-Expert-Medium <jkpbne.pfb
-jkpbsc8r Kp-Smallcaps-Medium <8r.enc <jkpbsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkpbsce Kp-SC-Expert-Medium <jkpbsce.pfb
-jkpbscsl8r Kp-Smallcaps-Medium <8r.enc <jkpbsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpbscsle Kp-SC-Expert-Medium <jkpbsce.pfb "0.167 SlantFont" 
-jkpbsl8r Kp-Medium <8r.enc <jkpbn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpbslc Kp-Companion-Medium <jkpbnc.pfb "0.167 SlantFont" 
-jkpbsle Kp-Expert-Medium <jkpbne.pfb "0.167 SlantFont" 
+jkpbne Kp-Expert-Medium "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpbne.pfb
+jkpbsc8r Kp-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpbsc8a.pfb
+jkpbsce Kp-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkpbsce.pfb
+jkpbscsl8r Kp-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpbsc8a.pfb
+jkpbscsle Kp-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpbsce.pfb
+jkpbsl8r Kp-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpbn8a.pfb
+jkpbslc Kp-Companion-Medium "0.167 SlantFont" <jkpbnc.pfb
+jkpbsle Kp-Expert-Medium "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkpbne.pfb
 jkpbsy Kp--M-Sy-Medium <jkpbsy.pfb
 jkpbsya Kp--M-Sya-Medium <jkpbsya.pfb
 jkpbsyb Kp--M-Syb-Medium <jkpbsyb.pfb
 jkpbsyc Kp--M-Syc-Medium <jkpbsyc.pfb
 jkpbsyd Kp--M-Syd-Medium <jkpbsyd.pfb
-jkpbxit8r Kp-MediumItalic <8r.enc <jkpbit8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkpbxitc Kp-Companion-MediumItalic <jkpbitc.pfb "1.125 ExtendFont" 
-jkpbxite Kp-Expert-MediumItalic <jkpbite.pfb "1.125 ExtendFont" 
-jkpbxn8r Kp-Medium <8r.enc <jkpbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkpbxnc Kp-Companion-Medium <jkpbnc.pfb "1.125 ExtendFont" 
-jkpbxne Kp-Expert-Medium <jkpbne.pfb "1.125 ExtendFont" 
-jkpbxsc8r Kp-Smallcaps-Medium <8r.enc <jkpbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkpbxsce Kp-SC-Expert-Medium <jkpbsce.pfb "1.125 ExtendFont" 
-jkpbxscsl8r Kp-Smallcaps-Medium <8r.enc <jkpbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkpbxscsle Kp-SC-Expert-Medium <jkpbsce.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpbxsl8r Kp-Medium <8r.enc <jkpbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkpbxslc Kp-Companion-Medium <jkpbnc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpbxsle Kp-Expert-Medium <jkpbne.pfb "1.125 ExtendFont 0.167 SlantFont" 
+jkpbxit8r Kp-MediumItalic "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkpbit8a.pfb
+jkpbxitc Kp-Companion-MediumItalic "1.125 ExtendFont" <jkpbitc.pfb
+jkpbxite Kp-Expert-MediumItalic "KPFonts-Expert ReEncodeFont 1.125 ExtendFont" <kpfonts-expert.enc <jkpbite.pfb
+jkpbxn8r Kp-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkpbn8a.pfb
+jkpbxnc Kp-Companion-Medium "1.125 ExtendFont" <jkpbnc.pfb
+jkpbxne Kp-Expert-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont" <kpfonts-expert.enc <jkpbne.pfb
+jkpbxsc8r Kp-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkpbsc8a.pfb
+jkpbxsce Kp-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-expert-sc.enc <jkpbsce.pfb
+jkpbxscsl8r Kp-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkpbsc8a.pfb
+jkpbxscsle Kp-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpbsce.pfb
+jkpbxsl8r Kp-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkpbn8a.pfb
+jkpbxslc Kp-Companion-Medium "1.125 ExtendFont 0.167 SlantFont" <jkpbnc.pfb
+jkpbxsle Kp-Expert-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert.enc <jkpbne.pfb
 jkpex Kp--M-Ex-Regular <jkpex.pfb
 jkpexa Kp--M-Exa-Regular <jkpexa.pfb
-jkpkbsc Kp-LargeSmallCaps-Medium <jkpkbsc.pfb
-jkpkbscsl Kp-LargeSmallCaps-Medium <jkpkbsc.pfb "0.167 SlantFont" 
-jkpkbxsc Kp-LargeSmallCaps-Medium <jkpkbsc.pfb "1.125 ExtendFont" 
-jkpkbxscsl Kp-LargeSmallCaps-Medium <jkpkbsc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpkmsc Kp-LargeSmallCaps-Regular <jkpkmsc.pfb
-jkpkmscsl Kp-LargeSmallCaps-Regular <jkpkmsc.pfb "0.167 SlantFont" 
+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
+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
 jkplbexa Kp-Light-M-Exa-Medium <jkplbexa.pfb
-jkplbit8r Kp-Light-MediumItalic <8r.enc <jkplbit8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkplbit8r Kp-Light-MediumItalic "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplbit8a.pfb
 jkplbitc Kp-Light-Companion-MediumItalic <jkplbitc.pfb
-jkplbite Kp-Light-Expert-MediumItalic <jkplbite.pfb
+jkplbite Kp-Light-Expert-MediumItalic "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkplbite.pfb
 jkplbmi Kp-Light-M-MediumItalic <jkplbmi.pfb
 jkplbmia Kp-Light-M-Medium <jkplbmia.pfb
-jkplbn8r Kp-Light-Medium <8r.enc <jkplbn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkplbn8r Kp-Light-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplbn8a.pfb
 jkplbnc Kp-Light-Companion-Medium <jkplbnc.pfb
-jkplbne Kp-Light-Expert-Medium <jkplbne.pfb
-jkplbsc8r Kp-Light-Smallcaps-Medium <8r.enc <jkplbsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkplbsce Kp-Light-SC-Expert-Medium <jkplbsce.pfb
-jkplbscsl8r Kp-Light-Smallcaps-Medium <8r.enc <jkplbsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkplbscsle Kp-Light-SC-Expert-Medium <jkplbsce.pfb "0.167 SlantFont" 
-jkplbsl8r Kp-Light-Medium <8r.enc <jkplbn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkplbslc Kp-Light-Companion-Medium <jkplbnc.pfb "0.167 SlantFont" 
-jkplbsle Kp-Light-Expert-Medium <jkplbne.pfb "0.167 SlantFont" 
+jkplbne Kp-Light-Expert-Medium "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkplbne.pfb
+jkplbsc8r Kp-Light-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplbsc8a.pfb
+jkplbsce Kp-Light-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkplbsce.pfb
+jkplbscsl8r Kp-Light-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkplbsc8a.pfb
+jkplbscsle Kp-Light-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkplbsce.pfb
+jkplbsl8r Kp-Light-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkplbn8a.pfb
+jkplbslc Kp-Light-Companion-Medium "0.167 SlantFont" <jkplbnc.pfb
+jkplbsle Kp-Light-Expert-Medium "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkplbne.pfb
 jkplbsy Kp-Light-M-Sy-Medium <jkplbsy.pfb
 jkplbsyb Kp-Light-M-Syb-Medium <jkplbsyb.pfb
 jkplbsyc Kp-Light-M-Syc-Medium <jkplbsyc.pfb
 jkplbsyd Kp-Light-M-Syd-Medium <jkplbsyd.pfb
-jkplbxit8r Kp-Light-MediumItalic <8r.enc <jkplbit8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkplbxitc Kp-Light-Companion-MediumItalic <jkplbitc.pfb "1.125 ExtendFont" 
-jkplbxite Kp-Light-Expert-MediumItalic <jkplbite.pfb "1.125 ExtendFont" 
-jkplbxn8r Kp-Light-Medium <8r.enc <jkplbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkplbxnc Kp-Light-Companion-Medium <jkplbnc.pfb "1.125 ExtendFont" 
-jkplbxne Kp-Light-Expert-Medium <jkplbne.pfb "1.125 ExtendFont" 
-jkplbxsc8r Kp-Light-Smallcaps-Medium <8r.enc <jkplbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkplbxsce Kp-Light-SC-Expert-Medium <jkplbsce.pfb "1.125 ExtendFont" 
-jkplbxscsl8r Kp-Light-Smallcaps-Medium <8r.enc <jkplbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkplbxscsle Kp-Light-SC-Expert-Medium <jkplbsce.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkplbxsl8r Kp-Light-Medium <8r.enc <jkplbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkplbxslc Kp-Light-Companion-Medium <jkplbnc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkplbxsle Kp-Light-Expert-Medium <jkplbne.pfb "1.125 ExtendFont 0.167 SlantFont" 
+jkplbxit8r Kp-Light-MediumItalic "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkplbit8a.pfb
+jkplbxitc Kp-Light-Companion-MediumItalic "1.125 ExtendFont" <jkplbitc.pfb
+jkplbxite Kp-Light-Expert-MediumItalic "KPFonts-Expert ReEncodeFont 1.125 ExtendFont" <kpfonts-expert.enc <jkplbite.pfb
+jkplbxn8r Kp-Light-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkplbn8a.pfb
+jkplbxnc Kp-Light-Companion-Medium "1.125 ExtendFont" <jkplbnc.pfb
+jkplbxne Kp-Light-Expert-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont" <kpfonts-expert.enc <jkplbne.pfb
+jkplbxsc8r Kp-Light-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkplbsc8a.pfb
+jkplbxsce Kp-Light-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-expert-sc.enc <jkplbsce.pfb
+jkplbxscsl8r Kp-Light-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkplbsc8a.pfb
+jkplbxscsle Kp-Light-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkplbsce.pfb
+jkplbxsl8r Kp-Light-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkplbn8a.pfb
+jkplbxslc Kp-Light-Companion-Medium "1.125 ExtendFont 0.167 SlantFont" <jkplbnc.pfb
+jkplbxsle Kp-Light-Expert-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert.enc <jkplbne.pfb
 jkplex Kp-Light-M-Ex-Regular <jkplex.pfb
 jkplexa Kp-Light-M-Exa-Regular <jkplexa.pfb
-jkplkbsc Kp-Light-LargeSmallCaps-Medium <jkplkbsc.pfb
-jkplkbscsl Kp-Light-LargeSmallCaps-Medium <jkplkbsc.pfb "0.167 SlantFont" 
-jkplkbxsc Kp-Light-LargeSmallCaps-Medium <jkplkbsc.pfb "1.125 ExtendFont" 
-jkplkbxscsl Kp-Light-LargeSmallCaps-Medium <jkplkbsc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkplkmsc Kp-Light-LargeSmallCaps-Regular <jkplkmsc.pfb
-jkplkmscsl Kp-Light-LargeSmallCaps-Regular <jkplkmsc.pfb "0.167 SlantFont" 
+jkplkbsc Kp-Light-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkplkbsc.pfb
+jkplkbscsl Kp-Light-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkplkbsc.pfb
+jkplkbxsc Kp-Light-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-large-sc.enc <jkplkbsc.pfb
+jkplkbxscsl Kp-Light-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkplkbsc.pfb
+jkplkmsc Kp-Light-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkplkmsc.pfb
+jkplkmscsl Kp-Light-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkplkmsc.pfb
 jkplmi Kp-Light-M-Italic <jkplmi.pfb
 jkplmia Kp-Light-M-Regular <jkplmia.pfb
-jkplmit8r Kp-Light-Italic <8r.enc <jkplmit8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkplmit8r Kp-Light-Italic "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplmit8a.pfb
 jkplmitc Kp-Light-Companion-Italic <jkplmitc.pfb
-jkplmite Kp-Light-Expert-Italic <jkplmite.pfb
-jkplmn8r Kp-Light-Regular <8r.enc <jkplmn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkplmite Kp-Light-Expert-Italic "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkplmite.pfb
+jkplmn8r Kp-Light-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplmn8a.pfb
 jkplmnc Kp-Light-Companion-Regular <jkplmnc.pfb
-jkplmne Kp-Light-Expert-Regular <jkplmne.pfb
-jkplmsc8r Kp-Light-SmallCaps-Regular <8r.enc <jkplmsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkplmsce Kp-Light-SC-Expert-Regular <jkplmsce.pfb
-jkplmscsl8r Kp-Light-SmallCaps-Regular <8r.enc <jkplmsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkplmscsle Kp-Light-SC-Expert-Regular <jkplmsce.pfb "0.167 SlantFont" 
-jkplmsl8r Kp-Light-Regular <8r.enc <jkplmn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkplmslc Kp-Light-Companion-Regular <jkplmnc.pfb "0.167 SlantFont" 
-jkplmsle Kp-Light-Expert-Regular <jkplmne.pfb "0.167 SlantFont" 
+jkplmne Kp-Light-Expert-Regular "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkplmne.pfb
+jkplmsc8r Kp-Light-SmallCaps-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplmsc8a.pfb
+jkplmsce Kp-Light-SC-Expert-Regular "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkplmsce.pfb
+jkplmscsl8r Kp-Light-SmallCaps-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkplmsc8a.pfb
+jkplmscsle Kp-Light-SC-Expert-Regular "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkplmsce.pfb
+jkplmsl8r Kp-Light-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkplmn8a.pfb
+jkplmslc Kp-Light-Companion-Regular "0.167 SlantFont" <jkplmnc.pfb
+jkplmsle Kp-Light-Expert-Regular "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkplmne.pfb
 jkplsy Kp-Light-M-Sy-Regular <jkplsy.pfb
 jkplsyb Kp-Light-M-Syb-Regular <jkplsyb.pfb
 jkplsyc Kp-Light-M-Syc-Regular <jkplsyc.pfb
@@ -4088,70 +4088,70 @@ jkpmi Kp--M-Italic <jkpmi.pfb
 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 <jkpmite.pfb
-jkpmn8r Kp-Regular <8r.enc <jkpmn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpmite Kp-Expert-Italic "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpmite.pfb
+jkpmn8r Kp-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpmn8a.pfb
 jkpmnc Kp-Companion-Regular <jkpmnc.pfb
-jkpmne Kp-Expert-Regular <jkpmne.pfb
-jkpmsc8r Kp-SmallCaps-Regular <8r.enc <jkpmsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkpmsce Kp-SC-Expert-Regular <jkpmsce.pfb
-jkpmscsl8r Kp-SmallCaps-Regular <8r.enc <jkpmsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpmscsle Kp-SC-Expert-Regular <jkpmsce.pfb "0.167 SlantFont" 
-jkpmsl8r Kp-Regular <8r.enc <jkpmn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpmslc Kp-Companion-Regular <jkpmnc.pfb "0.167 SlantFont" 
-jkpmsle Kp-Expert-Regular <jkpmne.pfb "0.167 SlantFont" 
-jkpssbn8r Sf-Kp-Medium <8r.enc <jkpssbn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpmne Kp-Expert-Regular "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpmne.pfb
+jkpmsc8r Kp-SmallCaps-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpmsc8a.pfb
+jkpmsce Kp-SC-Expert-Regular "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkpmsce.pfb
+jkpmscsl8r Kp-SmallCaps-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpmsc8a.pfb
+jkpmscsle Kp-SC-Expert-Regular "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpmsce.pfb
+jkpmsl8r Kp-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpmn8a.pfb
+jkpmslc Kp-Companion-Regular "0.167 SlantFont" <jkpmnc.pfb
+jkpmsle Kp-Expert-Regular "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkpmne.pfb
+jkpssbn8r Sf-Kp-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpssbn8a.pfb
 jkpssbnc Sf-Kp-Companion-Medium <jkpssbnc.pfb
-jkpssbne Sf-Kp-Exp-Medium <jkpssbne.pfb
-jkpssbsc8r Sf-Kp-Sc-Medium <8r.enc <jkpssbsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkpssbsce Sf-Kp-Sc-Exp-Medium <jkpssbsce.pfb
-jkpssbscsl8r Sf-Kp-Sc-Medium <8r.enc <jkpssbsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpssbscsle Sf-Kp-Sc-Exp-Medium <jkpssbsce.pfb "0.167 SlantFont" 
-jkpssbsl8r Sf-Kp-Medium <8r.enc <jkpssbn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpssbslc Sf-Kp-Companion-Medium <jkpssbnc.pfb "0.167 SlantFont" 
-jkpssbsle Sf-Kp-Exp-Medium <jkpssbne.pfb "0.167 SlantFont" 
-jkpssbxn8r Sf-Kp-Medium <8r.enc <jkpssbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkpssbxnc Sf-Kp-Companion-Medium <jkpssbnc.pfb "1.125 ExtendFont" 
-jkpssbxne Sf-Kp-Exp-Medium <jkpssbne.pfb "1.125 ExtendFont" 
-jkpssbxsc8r Sf-Kp-Sc-Medium <8r.enc <jkpssbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkpssbxsce Sf-Kp-Sc-Exp-Medium <jkpssbsce.pfb "1.125 ExtendFont" 
-jkpssbxscsl8r Sf-Kp-Sc-Medium <8r.enc <jkpssbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkpssbxscsle Sf-Kp-Sc-Exp-Medium <jkpssbsce.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpssbxsl8r Sf-Kp-Medium <8r.enc <jkpssbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkpssbxslc Sf-Kp-Companion-Medium <jkpssbnc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpssbxsle Sf-Kp-Exp-Medium <jkpssbne.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpsskbsc Sf-Kp-LargeSmallCaps-Medium <jkpsskbsc.pfb
-jkpsskbscsl Sf-Kp-LargeSmallCaps-Medium <jkpsskbsc.pfb "0.167 SlantFont" 
-jkpsskbxsc Sf-Kp-LargeSmallCaps-Medium <jkpsskbsc.pfb "1.125 ExtendFont" 
-jkpsskbxscsl Sf-Kp-LargeSmallCaps-Medium <jkpsskbsc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpsskmsc Sf-Kp-LargeSmallCaps-Regular <jkpsskmsc.pfb
-jkpsskmscsl Sf-Kp-LargeSmallCaps-Regular <jkpsskmsc.pfb "0.167 SlantFont" 
-jkpssmn8r Sf-Kp-Regular <8r.enc <jkpssmn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpssbne Sf-Kp-Exp-Medium "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpssbne.pfb
+jkpssbsc8r Sf-Kp-Sc-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpssbsc8a.pfb
+jkpssbsce Sf-Kp-Sc-Exp-Medium "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkpssbsce.pfb
+jkpssbscsl8r Sf-Kp-Sc-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpssbsc8a.pfb
+jkpssbscsle Sf-Kp-Sc-Exp-Medium "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpssbsce.pfb
+jkpssbsl8r Sf-Kp-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpssbn8a.pfb
+jkpssbslc Sf-Kp-Companion-Medium "0.167 SlantFont" <jkpssbnc.pfb
+jkpssbsle Sf-Kp-Exp-Medium "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkpssbne.pfb
+jkpssbxn8r Sf-Kp-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkpssbn8a.pfb
+jkpssbxnc Sf-Kp-Companion-Medium "1.125 ExtendFont" <jkpssbnc.pfb
+jkpssbxne Sf-Kp-Exp-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont" <kpfonts-expert.enc <jkpssbne.pfb
+jkpssbxsc8r Sf-Kp-Sc-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkpssbsc8a.pfb
+jkpssbxsce Sf-Kp-Sc-Exp-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-expert-sc.enc <jkpssbsce.pfb
+jkpssbxscsl8r Sf-Kp-Sc-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkpssbsc8a.pfb
+jkpssbxscsle Sf-Kp-Sc-Exp-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpssbsce.pfb
+jkpssbxsl8r Sf-Kp-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkpssbn8a.pfb
+jkpssbxslc Sf-Kp-Companion-Medium "1.125 ExtendFont 0.167 SlantFont" <jkpssbnc.pfb
+jkpssbxsle Sf-Kp-Exp-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert.enc <jkpssbne.pfb
+jkpsskbsc Sf-Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkpsskbsc.pfb
+jkpsskbscsl Sf-Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpsskbsc.pfb
+jkpsskbxsc Sf-Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-large-sc.enc <jkpsskbsc.pfb
+jkpsskbxscsl Sf-Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpsskbsc.pfb
+jkpsskmsc Sf-Kp-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkpsskmsc.pfb
+jkpsskmscsl Sf-Kp-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpsskmsc.pfb
+jkpssmn8r Sf-Kp-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpssmn8a.pfb
 jkpssmnc Sf-Kp-Comp-Regular <jkpssmnc.pfb
-jkpssmne Sf-Kp-Exp-Regular <jkpssmne.pfb
-jkpssmsc8r Sf-Kp-Sc-Regular <8r.enc <jkpssmsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkpssmsce Sf-Kp-Sc-Exp-Regular <jkpssmsce.pfb
-jkpssmscsl8r Sf-Kp-Sc-Regular <8r.enc <jkpssmsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpssmscsle Sf-Kp-Sc-Exp-Regular <jkpssmsce.pfb "0.167 SlantFont" 
-jkpssmsl8r Sf-Kp-Regular <8r.enc <jkpssmn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpssmslc Sf-Kp-Comp-Regular <jkpssmnc.pfb "0.167 SlantFont" 
-jkpssmsle Sf-Kp-Exp-Regular <jkpssmne.pfb "0.167 SlantFont" 
+jkpssmne Sf-Kp-Exp-Regular "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpssmne.pfb
+jkpssmsc8r Sf-Kp-Sc-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpssmsc8a.pfb
+jkpssmsce Sf-Kp-Sc-Exp-Regular "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkpssmsce.pfb
+jkpssmscsl8r Sf-Kp-Sc-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpssmsc8a.pfb
+jkpssmscsle Sf-Kp-Sc-Exp-Regular "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpssmsce.pfb
+jkpssmsl8r Sf-Kp-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpssmn8a.pfb
+jkpssmslc Sf-Kp-Comp-Regular "0.167 SlantFont" <jkpssmnc.pfb
+jkpssmsle Sf-Kp-Exp-Regular "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkpssmne.pfb
 jkpsy Kp--M-Sy-Regular <jkpsy.pfb
 jkpsya Kp--M-Sya-Regular <jkpsya.pfb
 jkpsyb Kp--M-Syb-Regular <jkpsyb.pfb
 jkpsyc Kp--M-Syc-Regular <jkpsyc.pfb
 jkpsyd Kp--M-Syd-Regular <jkpsyd.pfb
-jkpttbn8r Tt-Kp-Medium <8r.enc <jkpttbn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpttbn8r Tt-Kp-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpttbn8a.pfb
 jkpttbnc Tt-Kp-Comp-Medium <jkpttbnc.pfb
-jkpttbne Tt-Kp-Exp-Medium <jkpttbne.pfb
-jkpttbsl8r Tt-Kp-Medium <8r.enc <jkpttbn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpttbslc Tt-Kp-Comp-Medium <jkpttbnc.pfb "0.167 SlantFont" 
-jkpttbsle Tt-Kp-Exp-Medium <jkpttbne.pfb "0.167 SlantFont" 
-jkpttmn8r Tt-Kp-Regular <8r.enc <jkpttmn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpttbne Tt-Kp-Exp-Medium "KPFonts-Expert-TT ReEncodeFont" <kpfonts-expert-tt.enc <jkpttbne.pfb
+jkpttbsl8r Tt-Kp-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpttbn8a.pfb
+jkpttbslc Tt-Kp-Comp-Medium "0.167 SlantFont" <jkpttbnc.pfb
+jkpttbsle Tt-Kp-Exp-Medium "KPFonts-Expert-TT ReEncodeFont 0.167 SlantFont" <kpfonts-expert-tt.enc <jkpttbne.pfb
+jkpttmn8r Tt-Kp-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpttmn8a.pfb
 jkpttmnc Tt-Kp-Comp-Regular <jkpttmnc.pfb
-jkpttmne Tt-Kp-Exp-Regular <jkpttmne.pfb
-jkpttmsl8r Tt-Kp-Regular <8r.enc <jkpttmn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpttmslc Tt-Kp-Comp-Regular <jkpttmnc.pfb "0.167 SlantFont" 
-jkpttmsle Tt-Kp-Exp-Regular <jkpttmne.pfb "0.167 SlantFont" 
+jkpttmne Tt-Kp-Exp-Regular "KPFonts-Expert-TT ReEncodeFont" <kpfonts-expert-tt.enc <jkpttmne.pfb
+jkpttmsl8r Tt-Kp-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpttmn8a.pfb
+jkpttmslc Tt-Kp-Comp-Regular "0.167 SlantFont" <jkpttmnc.pfb
+jkpttmsle Tt-Kp-Exp-Regular "KPFonts-Expert-TT ReEncodeFont 0.167 SlantFont" <kpfonts-expert-tt.enc <jkpttmne.pfb
 jthb8v Tahoma-Bold "T5DEncoding ReEncodeFont" <t5d.enc <tahomabd.ttf
 jthr8v Tahoma "T5DEncoding ReEncodeFont" <t5d.enc <tahoma.ttf
 jvnb8v Verdana-Bold "T5DEncoding ReEncodeFont" <t5d.enc <verdanab.ttf
@@ -9341,7 +9341,6 @@ xyeubt11 XYEUBT10 "1.1 ExtendFont" <xyeubt10.pfb
 xyeubt12 XYEUBT10 "1.2 ExtendFont" <xyeubt10.pfb
 yfrak yfrak-Regular <yfrak.pfb
 ygoth ygoth-Regular <ygoth.pfb
-yhcmex10 Yhcmex <yhcmex.pfb
 ylyb8r LibrisADFStd-Bold <8r.enc <ylyb8a.pfb "TeXBase1Encoding ReEncodeFont" 
 ylyb8s LibrisADFStd-Bold <libris-supp.enc <ylyb8a.pfb "fontinst-autoenc-libris-supp ReEncodeFont" 
 ylybi8r LibrisADFStd-BoldItalic <8r.enc <ylybi8a.pfb "TeXBase1Encoding ReEncodeFont" 
diff --git a/Master/texmf/fonts/map/dvips/updmap/psfonts_pk.map b/Master/texmf/fonts/map/dvips/updmap/psfonts_pk.map
index 5d196bdee3c..1ad4196daf1 100644
--- a/Master/texmf/fonts/map/dvips/updmap/psfonts_pk.map
+++ b/Master/texmf/fonts/map/dvips/updmap/psfonts_pk.map
@@ -1969,104 +1969,104 @@ hvo Helvetica-Oblique "TeXnANSIEncoding ReEncodeFont" <texnansi.enc
 icelandic icelandic <icelandic.pfb
 jkpbex Kp--M-Ex-Medium <jkpbex.pfb
 jkpbexa Kp--M-Exa-Medium <jkpbexa.pfb
-jkpbit8r Kp-MediumItalic <8r.enc <jkpbit8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpbit8r Kp-MediumItalic "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpbit8a.pfb
 jkpbitc Kp-Companion-MediumItalic <jkpbitc.pfb
-jkpbite Kp-Expert-MediumItalic <jkpbite.pfb
+jkpbite Kp-Expert-MediumItalic "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpbite.pfb
 jkpbmi Kp--M-MediumItalic <jkpbmi.pfb
 jkpbmia Kp--M-Medium <jkpbmia.pfb
-jkpbn8r Kp-Medium <8r.enc <jkpbn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpbn8r Kp-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpbn8a.pfb
 jkpbnc Kp-Companion-Medium <jkpbnc.pfb
-jkpbne Kp-Expert-Medium <jkpbne.pfb
-jkpbsc8r Kp-Smallcaps-Medium <8r.enc <jkpbsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkpbsce Kp-SC-Expert-Medium <jkpbsce.pfb
-jkpbscsl8r Kp-Smallcaps-Medium <8r.enc <jkpbsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpbscsle Kp-SC-Expert-Medium <jkpbsce.pfb "0.167 SlantFont" 
-jkpbsl8r Kp-Medium <8r.enc <jkpbn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpbslc Kp-Companion-Medium <jkpbnc.pfb "0.167 SlantFont" 
-jkpbsle Kp-Expert-Medium <jkpbne.pfb "0.167 SlantFont" 
+jkpbne Kp-Expert-Medium "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpbne.pfb
+jkpbsc8r Kp-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpbsc8a.pfb
+jkpbsce Kp-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkpbsce.pfb
+jkpbscsl8r Kp-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpbsc8a.pfb
+jkpbscsle Kp-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpbsce.pfb
+jkpbsl8r Kp-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpbn8a.pfb
+jkpbslc Kp-Companion-Medium "0.167 SlantFont" <jkpbnc.pfb
+jkpbsle Kp-Expert-Medium "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkpbne.pfb
 jkpbsy Kp--M-Sy-Medium <jkpbsy.pfb
 jkpbsya Kp--M-Sya-Medium <jkpbsya.pfb
 jkpbsyb Kp--M-Syb-Medium <jkpbsyb.pfb
 jkpbsyc Kp--M-Syc-Medium <jkpbsyc.pfb
 jkpbsyd Kp--M-Syd-Medium <jkpbsyd.pfb
-jkpbxit8r Kp-MediumItalic <8r.enc <jkpbit8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkpbxitc Kp-Companion-MediumItalic <jkpbitc.pfb "1.125 ExtendFont" 
-jkpbxite Kp-Expert-MediumItalic <jkpbite.pfb "1.125 ExtendFont" 
-jkpbxn8r Kp-Medium <8r.enc <jkpbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkpbxnc Kp-Companion-Medium <jkpbnc.pfb "1.125 ExtendFont" 
-jkpbxne Kp-Expert-Medium <jkpbne.pfb "1.125 ExtendFont" 
-jkpbxsc8r Kp-Smallcaps-Medium <8r.enc <jkpbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkpbxsce Kp-SC-Expert-Medium <jkpbsce.pfb "1.125 ExtendFont" 
-jkpbxscsl8r Kp-Smallcaps-Medium <8r.enc <jkpbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkpbxscsle Kp-SC-Expert-Medium <jkpbsce.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpbxsl8r Kp-Medium <8r.enc <jkpbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkpbxslc Kp-Companion-Medium <jkpbnc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpbxsle Kp-Expert-Medium <jkpbne.pfb "1.125 ExtendFont 0.167 SlantFont" 
+jkpbxit8r Kp-MediumItalic "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkpbit8a.pfb
+jkpbxitc Kp-Companion-MediumItalic "1.125 ExtendFont" <jkpbitc.pfb
+jkpbxite Kp-Expert-MediumItalic "KPFonts-Expert ReEncodeFont 1.125 ExtendFont" <kpfonts-expert.enc <jkpbite.pfb
+jkpbxn8r Kp-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkpbn8a.pfb
+jkpbxnc Kp-Companion-Medium "1.125 ExtendFont" <jkpbnc.pfb
+jkpbxne Kp-Expert-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont" <kpfonts-expert.enc <jkpbne.pfb
+jkpbxsc8r Kp-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkpbsc8a.pfb
+jkpbxsce Kp-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-expert-sc.enc <jkpbsce.pfb
+jkpbxscsl8r Kp-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkpbsc8a.pfb
+jkpbxscsle Kp-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpbsce.pfb
+jkpbxsl8r Kp-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkpbn8a.pfb
+jkpbxslc Kp-Companion-Medium "1.125 ExtendFont 0.167 SlantFont" <jkpbnc.pfb
+jkpbxsle Kp-Expert-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert.enc <jkpbne.pfb
 jkpex Kp--M-Ex-Regular <jkpex.pfb
 jkpexa Kp--M-Exa-Regular <jkpexa.pfb
-jkpkbsc Kp-LargeSmallCaps-Medium <jkpkbsc.pfb
-jkpkbscsl Kp-LargeSmallCaps-Medium <jkpkbsc.pfb "0.167 SlantFont" 
-jkpkbxsc Kp-LargeSmallCaps-Medium <jkpkbsc.pfb "1.125 ExtendFont" 
-jkpkbxscsl Kp-LargeSmallCaps-Medium <jkpkbsc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpkmsc Kp-LargeSmallCaps-Regular <jkpkmsc.pfb
-jkpkmscsl Kp-LargeSmallCaps-Regular <jkpkmsc.pfb "0.167 SlantFont" 
+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
+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
 jkplbexa Kp-Light-M-Exa-Medium <jkplbexa.pfb
-jkplbit8r Kp-Light-MediumItalic <8r.enc <jkplbit8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkplbit8r Kp-Light-MediumItalic "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplbit8a.pfb
 jkplbitc Kp-Light-Companion-MediumItalic <jkplbitc.pfb
-jkplbite Kp-Light-Expert-MediumItalic <jkplbite.pfb
+jkplbite Kp-Light-Expert-MediumItalic "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkplbite.pfb
 jkplbmi Kp-Light-M-MediumItalic <jkplbmi.pfb
 jkplbmia Kp-Light-M-Medium <jkplbmia.pfb
-jkplbn8r Kp-Light-Medium <8r.enc <jkplbn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkplbn8r Kp-Light-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplbn8a.pfb
 jkplbnc Kp-Light-Companion-Medium <jkplbnc.pfb
-jkplbne Kp-Light-Expert-Medium <jkplbne.pfb
-jkplbsc8r Kp-Light-Smallcaps-Medium <8r.enc <jkplbsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkplbsce Kp-Light-SC-Expert-Medium <jkplbsce.pfb
-jkplbscsl8r Kp-Light-Smallcaps-Medium <8r.enc <jkplbsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkplbscsle Kp-Light-SC-Expert-Medium <jkplbsce.pfb "0.167 SlantFont" 
-jkplbsl8r Kp-Light-Medium <8r.enc <jkplbn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkplbslc Kp-Light-Companion-Medium <jkplbnc.pfb "0.167 SlantFont" 
-jkplbsle Kp-Light-Expert-Medium <jkplbne.pfb "0.167 SlantFont" 
+jkplbne Kp-Light-Expert-Medium "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkplbne.pfb
+jkplbsc8r Kp-Light-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplbsc8a.pfb
+jkplbsce Kp-Light-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkplbsce.pfb
+jkplbscsl8r Kp-Light-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkplbsc8a.pfb
+jkplbscsle Kp-Light-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkplbsce.pfb
+jkplbsl8r Kp-Light-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkplbn8a.pfb
+jkplbslc Kp-Light-Companion-Medium "0.167 SlantFont" <jkplbnc.pfb
+jkplbsle Kp-Light-Expert-Medium "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkplbne.pfb
 jkplbsy Kp-Light-M-Sy-Medium <jkplbsy.pfb
 jkplbsyb Kp-Light-M-Syb-Medium <jkplbsyb.pfb
 jkplbsyc Kp-Light-M-Syc-Medium <jkplbsyc.pfb
 jkplbsyd Kp-Light-M-Syd-Medium <jkplbsyd.pfb
-jkplbxit8r Kp-Light-MediumItalic <8r.enc <jkplbit8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkplbxitc Kp-Light-Companion-MediumItalic <jkplbitc.pfb "1.125 ExtendFont" 
-jkplbxite Kp-Light-Expert-MediumItalic <jkplbite.pfb "1.125 ExtendFont" 
-jkplbxn8r Kp-Light-Medium <8r.enc <jkplbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkplbxnc Kp-Light-Companion-Medium <jkplbnc.pfb "1.125 ExtendFont" 
-jkplbxne Kp-Light-Expert-Medium <jkplbne.pfb "1.125 ExtendFont" 
-jkplbxsc8r Kp-Light-Smallcaps-Medium <8r.enc <jkplbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkplbxsce Kp-Light-SC-Expert-Medium <jkplbsce.pfb "1.125 ExtendFont" 
-jkplbxscsl8r Kp-Light-Smallcaps-Medium <8r.enc <jkplbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkplbxscsle Kp-Light-SC-Expert-Medium <jkplbsce.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkplbxsl8r Kp-Light-Medium <8r.enc <jkplbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkplbxslc Kp-Light-Companion-Medium <jkplbnc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkplbxsle Kp-Light-Expert-Medium <jkplbne.pfb "1.125 ExtendFont 0.167 SlantFont" 
+jkplbxit8r Kp-Light-MediumItalic "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkplbit8a.pfb
+jkplbxitc Kp-Light-Companion-MediumItalic "1.125 ExtendFont" <jkplbitc.pfb
+jkplbxite Kp-Light-Expert-MediumItalic "KPFonts-Expert ReEncodeFont 1.125 ExtendFont" <kpfonts-expert.enc <jkplbite.pfb
+jkplbxn8r Kp-Light-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkplbn8a.pfb
+jkplbxnc Kp-Light-Companion-Medium "1.125 ExtendFont" <jkplbnc.pfb
+jkplbxne Kp-Light-Expert-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont" <kpfonts-expert.enc <jkplbne.pfb
+jkplbxsc8r Kp-Light-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkplbsc8a.pfb
+jkplbxsce Kp-Light-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-expert-sc.enc <jkplbsce.pfb
+jkplbxscsl8r Kp-Light-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkplbsc8a.pfb
+jkplbxscsle Kp-Light-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkplbsce.pfb
+jkplbxsl8r Kp-Light-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkplbn8a.pfb
+jkplbxslc Kp-Light-Companion-Medium "1.125 ExtendFont 0.167 SlantFont" <jkplbnc.pfb
+jkplbxsle Kp-Light-Expert-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert.enc <jkplbne.pfb
 jkplex Kp-Light-M-Ex-Regular <jkplex.pfb
 jkplexa Kp-Light-M-Exa-Regular <jkplexa.pfb
-jkplkbsc Kp-Light-LargeSmallCaps-Medium <jkplkbsc.pfb
-jkplkbscsl Kp-Light-LargeSmallCaps-Medium <jkplkbsc.pfb "0.167 SlantFont" 
-jkplkbxsc Kp-Light-LargeSmallCaps-Medium <jkplkbsc.pfb "1.125 ExtendFont" 
-jkplkbxscsl Kp-Light-LargeSmallCaps-Medium <jkplkbsc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkplkmsc Kp-Light-LargeSmallCaps-Regular <jkplkmsc.pfb
-jkplkmscsl Kp-Light-LargeSmallCaps-Regular <jkplkmsc.pfb "0.167 SlantFont" 
+jkplkbsc Kp-Light-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkplkbsc.pfb
+jkplkbscsl Kp-Light-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkplkbsc.pfb
+jkplkbxsc Kp-Light-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-large-sc.enc <jkplkbsc.pfb
+jkplkbxscsl Kp-Light-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkplkbsc.pfb
+jkplkmsc Kp-Light-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkplkmsc.pfb
+jkplkmscsl Kp-Light-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkplkmsc.pfb
 jkplmi Kp-Light-M-Italic <jkplmi.pfb
 jkplmia Kp-Light-M-Regular <jkplmia.pfb
-jkplmit8r Kp-Light-Italic <8r.enc <jkplmit8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkplmit8r Kp-Light-Italic "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplmit8a.pfb
 jkplmitc Kp-Light-Companion-Italic <jkplmitc.pfb
-jkplmite Kp-Light-Expert-Italic <jkplmite.pfb
-jkplmn8r Kp-Light-Regular <8r.enc <jkplmn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkplmite Kp-Light-Expert-Italic "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkplmite.pfb
+jkplmn8r Kp-Light-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplmn8a.pfb
 jkplmnc Kp-Light-Companion-Regular <jkplmnc.pfb
-jkplmne Kp-Light-Expert-Regular <jkplmne.pfb
-jkplmsc8r Kp-Light-SmallCaps-Regular <8r.enc <jkplmsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkplmsce Kp-Light-SC-Expert-Regular <jkplmsce.pfb
-jkplmscsl8r Kp-Light-SmallCaps-Regular <8r.enc <jkplmsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkplmscsle Kp-Light-SC-Expert-Regular <jkplmsce.pfb "0.167 SlantFont" 
-jkplmsl8r Kp-Light-Regular <8r.enc <jkplmn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkplmslc Kp-Light-Companion-Regular <jkplmnc.pfb "0.167 SlantFont" 
-jkplmsle Kp-Light-Expert-Regular <jkplmne.pfb "0.167 SlantFont" 
+jkplmne Kp-Light-Expert-Regular "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkplmne.pfb
+jkplmsc8r Kp-Light-SmallCaps-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplmsc8a.pfb
+jkplmsce Kp-Light-SC-Expert-Regular "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkplmsce.pfb
+jkplmscsl8r Kp-Light-SmallCaps-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkplmsc8a.pfb
+jkplmscsle Kp-Light-SC-Expert-Regular "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkplmsce.pfb
+jkplmsl8r Kp-Light-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkplmn8a.pfb
+jkplmslc Kp-Light-Companion-Regular "0.167 SlantFont" <jkplmnc.pfb
+jkplmsle Kp-Light-Expert-Regular "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkplmne.pfb
 jkplsy Kp-Light-M-Sy-Regular <jkplsy.pfb
 jkplsyb Kp-Light-M-Syb-Regular <jkplsyb.pfb
 jkplsyc Kp-Light-M-Syc-Regular <jkplsyc.pfb
@@ -2075,70 +2075,70 @@ jkpmi Kp--M-Italic <jkpmi.pfb
 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 <jkpmite.pfb
-jkpmn8r Kp-Regular <8r.enc <jkpmn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpmite Kp-Expert-Italic "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpmite.pfb
+jkpmn8r Kp-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpmn8a.pfb
 jkpmnc Kp-Companion-Regular <jkpmnc.pfb
-jkpmne Kp-Expert-Regular <jkpmne.pfb
-jkpmsc8r Kp-SmallCaps-Regular <8r.enc <jkpmsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkpmsce Kp-SC-Expert-Regular <jkpmsce.pfb
-jkpmscsl8r Kp-SmallCaps-Regular <8r.enc <jkpmsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpmscsle Kp-SC-Expert-Regular <jkpmsce.pfb "0.167 SlantFont" 
-jkpmsl8r Kp-Regular <8r.enc <jkpmn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpmslc Kp-Companion-Regular <jkpmnc.pfb "0.167 SlantFont" 
-jkpmsle Kp-Expert-Regular <jkpmne.pfb "0.167 SlantFont" 
-jkpssbn8r Sf-Kp-Medium <8r.enc <jkpssbn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpmne Kp-Expert-Regular "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpmne.pfb
+jkpmsc8r Kp-SmallCaps-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpmsc8a.pfb
+jkpmsce Kp-SC-Expert-Regular "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkpmsce.pfb
+jkpmscsl8r Kp-SmallCaps-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpmsc8a.pfb
+jkpmscsle Kp-SC-Expert-Regular "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpmsce.pfb
+jkpmsl8r Kp-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpmn8a.pfb
+jkpmslc Kp-Companion-Regular "0.167 SlantFont" <jkpmnc.pfb
+jkpmsle Kp-Expert-Regular "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkpmne.pfb
+jkpssbn8r Sf-Kp-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpssbn8a.pfb
 jkpssbnc Sf-Kp-Companion-Medium <jkpssbnc.pfb
-jkpssbne Sf-Kp-Exp-Medium <jkpssbne.pfb
-jkpssbsc8r Sf-Kp-Sc-Medium <8r.enc <jkpssbsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkpssbsce Sf-Kp-Sc-Exp-Medium <jkpssbsce.pfb
-jkpssbscsl8r Sf-Kp-Sc-Medium <8r.enc <jkpssbsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpssbscsle Sf-Kp-Sc-Exp-Medium <jkpssbsce.pfb "0.167 SlantFont" 
-jkpssbsl8r Sf-Kp-Medium <8r.enc <jkpssbn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpssbslc Sf-Kp-Companion-Medium <jkpssbnc.pfb "0.167 SlantFont" 
-jkpssbsle Sf-Kp-Exp-Medium <jkpssbne.pfb "0.167 SlantFont" 
-jkpssbxn8r Sf-Kp-Medium <8r.enc <jkpssbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkpssbxnc Sf-Kp-Companion-Medium <jkpssbnc.pfb "1.125 ExtendFont" 
-jkpssbxne Sf-Kp-Exp-Medium <jkpssbne.pfb "1.125 ExtendFont" 
-jkpssbxsc8r Sf-Kp-Sc-Medium <8r.enc <jkpssbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkpssbxsce Sf-Kp-Sc-Exp-Medium <jkpssbsce.pfb "1.125 ExtendFont" 
-jkpssbxscsl8r Sf-Kp-Sc-Medium <8r.enc <jkpssbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkpssbxscsle Sf-Kp-Sc-Exp-Medium <jkpssbsce.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpssbxsl8r Sf-Kp-Medium <8r.enc <jkpssbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkpssbxslc Sf-Kp-Companion-Medium <jkpssbnc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpssbxsle Sf-Kp-Exp-Medium <jkpssbne.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpsskbsc Sf-Kp-LargeSmallCaps-Medium <jkpsskbsc.pfb
-jkpsskbscsl Sf-Kp-LargeSmallCaps-Medium <jkpsskbsc.pfb "0.167 SlantFont" 
-jkpsskbxsc Sf-Kp-LargeSmallCaps-Medium <jkpsskbsc.pfb "1.125 ExtendFont" 
-jkpsskbxscsl Sf-Kp-LargeSmallCaps-Medium <jkpsskbsc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpsskmsc Sf-Kp-LargeSmallCaps-Regular <jkpsskmsc.pfb
-jkpsskmscsl Sf-Kp-LargeSmallCaps-Regular <jkpsskmsc.pfb "0.167 SlantFont" 
-jkpssmn8r Sf-Kp-Regular <8r.enc <jkpssmn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpssbne Sf-Kp-Exp-Medium "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpssbne.pfb
+jkpssbsc8r Sf-Kp-Sc-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpssbsc8a.pfb
+jkpssbsce Sf-Kp-Sc-Exp-Medium "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkpssbsce.pfb
+jkpssbscsl8r Sf-Kp-Sc-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpssbsc8a.pfb
+jkpssbscsle Sf-Kp-Sc-Exp-Medium "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpssbsce.pfb
+jkpssbsl8r Sf-Kp-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpssbn8a.pfb
+jkpssbslc Sf-Kp-Companion-Medium "0.167 SlantFont" <jkpssbnc.pfb
+jkpssbsle Sf-Kp-Exp-Medium "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkpssbne.pfb
+jkpssbxn8r Sf-Kp-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkpssbn8a.pfb
+jkpssbxnc Sf-Kp-Companion-Medium "1.125 ExtendFont" <jkpssbnc.pfb
+jkpssbxne Sf-Kp-Exp-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont" <kpfonts-expert.enc <jkpssbne.pfb
+jkpssbxsc8r Sf-Kp-Sc-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkpssbsc8a.pfb
+jkpssbxsce Sf-Kp-Sc-Exp-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-expert-sc.enc <jkpssbsce.pfb
+jkpssbxscsl8r Sf-Kp-Sc-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkpssbsc8a.pfb
+jkpssbxscsle Sf-Kp-Sc-Exp-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpssbsce.pfb
+jkpssbxsl8r Sf-Kp-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkpssbn8a.pfb
+jkpssbxslc Sf-Kp-Companion-Medium "1.125 ExtendFont 0.167 SlantFont" <jkpssbnc.pfb
+jkpssbxsle Sf-Kp-Exp-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert.enc <jkpssbne.pfb
+jkpsskbsc Sf-Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkpsskbsc.pfb
+jkpsskbscsl Sf-Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpsskbsc.pfb
+jkpsskbxsc Sf-Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-large-sc.enc <jkpsskbsc.pfb
+jkpsskbxscsl Sf-Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpsskbsc.pfb
+jkpsskmsc Sf-Kp-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkpsskmsc.pfb
+jkpsskmscsl Sf-Kp-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpsskmsc.pfb
+jkpssmn8r Sf-Kp-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpssmn8a.pfb
 jkpssmnc Sf-Kp-Comp-Regular <jkpssmnc.pfb
-jkpssmne Sf-Kp-Exp-Regular <jkpssmne.pfb
-jkpssmsc8r Sf-Kp-Sc-Regular <8r.enc <jkpssmsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkpssmsce Sf-Kp-Sc-Exp-Regular <jkpssmsce.pfb
-jkpssmscsl8r Sf-Kp-Sc-Regular <8r.enc <jkpssmsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpssmscsle Sf-Kp-Sc-Exp-Regular <jkpssmsce.pfb "0.167 SlantFont" 
-jkpssmsl8r Sf-Kp-Regular <8r.enc <jkpssmn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpssmslc Sf-Kp-Comp-Regular <jkpssmnc.pfb "0.167 SlantFont" 
-jkpssmsle Sf-Kp-Exp-Regular <jkpssmne.pfb "0.167 SlantFont" 
+jkpssmne Sf-Kp-Exp-Regular "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpssmne.pfb
+jkpssmsc8r Sf-Kp-Sc-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpssmsc8a.pfb
+jkpssmsce Sf-Kp-Sc-Exp-Regular "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkpssmsce.pfb
+jkpssmscsl8r Sf-Kp-Sc-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpssmsc8a.pfb
+jkpssmscsle Sf-Kp-Sc-Exp-Regular "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpssmsce.pfb
+jkpssmsl8r Sf-Kp-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpssmn8a.pfb
+jkpssmslc Sf-Kp-Comp-Regular "0.167 SlantFont" <jkpssmnc.pfb
+jkpssmsle Sf-Kp-Exp-Regular "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkpssmne.pfb
 jkpsy Kp--M-Sy-Regular <jkpsy.pfb
 jkpsya Kp--M-Sya-Regular <jkpsya.pfb
 jkpsyb Kp--M-Syb-Regular <jkpsyb.pfb
 jkpsyc Kp--M-Syc-Regular <jkpsyc.pfb
 jkpsyd Kp--M-Syd-Regular <jkpsyd.pfb
-jkpttbn8r Tt-Kp-Medium <8r.enc <jkpttbn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpttbn8r Tt-Kp-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpttbn8a.pfb
 jkpttbnc Tt-Kp-Comp-Medium <jkpttbnc.pfb
-jkpttbne Tt-Kp-Exp-Medium <jkpttbne.pfb
-jkpttbsl8r Tt-Kp-Medium <8r.enc <jkpttbn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpttbslc Tt-Kp-Comp-Medium <jkpttbnc.pfb "0.167 SlantFont" 
-jkpttbsle Tt-Kp-Exp-Medium <jkpttbne.pfb "0.167 SlantFont" 
-jkpttmn8r Tt-Kp-Regular <8r.enc <jkpttmn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpttbne Tt-Kp-Exp-Medium "KPFonts-Expert-TT ReEncodeFont" <kpfonts-expert-tt.enc <jkpttbne.pfb
+jkpttbsl8r Tt-Kp-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpttbn8a.pfb
+jkpttbslc Tt-Kp-Comp-Medium "0.167 SlantFont" <jkpttbnc.pfb
+jkpttbsle Tt-Kp-Exp-Medium "KPFonts-Expert-TT ReEncodeFont 0.167 SlantFont" <kpfonts-expert-tt.enc <jkpttbne.pfb
+jkpttmn8r Tt-Kp-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpttmn8a.pfb
 jkpttmnc Tt-Kp-Comp-Regular <jkpttmnc.pfb
-jkpttmne Tt-Kp-Exp-Regular <jkpttmne.pfb
-jkpttmsl8r Tt-Kp-Regular <8r.enc <jkpttmn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpttmslc Tt-Kp-Comp-Regular <jkpttmnc.pfb "0.167 SlantFont" 
-jkpttmsle Tt-Kp-Exp-Regular <jkpttmne.pfb "0.167 SlantFont" 
+jkpttmne Tt-Kp-Exp-Regular "KPFonts-Expert-TT ReEncodeFont" <kpfonts-expert-tt.enc <jkpttmne.pfb
+jkpttmsl8r Tt-Kp-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpttmn8a.pfb
+jkpttmslc Tt-Kp-Comp-Regular "0.167 SlantFont" <jkpttmnc.pfb
+jkpttmsle Tt-Kp-Exp-Regular "KPFonts-Expert-TT ReEncodeFont 0.167 SlantFont" <kpfonts-expert-tt.enc <jkpttmne.pfb
 jthb8v Tahoma-Bold "T5DEncoding ReEncodeFont" <t5d.enc <tahomabd.ttf
 jthr8v Tahoma "T5DEncoding ReEncodeFont" <t5d.enc <tahoma.ttf
 jvnb8v Verdana-Bold "T5DEncoding ReEncodeFont" <t5d.enc <verdanab.ttf
diff --git a/Master/texmf/fonts/map/dvips/updmap/psfonts_t1.map b/Master/texmf/fonts/map/dvips/updmap/psfonts_t1.map
index 85a0bab32b3..48f7022f80e 100644
--- a/Master/texmf/fonts/map/dvips/updmap/psfonts_t1.map
+++ b/Master/texmf/fonts/map/dvips/updmap/psfonts_t1.map
@@ -3982,104 +3982,104 @@ itclq8 ISFLQ8 "TS1Encoding ReEncodeFont" <cm-super-ts1.enc <isflq8.pfb
 itcltt8 ISFLTT8 "TS1Encoding ReEncodeFont" <cm-super-ts1.enc <isfltt8.pfb
 jkpbex Kp--M-Ex-Medium <jkpbex.pfb
 jkpbexa Kp--M-Exa-Medium <jkpbexa.pfb
-jkpbit8r Kp-MediumItalic <8r.enc <jkpbit8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpbit8r Kp-MediumItalic "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpbit8a.pfb
 jkpbitc Kp-Companion-MediumItalic <jkpbitc.pfb
-jkpbite Kp-Expert-MediumItalic <jkpbite.pfb
+jkpbite Kp-Expert-MediumItalic "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpbite.pfb
 jkpbmi Kp--M-MediumItalic <jkpbmi.pfb
 jkpbmia Kp--M-Medium <jkpbmia.pfb
-jkpbn8r Kp-Medium <8r.enc <jkpbn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpbn8r Kp-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpbn8a.pfb
 jkpbnc Kp-Companion-Medium <jkpbnc.pfb
-jkpbne Kp-Expert-Medium <jkpbne.pfb
-jkpbsc8r Kp-Smallcaps-Medium <8r.enc <jkpbsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkpbsce Kp-SC-Expert-Medium <jkpbsce.pfb
-jkpbscsl8r Kp-Smallcaps-Medium <8r.enc <jkpbsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpbscsle Kp-SC-Expert-Medium <jkpbsce.pfb "0.167 SlantFont" 
-jkpbsl8r Kp-Medium <8r.enc <jkpbn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpbslc Kp-Companion-Medium <jkpbnc.pfb "0.167 SlantFont" 
-jkpbsle Kp-Expert-Medium <jkpbne.pfb "0.167 SlantFont" 
+jkpbne Kp-Expert-Medium "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpbne.pfb
+jkpbsc8r Kp-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpbsc8a.pfb
+jkpbsce Kp-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkpbsce.pfb
+jkpbscsl8r Kp-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpbsc8a.pfb
+jkpbscsle Kp-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpbsce.pfb
+jkpbsl8r Kp-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpbn8a.pfb
+jkpbslc Kp-Companion-Medium "0.167 SlantFont" <jkpbnc.pfb
+jkpbsle Kp-Expert-Medium "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkpbne.pfb
 jkpbsy Kp--M-Sy-Medium <jkpbsy.pfb
 jkpbsya Kp--M-Sya-Medium <jkpbsya.pfb
 jkpbsyb Kp--M-Syb-Medium <jkpbsyb.pfb
 jkpbsyc Kp--M-Syc-Medium <jkpbsyc.pfb
 jkpbsyd Kp--M-Syd-Medium <jkpbsyd.pfb
-jkpbxit8r Kp-MediumItalic <8r.enc <jkpbit8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkpbxitc Kp-Companion-MediumItalic <jkpbitc.pfb "1.125 ExtendFont" 
-jkpbxite Kp-Expert-MediumItalic <jkpbite.pfb "1.125 ExtendFont" 
-jkpbxn8r Kp-Medium <8r.enc <jkpbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkpbxnc Kp-Companion-Medium <jkpbnc.pfb "1.125 ExtendFont" 
-jkpbxne Kp-Expert-Medium <jkpbne.pfb "1.125 ExtendFont" 
-jkpbxsc8r Kp-Smallcaps-Medium <8r.enc <jkpbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkpbxsce Kp-SC-Expert-Medium <jkpbsce.pfb "1.125 ExtendFont" 
-jkpbxscsl8r Kp-Smallcaps-Medium <8r.enc <jkpbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkpbxscsle Kp-SC-Expert-Medium <jkpbsce.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpbxsl8r Kp-Medium <8r.enc <jkpbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkpbxslc Kp-Companion-Medium <jkpbnc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpbxsle Kp-Expert-Medium <jkpbne.pfb "1.125 ExtendFont 0.167 SlantFont" 
+jkpbxit8r Kp-MediumItalic "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkpbit8a.pfb
+jkpbxitc Kp-Companion-MediumItalic "1.125 ExtendFont" <jkpbitc.pfb
+jkpbxite Kp-Expert-MediumItalic "KPFonts-Expert ReEncodeFont 1.125 ExtendFont" <kpfonts-expert.enc <jkpbite.pfb
+jkpbxn8r Kp-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkpbn8a.pfb
+jkpbxnc Kp-Companion-Medium "1.125 ExtendFont" <jkpbnc.pfb
+jkpbxne Kp-Expert-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont" <kpfonts-expert.enc <jkpbne.pfb
+jkpbxsc8r Kp-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkpbsc8a.pfb
+jkpbxsce Kp-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-expert-sc.enc <jkpbsce.pfb
+jkpbxscsl8r Kp-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkpbsc8a.pfb
+jkpbxscsle Kp-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpbsce.pfb
+jkpbxsl8r Kp-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkpbn8a.pfb
+jkpbxslc Kp-Companion-Medium "1.125 ExtendFont 0.167 SlantFont" <jkpbnc.pfb
+jkpbxsle Kp-Expert-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert.enc <jkpbne.pfb
 jkpex Kp--M-Ex-Regular <jkpex.pfb
 jkpexa Kp--M-Exa-Regular <jkpexa.pfb
-jkpkbsc Kp-LargeSmallCaps-Medium <jkpkbsc.pfb
-jkpkbscsl Kp-LargeSmallCaps-Medium <jkpkbsc.pfb "0.167 SlantFont" 
-jkpkbxsc Kp-LargeSmallCaps-Medium <jkpkbsc.pfb "1.125 ExtendFont" 
-jkpkbxscsl Kp-LargeSmallCaps-Medium <jkpkbsc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpkmsc Kp-LargeSmallCaps-Regular <jkpkmsc.pfb
-jkpkmscsl Kp-LargeSmallCaps-Regular <jkpkmsc.pfb "0.167 SlantFont" 
+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
+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
 jkplbexa Kp-Light-M-Exa-Medium <jkplbexa.pfb
-jkplbit8r Kp-Light-MediumItalic <8r.enc <jkplbit8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkplbit8r Kp-Light-MediumItalic "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplbit8a.pfb
 jkplbitc Kp-Light-Companion-MediumItalic <jkplbitc.pfb
-jkplbite Kp-Light-Expert-MediumItalic <jkplbite.pfb
+jkplbite Kp-Light-Expert-MediumItalic "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkplbite.pfb
 jkplbmi Kp-Light-M-MediumItalic <jkplbmi.pfb
 jkplbmia Kp-Light-M-Medium <jkplbmia.pfb
-jkplbn8r Kp-Light-Medium <8r.enc <jkplbn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkplbn8r Kp-Light-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplbn8a.pfb
 jkplbnc Kp-Light-Companion-Medium <jkplbnc.pfb
-jkplbne Kp-Light-Expert-Medium <jkplbne.pfb
-jkplbsc8r Kp-Light-Smallcaps-Medium <8r.enc <jkplbsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkplbsce Kp-Light-SC-Expert-Medium <jkplbsce.pfb
-jkplbscsl8r Kp-Light-Smallcaps-Medium <8r.enc <jkplbsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkplbscsle Kp-Light-SC-Expert-Medium <jkplbsce.pfb "0.167 SlantFont" 
-jkplbsl8r Kp-Light-Medium <8r.enc <jkplbn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkplbslc Kp-Light-Companion-Medium <jkplbnc.pfb "0.167 SlantFont" 
-jkplbsle Kp-Light-Expert-Medium <jkplbne.pfb "0.167 SlantFont" 
+jkplbne Kp-Light-Expert-Medium "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkplbne.pfb
+jkplbsc8r Kp-Light-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplbsc8a.pfb
+jkplbsce Kp-Light-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkplbsce.pfb
+jkplbscsl8r Kp-Light-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkplbsc8a.pfb
+jkplbscsle Kp-Light-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkplbsce.pfb
+jkplbsl8r Kp-Light-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkplbn8a.pfb
+jkplbslc Kp-Light-Companion-Medium "0.167 SlantFont" <jkplbnc.pfb
+jkplbsle Kp-Light-Expert-Medium "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkplbne.pfb
 jkplbsy Kp-Light-M-Sy-Medium <jkplbsy.pfb
 jkplbsyb Kp-Light-M-Syb-Medium <jkplbsyb.pfb
 jkplbsyc Kp-Light-M-Syc-Medium <jkplbsyc.pfb
 jkplbsyd Kp-Light-M-Syd-Medium <jkplbsyd.pfb
-jkplbxit8r Kp-Light-MediumItalic <8r.enc <jkplbit8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkplbxitc Kp-Light-Companion-MediumItalic <jkplbitc.pfb "1.125 ExtendFont" 
-jkplbxite Kp-Light-Expert-MediumItalic <jkplbite.pfb "1.125 ExtendFont" 
-jkplbxn8r Kp-Light-Medium <8r.enc <jkplbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkplbxnc Kp-Light-Companion-Medium <jkplbnc.pfb "1.125 ExtendFont" 
-jkplbxne Kp-Light-Expert-Medium <jkplbne.pfb "1.125 ExtendFont" 
-jkplbxsc8r Kp-Light-Smallcaps-Medium <8r.enc <jkplbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkplbxsce Kp-Light-SC-Expert-Medium <jkplbsce.pfb "1.125 ExtendFont" 
-jkplbxscsl8r Kp-Light-Smallcaps-Medium <8r.enc <jkplbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkplbxscsle Kp-Light-SC-Expert-Medium <jkplbsce.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkplbxsl8r Kp-Light-Medium <8r.enc <jkplbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkplbxslc Kp-Light-Companion-Medium <jkplbnc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkplbxsle Kp-Light-Expert-Medium <jkplbne.pfb "1.125 ExtendFont 0.167 SlantFont" 
+jkplbxit8r Kp-Light-MediumItalic "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkplbit8a.pfb
+jkplbxitc Kp-Light-Companion-MediumItalic "1.125 ExtendFont" <jkplbitc.pfb
+jkplbxite Kp-Light-Expert-MediumItalic "KPFonts-Expert ReEncodeFont 1.125 ExtendFont" <kpfonts-expert.enc <jkplbite.pfb
+jkplbxn8r Kp-Light-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkplbn8a.pfb
+jkplbxnc Kp-Light-Companion-Medium "1.125 ExtendFont" <jkplbnc.pfb
+jkplbxne Kp-Light-Expert-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont" <kpfonts-expert.enc <jkplbne.pfb
+jkplbxsc8r Kp-Light-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkplbsc8a.pfb
+jkplbxsce Kp-Light-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-expert-sc.enc <jkplbsce.pfb
+jkplbxscsl8r Kp-Light-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkplbsc8a.pfb
+jkplbxscsle Kp-Light-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkplbsce.pfb
+jkplbxsl8r Kp-Light-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkplbn8a.pfb
+jkplbxslc Kp-Light-Companion-Medium "1.125 ExtendFont 0.167 SlantFont" <jkplbnc.pfb
+jkplbxsle Kp-Light-Expert-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert.enc <jkplbne.pfb
 jkplex Kp-Light-M-Ex-Regular <jkplex.pfb
 jkplexa Kp-Light-M-Exa-Regular <jkplexa.pfb
-jkplkbsc Kp-Light-LargeSmallCaps-Medium <jkplkbsc.pfb
-jkplkbscsl Kp-Light-LargeSmallCaps-Medium <jkplkbsc.pfb "0.167 SlantFont" 
-jkplkbxsc Kp-Light-LargeSmallCaps-Medium <jkplkbsc.pfb "1.125 ExtendFont" 
-jkplkbxscsl Kp-Light-LargeSmallCaps-Medium <jkplkbsc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkplkmsc Kp-Light-LargeSmallCaps-Regular <jkplkmsc.pfb
-jkplkmscsl Kp-Light-LargeSmallCaps-Regular <jkplkmsc.pfb "0.167 SlantFont" 
+jkplkbsc Kp-Light-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkplkbsc.pfb
+jkplkbscsl Kp-Light-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkplkbsc.pfb
+jkplkbxsc Kp-Light-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-large-sc.enc <jkplkbsc.pfb
+jkplkbxscsl Kp-Light-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkplkbsc.pfb
+jkplkmsc Kp-Light-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkplkmsc.pfb
+jkplkmscsl Kp-Light-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkplkmsc.pfb
 jkplmi Kp-Light-M-Italic <jkplmi.pfb
 jkplmia Kp-Light-M-Regular <jkplmia.pfb
-jkplmit8r Kp-Light-Italic <8r.enc <jkplmit8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkplmit8r Kp-Light-Italic "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplmit8a.pfb
 jkplmitc Kp-Light-Companion-Italic <jkplmitc.pfb
-jkplmite Kp-Light-Expert-Italic <jkplmite.pfb
-jkplmn8r Kp-Light-Regular <8r.enc <jkplmn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkplmite Kp-Light-Expert-Italic "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkplmite.pfb
+jkplmn8r Kp-Light-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplmn8a.pfb
 jkplmnc Kp-Light-Companion-Regular <jkplmnc.pfb
-jkplmne Kp-Light-Expert-Regular <jkplmne.pfb
-jkplmsc8r Kp-Light-SmallCaps-Regular <8r.enc <jkplmsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkplmsce Kp-Light-SC-Expert-Regular <jkplmsce.pfb
-jkplmscsl8r Kp-Light-SmallCaps-Regular <8r.enc <jkplmsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkplmscsle Kp-Light-SC-Expert-Regular <jkplmsce.pfb "0.167 SlantFont" 
-jkplmsl8r Kp-Light-Regular <8r.enc <jkplmn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkplmslc Kp-Light-Companion-Regular <jkplmnc.pfb "0.167 SlantFont" 
-jkplmsle Kp-Light-Expert-Regular <jkplmne.pfb "0.167 SlantFont" 
+jkplmne Kp-Light-Expert-Regular "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkplmne.pfb
+jkplmsc8r Kp-Light-SmallCaps-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplmsc8a.pfb
+jkplmsce Kp-Light-SC-Expert-Regular "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkplmsce.pfb
+jkplmscsl8r Kp-Light-SmallCaps-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkplmsc8a.pfb
+jkplmscsle Kp-Light-SC-Expert-Regular "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkplmsce.pfb
+jkplmsl8r Kp-Light-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkplmn8a.pfb
+jkplmslc Kp-Light-Companion-Regular "0.167 SlantFont" <jkplmnc.pfb
+jkplmsle Kp-Light-Expert-Regular "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkplmne.pfb
 jkplsy Kp-Light-M-Sy-Regular <jkplsy.pfb
 jkplsyb Kp-Light-M-Syb-Regular <jkplsyb.pfb
 jkplsyc Kp-Light-M-Syc-Regular <jkplsyc.pfb
@@ -4088,70 +4088,70 @@ jkpmi Kp--M-Italic <jkpmi.pfb
 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 <jkpmite.pfb
-jkpmn8r Kp-Regular <8r.enc <jkpmn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpmite Kp-Expert-Italic "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpmite.pfb
+jkpmn8r Kp-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpmn8a.pfb
 jkpmnc Kp-Companion-Regular <jkpmnc.pfb
-jkpmne Kp-Expert-Regular <jkpmne.pfb
-jkpmsc8r Kp-SmallCaps-Regular <8r.enc <jkpmsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkpmsce Kp-SC-Expert-Regular <jkpmsce.pfb
-jkpmscsl8r Kp-SmallCaps-Regular <8r.enc <jkpmsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpmscsle Kp-SC-Expert-Regular <jkpmsce.pfb "0.167 SlantFont" 
-jkpmsl8r Kp-Regular <8r.enc <jkpmn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpmslc Kp-Companion-Regular <jkpmnc.pfb "0.167 SlantFont" 
-jkpmsle Kp-Expert-Regular <jkpmne.pfb "0.167 SlantFont" 
-jkpssbn8r Sf-Kp-Medium <8r.enc <jkpssbn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpmne Kp-Expert-Regular "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpmne.pfb
+jkpmsc8r Kp-SmallCaps-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpmsc8a.pfb
+jkpmsce Kp-SC-Expert-Regular "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkpmsce.pfb
+jkpmscsl8r Kp-SmallCaps-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpmsc8a.pfb
+jkpmscsle Kp-SC-Expert-Regular "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpmsce.pfb
+jkpmsl8r Kp-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpmn8a.pfb
+jkpmslc Kp-Companion-Regular "0.167 SlantFont" <jkpmnc.pfb
+jkpmsle Kp-Expert-Regular "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkpmne.pfb
+jkpssbn8r Sf-Kp-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpssbn8a.pfb
 jkpssbnc Sf-Kp-Companion-Medium <jkpssbnc.pfb
-jkpssbne Sf-Kp-Exp-Medium <jkpssbne.pfb
-jkpssbsc8r Sf-Kp-Sc-Medium <8r.enc <jkpssbsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkpssbsce Sf-Kp-Sc-Exp-Medium <jkpssbsce.pfb
-jkpssbscsl8r Sf-Kp-Sc-Medium <8r.enc <jkpssbsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpssbscsle Sf-Kp-Sc-Exp-Medium <jkpssbsce.pfb "0.167 SlantFont" 
-jkpssbsl8r Sf-Kp-Medium <8r.enc <jkpssbn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpssbslc Sf-Kp-Companion-Medium <jkpssbnc.pfb "0.167 SlantFont" 
-jkpssbsle Sf-Kp-Exp-Medium <jkpssbne.pfb "0.167 SlantFont" 
-jkpssbxn8r Sf-Kp-Medium <8r.enc <jkpssbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkpssbxnc Sf-Kp-Companion-Medium <jkpssbnc.pfb "1.125 ExtendFont" 
-jkpssbxne Sf-Kp-Exp-Medium <jkpssbne.pfb "1.125 ExtendFont" 
-jkpssbxsc8r Sf-Kp-Sc-Medium <8r.enc <jkpssbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkpssbxsce Sf-Kp-Sc-Exp-Medium <jkpssbsce.pfb "1.125 ExtendFont" 
-jkpssbxscsl8r Sf-Kp-Sc-Medium <8r.enc <jkpssbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkpssbxscsle Sf-Kp-Sc-Exp-Medium <jkpssbsce.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpssbxsl8r Sf-Kp-Medium <8r.enc <jkpssbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkpssbxslc Sf-Kp-Companion-Medium <jkpssbnc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpssbxsle Sf-Kp-Exp-Medium <jkpssbne.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpsskbsc Sf-Kp-LargeSmallCaps-Medium <jkpsskbsc.pfb
-jkpsskbscsl Sf-Kp-LargeSmallCaps-Medium <jkpsskbsc.pfb "0.167 SlantFont" 
-jkpsskbxsc Sf-Kp-LargeSmallCaps-Medium <jkpsskbsc.pfb "1.125 ExtendFont" 
-jkpsskbxscsl Sf-Kp-LargeSmallCaps-Medium <jkpsskbsc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpsskmsc Sf-Kp-LargeSmallCaps-Regular <jkpsskmsc.pfb
-jkpsskmscsl Sf-Kp-LargeSmallCaps-Regular <jkpsskmsc.pfb "0.167 SlantFont" 
-jkpssmn8r Sf-Kp-Regular <8r.enc <jkpssmn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpssbne Sf-Kp-Exp-Medium "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpssbne.pfb
+jkpssbsc8r Sf-Kp-Sc-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpssbsc8a.pfb
+jkpssbsce Sf-Kp-Sc-Exp-Medium "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkpssbsce.pfb
+jkpssbscsl8r Sf-Kp-Sc-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpssbsc8a.pfb
+jkpssbscsle Sf-Kp-Sc-Exp-Medium "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpssbsce.pfb
+jkpssbsl8r Sf-Kp-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpssbn8a.pfb
+jkpssbslc Sf-Kp-Companion-Medium "0.167 SlantFont" <jkpssbnc.pfb
+jkpssbsle Sf-Kp-Exp-Medium "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkpssbne.pfb
+jkpssbxn8r Sf-Kp-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkpssbn8a.pfb
+jkpssbxnc Sf-Kp-Companion-Medium "1.125 ExtendFont" <jkpssbnc.pfb
+jkpssbxne Sf-Kp-Exp-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont" <kpfonts-expert.enc <jkpssbne.pfb
+jkpssbxsc8r Sf-Kp-Sc-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkpssbsc8a.pfb
+jkpssbxsce Sf-Kp-Sc-Exp-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-expert-sc.enc <jkpssbsce.pfb
+jkpssbxscsl8r Sf-Kp-Sc-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkpssbsc8a.pfb
+jkpssbxscsle Sf-Kp-Sc-Exp-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpssbsce.pfb
+jkpssbxsl8r Sf-Kp-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkpssbn8a.pfb
+jkpssbxslc Sf-Kp-Companion-Medium "1.125 ExtendFont 0.167 SlantFont" <jkpssbnc.pfb
+jkpssbxsle Sf-Kp-Exp-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert.enc <jkpssbne.pfb
+jkpsskbsc Sf-Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkpsskbsc.pfb
+jkpsskbscsl Sf-Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpsskbsc.pfb
+jkpsskbxsc Sf-Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-large-sc.enc <jkpsskbsc.pfb
+jkpsskbxscsl Sf-Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpsskbsc.pfb
+jkpsskmsc Sf-Kp-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkpsskmsc.pfb
+jkpsskmscsl Sf-Kp-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpsskmsc.pfb
+jkpssmn8r Sf-Kp-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpssmn8a.pfb
 jkpssmnc Sf-Kp-Comp-Regular <jkpssmnc.pfb
-jkpssmne Sf-Kp-Exp-Regular <jkpssmne.pfb
-jkpssmsc8r Sf-Kp-Sc-Regular <8r.enc <jkpssmsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkpssmsce Sf-Kp-Sc-Exp-Regular <jkpssmsce.pfb
-jkpssmscsl8r Sf-Kp-Sc-Regular <8r.enc <jkpssmsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpssmscsle Sf-Kp-Sc-Exp-Regular <jkpssmsce.pfb "0.167 SlantFont" 
-jkpssmsl8r Sf-Kp-Regular <8r.enc <jkpssmn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpssmslc Sf-Kp-Comp-Regular <jkpssmnc.pfb "0.167 SlantFont" 
-jkpssmsle Sf-Kp-Exp-Regular <jkpssmne.pfb "0.167 SlantFont" 
+jkpssmne Sf-Kp-Exp-Regular "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpssmne.pfb
+jkpssmsc8r Sf-Kp-Sc-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpssmsc8a.pfb
+jkpssmsce Sf-Kp-Sc-Exp-Regular "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkpssmsce.pfb
+jkpssmscsl8r Sf-Kp-Sc-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpssmsc8a.pfb
+jkpssmscsle Sf-Kp-Sc-Exp-Regular "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpssmsce.pfb
+jkpssmsl8r Sf-Kp-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpssmn8a.pfb
+jkpssmslc Sf-Kp-Comp-Regular "0.167 SlantFont" <jkpssmnc.pfb
+jkpssmsle Sf-Kp-Exp-Regular "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkpssmne.pfb
 jkpsy Kp--M-Sy-Regular <jkpsy.pfb
 jkpsya Kp--M-Sya-Regular <jkpsya.pfb
 jkpsyb Kp--M-Syb-Regular <jkpsyb.pfb
 jkpsyc Kp--M-Syc-Regular <jkpsyc.pfb
 jkpsyd Kp--M-Syd-Regular <jkpsyd.pfb
-jkpttbn8r Tt-Kp-Medium <8r.enc <jkpttbn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpttbn8r Tt-Kp-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpttbn8a.pfb
 jkpttbnc Tt-Kp-Comp-Medium <jkpttbnc.pfb
-jkpttbne Tt-Kp-Exp-Medium <jkpttbne.pfb
-jkpttbsl8r Tt-Kp-Medium <8r.enc <jkpttbn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpttbslc Tt-Kp-Comp-Medium <jkpttbnc.pfb "0.167 SlantFont" 
-jkpttbsle Tt-Kp-Exp-Medium <jkpttbne.pfb "0.167 SlantFont" 
-jkpttmn8r Tt-Kp-Regular <8r.enc <jkpttmn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpttbne Tt-Kp-Exp-Medium "KPFonts-Expert-TT ReEncodeFont" <kpfonts-expert-tt.enc <jkpttbne.pfb
+jkpttbsl8r Tt-Kp-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpttbn8a.pfb
+jkpttbslc Tt-Kp-Comp-Medium "0.167 SlantFont" <jkpttbnc.pfb
+jkpttbsle Tt-Kp-Exp-Medium "KPFonts-Expert-TT ReEncodeFont 0.167 SlantFont" <kpfonts-expert-tt.enc <jkpttbne.pfb
+jkpttmn8r Tt-Kp-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpttmn8a.pfb
 jkpttmnc Tt-Kp-Comp-Regular <jkpttmnc.pfb
-jkpttmne Tt-Kp-Exp-Regular <jkpttmne.pfb
-jkpttmsl8r Tt-Kp-Regular <8r.enc <jkpttmn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpttmslc Tt-Kp-Comp-Regular <jkpttmnc.pfb "0.167 SlantFont" 
-jkpttmsle Tt-Kp-Exp-Regular <jkpttmne.pfb "0.167 SlantFont" 
+jkpttmne Tt-Kp-Exp-Regular "KPFonts-Expert-TT ReEncodeFont" <kpfonts-expert-tt.enc <jkpttmne.pfb
+jkpttmsl8r Tt-Kp-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpttmn8a.pfb
+jkpttmslc Tt-Kp-Comp-Regular "0.167 SlantFont" <jkpttmnc.pfb
+jkpttmsle Tt-Kp-Exp-Regular "KPFonts-Expert-TT ReEncodeFont 0.167 SlantFont" <kpfonts-expert-tt.enc <jkpttmne.pfb
 jthb8v Tahoma-Bold "T5DEncoding ReEncodeFont" <t5d.enc <tahomabd.ttf
 jthr8v Tahoma "T5DEncoding ReEncodeFont" <t5d.enc <tahoma.ttf
 jvnb8v Verdana-Bold "T5DEncoding ReEncodeFont" <t5d.enc <verdanab.ttf
@@ -9341,7 +9341,6 @@ xyeubt11 XYEUBT10 "1.1 ExtendFont" <xyeubt10.pfb
 xyeubt12 XYEUBT10 "1.2 ExtendFont" <xyeubt10.pfb
 yfrak yfrak-Regular <yfrak.pfb
 ygoth ygoth-Regular <ygoth.pfb
-yhcmex10 Yhcmex <yhcmex.pfb
 ylyb8r LibrisADFStd-Bold <8r.enc <ylyb8a.pfb "TeXBase1Encoding ReEncodeFont" 
 ylyb8s LibrisADFStd-Bold <libris-supp.enc <ylyb8a.pfb "fontinst-autoenc-libris-supp ReEncodeFont" 
 ylybi8r LibrisADFStd-BoldItalic <8r.enc <ylybi8a.pfb "TeXBase1Encoding ReEncodeFont" 
diff --git a/Master/texmf/fonts/map/pdftex/updmap/pdftex.map b/Master/texmf/fonts/map/pdftex/updmap/pdftex.map
index 4414ccf5f51..3fccbb83f60 100644
--- a/Master/texmf/fonts/map/pdftex/updmap/pdftex.map
+++ b/Master/texmf/fonts/map/pdftex/updmap/pdftex.map
@@ -3982,104 +3982,104 @@ itclq8 ISFLQ8 "TS1Encoding ReEncodeFont" <cm-super-ts1.enc <isflq8.pfb
 itcltt8 ISFLTT8 "TS1Encoding ReEncodeFont" <cm-super-ts1.enc <isfltt8.pfb
 jkpbex Kp--M-Ex-Medium <jkpbex.pfb
 jkpbexa Kp--M-Exa-Medium <jkpbexa.pfb
-jkpbit8r Kp-MediumItalic <8r.enc <jkpbit8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpbit8r Kp-MediumItalic "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpbit8a.pfb
 jkpbitc Kp-Companion-MediumItalic <jkpbitc.pfb
-jkpbite Kp-Expert-MediumItalic <jkpbite.pfb
+jkpbite Kp-Expert-MediumItalic "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpbite.pfb
 jkpbmi Kp--M-MediumItalic <jkpbmi.pfb
 jkpbmia Kp--M-Medium <jkpbmia.pfb
-jkpbn8r Kp-Medium <8r.enc <jkpbn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpbn8r Kp-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpbn8a.pfb
 jkpbnc Kp-Companion-Medium <jkpbnc.pfb
-jkpbne Kp-Expert-Medium <jkpbne.pfb
-jkpbsc8r Kp-Smallcaps-Medium <8r.enc <jkpbsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkpbsce Kp-SC-Expert-Medium <jkpbsce.pfb
-jkpbscsl8r Kp-Smallcaps-Medium <8r.enc <jkpbsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpbscsle Kp-SC-Expert-Medium <jkpbsce.pfb "0.167 SlantFont" 
-jkpbsl8r Kp-Medium <8r.enc <jkpbn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpbslc Kp-Companion-Medium <jkpbnc.pfb "0.167 SlantFont" 
-jkpbsle Kp-Expert-Medium <jkpbne.pfb "0.167 SlantFont" 
+jkpbne Kp-Expert-Medium "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpbne.pfb
+jkpbsc8r Kp-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpbsc8a.pfb
+jkpbsce Kp-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkpbsce.pfb
+jkpbscsl8r Kp-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpbsc8a.pfb
+jkpbscsle Kp-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpbsce.pfb
+jkpbsl8r Kp-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpbn8a.pfb
+jkpbslc Kp-Companion-Medium "0.167 SlantFont" <jkpbnc.pfb
+jkpbsle Kp-Expert-Medium "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkpbne.pfb
 jkpbsy Kp--M-Sy-Medium <jkpbsy.pfb
 jkpbsya Kp--M-Sya-Medium <jkpbsya.pfb
 jkpbsyb Kp--M-Syb-Medium <jkpbsyb.pfb
 jkpbsyc Kp--M-Syc-Medium <jkpbsyc.pfb
 jkpbsyd Kp--M-Syd-Medium <jkpbsyd.pfb
-jkpbxit8r Kp-MediumItalic <8r.enc <jkpbit8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkpbxitc Kp-Companion-MediumItalic <jkpbitc.pfb "1.125 ExtendFont" 
-jkpbxite Kp-Expert-MediumItalic <jkpbite.pfb "1.125 ExtendFont" 
-jkpbxn8r Kp-Medium <8r.enc <jkpbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkpbxnc Kp-Companion-Medium <jkpbnc.pfb "1.125 ExtendFont" 
-jkpbxne Kp-Expert-Medium <jkpbne.pfb "1.125 ExtendFont" 
-jkpbxsc8r Kp-Smallcaps-Medium <8r.enc <jkpbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkpbxsce Kp-SC-Expert-Medium <jkpbsce.pfb "1.125 ExtendFont" 
-jkpbxscsl8r Kp-Smallcaps-Medium <8r.enc <jkpbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkpbxscsle Kp-SC-Expert-Medium <jkpbsce.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpbxsl8r Kp-Medium <8r.enc <jkpbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkpbxslc Kp-Companion-Medium <jkpbnc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpbxsle Kp-Expert-Medium <jkpbne.pfb "1.125 ExtendFont 0.167 SlantFont" 
+jkpbxit8r Kp-MediumItalic "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkpbit8a.pfb
+jkpbxitc Kp-Companion-MediumItalic "1.125 ExtendFont" <jkpbitc.pfb
+jkpbxite Kp-Expert-MediumItalic "KPFonts-Expert ReEncodeFont 1.125 ExtendFont" <kpfonts-expert.enc <jkpbite.pfb
+jkpbxn8r Kp-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkpbn8a.pfb
+jkpbxnc Kp-Companion-Medium "1.125 ExtendFont" <jkpbnc.pfb
+jkpbxne Kp-Expert-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont" <kpfonts-expert.enc <jkpbne.pfb
+jkpbxsc8r Kp-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkpbsc8a.pfb
+jkpbxsce Kp-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-expert-sc.enc <jkpbsce.pfb
+jkpbxscsl8r Kp-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkpbsc8a.pfb
+jkpbxscsle Kp-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpbsce.pfb
+jkpbxsl8r Kp-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkpbn8a.pfb
+jkpbxslc Kp-Companion-Medium "1.125 ExtendFont 0.167 SlantFont" <jkpbnc.pfb
+jkpbxsle Kp-Expert-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert.enc <jkpbne.pfb
 jkpex Kp--M-Ex-Regular <jkpex.pfb
 jkpexa Kp--M-Exa-Regular <jkpexa.pfb
-jkpkbsc Kp-LargeSmallCaps-Medium <jkpkbsc.pfb
-jkpkbscsl Kp-LargeSmallCaps-Medium <jkpkbsc.pfb "0.167 SlantFont" 
-jkpkbxsc Kp-LargeSmallCaps-Medium <jkpkbsc.pfb "1.125 ExtendFont" 
-jkpkbxscsl Kp-LargeSmallCaps-Medium <jkpkbsc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpkmsc Kp-LargeSmallCaps-Regular <jkpkmsc.pfb
-jkpkmscsl Kp-LargeSmallCaps-Regular <jkpkmsc.pfb "0.167 SlantFont" 
+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
+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
 jkplbexa Kp-Light-M-Exa-Medium <jkplbexa.pfb
-jkplbit8r Kp-Light-MediumItalic <8r.enc <jkplbit8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkplbit8r Kp-Light-MediumItalic "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplbit8a.pfb
 jkplbitc Kp-Light-Companion-MediumItalic <jkplbitc.pfb
-jkplbite Kp-Light-Expert-MediumItalic <jkplbite.pfb
+jkplbite Kp-Light-Expert-MediumItalic "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkplbite.pfb
 jkplbmi Kp-Light-M-MediumItalic <jkplbmi.pfb
 jkplbmia Kp-Light-M-Medium <jkplbmia.pfb
-jkplbn8r Kp-Light-Medium <8r.enc <jkplbn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkplbn8r Kp-Light-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplbn8a.pfb
 jkplbnc Kp-Light-Companion-Medium <jkplbnc.pfb
-jkplbne Kp-Light-Expert-Medium <jkplbne.pfb
-jkplbsc8r Kp-Light-Smallcaps-Medium <8r.enc <jkplbsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkplbsce Kp-Light-SC-Expert-Medium <jkplbsce.pfb
-jkplbscsl8r Kp-Light-Smallcaps-Medium <8r.enc <jkplbsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkplbscsle Kp-Light-SC-Expert-Medium <jkplbsce.pfb "0.167 SlantFont" 
-jkplbsl8r Kp-Light-Medium <8r.enc <jkplbn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkplbslc Kp-Light-Companion-Medium <jkplbnc.pfb "0.167 SlantFont" 
-jkplbsle Kp-Light-Expert-Medium <jkplbne.pfb "0.167 SlantFont" 
+jkplbne Kp-Light-Expert-Medium "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkplbne.pfb
+jkplbsc8r Kp-Light-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplbsc8a.pfb
+jkplbsce Kp-Light-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkplbsce.pfb
+jkplbscsl8r Kp-Light-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkplbsc8a.pfb
+jkplbscsle Kp-Light-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkplbsce.pfb
+jkplbsl8r Kp-Light-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkplbn8a.pfb
+jkplbslc Kp-Light-Companion-Medium "0.167 SlantFont" <jkplbnc.pfb
+jkplbsle Kp-Light-Expert-Medium "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkplbne.pfb
 jkplbsy Kp-Light-M-Sy-Medium <jkplbsy.pfb
 jkplbsyb Kp-Light-M-Syb-Medium <jkplbsyb.pfb
 jkplbsyc Kp-Light-M-Syc-Medium <jkplbsyc.pfb
 jkplbsyd Kp-Light-M-Syd-Medium <jkplbsyd.pfb
-jkplbxit8r Kp-Light-MediumItalic <8r.enc <jkplbit8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkplbxitc Kp-Light-Companion-MediumItalic <jkplbitc.pfb "1.125 ExtendFont" 
-jkplbxite Kp-Light-Expert-MediumItalic <jkplbite.pfb "1.125 ExtendFont" 
-jkplbxn8r Kp-Light-Medium <8r.enc <jkplbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkplbxnc Kp-Light-Companion-Medium <jkplbnc.pfb "1.125 ExtendFont" 
-jkplbxne Kp-Light-Expert-Medium <jkplbne.pfb "1.125 ExtendFont" 
-jkplbxsc8r Kp-Light-Smallcaps-Medium <8r.enc <jkplbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkplbxsce Kp-Light-SC-Expert-Medium <jkplbsce.pfb "1.125 ExtendFont" 
-jkplbxscsl8r Kp-Light-Smallcaps-Medium <8r.enc <jkplbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkplbxscsle Kp-Light-SC-Expert-Medium <jkplbsce.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkplbxsl8r Kp-Light-Medium <8r.enc <jkplbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkplbxslc Kp-Light-Companion-Medium <jkplbnc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkplbxsle Kp-Light-Expert-Medium <jkplbne.pfb "1.125 ExtendFont 0.167 SlantFont" 
+jkplbxit8r Kp-Light-MediumItalic "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkplbit8a.pfb
+jkplbxitc Kp-Light-Companion-MediumItalic "1.125 ExtendFont" <jkplbitc.pfb
+jkplbxite Kp-Light-Expert-MediumItalic "KPFonts-Expert ReEncodeFont 1.125 ExtendFont" <kpfonts-expert.enc <jkplbite.pfb
+jkplbxn8r Kp-Light-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkplbn8a.pfb
+jkplbxnc Kp-Light-Companion-Medium "1.125 ExtendFont" <jkplbnc.pfb
+jkplbxne Kp-Light-Expert-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont" <kpfonts-expert.enc <jkplbne.pfb
+jkplbxsc8r Kp-Light-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkplbsc8a.pfb
+jkplbxsce Kp-Light-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-expert-sc.enc <jkplbsce.pfb
+jkplbxscsl8r Kp-Light-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkplbsc8a.pfb
+jkplbxscsle Kp-Light-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkplbsce.pfb
+jkplbxsl8r Kp-Light-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkplbn8a.pfb
+jkplbxslc Kp-Light-Companion-Medium "1.125 ExtendFont 0.167 SlantFont" <jkplbnc.pfb
+jkplbxsle Kp-Light-Expert-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert.enc <jkplbne.pfb
 jkplex Kp-Light-M-Ex-Regular <jkplex.pfb
 jkplexa Kp-Light-M-Exa-Regular <jkplexa.pfb
-jkplkbsc Kp-Light-LargeSmallCaps-Medium <jkplkbsc.pfb
-jkplkbscsl Kp-Light-LargeSmallCaps-Medium <jkplkbsc.pfb "0.167 SlantFont" 
-jkplkbxsc Kp-Light-LargeSmallCaps-Medium <jkplkbsc.pfb "1.125 ExtendFont" 
-jkplkbxscsl Kp-Light-LargeSmallCaps-Medium <jkplkbsc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkplkmsc Kp-Light-LargeSmallCaps-Regular <jkplkmsc.pfb
-jkplkmscsl Kp-Light-LargeSmallCaps-Regular <jkplkmsc.pfb "0.167 SlantFont" 
+jkplkbsc Kp-Light-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkplkbsc.pfb
+jkplkbscsl Kp-Light-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkplkbsc.pfb
+jkplkbxsc Kp-Light-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-large-sc.enc <jkplkbsc.pfb
+jkplkbxscsl Kp-Light-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkplkbsc.pfb
+jkplkmsc Kp-Light-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkplkmsc.pfb
+jkplkmscsl Kp-Light-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkplkmsc.pfb
 jkplmi Kp-Light-M-Italic <jkplmi.pfb
 jkplmia Kp-Light-M-Regular <jkplmia.pfb
-jkplmit8r Kp-Light-Italic <8r.enc <jkplmit8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkplmit8r Kp-Light-Italic "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplmit8a.pfb
 jkplmitc Kp-Light-Companion-Italic <jkplmitc.pfb
-jkplmite Kp-Light-Expert-Italic <jkplmite.pfb
-jkplmn8r Kp-Light-Regular <8r.enc <jkplmn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkplmite Kp-Light-Expert-Italic "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkplmite.pfb
+jkplmn8r Kp-Light-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplmn8a.pfb
 jkplmnc Kp-Light-Companion-Regular <jkplmnc.pfb
-jkplmne Kp-Light-Expert-Regular <jkplmne.pfb
-jkplmsc8r Kp-Light-SmallCaps-Regular <8r.enc <jkplmsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkplmsce Kp-Light-SC-Expert-Regular <jkplmsce.pfb
-jkplmscsl8r Kp-Light-SmallCaps-Regular <8r.enc <jkplmsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkplmscsle Kp-Light-SC-Expert-Regular <jkplmsce.pfb "0.167 SlantFont" 
-jkplmsl8r Kp-Light-Regular <8r.enc <jkplmn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkplmslc Kp-Light-Companion-Regular <jkplmnc.pfb "0.167 SlantFont" 
-jkplmsle Kp-Light-Expert-Regular <jkplmne.pfb "0.167 SlantFont" 
+jkplmne Kp-Light-Expert-Regular "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkplmne.pfb
+jkplmsc8r Kp-Light-SmallCaps-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplmsc8a.pfb
+jkplmsce Kp-Light-SC-Expert-Regular "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkplmsce.pfb
+jkplmscsl8r Kp-Light-SmallCaps-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkplmsc8a.pfb
+jkplmscsle Kp-Light-SC-Expert-Regular "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkplmsce.pfb
+jkplmsl8r Kp-Light-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkplmn8a.pfb
+jkplmslc Kp-Light-Companion-Regular "0.167 SlantFont" <jkplmnc.pfb
+jkplmsle Kp-Light-Expert-Regular "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkplmne.pfb
 jkplsy Kp-Light-M-Sy-Regular <jkplsy.pfb
 jkplsyb Kp-Light-M-Syb-Regular <jkplsyb.pfb
 jkplsyc Kp-Light-M-Syc-Regular <jkplsyc.pfb
@@ -4088,70 +4088,70 @@ jkpmi Kp--M-Italic <jkpmi.pfb
 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 <jkpmite.pfb
-jkpmn8r Kp-Regular <8r.enc <jkpmn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpmite Kp-Expert-Italic "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpmite.pfb
+jkpmn8r Kp-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpmn8a.pfb
 jkpmnc Kp-Companion-Regular <jkpmnc.pfb
-jkpmne Kp-Expert-Regular <jkpmne.pfb
-jkpmsc8r Kp-SmallCaps-Regular <8r.enc <jkpmsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkpmsce Kp-SC-Expert-Regular <jkpmsce.pfb
-jkpmscsl8r Kp-SmallCaps-Regular <8r.enc <jkpmsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpmscsle Kp-SC-Expert-Regular <jkpmsce.pfb "0.167 SlantFont" 
-jkpmsl8r Kp-Regular <8r.enc <jkpmn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpmslc Kp-Companion-Regular <jkpmnc.pfb "0.167 SlantFont" 
-jkpmsle Kp-Expert-Regular <jkpmne.pfb "0.167 SlantFont" 
-jkpssbn8r Sf-Kp-Medium <8r.enc <jkpssbn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpmne Kp-Expert-Regular "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpmne.pfb
+jkpmsc8r Kp-SmallCaps-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpmsc8a.pfb
+jkpmsce Kp-SC-Expert-Regular "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkpmsce.pfb
+jkpmscsl8r Kp-SmallCaps-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpmsc8a.pfb
+jkpmscsle Kp-SC-Expert-Regular "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpmsce.pfb
+jkpmsl8r Kp-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpmn8a.pfb
+jkpmslc Kp-Companion-Regular "0.167 SlantFont" <jkpmnc.pfb
+jkpmsle Kp-Expert-Regular "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkpmne.pfb
+jkpssbn8r Sf-Kp-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpssbn8a.pfb
 jkpssbnc Sf-Kp-Companion-Medium <jkpssbnc.pfb
-jkpssbne Sf-Kp-Exp-Medium <jkpssbne.pfb
-jkpssbsc8r Sf-Kp-Sc-Medium <8r.enc <jkpssbsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkpssbsce Sf-Kp-Sc-Exp-Medium <jkpssbsce.pfb
-jkpssbscsl8r Sf-Kp-Sc-Medium <8r.enc <jkpssbsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpssbscsle Sf-Kp-Sc-Exp-Medium <jkpssbsce.pfb "0.167 SlantFont" 
-jkpssbsl8r Sf-Kp-Medium <8r.enc <jkpssbn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpssbslc Sf-Kp-Companion-Medium <jkpssbnc.pfb "0.167 SlantFont" 
-jkpssbsle Sf-Kp-Exp-Medium <jkpssbne.pfb "0.167 SlantFont" 
-jkpssbxn8r Sf-Kp-Medium <8r.enc <jkpssbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkpssbxnc Sf-Kp-Companion-Medium <jkpssbnc.pfb "1.125 ExtendFont" 
-jkpssbxne Sf-Kp-Exp-Medium <jkpssbne.pfb "1.125 ExtendFont" 
-jkpssbxsc8r Sf-Kp-Sc-Medium <8r.enc <jkpssbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkpssbxsce Sf-Kp-Sc-Exp-Medium <jkpssbsce.pfb "1.125 ExtendFont" 
-jkpssbxscsl8r Sf-Kp-Sc-Medium <8r.enc <jkpssbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkpssbxscsle Sf-Kp-Sc-Exp-Medium <jkpssbsce.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpssbxsl8r Sf-Kp-Medium <8r.enc <jkpssbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkpssbxslc Sf-Kp-Companion-Medium <jkpssbnc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpssbxsle Sf-Kp-Exp-Medium <jkpssbne.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpsskbsc Sf-Kp-LargeSmallCaps-Medium <jkpsskbsc.pfb
-jkpsskbscsl Sf-Kp-LargeSmallCaps-Medium <jkpsskbsc.pfb "0.167 SlantFont" 
-jkpsskbxsc Sf-Kp-LargeSmallCaps-Medium <jkpsskbsc.pfb "1.125 ExtendFont" 
-jkpsskbxscsl Sf-Kp-LargeSmallCaps-Medium <jkpsskbsc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpsskmsc Sf-Kp-LargeSmallCaps-Regular <jkpsskmsc.pfb
-jkpsskmscsl Sf-Kp-LargeSmallCaps-Regular <jkpsskmsc.pfb "0.167 SlantFont" 
-jkpssmn8r Sf-Kp-Regular <8r.enc <jkpssmn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpssbne Sf-Kp-Exp-Medium "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpssbne.pfb
+jkpssbsc8r Sf-Kp-Sc-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpssbsc8a.pfb
+jkpssbsce Sf-Kp-Sc-Exp-Medium "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkpssbsce.pfb
+jkpssbscsl8r Sf-Kp-Sc-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpssbsc8a.pfb
+jkpssbscsle Sf-Kp-Sc-Exp-Medium "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpssbsce.pfb
+jkpssbsl8r Sf-Kp-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpssbn8a.pfb
+jkpssbslc Sf-Kp-Companion-Medium "0.167 SlantFont" <jkpssbnc.pfb
+jkpssbsle Sf-Kp-Exp-Medium "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkpssbne.pfb
+jkpssbxn8r Sf-Kp-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkpssbn8a.pfb
+jkpssbxnc Sf-Kp-Companion-Medium "1.125 ExtendFont" <jkpssbnc.pfb
+jkpssbxne Sf-Kp-Exp-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont" <kpfonts-expert.enc <jkpssbne.pfb
+jkpssbxsc8r Sf-Kp-Sc-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkpssbsc8a.pfb
+jkpssbxsce Sf-Kp-Sc-Exp-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-expert-sc.enc <jkpssbsce.pfb
+jkpssbxscsl8r Sf-Kp-Sc-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkpssbsc8a.pfb
+jkpssbxscsle Sf-Kp-Sc-Exp-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpssbsce.pfb
+jkpssbxsl8r Sf-Kp-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkpssbn8a.pfb
+jkpssbxslc Sf-Kp-Companion-Medium "1.125 ExtendFont 0.167 SlantFont" <jkpssbnc.pfb
+jkpssbxsle Sf-Kp-Exp-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert.enc <jkpssbne.pfb
+jkpsskbsc Sf-Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkpsskbsc.pfb
+jkpsskbscsl Sf-Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpsskbsc.pfb
+jkpsskbxsc Sf-Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-large-sc.enc <jkpsskbsc.pfb
+jkpsskbxscsl Sf-Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpsskbsc.pfb
+jkpsskmsc Sf-Kp-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkpsskmsc.pfb
+jkpsskmscsl Sf-Kp-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpsskmsc.pfb
+jkpssmn8r Sf-Kp-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpssmn8a.pfb
 jkpssmnc Sf-Kp-Comp-Regular <jkpssmnc.pfb
-jkpssmne Sf-Kp-Exp-Regular <jkpssmne.pfb
-jkpssmsc8r Sf-Kp-Sc-Regular <8r.enc <jkpssmsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkpssmsce Sf-Kp-Sc-Exp-Regular <jkpssmsce.pfb
-jkpssmscsl8r Sf-Kp-Sc-Regular <8r.enc <jkpssmsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpssmscsle Sf-Kp-Sc-Exp-Regular <jkpssmsce.pfb "0.167 SlantFont" 
-jkpssmsl8r Sf-Kp-Regular <8r.enc <jkpssmn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpssmslc Sf-Kp-Comp-Regular <jkpssmnc.pfb "0.167 SlantFont" 
-jkpssmsle Sf-Kp-Exp-Regular <jkpssmne.pfb "0.167 SlantFont" 
+jkpssmne Sf-Kp-Exp-Regular "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpssmne.pfb
+jkpssmsc8r Sf-Kp-Sc-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpssmsc8a.pfb
+jkpssmsce Sf-Kp-Sc-Exp-Regular "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkpssmsce.pfb
+jkpssmscsl8r Sf-Kp-Sc-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpssmsc8a.pfb
+jkpssmscsle Sf-Kp-Sc-Exp-Regular "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpssmsce.pfb
+jkpssmsl8r Sf-Kp-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpssmn8a.pfb
+jkpssmslc Sf-Kp-Comp-Regular "0.167 SlantFont" <jkpssmnc.pfb
+jkpssmsle Sf-Kp-Exp-Regular "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkpssmne.pfb
 jkpsy Kp--M-Sy-Regular <jkpsy.pfb
 jkpsya Kp--M-Sya-Regular <jkpsya.pfb
 jkpsyb Kp--M-Syb-Regular <jkpsyb.pfb
 jkpsyc Kp--M-Syc-Regular <jkpsyc.pfb
 jkpsyd Kp--M-Syd-Regular <jkpsyd.pfb
-jkpttbn8r Tt-Kp-Medium <8r.enc <jkpttbn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpttbn8r Tt-Kp-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpttbn8a.pfb
 jkpttbnc Tt-Kp-Comp-Medium <jkpttbnc.pfb
-jkpttbne Tt-Kp-Exp-Medium <jkpttbne.pfb
-jkpttbsl8r Tt-Kp-Medium <8r.enc <jkpttbn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpttbslc Tt-Kp-Comp-Medium <jkpttbnc.pfb "0.167 SlantFont" 
-jkpttbsle Tt-Kp-Exp-Medium <jkpttbne.pfb "0.167 SlantFont" 
-jkpttmn8r Tt-Kp-Regular <8r.enc <jkpttmn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpttbne Tt-Kp-Exp-Medium "KPFonts-Expert-TT ReEncodeFont" <kpfonts-expert-tt.enc <jkpttbne.pfb
+jkpttbsl8r Tt-Kp-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpttbn8a.pfb
+jkpttbslc Tt-Kp-Comp-Medium "0.167 SlantFont" <jkpttbnc.pfb
+jkpttbsle Tt-Kp-Exp-Medium "KPFonts-Expert-TT ReEncodeFont 0.167 SlantFont" <kpfonts-expert-tt.enc <jkpttbne.pfb
+jkpttmn8r Tt-Kp-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpttmn8a.pfb
 jkpttmnc Tt-Kp-Comp-Regular <jkpttmnc.pfb
-jkpttmne Tt-Kp-Exp-Regular <jkpttmne.pfb
-jkpttmsl8r Tt-Kp-Regular <8r.enc <jkpttmn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpttmslc Tt-Kp-Comp-Regular <jkpttmnc.pfb "0.167 SlantFont" 
-jkpttmsle Tt-Kp-Exp-Regular <jkpttmne.pfb "0.167 SlantFont" 
+jkpttmne Tt-Kp-Exp-Regular "KPFonts-Expert-TT ReEncodeFont" <kpfonts-expert-tt.enc <jkpttmne.pfb
+jkpttmsl8r Tt-Kp-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpttmn8a.pfb
+jkpttmslc Tt-Kp-Comp-Regular "0.167 SlantFont" <jkpttmnc.pfb
+jkpttmsle Tt-Kp-Exp-Regular "KPFonts-Expert-TT ReEncodeFont 0.167 SlantFont" <kpfonts-expert-tt.enc <jkpttmne.pfb
 jthb8v Tahoma-Bold "T5DEncoding ReEncodeFont" <t5d.enc <tahomabd.ttf
 jthr8v Tahoma "T5DEncoding ReEncodeFont" <t5d.enc <tahoma.ttf
 jvnb8v Verdana-Bold "T5DEncoding ReEncodeFont" <t5d.enc <verdanab.ttf
@@ -9341,7 +9341,6 @@ xyeubt11 XYEUBT10 "1.1 ExtendFont" <xyeubt10.pfb
 xyeubt12 XYEUBT10 "1.2 ExtendFont" <xyeubt10.pfb
 yfrak yfrak-Regular <yfrak.pfb
 ygoth ygoth-Regular <ygoth.pfb
-yhcmex10 Yhcmex <yhcmex.pfb
 ylyb8r LibrisADFStd-Bold <8r.enc <ylyb8a.pfb "TeXBase1Encoding ReEncodeFont" 
 ylyb8s LibrisADFStd-Bold <libris-supp.enc <ylyb8a.pfb "fontinst-autoenc-libris-supp ReEncodeFont" 
 ylybi8r LibrisADFStd-BoldItalic <8r.enc <ylybi8a.pfb "TeXBase1Encoding ReEncodeFont" 
diff --git a/Master/texmf/fonts/map/pdftex/updmap/pdftex_dl14.map b/Master/texmf/fonts/map/pdftex/updmap/pdftex_dl14.map
index 4414ccf5f51..3fccbb83f60 100644
--- a/Master/texmf/fonts/map/pdftex/updmap/pdftex_dl14.map
+++ b/Master/texmf/fonts/map/pdftex/updmap/pdftex_dl14.map
@@ -3982,104 +3982,104 @@ itclq8 ISFLQ8 "TS1Encoding ReEncodeFont" <cm-super-ts1.enc <isflq8.pfb
 itcltt8 ISFLTT8 "TS1Encoding ReEncodeFont" <cm-super-ts1.enc <isfltt8.pfb
 jkpbex Kp--M-Ex-Medium <jkpbex.pfb
 jkpbexa Kp--M-Exa-Medium <jkpbexa.pfb
-jkpbit8r Kp-MediumItalic <8r.enc <jkpbit8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpbit8r Kp-MediumItalic "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpbit8a.pfb
 jkpbitc Kp-Companion-MediumItalic <jkpbitc.pfb
-jkpbite Kp-Expert-MediumItalic <jkpbite.pfb
+jkpbite Kp-Expert-MediumItalic "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpbite.pfb
 jkpbmi Kp--M-MediumItalic <jkpbmi.pfb
 jkpbmia Kp--M-Medium <jkpbmia.pfb
-jkpbn8r Kp-Medium <8r.enc <jkpbn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpbn8r Kp-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpbn8a.pfb
 jkpbnc Kp-Companion-Medium <jkpbnc.pfb
-jkpbne Kp-Expert-Medium <jkpbne.pfb
-jkpbsc8r Kp-Smallcaps-Medium <8r.enc <jkpbsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkpbsce Kp-SC-Expert-Medium <jkpbsce.pfb
-jkpbscsl8r Kp-Smallcaps-Medium <8r.enc <jkpbsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpbscsle Kp-SC-Expert-Medium <jkpbsce.pfb "0.167 SlantFont" 
-jkpbsl8r Kp-Medium <8r.enc <jkpbn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpbslc Kp-Companion-Medium <jkpbnc.pfb "0.167 SlantFont" 
-jkpbsle Kp-Expert-Medium <jkpbne.pfb "0.167 SlantFont" 
+jkpbne Kp-Expert-Medium "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpbne.pfb
+jkpbsc8r Kp-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpbsc8a.pfb
+jkpbsce Kp-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkpbsce.pfb
+jkpbscsl8r Kp-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpbsc8a.pfb
+jkpbscsle Kp-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpbsce.pfb
+jkpbsl8r Kp-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpbn8a.pfb
+jkpbslc Kp-Companion-Medium "0.167 SlantFont" <jkpbnc.pfb
+jkpbsle Kp-Expert-Medium "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkpbne.pfb
 jkpbsy Kp--M-Sy-Medium <jkpbsy.pfb
 jkpbsya Kp--M-Sya-Medium <jkpbsya.pfb
 jkpbsyb Kp--M-Syb-Medium <jkpbsyb.pfb
 jkpbsyc Kp--M-Syc-Medium <jkpbsyc.pfb
 jkpbsyd Kp--M-Syd-Medium <jkpbsyd.pfb
-jkpbxit8r Kp-MediumItalic <8r.enc <jkpbit8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkpbxitc Kp-Companion-MediumItalic <jkpbitc.pfb "1.125 ExtendFont" 
-jkpbxite Kp-Expert-MediumItalic <jkpbite.pfb "1.125 ExtendFont" 
-jkpbxn8r Kp-Medium <8r.enc <jkpbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkpbxnc Kp-Companion-Medium <jkpbnc.pfb "1.125 ExtendFont" 
-jkpbxne Kp-Expert-Medium <jkpbne.pfb "1.125 ExtendFont" 
-jkpbxsc8r Kp-Smallcaps-Medium <8r.enc <jkpbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkpbxsce Kp-SC-Expert-Medium <jkpbsce.pfb "1.125 ExtendFont" 
-jkpbxscsl8r Kp-Smallcaps-Medium <8r.enc <jkpbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkpbxscsle Kp-SC-Expert-Medium <jkpbsce.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpbxsl8r Kp-Medium <8r.enc <jkpbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkpbxslc Kp-Companion-Medium <jkpbnc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpbxsle Kp-Expert-Medium <jkpbne.pfb "1.125 ExtendFont 0.167 SlantFont" 
+jkpbxit8r Kp-MediumItalic "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkpbit8a.pfb
+jkpbxitc Kp-Companion-MediumItalic "1.125 ExtendFont" <jkpbitc.pfb
+jkpbxite Kp-Expert-MediumItalic "KPFonts-Expert ReEncodeFont 1.125 ExtendFont" <kpfonts-expert.enc <jkpbite.pfb
+jkpbxn8r Kp-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkpbn8a.pfb
+jkpbxnc Kp-Companion-Medium "1.125 ExtendFont" <jkpbnc.pfb
+jkpbxne Kp-Expert-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont" <kpfonts-expert.enc <jkpbne.pfb
+jkpbxsc8r Kp-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkpbsc8a.pfb
+jkpbxsce Kp-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-expert-sc.enc <jkpbsce.pfb
+jkpbxscsl8r Kp-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkpbsc8a.pfb
+jkpbxscsle Kp-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpbsce.pfb
+jkpbxsl8r Kp-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkpbn8a.pfb
+jkpbxslc Kp-Companion-Medium "1.125 ExtendFont 0.167 SlantFont" <jkpbnc.pfb
+jkpbxsle Kp-Expert-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert.enc <jkpbne.pfb
 jkpex Kp--M-Ex-Regular <jkpex.pfb
 jkpexa Kp--M-Exa-Regular <jkpexa.pfb
-jkpkbsc Kp-LargeSmallCaps-Medium <jkpkbsc.pfb
-jkpkbscsl Kp-LargeSmallCaps-Medium <jkpkbsc.pfb "0.167 SlantFont" 
-jkpkbxsc Kp-LargeSmallCaps-Medium <jkpkbsc.pfb "1.125 ExtendFont" 
-jkpkbxscsl Kp-LargeSmallCaps-Medium <jkpkbsc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpkmsc Kp-LargeSmallCaps-Regular <jkpkmsc.pfb
-jkpkmscsl Kp-LargeSmallCaps-Regular <jkpkmsc.pfb "0.167 SlantFont" 
+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
+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
 jkplbexa Kp-Light-M-Exa-Medium <jkplbexa.pfb
-jkplbit8r Kp-Light-MediumItalic <8r.enc <jkplbit8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkplbit8r Kp-Light-MediumItalic "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplbit8a.pfb
 jkplbitc Kp-Light-Companion-MediumItalic <jkplbitc.pfb
-jkplbite Kp-Light-Expert-MediumItalic <jkplbite.pfb
+jkplbite Kp-Light-Expert-MediumItalic "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkplbite.pfb
 jkplbmi Kp-Light-M-MediumItalic <jkplbmi.pfb
 jkplbmia Kp-Light-M-Medium <jkplbmia.pfb
-jkplbn8r Kp-Light-Medium <8r.enc <jkplbn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkplbn8r Kp-Light-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplbn8a.pfb
 jkplbnc Kp-Light-Companion-Medium <jkplbnc.pfb
-jkplbne Kp-Light-Expert-Medium <jkplbne.pfb
-jkplbsc8r Kp-Light-Smallcaps-Medium <8r.enc <jkplbsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkplbsce Kp-Light-SC-Expert-Medium <jkplbsce.pfb
-jkplbscsl8r Kp-Light-Smallcaps-Medium <8r.enc <jkplbsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkplbscsle Kp-Light-SC-Expert-Medium <jkplbsce.pfb "0.167 SlantFont" 
-jkplbsl8r Kp-Light-Medium <8r.enc <jkplbn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkplbslc Kp-Light-Companion-Medium <jkplbnc.pfb "0.167 SlantFont" 
-jkplbsle Kp-Light-Expert-Medium <jkplbne.pfb "0.167 SlantFont" 
+jkplbne Kp-Light-Expert-Medium "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkplbne.pfb
+jkplbsc8r Kp-Light-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplbsc8a.pfb
+jkplbsce Kp-Light-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkplbsce.pfb
+jkplbscsl8r Kp-Light-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkplbsc8a.pfb
+jkplbscsle Kp-Light-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkplbsce.pfb
+jkplbsl8r Kp-Light-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkplbn8a.pfb
+jkplbslc Kp-Light-Companion-Medium "0.167 SlantFont" <jkplbnc.pfb
+jkplbsle Kp-Light-Expert-Medium "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkplbne.pfb
 jkplbsy Kp-Light-M-Sy-Medium <jkplbsy.pfb
 jkplbsyb Kp-Light-M-Syb-Medium <jkplbsyb.pfb
 jkplbsyc Kp-Light-M-Syc-Medium <jkplbsyc.pfb
 jkplbsyd Kp-Light-M-Syd-Medium <jkplbsyd.pfb
-jkplbxit8r Kp-Light-MediumItalic <8r.enc <jkplbit8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkplbxitc Kp-Light-Companion-MediumItalic <jkplbitc.pfb "1.125 ExtendFont" 
-jkplbxite Kp-Light-Expert-MediumItalic <jkplbite.pfb "1.125 ExtendFont" 
-jkplbxn8r Kp-Light-Medium <8r.enc <jkplbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkplbxnc Kp-Light-Companion-Medium <jkplbnc.pfb "1.125 ExtendFont" 
-jkplbxne Kp-Light-Expert-Medium <jkplbne.pfb "1.125 ExtendFont" 
-jkplbxsc8r Kp-Light-Smallcaps-Medium <8r.enc <jkplbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkplbxsce Kp-Light-SC-Expert-Medium <jkplbsce.pfb "1.125 ExtendFont" 
-jkplbxscsl8r Kp-Light-Smallcaps-Medium <8r.enc <jkplbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkplbxscsle Kp-Light-SC-Expert-Medium <jkplbsce.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkplbxsl8r Kp-Light-Medium <8r.enc <jkplbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkplbxslc Kp-Light-Companion-Medium <jkplbnc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkplbxsle Kp-Light-Expert-Medium <jkplbne.pfb "1.125 ExtendFont 0.167 SlantFont" 
+jkplbxit8r Kp-Light-MediumItalic "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkplbit8a.pfb
+jkplbxitc Kp-Light-Companion-MediumItalic "1.125 ExtendFont" <jkplbitc.pfb
+jkplbxite Kp-Light-Expert-MediumItalic "KPFonts-Expert ReEncodeFont 1.125 ExtendFont" <kpfonts-expert.enc <jkplbite.pfb
+jkplbxn8r Kp-Light-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkplbn8a.pfb
+jkplbxnc Kp-Light-Companion-Medium "1.125 ExtendFont" <jkplbnc.pfb
+jkplbxne Kp-Light-Expert-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont" <kpfonts-expert.enc <jkplbne.pfb
+jkplbxsc8r Kp-Light-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkplbsc8a.pfb
+jkplbxsce Kp-Light-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-expert-sc.enc <jkplbsce.pfb
+jkplbxscsl8r Kp-Light-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkplbsc8a.pfb
+jkplbxscsle Kp-Light-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkplbsce.pfb
+jkplbxsl8r Kp-Light-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkplbn8a.pfb
+jkplbxslc Kp-Light-Companion-Medium "1.125 ExtendFont 0.167 SlantFont" <jkplbnc.pfb
+jkplbxsle Kp-Light-Expert-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert.enc <jkplbne.pfb
 jkplex Kp-Light-M-Ex-Regular <jkplex.pfb
 jkplexa Kp-Light-M-Exa-Regular <jkplexa.pfb
-jkplkbsc Kp-Light-LargeSmallCaps-Medium <jkplkbsc.pfb
-jkplkbscsl Kp-Light-LargeSmallCaps-Medium <jkplkbsc.pfb "0.167 SlantFont" 
-jkplkbxsc Kp-Light-LargeSmallCaps-Medium <jkplkbsc.pfb "1.125 ExtendFont" 
-jkplkbxscsl Kp-Light-LargeSmallCaps-Medium <jkplkbsc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkplkmsc Kp-Light-LargeSmallCaps-Regular <jkplkmsc.pfb
-jkplkmscsl Kp-Light-LargeSmallCaps-Regular <jkplkmsc.pfb "0.167 SlantFont" 
+jkplkbsc Kp-Light-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkplkbsc.pfb
+jkplkbscsl Kp-Light-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkplkbsc.pfb
+jkplkbxsc Kp-Light-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-large-sc.enc <jkplkbsc.pfb
+jkplkbxscsl Kp-Light-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkplkbsc.pfb
+jkplkmsc Kp-Light-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkplkmsc.pfb
+jkplkmscsl Kp-Light-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkplkmsc.pfb
 jkplmi Kp-Light-M-Italic <jkplmi.pfb
 jkplmia Kp-Light-M-Regular <jkplmia.pfb
-jkplmit8r Kp-Light-Italic <8r.enc <jkplmit8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkplmit8r Kp-Light-Italic "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplmit8a.pfb
 jkplmitc Kp-Light-Companion-Italic <jkplmitc.pfb
-jkplmite Kp-Light-Expert-Italic <jkplmite.pfb
-jkplmn8r Kp-Light-Regular <8r.enc <jkplmn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkplmite Kp-Light-Expert-Italic "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkplmite.pfb
+jkplmn8r Kp-Light-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplmn8a.pfb
 jkplmnc Kp-Light-Companion-Regular <jkplmnc.pfb
-jkplmne Kp-Light-Expert-Regular <jkplmne.pfb
-jkplmsc8r Kp-Light-SmallCaps-Regular <8r.enc <jkplmsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkplmsce Kp-Light-SC-Expert-Regular <jkplmsce.pfb
-jkplmscsl8r Kp-Light-SmallCaps-Regular <8r.enc <jkplmsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkplmscsle Kp-Light-SC-Expert-Regular <jkplmsce.pfb "0.167 SlantFont" 
-jkplmsl8r Kp-Light-Regular <8r.enc <jkplmn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkplmslc Kp-Light-Companion-Regular <jkplmnc.pfb "0.167 SlantFont" 
-jkplmsle Kp-Light-Expert-Regular <jkplmne.pfb "0.167 SlantFont" 
+jkplmne Kp-Light-Expert-Regular "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkplmne.pfb
+jkplmsc8r Kp-Light-SmallCaps-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplmsc8a.pfb
+jkplmsce Kp-Light-SC-Expert-Regular "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkplmsce.pfb
+jkplmscsl8r Kp-Light-SmallCaps-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkplmsc8a.pfb
+jkplmscsle Kp-Light-SC-Expert-Regular "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkplmsce.pfb
+jkplmsl8r Kp-Light-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkplmn8a.pfb
+jkplmslc Kp-Light-Companion-Regular "0.167 SlantFont" <jkplmnc.pfb
+jkplmsle Kp-Light-Expert-Regular "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkplmne.pfb
 jkplsy Kp-Light-M-Sy-Regular <jkplsy.pfb
 jkplsyb Kp-Light-M-Syb-Regular <jkplsyb.pfb
 jkplsyc Kp-Light-M-Syc-Regular <jkplsyc.pfb
@@ -4088,70 +4088,70 @@ jkpmi Kp--M-Italic <jkpmi.pfb
 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 <jkpmite.pfb
-jkpmn8r Kp-Regular <8r.enc <jkpmn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpmite Kp-Expert-Italic "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpmite.pfb
+jkpmn8r Kp-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpmn8a.pfb
 jkpmnc Kp-Companion-Regular <jkpmnc.pfb
-jkpmne Kp-Expert-Regular <jkpmne.pfb
-jkpmsc8r Kp-SmallCaps-Regular <8r.enc <jkpmsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkpmsce Kp-SC-Expert-Regular <jkpmsce.pfb
-jkpmscsl8r Kp-SmallCaps-Regular <8r.enc <jkpmsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpmscsle Kp-SC-Expert-Regular <jkpmsce.pfb "0.167 SlantFont" 
-jkpmsl8r Kp-Regular <8r.enc <jkpmn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpmslc Kp-Companion-Regular <jkpmnc.pfb "0.167 SlantFont" 
-jkpmsle Kp-Expert-Regular <jkpmne.pfb "0.167 SlantFont" 
-jkpssbn8r Sf-Kp-Medium <8r.enc <jkpssbn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpmne Kp-Expert-Regular "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpmne.pfb
+jkpmsc8r Kp-SmallCaps-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpmsc8a.pfb
+jkpmsce Kp-SC-Expert-Regular "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkpmsce.pfb
+jkpmscsl8r Kp-SmallCaps-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpmsc8a.pfb
+jkpmscsle Kp-SC-Expert-Regular "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpmsce.pfb
+jkpmsl8r Kp-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpmn8a.pfb
+jkpmslc Kp-Companion-Regular "0.167 SlantFont" <jkpmnc.pfb
+jkpmsle Kp-Expert-Regular "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkpmne.pfb
+jkpssbn8r Sf-Kp-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpssbn8a.pfb
 jkpssbnc Sf-Kp-Companion-Medium <jkpssbnc.pfb
-jkpssbne Sf-Kp-Exp-Medium <jkpssbne.pfb
-jkpssbsc8r Sf-Kp-Sc-Medium <8r.enc <jkpssbsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkpssbsce Sf-Kp-Sc-Exp-Medium <jkpssbsce.pfb
-jkpssbscsl8r Sf-Kp-Sc-Medium <8r.enc <jkpssbsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpssbscsle Sf-Kp-Sc-Exp-Medium <jkpssbsce.pfb "0.167 SlantFont" 
-jkpssbsl8r Sf-Kp-Medium <8r.enc <jkpssbn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpssbslc Sf-Kp-Companion-Medium <jkpssbnc.pfb "0.167 SlantFont" 
-jkpssbsle Sf-Kp-Exp-Medium <jkpssbne.pfb "0.167 SlantFont" 
-jkpssbxn8r Sf-Kp-Medium <8r.enc <jkpssbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkpssbxnc Sf-Kp-Companion-Medium <jkpssbnc.pfb "1.125 ExtendFont" 
-jkpssbxne Sf-Kp-Exp-Medium <jkpssbne.pfb "1.125 ExtendFont" 
-jkpssbxsc8r Sf-Kp-Sc-Medium <8r.enc <jkpssbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkpssbxsce Sf-Kp-Sc-Exp-Medium <jkpssbsce.pfb "1.125 ExtendFont" 
-jkpssbxscsl8r Sf-Kp-Sc-Medium <8r.enc <jkpssbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkpssbxscsle Sf-Kp-Sc-Exp-Medium <jkpssbsce.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpssbxsl8r Sf-Kp-Medium <8r.enc <jkpssbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkpssbxslc Sf-Kp-Companion-Medium <jkpssbnc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpssbxsle Sf-Kp-Exp-Medium <jkpssbne.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpsskbsc Sf-Kp-LargeSmallCaps-Medium <jkpsskbsc.pfb
-jkpsskbscsl Sf-Kp-LargeSmallCaps-Medium <jkpsskbsc.pfb "0.167 SlantFont" 
-jkpsskbxsc Sf-Kp-LargeSmallCaps-Medium <jkpsskbsc.pfb "1.125 ExtendFont" 
-jkpsskbxscsl Sf-Kp-LargeSmallCaps-Medium <jkpsskbsc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpsskmsc Sf-Kp-LargeSmallCaps-Regular <jkpsskmsc.pfb
-jkpsskmscsl Sf-Kp-LargeSmallCaps-Regular <jkpsskmsc.pfb "0.167 SlantFont" 
-jkpssmn8r Sf-Kp-Regular <8r.enc <jkpssmn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpssbne Sf-Kp-Exp-Medium "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpssbne.pfb
+jkpssbsc8r Sf-Kp-Sc-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpssbsc8a.pfb
+jkpssbsce Sf-Kp-Sc-Exp-Medium "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkpssbsce.pfb
+jkpssbscsl8r Sf-Kp-Sc-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpssbsc8a.pfb
+jkpssbscsle Sf-Kp-Sc-Exp-Medium "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpssbsce.pfb
+jkpssbsl8r Sf-Kp-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpssbn8a.pfb
+jkpssbslc Sf-Kp-Companion-Medium "0.167 SlantFont" <jkpssbnc.pfb
+jkpssbsle Sf-Kp-Exp-Medium "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkpssbne.pfb
+jkpssbxn8r Sf-Kp-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkpssbn8a.pfb
+jkpssbxnc Sf-Kp-Companion-Medium "1.125 ExtendFont" <jkpssbnc.pfb
+jkpssbxne Sf-Kp-Exp-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont" <kpfonts-expert.enc <jkpssbne.pfb
+jkpssbxsc8r Sf-Kp-Sc-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkpssbsc8a.pfb
+jkpssbxsce Sf-Kp-Sc-Exp-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-expert-sc.enc <jkpssbsce.pfb
+jkpssbxscsl8r Sf-Kp-Sc-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkpssbsc8a.pfb
+jkpssbxscsle Sf-Kp-Sc-Exp-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpssbsce.pfb
+jkpssbxsl8r Sf-Kp-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkpssbn8a.pfb
+jkpssbxslc Sf-Kp-Companion-Medium "1.125 ExtendFont 0.167 SlantFont" <jkpssbnc.pfb
+jkpssbxsle Sf-Kp-Exp-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert.enc <jkpssbne.pfb
+jkpsskbsc Sf-Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkpsskbsc.pfb
+jkpsskbscsl Sf-Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpsskbsc.pfb
+jkpsskbxsc Sf-Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-large-sc.enc <jkpsskbsc.pfb
+jkpsskbxscsl Sf-Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpsskbsc.pfb
+jkpsskmsc Sf-Kp-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkpsskmsc.pfb
+jkpsskmscsl Sf-Kp-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpsskmsc.pfb
+jkpssmn8r Sf-Kp-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpssmn8a.pfb
 jkpssmnc Sf-Kp-Comp-Regular <jkpssmnc.pfb
-jkpssmne Sf-Kp-Exp-Regular <jkpssmne.pfb
-jkpssmsc8r Sf-Kp-Sc-Regular <8r.enc <jkpssmsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkpssmsce Sf-Kp-Sc-Exp-Regular <jkpssmsce.pfb
-jkpssmscsl8r Sf-Kp-Sc-Regular <8r.enc <jkpssmsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpssmscsle Sf-Kp-Sc-Exp-Regular <jkpssmsce.pfb "0.167 SlantFont" 
-jkpssmsl8r Sf-Kp-Regular <8r.enc <jkpssmn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpssmslc Sf-Kp-Comp-Regular <jkpssmnc.pfb "0.167 SlantFont" 
-jkpssmsle Sf-Kp-Exp-Regular <jkpssmne.pfb "0.167 SlantFont" 
+jkpssmne Sf-Kp-Exp-Regular "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpssmne.pfb
+jkpssmsc8r Sf-Kp-Sc-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpssmsc8a.pfb
+jkpssmsce Sf-Kp-Sc-Exp-Regular "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkpssmsce.pfb
+jkpssmscsl8r Sf-Kp-Sc-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpssmsc8a.pfb
+jkpssmscsle Sf-Kp-Sc-Exp-Regular "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpssmsce.pfb
+jkpssmsl8r Sf-Kp-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpssmn8a.pfb
+jkpssmslc Sf-Kp-Comp-Regular "0.167 SlantFont" <jkpssmnc.pfb
+jkpssmsle Sf-Kp-Exp-Regular "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkpssmne.pfb
 jkpsy Kp--M-Sy-Regular <jkpsy.pfb
 jkpsya Kp--M-Sya-Regular <jkpsya.pfb
 jkpsyb Kp--M-Syb-Regular <jkpsyb.pfb
 jkpsyc Kp--M-Syc-Regular <jkpsyc.pfb
 jkpsyd Kp--M-Syd-Regular <jkpsyd.pfb
-jkpttbn8r Tt-Kp-Medium <8r.enc <jkpttbn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpttbn8r Tt-Kp-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpttbn8a.pfb
 jkpttbnc Tt-Kp-Comp-Medium <jkpttbnc.pfb
-jkpttbne Tt-Kp-Exp-Medium <jkpttbne.pfb
-jkpttbsl8r Tt-Kp-Medium <8r.enc <jkpttbn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpttbslc Tt-Kp-Comp-Medium <jkpttbnc.pfb "0.167 SlantFont" 
-jkpttbsle Tt-Kp-Exp-Medium <jkpttbne.pfb "0.167 SlantFont" 
-jkpttmn8r Tt-Kp-Regular <8r.enc <jkpttmn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpttbne Tt-Kp-Exp-Medium "KPFonts-Expert-TT ReEncodeFont" <kpfonts-expert-tt.enc <jkpttbne.pfb
+jkpttbsl8r Tt-Kp-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpttbn8a.pfb
+jkpttbslc Tt-Kp-Comp-Medium "0.167 SlantFont" <jkpttbnc.pfb
+jkpttbsle Tt-Kp-Exp-Medium "KPFonts-Expert-TT ReEncodeFont 0.167 SlantFont" <kpfonts-expert-tt.enc <jkpttbne.pfb
+jkpttmn8r Tt-Kp-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpttmn8a.pfb
 jkpttmnc Tt-Kp-Comp-Regular <jkpttmnc.pfb
-jkpttmne Tt-Kp-Exp-Regular <jkpttmne.pfb
-jkpttmsl8r Tt-Kp-Regular <8r.enc <jkpttmn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpttmslc Tt-Kp-Comp-Regular <jkpttmnc.pfb "0.167 SlantFont" 
-jkpttmsle Tt-Kp-Exp-Regular <jkpttmne.pfb "0.167 SlantFont" 
+jkpttmne Tt-Kp-Exp-Regular "KPFonts-Expert-TT ReEncodeFont" <kpfonts-expert-tt.enc <jkpttmne.pfb
+jkpttmsl8r Tt-Kp-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpttmn8a.pfb
+jkpttmslc Tt-Kp-Comp-Regular "0.167 SlantFont" <jkpttmnc.pfb
+jkpttmsle Tt-Kp-Exp-Regular "KPFonts-Expert-TT ReEncodeFont 0.167 SlantFont" <kpfonts-expert-tt.enc <jkpttmne.pfb
 jthb8v Tahoma-Bold "T5DEncoding ReEncodeFont" <t5d.enc <tahomabd.ttf
 jthr8v Tahoma "T5DEncoding ReEncodeFont" <t5d.enc <tahoma.ttf
 jvnb8v Verdana-Bold "T5DEncoding ReEncodeFont" <t5d.enc <verdanab.ttf
@@ -9341,7 +9341,6 @@ xyeubt11 XYEUBT10 "1.1 ExtendFont" <xyeubt10.pfb
 xyeubt12 XYEUBT10 "1.2 ExtendFont" <xyeubt10.pfb
 yfrak yfrak-Regular <yfrak.pfb
 ygoth ygoth-Regular <ygoth.pfb
-yhcmex10 Yhcmex <yhcmex.pfb
 ylyb8r LibrisADFStd-Bold <8r.enc <ylyb8a.pfb "TeXBase1Encoding ReEncodeFont" 
 ylyb8s LibrisADFStd-Bold <libris-supp.enc <ylyb8a.pfb "fontinst-autoenc-libris-supp ReEncodeFont" 
 ylybi8r LibrisADFStd-BoldItalic <8r.enc <ylybi8a.pfb "TeXBase1Encoding ReEncodeFont" 
diff --git a/Master/texmf/fonts/map/pdftex/updmap/pdftex_ndl14.map b/Master/texmf/fonts/map/pdftex/updmap/pdftex_ndl14.map
index 9a7f3b48a89..4a29a0aa953 100644
--- a/Master/texmf/fonts/map/pdftex/updmap/pdftex_ndl14.map
+++ b/Master/texmf/fonts/map/pdftex/updmap/pdftex_ndl14.map
@@ -3982,104 +3982,104 @@ itclq8 ISFLQ8 "TS1Encoding ReEncodeFont" <cm-super-ts1.enc <isflq8.pfb
 itcltt8 ISFLTT8 "TS1Encoding ReEncodeFont" <cm-super-ts1.enc <isfltt8.pfb
 jkpbex Kp--M-Ex-Medium <jkpbex.pfb
 jkpbexa Kp--M-Exa-Medium <jkpbexa.pfb
-jkpbit8r Kp-MediumItalic <8r.enc <jkpbit8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpbit8r Kp-MediumItalic "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpbit8a.pfb
 jkpbitc Kp-Companion-MediumItalic <jkpbitc.pfb
-jkpbite Kp-Expert-MediumItalic <jkpbite.pfb
+jkpbite Kp-Expert-MediumItalic "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpbite.pfb
 jkpbmi Kp--M-MediumItalic <jkpbmi.pfb
 jkpbmia Kp--M-Medium <jkpbmia.pfb
-jkpbn8r Kp-Medium <8r.enc <jkpbn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpbn8r Kp-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpbn8a.pfb
 jkpbnc Kp-Companion-Medium <jkpbnc.pfb
-jkpbne Kp-Expert-Medium <jkpbne.pfb
-jkpbsc8r Kp-Smallcaps-Medium <8r.enc <jkpbsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkpbsce Kp-SC-Expert-Medium <jkpbsce.pfb
-jkpbscsl8r Kp-Smallcaps-Medium <8r.enc <jkpbsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpbscsle Kp-SC-Expert-Medium <jkpbsce.pfb "0.167 SlantFont" 
-jkpbsl8r Kp-Medium <8r.enc <jkpbn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpbslc Kp-Companion-Medium <jkpbnc.pfb "0.167 SlantFont" 
-jkpbsle Kp-Expert-Medium <jkpbne.pfb "0.167 SlantFont" 
+jkpbne Kp-Expert-Medium "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpbne.pfb
+jkpbsc8r Kp-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpbsc8a.pfb
+jkpbsce Kp-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkpbsce.pfb
+jkpbscsl8r Kp-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpbsc8a.pfb
+jkpbscsle Kp-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpbsce.pfb
+jkpbsl8r Kp-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpbn8a.pfb
+jkpbslc Kp-Companion-Medium "0.167 SlantFont" <jkpbnc.pfb
+jkpbsle Kp-Expert-Medium "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkpbne.pfb
 jkpbsy Kp--M-Sy-Medium <jkpbsy.pfb
 jkpbsya Kp--M-Sya-Medium <jkpbsya.pfb
 jkpbsyb Kp--M-Syb-Medium <jkpbsyb.pfb
 jkpbsyc Kp--M-Syc-Medium <jkpbsyc.pfb
 jkpbsyd Kp--M-Syd-Medium <jkpbsyd.pfb
-jkpbxit8r Kp-MediumItalic <8r.enc <jkpbit8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkpbxitc Kp-Companion-MediumItalic <jkpbitc.pfb "1.125 ExtendFont" 
-jkpbxite Kp-Expert-MediumItalic <jkpbite.pfb "1.125 ExtendFont" 
-jkpbxn8r Kp-Medium <8r.enc <jkpbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkpbxnc Kp-Companion-Medium <jkpbnc.pfb "1.125 ExtendFont" 
-jkpbxne Kp-Expert-Medium <jkpbne.pfb "1.125 ExtendFont" 
-jkpbxsc8r Kp-Smallcaps-Medium <8r.enc <jkpbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkpbxsce Kp-SC-Expert-Medium <jkpbsce.pfb "1.125 ExtendFont" 
-jkpbxscsl8r Kp-Smallcaps-Medium <8r.enc <jkpbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkpbxscsle Kp-SC-Expert-Medium <jkpbsce.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpbxsl8r Kp-Medium <8r.enc <jkpbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkpbxslc Kp-Companion-Medium <jkpbnc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpbxsle Kp-Expert-Medium <jkpbne.pfb "1.125 ExtendFont 0.167 SlantFont" 
+jkpbxit8r Kp-MediumItalic "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkpbit8a.pfb
+jkpbxitc Kp-Companion-MediumItalic "1.125 ExtendFont" <jkpbitc.pfb
+jkpbxite Kp-Expert-MediumItalic "KPFonts-Expert ReEncodeFont 1.125 ExtendFont" <kpfonts-expert.enc <jkpbite.pfb
+jkpbxn8r Kp-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkpbn8a.pfb
+jkpbxnc Kp-Companion-Medium "1.125 ExtendFont" <jkpbnc.pfb
+jkpbxne Kp-Expert-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont" <kpfonts-expert.enc <jkpbne.pfb
+jkpbxsc8r Kp-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkpbsc8a.pfb
+jkpbxsce Kp-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-expert-sc.enc <jkpbsce.pfb
+jkpbxscsl8r Kp-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkpbsc8a.pfb
+jkpbxscsle Kp-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpbsce.pfb
+jkpbxsl8r Kp-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkpbn8a.pfb
+jkpbxslc Kp-Companion-Medium "1.125 ExtendFont 0.167 SlantFont" <jkpbnc.pfb
+jkpbxsle Kp-Expert-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert.enc <jkpbne.pfb
 jkpex Kp--M-Ex-Regular <jkpex.pfb
 jkpexa Kp--M-Exa-Regular <jkpexa.pfb
-jkpkbsc Kp-LargeSmallCaps-Medium <jkpkbsc.pfb
-jkpkbscsl Kp-LargeSmallCaps-Medium <jkpkbsc.pfb "0.167 SlantFont" 
-jkpkbxsc Kp-LargeSmallCaps-Medium <jkpkbsc.pfb "1.125 ExtendFont" 
-jkpkbxscsl Kp-LargeSmallCaps-Medium <jkpkbsc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpkmsc Kp-LargeSmallCaps-Regular <jkpkmsc.pfb
-jkpkmscsl Kp-LargeSmallCaps-Regular <jkpkmsc.pfb "0.167 SlantFont" 
+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
+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
 jkplbexa Kp-Light-M-Exa-Medium <jkplbexa.pfb
-jkplbit8r Kp-Light-MediumItalic <8r.enc <jkplbit8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkplbit8r Kp-Light-MediumItalic "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplbit8a.pfb
 jkplbitc Kp-Light-Companion-MediumItalic <jkplbitc.pfb
-jkplbite Kp-Light-Expert-MediumItalic <jkplbite.pfb
+jkplbite Kp-Light-Expert-MediumItalic "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkplbite.pfb
 jkplbmi Kp-Light-M-MediumItalic <jkplbmi.pfb
 jkplbmia Kp-Light-M-Medium <jkplbmia.pfb
-jkplbn8r Kp-Light-Medium <8r.enc <jkplbn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkplbn8r Kp-Light-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplbn8a.pfb
 jkplbnc Kp-Light-Companion-Medium <jkplbnc.pfb
-jkplbne Kp-Light-Expert-Medium <jkplbne.pfb
-jkplbsc8r Kp-Light-Smallcaps-Medium <8r.enc <jkplbsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkplbsce Kp-Light-SC-Expert-Medium <jkplbsce.pfb
-jkplbscsl8r Kp-Light-Smallcaps-Medium <8r.enc <jkplbsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkplbscsle Kp-Light-SC-Expert-Medium <jkplbsce.pfb "0.167 SlantFont" 
-jkplbsl8r Kp-Light-Medium <8r.enc <jkplbn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkplbslc Kp-Light-Companion-Medium <jkplbnc.pfb "0.167 SlantFont" 
-jkplbsle Kp-Light-Expert-Medium <jkplbne.pfb "0.167 SlantFont" 
+jkplbne Kp-Light-Expert-Medium "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkplbne.pfb
+jkplbsc8r Kp-Light-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplbsc8a.pfb
+jkplbsce Kp-Light-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkplbsce.pfb
+jkplbscsl8r Kp-Light-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkplbsc8a.pfb
+jkplbscsle Kp-Light-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkplbsce.pfb
+jkplbsl8r Kp-Light-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkplbn8a.pfb
+jkplbslc Kp-Light-Companion-Medium "0.167 SlantFont" <jkplbnc.pfb
+jkplbsle Kp-Light-Expert-Medium "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkplbne.pfb
 jkplbsy Kp-Light-M-Sy-Medium <jkplbsy.pfb
 jkplbsyb Kp-Light-M-Syb-Medium <jkplbsyb.pfb
 jkplbsyc Kp-Light-M-Syc-Medium <jkplbsyc.pfb
 jkplbsyd Kp-Light-M-Syd-Medium <jkplbsyd.pfb
-jkplbxit8r Kp-Light-MediumItalic <8r.enc <jkplbit8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkplbxitc Kp-Light-Companion-MediumItalic <jkplbitc.pfb "1.125 ExtendFont" 
-jkplbxite Kp-Light-Expert-MediumItalic <jkplbite.pfb "1.125 ExtendFont" 
-jkplbxn8r Kp-Light-Medium <8r.enc <jkplbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkplbxnc Kp-Light-Companion-Medium <jkplbnc.pfb "1.125 ExtendFont" 
-jkplbxne Kp-Light-Expert-Medium <jkplbne.pfb "1.125 ExtendFont" 
-jkplbxsc8r Kp-Light-Smallcaps-Medium <8r.enc <jkplbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkplbxsce Kp-Light-SC-Expert-Medium <jkplbsce.pfb "1.125 ExtendFont" 
-jkplbxscsl8r Kp-Light-Smallcaps-Medium <8r.enc <jkplbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkplbxscsle Kp-Light-SC-Expert-Medium <jkplbsce.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkplbxsl8r Kp-Light-Medium <8r.enc <jkplbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkplbxslc Kp-Light-Companion-Medium <jkplbnc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkplbxsle Kp-Light-Expert-Medium <jkplbne.pfb "1.125 ExtendFont 0.167 SlantFont" 
+jkplbxit8r Kp-Light-MediumItalic "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkplbit8a.pfb
+jkplbxitc Kp-Light-Companion-MediumItalic "1.125 ExtendFont" <jkplbitc.pfb
+jkplbxite Kp-Light-Expert-MediumItalic "KPFonts-Expert ReEncodeFont 1.125 ExtendFont" <kpfonts-expert.enc <jkplbite.pfb
+jkplbxn8r Kp-Light-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkplbn8a.pfb
+jkplbxnc Kp-Light-Companion-Medium "1.125 ExtendFont" <jkplbnc.pfb
+jkplbxne Kp-Light-Expert-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont" <kpfonts-expert.enc <jkplbne.pfb
+jkplbxsc8r Kp-Light-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkplbsc8a.pfb
+jkplbxsce Kp-Light-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-expert-sc.enc <jkplbsce.pfb
+jkplbxscsl8r Kp-Light-Smallcaps-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkplbsc8a.pfb
+jkplbxscsle Kp-Light-SC-Expert-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkplbsce.pfb
+jkplbxsl8r Kp-Light-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkplbn8a.pfb
+jkplbxslc Kp-Light-Companion-Medium "1.125 ExtendFont 0.167 SlantFont" <jkplbnc.pfb
+jkplbxsle Kp-Light-Expert-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert.enc <jkplbne.pfb
 jkplex Kp-Light-M-Ex-Regular <jkplex.pfb
 jkplexa Kp-Light-M-Exa-Regular <jkplexa.pfb
-jkplkbsc Kp-Light-LargeSmallCaps-Medium <jkplkbsc.pfb
-jkplkbscsl Kp-Light-LargeSmallCaps-Medium <jkplkbsc.pfb "0.167 SlantFont" 
-jkplkbxsc Kp-Light-LargeSmallCaps-Medium <jkplkbsc.pfb "1.125 ExtendFont" 
-jkplkbxscsl Kp-Light-LargeSmallCaps-Medium <jkplkbsc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkplkmsc Kp-Light-LargeSmallCaps-Regular <jkplkmsc.pfb
-jkplkmscsl Kp-Light-LargeSmallCaps-Regular <jkplkmsc.pfb "0.167 SlantFont" 
+jkplkbsc Kp-Light-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkplkbsc.pfb
+jkplkbscsl Kp-Light-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkplkbsc.pfb
+jkplkbxsc Kp-Light-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-large-sc.enc <jkplkbsc.pfb
+jkplkbxscsl Kp-Light-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkplkbsc.pfb
+jkplkmsc Kp-Light-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkplkmsc.pfb
+jkplkmscsl Kp-Light-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkplkmsc.pfb
 jkplmi Kp-Light-M-Italic <jkplmi.pfb
 jkplmia Kp-Light-M-Regular <jkplmia.pfb
-jkplmit8r Kp-Light-Italic <8r.enc <jkplmit8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkplmit8r Kp-Light-Italic "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplmit8a.pfb
 jkplmitc Kp-Light-Companion-Italic <jkplmitc.pfb
-jkplmite Kp-Light-Expert-Italic <jkplmite.pfb
-jkplmn8r Kp-Light-Regular <8r.enc <jkplmn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkplmite Kp-Light-Expert-Italic "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkplmite.pfb
+jkplmn8r Kp-Light-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplmn8a.pfb
 jkplmnc Kp-Light-Companion-Regular <jkplmnc.pfb
-jkplmne Kp-Light-Expert-Regular <jkplmne.pfb
-jkplmsc8r Kp-Light-SmallCaps-Regular <8r.enc <jkplmsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkplmsce Kp-Light-SC-Expert-Regular <jkplmsce.pfb
-jkplmscsl8r Kp-Light-SmallCaps-Regular <8r.enc <jkplmsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkplmscsle Kp-Light-SC-Expert-Regular <jkplmsce.pfb "0.167 SlantFont" 
-jkplmsl8r Kp-Light-Regular <8r.enc <jkplmn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkplmslc Kp-Light-Companion-Regular <jkplmnc.pfb "0.167 SlantFont" 
-jkplmsle Kp-Light-Expert-Regular <jkplmne.pfb "0.167 SlantFont" 
+jkplmne Kp-Light-Expert-Regular "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkplmne.pfb
+jkplmsc8r Kp-Light-SmallCaps-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkplmsc8a.pfb
+jkplmsce Kp-Light-SC-Expert-Regular "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkplmsce.pfb
+jkplmscsl8r Kp-Light-SmallCaps-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkplmsc8a.pfb
+jkplmscsle Kp-Light-SC-Expert-Regular "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkplmsce.pfb
+jkplmsl8r Kp-Light-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkplmn8a.pfb
+jkplmslc Kp-Light-Companion-Regular "0.167 SlantFont" <jkplmnc.pfb
+jkplmsle Kp-Light-Expert-Regular "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkplmne.pfb
 jkplsy Kp-Light-M-Sy-Regular <jkplsy.pfb
 jkplsyb Kp-Light-M-Syb-Regular <jkplsyb.pfb
 jkplsyc Kp-Light-M-Syc-Regular <jkplsyc.pfb
@@ -4088,70 +4088,70 @@ jkpmi Kp--M-Italic <jkpmi.pfb
 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 <jkpmite.pfb
-jkpmn8r Kp-Regular <8r.enc <jkpmn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpmite Kp-Expert-Italic "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpmite.pfb
+jkpmn8r Kp-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpmn8a.pfb
 jkpmnc Kp-Companion-Regular <jkpmnc.pfb
-jkpmne Kp-Expert-Regular <jkpmne.pfb
-jkpmsc8r Kp-SmallCaps-Regular <8r.enc <jkpmsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkpmsce Kp-SC-Expert-Regular <jkpmsce.pfb
-jkpmscsl8r Kp-SmallCaps-Regular <8r.enc <jkpmsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpmscsle Kp-SC-Expert-Regular <jkpmsce.pfb "0.167 SlantFont" 
-jkpmsl8r Kp-Regular <8r.enc <jkpmn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpmslc Kp-Companion-Regular <jkpmnc.pfb "0.167 SlantFont" 
-jkpmsle Kp-Expert-Regular <jkpmne.pfb "0.167 SlantFont" 
-jkpssbn8r Sf-Kp-Medium <8r.enc <jkpssbn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpmne Kp-Expert-Regular "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpmne.pfb
+jkpmsc8r Kp-SmallCaps-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpmsc8a.pfb
+jkpmsce Kp-SC-Expert-Regular "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkpmsce.pfb
+jkpmscsl8r Kp-SmallCaps-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpmsc8a.pfb
+jkpmscsle Kp-SC-Expert-Regular "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpmsce.pfb
+jkpmsl8r Kp-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpmn8a.pfb
+jkpmslc Kp-Companion-Regular "0.167 SlantFont" <jkpmnc.pfb
+jkpmsle Kp-Expert-Regular "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkpmne.pfb
+jkpssbn8r Sf-Kp-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpssbn8a.pfb
 jkpssbnc Sf-Kp-Companion-Medium <jkpssbnc.pfb
-jkpssbne Sf-Kp-Exp-Medium <jkpssbne.pfb
-jkpssbsc8r Sf-Kp-Sc-Medium <8r.enc <jkpssbsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkpssbsce Sf-Kp-Sc-Exp-Medium <jkpssbsce.pfb
-jkpssbscsl8r Sf-Kp-Sc-Medium <8r.enc <jkpssbsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpssbscsle Sf-Kp-Sc-Exp-Medium <jkpssbsce.pfb "0.167 SlantFont" 
-jkpssbsl8r Sf-Kp-Medium <8r.enc <jkpssbn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpssbslc Sf-Kp-Companion-Medium <jkpssbnc.pfb "0.167 SlantFont" 
-jkpssbsle Sf-Kp-Exp-Medium <jkpssbne.pfb "0.167 SlantFont" 
-jkpssbxn8r Sf-Kp-Medium <8r.enc <jkpssbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkpssbxnc Sf-Kp-Companion-Medium <jkpssbnc.pfb "1.125 ExtendFont" 
-jkpssbxne Sf-Kp-Exp-Medium <jkpssbne.pfb "1.125 ExtendFont" 
-jkpssbxsc8r Sf-Kp-Sc-Medium <8r.enc <jkpssbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" 
-jkpssbxsce Sf-Kp-Sc-Exp-Medium <jkpssbsce.pfb "1.125 ExtendFont" 
-jkpssbxscsl8r Sf-Kp-Sc-Medium <8r.enc <jkpssbsc8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkpssbxscsle Sf-Kp-Sc-Exp-Medium <jkpssbsce.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpssbxsl8r Sf-Kp-Medium <8r.enc <jkpssbn8a.pfb "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" 
-jkpssbxslc Sf-Kp-Companion-Medium <jkpssbnc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpssbxsle Sf-Kp-Exp-Medium <jkpssbne.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpsskbsc Sf-Kp-LargeSmallCaps-Medium <jkpsskbsc.pfb
-jkpsskbscsl Sf-Kp-LargeSmallCaps-Medium <jkpsskbsc.pfb "0.167 SlantFont" 
-jkpsskbxsc Sf-Kp-LargeSmallCaps-Medium <jkpsskbsc.pfb "1.125 ExtendFont" 
-jkpsskbxscsl Sf-Kp-LargeSmallCaps-Medium <jkpsskbsc.pfb "1.125 ExtendFont 0.167 SlantFont" 
-jkpsskmsc Sf-Kp-LargeSmallCaps-Regular <jkpsskmsc.pfb
-jkpsskmscsl Sf-Kp-LargeSmallCaps-Regular <jkpsskmsc.pfb "0.167 SlantFont" 
-jkpssmn8r Sf-Kp-Regular <8r.enc <jkpssmn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpssbne Sf-Kp-Exp-Medium "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpssbne.pfb
+jkpssbsc8r Sf-Kp-Sc-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpssbsc8a.pfb
+jkpssbsce Sf-Kp-Sc-Exp-Medium "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkpssbsce.pfb
+jkpssbscsl8r Sf-Kp-Sc-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpssbsc8a.pfb
+jkpssbscsle Sf-Kp-Sc-Exp-Medium "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpssbsce.pfb
+jkpssbsl8r Sf-Kp-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpssbn8a.pfb
+jkpssbslc Sf-Kp-Companion-Medium "0.167 SlantFont" <jkpssbnc.pfb
+jkpssbsle Sf-Kp-Exp-Medium "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkpssbne.pfb
+jkpssbxn8r Sf-Kp-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkpssbn8a.pfb
+jkpssbxnc Sf-Kp-Companion-Medium "1.125 ExtendFont" <jkpssbnc.pfb
+jkpssbxne Sf-Kp-Exp-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont" <kpfonts-expert.enc <jkpssbne.pfb
+jkpssbxsc8r Sf-Kp-Sc-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont" <8r.enc <jkpssbsc8a.pfb
+jkpssbxsce Sf-Kp-Sc-Exp-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-expert-sc.enc <jkpssbsce.pfb
+jkpssbxscsl8r Sf-Kp-Sc-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkpssbsc8a.pfb
+jkpssbxscsle Sf-Kp-Sc-Exp-Medium "KPFonts-Expert-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpssbsce.pfb
+jkpssbxsl8r Sf-Kp-Medium "TeXBase1Encoding ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <8r.enc <jkpssbn8a.pfb
+jkpssbxslc Sf-Kp-Companion-Medium "1.125 ExtendFont 0.167 SlantFont" <jkpssbnc.pfb
+jkpssbxsle Sf-Kp-Exp-Medium "KPFonts-Expert ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-expert.enc <jkpssbne.pfb
+jkpsskbsc Sf-Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkpsskbsc.pfb
+jkpsskbscsl Sf-Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpsskbsc.pfb
+jkpsskbxsc Sf-Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont" <kpfonts-large-sc.enc <jkpsskbsc.pfb
+jkpsskbxscsl Sf-Kp-LargeSmallCaps-Medium "KPFonts-large-SC ReEncodeFont 1.125 ExtendFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpsskbsc.pfb
+jkpsskmsc Sf-Kp-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont" <kpfonts-large-sc.enc <jkpsskmsc.pfb
+jkpsskmscsl Sf-Kp-LargeSmallCaps-Regular "KPFonts-large-SC ReEncodeFont 0.167 SlantFont" <kpfonts-large-sc.enc <jkpsskmsc.pfb
+jkpssmn8r Sf-Kp-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpssmn8a.pfb
 jkpssmnc Sf-Kp-Comp-Regular <jkpssmnc.pfb
-jkpssmne Sf-Kp-Exp-Regular <jkpssmne.pfb
-jkpssmsc8r Sf-Kp-Sc-Regular <8r.enc <jkpssmsc8a.pfb "TeXBase1Encoding ReEncodeFont" 
-jkpssmsce Sf-Kp-Sc-Exp-Regular <jkpssmsce.pfb
-jkpssmscsl8r Sf-Kp-Sc-Regular <8r.enc <jkpssmsc8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpssmscsle Sf-Kp-Sc-Exp-Regular <jkpssmsce.pfb "0.167 SlantFont" 
-jkpssmsl8r Sf-Kp-Regular <8r.enc <jkpssmn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpssmslc Sf-Kp-Comp-Regular <jkpssmnc.pfb "0.167 SlantFont" 
-jkpssmsle Sf-Kp-Exp-Regular <jkpssmne.pfb "0.167 SlantFont" 
+jkpssmne Sf-Kp-Exp-Regular "KPFonts-Expert ReEncodeFont" <kpfonts-expert.enc <jkpssmne.pfb
+jkpssmsc8r Sf-Kp-Sc-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpssmsc8a.pfb
+jkpssmsce Sf-Kp-Sc-Exp-Regular "KPFonts-Expert-SC ReEncodeFont" <kpfonts-expert-sc.enc <jkpssmsce.pfb
+jkpssmscsl8r Sf-Kp-Sc-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpssmsc8a.pfb
+jkpssmscsle Sf-Kp-Sc-Exp-Regular "KPFonts-Expert-SC ReEncodeFont 0.167 SlantFont" <kpfonts-expert-sc.enc <jkpssmsce.pfb
+jkpssmsl8r Sf-Kp-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpssmn8a.pfb
+jkpssmslc Sf-Kp-Comp-Regular "0.167 SlantFont" <jkpssmnc.pfb
+jkpssmsle Sf-Kp-Exp-Regular "KPFonts-Expert ReEncodeFont 0.167 SlantFont" <kpfonts-expert.enc <jkpssmne.pfb
 jkpsy Kp--M-Sy-Regular <jkpsy.pfb
 jkpsya Kp--M-Sya-Regular <jkpsya.pfb
 jkpsyb Kp--M-Syb-Regular <jkpsyb.pfb
 jkpsyc Kp--M-Syc-Regular <jkpsyc.pfb
 jkpsyd Kp--M-Syd-Regular <jkpsyd.pfb
-jkpttbn8r Tt-Kp-Medium <8r.enc <jkpttbn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpttbn8r Tt-Kp-Medium "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpttbn8a.pfb
 jkpttbnc Tt-Kp-Comp-Medium <jkpttbnc.pfb
-jkpttbne Tt-Kp-Exp-Medium <jkpttbne.pfb
-jkpttbsl8r Tt-Kp-Medium <8r.enc <jkpttbn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpttbslc Tt-Kp-Comp-Medium <jkpttbnc.pfb "0.167 SlantFont" 
-jkpttbsle Tt-Kp-Exp-Medium <jkpttbne.pfb "0.167 SlantFont" 
-jkpttmn8r Tt-Kp-Regular <8r.enc <jkpttmn8a.pfb "TeXBase1Encoding ReEncodeFont" 
+jkpttbne Tt-Kp-Exp-Medium "KPFonts-Expert-TT ReEncodeFont" <kpfonts-expert-tt.enc <jkpttbne.pfb
+jkpttbsl8r Tt-Kp-Medium "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpttbn8a.pfb
+jkpttbslc Tt-Kp-Comp-Medium "0.167 SlantFont" <jkpttbnc.pfb
+jkpttbsle Tt-Kp-Exp-Medium "KPFonts-Expert-TT ReEncodeFont 0.167 SlantFont" <kpfonts-expert-tt.enc <jkpttbne.pfb
+jkpttmn8r Tt-Kp-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <jkpttmn8a.pfb
 jkpttmnc Tt-Kp-Comp-Regular <jkpttmnc.pfb
-jkpttmne Tt-Kp-Exp-Regular <jkpttmne.pfb
-jkpttmsl8r Tt-Kp-Regular <8r.enc <jkpttmn8a.pfb "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" 
-jkpttmslc Tt-Kp-Comp-Regular <jkpttmnc.pfb "0.167 SlantFont" 
-jkpttmsle Tt-Kp-Exp-Regular <jkpttmne.pfb "0.167 SlantFont" 
+jkpttmne Tt-Kp-Exp-Regular "KPFonts-Expert-TT ReEncodeFont" <kpfonts-expert-tt.enc <jkpttmne.pfb
+jkpttmsl8r Tt-Kp-Regular "TeXBase1Encoding ReEncodeFont 0.167 SlantFont" <8r.enc <jkpttmn8a.pfb
+jkpttmslc Tt-Kp-Comp-Regular "0.167 SlantFont" <jkpttmnc.pfb
+jkpttmsle Tt-Kp-Exp-Regular "KPFonts-Expert-TT ReEncodeFont 0.167 SlantFont" <kpfonts-expert-tt.enc <jkpttmne.pfb
 jthb8v Tahoma-Bold "T5DEncoding ReEncodeFont" <t5d.enc <tahomabd.ttf
 jthr8v Tahoma "T5DEncoding ReEncodeFont" <t5d.enc <tahoma.ttf
 jvnb8v Verdana-Bold "T5DEncoding ReEncodeFont" <t5d.enc <verdanab.ttf
@@ -9341,7 +9341,6 @@ xyeubt11 XYEUBT10 "1.1 ExtendFont" <xyeubt10.pfb
 xyeubt12 XYEUBT10 "1.2 ExtendFont" <xyeubt10.pfb
 yfrak yfrak-Regular <yfrak.pfb
 ygoth ygoth-Regular <ygoth.pfb
-yhcmex10 Yhcmex <yhcmex.pfb
 ylyb8r LibrisADFStd-Bold <8r.enc <ylyb8a.pfb "TeXBase1Encoding ReEncodeFont" 
 ylyb8s LibrisADFStd-Bold <libris-supp.enc <ylyb8a.pfb "fontinst-autoenc-libris-supp ReEncodeFont" 
 ylybi8r LibrisADFStd-BoldItalic <8r.enc <ylybi8a.pfb "TeXBase1Encoding ReEncodeFont"