summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/fonts
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2017-01-14 06:02:03 +0000
committerNorbert Preining <preining@logic.at>2017-01-14 06:02:03 +0000
commit35cf52d0dbb57459345cacf0250455e015e38829 (patch)
tree8941134af5e807cb592bb59b10fabf09197d0ac2 /Master/texmf-dist/fonts
parent68082f953b9c1da98b2b9365067d2ef2b0aa3d11 (diff)
remove jfontmaps
git-svn-id: svn://tug.org/texlive/trunk@42945 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/fonts')
-rw-r--r--Master/texmf-dist/fonts/cmap/jfontmaps/2004-H2609
-rw-r--r--Master/texmf-dist/fonts/cmap/jfontmaps/2004-V146
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/otf-hiragino-elcapitan-pron.map92
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/otf-up-hiragino-elcapitan-pron.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/ptex-hiragino-elcapitan-pron-04.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/ptex-hiragino-elcapitan-pron.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/uptex-hiragino-elcapitan-pron-04.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/uptex-hiragino-elcapitan-pron.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/otf-hiragino-elcapitan.map92
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/otf-up-hiragino-elcapitan.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/ptex-hiragino-elcapitan-04.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/ptex-hiragino-elcapitan.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/uptex-hiragino-elcapitan-04.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/uptex-hiragino-elcapitan.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/otf-hiragino-pron.map92
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/otf-up-hiragino-pron.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/ptex-hiragino-pron-04.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/ptex-hiragino-pron.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/uptex-hiragino-pron-04.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/uptex-hiragino-pron.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/otf-hiragino.map92
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/otf-up-hiragino.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/ptex-hiragino-04.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/ptex-hiragino.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/uptex-hiragino-04.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/uptex-hiragino.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/otf-ipa.map80
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/otf-up-ipa.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/ptex-ipa.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/uptex-ipa.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/otf-ipaex.map80
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/otf-up-ipaex.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/ptex-ipaex.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/uptex-ipaex.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/otf-kozuka-pr6.map80
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/otf-up-kozuka-pr6.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/ptex-kozuka-pr6-04.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/ptex-kozuka-pr6.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/uptex-kozuka-pr6-04.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/uptex-kozuka-pr6.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/otf-kozuka-pr6n.map80
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/otf-up-kozuka-pr6n.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/ptex-kozuka-pr6n-04.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/ptex-kozuka-pr6n.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/uptex-kozuka-pr6n-04.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/uptex-kozuka-pr6n.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/otf-kozuka.map80
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/otf-up-kozuka.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/ptex-kozuka-04.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/ptex-kozuka.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/uptex-kozuka-04.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/uptex-kozuka.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/otf-morisawa-pr6n.map80
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/otf-up-morisawa-pr6n.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/ptex-morisawa-pr6n-04.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/ptex-morisawa-pr6n.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/uptex-morisawa-pr6n-04.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/uptex-morisawa-pr6n.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/otf-morisawa.map80
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/otf-up-morisawa.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/ptex-morisawa-04.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/ptex-morisawa.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/uptex-morisawa-04.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/uptex-morisawa.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/otf-ms-osx.map80
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/otf-up-ms-osx.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/ptex-ms-osx.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/uptex-ms-osx.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/otf-ms.map80
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/otf-up-ms.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/ptex-ms.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/uptex-ms.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/otf-noEmbed.map80
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/otf-up-noEmbed.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/ptex-noEmbed-04.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/ptex-noEmbed.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/uptex-noEmbed-04.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/uptex-noEmbed.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/otf-toppanbunkyu-sierra.map80
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/otf-up-toppanbunkyu-sierra.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/ptex-toppanbunkyu-sierra-04.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/ptex-toppanbunkyu-sierra.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/uptex-toppanbunkyu-sierra-04.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/uptex-toppanbunkyu-sierra.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/otf-up-yu-osx.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/otf-yu-osx.map80
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/ptex-yu-osx-04.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/ptex-yu-osx.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/uptex-yu-osx-04.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/uptex-yu-osx.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/otf-up-yu-win.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/otf-yu-win.map80
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/ptex-yu-win.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/uptex-yu-win.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/otf-up-yu-win10.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/otf-yu-win10.map80
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/ptex-yu-win10.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/uptex-yu-win10.map10
98 files changed, 0 insertions, 5239 deletions
diff --git a/Master/texmf-dist/fonts/cmap/jfontmaps/2004-H b/Master/texmf-dist/fonts/cmap/jfontmaps/2004-H
deleted file mode 100644
index 4523efff93d..00000000000
--- a/Master/texmf-dist/fonts/cmap/jfontmaps/2004-H
+++ /dev/null
@@ -1,2609 +0,0 @@
-%!PS-Adobe-3.0 Resource-CMap
-%%DocumentNeededResources: ProcSet (CIDInit)
-%%IncludeResource: ProcSet (CIDInit)
-%%BeginResource: CMap (2004-H)
-%%Title: (2004-H Adobe Japan1 6)
-%%Version: 0.001
-%%Copyright: ------------------------------------------------------------
-%%Copyright: Copyright (c) 2013 Hironori KITAGAWA.
-%%Copyright:
-%%Copyright: This software is free software.
-%%Copyright: Unlimited permission is granted to use, copy, and distribute
-%%Copyright: it, with or without modification, either commercially and
-%%Copyright: noncommercially.
-%%Copyright: THIS SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY.
-%%Copyright: ------------------------------------------------------------
-%%EndComments
-
-/CIDInit /ProcSet findresource begin
-
-12 dict begin
-
-begincmap
-/CIDSystemInfo 3 dict dup begin
- /Registry (Adobe) def
- /Ordering (Japan1) def
- /Supplement 6 def
-end def
-
-/CMapName /2004-H def
-/CMapVersion 0.001 def
-/CMapType 1 def
-
-/WMode 0 def
-
-2 begincodespacerange
- <2121> <7E7E>
- <A1A1> <FEFE>
-endcodespacerange
-
-100 begincidrange
-<2121> <217e> 633
-<2221> <222e> 727
-<222f> <2230> 8006
-<2231> <2231> 693
-<2232> <2232> 665
-<2233> <2235> 12108
-<2236> <2236> 12106
-<2237> <2238> 16194
-<2239> <2239> 12181
-<223a> <2241> 741
-<2242> <2245> 16306
-<2246> <2246> 16299
-<2247> <2247> 12184
-<2248> <2249> 15478
-<224a> <2250> 749
-<2251> <2251> 12188
-<2252> <2252> 12186
-<2253> <2253> 12189
-<2254> <2254> 16196
-<2255> <2255> 16300
-<2256> <2257> 12131
-<2258> <2259> 12129
-<225a> <225b> 16197
-<225c> <226a> 756
-<226b> <226b> 16303
-<226c> <226c> 12120
-<226d> <226e> 16301
-<226f> <2270> 16304
-<2271> <2271> 12201
-<2272> <2279> 771
-<227a> <227b> 16199
-<227c> <227c> 12100
-<227d> <227d> 12099
-<227e> <227e> 779
-<2321> <2321> 8010
-<2322> <2322> 12195
-<2323> <2323> 8009
-<2324> <2324> 12194
-<2325> <2325> 12205
-<2326> <2326> 12202
-<2327> <2327> 12204
-<2328> <2328> 12203
-<2329> <2329> 8310
-<232a> <232a> 8014
-<232b> <232b> 8013
-<232c> <232c> 8012
-<232d> <232d> 8011
-<232e> <232f> 16201
-<2330> <2339> 780
-<233a> <233a> 16203
-<233b> <233b> 8210
-<233c> <233c> 12179
-<233d> <233d> 12640
-<233e> <233e> 12639
-<233f> <233f> 12254
-<2340> <2340> 12256
-<2341> <235a> 790
-<235b> <235b> 12118
-<235c> <235c> 12089
-<235d> <235d> 12092
-<235e> <235e> 8034
-<235f> <235f> 8025
-<2360> <2360> 16204
-<2361> <237a> 816
-<237b> <237e> 16205
-<2421> <2473> 842
-<2474> <2476> 7958
-<2477> <247b> 16209
-<2521> <2576> 925
-<2577> <257e> 16214
-<2621> <2638> 1011
-<2639> <2639> 8018
-<263a> <263a> 8211
-<263b> <263b> 8019
-<263c> <263c> 8214
-<263d> <263d> 8017
-<263e> <263e> 8212
-<263f> <263f> 8016
-<2640> <2640> 8213
-<2641> <2658> 1035
-<2659> <2665> 16222
-<2666> <2666> 8058
-<2667> <2667> 8056
-<2668> <266b> 8215
-<266c> <266c> 12098
-<266d> <267e> 16235
-<2721> <2741> 1059
-<2742> <2750> 16253
-<2751> <2771> 1092
-<2772> <2775> 8313
-<2776> <2777> 16310
-<2778> <2779> 9781
-<277a> <277a> 9784
-<277b> <277e> 16270
-<2821> <2821> 7479
-<2822> <2822> 7481
-<2823> <2823> 7491
-<2824> <2824> 7495
-<2825> <2825> 7503
-<2826> <2826> 7499
-endcidrange
-100 begincidrange
-<2827> <2827> 7507
-<2828> <2828> 7523
-<2829> <2829> 7515
-<282a> <282a> 7531
-<282b> <282b> 7539
-<282c> <282c> 7480
-<282d> <282d> 7482
-<282e> <282e> 7494
-<282f> <282f> 7498
-<2830> <2830> 7506
-<2831> <2831> 7502
-<2832> <2832> 7514
-<2833> <2833> 7530
-<2834> <2834> 7522
-<2835> <2835> 7538
-<2836> <2836> 7554
-<2837> <2837> 7511
-<2838> <2838> 7526
-<2839> <2839> 7519
-<283a> <283a> 7534
-<283b> <283b> 7542
-<283c> <283c> 7508
-<283d> <283d> 7527
-<283e> <283e> 7516
-<283f> <283f> 7535
-<2840> <2840> 7545
-<2841> <2841> 8091
-<2842> <284b> 8102
-<284c> <285e> 10244
-<2867> <286a> 16274
-<286b> <286b> 12111
-<286c> <286d> 16278
-<286e> <286e> 12112
-<286f> <286f> 9394
-<2870> <2870> 9406
-<2871> <2871> 9410
-<2872> <2875> 15729
-<2876> <2876> 9401
-<2877> <2877> 9413
-<2878> <2878> 9415
-<2879> <287c> 15733
-<2921> <2921> 9779
-<2922> <2922> 1
-<2923> <2923> 101
-<2924> <2924> 16280
-<2925> <2925> 8005
-<2926> <2926> 8059
-<2927> <2927> 140
-<2928> <2928> 109
-<2929> <2929> 151
-<292a> <292a> 8060
-<292b> <292b> 129
-<292c> <292d> 157
-<292e> <292e> 117
-<292f> <292f> 134
-<2930> <2930> 160
-<2931> <2931> 144
-<2932> <2932> 123
-<2933> <2933> 8185
-<2934> <2934> 8184
-<2935> <2935> 9783
-<2936> <2936> 126
-<2937> <293c> 164
-<293d> <293d> 139
-<293e> <294d> 170
-<294e> <294e> 142
-<294f> <2954> 187
-<2955> <2955> 150
-<2956> <295b> 193
-<295c> <295c> 145
-<295d> <296c> 199
-<296d> <296d> 148
-<296e> <2974> 216
-<2975> <2979> 9366
-<297a> <297e> 9361
-<2a21> <2a22> 15737
-<2a23> <2a23> 141
-<2a24> <2a25> 15739
-<2a26> <2a26> 223
-<2a27> <2a29> 15741
-<2a2a> <2a2a> 225
-<2a2b> <2a2d> 15744
-<2a2e> <2a2e> 147
-<2a2f> <2a31> 15747
-<2a32> <2a32> 227
-<2a33> <2a36> 15750
-<2a37> <2a37> 229
-<2a38> <2a3e> 15754
-<2a3f> <2a3f> 9395
-<2a40> <2a44> 15761
-<2a45> <2a45> 9404
-<2a46> <2a4d> 15766
-<2a4e> <2a4e> 9407
-<2a4f> <2a54> 15774
-<2a55> <2a55> 9416
-<2a56> <2a67> 15780
-<2a68> <2a68> 9442
-<2a69> <2a69> 9441
-<2a6a> <2a79> 15798
-<2a7a> <2a7a> 9436
-endcidrange
-100 begincidrange
-<2a7b> <2a7e> 15814
-<2b21> <2b29> 15818
-<2b2a> <2b2a> 149
-<2b2b> <2b2b> 143
-<2b2c> <2b2e> 15827
-<2b2f> <2b2f> 9437
-<2b30> <2b30> 9426
-<2b31> <2b36> 15830
-<2b37> <2b37> 9438
-<2b38> <2b38> 9423
-<2b39> <2b39> 9418
-<2b3a> <2b42> 15836
-<2b43> <2b43> 9429
-<2b44> <2b44> 9422
-<2b45> <2b45> 9421
-<2b46> <2b46> 9420
-<2b47> <2b47> 9419
-<2b48> <2b48> 9425
-<2b49> <2b49> 9424
-<2b4a> <2b4a> 9440
-<2b4b> <2b4b> 9439
-<2b4c> <2b4c> 9428
-<2b4d> <2b4d> 9427
-<2b4e> <2b4e> 9431
-<2b4f> <2b4f> 9430
-<2b50> <2b50> 9434
-<2b51> <2b51> 9433
-<2b52> <2b54> 15845
-<2b55> <2b55> 9443
-<2b56> <2b56> 15848
-<2b57> <2b57> 130
-<2b58> <2b58> 15849
-<2b59> <2b59> 135
-<2b5a> <2b5a> 127
-<2b5b> <2b5b> 129
-<2b5c> <2b5c> 65
-<2b5d> <2b5d> 15850
-<2b5e> <2b5e> 137
-<2b5f> <2b5f> 128
-<2b60> <2b6c> 15851
-<2b6d> <2b6d> 132
-<2b6e> <2b7c> 15864
-<2b7d> <2b7d> 95
-<2b7e> <2b7e> 15879
-<2c21> <2c29> 8286
-<2c2a> <2c34> 10514
-<2c35> <2c3e> 8092
-<2c3f> <2c40> 8298
-<2c41> <2c5a> 10313
-<2c5b> <2c6e> 10413
-<2c6f> <2c6f> 10455
-<2c70> <2c70> 10438
-<2c71> <2c71> 10434
-<2c72> <2c72> 10442
-<2c73> <2c73> 10441
-<2c7d> <2c7e> 16281
-<2d21> <2d3e> 7555
-<2d3f> <2d3f> 8225
-<2d40> <2d41> 7585
-<2d42> <2d42> 8038
-<2d43> <2d43> 7588
-<2d44> <2d44> 8040
-<2d45> <2d45> 7590
-<2d46> <2d46> 8042
-<2d47> <2d48> 7592
-<2d49> <2d49> 8044
-<2d4a> <2d4b> 7595
-<2d4c> <2d4c> 8043
-<2d4d> <2d4e> 7598
-<2d4f> <2d4f> 8047
-<2d50> <2d56> 7601
-<2d57> <2d57> 8226
-<2d5f> <2d5f> 8323
-<2d60> <2d63> 7608
-<2d64> <2d64> 8055
-<2d65> <2d6f> 7613
-<2d73> <2d73> 7624
-<2d78> <2d79> 7629
-<2d7d> <2d7d> 12259
-<2d7e> <2d7e> 8219
-<2e21> <2e21> 13731
-<2e22> <2e22> 13839
-<2e23> <2e23> 13698
-<2e24> <2e24> 8371
-<2e25> <2e26> 14300
-<2e27> <2e27> 14307
-<2e28> <2e28> 8372
-<2e29> <2e2a> 14312
-<2e2b> <2e2b> 8375
-<2e2c> <2e2c> 14314
-<2e2d> <2e2d> 14316
-<2e2e> <2e2e> 16779
-<2e2f> <2e2f> 14318
-<2e30> <2e30> 8377
-<2e31> <2e33> 16780
-<2e34> <2e34> 14322
-<2e35> <2e35> 8379
-<2e36> <2e36> 8381
-<2e37> <2e37> 14323
-<2e38> <2e38> 13382
-endcidrange
-100 begincidrange
-<2e39> <2e39> 8364
-<2e3a> <2e3a> 7660
-<2e3b> <2e3b> 14328
-<2e3c> <2e3c> 20299
-<2e3d> <2e3e> 16783
-<2e3f> <2e40> 14331
-<2e41> <2e41> 8383
-<2e42> <2e42> 14336
-<2e43> <2e43> 16785
-<2e44> <2e44> 8390
-<2e45> <2e45> 14340
-<2e46> <2e47> 16786
-<2e48> <2e48> 14341
-<2e49> <2e49> 13360
-<2e4a> <2e4b> 16788
-<2e4c> <2e4c> 14345
-<2e4d> <2e4d> 14348
-<2e4e> <2e4e> 16790
-<2e4f> <2e4f> 8393
-<2e50> <2e50> 13389
-<2e51> <2e53> 16791
-<2e54> <2e54> 8395
-<2e55> <2e55> 15410
-<2e56> <2e56> 16794
-<2e57> <2e57> 20300
-<2e58> <2e58> 16795
-<2e59> <2e59> 14353
-<2e5a> <2e5a> 14355
-<2e5b> <2e5b> 15425
-<2e5c> <2e5c> 14357
-<2e5d> <2e5d> 8398
-<2e5e> <2e5e> 14358
-<2e5f> <2e5f> 16796
-<2e60> <2e60> 14359
-<2e61> <2e62> 14361
-<2e63> <2e63> 13385
-<2e64> <2e64> 16797
-<2e65> <2e65> 14056
-<2e66> <2e66> 16798
-<2e67> <2e67> 8402
-<2e68> <2e68> 13338
-<2e69> <2e69> 14363
-<2e6a> <2e6a> 16799
-<2e6b> <2e6b> 8403
-<2e6c> <2e6c> 20301
-<2e6d> <2e6d> 16800
-<2e6e> <2e6e> 13378
-<2e6f> <2e6f> 14369
-<2e70> <2e70> 16801
-<2e71> <2e71> 13365
-<2e72> <2e72> 8407
-<2e73> <2e73> 16802
-<2e74> <2e74> 8408
-<2e75> <2e75> 16803
-<2e76> <2e77> 14375
-<2e78> <2e78> 8411
-<2e79> <2e7a> 14378
-<2e7b> <2e7c> 16804
-<2e7d> <2e7e> 14381
-<2f21> <2f21> 8413
-<2f22> <2f22> 14386
-<2f23> <2f23> 8414
-<2f24> <2f26> 14388
-<2f27> <2f27> 16806
-<2f28> <2f28> 7633
-<2f29> <2f29> 16807
-<2f2a> <2f2a> 8415
-<2f2b> <2f2b> 14395
-<2f2c> <2f2c> 7651
-<2f2d> <2f2e> 16808
-<2f2f> <2f2f> 13366
-<2f30> <2f31> 14396
-<2f32> <2f32> 16810
-<2f33> <2f33> 14401
-<2f34> <2f34> 15411
-<2f35> <2f35> 14404
-<2f36> <2f36> 13333
-<2f37> <2f39> 14406
-<2f3a> <2f3a> 7654
-<2f3b> <2f3c> 16811
-<2f3d> <2f3d> 14411
-<2f3e> <2f3e> 16813
-<2f3f> <2f3f> 14414
-<2f40> <2f40> 7770
-<2f41> <2f41> 14417
-<2f42> <2f42> 13953
-<2f43> <2f43> 13952
-<2f44> <2f46> 14420
-<2f47> <2f47> 14424
-<2f48> <2f49> 16814
-<2f4a> <2f4a> 14426
-<2f4b> <2f4b> 8421
-<2f4c> <2f4c> 16816
-<2f4d> <2f4d> 14427
-<2f4e> <2f4e> 8420
-<2f4f> <2f4f> 8419
-<2f50> <2f51> 16817
-<2f52> <2f56> 14429
-<2f57> <2f57> 7746
-<2f58> <2f58> 7751
-endcidrange
-100 begincidrange
-<2f59> <2f59> 16819
-<2f5a> <2f5a> 13384
-<2f5b> <2f5b> 14436
-<2f5c> <2f5c> 16820
-<2f5d> <2f5d> 8423
-<2f5e> <2f5e> 13387
-<2f5f> <2f5f> 14438
-<2f60> <2f61> 16821
-<2f62> <2f62> 14439
-<2f63> <2f64> 14441
-<2f65> <2f65> 16823
-<2f66> <2f67> 14443
-<2f68> <2f68> 16824
-<2f69> <2f69> 8428
-<2f6a> <2f6a> 14448
-<2f6b> <2f6c> 16825
-<2f6d> <2f6d> 8430
-<2f6e> <2f6e> 16827
-<2f6f> <2f70> 14450
-<2f71> <2f71> 16828
-<2f72> <2f72> 14456
-<2f73> <2f73> 16829
-<2f74> <2f74> 14460
-<2f75> <2f75> 16830
-<2f76> <2f76> 14461
-<2f77> <2f77> 16831
-<2f78> <2f79> 14462
-<2f7a> <2f7b> 16832
-<2f7c> <2f7d> 14468
-<2f7e> <2f7e> 7774
-<3021> <3028> 1125
-<3029> <3029> 8266
-<302a> <3031> 1134
-<3032> <3032> 7961
-<3033> <303a> 1143
-<303b> <303b> 7634
-<303c> <306d> 1152
-<306e> <306e> 7635
-<306f> <3070> 1203
-<3071> <3071> 7962
-<3072> <3072> 1206
-<3073> <3073> 7636
-<3074> <307b> 1208
-<307c> <307c> 7637
-<307d> <307e> 1217
-<3121> <3129> 1219
-<312a> <312a> 7638
-<312b> <3138> 1229
-<3139> <3139> 20271
-<313a> <313c> 1244
-<313d> <313d> 7642
-<313e> <3141> 1248
-<3142> <3142> 13650
-<3143> <317e> 1253
-<3221> <3227> 1313
-<3228> <3228> 7645
-<3229> <325f> 1321
-<3260> <3260> 7647
-<3261> <3266> 1377
-<3267> <3267> 7965
-<3268> <3275> 1384
-<3276> <3276> 13673
-<3277> <3279> 1399
-<327a> <327a> 20269
-<327b> <327e> 1403
-<3321> <3321> 1407
-<3322> <3322> 7650
-<3323> <336a> 1409
-<336b> <336b> 7652
-<336c> <3372> 1482
-<3373> <3373> 7653
-<3374> <3377> 1490
-<3378> <3378> 20290
-<3379> <337e> 1495
-<3421> <344c> 1501
-<344d> <344d> 7656
-<344e> <3464> 1546
-<3465> <3465> 7657
-<3466> <347e> 1570
-<3521> <352a> 1595
-<352b> <352b> 7658
-<352c> <353f> 1606
-<3540> <3540> 7659
-<3541> <3561> 1627
-<3562> <3562> 7966
-<3563> <3563> 1661
-<3564> <3564> 20270
-<3565> <3567> 1663
-<3568> <3568> 20263
-<3569> <357e> 1667
-<3621> <3629> 1689
-<362a> <362a> 7661
-<362b> <3641> 1699
-<3642> <3642> 7968
-<3643> <364e> 1723
-<364f> <364f> 7662
-<3650> <3673> 1736
-<3674> <3674> 7664
-<3675> <367a> 1773
-<367b> <367b> 7665
-endcidrange
-100 begincidrange
-<367c> <367c> 1780
-<367d> <367d> 7666
-<367e> <367e> 1782
-<3721> <3728> 1783
-<3729> <3729> 20272
-<372a> <3736> 1792
-<3737> <3737> 7668
-<3738> <3763> 1806
-<3764> <3764> 20273
-<3765> <3770> 1851
-<3771> <3771> 7674
-<3772> <377d> 1864
-<377e> <377e> 7676
-<3821> <382f> 1877
-<3830> <3830> 20276
-<3831> <3840> 1893
-<3841> <3841> 7678
-<3842> <387e> 1910
-<3921> <392a> 1971
-<392b> <392b> 7679
-<392c> <393b> 1982
-<393c> <393c> 20279
-<393d> <3973> 1999
-<3974> <3974> 7683
-<3975> <3978> 2055
-<3979> <3979> 20284
-<397a> <397e> 2060
-<3a21> <3a34> 2065
-<3a35> <3a35> 20281
-<3a36> <3a66> 2086
-<3a67> <3a67> 7686
-<3a68> <3a7e> 2136
-<3b21> <3b26> 2159
-<3b27> <3b27> 7688
-<3b28> <3b29> 2166
-<3b2a> <3b2a> 7689
-<3b2b> <3b2b> 2169
-<3b2c> <3b2c> 7690
-<3b2d> <3b2d> 20280
-<3b2e> <3b40> 2172
-<3b41> <3b41> 7970
-<3b42> <3b7e> 2192
-<3c21> <3c5c> 2253
-<3c5d> <3c5e> 7695
-<3c5f> <3c7e> 2315
-<3d21> <3d35> 2347
-<3d36> <3d36> 7698
-<3d37> <3d5c> 2369
-<3d5d> <3d5d> 13460
-<3d5e> <3d71> 2408
-<3d72> <3d73> 7701
-<3d74> <3d7e> 2430
-<3e21> <3e24> 2441
-<3e25> <3e25> 7703
-<3e26> <3e63> 2446
-<3e64> <3e64> 7708
-<3e65> <3e72> 2509
-<3e73> <3e73> 20282
-<3e74> <3e7e> 2524
-<3f21> <3f29> 2535
-<3f2a> <3f2a> 7709
-<3f2b> <3f55> 2545
-<3f56> <3f56> 13860
-<3f57> <3f5f> 2589
-<3f60> <3f60> 7711
-<3f61> <3f7e> 2599
-<4021> <4021> 2629
-<4022> <4022> 7713
-<4023> <4070> 2631
-<4071> <4071> 7716
-<4072> <4078> 2710
-<4079> <4079> 7718
-<407a> <407a> 7972
-<407b> <407b> 2719
-<407c> <407d> 7973
-<407e> <407e> 2722
-<4121> <4126> 2723
-<4127> <4127> 7720
-<4128> <4138> 2730
-<4139> <4139> 7721
-<413a> <414b> 2748
-<414c> <414c> 7722
-<414d> <417e> 2767
-<4221> <4236> 2817
-<4237> <4237> 7975
-<4238> <423c> 2840
-<423d> <423d> 7726
-<423e> <425b> 2846
-<425c> <425c> 7728
-<425d> <427c> 2877
-<427d> <427d> 7733
-<427e> <427e> 2910
-<4321> <4328> 2911
-<4329> <4329> 7735
-<432a> <432d> 2920
-<432e> <432e> 7738
-<432f> <4336> 2925
-<4337> <4337> 13915
-<4338> <436f> 2934
-<4370> <4370> 7740
-endcidrange
-100 begincidrange
-<4371> <4374> 2991
-<4375> <4375> 7741
-<4376> <437e> 2996
-<4421> <443c> 3005
-<443d> <443d> 7743
-<443e> <4447> 3034
-<4448> <4448> 7744
-<4449> <4449> 3045
-<444a> <444a> 7745
-<444b> <4453> 3047
-<4454> <4454> 8267
-<4455> <4471> 3057
-<4472> <4472> 20286
-<4473> <447e> 3087
-<4521> <4521> 3099
-<4522> <4522> 7748
-<4523> <4526> 3101
-<4527> <4527> 7749
-<4528> <452d> 3106
-<452e> <452e> 7750
-<452f> <4545> 3113
-<4546> <4546> 13949
-<4547> <4547> 3137
-<4548> <4548> 7753
-<4549> <454a> 3139
-<454b> <454b> 7754
-<454c> <4551> 3142
-<4552> <4552> 7756
-<4553> <457e> 3149
-<4621> <4653> 3193
-<4654> <4654> 7761
-<4655> <465a> 3245
-<465b> <465b> 20287
-<465c> <4665> 3252
-<4666> <4667> 7766
-<4668> <4669> 3264
-<466a> <466a> 7768
-<466b> <467e> 3267
-<4721> <4728> 3287
-<4729> <4729> 7769
-<472a> <4756> 3296
-<4757> <4757> 7771
-<4758> <4766> 3342
-<4767> <4767> 7772
-<4768> <4768> 3358
-<4769> <4769> 7773
-<476a> <477c> 3360
-<477d> <477d> 20288
-<477e> <477e> 3380
-<4821> <4823> 3381
-<4824> <4824> 7775
-<4825> <483f> 3385
-<4840> <4840> 7978
-<4841> <4853> 3413
-<4854> <4854> 7778
-<4855> <486f> 3433
-<4870> <4870> 13495
-<4871> <4874> 3461
-<4875> <4875> 7780
-<4876> <487e> 3466
-<4921> <4922> 3475
-<4923> <4923> 7782
-<4924> <492e> 3478
-<492f> <492f> 7783
-<4930> <4934> 3490
-<4935> <4935> 7785
-<4936> <493e> 3496
-<493f> <493f> 20222
-<4940> <4940> 7786
-<4941> <494d> 3507
-<494e> <494e> 7787
-<494f> <495f> 3521
-<4960> <4960> 20289
-<4961> <497e> 3539
-<4a21> <4a42> 3569
-<4a43> <4a43> 7789
-<4a44> <4a4c> 3604
-<4a4d> <4a4d> 7790
-<4a4e> <4a4e> 14013
-<4a4f> <4a52> 3615
-<4a53> <4a53> 7979
-<4a54> <4a59> 3620
-<4a5a> <4a5a> 7791
-<4a5b> <4a5b> 3627
-<4a5c> <4a5c> 20291
-<4a5d> <4a78> 3629
-<4a79> <4a79> 7792
-<4a7a> <4a7e> 3658
-<4b21> <4b28> 3663
-<4b29> <4b29> 7794
-<4b2a> <4b6f> 3672
-<4b70> <4b70> 7796
-<4b71> <4b77> 3743
-<4b78> <4b78> 7980
-<4b79> <4b7e> 3751
-<4c21> <4c58> 3757
-<4c59> <4c59> 7798
-<4c5a> <4c5e> 3814
-<4c5f> <4c5f> 7799
-<4c60> <4c61> 3820
-endcidrange
-100 begincidrange
-<4c62> <4c62> 20293
-<4c63> <4c6b> 3823
-<4c6c> <4c6c> 20294
-<4c6d> <4c79> 3833
-<4c7a> <4c7a> 7801
-<4c7b> <4c7b> 3847
-<4c7c> <4c7c> 7802
-<4c7d> <4c7e> 3849
-<4d21> <4d31> 3851
-<4d32> <4d32> 14074
-<4d33> <4d7e> 3869
-<4e21> <4e79> 3945
-<4e7a> <4e7b> 7809
-<4e7c> <4e7c> 20265
-<4e7d> <4e7e> 4037
-<4f21> <4f30> 4039
-<4f31> <4f31> 7812
-<4f32> <4f53> 4056
-<4f54> <4f54> 13803
-<4f55> <4f55> 14471
-<4f56> <4f56> 8432
-<4f57> <4f58> 16834
-<4f59> <4f59> 8435
-<4f5a> <4f5a> 20302
-<4f5b> <4f5b> 16836
-<4f5c> <4f5c> 8437
-<4f5d> <4f5e> 14476
-<4f5f> <4f5f> 13850
-<4f60> <4f60> 7693
-<4f61> <4f61> 13361
-<4f62> <4f68> 16837
-<4f69> <4f69> 8439
-<4f6a> <4f6a> 14482
-<4f6b> <4f6b> 16844
-<4f6c> <4f6d> 14483
-<4f6e> <4f6e> 16845
-<4f6f> <4f6f> 14123
-<4f70> <4f70> 16846
-<4f71> <4f71> 8441
-<4f72> <4f72> 14290
-<4f73> <4f73> 14488
-<4f74> <4f74> 16847
-<4f75> <4f75> 8442
-<4f76> <4f76> 14489
-<4f77> <4f77> 8445
-<4f78> <4f78> 16848
-<4f79> <4f79> 14493
-<4f7a> <4f7b> 16849
-<4f7c> <4f7c> 8446
-<4f7d> <4f7d> 16851
-<4f7e> <4f7e> 13964
-<5021> <507e> 4090
-<5121> <514c> 4184
-<514d> <514d> 7817
-<514e> <517e> 4229
-<5221> <5256> 4278
-<5257> <5257> 14111
-<5258> <527a> 4333
-<527b> <527b> 20277
-<527c> <527e> 4369
-<5321> <535d> 4372
-<535e> <535e> 7821
-<535f> <5372> 4434
-<5373> <5373> 14116
-<5374> <537e> 4455
-<5421> <547e> 4466
-<5521> <557e> 4560
-<5621> <567e> 4654
-<5721> <5750> 4748
-<5751> <5751> 13538
-<5752> <577e> 4797
-<5821> <587e> 4842
-<5921> <5927> 4936
-<5928> <5928> 7991
-<5929> <5974> 4944
-<5975> <5975> 20264
-<5976> <597e> 5021
-<5a21> <5a7e> 5030
-<5b21> <5b7e> 5124
-<5c21> <5c7e> 5218
-<5d21> <5d7e> 5312
-<5e21> <5e7e> 5406
-<5f21> <5f7e> 5500
-<6021> <6043> 5594
-<6044> <6044> 20278
-<6045> <607e> 5630
-<6121> <6130> 5688
-<6131> <6131> 20267
-<6132> <6133> 5705
-<6134> <6134> 20283
-<6135> <6155> 5708
-<6156> <6156> 20175
-<6157> <617e> 5742
-<6221> <627e> 5782
-<6321> <635d> 5876
-<635e> <635e> 20285
-<635f> <637e> 5938
-<6421> <6426> 5970
-<6427> <6427> 20266
-<6428> <643f> 5977
-endcidrange
-100 begincidrange
-<6440> <6440> 7997
-<6441> <647e> 6002
-<6521> <657e> 6064
-<6621> <667e> 6158
-<6721> <6726> 6252
-<6727> <6727> 20275
-<6728> <675a> 6259
-<675b> <675b> 14196
-<675c> <6769> 6311
-<676a> <676a> 20292
-<676b> <677e> 6326
-<6821> <687e> 6346
-<6921> <6949> 6440
-<694a> <694a> 20274
-<694b> <6966> 6482
-<6967> <6967> 20296
-<6968> <697e> 6511
-<6a21> <6a23> 6534
-<6a24> <6a24> 20295
-<6a25> <6a7e> 6538
-<6b21> <6b42> 6628
-<6b43> <6b43> 20268
-<6b44> <6b7e> 6663
-<6c21> <6c7e> 6722
-<6d21> <6d7e> 6816
-<6e21> <6e7e> 6910
-<6f21> <6f7e> 7004
-<7021> <7056> 7098
-<7057> <7057> 13624
-<7058> <707e> 7153
-<7121> <7158> 7192
-<7159> <7159> 8003
-<715a> <717e> 7249
-<7221> <726c> 7286
-<726d> <726d> 14272
-<726e> <727e> 7363
-<7321> <737e> 7380
-<7421> <7424> 7474
-<7425> <7426> 8284
-<7427> <7427> 7963
-<7428> <7428> 13362
-<7429> <7429> 14499
-<742a> <742a> 14501
-<742b> <742b> 14503
-<742c> <742c> 16852
-<742d> <742d> 14508
-<742e> <742e> 20303
-<742f> <742f> 15390
-<7430> <7432> 16853
-<7433> <7433> 14512
-<7434> <7434> 14515
-<7435> <7435> 16856
-<7436> <7436> 8450
-<7437> <7437> 14518
-<7438> <7438> 16857
-<7439> <7439> 14520
-<743a> <743a> 8370
-<743b> <743b> 16858
-<743c> <743d> 14522
-<743e> <743e> 8451
-<743f> <743f> 16859
-<7440> <7442> 14524
-<7443> <7443> 14528
-<7444> <7444> 13368
-<7445> <7445> 8452
-<7446> <7446> 14531
-<7447> <7447> 8453
-<7448> <7449> 14532
-<744a> <744c> 16860
-<744d> <744d> 14538
-<744e> <744f> 16863
-<7450> <7450> 13326
-<7451> <7451> 16865
-<7452> <7452> 21558
-<7453> <7453> 14544
-<7454> <7454> 16866
-<7455> <7455> 8458
-<7456> <7456> 16867
-<7457> <7457> 14546
-<7458> <7458> 14550
-<7459> <7459> 16868
-<745a> <745a> 8463
-<745b> <745b> 8462
-<745c> <745c> 13328
-<745d> <745d> 14552
-<745e> <745e> 13363
-<745f> <7460> 16869
-<7461> <7461> 21072
-<7462> <7462> 16871
-<7463> <7463> 13390
-<7464> <7464> 14559
-<7465> <7465> 14563
-<7466> <7467> 16872
-<7468> <7468> 13765
-<7469> <7469> 14564
-<746a> <746a> 16874
-<746b> <746c> 14565
-<746d> <746e> 14568
-<746f> <7470> 14571
-<7471> <7472> 16875
-endcidrange
-100 begincidrange
-<7473> <7473> 13340
-<7474> <7474> 8467
-<7475> <7475> 14582
-<7476> <7476> 7724
-<7477> <7477> 14583
-<7478> <7478> 16877
-<7479> <7479> 7747
-<747a> <747a> 8468
-<747b> <747b> 14586
-<747c> <747c> 8470
-<747d> <747e> 14588
-<7521> <7521> 16878
-<7522> <7522> 13341
-<7523> <7523> 16879
-<7524> <7525> 14591
-<7526> <7526> 7831
-<7527> <7527> 16880
-<7528> <7528> 13381
-<7529> <7529> 14597
-<752a> <752a> 16881
-<752b> <752b> 13334
-<752c> <752c> 8472
-<752d> <752d> 8474
-<752e> <752e> 8473
-<752f> <752f> 20304
-<7530> <7531> 16882
-<7532> <7532> 8477
-<7533> <7534> 16884
-<7535> <7535> 8366
-<7536> <7536> 16886
-<7537> <7537> 8369
-<7538> <7538> 16887
-<7539> <7539> 14604
-<753a> <753a> 16888
-<753b> <753b> 8480
-<753c> <753c> 13377
-<753d> <753d> 14607
-<753e> <753e> 8478
-<753f> <753f> 8482
-<7540> <7542> 16889
-<7543> <7543> 13352
-<7544> <7545> 8484
-<7546> <7546> 16892
-<7547> <7547> 13397
-<7548> <7548> 14611
-<7549> <7549> 15433
-<754a> <754b> 16893
-<754c> <754c> 8487
-<754d> <754d> 14614
-<754e> <754e> 20305
-<754f> <754f> 14615
-<7550> <7550> 8490
-<7551> <7551> 16895
-<7552> <7552> 14616
-<7553> <7553> 14619
-<7554> <7557> 16896
-<7558> <7558> 8491
-<7559> <7559> 14622
-<755a> <755a> 8493
-<755b> <755b> 14623
-<755c> <755c> 16900
-<755d> <755d> 14066
-<755e> <755e> 8492
-<755f> <755f> 16901
-<7560> <7560> 14626
-<7561> <7564> 14628
-<7565> <7565> 13375
-<7566> <7566> 16902
-<7567> <7568> 14634
-<7569> <7569> 8367
-<756a> <756a> 14636
-<756b> <756f> 14638
-<7570> <7572> 16903
-<7573> <7573> 14645
-<7574> <7574> 16906
-<7575> <7576> 14647
-<7577> <7577> 16907
-<7578> <7578> 8498
-<7579> <7579> 14651
-<757a> <757a> 8499
-<757b> <757b> 16908
-<757c> <757c> 14653
-<757d> <757e> 16909
-<7621> <7621> 16911
-<7622> <7622> 8501
-<7623> <7623> 16912
-<7624> <7624> 13329
-<7625> <7625> 16913
-<7626> <7626> 14143
-<7627> <7628> 14658
-<7629> <762a> 16914
-<762b> <762d> 14662
-<762e> <762f> 14666
-<7630> <7630> 8503
-<7631> <7631> 8505
-<7632> <7632> 16916
-<7633> <7633> 14669
-<7634> <7634> 16917
-<7635> <7636> 14671
-<7637> <7637> 16918
-endcidrange
-100 begincidrange
-<7638> <7638> 8508
-<7639> <7639> 14675
-<763a> <763a> 16919
-<763b> <763b> 13392
-<763c> <763c> 16920
-<763d> <763d> 14677
-<763e> <763e> 16921
-<763f> <7642> 14679
-<7643> <7643> 13386
-<7644> <7644> 16922
-<7645> <7645> 13398
-<7646> <7646> 14683
-<7647> <7648> 16923
-<7649> <7649> 13344
-<764a> <764a> 13388
-<764b> <764b> 8509
-<764c> <764e> 16925
-<764f> <7650> 14687
-<7651> <7651> 14691
-<7652> <7652> 8511
-<7653> <7653> 14153
-<7654> <7654> 16928
-<7655> <7655> 14692
-<7656> <7656> 14694
-<7657> <7657> 8512
-<7658> <7658> 16929
-<7659> <7659> 14696
-<765a> <765b> 16930
-<765c> <765c> 14698
-<765d> <765e> 14700
-<765f> <765f> 14703
-<7660> <7660> 13904
-<7661> <7661> 8515
-<7662> <7662> 14705
-<7663> <7663> 14707
-<7664> <7667> 16932
-<7668> <7668> 14710
-<7669> <7669> 13327
-<766a> <766a> 14711
-<766b> <766b> 8516
-<766c> <766c> 13354
-<766d> <766e> 16936
-<766f> <766f> 8519
-<7670> <7671> 14712
-<7672> <7672> 14715
-<7673> <7673> 13395
-<7674> <7675> 16938
-<7676> <7676> 8523
-<7677> <7677> 7700
-<7678> <7678> 13330
-<7679> <7679> 16940
-<767a> <767a> 8525
-<767b> <767b> 16941
-<767c> <767c> 13324
-<767d> <767e> 16942
-<7721> <7721> 14719
-<7722> <7722> 14721
-<7723> <7723> 16944
-<7724> <7724> 14723
-<7725> <7725> 13332
-<7726> <7728> 14724
-<7729> <7729> 7776
-<772a> <772a> 16945
-<772b> <772b> 14728
-<772c> <772c> 16946
-<772d> <772d> 14729
-<772e> <772e> 16947
-<772f> <772f> 8529
-<7730> <7730> 16948
-<7731> <7731> 14732
-<7732> <7732> 14734
-<7733> <7733> 16949
-<7734> <7734> 14736
-<7735> <7735> 14738
-<7736> <7738> 16950
-<7739> <7739> 15395
-<773a> <773a> 16953
-<773b> <773c> 8531
-<773d> <773d> 7760
-<773e> <773e> 8534
-<773f> <773f> 20306
-<7740> <7741> 14746
-<7742> <7742> 16954
-<7743> <7743> 14748
-<7744> <7744> 16955
-<7745> <7745> 8535
-<7746> <7746> 16956
-<7747> <7747> 8536
-<7748> <7748> 14753
-<7749> <774a> 14755
-<774b> <774b> 16957
-<774c> <774c> 8537
-<774d> <774e> 16958
-<774f> <774f> 14759
-<7750> <7750> 16960
-<7751> <7751> 7644
-<7752> <7753> 8540
-<7754> <7754> 16961
-<7755> <7755> 13347
-<7756> <7756> 21933
-endcidrange
-100 begincidrange
-<7757> <7757> 8539
-<7758> <7758> 14763
-<7759> <7759> 16962
-<775a> <775a> 20307
-<775b> <775c> 16963
-<775d> <775d> 14765
-<775e> <775e> 8543
-<775f> <7760> 16965
-<7761> <7761> 8544
-<7762> <7762> 14770
-<7763> <7763> 16967
-<7764> <7765> 14776
-<7766> <7766> 16968
-<7767> <7767> 14779
-<7768> <7768> 16969
-<7769> <7769> 8546
-<776a> <776a> 13355
-<776b> <776b> 14783
-<776c> <776d> 16970
-<776e> <776e> 14786
-<776f> <776f> 8548
-<7770> <7771> 16972
-<7772> <7772> 14790
-<7773> <7773> 14794
-<7774> <7775> 14796
-<7776> <7776> 16974
-<7777> <7778> 14798
-<7779> <7779> 8551
-<777a> <777a> 14803
-<777b> <777b> 8552
-<777c> <777c> 14804
-<777d> <777d> 8553
-<777e> <777e> 14805
-<7821> <7821> 8555
-<7822> <7824> 14809
-<7825> <7825> 7732
-<7826> <7826> 8557
-<7827> <7827> 14813
-<7828> <7828> 8558
-<7829> <7829> 16975
-<782a> <782a> 14814
-<782b> <782b> 8560
-<782c> <782d> 14815
-<782e> <782e> 14819
-<782f> <782f> 16976
-<7830> <7831> 14820
-<7832> <7832> 14824
-<7833> <7833> 16977
-<7834> <7834> 14826
-<7835> <7835> 16978
-<7836> <7837> 14830
-<7838> <7838> 8562
-<7839> <783a> 14833
-<783b> <783b> 8563
-<783c> <783c> 14836
-<783d> <783d> 14832
-<783e> <783e> 16979
-<783f> <783f> 14837
-<7840> <7840> 16980
-<7841> <7843> 14839
-<7844> <7844> 16981
-<7845> <7845> 14842
-<7846> <7846> 16982
-<7847> <7847> 8564
-<7848> <7848> 16983
-<7849> <7849> 8434
-<784a> <784a> 8565
-<784b> <784b> 14845
-<784c> <784c> 14848
-<784d> <784e> 16984
-<784f> <784f> 14851
-<7850> <7850> 14853
-<7851> <7852> 16986
-<7853> <785a> 14855
-<785b> <785b> 16988
-<785c> <785f> 14863
-<7860> <7860> 16989
-<7861> <7861> 8569
-<7862> <7862> 16990
-<7863> <7863> 8568
-<7864> <7864> 8570
-<7865> <7866> 16991
-<7867> <7868> 14870
-<7869> <786c> 16993
-<786d> <786d> 14873
-<786e> <786f> 16997
-<7870> <7871> 14874
-<7872> <7872> 8572
-<7873> <7874> 16999
-<7875> <7876> 14876
-<7877> <7877> 7877
-<7878> <787a> 17001
-<787b> <787b> 14882
-<787c> <787c> 17004
-<787d> <787d> 14888
-<787e> <787e> 17005
-<7921> <7921> 17006
-<7922> <7922> 8575
-<7923> <7923> 13342
-<7924> <7924> 15420
-endcidrange
-100 begincidrange
-<7925> <7925> 14892
-<7926> <7926> 17007
-<7927> <7927> 13379
-<7928> <792a> 17008
-<792b> <792b> 14897
-<792c> <792c> 14900
-<792d> <792d> 17011
-<792e> <792e> 14901
-<792f> <7930> 17012
-<7931> <7931> 14903
-<7932> <7932> 17014
-<7933> <7933> 13348
-<7934> <7934> 13345
-<7935> <7935> 14907
-<7936> <7936> 17015
-<7937> <7937> 13335
-<7938> <7938> 13391
-<7939> <7939> 13359
-<793a> <793a> 14909
-<793b> <793b> 13351
-<793c> <793d> 8580
-<793e> <793e> 17016
-<793f> <793f> 13325
-<7940> <7940> 13371
-<7941> <7941> 8583
-<7942> <7942> 14912
-<7943> <7943> 7758
-<7944> <7944> 14913
-<7945> <7945> 17017
-<7946> <7946> 14915
-<7947> <794b> 17018
-<794c> <794c> 14917
-<794d> <794d> 13343
-<794e> <794e> 14922
-<794f> <794f> 14925
-<7950> <7950> 14927
-<7951> <7951> 13373
-<7952> <7952> 17023
-<7953> <7953> 14929
-<7954> <7954> 17024
-<7955> <7956> 14931
-<7957> <7957> 17025
-<7958> <7958> 8588
-<7959> <795c> 17026
-<795d> <795f> 14939
-<7960> <7960> 14943
-<7961> <7961> 17030
-<7962> <7962> 14944
-<7963> <7963> 8589
-<7964> <7964> 13358
-<7965> <7966> 14947
-<7967> <7967> 17031
-<7968> <7968> 14953
-<7969> <7969> 7739
-<796a> <796a> 14951
-<796b> <796b> 17032
-<796c> <796c> 14954
-<796d> <796d> 14176
-<796e> <796e> 17033
-<796f> <796f> 14956
-<7970> <7974> 17034
-<7975> <7975> 14960
-<7976> <7976> 17039
-<7977> <7978> 14965
-<7979> <797a> 14968
-<797b> <797d> 14971
-<797e> <797e> 17040
-<7a21> <7a21> 14974
-<7a22> <7a22> 8591
-<7a23> <7a23> 14975
-<7a24> <7a24> 17041
-<7a25> <7a25> 14978
-<7a26> <7a26> 17042
-<7a27> <7a27> 14980
-<7a28> <7a28> 8594
-<7a29> <7a2a> 17043
-<7a2b> <7a2b> 14982
-<7a2c> <7a2c> 8595
-<7a2d> <7a2d> 13322
-<7a2e> <7a2e> 13399
-<7a2f> <7a2f> 17045
-<7a30> <7a32> 14986
-<7a33> <7a33> 13376
-<7a34> <7a34> 14990
-<7a35> <7a35> 8596
-<7a36> <7a36> 7697
-<7a37> <7a37> 8359
-<7a38> <7a38> 14994
-<7a39> <7a39> 8597
-<7a3a> <7a3a> 13353
-<7a3b> <7a3b> 15002
-<7a3c> <7a3c> 17046
-<7a3d> <7a3e> 15003
-<7a3f> <7a3f> 17047
-<7a40> <7a40> 15005
-<7a41> <7a42> 15007
-<7a43> <7a43> 15010
-<7a44> <7a44> 13349
-<7a45> <7a45> 15013
-<7a46> <7a46> 15015
-endcidrange
-100 begincidrange
-<7a47> <7a48> 17048
-<7a49> <7a49> 15017
-<7a4a> <7a4a> 17050
-<7a4b> <7a4b> 15024
-<7a4c> <7a4d> 17051
-<7a4e> <7a4e> 15027
-<7a4f> <7a4f> 15029
-<7a50> <7a55> 17053
-<7a56> <7a56> 15034
-<7a57> <7a57> 17059
-<7a58> <7a58> 13350
-<7a59> <7a59> 14195
-<7a5a> <7a5d> 17060
-<7a5e> <7a5e> 15043
-<7a5f> <7a62> 17064
-<7a63> <7a65> 15044
-<7a66> <7a66> 17068
-<7a67> <7a67> 15047
-<7a68> <7a69> 17069
-<7a6a> <7a6a> 15048
-<7a6b> <7a6b> 17071
-<7a6c> <7a6d> 8600
-<7a6e> <7a70> 17072
-<7a71> <7a71> 15049
-<7a72> <7a72> 17075
-<7a73> <7a74> 15050
-<7a75> <7a75> 17076
-<7a76> <7a76> 15052
-<7a77> <7a78> 15054
-<7a79> <7a79> 17077
-<7a7a> <7a7c> 15056
-<7a7d> <7a7d> 8603
-<7a7e> <7a7e> 17078
-<7b21> <7b22> 17079
-<7b23> <7b23> 15059
-<7b24> <7b25> 17081
-<7b26> <7b26> 7807
-<7b27> <7b27> 13367
-<7b28> <7b28> 8605
-<7b29> <7b2d> 17083
-<7b2e> <7b2e> 15065
-<7b2f> <7b2f> 8606
-<7b30> <7b30> 17088
-<7b31> <7b32> 15066
-<7b33> <7b35> 17089
-<7b36> <7b36> 7706
-<7b37> <7b37> 17092
-<7b38> <7b38> 8608
-<7b39> <7b39> 17093
-<7b3a> <7b3a> 8610
-<7b3b> <7b3b> 15076
-<7b3c> <7b3d> 17094
-<7b3e> <7b3e> 15073
-<7b3f> <7b3f> 17096
-<7b40> <7b40> 8611
-<7b41> <7b41> 17097
-<7b42> <7b42> 15075
-<7b43> <7b43> 17098
-<7b44> <7b44> 15077
-<7b45> <7b4a> 17099
-<7b4b> <7b4b> 15078
-<7b4c> <7b4d> 17105
-<7b4e> <7b4e> 13336
-<7b4f> <7b4f> 13394
-<7b50> <7b51> 17107
-<7b52> <7b52> 15081
-<7b53> <7b53> 17109
-<7b54> <7b54> 15086
-<7b55> <7b55> 17110
-<7b56> <7b56> 15089
-<7b57> <7b57> 17111
-<7b58> <7b59> 15090
-<7b5a> <7b5a> 15097
-<7b5b> <7b5b> 17112
-<7b5c> <7b5c> 15098
-<7b5d> <7b5f> 15100
-<7b60> <7b60> 17113
-<7b61> <7b61> 15103
-<7b62> <7b62> 7715
-<7b63> <7b63> 15108
-<7b64> <7b65> 17114
-<7b66> <7b66> 15110
-<7b67> <7b67> 7813
-<7b68> <7b69> 15115
-<7b6a> <7b6a> 15119
-<7b6b> <7b6c> 17116
-<7b6d> <7b6d> 8615
-<7b6e> <7b6e> 8360
-<7b6f> <7b6f> 13331
-<7b70> <7b74> 15125
-<7b75> <7b78> 17118
-<7b79> <7b79> 13346
-<7b7a> <7b7a> 15132
-<7b7b> <7b7b> 15134
-<7b7c> <7b7c> 17122
-<7b7d> <7b7d> 8616
-<7b7e> <7b7e> 15138
-<7c21> <7c21> 15139
-<7c22> <7c22> 8617
-<7c23> <7c23> 17123
-endcidrange
-100 begincidrange
-<7c24> <7c24> 15140
-<7c25> <7c27> 17124
-<7c28> <7c29> 8618
-<7c2a> <7c2a> 17127
-<7c2b> <7c2b> 8621
-<7c2c> <7c2c> 15142
-<7c2d> <7c2d> 8623
-<7c2e> <7c2e> 8622
-<7c2f> <7c2f> 13321
-<7c30> <7c30> 13339
-<7c31> <7c31> 17128
-<7c32> <7c32> 15147
-<7c33> <7c37> 17129
-<7c38> <7c38> 13380
-<7c39> <7c39> 15155
-<7c3a> <7c3a> 8627
-<7c3b> <7c3c> 15156
-<7c3d> <7c3d> 13364
-<7c3e> <7c3e> 8628
-<7c3f> <7c3f> 15158
-<7c40> <7c40> 17134
-<7c41> <7c41> 15166
-<7c42> <7c43> 17135
-<7c44> <7c44> 15169
-<7c45> <7c46> 17137
-<7c47> <7c47> 15172
-<7c48> <7c49> 17139
-<7c4a> <7c4a> 7663
-<7c4b> <7c4e> 17141
-<7c4f> <7c4f> 15181
-<7c50> <7c51> 17145
-<7c52> <7c53> 15182
-<7c54> <7c54> 15187
-<7c55> <7c58> 17147
-<7c59> <7c59> 13320
-<7c5a> <7c5b> 15192
-<7c5c> <7c5c> 17151
-<7c5d> <7c5f> 15194
-<7c60> <7c64> 17152
-<7c65> <7c66> 15198
-<7c67> <7c67> 8635
-<7c68> <7c68> 17157
-<7c69> <7c69> 15200
-<7c6a> <7c6a> 8636
-<7c6b> <7c6b> 17158
-<7c6c> <7c6c> 8637
-<7c6d> <7c6f> 17159
-<7c70> <7c70> 8638
-<7c71> <7c71> 17162
-<7c72> <7c72> 15203
-<7c73> <7c73> 17163
-<7c74> <7c76> 15205
-<7c77> <7c77> 17164
-<7c78> <7c78> 15211
-<7c79> <7c79> 7707
-<7c7a> <7c7a> 7777
-<7c7b> <7c7b> 15216
-<7c7c> <7c7c> 8640
-<7c7d> <7c7d> 15219
-<7c7e> <7c7e> 8644
-<7d21> <7d21> 8645
-<7d22> <7d22> 8642
-<7d23> <7d23> 17165
-<7d24> <7d24> 15220
-<7d25> <7d25> 8647
-<7d26> <7d26> 15223
-<7d27> <7d27> 8655
-<7d28> <7d28> 8649
-<7d29> <7d29> 8651
-<7d2a> <7d2a> 8650
-<7d2b> <7d2b> 15224
-<7d2c> <7d2c> 15226
-<7d2d> <7d2d> 8659
-<7d2e> <7d2e> 8362
-<7d2f> <7d31> 15228
-<7d32> <7d32> 8667
-<7d33> <7d33> 8666
-<7d34> <7d34> 8673
-<7d35> <7d35> 13402
-<7d36> <7d36> 15234
-<7d37> <7d37> 8669
-<7d38> <7d38> 8668
-<7d39> <7d39> 8361
-<7d3a> <7d3a> 17166
-<7d3b> <7d3b> 13400
-<7d3c> <7d3d> 17167
-<7d3e> <7d3e> 15239
-<7d3f> <7d3f> 8676
-<7d40> <7d40> 15241
-<7d41> <7d41> 17169
-<7d42> <7d42> 15242
-<7d43> <7d44> 8679
-<7d45> <7d46> 17170
-<7d47> <7d47> 15248
-<7d48> <7d4a> 17172
-<7d4b> <7d4b> 15253
-<7d4c> <7d4c> 17175
-<7d4d> <7d4d> 15254
-<7d4e> <7d4f> 17176
-<7d50> <7d51> 15256
-endcidrange
-100 begincidrange
-<7d52> <7d53> 17178
-<7d54> <7d54> 15260
-<7d55> <7d58> 17180
-<7d59> <7d59> 15261
-<7d5a> <7d5a> 17184
-<7d5b> <7d5c> 15264
-<7d5d> <7d5d> 13393
-<7d5e> <7d5e> 8688
-<7d5f> <7d5f> 15266
-<7d60> <7d60> 17185
-<7d61> <7d61> 15268
-<7d62> <7d62> 15270
-<7d63> <7d63> 13374
-<7d64> <7d64> 15271
-<7d65> <7d65> 17186
-<7d66> <7d67> 8690
-<7d68> <7d68> 8693
-<7d69> <7d69> 17187
-<7d6a> <7d6a> 8694
-<7d6b> <7d6b> 15275
-<7d6c> <7d6d> 15277
-<7d6e> <7d72> 17188
-<7d73> <7d73> 15284
-<7d74> <7d74> 17193
-<7d75> <7d75> 15285
-<7d76> <7d76> 13337
-<7d77> <7d77> 15286
-<7d78> <7d78> 15288
-<7d79> <7d79> 15290
-<7d7a> <7d7a> 7795
-<7d7b> <7d7b> 7788
-<7d7c> <7d7d> 15292
-<7d7e> <7d7e> 17194
-<7e21> <7e21> 8697
-<7e22> <7e22> 15294
-<7e23> <7e23> 7752
-<7e24> <7e24> 13396
-<7e25> <7e25> 8698
-<7e26> <7e26> 15295
-<7e27> <7e27> 15297
-<7e28> <7e28> 15299
-<7e29> <7e2a> 17195
-<7e2b> <7e2b> 8703
-<7e2c> <7e2c> 15311
-<7e2d> <7e2d> 17197
-<7e2e> <7e2e> 15313
-<7e2f> <7e30> 15315
-<7e31> <7e31> 15318
-<7e32> <7e32> 22920
-<7e33> <7e33> 8704
-<7e34> <7e34> 7727
-<7e35> <7e35> 15322
-<7e36> <7e39> 17198
-<7e3a> <7e3a> 15323
-<7e3b> <7e3c> 17202
-<7e3d> <7e3d> 15325
-<7e3e> <7e40> 17204
-<7e41> <7e41> 15329
-<7e42> <7e42> 17207
-<7e43> <7e43> 8708
-<7e44> <7e44> 8707
-<7e45> <7e46> 17208
-<7e47> <7e47> 8709
-<7e48> <7e48> 17210
-<7e49> <7e4a> 15330
-<7e4b> <7e4d> 17211
-<7e4e> <7e4e> 15338
-<7e4f> <7e4f> 8712
-<7e50> <7e50> 17214
-<7e51> <7e51> 15343
-<7e52> <7e53> 17215
-<7e54> <7e55> 15344
-<7e56> <7e56> 17217
-<7e57> <7e57> 15347
-<7e58> <7e5a> 17218
-<7e5b> <7e5b> 15350
-<7e5c> <7e5c> 17221
-<7e5d> <7e5d> 15351
-<7e5e> <7e5e> 8713
-<7e5f> <7e5f> 15353
-<7e60> <7e64> 17222
-<7e65> <7e65> 7646
-<7e66> <7e68> 17227
-<7e69> <7e69> 15363
-<7e6a> <7e6a> 7677
-<7e6b> <7e6b> 17230
-<7e6c> <7e6c> 15365
-<7e6d> <7e6d> 15367
-<7e6e> <7e6e> 17231
-<7e6f> <7e6f> 7682
-<7e70> <7e70> 7797
-<7e71> <7e71> 13323
-<7e72> <7e72> 8717
-<7e73> <7e73> 15370
-<7e74> <7e74> 15376
-<7e75> <7e75> 15379
-<7e76> <7e77> 15383
-<7e78> <7e78> 17232
-<7e79> <7e79> 15385
-<7e7a> <7e7a> 19312
-endcidrange
-100 begincidrange
-<7e7b> <7e7b> 7826
-<7e7c> <7e7c> 19346
-<7e7d> <7e7d> 13893
-<7e7e> <7e7e> 7671
-<a1a1> <a1a5> 17233
-<a1a6> <a1a6> 14299
-<a1a7> <a1a7> 17238
-<a1a8> <a1a8> 14302
-<a1a9> <a1a9> 17239
-<a1aa> <a1aa> 14126
-<a1ab> <a1ae> 17240
-<a1af> <a1af> 14305
-<a1b0> <a1b2> 17244
-<a1b3> <a1b3> 14216
-<a1b4> <a1b4> 14309
-<a1b5> <a1b6> 13856
-<a1b7> <a1b9> 17247
-<a1ba> <a1ba> 14310
-<a1bb> <a1be> 17250
-<a1bf> <a1bf> 8374
-<a1c0> <a1c3> 17254
-<a1c4> <a1c4> 14319
-<a1c5> <a1c8> 17258
-<a1c9> <a1ca> 14320
-<a1cb> <a1cc> 17262
-<a1cd> <a1cd> 8378
-<a1ce> <a1ce> 8380
-<a1cf> <a1d0> 17264
-<a1d1> <a1d1> 14324
-<a1d2> <a1d3> 17266
-<a1d4> <a1d4> 14325
-<a1d5> <a1d7> 17268
-<a1d8> <a1d8> 14327
-<a1d9> <a1d9> 14329
-<a1da> <a1db> 17271
-<a1dc> <a1dc> 8386
-<a1dd> <a1dd> 8384
-<a1de> <a1de> 14047
-<a1df> <a1df> 8389
-<a1e0> <a1e0> 8387
-<a1e1> <a1e2> 17273
-<a1e3> <a1e3> 14333
-<a1e4> <a1e4> 17275
-<a1e5> <a1e6> 14334
-<a1e7> <a1e7> 8388
-<a1e8> <a1ec> 17276
-<a1ed> <a1ee> 14338
-<a1ef> <a1fa> 17281
-<a1fb> <a1fb> 15408
-<a1fc> <a1fc> 17293
-<a1fd> <a1fd> 14342
-<a1fe> <a1fe> 17294
-<a3a1> <a3a1> 14344
-<a3a2> <a3a3> 17295
-<a3a4> <a3a4> 14347
-<a3a5> <a3af> 17297
-<a3b0> <a3b0> 14351
-<a3b1> <a3b1> 17308
-<a3b2> <a3b2> 14105
-<a3b3> <a3b3> 17309
-<a3b4> <a3b4> 14354
-<a3b5> <a3b5> 14356
-<a3b6> <a3c2> 17310
-<a3c3> <a3c3> 8400
-<a3c4> <a3c4> 8573
-<a3c5> <a3c7> 17323
-<a3c8> <a3c8> 13865
-<a3c9> <a3cb> 17326
-<a3cc> <a3cd> 14364
-<a3ce> <a3ce> 8405
-<a3cf> <a3cf> 17329
-<a3d0> <a3d0> 14366
-<a3d1> <a3d4> 17330
-<a3d5> <a3d5> 14370
-<a3d6> <a3df> 17334
-<a3e0> <a3e0> 14372
-<a3e1> <a3e2> 17344
-<a3e3> <a3e3> 14374
-<a3e4> <a3e4> 14115
-<a3e5> <a3e9> 17346
-<a3ea> <a3ea> 14377
-<a3eb> <a3eb> 17351
-<a3ec> <a3ec> 8412
-<a3ed> <a3ed> 14380
-<a3ee> <a3f0> 17352
-<a3f1> <a3f1> 14383
-<a3f2> <a3f4> 17355
-<a3f5> <a3f5> 14385
-<a3f6> <a3fe> 17358
-<a4a1> <a4a4> 17367
-<a4a5> <a4a5> 14391
-<a4a6> <a4a6> 17371
-<a4a7> <a4a7> 14392
-<a4a8> <a4a8> 20308
-<a4a9> <a4ac> 17372
-<a4ad> <a4ad> 14394
-<a4ae> <a4c0> 17376
-<a4c1> <a4c1> 14399
-<a4c2> <a4c3> 17395
-<a4c4> <a4c4> 14400
-endcidrange
-100 begincidrange
-<a4c5> <a4cc> 17397
-<a4cd> <a4ce> 14409
-<a4cf> <a4d0> 17405
-<a4d1> <a4d1> 14412
-<a4d2> <a4d9> 17407
-<a4da> <a4db> 14418
-<a4dc> <a4e0> 17415
-<a4e1> <a4e1> 14423
-<a4e2> <a4eb> 17420
-<a4ec> <a4ec> 8418
-<a4ed> <a4f6> 17430
-<a4f7> <a4f7> 14428
-<a4f8> <a4fe> 17440
-<a5a1> <a5a1> 14434
-<a5a2> <a5a2> 17447
-<a5a3> <a5a3> 14435
-<a5a4> <a5b8> 17448
-<a5b9> <a5b9> 21371
-<a5ba> <a5ba> 8425
-<a5bb> <a5bc> 17470
-<a5bd> <a5bd> 14445
-<a5be> <a5c4> 17472
-<a5c5> <a5c5> 8427
-<a5c6> <a5d0> 17479
-<a5d1> <a5d2> 14452
-<a5d3> <a5d7> 17490
-<a5d8> <a5d8> 14455
-<a5d9> <a5dc> 17495
-<a5dd> <a5dd> 14458
-<a5de> <a5e5> 17499
-<a5e6> <a5e6> 14465
-<a5e7> <a5eb> 17507
-<a5ec> <a5ec> 14466
-<a5ed> <a5f0> 17512
-<a5f1> <a5f1> 14467
-<a5f2> <a5f4> 17516
-<a5f5> <a5f5> 14470
-<a5f6> <a5f9> 17519
-<a5fa> <a5fa> 14472
-<a5fb> <a5fb> 14474
-<a5fc> <a5fe> 17523
-<a8a1> <a8a3> 17526
-<a8a4> <a8a4> 8433
-<a8a5> <a8ae> 17529
-<a8af> <a8af> 14478
-<a8b0> <a8b1> 17539
-<a8b2> <a8b2> 14479
-<a8b3> <a8b4> 17541
-<a8b5> <a8b5> 14480
-<a8b6> <a8b8> 17543
-<a8b9> <a8b9> 14481
-<a8ba> <a8c2> 17546
-<a8c3> <a8c3> 8438
-<a8c4> <a8d0> 17555
-<a8d1> <a8d2> 14485
-<a8d3> <a8d4> 17568
-<a8d5> <a8d5> 8444
-<a8d6> <a8de> 17570
-<a8df> <a8e0> 14490
-<a8e1> <a8e1> 17579
-<a8e2> <a8e2> 14492
-<a8e3> <a8e3> 17580
-<a8e4> <a8e4> 15405
-<a8e5> <a8e6> 17581
-<a8e7> <a8e7> 8447
-<a8e8> <a8e9> 17583
-<a8ea> <a8eb> 14494
-<a8ec> <a8ef> 17585
-<a8f0> <a8f0> 14497
-<a8f1> <a8f1> 17589
-<a8f2> <a8f2> 14498
-<a8f3> <a8f3> 14500
-<a8f4> <a8f5> 17590
-<a8f6> <a8f6> 14502
-<a8f7> <a8fb> 17592
-<a8fc> <a8fd> 14504
-<a8fe> <a8fe> 17597
-<aca1> <aca3> 17598
-<aca4> <aca4> 14507
-<aca5> <aca6> 17601
-<aca7> <aca7> 14509
-<aca8> <aca8> 17603
-<aca9> <aca9> 14511
-<acaa> <acad> 17604
-<acae> <acaf> 14513
-<acb0> <acb7> 17608
-<acb8> <acb8> 14527
-<acb9> <acba> 14529
-<acbb> <acbb> 13852
-<acbc> <acc4> 17616
-<acc5> <acc5> 14535
-<acc6> <acc6> 17625
-<acc7> <acc7> 14536
-<acc8> <accb> 17626
-<accc> <accc> 14540
-<accd> <accd> 8456
-<acce> <acd0> 17630
-<acd1> <acd1> 14543
-<acd2> <acd5> 17633
-<acd6> <acd6> 14545
-endcidrange
-100 begincidrange
-<acd7> <acd7> 17637
-<acd8> <acd8> 8460
-<acd9> <acda> 17638
-<acdb> <acdc> 14547
-<acdd> <ace3> 17640
-<ace4> <ace4> 14551
-<ace5> <ace8> 17647
-<ace9> <ace9> 8464
-<acea> <acea> 17651
-<aceb> <aceb> 14554
-<acec> <acef> 17652
-<acf0> <acf0> 14556
-<acf1> <acf2> 17656
-<acf3> <acf3> 14557
-<acf4> <acf4> 17658
-<acf5> <acf5> 14558
-<acf6> <acf8> 14560
-<acf9> <acfe> 17659
-<ada1> <ada1> 17665
-<ada2> <ada2> 8466
-<ada3> <ada6> 17666
-<ada7> <ada7> 14567
-<ada8> <adb6> 17670
-<adb7> <adb7> 14575
-<adb8> <adbb> 17685
-<adbc> <adbc> 13892
-<adbd> <adbe> 17689
-<adbf> <adbf> 14580
-<adc0> <adc3> 17691
-<adc4> <adc4> 14581
-<adc5> <adc9> 17695
-<adca> <adca> 14585
-<adcb> <adcf> 17700
-<add0> <add0> 8469
-<add1> <add7> 17705
-<add8> <add8> 14590
-<add9> <add9> 17712
-<adda> <adda> 14593
-<addb> <addd> 17713
-<adde> <adde> 14594
-<addf> <ade5> 17716
-<ade6> <ade6> 14598
-<ade7> <ade7> 17723
-<ade8> <ade8> 14599
-<ade9> <aded> 17724
-<adee> <adee> 14600
-<adef> <adf1> 17729
-<adf2> <adf2> 14602
-<adf3> <adfd> 17732
-<adfe> <adfe> 8479
-<aea1> <aea1> 14605
-<aea2> <aea2> 14138
-<aea3> <aea5> 17743
-<aea6> <aea6> 14608
-<aea7> <aeac> 17746
-<aead> <aead> 8483
-<aeae> <aeb0> 17752
-<aeb1> <aeb1> 21722
-<aeb2> <aeb2> 17756
-<aeb3> <aeb3> 8486
-<aeb4> <aeb4> 17757
-<aeb5> <aeb5> 14612
-<aeb6> <aeb7> 17758
-<aeb8> <aeb8> 14613
-<aeb9> <aebd> 17760
-<aebe> <aebe> 14617
-<aebf> <aec5> 17765
-<aec6> <aec6> 14618
-<aec7> <aecb> 17772
-<aecc> <aecd> 14620
-<aece> <aed0> 17777
-<aed1> <aed1> 14624
-<aed2> <aed2> 17780
-<aed3> <aed3> 14625
-<aed4> <aede> 17781
-<aedf> <aedf> 8495
-<aee0> <aee7> 17792
-<aee8> <aee8> 14632
-<aee9> <aef8> 17800
-<aef9> <aef9> 8497
-<aefa> <aefc> 17816
-<aefd> <aefd> 8496
-<aefe> <aefe> 14637
-<afa1> <afa8> 17819
-<afa9> <afa9> 13965
-<afaa> <afaa> 17827
-<afab> <afab> 14646
-<afac> <afaf> 17828
-<afb0> <afb0> 14649
-<afb1> <afb1> 17832
-<afb2> <afb2> 14650
-<afb3> <afb5> 17833
-<afb6> <afb6> 8500
-<afb7> <afb7> 14652
-<afb8> <afb8> 17836
-<afb9> <afb9> 14654
-<afba> <afbd> 17837
-<afbe> <afbe> 14655
-<afbf> <afc0> 17841
-<afc1> <afc1> 8502
-endcidrange
-100 begincidrange
-<afc2> <afc2> 17843
-<afc3> <afc3> 15393
-<afc4> <afd0> 17844
-<afd1> <afd1> 14661
-<afd2> <afd2> 17857
-<afd3> <afd3> 8504
-<afd4> <afd9> 17858
-<afda> <afda> 8506
-<afdb> <afdb> 14668
-<afdc> <afdd> 17864
-<afde> <afde> 14670
-<afdf> <afdf> 14673
-<afe0> <afe6> 17866
-<afe7> <afe7> 14674
-<afe8> <afea> 17873
-<afeb> <afeb> 14676
-<afec> <affe> 17876
-<eea1> <eea4> 17895
-<eea5> <eea5> 14684
-<eea6> <eeac> 17899
-<eead> <eead> 14686
-<eeae> <eeb0> 17906
-<eeb1> <eeb1> 14689
-<eeb2> <eeb2> 17909
-<eeb3> <eeb3> 20309
-<eeb4> <eeb4> 17910
-<eeb5> <eeb5> 8510
-<eeb6> <eebc> 17911
-<eebd> <eebd> 14695
-<eebe> <eec0> 17918
-<eec1> <eec1> 14697
-<eec2> <eec2> 17921
-<eec3> <eec3> 14699
-<eec4> <eec4> 8514
-<eec5> <eec6> 17922
-<eec7> <eec7> 14702
-<eec8> <eeca> 17924
-<eecb> <eecb> 14704
-<eecc> <eed2> 17927
-<eed3> <eed3> 14709
-<eed4> <eedc> 17934
-<eedd> <eedd> 14150
-<eede> <eee7> 17943
-<eee8> <eee8> 8520
-<eee9> <eee9> 15414
-<eeea> <eeea> 17953
-<eeeb> <eeeb> 14716
-<eeec> <eeee> 17954
-<eeef> <eeef> 14717
-<eef0> <eef0> 8526
-<eef1> <eef2> 17957
-<eef3> <eef3> 8527
-<eef4> <eef8> 17959
-<eef9> <eef9> 14718
-<eefa> <eefe> 17964
-<efa1> <efa3> 17969
-<efa4> <efa4> 8528
-<efa5> <efa5> 17972
-<efa6> <efa6> 14720
-<efa7> <efa7> 15416
-<efa8> <efb4> 17973
-<efb5> <efb5> 14727
-<efb6> <efb7> 17986
-<efb8> <efb8> 13884
-<efb9> <efb9> 14730
-<efba> <efc0> 17988
-<efc1> <efc1> 8530
-<efc2> <efc3> 17995
-<efc4> <efc5> 14739
-<efc6> <efc9> 17997
-<efca> <efca> 8533
-<efcb> <efcd> 18001
-<efce> <efce> 14742
-<efcf> <efcf> 18004
-<efd0> <efd0> 14743
-<efd1> <efd4> 18005
-<efd5> <efd5> 14745
-<efd6> <efd7> 18009
-<efd8> <efd8> 14749
-<efd9> <efda> 18011
-<efdb> <efdc> 14750
-<efdd> <efdd> 18013
-<efde> <efde> 14752
-<efdf> <efdf> 18014
-<efe0> <efe0> 8365
-<efe1> <efe7> 18015
-<efe8> <efe8> 14754
-<efe9> <efe9> 14757
-<efea> <efea> 18022
-<efeb> <efeb> 8538
-<efec> <efec> 18023
-<efed> <efed> 14758
-<efee> <eff1> 18024
-<eff2> <eff2> 14760
-<eff3> <eff3> 18028
-<eff4> <eff4> 14761
-<eff5> <effe> 18029
-<f0a1> <f0a1> 15397
-<f0a2> <f0a2> 18039
-<f0a3> <f0a4> 14767
-endcidrange
-100 begincidrange
-<f0a5> <f0a8> 18040
-<f0a9> <f0a9> 15398
-<f0aa> <f0aa> 14772
-<f0ab> <f0ab> 18044
-<f0ac> <f0ac> 14773
-<f0ad> <f0ad> 18045
-<f0ae> <f0ae> 14157
-<f0af> <f0af> 18046
-<f0b0> <f0b0> 14775
-<f0b1> <f0b9> 18047
-<f0ba> <f0ba> 14780
-<f0bb> <f0bc> 18056
-<f0bd> <f0bd> 8545
-<f0be> <f0cb> 18058
-<f0cc> <f0cc> 14787
-<f0cd> <f0d1> 18072
-<f0d2> <f0d2> 14789
-<f0d3> <f0d6> 18077
-<f0d7> <f0d7> 8549
-<f0d8> <f0d8> 18081
-<f0d9> <f0d9> 14792
-<f0da> <f0dd> 18082
-<f0de> <f0de> 14795
-<f0df> <f0df> 18086
-<f0e0> <f0e0> 15423
-<f0e1> <f0e2> 14800
-<f0e3> <f0e3> 18087
-<f0e4> <f0e4> 14802
-<f0e5> <f0ed> 18088
-<f0ee> <f0ee> 14812
-<f0ef> <f0f0> 14817
-<f0f1> <f0f3> 18097
-<f0f4> <f0f4> 14822
-<f0f5> <f0f6> 18100
-<f0f7> <f0f7> 14827
-<f0f8> <f0f8> 18102
-<f0f9> <f0f9> 14829
-<f0fa> <f0fe> 18103
-<f1a1> <f1a1> 14835
-<f1a2> <f1a4> 18108
-<f1a5> <f1a5> 14838
-<f1a6> <f1aa> 18111
-<f1ab> <f1ab> 14843
-<f1ac> <f1ac> 14160
-<f1ad> <f1b9> 18116
-<f1ba> <f1ba> 14844
-<f1bb> <f1bc> 18129
-<f1bd> <f1bd> 15419
-<f1be> <f1c2> 18131
-<f1c3> <f1c3> 14846
-<f1c4> <f1c4> 13995
-<f1c5> <f1d3> 18136
-<f1d4> <f1d4> 14162
-<f1d5> <f1d6> 18151
-<f1d7> <f1d7> 14852
-<f1d8> <f1ee> 18153
-<f1ef> <f1ef> 8567
-<f1f0> <f1f8> 18176
-<f1f9> <f1f9> 14872
-<f1fa> <f1fe> 18185
-<f2a1> <f2a5> 18190
-<f2a6> <f2a6> 14878
-<f2a7> <f2a7> 14165
-<f2a8> <f2a8> 18195
-<f2a9> <f2a9> 14879
-<f2aa> <f2aa> 18196
-<f2ab> <f2ab> 14880
-<f2ac> <f2b1> 18197
-<f2b2> <f2b2> 14166
-<f2b3> <f2b5> 18203
-<f2b6> <f2b6> 14883
-<f2b7> <f2b8> 18206
-<f2b9> <f2b9> 15436
-<f2ba> <f2bb> 14884
-<f2bc> <f2be> 18208
-<f2bf> <f2bf> 14886
-<f2c0> <f2c2> 18211
-<f2c3> <f2c3> 8574
-<f2c4> <f2c5> 18214
-<f2c6> <f2c6> 8576
-<f2c7> <f2cc> 18216
-<f2cd> <f2cd> 14893
-<f2ce> <f2cf> 18222
-<f2d0> <f2d2> 14894
-<f2d3> <f2d3> 18224
-<f2d4> <f2d5> 14898
-<f2d6> <f2d8> 18225
-<f2d9> <f2d9> 14902
-<f2da> <f2dd> 18228
-<f2de> <f2de> 8578
-<f2df> <f2df> 18232
-<f2e0> <f2e0> 14905
-<f2e1> <f2e2> 18233
-<f2e3> <f2e3> 14908
-<f2e4> <f2e6> 18235
-<f2e7> <f2e7> 8582
-<f2e8> <f2e8> 18238
-<f2e9> <f2e9> 14911
-<f2ea> <f2ea> 8584
-<f2eb> <f2ed> 18239
-endcidrange
-100 begincidrange
-<f2ee> <f2ee> 14914
-<f2ef> <f2f8> 18242
-<f2f9> <f2f9> 14919
-<f2fa> <f2fb> 18252
-<f2fc> <f2fc> 14920
-<f2fd> <f2fd> 18254
-<f2fe> <f2fe> 14921
-<f3a1> <f3a2> 18255
-<f3a3> <f3a3> 14924
-<f3a4> <f3a7> 18257
-<f3a8> <f3a8> 20310
-<f3a9> <f3ab> 18261
-<f3ac> <f3ac> 14928
-<f3ad> <f3af> 18264
-<f3b0> <f3b0> 14930
-<f3b1> <f3b4> 18267
-<f3b5> <f3b5> 14933
-<f3b6> <f3b8> 18271
-<f3b9> <f3ba> 8585
-<f3bb> <f3be> 18274
-<f3bf> <f3bf> 14935
-<f3c0> <f3c1> 18278
-<f3c2> <f3c2> 14937
-<f3c3> <f3c5> 18280
-<f3c6> <f3c6> 14938
-<f3c7> <f3cf> 18283
-<f3d0> <f3d0> 14942
-<f3d1> <f3d4> 18292
-<f3d5> <f3d5> 14945
-<f3d6> <f3d7> 18296
-<f3d8> <f3d8> 14946
-<f3d9> <f3e4> 18298
-<f3e5> <f3e5> 14949
-<f3e6> <f3e6> 18310
-<f3e7> <f3e7> 14950
-<f3e8> <f3e8> 14952
-<f3e9> <f3ea> 18311
-<f3eb> <f3eb> 14955
-<f3ec> <f3ef> 18313
-<f3f0> <f3f0> 14958
-<f3f1> <f3f1> 18317
-<f3f2> <f3f2> 14959
-<f3f3> <f3f9> 18318
-<f3fa> <f3fa> 14961
-<f3fb> <f3fd> 18325
-<f3fe> <f3fe> 14962
-<f4a1> <f4a2> 18328
-<f4a3> <f4a3> 14964
-<f4a4> <f4a5> 18330
-<f4a6> <f4a6> 14967
-<f4a7> <f4a9> 18332
-<f4aa> <f4aa> 14970
-<f4ab> <f4b6> 18335
-<f4b7> <f4b7> 14976
-<f4b8> <f4bd> 18347
-<f4be> <f4be> 14979
-<f4bf> <f4bf> 18353
-<f4c0> <f4c0> 14981
-<f4c1> <f4c6> 18354
-<f4c7> <f4c7> 8593
-<f4c8> <f4cb> 18360
-<f4cc> <f4cd> 14984
-<f4ce> <f4d3> 18364
-<f4d4> <f4d4> 14989
-<f4d5> <f4d7> 18370
-<f4d8> <f4d8> 14993
-<f4d9> <f4dd> 18373
-<f4de> <f4df> 14995
-<f4e0> <f4e5> 18378
-<f4e6> <f4e7> 14997
-<f4e8> <f4e9> 18384
-<f4ea> <f4ea> 14999
-<f4eb> <f4eb> 18386
-<f4ec> <f4ec> 15001
-<f4ed> <f4f1> 18387
-<f4f2> <f4f2> 20311
-<f4f3> <f4fc> 18392
-<f4fd> <f4fd> 15006
-<f4fe> <f4fe> 15009
-<f5a1> <f5a1> 18402
-<f5a2> <f5a2> 14099
-<f5a3> <f5a4> 18403
-<f5a5> <f5a6> 15011
-<f5a7> <f5a7> 18405
-<f5a8> <f5a8> 15014
-<f5a9> <f5ac> 18406
-<f5ad> <f5ae> 15019
-<f5af> <f5b7> 18410
-<f5b8> <f5b8> 15025
-<f5b9> <f5b9> 18419
-<f5ba> <f5ba> 14100
-<f5bb> <f5bf> 18420
-<f5c0> <f5c0> 15026
-<f5c1> <f5ca> 18425
-<f5cb> <f5cb> 15031
-<f5cc> <f5cc> 18435
-<f5cd> <f5cd> 15032
-<f5ce> <f5d9> 18436
-<f5da> <f5da> 13646
-<f5db> <f5e0> 18448
-endcidrange
-100 begincidrange
-<f5e1> <f5e1> 15037
-<f5e2> <f5e3> 18454
-<f5e4> <f5e5> 15038
-<f5e6> <f5e6> 18456
-<f5e7> <f5e7> 15040
-<f5e8> <f5ea> 18457
-<f5eb> <f5eb> 15041
-<f5ec> <f5ec> 18460
-<f5ed> <f5ed> 15042
-<f5ee> <f5f3> 18461
-<f5f4> <f5f4> 14199
-<f5f5> <f5f5> 14198
-<f5f6> <f5f6> 14197
-<f5f7> <f5fe> 18467
-<f6a1> <f6b2> 18475
-<f6b3> <f6b3> 8602
-<f6b4> <f6b5> 18493
-<f6b6> <f6b6> 15053
-<f6b7> <f6c0> 18495
-<f6c1> <f6c2> 15060
-<f6c3> <f6c6> 18505
-<f6c7> <f6c7> 15062
-<f6c8> <f6cf> 18509
-<f6d0> <f6d0> 15063
-<f6d1> <f6d4> 18517
-<f6d5> <f6d5> 8363
-<f6d6> <f6e0> 18521
-<f6e1> <f6e1> 15068
-<f6e2> <f6e3> 18532
-<f6e4> <f6e5> 15069
-<f6e6> <f6e9> 18534
-<f6ea> <f6ea> 15071
-<f6eb> <f6ec> 18538
-<f6ed> <f6ed> 14206
-<f6ee> <f6ee> 18540
-<f6ef> <f6ef> 7861
-<f6f0> <f6f0> 18541
-<f6f1> <f6f1> 8607
-<f6f2> <f6f2> 15072
-<f6f3> <f6fe> 18542
-<f7a1> <f7a2> 18554
-<f7a3> <f7a3> 15074
-<f7a4> <f7b7> 18556
-<f7b8> <f7b8> 21073
-<f7b9> <f7ba> 18576
-<f7bb> <f7bb> 15082
-<f7bc> <f7bc> 18578
-<f7bd> <f7bd> 15083
-<f7be> <f7bf> 18579
-<f7c0> <f7c1> 15084
-<f7c2> <f7c3> 18581
-<f7c4> <f7c4> 15088
-<f7c5> <f7c5> 8613
-<f7c6> <f7d3> 18583
-<f7d4> <f7d5> 15092
-<f7d6> <f7da> 18597
-<f7db> <f7db> 15096
-<f7dc> <f7f0> 18602
-<f7f1> <f7f1> 15421
-<f7f2> <f7f7> 18623
-<f7f8> <f7fa> 15104
-<f7fb> <f7fb> 20312
-<f7fc> <f7fc> 15109
-<f7fd> <f7fe> 18629
-<f8a1> <f8a6> 18631
-<f8a7> <f8a8> 15113
-<f8a9> <f8af> 18637
-<f8b0> <f8b1> 15117
-<f8b2> <f8b2> 18644
-<f8b3> <f8b3> 15120
-<f8b4> <f8b6> 18645
-<f8b7> <f8b9> 15121
-<f8ba> <f8c2> 18648
-<f8c3> <f8c3> 15438
-<f8c4> <f8c4> 18657
-<f8c5> <f8c5> 13870
-<f8c6> <f8ca> 18658
-<f8cb> <f8cb> 15133
-<f8cc> <f8ce> 18663
-<f8cf> <f8cf> 15135
-<f8d0> <f8df> 18666
-<f8e0> <f8e0> 8620
-<f8e1> <f8e7> 18682
-<f8e8> <f8e8> 15143
-<f8e9> <f8e9> 18689
-<f8ea> <f8ea> 15145
-<f8eb> <f8ee> 18690
-<f8ef> <f8ef> 21074
-<f8f0> <f8f3> 18694
-<f8f4> <f8f5> 15148
-<f8f6> <f8fb> 18698
-<f8fc> <f8fc> 15150
-<f8fd> <f8fd> 18704
-<f8fe> <f8fe> 15151
-<f9a1> <f9a3> 18705
-<f9a4> <f9a4> 15152
-<f9a5> <f9aa> 18708
-<f9ab> <f9ab> 15153
-<f9ac> <f9ad> 18714
-<f9ae> <f9ae> 15154
-endcidrange
-100 begincidrange
-<f9af> <f9af> 18716
-<f9b0> <f9b0> 8626
-<f9b1> <f9b4> 18717
-<f9b5> <f9b6> 15160
-<f9b7> <f9b8> 15163
-<f9b9> <f9b9> 13898
-<f9ba> <f9ba> 15165
-<f9bb> <f9bc> 18721
-<f9bd> <f9bd> 15168
-<f9be> <f9cb> 18723
-<f9cc> <f9cc> 15170
-<f9cd> <f9ce> 18737
-<f9cf> <f9cf> 15171
-<f9d0> <f9d3> 18739
-<f9d4> <f9d5> 15175
-<f9d6> <f9d6> 18743
-<f9d7> <f9d7> 14083
-<f9d8> <f9d9> 18744
-<f9da> <f9db> 15177
-<f9dc> <f9dc> 18746
-<f9dd> <f9dd> 15179
-<f9de> <f9e0> 18747
-<f9e1> <f9e1> 15180
-<f9e2> <f9e8> 18750
-<f9e9> <f9e9> 15403
-<f9ea> <f9ea> 15184
-<f9eb> <f9f2> 18757
-<f9f3> <f9f3> 15186
-<f9f4> <f9f6> 18765
-<f9f7> <f9f7> 15189
-<f9f8> <f9fb> 18768
-<f9fc> <f9fc> 15191
-<f9fd> <f9fe> 18772
-<faa1> <faa4> 18774
-<faa5> <faa5> 15262
-<faa6> <fab8> 18778
-<fab9> <fab9> 15202
-<faba> <fabc> 18797
-<fabd> <fabd> 15204
-<fabe> <fac1> 18800
-<fac2> <fac3> 15208
-<fac4> <fac6> 18804
-<fac7> <fac7> 15210
-<fac8> <fac8> 15212
-<fac9> <fac9> 15214
-<faca> <facd> 18807
-<face> <face> 8639
-<facf> <fad1> 18811
-<fad2> <fad2> 8643
-<fad3> <fad3> 18814
-<fad4> <fad4> 8648
-<fad5> <fad7> 18815
-<fad8> <fad8> 15222
-<fad9> <fad9> 18818
-<fada> <fada> 15225
-<fadb> <fadb> 18819
-<fadc> <fadc> 8652
-<fadd> <fadd> 8654
-<fade> <fade> 18820
-<fadf> <fadf> 8653
-<fae0> <fae0> 15227
-<fae1> <fae2> 18821
-<fae3> <fae3> 8656
-<fae4> <fae4> 18823
-<fae5> <fae5> 14253
-<fae6> <faee> 18824
-<faef> <faef> 8657
-<faf0> <faf7> 18833
-<faf8> <faf8> 8663
-<faf9> <fafa> 8661
-<fafb> <fafb> 18841
-<fafc> <fafc> 8660
-<fafd> <fafe> 18842
-<fba1> <fba2> 18844
-<fba3> <fba3> 8368
-<fba4> <fba4> 8670
-<fba5> <fba5> 8675
-<fba6> <fba7> 15232
-<fba8> <fba8> 8674
-<fba9> <fba9> 8672
-<fbaa> <fbaa> 15235
-<fbab> <fbad> 18846
-<fbae> <fbae> 15236
-<fbaf> <fbaf> 18849
-<fbb0> <fbb0> 8677
-<fbb1> <fbbf> 18850
-<fbc0> <fbc0> 15244
-<fbc1> <fbc2> 18865
-<fbc3> <fbc3> 15246
-<fbc4> <fbc5> 18867
-<fbc6> <fbc6> 15249
-<fbc7> <fbca> 18869
-<fbcb> <fbcb> 15250
-<fbcc> <fbcc> 18873
-<fbcd> <fbcd> 8683
-<fbce> <fbd1> 18874
-<fbd2> <fbd2> 15255
-<fbd3> <fbd7> 18878
-<fbd8> <fbd8> 20313
-<fbd9> <fbd9> 15259
-endcidrange
-100 begincidrange
-<fbda> <fbe2> 18883
-<fbe3> <fbe3> 15263
-<fbe4> <fbea> 18892
-<fbeb> <fbeb> 15267
-<fbec> <fbec> 8689
-<fbed> <fbfb> 18899
-<fbfc> <fbfc> 20314
-<fbfd> <fbfe> 18914
-<fca1> <fca4> 18916
-<fca5> <fca5> 15279
-<fca6> <fca6> 18920
-<fca7> <fca7> 15280
-<fca8> <fcae> 18921
-<fcaf> <fcaf> 15283
-<fcb0> <fcb3> 18928
-<fcb4> <fcb4> 15287
-<fcb5> <fcb8> 18932
-<fcb9> <fcb9> 15289
-<fcba> <fcc3> 18936
-<fcc4> <fcc4> 15296
-<fcc5> <fcc6> 18946
-<fcc7> <fcc7> 15298
-<fcc8> <fcca> 18948
-<fccb> <fccc> 13848
-<fccd> <fcce> 18951
-<fccf> <fccf> 15300
-<fcd0> <fcde> 18953
-<fcdf> <fce0> 15301
-<fce1> <fce3> 18968
-<fce4> <fce4> 15303
-<fce5> <fce6> 18971
-<fce7> <fce7> 15304
-<fce8> <fce8> 18973
-<fce9> <fcea> 15305
-<fceb> <fced> 18974
-<fcee> <fcee> 15308
-<fcef> <fcf1> 18977
-<fcf2> <fcf2> 15310
-<fcf3> <fcfb> 18980
-<fcfc> <fcfc> 15312
-<fcfd> <fcfe> 18989
-<fda1> <fda1> 18991
-<fda2> <fda2> 15317
-<fda3> <fdb0> 18992
-<fdb1> <fdb1> 15430
-<fdb2> <fdb2> 8706
-<fdb3> <fdb5> 19006
-<fdb6> <fdb6> 15324
-<fdb7> <fdbc> 19009
-<fdbd> <fdbd> 15326
-<fdbe> <fdc4> 19015
-<fdc5> <fdc5> 15328
-<fdc6> <fdc9> 19022
-<fdca> <fdca> 8710
-<fdcb> <fdcb> 19026
-<fdcc> <fdcc> 20315
-<fdcd> <fdcf> 19027
-<fdd0> <fdd0> 15332
-<fdd1> <fdd3> 19030
-<fdd4> <fdd4> 15334
-<fdd5> <fdd5> 19033
-<fdd6> <fdd6> 15335
-<fdd7> <fdd9> 19034
-<fdda> <fdda> 15337
-<fddb> <fddb> 19037
-<fddc> <fddc> 15336
-<fddd> <fde3> 19038
-<fde4> <fde4> 15340
-<fde5> <fde5> 19045
-<fde6> <fde6> 15341
-<fde7> <fde8> 19046
-<fde9> <fde9> 15342
-<fdea> <fdfa> 19048
-<fdfb> <fdfb> 15346
-<fdfc> <fdfe> 19065
-<fea1> <fea3> 19068
-<fea4> <fea4> 15348
-<fea5> <fead> 19071
-<feae> <feae> 15349
-<feaf> <feb2> 19080
-<feb3> <feb3> 15352
-<feb4> <feb4> 8714
-<feb5> <feb8> 19084
-<feb9> <feb9> 15354
-<feba> <feba> 19088
-<febb> <febb> 15355
-<febc> <fec1> 19089
-<fec2> <fec3> 15357
-<fec4> <fec4> 19095
-<fec5> <fec5> 15359
-<fec6> <fec6> 19096
-<fec7> <fec7> 15360
-<fec8> <fec9> 19097
-<feca> <feca> 15362
-<fecb> <fece> 19099
-<fecf> <fecf> 8716
-<fed0> <fed0> 19103
-<fed1> <fed1> 15364
-<fed2> <fed6> 19104
-<fed7> <fed7> 15366
-endcidrange
-11 begincidrange
-<fed8> <fedb> 19109
-<fedc> <fedd> 15368
-<fede> <fee1> 19113
-<fee2> <fee5> 15372
-<fee6> <fee7> 19117
-<fee8> <fee9> 15377
-<feea> <fef1> 19119
-<fef2> <fef2> 20316
-<fef3> <fef4> 19127
-<fef5> <fef5> 15382
-<fef6> <fef6> 19129
-endcidrange
-endcmap
-CMapName currentdict /CMap defineresource pop
-end
-end
-
-%%EndResource
-%%EOF
diff --git a/Master/texmf-dist/fonts/cmap/jfontmaps/2004-V b/Master/texmf-dist/fonts/cmap/jfontmaps/2004-V
deleted file mode 100644
index f6e3e38a1fa..00000000000
--- a/Master/texmf-dist/fonts/cmap/jfontmaps/2004-V
+++ /dev/null
@@ -1,146 +0,0 @@
-%!PS-Adobe-3.0 Resource-CMap
-%%DocumentNeededResources: ProcSet (CIDInit)
-%%DocumentNeededResources: CMap (2004-H)
-%%IncludeResource: ProcSet (CIDInit)
-%%IncludeResource: CMap (2004-H)
-%%BeginResource: CMap (2004-V)
-%%Title: (2004-V Adobe Japan1 6)
-%%Version: 0.001
-%%Copyright: ------------------------------------------------------------
-%%Copyright: Copyright (c) 2013 Hironori KITAGAWA.
-%%Copyright:
-%%Copyright: This software is free software.
-%%Copyright: Unlimited permission is granted to use, copy, and distribute
-%%Copyright: it, with or without modification, either commercially and
-%%Copyright: noncommercially.
-%%Copyright: THIS SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY.
-%%Copyright: ------------------------------------------------------------
-%%EndComments
-
-/CIDInit /ProcSet findresource begin
-
-12 dict begin
-
-begincmap
-
-/2004-H usecmap
-
-/CIDSystemInfo 3 dict dup begin
- /Registry (Adobe) def
- /Ordering (Japan1) def
- /Supplement 6 def
-end def
-
-/CMapName /2004-V def
-/CMapVersion 0.001 def
-/CMapType 1 def
-
-/WMode 1 def
-
-98 begincidrange
-<2122> <2123> 7887
-<2124> <2124> 8268
-<2125> <2125> 8274
-<2127> <2127> 12101
-<212b> <212b> 8272
-<212c> <212c> 8271
-<2131> <2132> 7889
-<213c> <213e> 7891
-<2141> <2145> 7894
-<2146> <2147> 12173
-<2148> <2149> 7956
-<214a> <215b> 7899
-<2161> <2161> 7917
-<216b> <216b> 8269
-<216c> <216c> 8273
-<216d> <216d> 8283
-<222a> <222a> 739
-<222b> <222b> 738
-<222c> <222d> 736
-<2232> <2232> 7894
-<2236> <2236> 12107
-<2256> <2257> 12141
-<2258> <2259> 12139
-<225a> <225b> 16329
-<2329> <2329> 8311
-<232a> <232b> 8011
-<232c> <232c> 8014
-<232d> <232d> 8013
-<237b> <237c> 16331
-<2421> <2421> 7918
-<2423> <2423> 7919
-<2425> <2425> 7920
-<2427> <2427> 7921
-<2429> <2429> 7922
-<2443> <2443> 7923
-<2463> <2463> 7924
-<2465> <2465> 7925
-<2467> <2467> 7926
-<246e> <246e> 7927
-<2475> <2476> 8264
-<2521> <2521> 7928
-<2523> <2523> 7929
-<2525> <2525> 7930
-<2527> <2527> 7931
-<2529> <2529> 7932
-<2543> <2543> 7933
-<2563> <2563> 7934
-<2565> <2565> 7935
-<2567> <2567> 7936
-<256e> <256e> 7937
-<2575> <2576> 7938
-<266e> <267e> 16333
-<2821> <2821> 7481
-<2822> <2822> 7479
-<2823> <2823> 7495
-<2824> <2824> 7503
-<2825> <2825> 7499
-<2826> <2826> 7491
-<2827> <2827> 7523
-<2828> <2828> 7515
-<2829> <2829> 7531
-<282a> <282a> 7507
-<282c> <282c> 7482
-<282d> <282d> 7480
-<282e> <282e> 7498
-<282f> <282f> 7506
-<2830> <2830> 7502
-<2831> <2831> 7494
-<2832> <2832> 7530
-<2833> <2833> 7522
-<2834> <2834> 7538
-<2835> <2835> 7514
-<2837> <2837> 7526
-<2838> <2838> 7519
-<2839> <2839> 7534
-<283a> <283a> 7511
-<283b> <283b> 7545
-<283c> <283c> 7527
-<283d> <283d> 7516
-<283e> <283e> 7535
-<283f> <283f> 7508
-<2840> <2840> 7542
-<2d40> <2d41> 7940
-<2d42> <2d42> 8329
-<2d43> <2d43> 7943
-<2d44> <2d44> 8339
-<2d45> <2d45> 7945
-<2d46> <2d46> 8338
-<2d47> <2d48> 7947
-<2d49> <2d49> 8344
-<2d4a> <2d4b> 7950
-<2d4c> <2d4c> 8348
-<2d4d> <2d4e> 7953
-<2d4f> <2d4f> 8349
-<2d5f> <2d5f> 12044
-<2d60> <2d61> 7956
-<2d6d> <2d6f> 12041
-<2d7e> <2d7e> 8222
-endcidrange
-endcmap
-CMapName currentdict /CMap defineresource pop
-end
-end
-
-%%EndResource
-%%EOF
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/otf-hiragino-elcapitan-pron.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/otf-hiragino-elcapitan-pron.map
deleted file mode 100644
index bd537f76038..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/otf-hiragino-elcapitan-pron.map
+++ /dev/null
@@ -1,92 +0,0 @@
-
-% TEXT, 90JIS
-hminl-h H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-hminl-v V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-hminr-h H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-hminr-v V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-hminb-h H :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6
-hminb-v V :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6
-hgothr-h H :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-hgothr-v V :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-hgothb-h H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-hgothb-v V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-hgotheb-h H :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
-hgotheb-v V :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
-hmgothr-h H :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
-hmgothr-v V :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
-
-% TEXT, JIS04
-hminln-h H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-hminln-v V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-hminrn-h H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-hminrn-v V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-hminbn-h H :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6
-hminbn-v V :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6
-hgothrn-h H :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-hgothrn-v V :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-hgothbn-h H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-hgothbn-v V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-hgothebn-h H :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
-hgothebn-v V :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
-hmgothrn-h H :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
-hmgothrn-v V :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
-
-% CID
-otf-cjml-h Identity-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-otf-cjml-v Identity-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-otf-cjmr-h Identity-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-otf-cjmr-v Identity-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-otf-cjmb-h Identity-H :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6
-otf-cjmb-v Identity-V :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6
-otf-cjgr-h Identity-H :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-otf-cjgr-v Identity-V :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-otf-cjgb-h Identity-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-otf-cjgb-v Identity-V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-otf-cjge-h Identity-H :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
-otf-cjge-v Identity-V :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
-otf-cjmgr-h Identity-H :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
-otf-cjmgr-v Identity-V :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
-
-% Unicode 90JIS
-otf-ujml-h UniJIS-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-otf-ujml-v UniJIS-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-otf-ujmr-h UniJIS-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-otf-ujmr-v UniJIS-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-otf-ujmb-h UniJIS-UTF16-H :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6
-otf-ujmb-v UniJIS-UTF16-V :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6
-otf-ujgr-h UniJIS-UTF16-H :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-otf-ujgr-v UniJIS-UTF16-V :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-otf-ujgb-h UniJIS-UTF16-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-otf-ujgb-v UniJIS-UTF16-V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-otf-ujge-h UniJIS-UTF16-H :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
-otf-ujge-v UniJIS-UTF16-V :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
-otf-ujmgr-h UniJIS-UTF16-H :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
-otf-ujmgr-v UniJIS-UTF16-V :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
-
-% Unicode JIS04
-otf-ujmln-h UniJIS2004-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-otf-ujmln-v UniJIS2004-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-otf-ujmrn-h UniJIS2004-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-otf-ujmrn-v UniJIS2004-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-otf-ujmbn-h UniJIS2004-UTF16-H :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6
-otf-ujmbn-v UniJIS2004-UTF16-V :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6
-otf-ujgrn-h UniJIS2004-UTF16-H :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-otf-ujgrn-v UniJIS2004-UTF16-V :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-otf-ujgbn-h UniJIS2004-UTF16-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-otf-ujgbn-v UniJIS2004-UTF16-V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-otf-ujgen-h UniJIS2004-UTF16-H :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
-otf-ujgen-v UniJIS2004-UTF16-V :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
-otf-ujmgrn-h UniJIS2004-UTF16-H :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
-otf-ujmgrn-v UniJIS2004-UTF16-V :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
-
-% hiraprop
-hiramin-w3-h Identity-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-hiramin-w6-h Identity-H :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6
-hirakaku-w3-h Identity-H :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-hirakaku-w6-h Identity-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-hiramaru-w4-h Identity-H :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
-hiramin-w3-v Identity-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-hiramin-w6-v Identity-V :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6
-hirakaku-w3-v Identity-V :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-hirakaku-w6-v Identity-V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-hiramaru-w4-v Identity-V :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/otf-up-hiragino-elcapitan-pron.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/otf-up-hiragino-elcapitan-pron.map
deleted file mode 100644
index 50f3ae1653c..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/otf-up-hiragino-elcapitan-pron.map
+++ /dev/null
@@ -1,32 +0,0 @@
-
-% TEXT, 90JIS
-uphminl-h UniJIS-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-uphminl-v UniJIS-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-uphminr-h UniJIS-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-uphminr-v UniJIS-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-uphminb-h UniJIS-UTF16-H :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6
-uphminb-v UniJIS-UTF16-V :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6
-uphgothr-h UniJIS-UTF16-H :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-uphgothr-v UniJIS-UTF16-V :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-uphgothb-h UniJIS-UTF16-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-uphgothb-v UniJIS-UTF16-V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-uphgotheb-h UniJIS-UTF16-H :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
-uphgotheb-v UniJIS-UTF16-V :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
-uphmgothr-h UniJIS-UTF16-H :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
-uphmgothr-v UniJIS-UTF16-V :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
-
-% TEXT, JIS04
-uphminln-h UniJIS2004-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-uphminln-v UniJIS2004-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-uphminrn-h UniJIS2004-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-uphminrn-v UniJIS2004-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-uphminbn-h UniJIS2004-UTF16-H :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6
-uphminbn-v UniJIS2004-UTF16-V :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6
-uphgothrn-h UniJIS2004-UTF16-H :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-uphgothrn-v UniJIS2004-UTF16-V :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-uphgothbn-h UniJIS2004-UTF16-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-uphgothbn-v UniJIS2004-UTF16-V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-uphgothebn-h UniJIS2004-UTF16-H :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
-uphgothebn-v UniJIS2004-UTF16-V :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
-uphmgothrn-h UniJIS2004-UTF16-H :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
-uphmgothrn-v UniJIS2004-UTF16-V :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/ptex-hiragino-elcapitan-pron-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/ptex-hiragino-elcapitan-pron-04.map
deleted file mode 100644
index a27347bf962..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/ptex-hiragino-elcapitan-pron-04.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml 2004-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-rmlv 2004-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-gbm 2004-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-gbmv 2004-V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/ptex-hiragino-elcapitan-pron.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/ptex-hiragino-elcapitan-pron.map
deleted file mode 100644
index 6556548b7e7..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/ptex-hiragino-elcapitan-pron.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-rmlv V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-gbm H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-gbmv V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/uptex-hiragino-elcapitan-pron-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/uptex-hiragino-elcapitan-pron-04.map
deleted file mode 100644
index 057e1097f19..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/uptex-hiragino-elcapitan-pron-04.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS2004-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-urmlv UniJIS2004-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-ugbm UniJIS2004-UTF16-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-ugbmv UniJIS2004-UTF16-V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-uprml-h UniJIS2004-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-uprml-v UniJIS2004-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-upgbm-h UniJIS2004-UTF16-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-upgbm-v UniJIS2004-UTF16-V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-uprml-hq UniJIS-UCS2-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-upgbm-hq UniJIS-UCS2-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/uptex-hiragino-elcapitan-pron.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/uptex-hiragino-elcapitan-pron.map
deleted file mode 100644
index 2e21b50da69..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/uptex-hiragino-elcapitan-pron.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-urmlv UniJIS-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-ugbm UniJIS-UTF16-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-ugbmv UniJIS-UTF16-V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-uprml-h UniJIS-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-uprml-v UniJIS-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-upgbm-h UniJIS-UTF16-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-upgbm-v UniJIS-UTF16-V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-uprml-hq UniJIS-UCS2-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-upgbm-hq UniJIS-UCS2-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/otf-hiragino-elcapitan.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/otf-hiragino-elcapitan.map
deleted file mode 100644
index 41c5388d9d8..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/otf-hiragino-elcapitan.map
+++ /dev/null
@@ -1,92 +0,0 @@
-
-% TEXT, 90JIS
-hminl-h H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-hminl-v V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-hminr-h H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-hminr-v V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-hminb-h H :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6
-hminb-v V :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6
-hgothr-h H :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-hgothr-v V :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-hgothb-h H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-hgothb-v V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-hgotheb-h H :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
-hgotheb-v V :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
-hmgothr-h H :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
-hmgothr-v V :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
-
-% TEXT, JIS04
-hminln-h H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-hminln-v V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-hminrn-h H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-hminrn-v V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-hminbn-h H :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6
-hminbn-v V :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6
-hgothrn-h H :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-hgothrn-v V :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-hgothbn-h H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-hgothbn-v V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-hgothebn-h H :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
-hgothebn-v V :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
-hmgothrn-h H :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
-hmgothrn-v V :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
-
-% CID
-otf-cjml-h Identity-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-otf-cjml-v Identity-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-otf-cjmr-h Identity-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-otf-cjmr-v Identity-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-otf-cjmb-h Identity-H :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6
-otf-cjmb-v Identity-V :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6
-otf-cjgr-h Identity-H :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-otf-cjgr-v Identity-V :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-otf-cjgb-h Identity-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-otf-cjgb-v Identity-V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-otf-cjge-h Identity-H :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
-otf-cjge-v Identity-V :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
-otf-cjmgr-h Identity-H :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
-otf-cjmgr-v Identity-V :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
-
-% Unicode 90JIS
-otf-ujml-h UniJIS-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-otf-ujml-v UniJIS-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-otf-ujmr-h UniJIS-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-otf-ujmr-v UniJIS-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-otf-ujmb-h UniJIS-UTF16-H :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6
-otf-ujmb-v UniJIS-UTF16-V :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6
-otf-ujgr-h UniJIS-UTF16-H :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-otf-ujgr-v UniJIS-UTF16-V :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-otf-ujgb-h UniJIS-UTF16-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-otf-ujgb-v UniJIS-UTF16-V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-otf-ujge-h UniJIS-UTF16-H :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
-otf-ujge-v UniJIS-UTF16-V :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
-otf-ujmgr-h UniJIS-UTF16-H :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
-otf-ujmgr-v UniJIS-UTF16-V :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
-
-% Unicode JIS04
-otf-ujmln-h UniJIS2004-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-otf-ujmln-v UniJIS2004-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-otf-ujmrn-h UniJIS2004-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-otf-ujmrn-v UniJIS2004-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-otf-ujmbn-h UniJIS2004-UTF16-H :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6
-otf-ujmbn-v UniJIS2004-UTF16-V :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6
-otf-ujgrn-h UniJIS2004-UTF16-H :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-otf-ujgrn-v UniJIS2004-UTF16-V :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-otf-ujgbn-h UniJIS2004-UTF16-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-otf-ujgbn-v UniJIS2004-UTF16-V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-otf-ujgen-h UniJIS2004-UTF16-H :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
-otf-ujgen-v UniJIS2004-UTF16-V :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
-otf-ujmgrn-h UniJIS2004-UTF16-H :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
-otf-ujmgrn-v UniJIS2004-UTF16-V :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
-
-% hiraprop
-hiramin-w3-h Identity-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-hiramin-w6-h Identity-H :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6
-hirakaku-w3-h Identity-H :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-hirakaku-w6-h Identity-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-hiramaru-w4-h Identity-H :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
-hiramin-w3-v Identity-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-hiramin-w6-v Identity-V :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6
-hirakaku-w3-v Identity-V :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-hirakaku-w6-v Identity-V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-hiramaru-w4-v Identity-V :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/otf-up-hiragino-elcapitan.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/otf-up-hiragino-elcapitan.map
deleted file mode 100644
index d01b53b4f56..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/otf-up-hiragino-elcapitan.map
+++ /dev/null
@@ -1,32 +0,0 @@
-
-% TEXT, 90JIS
-uphminl-h UniJIS-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-uphminl-v UniJIS-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-uphminr-h UniJIS-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-uphminr-v UniJIS-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-uphminb-h UniJIS-UTF16-H :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6
-uphminb-v UniJIS-UTF16-V :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6
-uphgothr-h UniJIS-UTF16-H :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-uphgothr-v UniJIS-UTF16-V :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-uphgothb-h UniJIS-UTF16-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-uphgothb-v UniJIS-UTF16-V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-uphgotheb-h UniJIS-UTF16-H :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
-uphgotheb-v UniJIS-UTF16-V :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
-uphmgothr-h UniJIS-UTF16-H :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
-uphmgothr-v UniJIS-UTF16-V :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
-
-% TEXT, JIS04
-uphminln-h UniJIS2004-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-uphminln-v UniJIS2004-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-uphminrn-h UniJIS2004-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-uphminrn-v UniJIS2004-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-uphminbn-h UniJIS2004-UTF16-H :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6
-uphminbn-v UniJIS2004-UTF16-V :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6
-uphgothrn-h UniJIS2004-UTF16-H :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-uphgothrn-v UniJIS2004-UTF16-V :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-uphgothbn-h UniJIS2004-UTF16-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-uphgothbn-v UniJIS2004-UTF16-V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-uphgothebn-h UniJIS2004-UTF16-H :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
-uphgothebn-v UniJIS2004-UTF16-V :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
-uphmgothrn-h UniJIS2004-UTF16-H :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
-uphmgothrn-v UniJIS2004-UTF16-V :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/ptex-hiragino-elcapitan-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/ptex-hiragino-elcapitan-04.map
deleted file mode 100644
index 7ffb1d6e7bb..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/ptex-hiragino-elcapitan-04.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml 2004-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-rmlv 2004-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-gbm 2004-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-gbmv 2004-V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/ptex-hiragino-elcapitan.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/ptex-hiragino-elcapitan.map
deleted file mode 100644
index 05d0f34ee11..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/ptex-hiragino-elcapitan.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-rmlv V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-gbm H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-gbmv V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/uptex-hiragino-elcapitan-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/uptex-hiragino-elcapitan-04.map
deleted file mode 100644
index ce0407b9c0b..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/uptex-hiragino-elcapitan-04.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS2004-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-urmlv UniJIS2004-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-ugbm UniJIS2004-UTF16-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-ugbmv UniJIS2004-UTF16-V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-uprml-h UniJIS2004-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-uprml-v UniJIS2004-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-upgbm-h UniJIS2004-UTF16-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-upgbm-v UniJIS2004-UTF16-V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-uprml-hq UniJIS-UCS2-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-upgbm-hq UniJIS-UCS2-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/uptex-hiragino-elcapitan.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/uptex-hiragino-elcapitan.map
deleted file mode 100644
index 21af43d0c51..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/uptex-hiragino-elcapitan.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-urmlv UniJIS-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-ugbm UniJIS-UTF16-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-ugbmv UniJIS-UTF16-V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-uprml-h UniJIS-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-uprml-v UniJIS-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-upgbm-h UniJIS-UTF16-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-upgbm-v UniJIS-UTF16-V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-uprml-hq UniJIS-UCS2-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-upgbm-hq UniJIS-UCS2-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/otf-hiragino-pron.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/otf-hiragino-pron.map
deleted file mode 100644
index b4b41ac0348..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/otf-hiragino-pron.map
+++ /dev/null
@@ -1,92 +0,0 @@
-
-% TEXT, 90JIS
-hminl-h H HiraMinProN-W2.otf
-hminl-v V HiraMinProN-W2.otf
-hminr-h H HiraMinProN-W3.otf
-hminr-v V HiraMinProN-W3.otf
-hminb-h H HiraMinProN-W6.otf
-hminb-v V HiraMinProN-W6.otf
-hgothr-h H HiraKakuProN-W3.otf
-hgothr-v V HiraKakuProN-W3.otf
-hgothb-h H HiraKakuProN-W6.otf
-hgothb-v V HiraKakuProN-W6.otf
-hgotheb-h H HiraKakuStdN-W8.otf
-hgotheb-v V HiraKakuStdN-W8.otf
-hmgothr-h H HiraMaruProN-W4.otf
-hmgothr-v V HiraMaruProN-W4.otf
-
-% TEXT, JIS04
-hminln-h H HiraMinProN-W2.otf
-hminln-v V HiraMinProN-W2.otf
-hminrn-h H HiraMinProN-W3.otf
-hminrn-v V HiraMinProN-W3.otf
-hminbn-h H HiraMinProN-W6.otf
-hminbn-v V HiraMinProN-W6.otf
-hgothrn-h H HiraKakuProN-W3.otf
-hgothrn-v V HiraKakuProN-W3.otf
-hgothbn-h H HiraKakuProN-W6.otf
-hgothbn-v V HiraKakuProN-W6.otf
-hgothebn-h H HiraKakuStdN-W8.otf
-hgothebn-v V HiraKakuStdN-W8.otf
-hmgothrn-h H HiraMaruProN-W4.otf
-hmgothrn-v V HiraMaruProN-W4.otf
-
-% CID
-otf-cjml-h Identity-H HiraMinProN-W2.otf
-otf-cjml-v Identity-V HiraMinProN-W2.otf
-otf-cjmr-h Identity-H HiraMinProN-W3.otf
-otf-cjmr-v Identity-V HiraMinProN-W3.otf
-otf-cjmb-h Identity-H HiraMinProN-W6.otf
-otf-cjmb-v Identity-V HiraMinProN-W6.otf
-otf-cjgr-h Identity-H HiraKakuProN-W3.otf
-otf-cjgr-v Identity-V HiraKakuProN-W3.otf
-otf-cjgb-h Identity-H HiraKakuProN-W6.otf
-otf-cjgb-v Identity-V HiraKakuProN-W6.otf
-otf-cjge-h Identity-H HiraKakuStdN-W8.otf
-otf-cjge-v Identity-V HiraKakuStdN-W8.otf
-otf-cjmgr-h Identity-H HiraMaruProN-W4.otf
-otf-cjmgr-v Identity-V HiraMaruProN-W4.otf
-
-% Unicode 90JIS
-otf-ujml-h UniJIS-UTF16-H HiraMinProN-W2.otf
-otf-ujml-v UniJIS-UTF16-V HiraMinProN-W2.otf
-otf-ujmr-h UniJIS-UTF16-H HiraMinProN-W3.otf
-otf-ujmr-v UniJIS-UTF16-V HiraMinProN-W3.otf
-otf-ujmb-h UniJIS-UTF16-H HiraMinProN-W6.otf
-otf-ujmb-v UniJIS-UTF16-V HiraMinProN-W6.otf
-otf-ujgr-h UniJIS-UTF16-H HiraKakuProN-W3.otf
-otf-ujgr-v UniJIS-UTF16-V HiraKakuProN-W3.otf
-otf-ujgb-h UniJIS-UTF16-H HiraKakuProN-W6.otf
-otf-ujgb-v UniJIS-UTF16-V HiraKakuProN-W6.otf
-otf-ujge-h UniJIS-UTF16-H HiraKakuStdN-W8.otf
-otf-ujge-v UniJIS-UTF16-V HiraKakuStdN-W8.otf
-otf-ujmgr-h UniJIS-UTF16-H HiraMaruProN-W4.otf
-otf-ujmgr-v UniJIS-UTF16-V HiraMaruProN-W4.otf
-
-% Unicode JIS04
-otf-ujmln-h UniJIS2004-UTF16-H HiraMinProN-W2.otf
-otf-ujmln-v UniJIS2004-UTF16-V HiraMinProN-W2.otf
-otf-ujmrn-h UniJIS2004-UTF16-H HiraMinProN-W3.otf
-otf-ujmrn-v UniJIS2004-UTF16-V HiraMinProN-W3.otf
-otf-ujmbn-h UniJIS2004-UTF16-H HiraMinProN-W6.otf
-otf-ujmbn-v UniJIS2004-UTF16-V HiraMinProN-W6.otf
-otf-ujgrn-h UniJIS2004-UTF16-H HiraKakuProN-W3.otf
-otf-ujgrn-v UniJIS2004-UTF16-V HiraKakuProN-W3.otf
-otf-ujgbn-h UniJIS2004-UTF16-H HiraKakuProN-W6.otf
-otf-ujgbn-v UniJIS2004-UTF16-V HiraKakuProN-W6.otf
-otf-ujgen-h UniJIS2004-UTF16-H HiraKakuStdN-W8.otf
-otf-ujgen-v UniJIS2004-UTF16-V HiraKakuStdN-W8.otf
-otf-ujmgrn-h UniJIS2004-UTF16-H HiraMaruProN-W4.otf
-otf-ujmgrn-v UniJIS2004-UTF16-V HiraMaruProN-W4.otf
-
-% hiraprop
-hiramin-w3-h Identity-H HiraMinProN-W3.otf
-hiramin-w6-h Identity-H HiraMinProN-W6.otf
-hirakaku-w3-h Identity-H HiraKakuProN-W3.otf
-hirakaku-w6-h Identity-H HiraKakuProN-W6.otf
-hiramaru-w4-h Identity-H HiraMaruProN-W4.otf
-hiramin-w3-v Identity-V HiraMinProN-W3.otf
-hiramin-w6-v Identity-V HiraMinProN-W6.otf
-hirakaku-w3-v Identity-V HiraKakuProN-W3.otf
-hirakaku-w6-v Identity-V HiraKakuProN-W6.otf
-hiramaru-w4-v Identity-V HiraMaruProN-W4.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/otf-up-hiragino-pron.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/otf-up-hiragino-pron.map
deleted file mode 100644
index 7f17033882b..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/otf-up-hiragino-pron.map
+++ /dev/null
@@ -1,32 +0,0 @@
-
-% TEXT, 90JIS
-uphminl-h UniJIS-UTF16-H HiraMinProN-W2.otf
-uphminl-v UniJIS-UTF16-V HiraMinProN-W2.otf
-uphminr-h UniJIS-UTF16-H HiraMinProN-W3.otf
-uphminr-v UniJIS-UTF16-V HiraMinProN-W3.otf
-uphminb-h UniJIS-UTF16-H HiraMinProN-W6.otf
-uphminb-v UniJIS-UTF16-V HiraMinProN-W6.otf
-uphgothr-h UniJIS-UTF16-H HiraKakuProN-W3.otf
-uphgothr-v UniJIS-UTF16-V HiraKakuProN-W3.otf
-uphgothb-h UniJIS-UTF16-H HiraKakuProN-W6.otf
-uphgothb-v UniJIS-UTF16-V HiraKakuProN-W6.otf
-uphgotheb-h UniJIS-UTF16-H HiraKakuStdN-W8.otf
-uphgotheb-v UniJIS-UTF16-V HiraKakuStdN-W8.otf
-uphmgothr-h UniJIS-UTF16-H HiraMaruProN-W4.otf
-uphmgothr-v UniJIS-UTF16-V HiraMaruProN-W4.otf
-
-% TEXT, JIS04
-uphminln-h UniJIS2004-UTF16-H HiraMinProN-W2.otf
-uphminln-v UniJIS2004-UTF16-V HiraMinProN-W2.otf
-uphminrn-h UniJIS2004-UTF16-H HiraMinProN-W3.otf
-uphminrn-v UniJIS2004-UTF16-V HiraMinProN-W3.otf
-uphminbn-h UniJIS2004-UTF16-H HiraMinProN-W6.otf
-uphminbn-v UniJIS2004-UTF16-V HiraMinProN-W6.otf
-uphgothrn-h UniJIS2004-UTF16-H HiraKakuProN-W3.otf
-uphgothrn-v UniJIS2004-UTF16-V HiraKakuProN-W3.otf
-uphgothbn-h UniJIS2004-UTF16-H HiraKakuProN-W6.otf
-uphgothbn-v UniJIS2004-UTF16-V HiraKakuProN-W6.otf
-uphgothebn-h UniJIS2004-UTF16-H HiraKakuStdN-W8.otf
-uphgothebn-v UniJIS2004-UTF16-V HiraKakuStdN-W8.otf
-uphmgothrn-h UniJIS2004-UTF16-H HiraMaruProN-W4.otf
-uphmgothrn-v UniJIS2004-UTF16-V HiraMaruProN-W4.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/ptex-hiragino-pron-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/ptex-hiragino-pron-04.map
deleted file mode 100644
index 769ad550031..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/ptex-hiragino-pron-04.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml 2004-H HiraMinProN-W3.otf
-rmlv 2004-V HiraMinProN-W3.otf
-gbm 2004-H HiraKakuProN-W6.otf
-gbmv 2004-V HiraKakuProN-W6.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/ptex-hiragino-pron.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/ptex-hiragino-pron.map
deleted file mode 100644
index 406c4e2dd9d..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/ptex-hiragino-pron.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml H HiraMinProN-W3.otf
-rmlv V HiraMinProN-W3.otf
-gbm H HiraKakuProN-W6.otf
-gbmv V HiraKakuProN-W6.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/uptex-hiragino-pron-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/uptex-hiragino-pron-04.map
deleted file mode 100644
index 113f1a01b42..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/uptex-hiragino-pron-04.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS2004-UTF16-H HiraMinProN-W3.otf
-urmlv UniJIS2004-UTF16-V HiraMinProN-W3.otf
-ugbm UniJIS2004-UTF16-H HiraKakuProN-W6.otf
-ugbmv UniJIS2004-UTF16-V HiraKakuProN-W6.otf
-uprml-h UniJIS2004-UTF16-H HiraMinProN-W3.otf
-uprml-v UniJIS2004-UTF16-V HiraMinProN-W3.otf
-upgbm-h UniJIS2004-UTF16-H HiraKakuProN-W6.otf
-upgbm-v UniJIS2004-UTF16-V HiraKakuProN-W6.otf
-uprml-hq UniJIS-UCS2-H HiraMinProN-W3.otf
-upgbm-hq UniJIS-UCS2-H HiraKakuProN-W6.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/uptex-hiragino-pron.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/uptex-hiragino-pron.map
deleted file mode 100644
index 061bd5269c3..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/uptex-hiragino-pron.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS-UTF16-H HiraMinProN-W3.otf
-urmlv UniJIS-UTF16-V HiraMinProN-W3.otf
-ugbm UniJIS-UTF16-H HiraKakuProN-W6.otf
-ugbmv UniJIS-UTF16-V HiraKakuProN-W6.otf
-uprml-h UniJIS-UTF16-H HiraMinProN-W3.otf
-uprml-v UniJIS-UTF16-V HiraMinProN-W3.otf
-upgbm-h UniJIS-UTF16-H HiraKakuProN-W6.otf
-upgbm-v UniJIS-UTF16-V HiraKakuProN-W6.otf
-uprml-hq UniJIS-UCS2-H HiraMinProN-W3.otf
-upgbm-hq UniJIS-UCS2-H HiraKakuProN-W6.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/otf-hiragino.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/otf-hiragino.map
deleted file mode 100644
index 8d2effbc1a9..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/otf-hiragino.map
+++ /dev/null
@@ -1,92 +0,0 @@
-
-% TEXT, 90JIS
-hminl-h H HiraMinPro-W2.otf
-hminl-v V HiraMinPro-W2.otf
-hminr-h H HiraMinPro-W3.otf
-hminr-v V HiraMinPro-W3.otf
-hminb-h H HiraMinPro-W6.otf
-hminb-v V HiraMinPro-W6.otf
-hgothr-h H HiraKakuPro-W3.otf
-hgothr-v V HiraKakuPro-W3.otf
-hgothb-h H HiraKakuPro-W6.otf
-hgothb-v V HiraKakuPro-W6.otf
-hgotheb-h H HiraKakuStd-W8.otf
-hgotheb-v V HiraKakuStd-W8.otf
-hmgothr-h H HiraMaruPro-W4.otf
-hmgothr-v V HiraMaruPro-W4.otf
-
-% TEXT, JIS04
-hminln-h H HiraMinPro-W2.otf
-hminln-v V HiraMinPro-W2.otf
-hminrn-h H HiraMinPro-W3.otf
-hminrn-v V HiraMinPro-W3.otf
-hminbn-h H HiraMinPro-W6.otf
-hminbn-v V HiraMinPro-W6.otf
-hgothrn-h H HiraKakuPro-W3.otf
-hgothrn-v V HiraKakuPro-W3.otf
-hgothbn-h H HiraKakuPro-W6.otf
-hgothbn-v V HiraKakuPro-W6.otf
-hgothebn-h H HiraKakuStd-W8.otf
-hgothebn-v V HiraKakuStd-W8.otf
-hmgothrn-h H HiraMaruPro-W4.otf
-hmgothrn-v V HiraMaruPro-W4.otf
-
-% CID
-otf-cjml-h Identity-H HiraMinPro-W2.otf
-otf-cjml-v Identity-V HiraMinPro-W2.otf
-otf-cjmr-h Identity-H HiraMinPro-W3.otf
-otf-cjmr-v Identity-V HiraMinPro-W3.otf
-otf-cjmb-h Identity-H HiraMinPro-W6.otf
-otf-cjmb-v Identity-V HiraMinPro-W6.otf
-otf-cjgr-h Identity-H HiraKakuPro-W3.otf
-otf-cjgr-v Identity-V HiraKakuPro-W3.otf
-otf-cjgb-h Identity-H HiraKakuPro-W6.otf
-otf-cjgb-v Identity-V HiraKakuPro-W6.otf
-otf-cjge-h Identity-H HiraKakuStd-W8.otf
-otf-cjge-v Identity-V HiraKakuStd-W8.otf
-otf-cjmgr-h Identity-H HiraMaruPro-W4.otf
-otf-cjmgr-v Identity-V HiraMaruPro-W4.otf
-
-% Unicode 90JIS
-otf-ujml-h UniJIS-UTF16-H HiraMinPro-W2.otf
-otf-ujml-v UniJIS-UTF16-V HiraMinPro-W2.otf
-otf-ujmr-h UniJIS-UTF16-H HiraMinPro-W3.otf
-otf-ujmr-v UniJIS-UTF16-V HiraMinPro-W3.otf
-otf-ujmb-h UniJIS-UTF16-H HiraMinPro-W6.otf
-otf-ujmb-v UniJIS-UTF16-V HiraMinPro-W6.otf
-otf-ujgr-h UniJIS-UTF16-H HiraKakuPro-W3.otf
-otf-ujgr-v UniJIS-UTF16-V HiraKakuPro-W3.otf
-otf-ujgb-h UniJIS-UTF16-H HiraKakuPro-W6.otf
-otf-ujgb-v UniJIS-UTF16-V HiraKakuPro-W6.otf
-otf-ujge-h UniJIS-UTF16-H HiraKakuStd-W8.otf
-otf-ujge-v UniJIS-UTF16-V HiraKakuStd-W8.otf
-otf-ujmgr-h UniJIS-UTF16-H HiraMaruPro-W4.otf
-otf-ujmgr-v UniJIS-UTF16-V HiraMaruPro-W4.otf
-
-% Unicode JIS04
-otf-ujmln-h UniJIS2004-UTF16-H HiraMinPro-W2.otf
-otf-ujmln-v UniJIS2004-UTF16-V HiraMinPro-W2.otf
-otf-ujmrn-h UniJIS2004-UTF16-H HiraMinPro-W3.otf
-otf-ujmrn-v UniJIS2004-UTF16-V HiraMinPro-W3.otf
-otf-ujmbn-h UniJIS2004-UTF16-H HiraMinPro-W6.otf
-otf-ujmbn-v UniJIS2004-UTF16-V HiraMinPro-W6.otf
-otf-ujgrn-h UniJIS2004-UTF16-H HiraKakuPro-W3.otf
-otf-ujgrn-v UniJIS2004-UTF16-V HiraKakuPro-W3.otf
-otf-ujgbn-h UniJIS2004-UTF16-H HiraKakuPro-W6.otf
-otf-ujgbn-v UniJIS2004-UTF16-V HiraKakuPro-W6.otf
-otf-ujgen-h UniJIS2004-UTF16-H HiraKakuStd-W8.otf
-otf-ujgen-v UniJIS2004-UTF16-V HiraKakuStd-W8.otf
-otf-ujmgrn-h UniJIS2004-UTF16-H HiraMaruPro-W4.otf
-otf-ujmgrn-v UniJIS2004-UTF16-V HiraMaruPro-W4.otf
-
-% hiraprop
-hiramin-w3-h Identity-H HiraMinPro-W3.otf
-hiramin-w6-h Identity-H HiraMinPro-W6.otf
-hirakaku-w3-h Identity-H HiraKakuPro-W3.otf
-hirakaku-w6-h Identity-H HiraKakuPro-W6.otf
-hiramaru-w4-h Identity-H HiraMaruPro-W4.otf
-hiramin-w3-v Identity-V HiraMinPro-W3.otf
-hiramin-w6-v Identity-V HiraMinPro-W6.otf
-hirakaku-w3-v Identity-V HiraKakuPro-W3.otf
-hirakaku-w6-v Identity-V HiraKakuPro-W6.otf
-hiramaru-w4-v Identity-V HiraMaruPro-W4.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/otf-up-hiragino.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/otf-up-hiragino.map
deleted file mode 100644
index 9772ad53659..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/otf-up-hiragino.map
+++ /dev/null
@@ -1,32 +0,0 @@
-
-% TEXT, 90JIS
-uphminl-h UniJIS-UTF16-H HiraMinPro-W2.otf
-uphminl-v UniJIS-UTF16-V HiraMinPro-W2.otf
-uphminr-h UniJIS-UTF16-H HiraMinPro-W3.otf
-uphminr-v UniJIS-UTF16-V HiraMinPro-W3.otf
-uphminb-h UniJIS-UTF16-H HiraMinPro-W6.otf
-uphminb-v UniJIS-UTF16-V HiraMinPro-W6.otf
-uphgothr-h UniJIS-UTF16-H HiraKakuPro-W3.otf
-uphgothr-v UniJIS-UTF16-V HiraKakuPro-W3.otf
-uphgothb-h UniJIS-UTF16-H HiraKakuPro-W6.otf
-uphgothb-v UniJIS-UTF16-V HiraKakuPro-W6.otf
-uphgotheb-h UniJIS-UTF16-H HiraKakuStd-W8.otf
-uphgotheb-v UniJIS-UTF16-V HiraKakuStd-W8.otf
-uphmgothr-h UniJIS-UTF16-H HiraMaruPro-W4.otf
-uphmgothr-v UniJIS-UTF16-V HiraMaruPro-W4.otf
-
-% TEXT, JIS04
-uphminln-h UniJIS2004-UTF16-H HiraMinPro-W2.otf
-uphminln-v UniJIS2004-UTF16-V HiraMinPro-W2.otf
-uphminrn-h UniJIS2004-UTF16-H HiraMinPro-W3.otf
-uphminrn-v UniJIS2004-UTF16-V HiraMinPro-W3.otf
-uphminbn-h UniJIS2004-UTF16-H HiraMinPro-W6.otf
-uphminbn-v UniJIS2004-UTF16-V HiraMinPro-W6.otf
-uphgothrn-h UniJIS2004-UTF16-H HiraKakuPro-W3.otf
-uphgothrn-v UniJIS2004-UTF16-V HiraKakuPro-W3.otf
-uphgothbn-h UniJIS2004-UTF16-H HiraKakuPro-W6.otf
-uphgothbn-v UniJIS2004-UTF16-V HiraKakuPro-W6.otf
-uphgothebn-h UniJIS2004-UTF16-H HiraKakuStd-W8.otf
-uphgothebn-v UniJIS2004-UTF16-V HiraKakuStd-W8.otf
-uphmgothrn-h UniJIS2004-UTF16-H HiraMaruPro-W4.otf
-uphmgothrn-v UniJIS2004-UTF16-V HiraMaruPro-W4.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/ptex-hiragino-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/ptex-hiragino-04.map
deleted file mode 100644
index c91cedd405e..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/ptex-hiragino-04.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml 2004-H HiraMinPro-W3.otf
-rmlv 2004-V HiraMinPro-W3.otf
-gbm 2004-H HiraKakuPro-W6.otf
-gbmv 2004-V HiraKakuPro-W6.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/ptex-hiragino.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/ptex-hiragino.map
deleted file mode 100644
index a5421735a80..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/ptex-hiragino.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml H HiraMinPro-W3.otf
-rmlv V HiraMinPro-W3.otf
-gbm H HiraKakuPro-W6.otf
-gbmv V HiraKakuPro-W6.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/uptex-hiragino-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/uptex-hiragino-04.map
deleted file mode 100644
index ec445a4fc5b..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/uptex-hiragino-04.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS2004-UTF16-H HiraMinPro-W3.otf
-urmlv UniJIS2004-UTF16-V HiraMinPro-W3.otf
-ugbm UniJIS2004-UTF16-H HiraKakuPro-W6.otf
-ugbmv UniJIS2004-UTF16-V HiraKakuPro-W6.otf
-uprml-h UniJIS2004-UTF16-H HiraMinPro-W3.otf
-uprml-v UniJIS2004-UTF16-V HiraMinPro-W3.otf
-upgbm-h UniJIS2004-UTF16-H HiraKakuPro-W6.otf
-upgbm-v UniJIS2004-UTF16-V HiraKakuPro-W6.otf
-uprml-hq UniJIS-UCS2-H HiraMinPro-W3.otf
-upgbm-hq UniJIS-UCS2-H HiraKakuPro-W6.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/uptex-hiragino.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/uptex-hiragino.map
deleted file mode 100644
index 2dfac238d72..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/uptex-hiragino.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS-UTF16-H HiraMinPro-W3.otf
-urmlv UniJIS-UTF16-V HiraMinPro-W3.otf
-ugbm UniJIS-UTF16-H HiraKakuPro-W6.otf
-ugbmv UniJIS-UTF16-V HiraKakuPro-W6.otf
-uprml-h UniJIS-UTF16-H HiraMinPro-W3.otf
-uprml-v UniJIS-UTF16-V HiraMinPro-W3.otf
-upgbm-h UniJIS-UTF16-H HiraKakuPro-W6.otf
-upgbm-v UniJIS-UTF16-V HiraKakuPro-W6.otf
-uprml-hq UniJIS-UCS2-H HiraMinPro-W3.otf
-upgbm-hq UniJIS-UCS2-H HiraKakuPro-W6.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/otf-ipa.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/otf-ipa.map
deleted file mode 100644
index 611554f510a..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/otf-ipa.map
+++ /dev/null
@@ -1,80 +0,0 @@
-
-% TEXT, 90JIS
-hminl-h H ipam.ttf %!PS IPAMincho
-hminl-v V ipam.ttf %!PS IPAMincho
-hminr-h H ipam.ttf %!PS IPAMincho
-hminr-v V ipam.ttf %!PS IPAMincho
-hminb-h H ipam.ttf %!PS IPAMincho
-hminb-v V ipam.ttf %!PS IPAMincho
-hgothr-h H ipag.ttf %!PS IPAGothic
-hgothr-v V ipag.ttf %!PS IPAGothic
-hgothb-h H ipag.ttf %!PS IPAGothic
-hgothb-v V ipag.ttf %!PS IPAGothic
-hgotheb-h H ipag.ttf %!PS IPAGothic
-hgotheb-v V ipag.ttf %!PS IPAGothic
-hmgothr-h H ipag.ttf %!PS IPAGothic
-hmgothr-v V ipag.ttf %!PS IPAGothic
-
-% TEXT, JIS04
-hminln-h H ipam.ttf %!PS IPAMincho
-hminln-v V ipam.ttf %!PS IPAMincho
-hminrn-h H ipam.ttf %!PS IPAMincho
-hminrn-v V ipam.ttf %!PS IPAMincho
-hminbn-h H ipam.ttf %!PS IPAMincho
-hminbn-v V ipam.ttf %!PS IPAMincho
-hgothrn-h H ipag.ttf %!PS IPAGothic
-hgothrn-v V ipag.ttf %!PS IPAGothic
-hgothbn-h H ipag.ttf %!PS IPAGothic
-hgothbn-v V ipag.ttf %!PS IPAGothic
-hgothebn-h H ipag.ttf %!PS IPAGothic
-hgothebn-v V ipag.ttf %!PS IPAGothic
-hmgothrn-h H ipag.ttf %!PS IPAGothic
-hmgothrn-v V ipag.ttf %!PS IPAGothic
-
-% CID
-otf-cjml-h Identity-H ipam.ttf/AJ16 %!PS IPAMincho
-otf-cjml-v Identity-V ipam.ttf/AJ16 %!PS IPAMincho
-otf-cjmr-h Identity-H ipam.ttf/AJ16 %!PS IPAMincho
-otf-cjmr-v Identity-V ipam.ttf/AJ16 %!PS IPAMincho
-otf-cjmb-h Identity-H ipam.ttf/AJ16 %!PS IPAMincho
-otf-cjmb-v Identity-V ipam.ttf/AJ16 %!PS IPAMincho
-otf-cjgr-h Identity-H ipag.ttf/AJ16 %!PS IPAGothic
-otf-cjgr-v Identity-V ipag.ttf/AJ16 %!PS IPAGothic
-otf-cjgb-h Identity-H ipag.ttf/AJ16 %!PS IPAGothic
-otf-cjgb-v Identity-V ipag.ttf/AJ16 %!PS IPAGothic
-otf-cjge-h Identity-H ipag.ttf/AJ16 %!PS IPAGothic
-otf-cjge-v Identity-V ipag.ttf/AJ16 %!PS IPAGothic
-otf-cjmgr-h Identity-H ipag.ttf/AJ16 %!PS IPAGothic
-otf-cjmgr-v Identity-V ipag.ttf/AJ16 %!PS IPAGothic
-
-% Unicode 90JIS
-otf-ujml-h UniJIS-UTF16-H ipam.ttf %!PS IPAMincho
-otf-ujml-v UniJIS-UTF16-V ipam.ttf %!PS IPAMincho
-otf-ujmr-h UniJIS-UTF16-H ipam.ttf %!PS IPAMincho
-otf-ujmr-v UniJIS-UTF16-V ipam.ttf %!PS IPAMincho
-otf-ujmb-h UniJIS-UTF16-H ipam.ttf %!PS IPAMincho
-otf-ujmb-v UniJIS-UTF16-V ipam.ttf %!PS IPAMincho
-otf-ujgr-h UniJIS-UTF16-H ipag.ttf %!PS IPAGothic
-otf-ujgr-v UniJIS-UTF16-V ipag.ttf %!PS IPAGothic
-otf-ujgb-h UniJIS-UTF16-H ipag.ttf %!PS IPAGothic
-otf-ujgb-v UniJIS-UTF16-V ipag.ttf %!PS IPAGothic
-otf-ujge-h UniJIS-UTF16-H ipag.ttf %!PS IPAGothic
-otf-ujge-v UniJIS-UTF16-V ipag.ttf %!PS IPAGothic
-otf-ujmgr-h UniJIS-UTF16-H ipag.ttf %!PS IPAGothic
-otf-ujmgr-v UniJIS-UTF16-V ipag.ttf %!PS IPAGothic
-
-% Unicode JIS04
-otf-ujmln-h UniJIS2004-UTF16-H ipam.ttf %!PS IPAMincho
-otf-ujmln-v UniJIS2004-UTF16-V ipam.ttf %!PS IPAMincho
-otf-ujmrn-h UniJIS2004-UTF16-H ipam.ttf %!PS IPAMincho
-otf-ujmrn-v UniJIS2004-UTF16-V ipam.ttf %!PS IPAMincho
-otf-ujmbn-h UniJIS2004-UTF16-H ipam.ttf %!PS IPAMincho
-otf-ujmbn-v UniJIS2004-UTF16-V ipam.ttf %!PS IPAMincho
-otf-ujgrn-h UniJIS2004-UTF16-H ipag.ttf %!PS IPAGothic
-otf-ujgrn-v UniJIS2004-UTF16-V ipag.ttf %!PS IPAGothic
-otf-ujgbn-h UniJIS2004-UTF16-H ipag.ttf %!PS IPAGothic
-otf-ujgbn-v UniJIS2004-UTF16-V ipag.ttf %!PS IPAGothic
-otf-ujgen-h UniJIS2004-UTF16-H ipag.ttf %!PS IPAGothic
-otf-ujgen-v UniJIS2004-UTF16-V ipag.ttf %!PS IPAGothic
-otf-ujmgrn-h UniJIS2004-UTF16-H ipag.ttf %!PS IPAGothic
-otf-ujmgrn-v UniJIS2004-UTF16-V ipag.ttf %!PS IPAGothic
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/otf-up-ipa.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/otf-up-ipa.map
deleted file mode 100644
index ef5f32ec81b..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/otf-up-ipa.map
+++ /dev/null
@@ -1,32 +0,0 @@
-
-% TEXT, 90JIS
-uphminl-h UniJIS-UTF16-H ipam.ttf %!PS IPAMincho
-uphminl-v UniJIS-UTF16-V ipam.ttf %!PS IPAMincho
-uphminr-h UniJIS-UTF16-H ipam.ttf %!PS IPAMincho
-uphminr-v UniJIS-UTF16-V ipam.ttf %!PS IPAMincho
-uphminb-h UniJIS-UTF16-H ipam.ttf %!PS IPAMincho
-uphminb-v UniJIS-UTF16-V ipam.ttf %!PS IPAMincho
-uphgothr-h UniJIS-UTF16-H ipag.ttf %!PS IPAGothic
-uphgothr-v UniJIS-UTF16-V ipag.ttf %!PS IPAGothic
-uphgothb-h UniJIS-UTF16-H ipag.ttf %!PS IPAGothic
-uphgothb-v UniJIS-UTF16-V ipag.ttf %!PS IPAGothic
-uphgotheb-h UniJIS-UTF16-H ipag.ttf %!PS IPAGothic
-uphgotheb-v UniJIS-UTF16-V ipag.ttf %!PS IPAGothic
-uphmgothr-h UniJIS-UTF16-H ipag.ttf %!PS IPAGothic
-uphmgothr-v UniJIS-UTF16-V ipag.ttf %!PS IPAGothic
-
-% TEXT, JIS04
-uphminln-h UniJIS2004-UTF16-H ipam.ttf %!PS IPAMincho
-uphminln-v UniJIS2004-UTF16-V ipam.ttf %!PS IPAMincho
-uphminrn-h UniJIS2004-UTF16-H ipam.ttf %!PS IPAMincho
-uphminrn-v UniJIS2004-UTF16-V ipam.ttf %!PS IPAMincho
-uphminbn-h UniJIS2004-UTF16-H ipam.ttf %!PS IPAMincho
-uphminbn-v UniJIS2004-UTF16-V ipam.ttf %!PS IPAMincho
-uphgothrn-h UniJIS2004-UTF16-H ipag.ttf %!PS IPAGothic
-uphgothrn-v UniJIS2004-UTF16-V ipag.ttf %!PS IPAGothic
-uphgothbn-h UniJIS2004-UTF16-H ipag.ttf %!PS IPAGothic
-uphgothbn-v UniJIS2004-UTF16-V ipag.ttf %!PS IPAGothic
-uphgothebn-h UniJIS2004-UTF16-H ipag.ttf %!PS IPAGothic
-uphgothebn-v UniJIS2004-UTF16-V ipag.ttf %!PS IPAGothic
-uphmgothrn-h UniJIS2004-UTF16-H ipag.ttf %!PS IPAGothic
-uphmgothrn-v UniJIS2004-UTF16-V ipag.ttf %!PS IPAGothic
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/ptex-ipa.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/ptex-ipa.map
deleted file mode 100644
index d1ab1809d0c..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/ptex-ipa.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml H ipam.ttf %!PS IPAMincho
-rmlv V ipam.ttf %!PS IPAMincho
-gbm H ipag.ttf %!PS IPAGothic
-gbmv V ipag.ttf %!PS IPAGothic
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/uptex-ipa.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/uptex-ipa.map
deleted file mode 100644
index 22e92e35cc4..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/uptex-ipa.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS-UTF16-H ipam.ttf %!PS IPAMincho
-urmlv UniJIS-UTF16-V ipam.ttf %!PS IPAMincho
-ugbm UniJIS-UTF16-H ipag.ttf %!PS IPAGothic
-ugbmv UniJIS-UTF16-V ipag.ttf %!PS IPAGothic
-uprml-h UniJIS-UTF16-H ipam.ttf %!PS IPAMincho
-uprml-v UniJIS-UTF16-V ipam.ttf %!PS IPAMincho
-upgbm-h UniJIS-UTF16-H ipag.ttf %!PS IPAGothic
-upgbm-v UniJIS-UTF16-V ipag.ttf %!PS IPAGothic
-uprml-hq UniJIS-UCS2-H ipam.ttf %!PS IPAMincho
-upgbm-hq UniJIS-UCS2-H ipag.ttf %!PS IPAGothic
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/otf-ipaex.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/otf-ipaex.map
deleted file mode 100644
index 02036bcd1fc..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/otf-ipaex.map
+++ /dev/null
@@ -1,80 +0,0 @@
-
-% TEXT, 90JIS
-hminl-h H ipaexm.ttf %!PS IPAexMincho
-hminl-v V ipaexm.ttf %!PS IPAexMincho
-hminr-h H ipaexm.ttf %!PS IPAexMincho
-hminr-v V ipaexm.ttf %!PS IPAexMincho
-hminb-h H ipaexm.ttf %!PS IPAexMincho
-hminb-v V ipaexm.ttf %!PS IPAexMincho
-hgothr-h H ipaexg.ttf %!PS IPAexGothic
-hgothr-v V ipaexg.ttf %!PS IPAexGothic
-hgothb-h H ipaexg.ttf %!PS IPAexGothic
-hgothb-v V ipaexg.ttf %!PS IPAexGothic
-hgotheb-h H ipaexg.ttf %!PS IPAexGothic
-hgotheb-v V ipaexg.ttf %!PS IPAexGothic
-hmgothr-h H ipaexg.ttf %!PS IPAexGothic
-hmgothr-v V ipaexg.ttf %!PS IPAexGothic
-
-% TEXT, JIS04
-hminln-h H ipaexm.ttf %!PS IPAexMincho
-hminln-v V ipaexm.ttf %!PS IPAexMincho
-hminrn-h H ipaexm.ttf %!PS IPAexMincho
-hminrn-v V ipaexm.ttf %!PS IPAexMincho
-hminbn-h H ipaexm.ttf %!PS IPAexMincho
-hminbn-v V ipaexm.ttf %!PS IPAexMincho
-hgothrn-h H ipaexg.ttf %!PS IPAexGothic
-hgothrn-v V ipaexg.ttf %!PS IPAexGothic
-hgothbn-h H ipaexg.ttf %!PS IPAexGothic
-hgothbn-v V ipaexg.ttf %!PS IPAexGothic
-hgothebn-h H ipaexg.ttf %!PS IPAexGothic
-hgothebn-v V ipaexg.ttf %!PS IPAexGothic
-hmgothrn-h H ipaexg.ttf %!PS IPAexGothic
-hmgothrn-v V ipaexg.ttf %!PS IPAexGothic
-
-% CID
-otf-cjml-h Identity-H ipaexm.ttf/AJ16 %!PS IPAexMincho
-otf-cjml-v Identity-V ipaexm.ttf/AJ16 %!PS IPAexMincho
-otf-cjmr-h Identity-H ipaexm.ttf/AJ16 %!PS IPAexMincho
-otf-cjmr-v Identity-V ipaexm.ttf/AJ16 %!PS IPAexMincho
-otf-cjmb-h Identity-H ipaexm.ttf/AJ16 %!PS IPAexMincho
-otf-cjmb-v Identity-V ipaexm.ttf/AJ16 %!PS IPAexMincho
-otf-cjgr-h Identity-H ipaexg.ttf/AJ16 %!PS IPAexGothic
-otf-cjgr-v Identity-V ipaexg.ttf/AJ16 %!PS IPAexGothic
-otf-cjgb-h Identity-H ipaexg.ttf/AJ16 %!PS IPAexGothic
-otf-cjgb-v Identity-V ipaexg.ttf/AJ16 %!PS IPAexGothic
-otf-cjge-h Identity-H ipaexg.ttf/AJ16 %!PS IPAexGothic
-otf-cjge-v Identity-V ipaexg.ttf/AJ16 %!PS IPAexGothic
-otf-cjmgr-h Identity-H ipaexg.ttf/AJ16 %!PS IPAexGothic
-otf-cjmgr-v Identity-V ipaexg.ttf/AJ16 %!PS IPAexGothic
-
-% Unicode 90JIS
-otf-ujml-h UniJIS-UTF16-H ipaexm.ttf %!PS IPAexMincho
-otf-ujml-v UniJIS-UTF16-V ipaexm.ttf %!PS IPAexMincho
-otf-ujmr-h UniJIS-UTF16-H ipaexm.ttf %!PS IPAexMincho
-otf-ujmr-v UniJIS-UTF16-V ipaexm.ttf %!PS IPAexMincho
-otf-ujmb-h UniJIS-UTF16-H ipaexm.ttf %!PS IPAexMincho
-otf-ujmb-v UniJIS-UTF16-V ipaexm.ttf %!PS IPAexMincho
-otf-ujgr-h UniJIS-UTF16-H ipaexg.ttf %!PS IPAexGothic
-otf-ujgr-v UniJIS-UTF16-V ipaexg.ttf %!PS IPAexGothic
-otf-ujgb-h UniJIS-UTF16-H ipaexg.ttf %!PS IPAexGothic
-otf-ujgb-v UniJIS-UTF16-V ipaexg.ttf %!PS IPAexGothic
-otf-ujge-h UniJIS-UTF16-H ipaexg.ttf %!PS IPAexGothic
-otf-ujge-v UniJIS-UTF16-V ipaexg.ttf %!PS IPAexGothic
-otf-ujmgr-h UniJIS-UTF16-H ipaexg.ttf %!PS IPAexGothic
-otf-ujmgr-v UniJIS-UTF16-V ipaexg.ttf %!PS IPAexGothic
-
-% Unicode JIS04
-otf-ujmln-h UniJIS2004-UTF16-H ipaexm.ttf %!PS IPAexMincho
-otf-ujmln-v UniJIS2004-UTF16-V ipaexm.ttf %!PS IPAexMincho
-otf-ujmrn-h UniJIS2004-UTF16-H ipaexm.ttf %!PS IPAexMincho
-otf-ujmrn-v UniJIS2004-UTF16-V ipaexm.ttf %!PS IPAexMincho
-otf-ujmbn-h UniJIS2004-UTF16-H ipaexm.ttf %!PS IPAexMincho
-otf-ujmbn-v UniJIS2004-UTF16-V ipaexm.ttf %!PS IPAexMincho
-otf-ujgrn-h UniJIS2004-UTF16-H ipaexg.ttf %!PS IPAexGothic
-otf-ujgrn-v UniJIS2004-UTF16-V ipaexg.ttf %!PS IPAexGothic
-otf-ujgbn-h UniJIS2004-UTF16-H ipaexg.ttf %!PS IPAexGothic
-otf-ujgbn-v UniJIS2004-UTF16-V ipaexg.ttf %!PS IPAexGothic
-otf-ujgen-h UniJIS2004-UTF16-H ipaexg.ttf %!PS IPAexGothic
-otf-ujgen-v UniJIS2004-UTF16-V ipaexg.ttf %!PS IPAexGothic
-otf-ujmgrn-h UniJIS2004-UTF16-H ipaexg.ttf %!PS IPAexGothic
-otf-ujmgrn-v UniJIS2004-UTF16-V ipaexg.ttf %!PS IPAexGothic
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/otf-up-ipaex.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/otf-up-ipaex.map
deleted file mode 100644
index 58fc9294ada..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/otf-up-ipaex.map
+++ /dev/null
@@ -1,32 +0,0 @@
-
-% TEXT, 90JIS
-uphminl-h UniJIS-UTF16-H ipaexm.ttf %!PS IPAexMincho
-uphminl-v UniJIS-UTF16-V ipaexm.ttf %!PS IPAexMincho
-uphminr-h UniJIS-UTF16-H ipaexm.ttf %!PS IPAexMincho
-uphminr-v UniJIS-UTF16-V ipaexm.ttf %!PS IPAexMincho
-uphminb-h UniJIS-UTF16-H ipaexm.ttf %!PS IPAexMincho
-uphminb-v UniJIS-UTF16-V ipaexm.ttf %!PS IPAexMincho
-uphgothr-h UniJIS-UTF16-H ipaexg.ttf %!PS IPAexGothic
-uphgothr-v UniJIS-UTF16-V ipaexg.ttf %!PS IPAexGothic
-uphgothb-h UniJIS-UTF16-H ipaexg.ttf %!PS IPAexGothic
-uphgothb-v UniJIS-UTF16-V ipaexg.ttf %!PS IPAexGothic
-uphgotheb-h UniJIS-UTF16-H ipaexg.ttf %!PS IPAexGothic
-uphgotheb-v UniJIS-UTF16-V ipaexg.ttf %!PS IPAexGothic
-uphmgothr-h UniJIS-UTF16-H ipaexg.ttf %!PS IPAexGothic
-uphmgothr-v UniJIS-UTF16-V ipaexg.ttf %!PS IPAexGothic
-
-% TEXT, JIS04
-uphminln-h UniJIS2004-UTF16-H ipaexm.ttf %!PS IPAexMincho
-uphminln-v UniJIS2004-UTF16-V ipaexm.ttf %!PS IPAexMincho
-uphminrn-h UniJIS2004-UTF16-H ipaexm.ttf %!PS IPAexMincho
-uphminrn-v UniJIS2004-UTF16-V ipaexm.ttf %!PS IPAexMincho
-uphminbn-h UniJIS2004-UTF16-H ipaexm.ttf %!PS IPAexMincho
-uphminbn-v UniJIS2004-UTF16-V ipaexm.ttf %!PS IPAexMincho
-uphgothrn-h UniJIS2004-UTF16-H ipaexg.ttf %!PS IPAexGothic
-uphgothrn-v UniJIS2004-UTF16-V ipaexg.ttf %!PS IPAexGothic
-uphgothbn-h UniJIS2004-UTF16-H ipaexg.ttf %!PS IPAexGothic
-uphgothbn-v UniJIS2004-UTF16-V ipaexg.ttf %!PS IPAexGothic
-uphgothebn-h UniJIS2004-UTF16-H ipaexg.ttf %!PS IPAexGothic
-uphgothebn-v UniJIS2004-UTF16-V ipaexg.ttf %!PS IPAexGothic
-uphmgothrn-h UniJIS2004-UTF16-H ipaexg.ttf %!PS IPAexGothic
-uphmgothrn-v UniJIS2004-UTF16-V ipaexg.ttf %!PS IPAexGothic
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/ptex-ipaex.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/ptex-ipaex.map
deleted file mode 100644
index 77e7adba347..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/ptex-ipaex.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml H ipaexm.ttf %!PS IPAexMincho
-rmlv V ipaexm.ttf %!PS IPAexMincho
-gbm H ipaexg.ttf %!PS IPAexGothic
-gbmv V ipaexg.ttf %!PS IPAexGothic
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/uptex-ipaex.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/uptex-ipaex.map
deleted file mode 100644
index 3fa3ca510b9..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/uptex-ipaex.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS-UTF16-H ipaexm.ttf %!PS IPAexMincho
-urmlv UniJIS-UTF16-V ipaexm.ttf %!PS IPAexMincho
-ugbm UniJIS-UTF16-H ipaexg.ttf %!PS IPAexGothic
-ugbmv UniJIS-UTF16-V ipaexg.ttf %!PS IPAexGothic
-uprml-h UniJIS-UTF16-H ipaexm.ttf %!PS IPAexMincho
-uprml-v UniJIS-UTF16-V ipaexm.ttf %!PS IPAexMincho
-upgbm-h UniJIS-UTF16-H ipaexg.ttf %!PS IPAexGothic
-upgbm-v UniJIS-UTF16-V ipaexg.ttf %!PS IPAexGothic
-uprml-hq UniJIS-UCS2-H ipaexm.ttf %!PS IPAexMincho
-upgbm-hq UniJIS-UCS2-H ipaexg.ttf %!PS IPAexGothic
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/otf-kozuka-pr6.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/otf-kozuka-pr6.map
deleted file mode 100644
index af409f34bc0..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/otf-kozuka-pr6.map
+++ /dev/null
@@ -1,80 +0,0 @@
-
-% TEXT, 90JIS
-hminl-h H KozMinProVI-Light.otf
-hminl-v V KozMinProVI-Light.otf
-hminr-h H KozMinProVI-Regular.otf
-hminr-v V KozMinProVI-Regular.otf
-hminb-h H KozMinProVI-Bold.otf
-hminb-v V KozMinProVI-Bold.otf
-hgothr-h H KozGoProVI-Regular.otf
-hgothr-v V KozGoProVI-Regular.otf
-hgothb-h H KozGoProVI-Bold.otf
-hgothb-v V KozGoProVI-Bold.otf
-hgotheb-h H KozGoProVI-Heavy.otf
-hgotheb-v V KozGoProVI-Heavy.otf
-hmgothr-h H KozGoProVI-Heavy.otf
-hmgothr-v V KozGoProVI-Heavy.otf
-
-% TEXT, JIS04
-hminln-h H KozMinProVI-Light.otf
-hminln-v V KozMinProVI-Light.otf
-hminrn-h H KozMinProVI-Regular.otf
-hminrn-v V KozMinProVI-Regular.otf
-hminbn-h H KozMinProVI-Bold.otf
-hminbn-v V KozMinProVI-Bold.otf
-hgothrn-h H KozGoProVI-Regular.otf
-hgothrn-v V KozGoProVI-Regular.otf
-hgothbn-h H KozGoProVI-Bold.otf
-hgothbn-v V KozGoProVI-Bold.otf
-hgothebn-h H KozGoProVI-Heavy.otf
-hgothebn-v V KozGoProVI-Heavy.otf
-hmgothrn-h H KozGoProVI-Heavy.otf
-hmgothrn-v V KozGoProVI-Heavy.otf
-
-% CID
-otf-cjml-h Identity-H KozMinProVI-Light.otf
-otf-cjml-v Identity-V KozMinProVI-Light.otf
-otf-cjmr-h Identity-H KozMinProVI-Regular.otf
-otf-cjmr-v Identity-V KozMinProVI-Regular.otf
-otf-cjmb-h Identity-H KozMinProVI-Bold.otf
-otf-cjmb-v Identity-V KozMinProVI-Bold.otf
-otf-cjgr-h Identity-H KozGoProVI-Regular.otf
-otf-cjgr-v Identity-V KozGoProVI-Regular.otf
-otf-cjgb-h Identity-H KozGoProVI-Bold.otf
-otf-cjgb-v Identity-V KozGoProVI-Bold.otf
-otf-cjge-h Identity-H KozGoProVI-Heavy.otf
-otf-cjge-v Identity-V KozGoProVI-Heavy.otf
-otf-cjmgr-h Identity-H KozGoProVI-Heavy.otf
-otf-cjmgr-v Identity-V KozGoProVI-Heavy.otf
-
-% Unicode 90JIS
-otf-ujml-h UniJIS-UTF16-H KozMinProVI-Light.otf
-otf-ujml-v UniJIS-UTF16-V KozMinProVI-Light.otf
-otf-ujmr-h UniJIS-UTF16-H KozMinProVI-Regular.otf
-otf-ujmr-v UniJIS-UTF16-V KozMinProVI-Regular.otf
-otf-ujmb-h UniJIS-UTF16-H KozMinProVI-Bold.otf
-otf-ujmb-v UniJIS-UTF16-V KozMinProVI-Bold.otf
-otf-ujgr-h UniJIS-UTF16-H KozGoProVI-Regular.otf
-otf-ujgr-v UniJIS-UTF16-V KozGoProVI-Regular.otf
-otf-ujgb-h UniJIS-UTF16-H KozGoProVI-Bold.otf
-otf-ujgb-v UniJIS-UTF16-V KozGoProVI-Bold.otf
-otf-ujge-h UniJIS-UTF16-H KozGoProVI-Heavy.otf
-otf-ujge-v UniJIS-UTF16-V KozGoProVI-Heavy.otf
-otf-ujmgr-h UniJIS-UTF16-H KozGoProVI-Heavy.otf
-otf-ujmgr-v UniJIS-UTF16-V KozGoProVI-Heavy.otf
-
-% Unicode JIS04
-otf-ujmln-h UniJIS2004-UTF16-H KozMinProVI-Light.otf
-otf-ujmln-v UniJIS2004-UTF16-V KozMinProVI-Light.otf
-otf-ujmrn-h UniJIS2004-UTF16-H KozMinProVI-Regular.otf
-otf-ujmrn-v UniJIS2004-UTF16-V KozMinProVI-Regular.otf
-otf-ujmbn-h UniJIS2004-UTF16-H KozMinProVI-Bold.otf
-otf-ujmbn-v UniJIS2004-UTF16-V KozMinProVI-Bold.otf
-otf-ujgrn-h UniJIS2004-UTF16-H KozGoProVI-Regular.otf
-otf-ujgrn-v UniJIS2004-UTF16-V KozGoProVI-Regular.otf
-otf-ujgbn-h UniJIS2004-UTF16-H KozGoProVI-Bold.otf
-otf-ujgbn-v UniJIS2004-UTF16-V KozGoProVI-Bold.otf
-otf-ujgen-h UniJIS2004-UTF16-H KozGoProVI-Heavy.otf
-otf-ujgen-v UniJIS2004-UTF16-V KozGoProVI-Heavy.otf
-otf-ujmgrn-h UniJIS2004-UTF16-H KozGoProVI-Heavy.otf
-otf-ujmgrn-v UniJIS2004-UTF16-V KozGoProVI-Heavy.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/otf-up-kozuka-pr6.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/otf-up-kozuka-pr6.map
deleted file mode 100644
index df26e786585..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/otf-up-kozuka-pr6.map
+++ /dev/null
@@ -1,32 +0,0 @@
-
-% TEXT, 90JIS
-uphminl-h UniJIS-UTF16-H KozMinProVI-Light.otf
-uphminl-v UniJIS-UTF16-V KozMinProVI-Light.otf
-uphminr-h UniJIS-UTF16-H KozMinProVI-Regular.otf
-uphminr-v UniJIS-UTF16-V KozMinProVI-Regular.otf
-uphminb-h UniJIS-UTF16-H KozMinProVI-Bold.otf
-uphminb-v UniJIS-UTF16-V KozMinProVI-Bold.otf
-uphgothr-h UniJIS-UTF16-H KozGoProVI-Regular.otf
-uphgothr-v UniJIS-UTF16-V KozGoProVI-Regular.otf
-uphgothb-h UniJIS-UTF16-H KozGoProVI-Bold.otf
-uphgothb-v UniJIS-UTF16-V KozGoProVI-Bold.otf
-uphgotheb-h UniJIS-UTF16-H KozGoProVI-Heavy.otf
-uphgotheb-v UniJIS-UTF16-V KozGoProVI-Heavy.otf
-uphmgothr-h UniJIS-UTF16-H KozGoProVI-Heavy.otf
-uphmgothr-v UniJIS-UTF16-V KozGoProVI-Heavy.otf
-
-% TEXT, JIS04
-uphminln-h UniJIS2004-UTF16-H KozMinProVI-Light.otf
-uphminln-v UniJIS2004-UTF16-V KozMinProVI-Light.otf
-uphminrn-h UniJIS2004-UTF16-H KozMinProVI-Regular.otf
-uphminrn-v UniJIS2004-UTF16-V KozMinProVI-Regular.otf
-uphminbn-h UniJIS2004-UTF16-H KozMinProVI-Bold.otf
-uphminbn-v UniJIS2004-UTF16-V KozMinProVI-Bold.otf
-uphgothrn-h UniJIS2004-UTF16-H KozGoProVI-Regular.otf
-uphgothrn-v UniJIS2004-UTF16-V KozGoProVI-Regular.otf
-uphgothbn-h UniJIS2004-UTF16-H KozGoProVI-Bold.otf
-uphgothbn-v UniJIS2004-UTF16-V KozGoProVI-Bold.otf
-uphgothebn-h UniJIS2004-UTF16-H KozGoProVI-Heavy.otf
-uphgothebn-v UniJIS2004-UTF16-V KozGoProVI-Heavy.otf
-uphmgothrn-h UniJIS2004-UTF16-H KozGoProVI-Heavy.otf
-uphmgothrn-v UniJIS2004-UTF16-V KozGoProVI-Heavy.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/ptex-kozuka-pr6-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/ptex-kozuka-pr6-04.map
deleted file mode 100644
index 419cbacd19f..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/ptex-kozuka-pr6-04.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml 2004-H KozMinProVI-Regular.otf
-rmlv 2004-V KozMinProVI-Regular.otf
-gbm 2004-H KozGoProVI-Medium.otf
-gbmv 2004-V KozGoProVI-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/ptex-kozuka-pr6.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/ptex-kozuka-pr6.map
deleted file mode 100644
index b4b281e21e0..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/ptex-kozuka-pr6.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml H KozMinProVI-Regular.otf
-rmlv V KozMinProVI-Regular.otf
-gbm H KozGoProVI-Medium.otf
-gbmv V KozGoProVI-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/uptex-kozuka-pr6-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/uptex-kozuka-pr6-04.map
deleted file mode 100644
index e8f3308d557..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/uptex-kozuka-pr6-04.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS2004-UTF16-H KozMinProVI-Regular.otf
-urmlv UniJIS2004-UTF16-V KozMinProVI-Regular.otf
-ugbm UniJIS2004-UTF16-H KozGoProVI-Medium.otf
-ugbmv UniJIS2004-UTF16-V KozGoProVI-Medium.otf
-uprml-h UniJIS2004-UTF16-H KozMinProVI-Regular.otf
-uprml-v UniJIS2004-UTF16-V KozMinProVI-Regular.otf
-upgbm-h UniJIS2004-UTF16-H KozGoProVI-Medium.otf
-upgbm-v UniJIS2004-UTF16-V KozGoProVI-Medium.otf
-uprml-hq UniJIS-UCS2-H KozMinProVI-Regular.otf
-upgbm-hq UniJIS-UCS2-H KozGoProVI-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/uptex-kozuka-pr6.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/uptex-kozuka-pr6.map
deleted file mode 100644
index 7521c9900ab..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/uptex-kozuka-pr6.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS-UTF16-H KozMinProVI-Regular.otf
-urmlv UniJIS-UTF16-V KozMinProVI-Regular.otf
-ugbm UniJIS-UTF16-H KozGoProVI-Medium.otf
-ugbmv UniJIS-UTF16-V KozGoProVI-Medium.otf
-uprml-h UniJIS-UTF16-H KozMinProVI-Regular.otf
-uprml-v UniJIS-UTF16-V KozMinProVI-Regular.otf
-upgbm-h UniJIS-UTF16-H KozGoProVI-Medium.otf
-upgbm-v UniJIS-UTF16-V KozGoProVI-Medium.otf
-uprml-hq UniJIS-UCS2-H KozMinProVI-Regular.otf
-upgbm-hq UniJIS-UCS2-H KozGoProVI-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/otf-kozuka-pr6n.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/otf-kozuka-pr6n.map
deleted file mode 100644
index b0ad481ff34..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/otf-kozuka-pr6n.map
+++ /dev/null
@@ -1,80 +0,0 @@
-
-% TEXT, 90JIS
-hminl-h H KozMinPr6N-Light.otf
-hminl-v V KozMinPr6N-Light.otf
-hminr-h H KozMinPr6N-Regular.otf
-hminr-v V KozMinPr6N-Regular.otf
-hminb-h H KozMinPr6N-Bold.otf
-hminb-v V KozMinPr6N-Bold.otf
-hgothr-h H KozGoPr6N-Regular.otf
-hgothr-v V KozGoPr6N-Regular.otf
-hgothb-h H KozGoPr6N-Bold.otf
-hgothb-v V KozGoPr6N-Bold.otf
-hgotheb-h H KozGoPr6N-Heavy.otf
-hgotheb-v V KozGoPr6N-Heavy.otf
-hmgothr-h H KozGoPr6N-Heavy.otf
-hmgothr-v V KozGoPr6N-Heavy.otf
-
-% TEXT, JIS04
-hminln-h H KozMinPr6N-Light.otf
-hminln-v V KozMinPr6N-Light.otf
-hminrn-h H KozMinPr6N-Regular.otf
-hminrn-v V KozMinPr6N-Regular.otf
-hminbn-h H KozMinPr6N-Bold.otf
-hminbn-v V KozMinPr6N-Bold.otf
-hgothrn-h H KozGoPr6N-Regular.otf
-hgothrn-v V KozGoPr6N-Regular.otf
-hgothbn-h H KozGoPr6N-Bold.otf
-hgothbn-v V KozGoPr6N-Bold.otf
-hgothebn-h H KozGoPr6N-Heavy.otf
-hgothebn-v V KozGoPr6N-Heavy.otf
-hmgothrn-h H KozGoPr6N-Heavy.otf
-hmgothrn-v V KozGoPr6N-Heavy.otf
-
-% CID
-otf-cjml-h Identity-H KozMinPr6N-Light.otf
-otf-cjml-v Identity-V KozMinPr6N-Light.otf
-otf-cjmr-h Identity-H KozMinPr6N-Regular.otf
-otf-cjmr-v Identity-V KozMinPr6N-Regular.otf
-otf-cjmb-h Identity-H KozMinPr6N-Bold.otf
-otf-cjmb-v Identity-V KozMinPr6N-Bold.otf
-otf-cjgr-h Identity-H KozGoPr6N-Regular.otf
-otf-cjgr-v Identity-V KozGoPr6N-Regular.otf
-otf-cjgb-h Identity-H KozGoPr6N-Bold.otf
-otf-cjgb-v Identity-V KozGoPr6N-Bold.otf
-otf-cjge-h Identity-H KozGoPr6N-Heavy.otf
-otf-cjge-v Identity-V KozGoPr6N-Heavy.otf
-otf-cjmgr-h Identity-H KozGoPr6N-Heavy.otf
-otf-cjmgr-v Identity-V KozGoPr6N-Heavy.otf
-
-% Unicode 90JIS
-otf-ujml-h UniJIS-UTF16-H KozMinPr6N-Light.otf
-otf-ujml-v UniJIS-UTF16-V KozMinPr6N-Light.otf
-otf-ujmr-h UniJIS-UTF16-H KozMinPr6N-Regular.otf
-otf-ujmr-v UniJIS-UTF16-V KozMinPr6N-Regular.otf
-otf-ujmb-h UniJIS-UTF16-H KozMinPr6N-Bold.otf
-otf-ujmb-v UniJIS-UTF16-V KozMinPr6N-Bold.otf
-otf-ujgr-h UniJIS-UTF16-H KozGoPr6N-Regular.otf
-otf-ujgr-v UniJIS-UTF16-V KozGoPr6N-Regular.otf
-otf-ujgb-h UniJIS-UTF16-H KozGoPr6N-Bold.otf
-otf-ujgb-v UniJIS-UTF16-V KozGoPr6N-Bold.otf
-otf-ujge-h UniJIS-UTF16-H KozGoPr6N-Heavy.otf
-otf-ujge-v UniJIS-UTF16-V KozGoPr6N-Heavy.otf
-otf-ujmgr-h UniJIS-UTF16-H KozGoPr6N-Heavy.otf
-otf-ujmgr-v UniJIS-UTF16-V KozGoPr6N-Heavy.otf
-
-% Unicode JIS04
-otf-ujmln-h UniJIS2004-UTF16-H KozMinPr6N-Light.otf
-otf-ujmln-v UniJIS2004-UTF16-V KozMinPr6N-Light.otf
-otf-ujmrn-h UniJIS2004-UTF16-H KozMinPr6N-Regular.otf
-otf-ujmrn-v UniJIS2004-UTF16-V KozMinPr6N-Regular.otf
-otf-ujmbn-h UniJIS2004-UTF16-H KozMinPr6N-Bold.otf
-otf-ujmbn-v UniJIS2004-UTF16-V KozMinPr6N-Bold.otf
-otf-ujgrn-h UniJIS2004-UTF16-H KozGoPr6N-Regular.otf
-otf-ujgrn-v UniJIS2004-UTF16-V KozGoPr6N-Regular.otf
-otf-ujgbn-h UniJIS2004-UTF16-H KozGoPr6N-Bold.otf
-otf-ujgbn-v UniJIS2004-UTF16-V KozGoPr6N-Bold.otf
-otf-ujgen-h UniJIS2004-UTF16-H KozGoPr6N-Heavy.otf
-otf-ujgen-v UniJIS2004-UTF16-V KozGoPr6N-Heavy.otf
-otf-ujmgrn-h UniJIS2004-UTF16-H KozGoPr6N-Heavy.otf
-otf-ujmgrn-v UniJIS2004-UTF16-V KozGoPr6N-Heavy.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/otf-up-kozuka-pr6n.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/otf-up-kozuka-pr6n.map
deleted file mode 100644
index 4d747238928..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/otf-up-kozuka-pr6n.map
+++ /dev/null
@@ -1,32 +0,0 @@
-
-% TEXT, 90JIS
-uphminl-h UniJIS-UTF16-H KozMinPr6N-Light.otf
-uphminl-v UniJIS-UTF16-V KozMinPr6N-Light.otf
-uphminr-h UniJIS-UTF16-H KozMinPr6N-Regular.otf
-uphminr-v UniJIS-UTF16-V KozMinPr6N-Regular.otf
-uphminb-h UniJIS-UTF16-H KozMinPr6N-Bold.otf
-uphminb-v UniJIS-UTF16-V KozMinPr6N-Bold.otf
-uphgothr-h UniJIS-UTF16-H KozGoPr6N-Regular.otf
-uphgothr-v UniJIS-UTF16-V KozGoPr6N-Regular.otf
-uphgothb-h UniJIS-UTF16-H KozGoPr6N-Bold.otf
-uphgothb-v UniJIS-UTF16-V KozGoPr6N-Bold.otf
-uphgotheb-h UniJIS-UTF16-H KozGoPr6N-Heavy.otf
-uphgotheb-v UniJIS-UTF16-V KozGoPr6N-Heavy.otf
-uphmgothr-h UniJIS-UTF16-H KozGoPr6N-Heavy.otf
-uphmgothr-v UniJIS-UTF16-V KozGoPr6N-Heavy.otf
-
-% TEXT, JIS04
-uphminln-h UniJIS2004-UTF16-H KozMinPr6N-Light.otf
-uphminln-v UniJIS2004-UTF16-V KozMinPr6N-Light.otf
-uphminrn-h UniJIS2004-UTF16-H KozMinPr6N-Regular.otf
-uphminrn-v UniJIS2004-UTF16-V KozMinPr6N-Regular.otf
-uphminbn-h UniJIS2004-UTF16-H KozMinPr6N-Bold.otf
-uphminbn-v UniJIS2004-UTF16-V KozMinPr6N-Bold.otf
-uphgothrn-h UniJIS2004-UTF16-H KozGoPr6N-Regular.otf
-uphgothrn-v UniJIS2004-UTF16-V KozGoPr6N-Regular.otf
-uphgothbn-h UniJIS2004-UTF16-H KozGoPr6N-Bold.otf
-uphgothbn-v UniJIS2004-UTF16-V KozGoPr6N-Bold.otf
-uphgothebn-h UniJIS2004-UTF16-H KozGoPr6N-Heavy.otf
-uphgothebn-v UniJIS2004-UTF16-V KozGoPr6N-Heavy.otf
-uphmgothrn-h UniJIS2004-UTF16-H KozGoPr6N-Heavy.otf
-uphmgothrn-v UniJIS2004-UTF16-V KozGoPr6N-Heavy.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/ptex-kozuka-pr6n-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/ptex-kozuka-pr6n-04.map
deleted file mode 100644
index ba254ca7c03..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/ptex-kozuka-pr6n-04.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml 2004-H KozMinPr6N-Regular.otf
-rmlv 2004-V KozMinPr6N-Regular.otf
-gbm 2004-H KozGoPr6N-Medium.otf
-gbmv 2004-V KozGoPr6N-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/ptex-kozuka-pr6n.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/ptex-kozuka-pr6n.map
deleted file mode 100644
index 03272e2b87a..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/ptex-kozuka-pr6n.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml H KozMinPr6N-Regular.otf
-rmlv V KozMinPr6N-Regular.otf
-gbm H KozGoPr6N-Medium.otf
-gbmv V KozGoPr6N-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/uptex-kozuka-pr6n-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/uptex-kozuka-pr6n-04.map
deleted file mode 100644
index a5d0e7de04d..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/uptex-kozuka-pr6n-04.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS2004-UTF16-H KozMinPr6N-Regular.otf
-urmlv UniJIS2004-UTF16-V KozMinPr6N-Regular.otf
-ugbm UniJIS2004-UTF16-H KozGoPr6N-Medium.otf
-ugbmv UniJIS2004-UTF16-V KozGoPr6N-Medium.otf
-uprml-h UniJIS2004-UTF16-H KozMinPr6N-Regular.otf
-uprml-v UniJIS2004-UTF16-V KozMinPr6N-Regular.otf
-upgbm-h UniJIS2004-UTF16-H KozGoPr6N-Medium.otf
-upgbm-v UniJIS2004-UTF16-V KozGoPr6N-Medium.otf
-uprml-hq UniJIS-UCS2-H KozMinPr6N-Regular.otf
-upgbm-hq UniJIS-UCS2-H KozGoPr6N-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/uptex-kozuka-pr6n.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/uptex-kozuka-pr6n.map
deleted file mode 100644
index 7210d879ab5..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/uptex-kozuka-pr6n.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS-UTF16-H KozMinPr6N-Regular.otf
-urmlv UniJIS-UTF16-V KozMinPr6N-Regular.otf
-ugbm UniJIS-UTF16-H KozGoPr6N-Medium.otf
-ugbmv UniJIS-UTF16-V KozGoPr6N-Medium.otf
-uprml-h UniJIS-UTF16-H KozMinPr6N-Regular.otf
-uprml-v UniJIS-UTF16-V KozMinPr6N-Regular.otf
-upgbm-h UniJIS-UTF16-H KozGoPr6N-Medium.otf
-upgbm-v UniJIS-UTF16-V KozGoPr6N-Medium.otf
-uprml-hq UniJIS-UCS2-H KozMinPr6N-Regular.otf
-upgbm-hq UniJIS-UCS2-H KozGoPr6N-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/otf-kozuka.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/otf-kozuka.map
deleted file mode 100644
index 46630111453..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/otf-kozuka.map
+++ /dev/null
@@ -1,80 +0,0 @@
-
-% TEXT, 90JIS
-hminl-h H KozMinPro-Light.otf
-hminl-v V KozMinPro-Light.otf
-hminr-h H KozMinPro-Regular.otf
-hminr-v V KozMinPro-Regular.otf
-hminb-h H KozMinPro-Bold.otf
-hminb-v V KozMinPro-Bold.otf
-hgothr-h H KozGoPro-Regular.otf
-hgothr-v V KozGoPro-Regular.otf
-hgothb-h H KozGoPro-Bold.otf
-hgothb-v V KozGoPro-Bold.otf
-hgotheb-h H KozGoPro-Heavy.otf
-hgotheb-v V KozGoPro-Heavy.otf
-hmgothr-h H KozGoPro-Heavy.otf
-hmgothr-v V KozGoPro-Heavy.otf
-
-% TEXT, JIS04
-hminln-h H KozMinPro-Light.otf
-hminln-v V KozMinPro-Light.otf
-hminrn-h H KozMinPro-Regular.otf
-hminrn-v V KozMinPro-Regular.otf
-hminbn-h H KozMinPro-Bold.otf
-hminbn-v V KozMinPro-Bold.otf
-hgothrn-h H KozGoPro-Regular.otf
-hgothrn-v V KozGoPro-Regular.otf
-hgothbn-h H KozGoPro-Bold.otf
-hgothbn-v V KozGoPro-Bold.otf
-hgothebn-h H KozGoPro-Heavy.otf
-hgothebn-v V KozGoPro-Heavy.otf
-hmgothrn-h H KozGoPro-Heavy.otf
-hmgothrn-v V KozGoPro-Heavy.otf
-
-% CID
-otf-cjml-h Identity-H KozMinPro-Light.otf
-otf-cjml-v Identity-V KozMinPro-Light.otf
-otf-cjmr-h Identity-H KozMinPro-Regular.otf
-otf-cjmr-v Identity-V KozMinPro-Regular.otf
-otf-cjmb-h Identity-H KozMinPro-Bold.otf
-otf-cjmb-v Identity-V KozMinPro-Bold.otf
-otf-cjgr-h Identity-H KozGoPro-Regular.otf
-otf-cjgr-v Identity-V KozGoPro-Regular.otf
-otf-cjgb-h Identity-H KozGoPro-Bold.otf
-otf-cjgb-v Identity-V KozGoPro-Bold.otf
-otf-cjge-h Identity-H KozGoPro-Heavy.otf
-otf-cjge-v Identity-V KozGoPro-Heavy.otf
-otf-cjmgr-h Identity-H KozGoPro-Heavy.otf
-otf-cjmgr-v Identity-V KozGoPro-Heavy.otf
-
-% Unicode 90JIS
-otf-ujml-h UniJIS-UTF16-H KozMinPro-Light.otf
-otf-ujml-v UniJIS-UTF16-V KozMinPro-Light.otf
-otf-ujmr-h UniJIS-UTF16-H KozMinPro-Regular.otf
-otf-ujmr-v UniJIS-UTF16-V KozMinPro-Regular.otf
-otf-ujmb-h UniJIS-UTF16-H KozMinPro-Bold.otf
-otf-ujmb-v UniJIS-UTF16-V KozMinPro-Bold.otf
-otf-ujgr-h UniJIS-UTF16-H KozGoPro-Regular.otf
-otf-ujgr-v UniJIS-UTF16-V KozGoPro-Regular.otf
-otf-ujgb-h UniJIS-UTF16-H KozGoPro-Bold.otf
-otf-ujgb-v UniJIS-UTF16-V KozGoPro-Bold.otf
-otf-ujge-h UniJIS-UTF16-H KozGoPro-Heavy.otf
-otf-ujge-v UniJIS-UTF16-V KozGoPro-Heavy.otf
-otf-ujmgr-h UniJIS-UTF16-H KozGoPro-Heavy.otf
-otf-ujmgr-v UniJIS-UTF16-V KozGoPro-Heavy.otf
-
-% Unicode JIS04
-otf-ujmln-h UniJIS2004-UTF16-H KozMinPro-Light.otf
-otf-ujmln-v UniJIS2004-UTF16-V KozMinPro-Light.otf
-otf-ujmrn-h UniJIS2004-UTF16-H KozMinPro-Regular.otf
-otf-ujmrn-v UniJIS2004-UTF16-V KozMinPro-Regular.otf
-otf-ujmbn-h UniJIS2004-UTF16-H KozMinPro-Bold.otf
-otf-ujmbn-v UniJIS2004-UTF16-V KozMinPro-Bold.otf
-otf-ujgrn-h UniJIS2004-UTF16-H KozGoPro-Regular.otf
-otf-ujgrn-v UniJIS2004-UTF16-V KozGoPro-Regular.otf
-otf-ujgbn-h UniJIS2004-UTF16-H KozGoPro-Bold.otf
-otf-ujgbn-v UniJIS2004-UTF16-V KozGoPro-Bold.otf
-otf-ujgen-h UniJIS2004-UTF16-H KozGoPro-Heavy.otf
-otf-ujgen-v UniJIS2004-UTF16-V KozGoPro-Heavy.otf
-otf-ujmgrn-h UniJIS2004-UTF16-H KozGoPro-Heavy.otf
-otf-ujmgrn-v UniJIS2004-UTF16-V KozGoPro-Heavy.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/otf-up-kozuka.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/otf-up-kozuka.map
deleted file mode 100644
index 02fbed2d9f1..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/otf-up-kozuka.map
+++ /dev/null
@@ -1,32 +0,0 @@
-
-% TEXT, 90JIS
-uphminl-h UniJIS-UTF16-H KozMinPro-Light.otf
-uphminl-v UniJIS-UTF16-V KozMinPro-Light.otf
-uphminr-h UniJIS-UTF16-H KozMinPro-Regular.otf
-uphminr-v UniJIS-UTF16-V KozMinPro-Regular.otf
-uphminb-h UniJIS-UTF16-H KozMinPro-Bold.otf
-uphminb-v UniJIS-UTF16-V KozMinPro-Bold.otf
-uphgothr-h UniJIS-UTF16-H KozGoPro-Regular.otf
-uphgothr-v UniJIS-UTF16-V KozGoPro-Regular.otf
-uphgothb-h UniJIS-UTF16-H KozGoPro-Bold.otf
-uphgothb-v UniJIS-UTF16-V KozGoPro-Bold.otf
-uphgotheb-h UniJIS-UTF16-H KozGoPro-Heavy.otf
-uphgotheb-v UniJIS-UTF16-V KozGoPro-Heavy.otf
-uphmgothr-h UniJIS-UTF16-H KozGoPro-Heavy.otf
-uphmgothr-v UniJIS-UTF16-V KozGoPro-Heavy.otf
-
-% TEXT, JIS04
-uphminln-h UniJIS2004-UTF16-H KozMinPro-Light.otf
-uphminln-v UniJIS2004-UTF16-V KozMinPro-Light.otf
-uphminrn-h UniJIS2004-UTF16-H KozMinPro-Regular.otf
-uphminrn-v UniJIS2004-UTF16-V KozMinPro-Regular.otf
-uphminbn-h UniJIS2004-UTF16-H KozMinPro-Bold.otf
-uphminbn-v UniJIS2004-UTF16-V KozMinPro-Bold.otf
-uphgothrn-h UniJIS2004-UTF16-H KozGoPro-Regular.otf
-uphgothrn-v UniJIS2004-UTF16-V KozGoPro-Regular.otf
-uphgothbn-h UniJIS2004-UTF16-H KozGoPro-Bold.otf
-uphgothbn-v UniJIS2004-UTF16-V KozGoPro-Bold.otf
-uphgothebn-h UniJIS2004-UTF16-H KozGoPro-Heavy.otf
-uphgothebn-v UniJIS2004-UTF16-V KozGoPro-Heavy.otf
-uphmgothrn-h UniJIS2004-UTF16-H KozGoPro-Heavy.otf
-uphmgothrn-v UniJIS2004-UTF16-V KozGoPro-Heavy.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/ptex-kozuka-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/ptex-kozuka-04.map
deleted file mode 100644
index 83c0241abfd..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/ptex-kozuka-04.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml 2004-H KozMinPro-Regular.otf
-rmlv 2004-V KozMinPro-Regular.otf
-gbm 2004-H KozGoPro-Medium.otf
-gbmv 2004-V KozGoPro-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/ptex-kozuka.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/ptex-kozuka.map
deleted file mode 100644
index 8f3158e513a..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/ptex-kozuka.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml H KozMinPro-Regular.otf
-rmlv V KozMinPro-Regular.otf
-gbm H KozGoPro-Medium.otf
-gbmv V KozGoPro-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/uptex-kozuka-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/uptex-kozuka-04.map
deleted file mode 100644
index 0b647bf3807..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/uptex-kozuka-04.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS2004-UTF16-H KozMinPro-Regular.otf
-urmlv UniJIS2004-UTF16-V KozMinPro-Regular.otf
-ugbm UniJIS2004-UTF16-H KozGoPro-Medium.otf
-ugbmv UniJIS2004-UTF16-V KozGoPro-Medium.otf
-uprml-h UniJIS2004-UTF16-H KozMinPro-Regular.otf
-uprml-v UniJIS2004-UTF16-V KozMinPro-Regular.otf
-upgbm-h UniJIS2004-UTF16-H KozGoPro-Medium.otf
-upgbm-v UniJIS2004-UTF16-V KozGoPro-Medium.otf
-uprml-hq UniJIS-UCS2-H KozMinPro-Regular.otf
-upgbm-hq UniJIS-UCS2-H KozGoPro-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/uptex-kozuka.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/uptex-kozuka.map
deleted file mode 100644
index fde211af58f..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/uptex-kozuka.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS-UTF16-H KozMinPro-Regular.otf
-urmlv UniJIS-UTF16-V KozMinPro-Regular.otf
-ugbm UniJIS-UTF16-H KozGoPro-Medium.otf
-ugbmv UniJIS-UTF16-V KozGoPro-Medium.otf
-uprml-h UniJIS-UTF16-H KozMinPro-Regular.otf
-uprml-v UniJIS-UTF16-V KozMinPro-Regular.otf
-upgbm-h UniJIS-UTF16-H KozGoPro-Medium.otf
-upgbm-v UniJIS-UTF16-V KozGoPro-Medium.otf
-uprml-hq UniJIS-UCS2-H KozMinPro-Regular.otf
-upgbm-hq UniJIS-UCS2-H KozGoPro-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/otf-morisawa-pr6n.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/otf-morisawa-pr6n.map
deleted file mode 100644
index b9693f80c09..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/otf-morisawa-pr6n.map
+++ /dev/null
@@ -1,80 +0,0 @@
-
-% TEXT, 90JIS
-hminl-h H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-hminl-v V A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-hminr-h H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-hminr-v V A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-hminb-h H A-OTF-FutoMinA101Pr6N-Bold.otf %!PS FutoMinA101Pr6N-Bold
-hminb-v V A-OTF-FutoMinA101Pr6N-Bold.otf %!PS FutoMinA101Pr6N-Bold
-hgothr-h H A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
-hgothr-v V A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
-hgothb-h H A-OTF-FutoGoB101Pr6N-Bold.otf %!PS FutoGoB101Pr6N-Bold
-hgothb-v V A-OTF-FutoGoB101Pr6N-Bold.otf %!PS FutoGoB101Pr6N-Bold
-hgotheb-h H A-OTF-MidashiGoPr6N-MB31.otf %!PS MidashiGoPr6N-MB31
-hgotheb-v V A-OTF-MidashiGoPr6N-MB31.otf %!PS MidashiGoPr6N-MB31
-hmgothr-h H A-OTF-ShinMGoPr6N-Light.otf %!PS ShinMGoPr6N-Light
-hmgothr-v V A-OTF-ShinMGoPr6N-Light.otf %!PS ShinMGoPr6N-Light
-
-% TEXT, JIS04
-hminln-h H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-hminln-v V A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-hminrn-h H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-hminrn-v V A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-hminbn-h H A-OTF-FutoMinA101Pr6N-Bold.otf %!PS FutoMinA101Pr6N-Bold
-hminbn-v V A-OTF-FutoMinA101Pr6N-Bold.otf %!PS FutoMinA101Pr6N-Bold
-hgothrn-h H A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
-hgothrn-v V A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
-hgothbn-h H A-OTF-FutoGoB101Pr6N-Bold.otf %!PS FutoGoB101Pr6N-Bold
-hgothbn-v V A-OTF-FutoGoB101Pr6N-Bold.otf %!PS FutoGoB101Pr6N-Bold
-hgothebn-h H A-OTF-MidashiGoPr6N-MB31.otf %!PS MidashiGoPr6N-MB31
-hgothebn-v V A-OTF-MidashiGoPr6N-MB31.otf %!PS MidashiGoPr6N-MB31
-hmgothrn-h H A-OTF-ShinMGoPr6N-Light.otf %!PS ShinMGoPr6N-Light
-hmgothrn-v V A-OTF-ShinMGoPr6N-Light.otf %!PS ShinMGoPr6N-Light
-
-% CID
-otf-cjml-h Identity-H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-otf-cjml-v Identity-V A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-otf-cjmr-h Identity-H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-otf-cjmr-v Identity-V A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-otf-cjmb-h Identity-H A-OTF-FutoMinA101Pr6N-Bold.otf %!PS FutoMinA101Pr6N-Bold
-otf-cjmb-v Identity-V A-OTF-FutoMinA101Pr6N-Bold.otf %!PS FutoMinA101Pr6N-Bold
-otf-cjgr-h Identity-H A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
-otf-cjgr-v Identity-V A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
-otf-cjgb-h Identity-H A-OTF-FutoGoB101Pr6N-Bold.otf %!PS FutoGoB101Pr6N-Bold
-otf-cjgb-v Identity-V A-OTF-FutoGoB101Pr6N-Bold.otf %!PS FutoGoB101Pr6N-Bold
-otf-cjge-h Identity-H A-OTF-MidashiGoPr6N-MB31.otf %!PS MidashiGoPr6N-MB31
-otf-cjge-v Identity-V A-OTF-MidashiGoPr6N-MB31.otf %!PS MidashiGoPr6N-MB31
-otf-cjmgr-h Identity-H A-OTF-ShinMGoPr6N-Light.otf %!PS ShinMGoPr6N-Light
-otf-cjmgr-v Identity-V A-OTF-ShinMGoPr6N-Light.otf %!PS ShinMGoPr6N-Light
-
-% Unicode 90JIS
-otf-ujml-h UniJIS-UTF16-H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-otf-ujml-v UniJIS-UTF16-V A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-otf-ujmr-h UniJIS-UTF16-H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-otf-ujmr-v UniJIS-UTF16-V A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-otf-ujmb-h UniJIS-UTF16-H A-OTF-FutoMinA101Pr6N-Bold.otf %!PS FutoMinA101Pr6N-Bold
-otf-ujmb-v UniJIS-UTF16-V A-OTF-FutoMinA101Pr6N-Bold.otf %!PS FutoMinA101Pr6N-Bold
-otf-ujgr-h UniJIS-UTF16-H A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
-otf-ujgr-v UniJIS-UTF16-V A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
-otf-ujgb-h UniJIS-UTF16-H A-OTF-FutoGoB101Pr6N-Bold.otf %!PS FutoGoB101Pr6N-Bold
-otf-ujgb-v UniJIS-UTF16-V A-OTF-FutoGoB101Pr6N-Bold.otf %!PS FutoGoB101Pr6N-Bold
-otf-ujge-h UniJIS-UTF16-H A-OTF-MidashiGoPr6N-MB31.otf %!PS MidashiGoPr6N-MB31
-otf-ujge-v UniJIS-UTF16-V A-OTF-MidashiGoPr6N-MB31.otf %!PS MidashiGoPr6N-MB31
-otf-ujmgr-h UniJIS-UTF16-H A-OTF-ShinMGoPr6N-Light.otf %!PS ShinMGoPr6N-Light
-otf-ujmgr-v UniJIS-UTF16-V A-OTF-ShinMGoPr6N-Light.otf %!PS ShinMGoPr6N-Light
-
-% Unicode JIS04
-otf-ujmln-h UniJIS2004-UTF16-H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-otf-ujmln-v UniJIS2004-UTF16-V A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-otf-ujmrn-h UniJIS2004-UTF16-H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-otf-ujmrn-v UniJIS2004-UTF16-V A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-otf-ujmbn-h UniJIS2004-UTF16-H A-OTF-FutoMinA101Pr6N-Bold.otf %!PS FutoMinA101Pr6N-Bold
-otf-ujmbn-v UniJIS2004-UTF16-V A-OTF-FutoMinA101Pr6N-Bold.otf %!PS FutoMinA101Pr6N-Bold
-otf-ujgrn-h UniJIS2004-UTF16-H A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
-otf-ujgrn-v UniJIS2004-UTF16-V A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
-otf-ujgbn-h UniJIS2004-UTF16-H A-OTF-FutoGoB101Pr6N-Bold.otf %!PS FutoGoB101Pr6N-Bold
-otf-ujgbn-v UniJIS2004-UTF16-V A-OTF-FutoGoB101Pr6N-Bold.otf %!PS FutoGoB101Pr6N-Bold
-otf-ujgen-h UniJIS2004-UTF16-H A-OTF-MidashiGoPr6N-MB31.otf %!PS MidashiGoPr6N-MB31
-otf-ujgen-v UniJIS2004-UTF16-V A-OTF-MidashiGoPr6N-MB31.otf %!PS MidashiGoPr6N-MB31
-otf-ujmgrn-h UniJIS2004-UTF16-H A-OTF-ShinMGoPr6N-Light.otf %!PS ShinMGoPr6N-Light
-otf-ujmgrn-v UniJIS2004-UTF16-V A-OTF-ShinMGoPr6N-Light.otf %!PS ShinMGoPr6N-Light
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/otf-up-morisawa-pr6n.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/otf-up-morisawa-pr6n.map
deleted file mode 100644
index c1cd7c8e02e..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/otf-up-morisawa-pr6n.map
+++ /dev/null
@@ -1,32 +0,0 @@
-
-% TEXT, 90JIS
-uphminl-h UniJIS-UTF16-H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-uphminl-v UniJIS-UTF16-V A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-uphminr-h UniJIS-UTF16-H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-uphminr-v UniJIS-UTF16-V A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-uphminb-h UniJIS-UTF16-H A-OTF-FutoMinA101Pr6N-Bold.otf %!PS FutoMinA101Pr6N-Bold
-uphminb-v UniJIS-UTF16-V A-OTF-FutoMinA101Pr6N-Bold.otf %!PS FutoMinA101Pr6N-Bold
-uphgothr-h UniJIS-UTF16-H A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
-uphgothr-v UniJIS-UTF16-V A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
-uphgothb-h UniJIS-UTF16-H A-OTF-FutoGoB101Pr6N-Bold.otf %!PS FutoGoB101Pr6N-Bold
-uphgothb-v UniJIS-UTF16-V A-OTF-FutoGoB101Pr6N-Bold.otf %!PS FutoGoB101Pr6N-Bold
-uphgotheb-h UniJIS-UTF16-H A-OTF-MidashiGoPr6N-MB31.otf %!PS MidashiGoPr6N-MB31
-uphgotheb-v UniJIS-UTF16-V A-OTF-MidashiGoPr6N-MB31.otf %!PS MidashiGoPr6N-MB31
-uphmgothr-h UniJIS-UTF16-H A-OTF-ShinMGoPr6N-Light.otf %!PS ShinMGoPr6N-Light
-uphmgothr-v UniJIS-UTF16-V A-OTF-ShinMGoPr6N-Light.otf %!PS ShinMGoPr6N-Light
-
-% TEXT, JIS04
-uphminln-h UniJIS2004-UTF16-H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-uphminln-v UniJIS2004-UTF16-V A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-uphminrn-h UniJIS2004-UTF16-H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-uphminrn-v UniJIS2004-UTF16-V A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-uphminbn-h UniJIS2004-UTF16-H A-OTF-FutoMinA101Pr6N-Bold.otf %!PS FutoMinA101Pr6N-Bold
-uphminbn-v UniJIS2004-UTF16-V A-OTF-FutoMinA101Pr6N-Bold.otf %!PS FutoMinA101Pr6N-Bold
-uphgothrn-h UniJIS2004-UTF16-H A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
-uphgothrn-v UniJIS2004-UTF16-V A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
-uphgothbn-h UniJIS2004-UTF16-H A-OTF-FutoGoB101Pr6N-Bold.otf %!PS FutoGoB101Pr6N-Bold
-uphgothbn-v UniJIS2004-UTF16-V A-OTF-FutoGoB101Pr6N-Bold.otf %!PS FutoGoB101Pr6N-Bold
-uphgothebn-h UniJIS2004-UTF16-H A-OTF-MidashiGoPr6N-MB31.otf %!PS MidashiGoPr6N-MB31
-uphgothebn-v UniJIS2004-UTF16-V A-OTF-MidashiGoPr6N-MB31.otf %!PS MidashiGoPr6N-MB31
-uphmgothrn-h UniJIS2004-UTF16-H A-OTF-ShinMGoPr6N-Light.otf %!PS ShinMGoPr6N-Light
-uphmgothrn-v UniJIS2004-UTF16-V A-OTF-ShinMGoPr6N-Light.otf %!PS ShinMGoPr6N-Light
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/ptex-morisawa-pr6n-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/ptex-morisawa-pr6n-04.map
deleted file mode 100644
index 7138d023e08..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/ptex-morisawa-pr6n-04.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml 2004-H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-rmlv 2004-V A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-gbm 2004-H A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
-gbmv 2004-V A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/ptex-morisawa-pr6n.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/ptex-morisawa-pr6n.map
deleted file mode 100644
index fb7d625d2c3..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/ptex-morisawa-pr6n.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-rmlv V A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-gbm H A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
-gbmv V A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/uptex-morisawa-pr6n-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/uptex-morisawa-pr6n-04.map
deleted file mode 100644
index 54f10e7272b..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/uptex-morisawa-pr6n-04.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS2004-UTF16-H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-urmlv UniJIS2004-UTF16-V A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-ugbm UniJIS2004-UTF16-H A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
-ugbmv UniJIS2004-UTF16-V A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
-uprml-h UniJIS2004-UTF16-H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-uprml-v UniJIS2004-UTF16-V A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-upgbm-h UniJIS2004-UTF16-H A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
-upgbm-v UniJIS2004-UTF16-V A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
-uprml-hq UniJIS-UCS2-H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-upgbm-hq UniJIS-UCS2-H A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/uptex-morisawa-pr6n.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/uptex-morisawa-pr6n.map
deleted file mode 100644
index d239a660e3a..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/uptex-morisawa-pr6n.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS-UTF16-H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-urmlv UniJIS-UTF16-V A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-ugbm UniJIS-UTF16-H A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
-ugbmv UniJIS-UTF16-V A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
-uprml-h UniJIS-UTF16-H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-uprml-v UniJIS-UTF16-V A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-upgbm-h UniJIS-UTF16-H A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
-upgbm-v UniJIS-UTF16-V A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
-uprml-hq UniJIS-UCS2-H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
-upgbm-hq UniJIS-UCS2-H A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/otf-morisawa.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/otf-morisawa.map
deleted file mode 100644
index c8e1fdee340..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/otf-morisawa.map
+++ /dev/null
@@ -1,80 +0,0 @@
-
-% TEXT, 90JIS
-hminl-h H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-hminl-v V A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-hminr-h H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-hminr-v V A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-hminb-h H A-OTF-FutoMinA101Pro-Bold.otf %!PS FutoMinA101Pro-Bold
-hminb-v V A-OTF-FutoMinA101Pro-Bold.otf %!PS FutoMinA101Pro-Bold
-hgothr-h H A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
-hgothr-v V A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
-hgothb-h H A-OTF-FutoGoB101Pro-Bold.otf %!PS FutoGoB101Pro-Bold
-hgothb-v V A-OTF-FutoGoB101Pro-Bold.otf %!PS FutoGoB101Pro-Bold
-hgotheb-h H A-OTF-MidashiGoPro-MB31.otf %!PS MidashiGoPro-MB31
-hgotheb-v V A-OTF-MidashiGoPro-MB31.otf %!PS MidashiGoPro-MB31
-hmgothr-h H A-OTF-Jun101Pro-Light.otf %!PS Jun101Pro-Light
-hmgothr-v V A-OTF-Jun101Pro-Light.otf %!PS Jun101Pro-Light
-
-% TEXT, JIS04
-hminln-h H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-hminln-v V A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-hminrn-h H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-hminrn-v V A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-hminbn-h H A-OTF-FutoMinA101Pro-Bold.otf %!PS FutoMinA101Pro-Bold
-hminbn-v V A-OTF-FutoMinA101Pro-Bold.otf %!PS FutoMinA101Pro-Bold
-hgothrn-h H A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
-hgothrn-v V A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
-hgothbn-h H A-OTF-FutoGoB101Pro-Bold.otf %!PS FutoGoB101Pro-Bold
-hgothbn-v V A-OTF-FutoGoB101Pro-Bold.otf %!PS FutoGoB101Pro-Bold
-hgothebn-h H A-OTF-MidashiGoPro-MB31.otf %!PS MidashiGoPro-MB31
-hgothebn-v V A-OTF-MidashiGoPro-MB31.otf %!PS MidashiGoPro-MB31
-hmgothrn-h H A-OTF-Jun101Pro-Light.otf %!PS Jun101Pro-Light
-hmgothrn-v V A-OTF-Jun101Pro-Light.otf %!PS Jun101Pro-Light
-
-% CID
-otf-cjml-h Identity-H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-otf-cjml-v Identity-V A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-otf-cjmr-h Identity-H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-otf-cjmr-v Identity-V A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-otf-cjmb-h Identity-H A-OTF-FutoMinA101Pro-Bold.otf %!PS FutoMinA101Pro-Bold
-otf-cjmb-v Identity-V A-OTF-FutoMinA101Pro-Bold.otf %!PS FutoMinA101Pro-Bold
-otf-cjgr-h Identity-H A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
-otf-cjgr-v Identity-V A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
-otf-cjgb-h Identity-H A-OTF-FutoGoB101Pro-Bold.otf %!PS FutoGoB101Pro-Bold
-otf-cjgb-v Identity-V A-OTF-FutoGoB101Pro-Bold.otf %!PS FutoGoB101Pro-Bold
-otf-cjge-h Identity-H A-OTF-MidashiGoPro-MB31.otf %!PS MidashiGoPro-MB31
-otf-cjge-v Identity-V A-OTF-MidashiGoPro-MB31.otf %!PS MidashiGoPro-MB31
-otf-cjmgr-h Identity-H A-OTF-Jun101Pro-Light.otf %!PS Jun101Pro-Light
-otf-cjmgr-v Identity-V A-OTF-Jun101Pro-Light.otf %!PS Jun101Pro-Light
-
-% Unicode 90JIS
-otf-ujml-h UniJIS-UTF16-H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-otf-ujml-v UniJIS-UTF16-V A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-otf-ujmr-h UniJIS-UTF16-H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-otf-ujmr-v UniJIS-UTF16-V A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-otf-ujmb-h UniJIS-UTF16-H A-OTF-FutoMinA101Pro-Bold.otf %!PS FutoMinA101Pro-Bold
-otf-ujmb-v UniJIS-UTF16-V A-OTF-FutoMinA101Pro-Bold.otf %!PS FutoMinA101Pro-Bold
-otf-ujgr-h UniJIS-UTF16-H A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
-otf-ujgr-v UniJIS-UTF16-V A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
-otf-ujgb-h UniJIS-UTF16-H A-OTF-FutoGoB101Pro-Bold.otf %!PS FutoGoB101Pro-Bold
-otf-ujgb-v UniJIS-UTF16-V A-OTF-FutoGoB101Pro-Bold.otf %!PS FutoGoB101Pro-Bold
-otf-ujge-h UniJIS-UTF16-H A-OTF-MidashiGoPro-MB31.otf %!PS MidashiGoPro-MB31
-otf-ujge-v UniJIS-UTF16-V A-OTF-MidashiGoPro-MB31.otf %!PS MidashiGoPro-MB31
-otf-ujmgr-h UniJIS-UTF16-H A-OTF-Jun101Pro-Light.otf %!PS Jun101Pro-Light
-otf-ujmgr-v UniJIS-UTF16-V A-OTF-Jun101Pro-Light.otf %!PS Jun101Pro-Light
-
-% Unicode JIS04
-otf-ujmln-h UniJIS2004-UTF16-H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-otf-ujmln-v UniJIS2004-UTF16-V A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-otf-ujmrn-h UniJIS2004-UTF16-H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-otf-ujmrn-v UniJIS2004-UTF16-V A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-otf-ujmbn-h UniJIS2004-UTF16-H A-OTF-FutoMinA101Pro-Bold.otf %!PS FutoMinA101Pro-Bold
-otf-ujmbn-v UniJIS2004-UTF16-V A-OTF-FutoMinA101Pro-Bold.otf %!PS FutoMinA101Pro-Bold
-otf-ujgrn-h UniJIS2004-UTF16-H A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
-otf-ujgrn-v UniJIS2004-UTF16-V A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
-otf-ujgbn-h UniJIS2004-UTF16-H A-OTF-FutoGoB101Pro-Bold.otf %!PS FutoGoB101Pro-Bold
-otf-ujgbn-v UniJIS2004-UTF16-V A-OTF-FutoGoB101Pro-Bold.otf %!PS FutoGoB101Pro-Bold
-otf-ujgen-h UniJIS2004-UTF16-H A-OTF-MidashiGoPro-MB31.otf %!PS MidashiGoPro-MB31
-otf-ujgen-v UniJIS2004-UTF16-V A-OTF-MidashiGoPro-MB31.otf %!PS MidashiGoPro-MB31
-otf-ujmgrn-h UniJIS2004-UTF16-H A-OTF-Jun101Pro-Light.otf %!PS Jun101Pro-Light
-otf-ujmgrn-v UniJIS2004-UTF16-V A-OTF-Jun101Pro-Light.otf %!PS Jun101Pro-Light
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/otf-up-morisawa.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/otf-up-morisawa.map
deleted file mode 100644
index 34c93e34ad1..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/otf-up-morisawa.map
+++ /dev/null
@@ -1,32 +0,0 @@
-
-% TEXT, 90JIS
-uphminl-h UniJIS-UTF16-H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-uphminl-v UniJIS-UTF16-V A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-uphminr-h UniJIS-UTF16-H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-uphminr-v UniJIS-UTF16-V A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-uphminb-h UniJIS-UTF16-H A-OTF-FutoMinA101Pro-Bold.otf %!PS FutoMinA101Pro-Bold
-uphminb-v UniJIS-UTF16-V A-OTF-FutoMinA101Pro-Bold.otf %!PS FutoMinA101Pro-Bold
-uphgothr-h UniJIS-UTF16-H A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
-uphgothr-v UniJIS-UTF16-V A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
-uphgothb-h UniJIS-UTF16-H A-OTF-FutoGoB101Pro-Bold.otf %!PS FutoGoB101Pro-Bold
-uphgothb-v UniJIS-UTF16-V A-OTF-FutoGoB101Pro-Bold.otf %!PS FutoGoB101Pro-Bold
-uphgotheb-h UniJIS-UTF16-H A-OTF-MidashiGoPro-MB31.otf %!PS MidashiGoPro-MB31
-uphgotheb-v UniJIS-UTF16-V A-OTF-MidashiGoPro-MB31.otf %!PS MidashiGoPro-MB31
-uphmgothr-h UniJIS-UTF16-H A-OTF-Jun101Pro-Light.otf %!PS Jun101Pro-Light
-uphmgothr-v UniJIS-UTF16-V A-OTF-Jun101Pro-Light.otf %!PS Jun101Pro-Light
-
-% TEXT, JIS04
-uphminln-h UniJIS2004-UTF16-H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-uphminln-v UniJIS2004-UTF16-V A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-uphminrn-h UniJIS2004-UTF16-H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-uphminrn-v UniJIS2004-UTF16-V A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-uphminbn-h UniJIS2004-UTF16-H A-OTF-FutoMinA101Pro-Bold.otf %!PS FutoMinA101Pro-Bold
-uphminbn-v UniJIS2004-UTF16-V A-OTF-FutoMinA101Pro-Bold.otf %!PS FutoMinA101Pro-Bold
-uphgothrn-h UniJIS2004-UTF16-H A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
-uphgothrn-v UniJIS2004-UTF16-V A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
-uphgothbn-h UniJIS2004-UTF16-H A-OTF-FutoGoB101Pro-Bold.otf %!PS FutoGoB101Pro-Bold
-uphgothbn-v UniJIS2004-UTF16-V A-OTF-FutoGoB101Pro-Bold.otf %!PS FutoGoB101Pro-Bold
-uphgothebn-h UniJIS2004-UTF16-H A-OTF-MidashiGoPro-MB31.otf %!PS MidashiGoPro-MB31
-uphgothebn-v UniJIS2004-UTF16-V A-OTF-MidashiGoPro-MB31.otf %!PS MidashiGoPro-MB31
-uphmgothrn-h UniJIS2004-UTF16-H A-OTF-Jun101Pro-Light.otf %!PS Jun101Pro-Light
-uphmgothrn-v UniJIS2004-UTF16-V A-OTF-Jun101Pro-Light.otf %!PS Jun101Pro-Light
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/ptex-morisawa-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/ptex-morisawa-04.map
deleted file mode 100644
index ae049847591..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/ptex-morisawa-04.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml 2004-H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-rmlv 2004-V A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-gbm 2004-H A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
-gbmv 2004-V A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/ptex-morisawa.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/ptex-morisawa.map
deleted file mode 100644
index db7516431d2..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/ptex-morisawa.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-rmlv V A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-gbm H A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
-gbmv V A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/uptex-morisawa-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/uptex-morisawa-04.map
deleted file mode 100644
index 5c9c57d84ac..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/uptex-morisawa-04.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS2004-UTF16-H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-urmlv UniJIS2004-UTF16-V A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-ugbm UniJIS2004-UTF16-H A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
-ugbmv UniJIS2004-UTF16-V A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
-uprml-h UniJIS2004-UTF16-H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-uprml-v UniJIS2004-UTF16-V A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-upgbm-h UniJIS2004-UTF16-H A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
-upgbm-v UniJIS2004-UTF16-V A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
-uprml-hq UniJIS-UCS2-H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-upgbm-hq UniJIS-UCS2-H A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/uptex-morisawa.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/uptex-morisawa.map
deleted file mode 100644
index fa4d56ddb62..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/uptex-morisawa.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS-UTF16-H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-urmlv UniJIS-UTF16-V A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-ugbm UniJIS-UTF16-H A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
-ugbmv UniJIS-UTF16-V A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
-uprml-h UniJIS-UTF16-H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-uprml-v UniJIS-UTF16-V A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-upgbm-h UniJIS-UTF16-H A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
-upgbm-v UniJIS-UTF16-V A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
-uprml-hq UniJIS-UCS2-H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
-upgbm-hq UniJIS-UCS2-H A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/otf-ms-osx.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/otf-ms-osx.map
deleted file mode 100644
index 098764dd06e..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/otf-ms-osx.map
+++ /dev/null
@@ -1,80 +0,0 @@
-
-% TEXT, 90JIS
-hminl-h H MS-Mincho.ttf
-hminl-v V MS-Mincho.ttf
-hminr-h H MS-Mincho.ttf
-hminr-v V MS-Mincho.ttf
-hminb-h H MS-Mincho.ttf
-hminb-v V MS-Mincho.ttf
-hgothr-h H MS-Gothic.ttf
-hgothr-v V MS-Gothic.ttf
-hgothb-h H MS-Gothic.ttf
-hgothb-v V MS-Gothic.ttf
-hgotheb-h H MS-Gothic.ttf
-hgotheb-v V MS-Gothic.ttf
-hmgothr-h H MS-Gothic.ttf
-hmgothr-v V MS-Gothic.ttf
-
-% TEXT, JIS04
-hminln-h H MS-Mincho.ttf
-hminln-v V MS-Mincho.ttf
-hminrn-h H MS-Mincho.ttf
-hminrn-v V MS-Mincho.ttf
-hminbn-h H MS-Mincho.ttf
-hminbn-v V MS-Mincho.ttf
-hgothrn-h H MS-Gothic.ttf
-hgothrn-v V MS-Gothic.ttf
-hgothbn-h H MS-Gothic.ttf
-hgothbn-v V MS-Gothic.ttf
-hgothebn-h H MS-Gothic.ttf
-hgothebn-v V MS-Gothic.ttf
-hmgothrn-h H MS-Gothic.ttf
-hmgothrn-v V MS-Gothic.ttf
-
-% CID
-otf-cjml-h Identity-H MS-Mincho.ttf/AJ16
-otf-cjml-v Identity-V MS-Mincho.ttf/AJ16
-otf-cjmr-h Identity-H MS-Mincho.ttf/AJ16
-otf-cjmr-v Identity-V MS-Mincho.ttf/AJ16
-otf-cjmb-h Identity-H MS-Mincho.ttf/AJ16
-otf-cjmb-v Identity-V MS-Mincho.ttf/AJ16
-otf-cjgr-h Identity-H MS-Gothic.ttf/AJ16
-otf-cjgr-v Identity-V MS-Gothic.ttf/AJ16
-otf-cjgb-h Identity-H MS-Gothic.ttf/AJ16
-otf-cjgb-v Identity-V MS-Gothic.ttf/AJ16
-otf-cjge-h Identity-H MS-Gothic.ttf/AJ16
-otf-cjge-v Identity-V MS-Gothic.ttf/AJ16
-otf-cjmgr-h Identity-H MS-Gothic.ttf/AJ16
-otf-cjmgr-v Identity-V MS-Gothic.ttf/AJ16
-
-% Unicode 90JIS
-otf-ujml-h UniJIS-UTF16-H MS-Mincho.ttf
-otf-ujml-v UniJIS-UTF16-V MS-Mincho.ttf
-otf-ujmr-h UniJIS-UTF16-H MS-Mincho.ttf
-otf-ujmr-v UniJIS-UTF16-V MS-Mincho.ttf
-otf-ujmb-h UniJIS-UTF16-H MS-Mincho.ttf
-otf-ujmb-v UniJIS-UTF16-V MS-Mincho.ttf
-otf-ujgr-h UniJIS-UTF16-H MS-Gothic.ttf
-otf-ujgr-v UniJIS-UTF16-V MS-Gothic.ttf
-otf-ujgb-h UniJIS-UTF16-H MS-Gothic.ttf
-otf-ujgb-v UniJIS-UTF16-V MS-Gothic.ttf
-otf-ujge-h UniJIS-UTF16-H MS-Gothic.ttf
-otf-ujge-v UniJIS-UTF16-V MS-Gothic.ttf
-otf-ujmgr-h UniJIS-UTF16-H MS-Gothic.ttf
-otf-ujmgr-v UniJIS-UTF16-V MS-Gothic.ttf
-
-% Unicode JIS04
-otf-ujmln-h UniJIS2004-UTF16-H MS-Mincho.ttf
-otf-ujmln-v UniJIS2004-UTF16-V MS-Mincho.ttf
-otf-ujmrn-h UniJIS2004-UTF16-H MS-Mincho.ttf
-otf-ujmrn-v UniJIS2004-UTF16-V MS-Mincho.ttf
-otf-ujmbn-h UniJIS2004-UTF16-H MS-Mincho.ttf
-otf-ujmbn-v UniJIS2004-UTF16-V MS-Mincho.ttf
-otf-ujgrn-h UniJIS2004-UTF16-H MS-Gothic.ttf
-otf-ujgrn-v UniJIS2004-UTF16-V MS-Gothic.ttf
-otf-ujgbn-h UniJIS2004-UTF16-H MS-Gothic.ttf
-otf-ujgbn-v UniJIS2004-UTF16-V MS-Gothic.ttf
-otf-ujgen-h UniJIS2004-UTF16-H MS-Gothic.ttf
-otf-ujgen-v UniJIS2004-UTF16-V MS-Gothic.ttf
-otf-ujmgrn-h UniJIS2004-UTF16-H MS-Gothic.ttf
-otf-ujmgrn-v UniJIS2004-UTF16-V MS-Gothic.ttf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/otf-up-ms-osx.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/otf-up-ms-osx.map
deleted file mode 100644
index 179ce994dc3..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/otf-up-ms-osx.map
+++ /dev/null
@@ -1,32 +0,0 @@
-
-% TEXT, 90JIS
-uphminl-h UniJIS-UTF16-H MS-Mincho.ttf
-uphminl-v UniJIS-UTF16-V MS-Mincho.ttf
-uphminr-h UniJIS-UTF16-H MS-Mincho.ttf
-uphminr-v UniJIS-UTF16-V MS-Mincho.ttf
-uphminb-h UniJIS-UTF16-H MS-Mincho.ttf
-uphminb-v UniJIS-UTF16-V MS-Mincho.ttf
-uphgothr-h UniJIS-UTF16-H MS-Gothic.ttf
-uphgothr-v UniJIS-UTF16-V MS-Gothic.ttf
-uphgothb-h UniJIS-UTF16-H MS-Gothic.ttf
-uphgothb-v UniJIS-UTF16-V MS-Gothic.ttf
-uphgotheb-h UniJIS-UTF16-H MS-Gothic.ttf
-uphgotheb-v UniJIS-UTF16-V MS-Gothic.ttf
-uphmgothr-h UniJIS-UTF16-H MS-Gothic.ttf
-uphmgothr-v UniJIS-UTF16-V MS-Gothic.ttf
-
-% TEXT, JIS04
-uphminln-h UniJIS2004-UTF16-H MS-Mincho.ttf
-uphminln-v UniJIS2004-UTF16-V MS-Mincho.ttf
-uphminrn-h UniJIS2004-UTF16-H MS-Mincho.ttf
-uphminrn-v UniJIS2004-UTF16-V MS-Mincho.ttf
-uphminbn-h UniJIS2004-UTF16-H MS-Mincho.ttf
-uphminbn-v UniJIS2004-UTF16-V MS-Mincho.ttf
-uphgothrn-h UniJIS2004-UTF16-H MS-Gothic.ttf
-uphgothrn-v UniJIS2004-UTF16-V MS-Gothic.ttf
-uphgothbn-h UniJIS2004-UTF16-H MS-Gothic.ttf
-uphgothbn-v UniJIS2004-UTF16-V MS-Gothic.ttf
-uphgothebn-h UniJIS2004-UTF16-H MS-Gothic.ttf
-uphgothebn-v UniJIS2004-UTF16-V MS-Gothic.ttf
-uphmgothrn-h UniJIS2004-UTF16-H MS-Gothic.ttf
-uphmgothrn-v UniJIS2004-UTF16-V MS-Gothic.ttf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/ptex-ms-osx.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/ptex-ms-osx.map
deleted file mode 100644
index e7d4744dd5b..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/ptex-ms-osx.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml H MS-Mincho.ttf
-rmlv V MS-Mincho.ttf
-gbm H MS-Gothic.ttf
-gbmv V MS-Gothic.ttf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/uptex-ms-osx.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/uptex-ms-osx.map
deleted file mode 100644
index ea081feaad9..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/uptex-ms-osx.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS-UTF16-H MS-Mincho.ttf
-urmlv UniJIS-UTF16-V MS-Mincho.ttf
-ugbm UniJIS-UTF16-H MS-Gothic.ttf
-ugbmv UniJIS-UTF16-V MS-Gothic.ttf
-uprml-h UniJIS-UTF16-H MS-Mincho.ttf
-uprml-v UniJIS-UTF16-V MS-Mincho.ttf
-upgbm-h UniJIS-UTF16-H MS-Gothic.ttf
-upgbm-v UniJIS-UTF16-V MS-Gothic.ttf
-uprml-hq UniJIS-UCS2-H MS-Mincho.ttf
-upgbm-hq UniJIS-UCS2-H MS-Gothic.ttf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/otf-ms.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/otf-ms.map
deleted file mode 100644
index 44ef877e29e..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/otf-ms.map
+++ /dev/null
@@ -1,80 +0,0 @@
-
-% TEXT, 90JIS
-hminl-h H :0:msmincho.ttc
-hminl-v V :0:msmincho.ttc
-hminr-h H :0:msmincho.ttc
-hminr-v V :0:msmincho.ttc
-hminb-h H :0:msmincho.ttc
-hminb-v V :0:msmincho.ttc
-hgothr-h H :0:msgothic.ttc
-hgothr-v V :0:msgothic.ttc
-hgothb-h H :0:msgothic.ttc
-hgothb-v V :0:msgothic.ttc
-hgotheb-h H :0:msgothic.ttc
-hgotheb-v V :0:msgothic.ttc
-hmgothr-h H :0:msgothic.ttc
-hmgothr-v V :0:msgothic.ttc
-
-% TEXT, JIS04
-hminln-h H :0:msmincho.ttc
-hminln-v V :0:msmincho.ttc
-hminrn-h H :0:msmincho.ttc
-hminrn-v V :0:msmincho.ttc
-hminbn-h H :0:msmincho.ttc
-hminbn-v V :0:msmincho.ttc
-hgothrn-h H :0:msgothic.ttc
-hgothrn-v V :0:msgothic.ttc
-hgothbn-h H :0:msgothic.ttc
-hgothbn-v V :0:msgothic.ttc
-hgothebn-h H :0:msgothic.ttc
-hgothebn-v V :0:msgothic.ttc
-hmgothrn-h H :0:msgothic.ttc
-hmgothrn-v V :0:msgothic.ttc
-
-% CID
-otf-cjml-h Identity-H :0:msmincho.ttc/AJ16
-otf-cjml-v Identity-V :0:msmincho.ttc/AJ16
-otf-cjmr-h Identity-H :0:msmincho.ttc/AJ16
-otf-cjmr-v Identity-V :0:msmincho.ttc/AJ16
-otf-cjmb-h Identity-H :0:msmincho.ttc/AJ16
-otf-cjmb-v Identity-V :0:msmincho.ttc/AJ16
-otf-cjgr-h Identity-H :0:msgothic.ttc/AJ16
-otf-cjgr-v Identity-V :0:msgothic.ttc/AJ16
-otf-cjgb-h Identity-H :0:msgothic.ttc/AJ16
-otf-cjgb-v Identity-V :0:msgothic.ttc/AJ16
-otf-cjge-h Identity-H :0:msgothic.ttc/AJ16
-otf-cjge-v Identity-V :0:msgothic.ttc/AJ16
-otf-cjmgr-h Identity-H :0:msgothic.ttc/AJ16
-otf-cjmgr-v Identity-V :0:msgothic.ttc/AJ16
-
-% Unicode 90JIS
-otf-ujml-h UniJIS-UTF16-H :0:msmincho.ttc
-otf-ujml-v UniJIS-UTF16-V :0:msmincho.ttc
-otf-ujmr-h UniJIS-UTF16-H :0:msmincho.ttc
-otf-ujmr-v UniJIS-UTF16-V :0:msmincho.ttc
-otf-ujmb-h UniJIS-UTF16-H :0:msmincho.ttc
-otf-ujmb-v UniJIS-UTF16-V :0:msmincho.ttc
-otf-ujgr-h UniJIS-UTF16-H :0:msgothic.ttc
-otf-ujgr-v UniJIS-UTF16-V :0:msgothic.ttc
-otf-ujgb-h UniJIS-UTF16-H :0:msgothic.ttc
-otf-ujgb-v UniJIS-UTF16-V :0:msgothic.ttc
-otf-ujge-h UniJIS-UTF16-H :0:msgothic.ttc
-otf-ujge-v UniJIS-UTF16-V :0:msgothic.ttc
-otf-ujmgr-h UniJIS-UTF16-H :0:msgothic.ttc
-otf-ujmgr-v UniJIS-UTF16-V :0:msgothic.ttc
-
-% Unicode JIS04
-otf-ujmln-h UniJIS2004-UTF16-H :0:msmincho.ttc
-otf-ujmln-v UniJIS2004-UTF16-V :0:msmincho.ttc
-otf-ujmrn-h UniJIS2004-UTF16-H :0:msmincho.ttc
-otf-ujmrn-v UniJIS2004-UTF16-V :0:msmincho.ttc
-otf-ujmbn-h UniJIS2004-UTF16-H :0:msmincho.ttc
-otf-ujmbn-v UniJIS2004-UTF16-V :0:msmincho.ttc
-otf-ujgrn-h UniJIS2004-UTF16-H :0:msgothic.ttc
-otf-ujgrn-v UniJIS2004-UTF16-V :0:msgothic.ttc
-otf-ujgbn-h UniJIS2004-UTF16-H :0:msgothic.ttc
-otf-ujgbn-v UniJIS2004-UTF16-V :0:msgothic.ttc
-otf-ujgen-h UniJIS2004-UTF16-H :0:msgothic.ttc
-otf-ujgen-v UniJIS2004-UTF16-V :0:msgothic.ttc
-otf-ujmgrn-h UniJIS2004-UTF16-H :0:msgothic.ttc
-otf-ujmgrn-v UniJIS2004-UTF16-V :0:msgothic.ttc
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/otf-up-ms.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/otf-up-ms.map
deleted file mode 100644
index c4ad8038f9b..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/otf-up-ms.map
+++ /dev/null
@@ -1,32 +0,0 @@
-
-% TEXT, 90JIS
-uphminl-h UniJIS-UTF16-H :0:msmincho.ttc
-uphminl-v UniJIS-UTF16-V :0:msmincho.ttc
-uphminr-h UniJIS-UTF16-H :0:msmincho.ttc
-uphminr-v UniJIS-UTF16-V :0:msmincho.ttc
-uphminb-h UniJIS-UTF16-H :0:msmincho.ttc
-uphminb-v UniJIS-UTF16-V :0:msmincho.ttc
-uphgothr-h UniJIS-UTF16-H :0:msgothic.ttc
-uphgothr-v UniJIS-UTF16-V :0:msgothic.ttc
-uphgothb-h UniJIS-UTF16-H :0:msgothic.ttc
-uphgothb-v UniJIS-UTF16-V :0:msgothic.ttc
-uphgotheb-h UniJIS-UTF16-H :0:msgothic.ttc
-uphgotheb-v UniJIS-UTF16-V :0:msgothic.ttc
-uphmgothr-h UniJIS-UTF16-H :0:msgothic.ttc
-uphmgothr-v UniJIS-UTF16-V :0:msgothic.ttc
-
-% TEXT, JIS04
-uphminln-h UniJIS2004-UTF16-H :0:msmincho.ttc
-uphminln-v UniJIS2004-UTF16-V :0:msmincho.ttc
-uphminrn-h UniJIS2004-UTF16-H :0:msmincho.ttc
-uphminrn-v UniJIS2004-UTF16-V :0:msmincho.ttc
-uphminbn-h UniJIS2004-UTF16-H :0:msmincho.ttc
-uphminbn-v UniJIS2004-UTF16-V :0:msmincho.ttc
-uphgothrn-h UniJIS2004-UTF16-H :0:msgothic.ttc
-uphgothrn-v UniJIS2004-UTF16-V :0:msgothic.ttc
-uphgothbn-h UniJIS2004-UTF16-H :0:msgothic.ttc
-uphgothbn-v UniJIS2004-UTF16-V :0:msgothic.ttc
-uphgothebn-h UniJIS2004-UTF16-H :0:msgothic.ttc
-uphgothebn-v UniJIS2004-UTF16-V :0:msgothic.ttc
-uphmgothrn-h UniJIS2004-UTF16-H :0:msgothic.ttc
-uphmgothrn-v UniJIS2004-UTF16-V :0:msgothic.ttc
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/ptex-ms.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/ptex-ms.map
deleted file mode 100644
index 5f38aeeee21..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/ptex-ms.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml H :0:msmincho.ttc
-rmlv V :0:msmincho.ttc
-gbm H :0:msgothic.ttc
-gbmv V :0:msgothic.ttc
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/uptex-ms.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/uptex-ms.map
deleted file mode 100644
index 56150b88fce..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/uptex-ms.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS-UTF16-H :0:msmincho.ttc
-urmlv UniJIS-UTF16-V :0:msmincho.ttc
-ugbm UniJIS-UTF16-H :0:msgothic.ttc
-ugbmv UniJIS-UTF16-V :0:msgothic.ttc
-uprml-h UniJIS-UTF16-H :0:msmincho.ttc
-uprml-v UniJIS-UTF16-V :0:msmincho.ttc
-upgbm-h UniJIS-UTF16-H :0:msgothic.ttc
-upgbm-v UniJIS-UTF16-V :0:msgothic.ttc
-uprml-hq UniJIS-UCS2-H :0:msmincho.ttc
-upgbm-hq UniJIS-UCS2-H :0:msgothic.ttc
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/otf-noEmbed.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/otf-noEmbed.map
deleted file mode 100644
index 7638546cc51..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/otf-noEmbed.map
+++ /dev/null
@@ -1,80 +0,0 @@
-
-% TEXT, 90JIS
-hminl-h H !Ryumin-Light
-hminl-v V !Ryumin-Light
-hminr-h H !Ryumin-Light
-hminr-v V !Ryumin-Light
-hminb-h H !Ryumin-Light,Bold
-hminb-v V !Ryumin-Light,Bold
-hgothr-h H !GothicBBB-Medium
-hgothr-v V !GothicBBB-Medium
-hgothb-h H !GothicBBB-Medium,Bold
-hgothb-v V !GothicBBB-Medium,Bold
-hgotheb-h H !GothicBBB-Medium,Bold
-hgotheb-v V !GothicBBB-Medium,Bold
-hmgothr-h H !GothicBBB-Medium
-hmgothr-v V !GothicBBB-Medium
-
-% TEXT, JIS04
-hminln-h H !Ryumin-Light
-hminln-v V !Ryumin-Light
-hminrn-h H !Ryumin-Light
-hminrn-v V !Ryumin-Light
-hminbn-h H !Ryumin-Light,Bold
-hminbn-v V !Ryumin-Light,Bold
-hgothrn-h H !GothicBBB-Medium
-hgothrn-v V !GothicBBB-Medium
-hgothbn-h H !GothicBBB-Medium,Bold
-hgothbn-v V !GothicBBB-Medium,Bold
-hgothebn-h H !GothicBBB-Medium,Bold
-hgothebn-v V !GothicBBB-Medium,Bold
-hmgothrn-h H !GothicBBB-Medium
-hmgothrn-v V !GothicBBB-Medium
-
-% CID
-otf-cjml-h Identity-H !Ryumin-Light
-otf-cjml-v Identity-V !Ryumin-Light
-otf-cjmr-h Identity-H !Ryumin-Light
-otf-cjmr-v Identity-V !Ryumin-Light
-otf-cjmb-h Identity-H !Ryumin-Light,Bold
-otf-cjmb-v Identity-V !Ryumin-Light,Bold
-otf-cjgr-h Identity-H !GothicBBB-Medium
-otf-cjgr-v Identity-V !GothicBBB-Medium
-otf-cjgb-h Identity-H !GothicBBB-Medium,Bold
-otf-cjgb-v Identity-V !GothicBBB-Medium,Bold
-otf-cjge-h Identity-H !GothicBBB-Medium,Bold
-otf-cjge-v Identity-V !GothicBBB-Medium,Bold
-otf-cjmgr-h Identity-H !GothicBBB-Medium
-otf-cjmgr-v Identity-V !GothicBBB-Medium
-
-% Unicode 90JIS
-otf-ujml-h UniJIS-UTF16-H !Ryumin-Light
-otf-ujml-v UniJIS-UTF16-V !Ryumin-Light
-otf-ujmr-h UniJIS-UTF16-H !Ryumin-Light
-otf-ujmr-v UniJIS-UTF16-V !Ryumin-Light
-otf-ujmb-h UniJIS-UTF16-H !Ryumin-Light,Bold
-otf-ujmb-v UniJIS-UTF16-V !Ryumin-Light,Bold
-otf-ujgr-h UniJIS-UTF16-H !GothicBBB-Medium
-otf-ujgr-v UniJIS-UTF16-V !GothicBBB-Medium
-otf-ujgb-h UniJIS-UTF16-H !GothicBBB-Medium,Bold
-otf-ujgb-v UniJIS-UTF16-V !GothicBBB-Medium,Bold
-otf-ujge-h UniJIS-UTF16-H !GothicBBB-Medium,Bold
-otf-ujge-v UniJIS-UTF16-V !GothicBBB-Medium,Bold
-otf-ujmgr-h UniJIS-UTF16-H !GothicBBB-Medium
-otf-ujmgr-v UniJIS-UTF16-V !GothicBBB-Medium
-
-% Unicode JIS04
-otf-ujmln-h UniJIS2004-UTF16-H !Ryumin-Light
-otf-ujmln-v UniJIS2004-UTF16-V !Ryumin-Light
-otf-ujmrn-h UniJIS2004-UTF16-H !Ryumin-Light
-otf-ujmrn-v UniJIS2004-UTF16-V !Ryumin-Light
-otf-ujmbn-h UniJIS2004-UTF16-H !Ryumin-Light,Bold
-otf-ujmbn-v UniJIS2004-UTF16-V !Ryumin-Light,Bold
-otf-ujgrn-h UniJIS2004-UTF16-H !GothicBBB-Medium
-otf-ujgrn-v UniJIS2004-UTF16-V !GothicBBB-Medium
-otf-ujgbn-h UniJIS2004-UTF16-H !GothicBBB-Medium,Bold
-otf-ujgbn-v UniJIS2004-UTF16-V !GothicBBB-Medium,Bold
-otf-ujgen-h UniJIS2004-UTF16-H !GothicBBB-Medium,Bold
-otf-ujgen-v UniJIS2004-UTF16-V !GothicBBB-Medium,Bold
-otf-ujmgrn-h UniJIS2004-UTF16-H !GothicBBB-Medium
-otf-ujmgrn-v UniJIS2004-UTF16-V !GothicBBB-Medium
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/otf-up-noEmbed.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/otf-up-noEmbed.map
deleted file mode 100644
index dca1153e4a3..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/otf-up-noEmbed.map
+++ /dev/null
@@ -1,32 +0,0 @@
-
-% TEXT, 90JIS
-uphminl-h UniJIS-UTF16-H !Ryumin-Light
-uphminl-v UniJIS-UTF16-V !Ryumin-Light
-uphminr-h UniJIS-UTF16-H !Ryumin-Light
-uphminr-v UniJIS-UTF16-V !Ryumin-Light
-uphminb-h UniJIS-UTF16-H !Ryumin-Light,Bold
-uphminb-v UniJIS-UTF16-V !Ryumin-Light,Bold
-uphgothr-h UniJIS-UTF16-H !GothicBBB-Medium
-uphgothr-v UniJIS-UTF16-V !GothicBBB-Medium
-uphgothb-h UniJIS-UTF16-H !GothicBBB-Medium,Bold
-uphgothb-v UniJIS-UTF16-V !GothicBBB-Medium,Bold
-uphgotheb-h UniJIS-UTF16-H !GothicBBB-Medium,Bold
-uphgotheb-v UniJIS-UTF16-V !GothicBBB-Medium,Bold
-uphmgothr-h UniJIS-UTF16-H !GothicBBB-Medium
-uphmgothr-v UniJIS-UTF16-V !GothicBBB-Medium
-
-% TEXT, JIS04
-uphminln-h UniJIS2004-UTF16-H !Ryumin-Light
-uphminln-v UniJIS2004-UTF16-V !Ryumin-Light
-uphminrn-h UniJIS2004-UTF16-H !Ryumin-Light
-uphminrn-v UniJIS2004-UTF16-V !Ryumin-Light
-uphminbn-h UniJIS2004-UTF16-H !Ryumin-Light,Bold
-uphminbn-v UniJIS2004-UTF16-V !Ryumin-Light,Bold
-uphgothrn-h UniJIS2004-UTF16-H !GothicBBB-Medium
-uphgothrn-v UniJIS2004-UTF16-V !GothicBBB-Medium
-uphgothbn-h UniJIS2004-UTF16-H !GothicBBB-Medium,Bold
-uphgothbn-v UniJIS2004-UTF16-V !GothicBBB-Medium,Bold
-uphgothebn-h UniJIS2004-UTF16-H !GothicBBB-Medium,Bold
-uphgothebn-v UniJIS2004-UTF16-V !GothicBBB-Medium,Bold
-uphmgothrn-h UniJIS2004-UTF16-H !GothicBBB-Medium
-uphmgothrn-v UniJIS2004-UTF16-V !GothicBBB-Medium
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/ptex-noEmbed-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/ptex-noEmbed-04.map
deleted file mode 100644
index e309b88c893..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/ptex-noEmbed-04.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml 2004-H !Ryumin-Light
-rmlv 2004-V !Ryumin-Light
-gbm 2004-H !GothicBBB-Medium
-gbmv 2004-V !GothicBBB-Medium
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/ptex-noEmbed.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/ptex-noEmbed.map
deleted file mode 100644
index 8f46d970813..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/ptex-noEmbed.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml H !Ryumin-Light
-rmlv V !Ryumin-Light
-gbm H !GothicBBB-Medium
-gbmv V !GothicBBB-Medium
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/uptex-noEmbed-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/uptex-noEmbed-04.map
deleted file mode 100644
index eb3088babc9..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/uptex-noEmbed-04.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS2004-UTF16-H !Ryumin-Light
-urmlv UniJIS2004-UTF16-V !Ryumin-Light
-ugbm UniJIS2004-UTF16-H !GothicBBB-Medium
-ugbmv UniJIS2004-UTF16-V !GothicBBB-Medium
-uprml-h UniJIS2004-UTF16-H !Ryumin-Light
-uprml-v UniJIS2004-UTF16-V !Ryumin-Light
-upgbm-h UniJIS2004-UTF16-H !GothicBBB-Medium
-upgbm-v UniJIS2004-UTF16-V !GothicBBB-Medium
-uprml-hq UniJIS-UCS2-H !Ryumin-Light
-upgbm-hq UniJIS-UCS2-H !GothicBBB-Medium
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/uptex-noEmbed.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/uptex-noEmbed.map
deleted file mode 100644
index e2670c1f5cb..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/uptex-noEmbed.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS-UTF16-H !Ryumin-Light
-urmlv UniJIS-UTF16-V !Ryumin-Light
-ugbm UniJIS-UTF16-H !GothicBBB-Medium
-ugbmv UniJIS-UTF16-V !GothicBBB-Medium
-uprml-h UniJIS-UTF16-H !Ryumin-Light
-uprml-v UniJIS-UTF16-V !Ryumin-Light
-upgbm-h UniJIS-UTF16-H !GothicBBB-Medium
-upgbm-v UniJIS-UTF16-V !GothicBBB-Medium
-uprml-hq UniJIS-UCS2-H !Ryumin-Light
-upgbm-hq UniJIS-UCS2-H !GothicBBB-Medium
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/otf-toppanbunkyu-sierra.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/otf-toppanbunkyu-sierra.map
deleted file mode 100644
index 341ab36feba..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/otf-toppanbunkyu-sierra.map
+++ /dev/null
@@ -1,80 +0,0 @@
-
-% TEXT, 90JIS
-hminl-h H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-hminl-v V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-hminr-h H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-hminr-v V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-hminb-h H ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
-hminb-v V ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
-hgothr-h H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-hgothr-v V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-hgothb-h H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-hgothb-v V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-hgotheb-h H ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
-hgotheb-v V ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
-hmgothr-h H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-hmgothr-v V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-
-% TEXT, JIS04
-hminln-h H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-hminln-v V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-hminrn-h H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-hminrn-v V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-hminbn-h H ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
-hminbn-v V ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
-hgothrn-h H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-hgothrn-v V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-hgothbn-h H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-hgothbn-v V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-hgothebn-h H ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
-hgothebn-v V ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
-hmgothrn-h H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-hmgothrn-v V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-
-% CID
-otf-cjml-h Identity-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-otf-cjml-v Identity-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-otf-cjmr-h Identity-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-otf-cjmr-v Identity-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-otf-cjmb-h Identity-H ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
-otf-cjmb-v Identity-V ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
-otf-cjgr-h Identity-H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-otf-cjgr-v Identity-V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-otf-cjgb-h Identity-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-otf-cjgb-v Identity-V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-otf-cjge-h Identity-H ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
-otf-cjge-v Identity-V ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
-otf-cjmgr-h Identity-H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-otf-cjmgr-v Identity-V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-
-% Unicode 90JIS
-otf-ujml-h UniJIS-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-otf-ujml-v UniJIS-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-otf-ujmr-h UniJIS-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-otf-ujmr-v UniJIS-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-otf-ujmb-h UniJIS-UTF16-H ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
-otf-ujmb-v UniJIS-UTF16-V ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
-otf-ujgr-h UniJIS-UTF16-H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-otf-ujgr-v UniJIS-UTF16-V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-otf-ujgb-h UniJIS-UTF16-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-otf-ujgb-v UniJIS-UTF16-V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-otf-ujge-h UniJIS-UTF16-H ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
-otf-ujge-v UniJIS-UTF16-V ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
-otf-ujmgr-h UniJIS-UTF16-H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-otf-ujmgr-v UniJIS-UTF16-V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-
-% Unicode JIS04
-otf-ujmln-h UniJIS2004-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-otf-ujmln-v UniJIS2004-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-otf-ujmrn-h UniJIS2004-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-otf-ujmrn-v UniJIS2004-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-otf-ujmbn-h UniJIS2004-UTF16-H ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
-otf-ujmbn-v UniJIS2004-UTF16-V ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
-otf-ujgrn-h UniJIS2004-UTF16-H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-otf-ujgrn-v UniJIS2004-UTF16-V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-otf-ujgbn-h UniJIS2004-UTF16-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-otf-ujgbn-v UniJIS2004-UTF16-V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-otf-ujgen-h UniJIS2004-UTF16-H ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
-otf-ujgen-v UniJIS2004-UTF16-V ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
-otf-ujmgrn-h UniJIS2004-UTF16-H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-otf-ujmgrn-v UniJIS2004-UTF16-V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/otf-up-toppanbunkyu-sierra.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/otf-up-toppanbunkyu-sierra.map
deleted file mode 100644
index 660c86b3aa1..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/otf-up-toppanbunkyu-sierra.map
+++ /dev/null
@@ -1,32 +0,0 @@
-
-% TEXT, 90JIS
-uphminl-h UniJIS-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-uphminl-v UniJIS-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-uphminr-h UniJIS-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-uphminr-v UniJIS-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-uphminb-h UniJIS-UTF16-H ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
-uphminb-v UniJIS-UTF16-V ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
-uphgothr-h UniJIS-UTF16-H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-uphgothr-v UniJIS-UTF16-V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-uphgothb-h UniJIS-UTF16-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-uphgothb-v UniJIS-UTF16-V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-uphgotheb-h UniJIS-UTF16-H ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
-uphgotheb-v UniJIS-UTF16-V ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
-uphmgothr-h UniJIS-UTF16-H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-uphmgothr-v UniJIS-UTF16-V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-
-% TEXT, JIS04
-uphminln-h UniJIS2004-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-uphminln-v UniJIS2004-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-uphminrn-h UniJIS2004-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-uphminrn-v UniJIS2004-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-uphminbn-h UniJIS2004-UTF16-H ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
-uphminbn-v UniJIS2004-UTF16-V ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
-uphgothrn-h UniJIS2004-UTF16-H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-uphgothrn-v UniJIS2004-UTF16-V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-uphgothbn-h UniJIS2004-UTF16-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-uphgothbn-v UniJIS2004-UTF16-V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-uphgothebn-h UniJIS2004-UTF16-H ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
-uphgothebn-v UniJIS2004-UTF16-V ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
-uphmgothrn-h UniJIS2004-UTF16-H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-uphmgothrn-v UniJIS2004-UTF16-V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/ptex-toppanbunkyu-sierra-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/ptex-toppanbunkyu-sierra-04.map
deleted file mode 100644
index 21df63f4571..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/ptex-toppanbunkyu-sierra-04.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml 2004-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-rmlv 2004-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-gbm 2004-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-gbmv 2004-V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/ptex-toppanbunkyu-sierra.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/ptex-toppanbunkyu-sierra.map
deleted file mode 100644
index 7f00b869d5c..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/ptex-toppanbunkyu-sierra.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-rmlv V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-gbm H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-gbmv V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/uptex-toppanbunkyu-sierra-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/uptex-toppanbunkyu-sierra-04.map
deleted file mode 100644
index 3c6cbdc57bc..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/uptex-toppanbunkyu-sierra-04.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS2004-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-urmlv UniJIS2004-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-ugbm UniJIS2004-UTF16-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-ugbmv UniJIS2004-UTF16-V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-uprml-h UniJIS2004-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-uprml-v UniJIS2004-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-upgbm-h UniJIS2004-UTF16-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-upgbm-v UniJIS2004-UTF16-V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-uprml-hq UniJIS-UCS2-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-upgbm-hq UniJIS-UCS2-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/uptex-toppanbunkyu-sierra.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/uptex-toppanbunkyu-sierra.map
deleted file mode 100644
index b15c83c6ab9..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/uptex-toppanbunkyu-sierra.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-urmlv UniJIS-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-ugbm UniJIS-UTF16-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-ugbmv UniJIS-UTF16-V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-uprml-h UniJIS-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-uprml-v UniJIS-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-upgbm-h UniJIS-UTF16-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-upgbm-v UniJIS-UTF16-V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-uprml-hq UniJIS-UCS2-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-upgbm-hq UniJIS-UCS2-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/otf-up-yu-osx.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/otf-up-yu-osx.map
deleted file mode 100644
index cf65d10471d..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/otf-up-yu-osx.map
+++ /dev/null
@@ -1,32 +0,0 @@
-
-% TEXT, 90JIS
-uphminl-h UniJIS-UTF16-H YuMin-Medium.otf
-uphminl-v UniJIS-UTF16-V YuMin-Medium.otf
-uphminr-h UniJIS-UTF16-H YuMin-Medium.otf
-uphminr-v UniJIS-UTF16-V YuMin-Medium.otf
-uphminb-h UniJIS-UTF16-H YuMin-Demibold.otf
-uphminb-v UniJIS-UTF16-V YuMin-Demibold.otf
-uphgothr-h UniJIS-UTF16-H YuGo-Medium.otf
-uphgothr-v UniJIS-UTF16-V YuGo-Medium.otf
-uphgothb-h UniJIS-UTF16-H YuGo-Bold.otf
-uphgothb-v UniJIS-UTF16-V YuGo-Bold.otf
-uphgotheb-h UniJIS-UTF16-H YuGo-Bold.otf
-uphgotheb-v UniJIS-UTF16-V YuGo-Bold.otf
-uphmgothr-h UniJIS-UTF16-H YuGo-Bold.otf
-uphmgothr-v UniJIS-UTF16-V YuGo-Bold.otf
-
-% TEXT, JIS04
-uphminln-h UniJIS2004-UTF16-H YuMin-Medium.otf
-uphminln-v UniJIS2004-UTF16-V YuMin-Medium.otf
-uphminrn-h UniJIS2004-UTF16-H YuMin-Medium.otf
-uphminrn-v UniJIS2004-UTF16-V YuMin-Medium.otf
-uphminbn-h UniJIS2004-UTF16-H YuMin-Demibold.otf
-uphminbn-v UniJIS2004-UTF16-V YuMin-Demibold.otf
-uphgothrn-h UniJIS2004-UTF16-H YuGo-Medium.otf
-uphgothrn-v UniJIS2004-UTF16-V YuGo-Medium.otf
-uphgothbn-h UniJIS2004-UTF16-H YuGo-Bold.otf
-uphgothbn-v UniJIS2004-UTF16-V YuGo-Bold.otf
-uphgothebn-h UniJIS2004-UTF16-H YuGo-Bold.otf
-uphgothebn-v UniJIS2004-UTF16-V YuGo-Bold.otf
-uphmgothrn-h UniJIS2004-UTF16-H YuGo-Bold.otf
-uphmgothrn-v UniJIS2004-UTF16-V YuGo-Bold.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/otf-yu-osx.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/otf-yu-osx.map
deleted file mode 100644
index 7ab78c040d4..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/otf-yu-osx.map
+++ /dev/null
@@ -1,80 +0,0 @@
-
-% TEXT, 90JIS
-hminl-h H YuMin-Medium.otf
-hminl-v V YuMin-Medium.otf
-hminr-h H YuMin-Medium.otf
-hminr-v V YuMin-Medium.otf
-hminb-h H YuMin-Demibold.otf
-hminb-v V YuMin-Demibold.otf
-hgothr-h H YuGo-Medium.otf
-hgothr-v V YuGo-Medium.otf
-hgothb-h H YuGo-Bold.otf
-hgothb-v V YuGo-Bold.otf
-hgotheb-h H YuGo-Bold.otf
-hgotheb-v V YuGo-Bold.otf
-hmgothr-h H YuGo-Bold.otf
-hmgothr-v V YuGo-Bold.otf
-
-% TEXT, JIS04
-hminln-h H YuMin-Medium.otf
-hminln-v V YuMin-Medium.otf
-hminrn-h H YuMin-Medium.otf
-hminrn-v V YuMin-Medium.otf
-hminbn-h H YuMin-Demibold.otf
-hminbn-v V YuMin-Demibold.otf
-hgothrn-h H YuGo-Medium.otf
-hgothrn-v V YuGo-Medium.otf
-hgothbn-h H YuGo-Bold.otf
-hgothbn-v V YuGo-Bold.otf
-hgothebn-h H YuGo-Bold.otf
-hgothebn-v V YuGo-Bold.otf
-hmgothrn-h H YuGo-Bold.otf
-hmgothrn-v V YuGo-Bold.otf
-
-% CID
-otf-cjml-h Identity-H YuMin-Medium.otf
-otf-cjml-v Identity-V YuMin-Medium.otf
-otf-cjmr-h Identity-H YuMin-Medium.otf
-otf-cjmr-v Identity-V YuMin-Medium.otf
-otf-cjmb-h Identity-H YuMin-Demibold.otf
-otf-cjmb-v Identity-V YuMin-Demibold.otf
-otf-cjgr-h Identity-H YuGo-Medium.otf
-otf-cjgr-v Identity-V YuGo-Medium.otf
-otf-cjgb-h Identity-H YuGo-Bold.otf
-otf-cjgb-v Identity-V YuGo-Bold.otf
-otf-cjge-h Identity-H YuGo-Bold.otf
-otf-cjge-v Identity-V YuGo-Bold.otf
-otf-cjmgr-h Identity-H YuGo-Bold.otf
-otf-cjmgr-v Identity-V YuGo-Bold.otf
-
-% Unicode 90JIS
-otf-ujml-h UniJIS-UTF16-H YuMin-Medium.otf
-otf-ujml-v UniJIS-UTF16-V YuMin-Medium.otf
-otf-ujmr-h UniJIS-UTF16-H YuMin-Medium.otf
-otf-ujmr-v UniJIS-UTF16-V YuMin-Medium.otf
-otf-ujmb-h UniJIS-UTF16-H YuMin-Demibold.otf
-otf-ujmb-v UniJIS-UTF16-V YuMin-Demibold.otf
-otf-ujgr-h UniJIS-UTF16-H YuGo-Medium.otf
-otf-ujgr-v UniJIS-UTF16-V YuGo-Medium.otf
-otf-ujgb-h UniJIS-UTF16-H YuGo-Bold.otf
-otf-ujgb-v UniJIS-UTF16-V YuGo-Bold.otf
-otf-ujge-h UniJIS-UTF16-H YuGo-Bold.otf
-otf-ujge-v UniJIS-UTF16-V YuGo-Bold.otf
-otf-ujmgr-h UniJIS-UTF16-H YuGo-Bold.otf
-otf-ujmgr-v UniJIS-UTF16-V YuGo-Bold.otf
-
-% Unicode JIS04
-otf-ujmln-h UniJIS2004-UTF16-H YuMin-Medium.otf
-otf-ujmln-v UniJIS2004-UTF16-V YuMin-Medium.otf
-otf-ujmrn-h UniJIS2004-UTF16-H YuMin-Medium.otf
-otf-ujmrn-v UniJIS2004-UTF16-V YuMin-Medium.otf
-otf-ujmbn-h UniJIS2004-UTF16-H YuMin-Demibold.otf
-otf-ujmbn-v UniJIS2004-UTF16-V YuMin-Demibold.otf
-otf-ujgrn-h UniJIS2004-UTF16-H YuGo-Medium.otf
-otf-ujgrn-v UniJIS2004-UTF16-V YuGo-Medium.otf
-otf-ujgbn-h UniJIS2004-UTF16-H YuGo-Bold.otf
-otf-ujgbn-v UniJIS2004-UTF16-V YuGo-Bold.otf
-otf-ujgen-h UniJIS2004-UTF16-H YuGo-Bold.otf
-otf-ujgen-v UniJIS2004-UTF16-V YuGo-Bold.otf
-otf-ujmgrn-h UniJIS2004-UTF16-H YuGo-Bold.otf
-otf-ujmgrn-v UniJIS2004-UTF16-V YuGo-Bold.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/ptex-yu-osx-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/ptex-yu-osx-04.map
deleted file mode 100644
index 6820e7a3954..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/ptex-yu-osx-04.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml 2004-H YuMin-Medium.otf
-rmlv 2004-V YuMin-Medium.otf
-gbm 2004-H YuGo-Medium.otf
-gbmv 2004-V YuGo-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/ptex-yu-osx.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/ptex-yu-osx.map
deleted file mode 100644
index 1e91e0f0e2a..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/ptex-yu-osx.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml H YuMin-Medium.otf
-rmlv V YuMin-Medium.otf
-gbm H YuGo-Medium.otf
-gbmv V YuGo-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/uptex-yu-osx-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/uptex-yu-osx-04.map
deleted file mode 100644
index 350e04c772d..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/uptex-yu-osx-04.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS2004-UTF16-H YuMin-Medium.otf
-urmlv UniJIS2004-UTF16-V YuMin-Medium.otf
-ugbm UniJIS2004-UTF16-H YuGo-Medium.otf
-ugbmv UniJIS2004-UTF16-V YuGo-Medium.otf
-uprml-h UniJIS2004-UTF16-H YuMin-Medium.otf
-uprml-v UniJIS2004-UTF16-V YuMin-Medium.otf
-upgbm-h UniJIS2004-UTF16-H YuGo-Medium.otf
-upgbm-v UniJIS2004-UTF16-V YuGo-Medium.otf
-uprml-hq UniJIS-UCS2-H YuMin-Medium.otf
-upgbm-hq UniJIS-UCS2-H YuGo-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/uptex-yu-osx.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/uptex-yu-osx.map
deleted file mode 100644
index 32cea92dd21..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/uptex-yu-osx.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS-UTF16-H YuMin-Medium.otf
-urmlv UniJIS-UTF16-V YuMin-Medium.otf
-ugbm UniJIS-UTF16-H YuGo-Medium.otf
-ugbmv UniJIS-UTF16-V YuGo-Medium.otf
-uprml-h UniJIS-UTF16-H YuMin-Medium.otf
-uprml-v UniJIS-UTF16-V YuMin-Medium.otf
-upgbm-h UniJIS-UTF16-H YuGo-Medium.otf
-upgbm-v UniJIS-UTF16-V YuGo-Medium.otf
-uprml-hq UniJIS-UCS2-H YuMin-Medium.otf
-upgbm-hq UniJIS-UCS2-H YuGo-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/otf-up-yu-win.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/otf-up-yu-win.map
deleted file mode 100644
index 10b1c6a4c9c..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/otf-up-yu-win.map
+++ /dev/null
@@ -1,32 +0,0 @@
-
-% TEXT, 90JIS
-uphminl-h UniJIS-UTF16-H yuminl.ttf %!PS YuMincho-Light
-uphminl-v UniJIS-UTF16-V yuminl.ttf %!PS YuMincho-Light
-uphminr-h UniJIS-UTF16-H yumin.ttf %!PS YuMincho-Regular
-uphminr-v UniJIS-UTF16-V yumin.ttf %!PS YuMincho-Regular
-uphminb-h UniJIS-UTF16-H yumindb.ttf %!PS YuMincho-DemiBold
-uphminb-v UniJIS-UTF16-V yumindb.ttf %!PS YuMincho-DemiBold
-uphgothr-h UniJIS-UTF16-H yugothic.ttf %!PS YuGothic-Regular
-uphgothr-v UniJIS-UTF16-V yugothic.ttf %!PS YuGothic-Regular
-uphgothb-h UniJIS-UTF16-H yugothib.ttf %!PS YuGothic-Bold
-uphgothb-v UniJIS-UTF16-V yugothib.ttf %!PS YuGothic-Bold
-uphgotheb-h UniJIS-UTF16-H yugothib.ttf %!PS YuGothic-Bold
-uphgotheb-v UniJIS-UTF16-V yugothib.ttf %!PS YuGothic-Bold
-uphmgothr-h UniJIS-UTF16-H yugothib.ttf %!PS YuGothic-Bold
-uphmgothr-v UniJIS-UTF16-V yugothib.ttf %!PS YuGothic-Bold
-
-% TEXT, JIS04
-uphminln-h UniJIS2004-UTF16-H yuminl.ttf %!PS YuMincho-Light
-uphminln-v UniJIS2004-UTF16-V yuminl.ttf %!PS YuMincho-Light
-uphminrn-h UniJIS2004-UTF16-H yumin.ttf %!PS YuMincho-Regular
-uphminrn-v UniJIS2004-UTF16-V yumin.ttf %!PS YuMincho-Regular
-uphminbn-h UniJIS2004-UTF16-H yumindb.ttf %!PS YuMincho-DemiBold
-uphminbn-v UniJIS2004-UTF16-V yumindb.ttf %!PS YuMincho-DemiBold
-uphgothrn-h UniJIS2004-UTF16-H yugothic.ttf %!PS YuGothic-Regular
-uphgothrn-v UniJIS2004-UTF16-V yugothic.ttf %!PS YuGothic-Regular
-uphgothbn-h UniJIS2004-UTF16-H yugothib.ttf %!PS YuGothic-Bold
-uphgothbn-v UniJIS2004-UTF16-V yugothib.ttf %!PS YuGothic-Bold
-uphgothebn-h UniJIS2004-UTF16-H yugothib.ttf %!PS YuGothic-Bold
-uphgothebn-v UniJIS2004-UTF16-V yugothib.ttf %!PS YuGothic-Bold
-uphmgothrn-h UniJIS2004-UTF16-H yugothib.ttf %!PS YuGothic-Bold
-uphmgothrn-v UniJIS2004-UTF16-V yugothib.ttf %!PS YuGothic-Bold
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/otf-yu-win.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/otf-yu-win.map
deleted file mode 100644
index 8bf00f2f0ee..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/otf-yu-win.map
+++ /dev/null
@@ -1,80 +0,0 @@
-
-% TEXT, 90JIS
-hminl-h H yuminl.ttf %!PS YuMincho-Light
-hminl-v V yuminl.ttf %!PS YuMincho-Light
-hminr-h H yumin.ttf %!PS YuMincho-Regular
-hminr-v V yumin.ttf %!PS YuMincho-Regular
-hminb-h H yumindb.ttf %!PS YuMincho-DemiBold
-hminb-v V yumindb.ttf %!PS YuMincho-DemiBold
-hgothr-h H yugothic.ttf %!PS YuGothic-Regular
-hgothr-v V yugothic.ttf %!PS YuGothic-Regular
-hgothb-h H yugothib.ttf %!PS YuGothic-Bold
-hgothb-v V yugothib.ttf %!PS YuGothic-Bold
-hgotheb-h H yugothib.ttf %!PS YuGothic-Bold
-hgotheb-v V yugothib.ttf %!PS YuGothic-Bold
-hmgothr-h H yugothib.ttf %!PS YuGothic-Bold
-hmgothr-v V yugothib.ttf %!PS YuGothic-Bold
-
-% TEXT, JIS04
-hminln-h H yuminl.ttf %!PS YuMincho-Light
-hminln-v V yuminl.ttf %!PS YuMincho-Light
-hminrn-h H yumin.ttf %!PS YuMincho-Regular
-hminrn-v V yumin.ttf %!PS YuMincho-Regular
-hminbn-h H yumindb.ttf %!PS YuMincho-DemiBold
-hminbn-v V yumindb.ttf %!PS YuMincho-DemiBold
-hgothrn-h H yugothic.ttf %!PS YuGothic-Regular
-hgothrn-v V yugothic.ttf %!PS YuGothic-Regular
-hgothbn-h H yugothib.ttf %!PS YuGothic-Bold
-hgothbn-v V yugothib.ttf %!PS YuGothic-Bold
-hgothebn-h H yugothib.ttf %!PS YuGothic-Bold
-hgothebn-v V yugothib.ttf %!PS YuGothic-Bold
-hmgothrn-h H yugothib.ttf %!PS YuGothic-Bold
-hmgothrn-v V yugothib.ttf %!PS YuGothic-Bold
-
-% CID
-otf-cjml-h Identity-H yuminl.ttf/AJ16 %!PS YuMincho-Light
-otf-cjml-v Identity-V yuminl.ttf/AJ16 %!PS YuMincho-Light
-otf-cjmr-h Identity-H yumin.ttf/AJ16 %!PS YuMincho-Regular
-otf-cjmr-v Identity-V yumin.ttf/AJ16 %!PS YuMincho-Regular
-otf-cjmb-h Identity-H yumindb.ttf/AJ16 %!PS YuMincho-DemiBold
-otf-cjmb-v Identity-V yumindb.ttf/AJ16 %!PS YuMincho-DemiBold
-otf-cjgr-h Identity-H yugothic.ttf/AJ16 %!PS YuGothic-Regular
-otf-cjgr-v Identity-V yugothic.ttf/AJ16 %!PS YuGothic-Regular
-otf-cjgb-h Identity-H yugothib.ttf/AJ16 %!PS YuGothic-Bold
-otf-cjgb-v Identity-V yugothib.ttf/AJ16 %!PS YuGothic-Bold
-otf-cjge-h Identity-H yugothib.ttf/AJ16 %!PS YuGothic-Bold
-otf-cjge-v Identity-V yugothib.ttf/AJ16 %!PS YuGothic-Bold
-otf-cjmgr-h Identity-H yugothib.ttf/AJ16 %!PS YuGothic-Bold
-otf-cjmgr-v Identity-V yugothib.ttf/AJ16 %!PS YuGothic-Bold
-
-% Unicode 90JIS
-otf-ujml-h UniJIS-UTF16-H yuminl.ttf %!PS YuMincho-Light
-otf-ujml-v UniJIS-UTF16-V yuminl.ttf %!PS YuMincho-Light
-otf-ujmr-h UniJIS-UTF16-H yumin.ttf %!PS YuMincho-Regular
-otf-ujmr-v UniJIS-UTF16-V yumin.ttf %!PS YuMincho-Regular
-otf-ujmb-h UniJIS-UTF16-H yumindb.ttf %!PS YuMincho-DemiBold
-otf-ujmb-v UniJIS-UTF16-V yumindb.ttf %!PS YuMincho-DemiBold
-otf-ujgr-h UniJIS-UTF16-H yugothic.ttf %!PS YuGothic-Regular
-otf-ujgr-v UniJIS-UTF16-V yugothic.ttf %!PS YuGothic-Regular
-otf-ujgb-h UniJIS-UTF16-H yugothib.ttf %!PS YuGothic-Bold
-otf-ujgb-v UniJIS-UTF16-V yugothib.ttf %!PS YuGothic-Bold
-otf-ujge-h UniJIS-UTF16-H yugothib.ttf %!PS YuGothic-Bold
-otf-ujge-v UniJIS-UTF16-V yugothib.ttf %!PS YuGothic-Bold
-otf-ujmgr-h UniJIS-UTF16-H yugothib.ttf %!PS YuGothic-Bold
-otf-ujmgr-v UniJIS-UTF16-V yugothib.ttf %!PS YuGothic-Bold
-
-% Unicode JIS04
-otf-ujmln-h UniJIS2004-UTF16-H yuminl.ttf %!PS YuMincho-Light
-otf-ujmln-v UniJIS2004-UTF16-V yuminl.ttf %!PS YuMincho-Light
-otf-ujmrn-h UniJIS2004-UTF16-H yumin.ttf %!PS YuMincho-Regular
-otf-ujmrn-v UniJIS2004-UTF16-V yumin.ttf %!PS YuMincho-Regular
-otf-ujmbn-h UniJIS2004-UTF16-H yumindb.ttf %!PS YuMincho-DemiBold
-otf-ujmbn-v UniJIS2004-UTF16-V yumindb.ttf %!PS YuMincho-DemiBold
-otf-ujgrn-h UniJIS2004-UTF16-H yugothic.ttf %!PS YuGothic-Regular
-otf-ujgrn-v UniJIS2004-UTF16-V yugothic.ttf %!PS YuGothic-Regular
-otf-ujgbn-h UniJIS2004-UTF16-H yugothib.ttf %!PS YuGothic-Bold
-otf-ujgbn-v UniJIS2004-UTF16-V yugothib.ttf %!PS YuGothic-Bold
-otf-ujgen-h UniJIS2004-UTF16-H yugothib.ttf %!PS YuGothic-Bold
-otf-ujgen-v UniJIS2004-UTF16-V yugothib.ttf %!PS YuGothic-Bold
-otf-ujmgrn-h UniJIS2004-UTF16-H yugothib.ttf %!PS YuGothic-Bold
-otf-ujmgrn-v UniJIS2004-UTF16-V yugothib.ttf %!PS YuGothic-Bold
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/ptex-yu-win.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/ptex-yu-win.map
deleted file mode 100644
index ee34a0ad1d6..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/ptex-yu-win.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml H yumin.ttf %!PS YuMincho-Regular
-rmlv V yumin.ttf %!PS YuMincho-Regular
-gbm H yugothic.ttf %!PS YuGothic-Regular
-gbmv V yugothic.ttf %!PS YuGothic-Regular
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/uptex-yu-win.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/uptex-yu-win.map
deleted file mode 100644
index 90b29697efe..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/uptex-yu-win.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS-UTF16-H yumin.ttf %!PS YuMincho-Regular
-urmlv UniJIS-UTF16-V yumin.ttf %!PS YuMincho-Regular
-ugbm UniJIS-UTF16-H yugothic.ttf %!PS YuGothic-Regular
-ugbmv UniJIS-UTF16-V yugothic.ttf %!PS YuGothic-Regular
-uprml-h UniJIS-UTF16-H yumin.ttf %!PS YuMincho-Regular
-uprml-v UniJIS-UTF16-V yumin.ttf %!PS YuMincho-Regular
-upgbm-h UniJIS-UTF16-H yugothic.ttf %!PS YuGothic-Regular
-upgbm-v UniJIS-UTF16-V yugothic.ttf %!PS YuGothic-Regular
-uprml-hq UniJIS-UCS2-H yumin.ttf %!PS YuMincho-Regular
-upgbm-hq UniJIS-UCS2-H yugothic.ttf %!PS YuGothic-Regular
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/otf-up-yu-win10.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/otf-up-yu-win10.map
deleted file mode 100644
index 2d1bf333ab7..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/otf-up-yu-win10.map
+++ /dev/null
@@ -1,32 +0,0 @@
-
-% TEXT, 90JIS
-uphminl-h UniJIS-UTF16-H yuminl.ttf %!PS YuMincho-Light
-uphminl-v UniJIS-UTF16-V yuminl.ttf %!PS YuMincho-Light
-uphminr-h UniJIS-UTF16-H yumin.ttf %!PS YuMincho-Regular
-uphminr-v UniJIS-UTF16-V yumin.ttf %!PS YuMincho-Regular
-uphminb-h UniJIS-UTF16-H yumindb.ttf %!PS YuMincho-DemiBold
-uphminb-v UniJIS-UTF16-V yumindb.ttf %!PS YuMincho-DemiBold
-uphgothr-h UniJIS-UTF16-H :0:YuGothR.ttc %!PS YuGothic-Regular
-uphgothr-v UniJIS-UTF16-V :0:YuGothR.ttc %!PS YuGothic-Regular
-uphgothb-h UniJIS-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold
-uphgothb-v UniJIS-UTF16-V :0:YuGothB.ttc %!PS YuGothic-Bold
-uphgotheb-h UniJIS-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold
-uphgotheb-v UniJIS-UTF16-V :0:YuGothB.ttc %!PS YuGothic-Bold
-uphmgothr-h UniJIS-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold
-uphmgothr-v UniJIS-UTF16-V :0:YuGothB.ttc %!PS YuGothic-Bold
-
-% TEXT, JIS04
-uphminln-h UniJIS2004-UTF16-H yuminl.ttf %!PS YuMincho-Light
-uphminln-v UniJIS2004-UTF16-V yuminl.ttf %!PS YuMincho-Light
-uphminrn-h UniJIS2004-UTF16-H yumin.ttf %!PS YuMincho-Regular
-uphminrn-v UniJIS2004-UTF16-V yumin.ttf %!PS YuMincho-Regular
-uphminbn-h UniJIS2004-UTF16-H yumindb.ttf %!PS YuMincho-DemiBold
-uphminbn-v UniJIS2004-UTF16-V yumindb.ttf %!PS YuMincho-DemiBold
-uphgothrn-h UniJIS2004-UTF16-H :0:YuGothR.ttc %!PS YuGothic-Regular
-uphgothrn-v UniJIS2004-UTF16-V :0:YuGothR.ttc %!PS YuGothic-Regular
-uphgothbn-h UniJIS2004-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold
-uphgothbn-v UniJIS2004-UTF16-V :0:YuGothB.ttc %!PS YuGothic-Bold
-uphgothebn-h UniJIS2004-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold
-uphgothebn-v UniJIS2004-UTF16-V :0:YuGothB.ttc %!PS YuGothic-Bold
-uphmgothrn-h UniJIS2004-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold
-uphmgothrn-v UniJIS2004-UTF16-V :0:YuGothB.ttc %!PS YuGothic-Bold
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/otf-yu-win10.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/otf-yu-win10.map
deleted file mode 100644
index 0d4f3ab7d48..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/otf-yu-win10.map
+++ /dev/null
@@ -1,80 +0,0 @@
-
-% TEXT, 90JIS
-hminl-h H yuminl.ttf %!PS YuMincho-Light
-hminl-v V yuminl.ttf %!PS YuMincho-Light
-hminr-h H yumin.ttf %!PS YuMincho-Regular
-hminr-v V yumin.ttf %!PS YuMincho-Regular
-hminb-h H yumindb.ttf %!PS YuMincho-DemiBold
-hminb-v V yumindb.ttf %!PS YuMincho-DemiBold
-hgothr-h H :0:YuGothR.ttc %!PS YuGothic-Regular
-hgothr-v V :0:YuGothR.ttc %!PS YuGothic-Regular
-hgothb-h H :0:YuGothB.ttc %!PS YuGothic-Bold
-hgothb-v V :0:YuGothB.ttc %!PS YuGothic-Bold
-hgotheb-h H :0:YuGothB.ttc %!PS YuGothic-Bold
-hgotheb-v V :0:YuGothB.ttc %!PS YuGothic-Bold
-hmgothr-h H :0:YuGothB.ttc %!PS YuGothic-Bold
-hmgothr-v V :0:YuGothB.ttc %!PS YuGothic-Bold
-
-% TEXT, JIS04
-hminln-h H yuminl.ttf %!PS YuMincho-Light
-hminln-v V yuminl.ttf %!PS YuMincho-Light
-hminrn-h H yumin.ttf %!PS YuMincho-Regular
-hminrn-v V yumin.ttf %!PS YuMincho-Regular
-hminbn-h H yumindb.ttf %!PS YuMincho-DemiBold
-hminbn-v V yumindb.ttf %!PS YuMincho-DemiBold
-hgothrn-h H :0:YuGothR.ttc %!PS YuGothic-Regular
-hgothrn-v V :0:YuGothR.ttc %!PS YuGothic-Regular
-hgothbn-h H :0:YuGothB.ttc %!PS YuGothic-Bold
-hgothbn-v V :0:YuGothB.ttc %!PS YuGothic-Bold
-hgothebn-h H :0:YuGothB.ttc %!PS YuGothic-Bold
-hgothebn-v V :0:YuGothB.ttc %!PS YuGothic-Bold
-hmgothrn-h H :0:YuGothB.ttc %!PS YuGothic-Bold
-hmgothrn-v V :0:YuGothB.ttc %!PS YuGothic-Bold
-
-% CID
-otf-cjml-h Identity-H yuminl.ttf/AJ16 %!PS YuMincho-Light
-otf-cjml-v Identity-V yuminl.ttf/AJ16 %!PS YuMincho-Light
-otf-cjmr-h Identity-H yumin.ttf/AJ16 %!PS YuMincho-Regular
-otf-cjmr-v Identity-V yumin.ttf/AJ16 %!PS YuMincho-Regular
-otf-cjmb-h Identity-H yumindb.ttf/AJ16 %!PS YuMincho-DemiBold
-otf-cjmb-v Identity-V yumindb.ttf/AJ16 %!PS YuMincho-DemiBold
-otf-cjgr-h Identity-H :0:YuGothR.ttc/AJ16 %!PS YuGothic-Regular
-otf-cjgr-v Identity-V :0:YuGothR.ttc/AJ16 %!PS YuGothic-Regular
-otf-cjgb-h Identity-H :0:YuGothB.ttc/AJ16 %!PS YuGothic-Bold
-otf-cjgb-v Identity-V :0:YuGothB.ttc/AJ16 %!PS YuGothic-Bold
-otf-cjge-h Identity-H :0:YuGothB.ttc/AJ16 %!PS YuGothic-Bold
-otf-cjge-v Identity-V :0:YuGothB.ttc/AJ16 %!PS YuGothic-Bold
-otf-cjmgr-h Identity-H :0:YuGothB.ttc/AJ16 %!PS YuGothic-Bold
-otf-cjmgr-v Identity-V :0:YuGothB.ttc/AJ16 %!PS YuGothic-Bold
-
-% Unicode 90JIS
-otf-ujml-h UniJIS-UTF16-H yuminl.ttf %!PS YuMincho-Light
-otf-ujml-v UniJIS-UTF16-V yuminl.ttf %!PS YuMincho-Light
-otf-ujmr-h UniJIS-UTF16-H yumin.ttf %!PS YuMincho-Regular
-otf-ujmr-v UniJIS-UTF16-V yumin.ttf %!PS YuMincho-Regular
-otf-ujmb-h UniJIS-UTF16-H yumindb.ttf %!PS YuMincho-DemiBold
-otf-ujmb-v UniJIS-UTF16-V yumindb.ttf %!PS YuMincho-DemiBold
-otf-ujgr-h UniJIS-UTF16-H :0:YuGothR.ttc %!PS YuGothic-Regular
-otf-ujgr-v UniJIS-UTF16-V :0:YuGothR.ttc %!PS YuGothic-Regular
-otf-ujgb-h UniJIS-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold
-otf-ujgb-v UniJIS-UTF16-V :0:YuGothB.ttc %!PS YuGothic-Bold
-otf-ujge-h UniJIS-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold
-otf-ujge-v UniJIS-UTF16-V :0:YuGothB.ttc %!PS YuGothic-Bold
-otf-ujmgr-h UniJIS-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold
-otf-ujmgr-v UniJIS-UTF16-V :0:YuGothB.ttc %!PS YuGothic-Bold
-
-% Unicode JIS04
-otf-ujmln-h UniJIS2004-UTF16-H yuminl.ttf %!PS YuMincho-Light
-otf-ujmln-v UniJIS2004-UTF16-V yuminl.ttf %!PS YuMincho-Light
-otf-ujmrn-h UniJIS2004-UTF16-H yumin.ttf %!PS YuMincho-Regular
-otf-ujmrn-v UniJIS2004-UTF16-V yumin.ttf %!PS YuMincho-Regular
-otf-ujmbn-h UniJIS2004-UTF16-H yumindb.ttf %!PS YuMincho-DemiBold
-otf-ujmbn-v UniJIS2004-UTF16-V yumindb.ttf %!PS YuMincho-DemiBold
-otf-ujgrn-h UniJIS2004-UTF16-H :0:YuGothR.ttc %!PS YuGothic-Regular
-otf-ujgrn-v UniJIS2004-UTF16-V :0:YuGothR.ttc %!PS YuGothic-Regular
-otf-ujgbn-h UniJIS2004-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold
-otf-ujgbn-v UniJIS2004-UTF16-V :0:YuGothB.ttc %!PS YuGothic-Bold
-otf-ujgen-h UniJIS2004-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold
-otf-ujgen-v UniJIS2004-UTF16-V :0:YuGothB.ttc %!PS YuGothic-Bold
-otf-ujmgrn-h UniJIS2004-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold
-otf-ujmgrn-v UniJIS2004-UTF16-V :0:YuGothB.ttc %!PS YuGothic-Bold
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/ptex-yu-win10.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/ptex-yu-win10.map
deleted file mode 100644
index 6723260b648..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/ptex-yu-win10.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml H yumin.ttf %!PS YuMincho-Regular
-rmlv V yumin.ttf %!PS YuMincho-Regular
-gbm H :0:YuGothM.ttc %!PS YuGothic-Medium
-gbmv V :0:YuGothM.ttc %!PS YuGothic-Medium
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/uptex-yu-win10.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/uptex-yu-win10.map
deleted file mode 100644
index bdf7659b4c6..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/uptex-yu-win10.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS-UTF16-H yumin.ttf %!PS YuMincho-Regular
-urmlv UniJIS-UTF16-V yumin.ttf %!PS YuMincho-Regular
-ugbm UniJIS-UTF16-H :0:YuGothM.ttc %!PS YuGothic-Medium
-ugbmv UniJIS-UTF16-V :0:YuGothM.ttc %!PS YuGothic-Medium
-uprml-h UniJIS-UTF16-H yumin.ttf %!PS YuMincho-Regular
-uprml-v UniJIS-UTF16-V yumin.ttf %!PS YuMincho-Regular
-upgbm-h UniJIS-UTF16-H :0:YuGothM.ttc %!PS YuGothic-Medium
-upgbm-v UniJIS-UTF16-V :0:YuGothM.ttc %!PS YuGothic-Medium
-uprml-hq UniJIS-UCS2-H yumin.ttf %!PS YuMincho-Regular
-upgbm-hq UniJIS-UCS2-H :0:YuGothM.ttc %!PS YuGothic-Medium