From 2819801d7589a3d26936698032383d93ea9bc2db Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Fri, 2 Oct 2015 22:13:29 +0000
Subject: cjk-gs-integrate (2oct15)

git-svn-id: svn://tug.org/texlive/trunk@38525 c570f23f-e606-0410-a88d-b1316a301751
---
 .../cjk-gs-integrate/cjk-gs-integrate.pl           | 463 +++++++++++++--------
 .../jfontmaps/kanji-config-updmap.pl               |  23 +-
 .../jfontmaps/kanji-fontmap-creator.pl             |   4 +-
 .../doc/fonts/cjk-gs-integrate/ChangeLog           |  72 +++-
 .../texmf-dist/doc/fonts/cjk-gs-integrate/README   | 172 ++++++++
 .../doc/fonts/cjk-gs-integrate/README.md           | 170 --------
 .../doc/fonts/cjk-gs-integrate/tools/release.sh    |   2 +
 .../scripts/cjk-gs-integrate/cjk-gs-integrate.pl   | 463 +++++++++++++--------
 8 files changed, 823 insertions(+), 546 deletions(-)
 create mode 100644 Master/texmf-dist/doc/fonts/cjk-gs-integrate/README
 delete mode 100644 Master/texmf-dist/doc/fonts/cjk-gs-integrate/README.md

diff --git a/Build/source/texk/texlive/linked_scripts/cjk-gs-integrate/cjk-gs-integrate.pl b/Build/source/texk/texlive/linked_scripts/cjk-gs-integrate/cjk-gs-integrate.pl
index 59badebf341..7641cbcb26b 100755
--- a/Build/source/texk/texlive/linked_scripts/cjk-gs-integrate/cjk-gs-integrate.pl
+++ b/Build/source/texk/texlive/linked_scripts/cjk-gs-integrate/cjk-gs-integrate.pl
@@ -22,10 +22,11 @@
 $^W = 1;
 use Getopt::Long qw(:config no_autoabbrev ignore_case_always);
 use File::Basename;
+use File::Path qw(make_path);
 use strict;
 
 (my $prg = basename($0)) =~ s/\.pl$//;
-my $version = '20150506.1';
+my $version = '20151002.0';
 
 if (win32()) {
   print_error("Sorry, currently not supported on Windows!\n");
@@ -34,6 +35,8 @@ if (win32()) {
 
 my %encode_list = (
   Japan => [ qw/
+    2004-H
+    2004-V
     78-EUC-H
     78-EUC-V
     78-H
@@ -220,6 +223,7 @@ my $opt_debug = 0;
 my $opt_listaliases = 0;
 my $opt_listallaliases = 0;
 my $opt_listfonts = 0;
+my $opt_remove = 0;
 my $opt_info = 0;
 my $opt_fontdef;
 my $opt_output;
@@ -228,7 +232,7 @@ my $opt_only_aliases = 0;
 my $opt_machine = 0;
 my $opt_filelist;
 my $opt_force = 0;
-my $opt_texmflink = 0;
+my $opt_texmflink;
 my $opt_markdown = 0;
 
 if (! GetOptions(
@@ -237,14 +241,15 @@ if (! GetOptions(
         "list-aliases" => \$opt_listaliases,
         "list-all-aliases" => \$opt_listallaliases,
         "list-fonts"  => \$opt_listfonts,
-        "link-texmflocal" => \$opt_texmflink,
+        "link-texmf:s" => \$opt_texmflink,
+        "remove"       => \$opt_remove,
         "only-aliases" => \$opt_only_aliases,
         "machine-readable" => \$opt_machine,
         "force"       => \$opt_force,
         "filelist=s"  => \$opt_filelist,
         "markdown"    => \$opt_markdown,
         "o|output=s"  => \$opt_output,
-	      "h|help"      => \$opt_help,
+        "h|help"      => \$opt_help,
         "q|quiet"     => \$opt_quiet,
         "d|debug+"    => \$opt_debug,
         "f|fontdef=s" => \$opt_fontdef,
@@ -270,7 +275,20 @@ if ($opt_debug) {
   $Data::Dumper::Indent = 1;
 }
 
-chomp (my $TEXMFLOCAL = `kpsewhich -var-value=TEXMFLOCAL`);
+if (defined($opt_texmflink)) {
+  my $foo;
+  if ($opt_texmflink eq '') {
+    # option was passed but didn't receive a value
+    #  -> use TEXMFLOCAL
+    chomp( $foo = `kpsewhich -var-value=TEXMFLOCAL`);
+  } else {
+    # option was passed with an argument
+    #  -> use it
+    $foo = $opt_texmflink;
+  }
+  $opt_texmflink = $foo;
+}
+
 
 main(@ARGV);
 
@@ -280,6 +298,7 @@ main(@ARGV);
 sub main {
   print_info("reading font database ...\n");
   read_font_database();
+  determine_ttf_link_target(); # see comments there
   if (!$opt_listallaliases) {
     print_info("checking for files ...\n");
     check_for_files();
@@ -358,12 +377,12 @@ sub main {
   }
   print_info("output is going to $opt_output\n");
   if (!$opt_only_aliases) {
-    print_info("generating font snippets and link CID fonts ...\n");
+    print_info(($opt_remove ? "removing" : "generating") . " font snippets and link CID fonts ...\n");
     do_otf_fonts();
-    print_info("generating font snippets, links, and cidfmap.local for TTF fonts ...\n");
+    print_info(($opt_remove ? "removing" : "generating") . " font snippets, links, and cidfmap.local for TTF fonts ...\n");
     do_ttf_fonts();
   }
-  print_info("generating font aliases ...\n");
+  print_info(($opt_remove ? "removing" : "generating") . " font aliases ...\n");
   do_aliases();
   print_info("finished\n");
 }
@@ -371,18 +390,35 @@ sub main {
 sub update_master_cidfmap {
   my $add = shift;
   my $cidfmap_master = "$opt_output/Init/cidfmap";
+  print_info(sprintf("%s $add %s cidfmap file ...\n", 
+    ($opt_remove ? "removing" : "adding"), ($opt_remove ? "from" : "to")));
   if (-r $cidfmap_master) {
     open(FOO, "<", $cidfmap_master) ||
       die ("Cannot open $cidfmap_master for reading: $!");
     my $found = 0;
+    my $newmaster = "";
+    # in add mode: just search for the entry and set $found
+    # in remove mode: collect all lines that do not match
     while(<FOO>) {
-      $found = 1 if
-        m/^\s*\(\Q$add\E\)\s\s*\.runlibfile\s*$/;
+      if (m/^\s*\(\Q$add\E\)\s\s*\.runlibfile\s*$/) {
+        $found = 1;
+      } else {
+        $newmaster .= $_;
+      }
     }
+    close(FOO);
     if ($found) {
-      print_info("$add already loaded in $cidfmap_master, no changes\n");
+      if ($opt_remove) {
+        open(FOO, ">", $cidfmap_master) ||
+          die ("Cannot clean up $cidfmap_master: $!");
+        print FOO $newmaster;
+        close FOO;
+      } else {
+        print_info("$add already loaded in $cidfmap_master, no changes\n");
+      }
     } else {
       return if $dry_run;
+      return if $opt_remove;
       open(FOO, ">>", $cidfmap_master) ||
         die ("Cannot open $cidfmap_master for appending: $!");
       print FOO "($add) .runlibfile\n";
@@ -390,6 +426,7 @@ sub update_master_cidfmap {
     }
   } else {
     return if $dry_run;
+    return if $opt_remove;
     open(FOO, ">", $cidfmap_master) ||
       die ("Cannot open $cidfmap_master for writing: $!");
     print FOO "($add) .runlibfile\n";
@@ -405,7 +442,7 @@ sub make_dir {
       exit 1;
     }
   } else {
-    $dry_run || mkdir($d);
+    $dry_run || make_path($d);
   }
 }
 
@@ -414,8 +451,7 @@ sub do_otf_fonts {
   my $ciddest  = "$opt_output/CIDFont";
   make_dir($fontdest, "cannot create CID snippets there!");
   make_dir($ciddest,  "cannot link CID fonts there!");
-  print "opt_texfmlink = $opt_texmflink\n";
-  make_dir("$TEXMFLOCAL/fonts/opentype/cjk-gs-integrate",
+  make_dir("$opt_texmflink/fonts/opentype/cjk-gs-integrate",
            "cannot link fonts to it!")
     if $opt_texmflink;
   for my $k (keys %fontdb) {
@@ -423,7 +459,7 @@ sub do_otf_fonts {
       generate_font_snippet($fontdest,
         $k, $fontdb{$k}{'class'}, $fontdb{$k}{'target'});
       link_font($fontdb{$k}{'target'}, $ciddest, $k);
-      link_font($fontdb{$k}{'target'}, "$TEXMFLOCAL/fonts/opentype/cjk-gs-integrate")
+      link_font($fontdb{$k}{'target'}, "$opt_texmflink/fonts/opentype/cjk-gs-integrate")
         if $opt_texmflink;
     }
   }
@@ -433,6 +469,10 @@ sub generate_font_snippet {
   my ($fd, $n, $c, $f) = @_;
   return if $dry_run;
   for my $enc (@{$encode_list{$c}}) {
+    if ($opt_remove) {
+      unlink "$fd/$n-$enc" if (-f "$fd/$n-$enc");
+      next;
+    }
     open(FOO, ">$fd/$n-$enc") || 
       die("cannot open $fd/$n-$enc for writing: $!");
     print FOO "%%!PS-Adobe-3.0 Resource-Font
@@ -461,11 +501,13 @@ sub link_font {
   if ($opt_force && -e $target) {
     print_info("Removing $target prior to recreation due to --force\n");
     unlink($target) || die "Cannot unlink $target prior to recreation under --force: $!";
+    return if $opt_remove;
   }
   if (-l $target) {
     my $linkt = readlink($target);
     if ($linkt && -r $linkt) {
       if ($linkt eq $f) {
+        unlink($target) if $opt_remove;
         # do nothing, it is the same link
       } else {
         print_error("link $target already existing, but different target then $target, exiting!\n");
@@ -480,7 +522,11 @@ sub link_font {
       print_error("$target already existing, but not a link, exiting!\n");
       exit(1);
     } else {
-      symlink($f, $target) || die("Cannot link font $f to $target: $!");
+      if ($opt_remove) {
+        unlink($target);
+      } else {
+        symlink($f, $target) || die("Cannot link font $f to $target: $!");
+      }
     }
   }
 }
@@ -491,16 +537,16 @@ sub do_ttf_fonts {
   my $outp = '';
   make_dir($fontdest, "cannot create CID snippets there!");
   make_dir($cidfsubst,  "cannot link TTF fonts there!");
-  make_dir("$TEXMFLOCAL/fonts/truetype/cjk-gs-integrate",
+  make_dir("$opt_texmflink/fonts/truetype/cjk-gs-integrate",
            "cannot link fonts to it!")
     if $opt_texmflink;
   for my $k (keys %fontdb) {
     if ($fontdb{$k}{'available'} && $fontdb{$k}{'type'} eq 'TTF') {
       generate_font_snippet($fontdest,
         $k, $fontdb{$k}{'class'}, $fontdb{$k}{'target'});
-      $outp .= generate_cidfmap_entry($k, $fontdb{$k}{'class'}, $fontdb{$k}{'target'}, $fontdb{$k}{'subfont'});
-      link_font($fontdb{$k}{'target'}, $cidfsubst);
-      link_font($fontdb{$k}{'target'}, "$TEXMFLOCAL/fonts/truetype/cjk-gs-integrate")
+      $outp .= generate_cidfmap_entry($k, $fontdb{$k}{'class'}, $fontdb{$k}{'ttfname'}, $fontdb{$k}{'subfont'});
+      link_font($fontdb{$k}{'target'}, $cidfsubst, $fontdb{$k}{'ttfname'});
+      link_font($fontdb{$k}{'target'}, "$opt_texmflink/fonts/truetype/cjk-gs-integrate", $fontdb{$k}{'ttfname'})
         if $opt_texmflink;
     }
   }
@@ -515,7 +561,6 @@ sub do_ttf_fonts {
     print FOO $outp;
     close(FOO);
   }
-  print_info("adding cidfmap.local to cidfmap file ...\n");
   update_master_cidfmap('cidfmap.local');
 }
 
@@ -586,7 +631,7 @@ sub do_aliases {
   $outp .= "\n% Simplified Chinese fonts\n" . join("\n", @sal) . "\n" if @sal;
   #
   return if $dry_run;
-  if ($outp) {
+  if ($outp && !$opt_remove) {
     if (! -d "$opt_output/Init") {
       mkdir("$opt_output/Init") ||
         die("Cannot create directory $opt_output/Init: $!");
@@ -596,19 +641,18 @@ sub do_aliases {
     print FOO $outp;
     close(FOO);
   }
-  print_info("adding cidfmap.aliases to cidfmap file ...\n");
   update_master_cidfmap('cidfmap.aliases');
 }
 
 sub generate_cidfmap_entry {
   my ($n, $c, $f, $sf) = @_;
-  # we link the ttf fonts, so we use only the base name
-  # otherwise the ps2pdf breaks due to -dSAFER
-  my $bn = basename($f);
+  return "" if $opt_remove;
+  # $f is already the link target name 'ttfname'
+  # as determined by minimal priority number
   # extract subfont
   my $s = "/$n << /FileType /TrueType 
   /Path pssystemparams /GenericResourceDir get 
-  (CIDFSubst/$bn) concatstrings
+  (CIDFSubst/$f) concatstrings
   /SubfontID $sf
   /CSI [($c";
   if ($c eq "Japan") {
@@ -642,6 +686,9 @@ sub info_found_fonts {
         $fn .= "($fontdb{$k}{'subfont'})";
       }
       print "File:  $fn\n";
+      if ($fontdb{$k}{'type'} eq 'TTF') {
+        print "Link:  $fontdb{$k}{'ttfname'}\n";
+      }
       print "\n";
     }
   }
@@ -722,6 +769,10 @@ sub check_for_files {
     my $bn = basename($f);
     $bntofn{$bn} = $f;
   }
+  if ($opt_debug > 0) {
+    print_debug("dumping font database before file check:\n");
+    print_debug(Data::Dumper::Dumper(\%fontdb));
+  }
   if ($opt_debug > 1) {
     print_ddebug("dumping basename to filename list:\n");
     print_ddebug(Data::Dumper::Dumper(\%bntofn));
@@ -747,17 +798,19 @@ sub check_for_files {
   # second round to determine the winner in case of more targets
   for my $k (keys %fontdb) {
     if ($fontdb{$k}{'available'}) {
-      my $mp = 1000000; my $mf;
+      my $mp = 1000000; my $mf; my $mt;
       for my $f (keys %{$fontdb{$k}{'files'}}) {
         if ($fontdb{$k}{'files'}{$f}{'priority'} < $mp) {
           $mp = $fontdb{$k}{'files'}{$f}{'priority'};
           $mf = $f;
+          $mt = $fontdb{$k}{'files'}{$f}{'type'};
         }
       }
       # extract subfont if necessary
       my $sf = 0;
       if ($mf =~ m/^(.*)\((\d*)\)$/) { $sf = $2; }
       $fontdb{$k}{'target'} = $fontdb{$k}{'files'}{$mf}{'target'};
+      $fontdb{$k}{'type'} = $fontdb{$k}{'files'}{$mf}{'type'};
       $fontdb{$k}{'subfont'} = $sf if ($fontdb{$k}{'type'} eq 'TTF');
     }
     # not needed anymore
@@ -817,6 +870,31 @@ sub compute_aliases {
   }
 }
 
+# While the OTF link target is determined by the filename itself
+# for TTF we can have ttc with several fonts.
+# The following routine determines the link target by selecting
+# the file name of the ttf candidates with the lowest priority
+# as the link target name for TTF
+sub determine_ttf_link_target {
+  for my $k (keys %fontdb) {
+    my $ttfname;
+    my $mp = 10000000;
+    for my $f (keys %{$fontdb{$k}{'files'}}) {
+      if ($fontdb{$k}{'files'}{$f}{'type'} eq 'TTF') {
+        my $p = $fontdb{$k}{'files'}{$f}{'priority'};
+        if ($p < $mp) {
+          $ttfname = $f;
+          $ttfname =~ s/^(.*)\(\d*\)$/$1/;
+          $mp = $p;
+        }
+      }
+    }
+    if ($ttfname) {
+      $fontdb{$k}{'ttfname'} = $ttfname;
+    }
+  }
+}
+
 sub read_font_database {
   my @dbl;
   if ($opt_fontdef) {
@@ -831,7 +909,6 @@ sub read_font_database {
   # add a "final empty line" to easy parsing
   push @dbl, "";
   my $fontname = "";
-  my $fonttype = "";
   my $fontclass = "";
   my %fontprovides = ();
   my %fontfiles;
@@ -842,21 +919,23 @@ sub read_font_database {
 
     next if ($l =~ m/^\s*#/);
     if ($l =~ m/^\s*$/) {
-      if ($fontname || $fonttype || $fontclass || keys(%fontfiles)) {
-        if ($fontname && $fonttype && $fontclass && keys(%fontfiles)) {
+      if ($fontname || $fontclass || keys(%fontfiles)) {
+        if ($fontname && $fontclass && keys(%fontfiles)) {
           my $realfontname = ($psname ? $psname : $fontname);
-          $fontdb{$realfontname}{'type'} = $fonttype;
           $fontdb{$realfontname}{'class'} = $fontclass;
           $fontdb{$realfontname}{'files'} = { %fontfiles };
           $fontdb{$realfontname}{'provides'} = { %fontprovides };
+          if ($opt_debug > 1) {
+            print_ddebug("Dumping fontfiles for $realfontname: " . Data::Dumper::Dumper(\%fontfiles));
+          }
           # reset to start
-          $fontname = $fonttype = $fontclass = $psname = "";
+          $fontname = $fontclass = $psname = "";
           %fontfiles = ();
           %fontprovides = ();
         } else {
-          print_warning("incomplete entry above line $lineno for $fontname/$fonttype/$fontclass, skipping!\n");
+          print_warning("incomplete entry above line $lineno for $fontname/$fontclass, skipping!\n");
           # reset to start
-          $fontname = $fonttype = $fontclass = $psname = "";
+          $fontname = $fontclass = $psname = "";
           %fontfiles = ();
           %fontprovides = ();
         }
@@ -867,10 +946,21 @@ sub read_font_database {
     }
     if ($l =~ m/^Name:\s*(.*)$/) { $fontname = $1; next; }
     if ($l =~ m/^PSName:\s*(.*)$/) { $psname = $1; next; }
-    if ($l =~ m/^Type:\s*(.*)$/) { $fonttype = $1 ; next ; }
     if ($l =~ m/^Class:\s*(.*)$/) { $fontclass = $1 ; next ; }
     if ($l =~ m/^Filename(\((\d+)\))?:\s*(.*)$/) { 
-      $fontfiles{$3}{'priority'} = ($2 ? $2 : 10);
+      my $fn = $3;
+      $fontfiles{$fn}{'priority'} = ($2 ? $2 : 10);
+      print_ddebug("filename: $fn\n");
+      if ($fn =~ m/\.ot[fc]$/i) {
+        print_ddebug("type: cid\n");
+        $fontfiles{$fn}{'type'} = 'CID';
+      } elsif ($fn =~ m/\.tt[fc](\(\d+\))?$/i) {
+        print_ddebug("type: ttf\n");
+        $fontfiles{$fn}{'type'} = 'TTF';
+      } else{
+        print_warning("cannot determine font type of $fn at line $lineno, skipping!\n");
+        delete $fontfiles{$fn};
+      }
       next;
     }
     if ($l =~ m/^Provides\((\d+)\):\s*(.*)$/) { $fontprovides{$2} = $1; next; }
@@ -915,21 +1005,23 @@ sub Usage {
   my $usage = "[perl] $prg\[.pl\] [OPTIONS]";
   my $options = "
 -n, --dry-run         do not actually output anything
+--remove              try to remove instead of create
 -f, --fontdef FILE    specify alternate set of font definitions, if not
                       given, the built-in set is used
 -o, --output DIR      specifies the base output dir, if not provided,
-                      the Resource directory of an install GhostScript
+                      the Resource directory of an installed GhostScript
                       is searched and used.
--a, --alias LL=RR     defines an alias, or overrides a given alias
+-a, --alias LL=RR     defines an alias, or overrides a given alias;
                       illegal if LL is provided by a real font, or
-                      RR is neither available as real font or alias
+                      RR is neither available as real font or alias;
                       can be given multiple times
 --filelist FILE       read list of available font files from FILE
                       instead of searching with kpathsea
---link-texmflocal     link fonts into
-                         TEXMFLOCAL/fonts/opentype/cjk-gs-integrate
+--link-texmf [DIR]    link fonts into
+                         DIR/fonts/opentype/cjk-gs-integrate
                       and
-                         TEXMFLOCAL/fonts/truetype/cjk-gs-integrate
+                         DIR/fonts/truetype/cjk-gs-integrate
+                      where DIR defaults to TEXMFLOCAL
 --machine-readable    output of --list-aliases is machine readable
 --force               do not bail out if linked fonts already exist
 -q, --quiet           be less verbose
@@ -1036,7 +1128,7 @@ Traditional Chinese:
 
     MSung-Light MHei-Medium MKai-Medium
 
-In addition, we also includes provide entries for the OTF Morisawa names:
+In addition, we also include provide entries for the OTF Morisawa names:
     RyuminPro-Light GothicBBBPro-Medium FutoMinA101Pro-Bold
     FutoGoB101Pro-Bold Jun101Pro-Light
 
@@ -1151,7 +1243,6 @@ __DATA__
 
 Name: A-OTF-FutoGoB101Pr6N-Bold
 PSName: FutoGoB101Pr6N-Bold
-Type: CID
 Class: Japan
 Provides(10): FutoGoB101-Bold
 Provides(10): FutoGoB101Pro-Bold
@@ -1159,14 +1250,12 @@ Filename: A-OTF-FutoGoB101Pr6N-Bold.otf
 
 Name: A-OTF-FutoGoB101Pro-Bold
 PSName: FutoGoB101Pro-Bold
-Type: CID
 Class: Japan
 Provides(20): FutoGoB101-Bold
 Filename: A-OTF-FutoGoB101Pro-Bold.otf
 
 Name: A-OTF-FutoMinA101Pr6N-Bold
 PSName: FutoMinA101Pr6N-Bold
-Type: CID
 Class: Japan
 Provides(10): FutoMinA101-Bold
 Provides(10): FutoMinA101Pro-Bold
@@ -1174,14 +1263,12 @@ Filename: A-OTF-FutoMinA101Pr6N-Bold.otf
 
 Name: A-OTF-FutoMinA101Pro-Bold
 PSName: FutoMinA101Pro-Bold
-Type: CID
 Class: Japan
 Provides(20): FutoMinA101-Bold
 Filename: A-OTF-FutoMinA101Pro-Bold.otf
 
 Name: A-OTF-GothicBBBPr6N-Medium
 PSName: GothicBBBPr6N-Medium
-Type: CID
 Class: Japan
 Provides(10): GothicBBB-Medium
 Provides(10): GothicBBBPro-Medium
@@ -1189,21 +1276,18 @@ Filename: A-OTF-GothicBBBPr6N-Medium.otf
 
 Name: A-OTF-GothicBBBPro-Medium
 PSName: GothicBBBPro-Medium
-Type: CID
 Class: Japan
 Provides(20): GothicBBB-Medium
 Filename: A-OTF-GothicBBBPro-Medium.otf
 
 Name: A-OTF-Jun101Pro-Light
 PSName: Jun101Pro-Light
-Type: CID
 Class: Japan
 Provides(20): Jun101-Light
 Filename: A-OTF-Jun101Pro-Light.otf
 
 Name: A-OTF-MidashiGoPr6N-MB31
 PSName: MidashiGoPr6N-MB31
-Type: CID
 Class: Japan
 Provides(10): MidashiGo-MB31
 Provides(10): MidashiGoPro-MB31
@@ -1211,14 +1295,12 @@ Filename: A-OTF-MidashiGoPr6N-MB31.otf
 
 Name: A-OTF-MidashiGoPro-MB31
 PSName: MidashiGoPro-MB31
-Type: CID
 Class: Japan
 Provides(20): MidashiGo-MB31
 Filename: A-OTF-MidashiGoPro-MB31.otf
 
 Name: A-OTF-RyuminPr6N-Light
 PSName: RyuminPr6N-Light
-Type: CID
 Class: Japan
 Provides(10): Ryumin-Light
 Provides(10): RyuminPro-Light
@@ -1226,14 +1308,12 @@ Filename: A-OTF-RyuminPr6N-Light.otf
 
 Name: A-OTF-RyuminPro-Light
 PSName: RyuminPro-Light
-Type: CID
 Class: Japan
 Provides(20): Ryumin-Light
 Filename: A-OTF-RyuminPro-Light.otf
 
 Name: A-OTF-ShinMGoPr6N-Light
 PSName: ShinMGoPr6N-Light
-Type: CID
 Class: Japan
 Provides(10): Jun101-Light
 Provides(10): Jun101Pro-Light
@@ -1243,7 +1323,6 @@ Filename: A-OTF-ShinMGoPr6N-Light.otf
 # Hiragino
 
 Name: HiraKakuPro-W3
-Type: CID
 Class: Japan
 Provides(40): GothicBBB-Medium
 Provides(40): GothicBBBPro-Medium
@@ -1252,124 +1331,219 @@ Provides(40): GothicBBBPro-Medium
 Filename(20): ヒラギノ角ゴ Pro W3.otf
 Filename(19): ヒラギノ角ゴ Pro W3.otf
 Filename(10): HiraKakuPro-W3.otf
+Filename(30): ヒラギノ角ゴシック W3.ttc(3)
+Filename(29): ヒラギノ角ゴシック W3.ttc(3)
+Filename(28): HiraginoSans-W3.ttc(3)
 
 Name: HiraKakuPro-W6
-Type: CID
 Class: Japan
 Provides(40): FutoGoB101-Bold
 Provides(40): FutoGoB101Pro-Bold
 Filename(20): ヒラギノ角ゴ Pro W6.otf
 Filename(19): ヒラギノ角ゴ Pro W6.otf
 Filename(10): HiraKakuPro-W6.otf
+Filename(30): ヒラギノ角ゴシック W6.ttc(3)
+Filename(29): ヒラギノ角ゴシック W6.ttc(3)
+Filename(28): HiraginoSans-W6.ttc(3)
 
 Name: HiraKakuProN-W3
-Type: CID
 Class: Japan
 Provides(30): GothicBBB-Medium
 Provides(30): GothicBBBPro-Medium
 Filename(20): ヒラギノ角ゴ ProN W3.otf
 Filename(19): ヒラギノ角ゴ ProN W3.otf
 Filename(10): HiraKakuProN-W3.otf
+Filename(30): ヒラギノ角ゴシック W3.ttc(2)
+Filename(29): ヒラギノ角ゴシック W3.ttc(2)
+Filename(28): HiraginoSans-W3.ttc(2)
 
 Name: HiraKakuProN-W6
-Type: CID
 Class: Japan
 Provides(30): FutoGoB101-Bold
 Provides(30): FutoGoB101Pro-Bold
 Filename(20): ヒラギノ角ゴ ProN W6.otf
 Filename(19): ヒラギノ角ゴ ProN W6.otf
 Filename(10): HiraKakuProN-W6.otf
+Filename(30): ヒラギノ角ゴシック W6.ttc(2)
+Filename(29): ヒラギノ角ゴシック W6.ttc(2)
+Filename(28): HiraginoSans-W6.ttc(2)
 
 Name: HiraKakuStd-W8
-Type: CID
 Class: Japan
 Provides(40): MidashiGo-MB31
 Provides(40): MidashiGoPro-MB31
 Filename(20): ヒラギノ角ゴ Std W8.otf
 Filename(19): ヒラギノ角ゴ Std W8.otf
 Filename(10): HiraKakuStd-W8.otf
+Filename(30): ヒラギノ角ゴシック W8.ttc(2)
+Filename(29): ヒラギノ角ゴシック W8.ttc(2)
+Filename(28): HiraginoSans-W8.ttc(2)
 
 Name: HiraKakuStdN-W8
-Type: CID
 Class: Japan
 Provides(30): MidashiGo-MB31
 Provides(30): MidashiGoPro-MB31
 Filename(20): ヒラギノ角ゴ StdN W8.otf
 Filename(19): ヒラギノ角ゴ StdN W8.otf
 Filename(10): HiraKakuStdN-W8.otf
+Filename(30): ヒラギノ角ゴシック W8.ttc(3)
+Filename(29): ヒラギノ角ゴシック W8.ttc(3)
+Filename(28): HiraginoSans-W8.ttc(3)
+
+Name: HiraginoSans-W0
+Class: Japan
+Provides(30): HiraginoSans-W0
+Filename(30): ヒラギノ角ゴシック W0.ttc(0)
+Filename(29): ヒラギノ角ゴシック W0.ttc(0)
+Filename(28): HiraginoSans-W0.ttc(0)
+
+Name: HiraginoSans-W1
+Class: Japan
+Provides(30): HiraginoSans-W1
+Filename(30): ヒラギノ角ゴシック W1.ttc(0)
+Filename(29): ヒラギノ角ゴシック W1.ttc(0)
+Filename(28): HiraginoSans-W1.ttc(0)
+
+Name: HiraginoSans-W2
+Class: Japan
+Provides(30): HiraginoSans-W2
+Filename(30): ヒラギノ角ゴシック W2.ttc(0)
+Filename(29): ヒラギノ角ゴシック W2.ttc(0)
+Filename(28): HiraginoSans-W2.ttc(0)
+
+Name: HiraginoSans-W3
+Class: Japan
+Provides(30): HiraginoSans-W3
+Filename(30): ヒラギノ角ゴシック W3.ttc(0)
+Filename(29): ヒラギノ角ゴシック W3.ttc(0)
+Filename(28): HiraginoSans-W3.ttc(0)
+
+Name: HiraginoSans-W4
+Class: Japan
+Provides(30): HiraginoSans-W4
+Filename(30): ヒラギノ角ゴシック W4.ttc(0)
+Filename(29): ヒラギノ角ゴシック W4.ttc(0)
+Filename(28): HiraginoSans-W4.ttc(0)
+
+Name: HiraginoSans-W5
+Class: Japan
+Provides(30): HiraginoSans-W5
+Filename(30): ヒラギノ角ゴシック W5.ttc(0)
+Filename(29): ヒラギノ角ゴシック W5.ttc(0)
+Filename(28): HiraginoSans-W5.ttc(0)
+
+Name: HiraginoSans-W6
+Class: Japan
+Provides(30): HiraginoSans-W6
+Filename(30): ヒラギノ角ゴシック W6.ttc(0)
+Filename(29): ヒラギノ角ゴシック W6.ttc(0)
+Filename(28): HiraginoSans-W6.ttc(0)
+
+Name: HiraginoSans-W7
+Class: Japan
+Provides(30): HiraginoSans-W7
+Filename(30): ヒラギノ角ゴシック W7.ttc(0)
+Filename(29): ヒラギノ角ゴシック W7.ttc(0)
+Filename(28): HiraginoSans-W7.ttc(0)
+
+Name: HiraginoSans-W8
+Class: Japan
+Provides(30): HiraginoSans-W8
+Filename(30): ヒラギノ角ゴシック W8.ttc(0)
+Filename(29): ヒラギノ角ゴシック W8.ttc(0)
+Filename(28): HiraginoSans-W8.ttc(0)
+
+Name: HiraginoSans-W9
+Class: Japan
+Provides(30): HiraginoSans-W9
+Filename(30): ヒラギノ角ゴシック W9.ttc(0)
+Filename(29): ヒラギノ角ゴシック W9.ttc(0)
+Filename(28): HiraginoSans-W9.ttc(0)
 
 Name: HiraMaruPro-W4
-Type: CID
 Class: Japan
 Provides(40): Jun101-Light
 Provides(40): Jun101Pro-Light
 Filename(20): ヒラギノ丸ゴ Pro W4.otf
 Filename(19): ヒラギノ丸ゴ Pro W4.otf
 Filename(10): HiraMaruPro-W4.otf
+Filename(30): ヒラギノ丸ゴ ProN W4.ttc(0)
+Filename(29): ヒラギノ丸ゴ ProN W4.ttc(0)
+Filename(28): HiraginoSansR-W4.ttc(0)
 
 Name: HiraMaruProN-W4
-Type: CID
 Class: Japan
 Provides(30): Jun101-Light
 Provides(30): Jun101Pro-Light
 Filename(20): ヒラギノ丸ゴ ProN W4.otf
 Filename(19): ヒラギノ丸ゴ ProN W4.otf
 Filename(10): HiraMaruProN-W4.otf
+Filename(30): ヒラギノ丸ゴ ProN W4.ttc(1)
+Filename(29): ヒラギノ丸ゴ ProN W4.ttc(1)
+Filename(28): HiraginoSansR-W4.ttc(1)
 
 Name: HiraMinPro-W3
-Type: CID
 Class: Japan
 Provides(40): Ryumin-Light
 Provides(40): RyuminPro-Light
 Filename(20): ヒラギノ明朝 Pro W3.otf
 Filename(19): ヒラギノ明朝 Pro W3.otf
 Filename(10): HiraMinPro-W3.otf
+Filename(30): ヒラギノ明朝 ProN W3.ttc(1)
+Filename(29): ヒラギノ明朝 ProN W3.ttc(1)
+Filename(28): HiraginoSerif-W3.ttc(1)
 
 Name: HiraMinPro-W6
-Type: CID
 Class: Japan
 Provides(40): FutoMinA101-Bold
 Provides(40): FutoMinA101Pro-Bold
 Filename(20): ヒラギノ明朝 Pro W6.otf
 Filename(19): ヒラギノ明朝 Pro W6.otf
 Filename(10): HiraMinPro-W6.otf
+Filename(30): ヒラギノ明朝 ProN W6.ttc(1)
+Filename(29): ヒラギノ明朝 ProN W6.ttc(1)
+Filename(28): HiraginoSerif-W6.ttc(1)
 
 Name: HiraMinProN-W3
-Type: CID
 Class: Japan
 Provides(30): Ryumin-Light
 Provides(30): RyuminPro-Light
 Filename(20): ヒラギノ明朝 ProN W3.otf
 Filename(19): ヒラギノ明朝 ProN W3.otf
 Filename(10): HiraMinProN-W3.otf
+Filename(30): ヒラギノ明朝 ProN W3.ttc(0)
+Filename(29): ヒラギノ明朝 ProN W3.ttc(0)
+Filename(28): HiraginoSerif-W3.ttc(0)
+
 
 Name: HiraMinProN-W6
-Type: CID
 Class: Japan
 Provides(30): FutoMinA101-Bold
 Provides(30): FutoMinA101Pro-Bold
 Filename(20): ヒラギノ明朝 ProN W6.otf
 Filename(19): ヒラギノ明朝 ProN W6.otf
 Filename(10): HiraMinProN-W6.otf
+Filename(30): ヒラギノ明朝 ProN W6.ttc(0)
+Filename(29): ヒラギノ明朝 ProN W6.ttc(0)
+Filename(28): HiraginoSerif-W6.ttc(0)
 
 
 Name: HiraginoSansGB-W3
-Type: CID
 Class: GB
 Filename(20): Hiragino Sans GB W3.otf
 Filename(10): HiraginoSansGB-W3.otf
+Filename(30): Hiragino Sans GB W3.ttc(0)
 
 Name: HiraginoSansGB-W6
-Type: CID
 Class: GB
 Filename(20): Hiragino Sans GB W6.otf
 Filename(10): HiraginoSansGB-W6.otf
+Filename(30): Hiragino Sans GB W6.ttc(0)
 
 
 # Yu-fonts MacOS version
 
 Name: YuGo-Medium
-Type: CID
 Class: Japan
 Provides(50): GothicBBB-Medium
 Provides(50): GothicBBBPro-Medium
@@ -1377,7 +1551,6 @@ Filename(20): Yu Gothic Medium.otf
 Filename(10): YuGo-Medium.otf
 
 Name: YuGo-Bold
-Type: CID
 Class: Japan
 Provides(50): FutoGoB101-Bold
 Provides(50): FutoGoB101Pro-Bold
@@ -1389,25 +1562,32 @@ Filename(20): Yu Gothic Bold.otf
 Filename(10): YuGo-Bold.otf
 
 Name: YuMin-Medium
-Type: CID
 Class: Japan
 Provides(50): Ryumin-Light
 Provides(50): RyuminPro-Light
 Filename(20): Yu Mincho Medium.otf
 Filename(10): YuMin-Medium.otf
+Filename(30): YuMincho.ttc(0)
 
 Name: YuMin-Demibold
-Type: CID
 Class: Japan
 Provides(50): FutoMinA101-Bold
 Provides(50): FutoMinA101Pro-Bold
 Filename(20): Yu Mincho Demibold.otf
 Filename(10): YuMin-Demibold.otf
+Filename(30): YuMincho.ttc(1)
+
+Name: YuMin_36pKn-Medium
+Class: Japan
+Filename(30): YuMincho.ttc(2)
+
+Name: YuMin_36pKn-Demibold
+Class: Japan
+Filename(30): YuMincho.ttc(3)
 
 # Yu-fonts Windows version
 
 Name: YuMincho-Regular
-Type: TTF
 Class: Japan
 Provides(60): Ryumin-Light
 Provides(60): RyuminPro-Light
@@ -1415,13 +1595,11 @@ Filename(20): yumin.ttf
 Filename(10): YuMincho-Regular.ttf
 
 Name: YuMincho-Light
-Type: TTF
 Class: Japan
 Filename(20): yuminl.ttf
 Filename(10): YuMincho-Light.ttf
 
 Name: YuMincho-DemiBold
-Type: TTF
 Class: Japan
 Provides(60): FutoMinA101-Bold
 Provides(60): FutoMinA101Pro-Bold
@@ -1429,7 +1607,6 @@ Filename(20): yumindb.ttf
 Filename(10): YuMincho-DemiBold.ttf
 
 Name: YuGothic-Regular
-Type: TTF
 Class: Japan
 Provides(60): GothicBBB-Medium
 Provides(60): GothicBBBPro-Medium
@@ -1437,13 +1614,11 @@ Filename(20): yugothic.ttf
 Filename(10): YuGothic-Regular.ttf
 
 Name: YuGothic-Light
-Type: TTF
 Class: Japan
 Filename(20): yugothil.ttf
 Filename(10): YuGothic-Light.ttf
 
 Name: YuGothic-Bold
-Type: TTF
 Class: Japan
 Provides(60): FutoGoB101-Bold
 Provides(60): FutoGoB101Pro-Bold
@@ -1457,7 +1632,6 @@ Filename(10): YuGothic-Bold.ttf
 # IPA fonts
 
 Name: IPAMincho
-Type: TTF
 Class: Japan
 Provides(110): Ryumin-Light
 Provides(110): RyuminPro-Light
@@ -1467,7 +1641,6 @@ Filename(20): ipam.ttf
 Filename(10): IPAMincho.ttf
 
 Name: IPAGothic
-Type: TTF
 Class: Japan
 Provides(110): GothicBBB-Medium
 Provides(110): GothicBBBPro-Medium
@@ -1481,7 +1654,6 @@ Filename(20): ipag.ttf
 Filename(10): IPAGothic.ttf
 
 Name: IPAexMincho
-Type: TTF
 Class: Japan
 Provides(100): Ryumin-Light
 Provides(100): RyuminPro-Light
@@ -1491,7 +1663,6 @@ Filename(20): ipaexm.ttf
 Filename(10): IPAexMincho.ttf
 
 Name: IPAexGothic
-Type: TTF
 Class: Japan
 Provides(100): GothicBBB-Medium
 Provides(100): GothicBBBPro-Medium
@@ -1507,14 +1678,12 @@ Filename(10): IPAexGothic.ttf
 # Kozuka fonts
 
 Name: KozGoPr6N-Bold
-Type: CID
 Class: Japan
 Provides(70): FutoGoB101-Bold
 Provides(70): FutoGoB101Pro-Bold
 Filename: KozGoPr6N-Bold.otf
 
 Name: KozGoPr6N-Heavy
-Type: CID
 Class: Japan
 Provides(70): Jun101-Light
 Provides(70): Jun101Pro-Light
@@ -1523,47 +1692,39 @@ Provides(70): MidashiGoPro-MB31
 Filename: KozGoPr6N-Heavy.otf
 
 Name: KozGoPr6N-Medium
-Type: CID
 Class: Japan
 Provides(70): GothicBBB-Medium
 Provides(70): GothicBBBPro-Medium
 Filename: KozGoPr6N-Medium.otf
 
 Name: KozGoPr6N-Regular
-Type: CID
 Class: Japan
 Filename: KozGoPr6N-Regular.otf
 
 Name: KozGoPr6N-ExtraLight
-Type: CID
 Class: Japan
 Filename: KozGoPr6N-ExtraLight.otf
 
 Name: KozGoPr6N-Light
-Type: CID
 Class: Japan
 Filename: KozGoPr6N-Light.otf
 
 Name: KozGoPro-ExtraLight
-Type: CID
 Class: Japan
 Filename: KozGoPro-ExtraLight.otf
 
 Name: KozGoPro-Light
-Type: CID
 Class: Japan
 Filename: KozGoPro-Light.otf
 
 
 Name: KozGoPro-Bold
-Type: CID
 Class: Japan
 Provides(90): FutoGoB101-Bold
 Provides(90): FutoGoB101Pro-Bold
 Filename: KozGoPro-Bold.otf
 
 Name: KozGoPro-Heavy
-Type: CID
 Class: Japan
 Provides(90): Jun101-Light
 Provides(90): Jun101Pro-Light
@@ -1572,26 +1733,22 @@ Provides(90): MidashiGoPro-MB31
 Filename: KozGoPro-Heavy.otf
 
 Name: KozGoPro-Medium
-Type: CID
 Class: Japan
 Provides(90): GothicBBB-Medium
 Provides(90): GothicBBBPro-Medium
 Filename: KozGoPro-Medium.otf
 
 Name: KozGoPro-Regular
-Type: CID
 Class: Japan
 Filename: KozGoPro-Regular.otf
 
 Name: KozGoProVI-Bold
-Type: CID
 Class: Japan
 Provides(80): FutoGoB101-Bold
 Provides(80): FutoGoB101Pro-Bold
 Filename: KozGoProVI-Bold.otf
 
 Name: KozGoProVI-Heavy
-Type: CID
 Class: Japan
 Provides(80): Jun101-Light
 Provides(80): Jun101Pro-Light
@@ -1600,118 +1757,126 @@ Provides(80): MidashiGoPro-MB31
 Filename: KozGoProVI-Heavy.otf
 
 Name: KozGoProVI-Medium
-Type: CID
 Class: Japan
 Provides(80): GothicBBB-Medium
 Provides(80): GothicBBBPro-Medium
 Filename: KozGoProVI-Medium.otf
 
 Name: KozGoProVI-Regular
-Type: CID
 Class: Japan
 Filename: KozGoProVI-Regular.otf
 
 Name: KozMinPr6N-Bold
-Type: CID
 Class: Japan
 Provides(70): FutoMinA101-Bold
 Provides(70): FutoMinA101Pro-Bold
 Filename: KozMinPr6N-Bold.otf
 
 Name: KozMinPr6N-Light
-Type: CID
 Class: Japan
 Filename: KozMinPr6N-Light.otf
 
 Name: KozMinPr6N-Regular
-Type: CID
 Class: Japan
 Provides(70): Ryumin-Light
 Provides(70): RyuminPro-Light
 Filename: KozMinPr6N-Regular.otf
 
 Name: KozMinPro-Bold
-Type: CID
 Class: Japan
 Provides(90): FutoMinA101-Bold
 Provides(90): FutoMinA101Pro-Bold
 Filename: KozMinPro-Bold.otf
 
 Name: KozMinPro-Light
-Type: CID
 Class: Japan
 Filename: KozMinPro-Light.otf
 
 Name: KozMinPro-Regular
-Type: CID
 Class: Japan
 Provides(90): Ryumin-Light
 Provides(90): RyuminPro-Light
 Filename: KozMinPro-Regular.otf
 
 Name: KozMinProVI-Bold
-Type: CID
 Class: Japan
 Provides(80): FutoMinA101-Bold
 Provides(80): FutoMinA101Pro-Bold
 Filename: KozMinProVI-Bold.otf
 
 Name: KozMinProVI-Light
-Type: CID
 Class: Japan
 Filename: KozMinProVI-Light.otf
 
 Name: KozMinProVI-Regular
-Type: CID
 Class: Japan
 Provides(80): Ryumin-Light
 Provides(80): RyuminPro-Light
 Filename: KozMinProVI-Regular.otf
 
 Name: KozMinPr6N-ExtraLight
-Type: CID
 Class: Japan
 Filename: KozMinPr6N-ExtraLight.otf
 
 Name: KozMinPr6N-Medium
-Type: CID
 Class: Japan
 Filename: KozMinPr6N-Medium.otf
 
 Name: KozMinPr6N-Heavy
-Type: CID
 Class: Japan
 Filename: KozMinPr6N-Heavy.otf
 
 Name: KozMinPro-ExtraLight
-Type: CID
 Class: Japan
 Filename: KozMinPro-ExtraLight.otf
 
 Name: KozMinPro-Medium
-Type: CID
 Class: Japan
 Filename: KozMinPro-Medium.otf
 
 Name: KozMinPro-Heavy
-Type: CID
 Class: Japan
 Filename: KozMinPro-Heavy.otf
 
+#
+# other OSX 11 fonts
+
+# TODO TODO should they provide Maru Gothic ???
+Name: TsukuARdGothic-Regular
+Class: Japan
+Filename: TsukushiAMaruGothic.ttc(0)
+
+Name: TsukuARdGothic-Bold
+Class: Japan
+Filename: TsukushiAMaruGothic.ttc(1)
+
+Name: TsukuBRdGothic-Regular
+Class: Japan
+Filename: TsukushiBMaruGothic.ttc(0)
+
+Name: TsukuBRdGothic-Bold
+Class: Japan
+Filename: TsukushiBMaruGothic.ttc(1)
+
+Name: Klee-Medium
+Class: Japan
+Filename: Klee.ttc(1)
+
+Name: Klee-Demibold
+Class: Japan
+Filename: Klee.ttc(0)
 
 #
 # CHINESE FONTS
 #
 
 Name: LiHeiPro
-Type: TTF
 Class: CNS
 Provides(50): MHei-Medium
 Filename(20): 儷黑 Pro.ttf
 Filename(10): LiHeiPro.ttf
 
 Name: LiSongPro
-Type: TTF
 Class: CNS
 Provides(50): MSung-Medium
 Provides(50): MSung-Light
@@ -1719,48 +1884,41 @@ Filename(20): 儷宋 Pro.ttf
 Filename(10): LiSongPro.ttf
 
 Name: STXihei
-Type: TTF
 Class: GB
 Provides(20): STHeiti-Light
 Filename(20): 华文细黑.ttf
 Filename(10): STXihei.ttf
 
 Name: STHeiti
-Type: TTF
 Class: GB
 Provides(50): STHeiti-Regular
 Filename(20): 华文黑体.ttf
 Filename(10): STHeiti.ttf
 
 Name: STHeitiSC-Light
-Type: TTF
 Class: GB
 Provides(10): STHeiti-Light
 Filename(10): STHeiti Light.ttc(1)
 Filename(20): STHeitiSC-Light.ttf
 
 Name: STHeitiSC-Medium
-Type: TTF
 Class: GB
 Provides(40): STHeiti-Regular
 Filename(10): STHeiti Medium.ttc(1)
 Filename(20): STHeitiSC-Medium.ttf
 
 Name: STHeitiTC-Light
-Type: TTF
 Class: CNS
 Filename(10): STHeiti Light.ttc(0)
 Filename(20): STHeitiTC-Light.ttf
 
 Name: STHeitiTC-Medium
-Type: TTF
 Class: CNS
 Provides(40): MHei-Medium
 Filename(10): STHeiti Medium.ttc(0)
 Filename(20): STHeitiTC-Medium.ttf
 
 Name: STFangsong
-Type: TTF
 Class: GB
 Provides(40): STFangsong-Light
 Provides(40): STFangsong-Regular
@@ -1768,7 +1926,6 @@ Filename(20): 华文仿宋.ttf
 Filename(10): STFangsong.ttf
 
 Name: STSong
-Type: TTF
 Class: GB
 Provides(50): STSong-Light
 Filename(10): Songti.ttc(4)
@@ -1777,7 +1934,6 @@ Filename(30): 华文宋体.ttf
 Filename(40): STSong.ttf
 
 Name: STSongti-SC-Light
-Type: TTF
 Class: GB
 Provides(40): STSong-Light
 Filename(10): Songti.ttc(3)
@@ -1785,48 +1941,41 @@ Filename(20): 宋体.ttc(2)
 Filename(30): STSongti-SC-Light.ttf
 
 Name: STSongti-SC-Regular
-Type: TTF
 Class: GB
 Filename(10): Songti.ttc(6)
 Filename(20): 宋体.ttc(4)
 Filename(30): STSongti-SC-Regular.ttf
 
 Name: STSongti-SC-Bold
-Type: TTF
 Class: GB
 Filename(10): Songti.ttc(1)
 Filename(20): 宋体.ttc(1)
 Filename(30): STSongti-SC-Bold.ttf
 
 Name: STSongti-SC-Black
-Type: TTF
 Class: GB
 Filename(10): Songti.ttc(0)
 Filename(20): 宋体.ttc(0)
 Filename(30): STSongti-SC-Black.ttf
 
 Name: STSongti-TC-Light
-Type: TTF
 Class: CNS
 Provides(40): MSung-Light
 Filename(10): Songti.ttc(5)
 Filename(20): STSongti-TC-Light.ttf
 
 Name: STSongti-TC-Regular
-Type: TTF
 Class: CNS
 Provides(40): MSung-Medium
 Filename(10): Songti.ttc(7)
 Filename(20): STSongti-TC-Regular.ttf
 
 Name: STSongti-TC-Bold
-Type: TTF
 Class: CNS
 Filename(10): Songti.ttc(2)
 Filename(20): STSongti-TC-Bold.ttf
 
 Name: STKaiti
-Type: TTF
 Class: GB
 Provides(50): STKaiti-Regular
 Filename(10): Kaiti.ttc(4)
@@ -1835,7 +1984,6 @@ Filename(30): 华文楷体.ttf
 Filename(40): STKaiti.ttf
 
 Name: STKaiti-SC-Regular
-Type: TTF
 Class: GB
 Provides(40): STKaiti-Regular
 Filename(10): Kaiti.ttc(3)
@@ -1843,34 +1991,29 @@ Filename(20): 楷体.ttc(2)
 Filename(30): STKaiti-SC-Regular.ttf
 
 Name: STKaiti-SC-Bold
-Type: TTF
 Class: GB
 Filename(10): Kaiti.ttc(1)
 Filename(20): 楷体.ttc(1)
 Filename(30): STKaiti-SC-Bold.ttf
 
 Name: STKaiti-SC-Black
-Type: TTF
 Class: GB
 Filename(10): Kaiti.ttc(0)
 Filename(20): 楷体.ttc(0)
 Filename(30): STKaiti-SC-Black.ttf
 
 Name: STKaiTi-TC-Regular
-Type: TTF
 Class: CNS
 Provides(40): MKai-Medium
 Filename(10): Kaiti.ttc(5)
 Filename(20): STKaiTi-TC-Regular.ttf
 
 Name: STKaiTi-TC-Bold
-Type: TTF
 Class: CNS
 Filename(10): Kaiti.ttc(2)
 Filename(20): STKaiTi-TC-Bold.ttf
 
 Name: STKaiti-Adobe-CNS1
-Type: TTF
 Class: CNS
 Provides(50): MKai-Medium
 Filename(10): Kaiti.ttc(4)
@@ -1883,26 +2026,22 @@ Filename(40): STKaiti.ttf
 # simplified chinese
 
 Name: AdobeSongStd-Light
-Type: CID
 Class: GB
 Provides(30): STSong-Light
 Filename(10): AdobeSongStd-Light.otf
 
 Name: AdobeHeitiStd-Regular
-Type: CID
 Class: GB
 Provides(30): STHeiti-Regular
 Provides(30): STHeiti-Light
 Filename(20): AdobeHeitiStd-Regular.otf
 
 Name: AdobeKaitiStd-Regular
-Type: CID
 Class: GB
 Provides(30): STKaiti-Regular
 Filename(20): AdobeKaitiStd-Regular.otf
 
 Name: AdobeFangsongStd-Regular
-Type: CID
 Class: GB
 Provides(30): STFangsong-Light
 Provides(30): STFangsong-Regular
@@ -1911,14 +2050,12 @@ Filename(20): AdobeFangsongStd-Regular.otf
 # traditional chinese
 
 Name: AdobeMingStd-Light
-Type: CID
 Class: CNS
 Provides(30): MSung-Light
 Provides(30): MSung-Medium
 Filename(20): AdobeMingStd-Light.otf
 
 Name: AdobeFanHeitiStd-Bold
-Type: CID
 Class: CNS
 Provides(30): MHei-Medium
 Provides(30): MKai-Medium
@@ -1927,13 +2064,11 @@ Filename(20): AdobeFanHeitiStd-Bold.otf
 # korean
 
 Name: AdobeMyungjoStd-Medium
-Type: CID
 Class: Korea
 Provides(20): HYSMyeongJo-Medium
 Filename: AdobeMyungjoStd-Medium.otf
 
 Name: AdobeGothicStd-Bold
-Type: CID
 Class: Korea
 Provides(20): HYGoThic-Medium
 Provides(50): HYRGoThic-Medium
@@ -1946,103 +2081,84 @@ Filename: AdobeGothicStd-Bold.otf
 # apple fonts
 
 Name: AppleMyungjo
-Type: TTF
 Class: Korea
 Provides(50): HYSMyeongJo-Medium
 Filename: AppleMyungjo.ttf
 
 Name: AppleGothic
-Type: TTF
 Class: Korea
 Provides(50): HYGoThic-Medium
 Provides(80): HYRGoThic-Medium
 Filename: AppleGothic.ttf
 
 Name: NanumMyeongjo
-Type: TTF
 Class: Korea
 Provides(30): HYSMyeongJo-Medium
 Filename: NanumMyeongjo.ttc(0)
 
 Name: NanumMyeongjoBold
-Type: TTF
 Class: Korea
 Filename: NanumMyeongjo.ttc(1)
 
 Name: NanumMyeongjoExtraBold
-Type: TTF
 Class: Korea
 Filename: NanumMyeongjo.ttc(2)
 
 Name: NanumGothic
-Type: TTF
 Class: Korea
 Provides(30): HYGoThic-Medium
 Provides(60): HYRGoThic-Medium
 Filename: NanumGothic.ttc(0)
 
 Name: NanumGothicBold
-Type: TTF
 Class: Korea
 Filename: NanumGothic.ttc(1)
 
 Name: NanumGothicExtraBold
-Type: TTF
 Class: Korea
 Filename: NanumGothic.ttc(2)
 
 Name: NanumBrush
-Type: TTF
 Class: Korea
 Filename: NanumScript.ttc(0)
 
 Name: NanumPen
-Type: TTF
 Class: Korea
 Filename: NanumScript.ttc(1)
 
 Name: AppleSDGothicNeo-Thin
-Type: CID
 Class: Korea
 Filename: AppleSDGothicNeo-Thin.otf
 
 Name: AppleSDGothicNeo-UltraLight
-Type: CID
 Class: Korea
 Filename: AppleSDGothicNeo-UltraLight.otf
 
 Name: AppleSDGothicNeo-Light
-Type: CID
 Class: Korea
 Filename: AppleSDGothicNeo-Light.otf
 
 Name: AppleSDGothicNeo-Regular
-Type: CID
 Class: Korea
 Filename: AppleSDGothicNeo-Regular.otf
 
 Name: AppleSDGothicNeo-Medium
-Type: CID
 Class: Korea
 Filename: AppleSDGothicNeo-Medium.otf
 
 Name: AppleSDGothicNeo-SemiBold
-Type: CID
 Class: Korea
 Filename: AppleSDGothicNeo-SemiBold.otf
 
 Name: AppleSDGothicNeo-Bold
-Type: CID
 Class: Korea
 Filename: AppleSDGothicNeo-Bold.otf
 
 Name: AppleSDGothicNeo-ExtraBold
-Type: CID
 Class: Korea
 Filename: AppleSDGothicNeo-ExtraBold.otf
 
 Name: AppleSDGothicNeo-Heavy
-Type: CID
 Class: Korea
 Filename: AppleSDGothicNeo-Heavy.otf
 
@@ -2053,7 +2169,6 @@ Filename: AppleSDGothicNeo-Heavy.otf
 # Korea
 
 Name: Gulim
-Type: TTF
 Class: Korea
 Provides(70): HYRGoThic-Medium
 Provides(70): HYGoThic-Medium
@@ -2061,13 +2176,11 @@ Filename(30): Gulim.ttf
 Filename(50): gulim.ttc
 
 Name: Dotum
-Type: TTF
 Class: Korea
 Provides(40): HYGoThic-Medium
 Filename(50): Dotum.ttf
 
 Name: Batang
-Type: TTF
 Class: Korea
 Provides(40): HYSMyeongJo-Medium
 Filename(50): Batang.ttf
@@ -2075,7 +2188,6 @@ Filename(50): Batang.ttf
 # simplified chinese
 
 Name: SimHei
-Type: TTF
 Class: GB
 Provides(60): STHeiti-Regular
 Provides(60): STKaiti-Regular
@@ -2083,7 +2195,6 @@ Provides(60): STHeiti-Light
 Filename(50): SimHei.ttf
 
 Name: SimSun
-Type: TTF
 Class: GB
 Provides(60): STSong-Light
 Provides(60): STFangsong-Light
@@ -2093,7 +2204,6 @@ Filename(50): SimSun.ttf
 # traditional chinese
 
 Name: MingLiU
-Type: TTF
 Class: CNS
 Provides(60): MHei-Medium
 Provides(60): MKai-Medium
@@ -2102,14 +2212,12 @@ Provides(60): MSung-Light
 Filename(50): MingLiU.ttf
 
 Name: PMingLiU
-Type: TTF
 Class: CNS
 Filename(50): PMingLiU.ttf
 
 # japanese
 
 Name: MS-Gothic
-Type: TTF
 Class: Japan
 Provides(95): GothicBBB-Medium
 Provides(95): GothicBBBPro-Medium
@@ -2125,7 +2233,6 @@ Filename(50): MS Gothic.ttf
 Filename(30): MS-Gothic.ttf
 
 Name: MS-Mincho
-Type: TTF
 Class: Japan
 Provides(95): Ryumin-Light
 Provides(95): RyuminPro-Light
@@ -2135,36 +2242,30 @@ Filename(50): MS Mincho.ttf
 Filename(30): MS-Mincho.ttf
 
 Name: MS-PGothic
-Type: TTF
 Class: Japan
 Filename(50): MS PGothic.ttf
 Filename(30): MS-PGothic.ttf
 
 Name: MS-PMincho
-Type: TTF
 Class: Japan
 Filename(50): MS PMincho.ttf
 Filename(30): MS-PMincho.ttf
 
 Name: Meiryo
-Type: TTF
 Class: Japan
 Filename(50): Meiryo.ttf
 
 Name: Meiryo-Bold
-Type: TTF
 Class: Japan
 Filename(50): Meiryo Bold.ttf
 Filename(30): Meiryo-Bold.ttf
 
 Name: Meiryo-BoldItalic
-Type: TTF
 Class: Japan
 Filename(50): Meiryo Bold Italic.ttf
 Filename(30): Meiryo-BoldItalic.ttf
 
 Name: Meiryo-Italic
-Type: TTF
 Class: Japan
 Filename(50): Meiryo Italic.ttf
 Filename(30): Meiryo-Italic.ttf
diff --git a/Build/source/texk/texlive/linked_scripts/jfontmaps/kanji-config-updmap.pl b/Build/source/texk/texlive/linked_scripts/jfontmaps/kanji-config-updmap.pl
index c255c8c8215..ce1613d82ee 100755
--- a/Build/source/texk/texlive/linked_scripts/jfontmaps/kanji-config-updmap.pl
+++ b/Build/source/texk/texlive/linked_scripts/jfontmaps/kanji-config-updmap.pl
@@ -1,20 +1,19 @@
 #!/usr/bin/env perl
 # kanji-config-updmap: setup Japanese font embedding
-# Version 20140301.0
+# Version 20150924.0
 #
 # formerly known as updmap-setup-kanji
 #
 # Copyright 2004-2006 by KOBAYASHI R. Taizo for the shell version (updmap-otf)
-# Copyright 2011-2014 by PREINING Norbert
+# Copyright 2011-2015 by PREINING Norbert
 #
 # This file is licensed under GPL version 3 or any later version.
 # For copyright statements see end of file.
 #
 # For development see
-#  https://git.gitorious.org/tlptexlive/jfontmaps.git
+#  https://github.com/norbusan/jfontmaps
 #
-# For a changelog see
-#  https://gitorious.org/tlptexlive/jfontmaps/blobs/master/ChangeLog
+# For a changelog see the git log
 # 
 
 $^W = 1;
@@ -22,7 +21,7 @@ use Getopt::Long qw(:config no_autoabbrev ignore_case_always);
 use strict;
 
 my $prg = "kanji-config-updmap";
-my $version = '20140301.0';
+my $version = '20150924.0';
 
 my $updmap_real = "updmap";
 my $updmap = $updmap_real;
@@ -66,6 +65,8 @@ if ($opt_help) {
 my %representatives = (
   "hiragino"      => "HiraMinPro-W3.otf",
   "hiragino-pron" => "HiraMinProN-W3.otf",
+  "hiragino-elcapitan" => "HiraginoSerif-W3.ttc",
+  "hiragino-elcapitan-pron" => "HiraginoSerif-W3.ttc",
   "morisawa"      => "A-OTF-RyuminPro-Light.otf",
   "morisawa-pr6n" => "A-OTF-RyuminPr6N-Light.otf",
   "kozuka"        => "KozMinPro-Regular.otf",
@@ -112,9 +113,10 @@ sub Usage {
                  map file otf-<family>.map has to be available.
      auto:       embed one of the following supported font families
                  automatically:
-                   hiragino, hiragino-pron, morisawa, morisawa-pr6n, 
+                   hiragino, hiragino-pron, hiragino-elcapitan,
+                   hiragino-elcapitan-pron, morisawa, morisawa-pr6n,
                    kozuka, kozuka-pr6, kozuka-pr6n, ipaex, ipa, ms, 
-                   yu-osx, yu-win
+                   yu-osx, yu-win, yu-win10
                  and fall back to not embedding any font if none of them
                  is available
      nofont:     embed no fonts (and rely on system fonts when displaying pdfs)
@@ -244,8 +246,9 @@ sub SetupReplacement {
         # then use them
         for my $i (qw/
             morisawa-pr6n yu-osx kozuka-pr6n kozuka-pr6
-            hiragino-pron hiragino
-            morisawa kozuka yu-win ipaex ipa ms/) {
+            hiragino-pron hiragino-elcapitan-pron hiragino
+            hiragino-elcapitan
+            morisawa kozuka yu-win yu-win10 ipaex ipa ms/) {
           if ($available{$i}) {
             return SetupMapFile($i);
           }
diff --git a/Build/source/texk/texlive/linked_scripts/jfontmaps/kanji-fontmap-creator.pl b/Build/source/texk/texlive/linked_scripts/jfontmaps/kanji-fontmap-creator.pl
index 75e632e3cd8..3f7a58ac69b 100755
--- a/Build/source/texk/texlive/linked_scripts/jfontmaps/kanji-fontmap-creator.pl
+++ b/Build/source/texk/texlive/linked_scripts/jfontmaps/kanji-fontmap-creator.pl
@@ -2,7 +2,7 @@
 #
 # kanji-fontmap-creator
 # (c) 2012-2014 Norbert Preining
-# Version: 20140301.0
+# Version: 20150924.0
 # Licenced under the GPLv2 or any higher version
 #
 # gui to create map files for updmap(-setup-kanji)
@@ -41,7 +41,7 @@ my $opt_help = 0;
 my $opt_version = 0;
 
 my $prg = "kanji-fontmap-creator";
-my $version = "20140301.0";
+my $version = "20150924.0";
 
 #
 # global vars configuring operation
diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/ChangeLog b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/ChangeLog
index 8ec8aca5181..c973e827363 100644
--- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/ChangeLog
+++ b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/ChangeLog
@@ -1,10 +1,78 @@
+2015-10-02  Norbert Preining  <norbert@preining.info>
+
+	* Release 20151002.0 (HEAD -> master) [0cab259]
+
+2015-10-02  Norbert Preining  <norbert@preining.info>
+
+	* update documentation [403383d]
+
+2015-09-28  Norbert Preining  <norbert@preining.info>
+
+	* update README.md for current status (origin/master, origin/HEAD) [789f124]
+
+2015-09-28  Norbert Preining  <norbert@preining.info>
+
+	* add --remove option [fea9b13]
+
+2015-09-28  Norbert Preining  <norbert@preining.info>
+
+	* use only --link-texmf with optional argument [d2ff6f8]
+
+2015-09-25  Norbert Preining  <norbert@preining.info>
+
+	* add HIraginoSans-W2 [10ca035]
+
+2015-09-24  Norbert Preining  <norbert@preining.info>
+
+	* use ttfname also for CIDFSubst link and cidfmap entry, add texmfout option [6acc38a]
+
+2015-09-24  Norbert Preining  <norbert@preining.info>
+
+	* ttf link name support [970dcf0]
+
+2015-09-24  Norbert Preining  <norbert@preining.info>
+
+	* auto-determine type of fontfile, and make type file specific [f8b7032]
+
+2015-09-22  Norbert Preining  <preining@logic.at>
+
+	* Merge pull request #4 from doraTeX/master [fed6b30]
+
+2015-09-22  doraTeX  <taylorkgb@gmail.com>
+
+	* Update font definitions for the latest El Capitan [86d28d1]
+
+2015-07-24  Norbert Preining  <preining@logic.at>
+
+	* Merge pull request #1 from munepi/master [98e37ef]
+
+2015-07-24  Munehiro Yamamoto  <munepixyz@gmail.com>
+
+	* cjk-gs-integrate.pl (encode_list): added 2004-{H,V} for Japan [51f4ffd]
+
+2015-07-24  Norbert Preining  <norbert@preining.info>
+
+	* add ISX 10.11 El Capitan fonts [dbe04b4]
+
+2015-05-07  Norbert Preining  <norbert@preining.info>
+
+	* fix line endings [81f0a82]
+
+2015-05-07  Norbert Preining  <norbert@preining.info>
+
+	* remove x bit from prn-variants.tex [202fc80]
+
+2015-05-07  Norbert Preining  <norbert@preining.info>
+
+	* rename README.md to README on release [25dcf6d]
+
 2015-05-06  Norbert Preining  <norbert@preining.info>
 
-	* Release 20150506.1 (HEAD, master) [daf2e89]
+	* Release 20150506.1 (tag: 20150506.1) [daf2e89]
 
 2015-05-06  Norbert Preining  <norbert@preining.info>
 
-	* reactivate aliases for MSung-Light and STFangsong-Light (origin/master, origin/HEAD) [bf0d437]
+	* reactivate aliases for MSung-Light and STFangsong-Light [bf0d437]
 
 2015-05-06  Norbert Preining  <norbert@preining.info>
 
diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/README b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/README
new file mode 100644
index 00000000000..8742f2d890f
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/README
@@ -0,0 +1,172 @@
+Configuring GhostScript for CJK CID/TTF fonts
+=============================================
+
+This script searches a list of directories for CJK fonts, and makes
+them available to an installed GhostScript. In the simplest case with
+sufficient privileges, a run without arguments should effect in a
+complete setup of GhostScript.
+
+Usage
+-----
+
+`````
+[perl] cjk-gs-integrate[.pl] [OPTIONS]
+`````
+
+#### Options ####
+
+`````
+  -n, --dry-run         do not actually output anything
+  --remove              try to remove instead of create
+  -f, --fontdef FILE    specify alternate set of font definitions, if not
+                        given, the built-in set is used
+  -o, --output DIR      specifies the base output dir, if not provided,
+                        the Resource directory of an installed GhostScript
+                        is searched and used.
+  -a, --alias LL=RR     defines an alias, or overrides a given alias;
+                        illegal if LL is provided by a real font, or
+                        RR is neither available as real font or alias;
+                        can be given multiple times
+  --filelist FILE       read list of available font files from FILE
+                        instead of searching with kpathsea
+  --link-texmf [DIR]    link fonts into
+                           DIR/fonts/opentype/cjk-gs-integrate
+                        and
+                           DIR/fonts/truetype/cjk-gs-integrate
+                        where DIR defaults to TEXMFLOCAL
+  --machine-readable    output of --list-aliases is machine readable
+  --force               do not bail out if linked fonts already exist
+  -q, --quiet           be less verbose
+  -d, --debug           output debug information, can be given multiple times
+  -v, --version         outputs only the version information
+  -h, --help            this help
+`````
+
+#### Command like options ####
+
+`````
+  --only-aliases        do only regenerate the cidfmap.alias file instead of all
+  --list-aliases        lists the available aliases and their options, with the
+                        selected option on top
+  --list-all-aliases    list all possible aliases without searching for actually
+                        present files
+  --list-fonts          lists the fonts found on the system
+  --info                combines the above two information
+`````
+
+Operation
+---------
+
+For each found TrueType (TTF) font it creates a cidfmap entry in
+
+    <Resource>/Init/cidfmap.local
+
+and links the font to
+
+    <Resource>/CIDFSubst/
+
+For each CID font it creates a snippet in
+
+    <Resource>/Font/
+
+and links the font to
+
+    <Resource>/CIDFont/
+
+The `<Resource>` dir is either given by `-o`/`--output`, or otherwise searched
+from an installed GhostScript (binary name is assumed to be 'gs').
+
+Aliases are added to 
+
+    <Resource>/Init/cidfmap.aliases
+
+Finally, it tries to add runlib calls to
+
+    <Resource>/Init/cidfmap
+
+to load the cidfmap.local and cidfmap.aliases.
+
+How and which directories are searched
+--------------------------------------
+
+Search is done using the kpathsea library, in particular using kpsewhich
+program. By default the following directories are searched:
+  - all TEXMF trees
+  - `/Library/Fonts`, `/Library/Fonts/Microsoft`, `/System/Library/Fonts`, 
+    `/Network/Library/Fonts`, and `~/Library/Fonts` (all if available)
+  - `c:/windows/fonts` (on Windows)
+  - the directories in `OSFONTDIR` environment variable
+
+In case you want to add some directories to the search path, adapt the
+`OSFONTDIR` environment variable accordingly: Example:
+
+`````
+    OSFONTDIR="/usr/local/share/fonts/truetype//:/usr/local/share/fonts/opentype//" $prg
+`````
+
+will result in fonts found in the above two given directories to be
+searched in addition.
+
+Output files
+------------
+
+If no output option is given, the program searches for a GhostScript
+interpreter 'gs' and determines its Resource directory. This might
+fail, in which case one need to pass the output directory manually.
+
+Since the program adds files and link to this directory, sufficient
+permissions are necessary.
+
+Aliases
+-------
+
+Aliases are managed via the Provides values in the font database.
+At the moment entries for the basic font names for CJK fonts
+are added:
+
+Japanese:
+
+    Ryumin-Light GothicBBB-Medium FutoMinA101-Bold FutoGoB101-Bold Jun101-Light
+
+Korean:
+
+    HYGoThic-Medium HYSMyeongJo-Medium
+
+Simplified Chinese:
+
+    STSong-Light STHeiti-Regular STHeiti-Light STKaiti-Regular
+
+Traditional Chinese:
+
+    MSung-Light MHei-Medium MKai-Medium
+
+In addition, we also include provide entries for the OTF Morisawa names:
+    RyuminPro-Light GothicBBBPro-Medium FutoMinA101Pro-Bold
+    FutoGoB101Pro-Bold Jun101Pro-Light
+
+The order is determined by the Provides setting in the font database,
+and for the Japanese fonts it is currently:
+    Morisawa Pr6, Morisawa, Hiragino ProN, Hiragino, 
+    Yu OSX, Yu Win, Kozuka ProN, Kozuka, IPAex, IPA
+
+That is, the first font found in this order will be used to provide the
+alias if necessary.
+
+#### Overriding aliases ####
+
+Using the command line option `--alias LL=RR` one can add arbitrary aliases,
+or override ones selected by the program. For this to work the following
+requirements of `LL` and `RR` must be fulfilled:
+  * `LL` is not provided by a real font
+  * `RR` is available either as real font, or as alias (indirect alias)
+
+Authors, Contributors, and Copyright
+------------------------------------
+
+The script and its documentation was written by Norbert Preining, based
+on research and work by Yusuke Kuroki, Bruno Voisin, Munehiro Yamamoto
+and the TeX Q&A wiki page.
+
+The script is licensed under GNU General Public License Version 3 or later.
+The contained font data is not copyrightable.
+
diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/README.md b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/README.md
deleted file mode 100644
index b460467c14a..00000000000
--- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/README.md
+++ /dev/null
@@ -1,170 +0,0 @@
-Configuring GhostScript for CJK CID/TTF fonts
-=============================================
-
-This script searches a list of directories for CJK fonts, and makes
-them available to an installed GhostScript. In the simplest case with
-sufficient privileges, a run without arguments should effect in a
-complete setup of GhostScript.
-
-Usage
------
-
-`````
-[perl] cjk-gs-integrate[.pl] [OPTIONS]
-`````
-
-#### Options ####
-
-`````
-  -n, --dry-run         do not actually output anything
-  -f, --fontdef FILE    specify alternate set of font definitions, if not
-                        given, the built-in set is used
-  -o, --output DIR      specifies the base output dir, if not provided,
-                        the Resource directory of an install GhostScript
-                        is searched and used.
-  -a, --alias LL=RR     defines an alias, or overrides a given alias
-                        illegal if LL is provided by a real font, or
-                        RR is neither available as real font or alias
-                        can be given multiple times
-  --filelist FILE       read list of available font files from FILE
-                        instead of searching with kpathsea
-  --link-texmflocal     link fonts into
-                           TEXMFLOCAL/fonts/opentype/cjk-gs-integrate
-                        and
-                           TEXMFLOCAL/fonts/truetype/cjk-gs-integrate
-  --machine-readable    output of --list-aliases is machine readable
-  --force               do not bail out if linked fonts already exist
-  -q, --quiet           be less verbose
-  -d, --debug           output debug information, can be given multiple times
-  -v, --version         outputs only the version information
-  -h, --help            this help
-`````
-
-#### Command like options ####
-
-`````
-  --only-aliases        do only regenerate the cidfmap.alias file instead of all
-  --list-aliases        lists the available aliases and their options, with the
-                        selected option on top
-  --list-all-aliases    list all possible aliases without searching for actually
-                        present files
-  --list-fonts          lists the fonts found on the system
-  --info                combines the above two information
-`````
-
-Operation
----------
-
-For each found TrueType (TTF) font it creates a cidfmap entry in
-
-    <Resource>/Init/cidfmap.local
-
-and links the font to
-
-    <Resource>/CIDFSubst/
-
-For each CID font it creates a snippet in
-
-    <Resource>/Font/
-
-and links the font to
-
-    <Resource>/CIDFont/
-
-The `<Resource>` dir is either given by `-o`/`--output`, or otherwise searched
-from an installed GhostScript (binary name is assumed to be 'gs').
-
-Aliases are added to 
-
-    <Resource>/Init/cidfmap.aliases
-
-Finally, it tries to add runlib calls to
-
-    <Resource>/Init/cidfmap
-
-to load the cidfmap.local and cidfmap.aliases.
-
-How and which directories are searched
---------------------------------------
-
-Search is done using the kpathsea library, in particular using kpsewhich
-program. By default the following directories are searched:
-  - all TEXMF trees
-  - `/Library/Fonts`, `/Library/Fonts/Microsoft`, `/System/Library/Fonts`, 
-    `/Network/Library/Fonts`, and `~/Library/Fonts` (all if available)
-  - `c:/windows/fonts` (on Windows)
-  - the directories in `OSFONTDIR` environment variable
-
-In case you want to add some directories to the search path, adapt the
-`OSFONTDIR` environment variable accordingly: Example:
-
-`````
-    OSFONTDIR="/usr/local/share/fonts/truetype//:/usr/local/share/fonts/opentype//" $prg
-`````
-
-will result in fonts found in the above two given directories to be
-searched in addition.
-
-Output files
-------------
-
-If no output option is given, the program searches for a GhostScript
-interpreter 'gs' and determines its Resource directory. This might
-fail, in which case one need to pass the output directory manually.
-
-Since the program adds files and link to this directory, sufficient
-permissions are necessary.
-
-Aliases
--------
-
-Aliases are managed via the Provides values in the font database.
-At the moment entries for the basic font names for CJK fonts
-are added:
-
-Japanese:
-
-    Ryumin-Light GothicBBB-Medium FutoMinA101-Bold FutoGoB101-Bold Jun101-Light
-
-Korean:
-
-    HYGoThic-Medium HYSMyeongJo-Medium
-
-Simplified Chinese:
-
-    STSong-Light STHeiti-Regular STHeiti-Light STKaiti-Regular
-
-Traditional Chinese:
-
-    MSung-Light MHei-Medium MKai-Medium
-
-In addition, we also includes provide entries for the OTF Morisawa names:
-    RyuminPro-Light GothicBBBPro-Medium FutoMinA101Pro-Bold
-    FutoGoB101Pro-Bold Jun101Pro-Light
-
-The order is determined by the Provides setting in the font database,
-and for the Japanese fonts it is currently:
-    Morisawa Pr6, Morisawa, Hiragino ProN, Hiragino, 
-    Yu OSX, Yu Win, Kozuka ProN, Kozuka, IPAex, IPA
-
-That is, the first font found in this order will be used to provide the
-alias if necessary.
-
-#### Overriding aliases ####
-
-Using the command line option `--alias LL=RR` one can add arbitrary aliases,
-or override ones selected by the program. For this to work the following
-requirements of `LL` and `RR` must be fulfilled:
-  * `LL` is not provided by a real font
-  * `RR` is available either as real font, or as alias (indirect alias)
-
-Authors, Contributors, and Copyright
-------------------------------------
-
-The script and its documentation was written by Norbert Preining, based
-on research and work by Yusuke Kuroki, Bruno Voisin, Munehiro Yamamoto
-and the TeX Q&A wiki page.
-
-The script is licensed under GNU General Public License Version 3 or later.
-The contained font data is not copyrightable.
-
diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tools/release.sh b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tools/release.sh
index 33c61cbdf5c..4ca8afc93c3 100755
--- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tools/release.sh
+++ b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tools/release.sh
@@ -36,6 +36,8 @@ for i in cjk-gs-integrate.pl ; do
   perl -pi.bak -e "s/\\\$VER\\\$/$VER/g" $i
   rm -f ${i}.bak
 done
+# rename README.md to README for CTAN
+mv README.md README
 cd ..
 diff -urN $PROJECT-$VER-orig $PROJECT-$VER
 tar zcf $DIR/$PROJECT-$VER.tar.gz $PROJECT-$VER
diff --git a/Master/texmf-dist/scripts/cjk-gs-integrate/cjk-gs-integrate.pl b/Master/texmf-dist/scripts/cjk-gs-integrate/cjk-gs-integrate.pl
index 59badebf341..7641cbcb26b 100755
--- a/Master/texmf-dist/scripts/cjk-gs-integrate/cjk-gs-integrate.pl
+++ b/Master/texmf-dist/scripts/cjk-gs-integrate/cjk-gs-integrate.pl
@@ -22,10 +22,11 @@
 $^W = 1;
 use Getopt::Long qw(:config no_autoabbrev ignore_case_always);
 use File::Basename;
+use File::Path qw(make_path);
 use strict;
 
 (my $prg = basename($0)) =~ s/\.pl$//;
-my $version = '20150506.1';
+my $version = '20151002.0';
 
 if (win32()) {
   print_error("Sorry, currently not supported on Windows!\n");
@@ -34,6 +35,8 @@ if (win32()) {
 
 my %encode_list = (
   Japan => [ qw/
+    2004-H
+    2004-V
     78-EUC-H
     78-EUC-V
     78-H
@@ -220,6 +223,7 @@ my $opt_debug = 0;
 my $opt_listaliases = 0;
 my $opt_listallaliases = 0;
 my $opt_listfonts = 0;
+my $opt_remove = 0;
 my $opt_info = 0;
 my $opt_fontdef;
 my $opt_output;
@@ -228,7 +232,7 @@ my $opt_only_aliases = 0;
 my $opt_machine = 0;
 my $opt_filelist;
 my $opt_force = 0;
-my $opt_texmflink = 0;
+my $opt_texmflink;
 my $opt_markdown = 0;
 
 if (! GetOptions(
@@ -237,14 +241,15 @@ if (! GetOptions(
         "list-aliases" => \$opt_listaliases,
         "list-all-aliases" => \$opt_listallaliases,
         "list-fonts"  => \$opt_listfonts,
-        "link-texmflocal" => \$opt_texmflink,
+        "link-texmf:s" => \$opt_texmflink,
+        "remove"       => \$opt_remove,
         "only-aliases" => \$opt_only_aliases,
         "machine-readable" => \$opt_machine,
         "force"       => \$opt_force,
         "filelist=s"  => \$opt_filelist,
         "markdown"    => \$opt_markdown,
         "o|output=s"  => \$opt_output,
-	      "h|help"      => \$opt_help,
+        "h|help"      => \$opt_help,
         "q|quiet"     => \$opt_quiet,
         "d|debug+"    => \$opt_debug,
         "f|fontdef=s" => \$opt_fontdef,
@@ -270,7 +275,20 @@ if ($opt_debug) {
   $Data::Dumper::Indent = 1;
 }
 
-chomp (my $TEXMFLOCAL = `kpsewhich -var-value=TEXMFLOCAL`);
+if (defined($opt_texmflink)) {
+  my $foo;
+  if ($opt_texmflink eq '') {
+    # option was passed but didn't receive a value
+    #  -> use TEXMFLOCAL
+    chomp( $foo = `kpsewhich -var-value=TEXMFLOCAL`);
+  } else {
+    # option was passed with an argument
+    #  -> use it
+    $foo = $opt_texmflink;
+  }
+  $opt_texmflink = $foo;
+}
+
 
 main(@ARGV);
 
@@ -280,6 +298,7 @@ main(@ARGV);
 sub main {
   print_info("reading font database ...\n");
   read_font_database();
+  determine_ttf_link_target(); # see comments there
   if (!$opt_listallaliases) {
     print_info("checking for files ...\n");
     check_for_files();
@@ -358,12 +377,12 @@ sub main {
   }
   print_info("output is going to $opt_output\n");
   if (!$opt_only_aliases) {
-    print_info("generating font snippets and link CID fonts ...\n");
+    print_info(($opt_remove ? "removing" : "generating") . " font snippets and link CID fonts ...\n");
     do_otf_fonts();
-    print_info("generating font snippets, links, and cidfmap.local for TTF fonts ...\n");
+    print_info(($opt_remove ? "removing" : "generating") . " font snippets, links, and cidfmap.local for TTF fonts ...\n");
     do_ttf_fonts();
   }
-  print_info("generating font aliases ...\n");
+  print_info(($opt_remove ? "removing" : "generating") . " font aliases ...\n");
   do_aliases();
   print_info("finished\n");
 }
@@ -371,18 +390,35 @@ sub main {
 sub update_master_cidfmap {
   my $add = shift;
   my $cidfmap_master = "$opt_output/Init/cidfmap";
+  print_info(sprintf("%s $add %s cidfmap file ...\n", 
+    ($opt_remove ? "removing" : "adding"), ($opt_remove ? "from" : "to")));
   if (-r $cidfmap_master) {
     open(FOO, "<", $cidfmap_master) ||
       die ("Cannot open $cidfmap_master for reading: $!");
     my $found = 0;
+    my $newmaster = "";
+    # in add mode: just search for the entry and set $found
+    # in remove mode: collect all lines that do not match
     while(<FOO>) {
-      $found = 1 if
-        m/^\s*\(\Q$add\E\)\s\s*\.runlibfile\s*$/;
+      if (m/^\s*\(\Q$add\E\)\s\s*\.runlibfile\s*$/) {
+        $found = 1;
+      } else {
+        $newmaster .= $_;
+      }
     }
+    close(FOO);
     if ($found) {
-      print_info("$add already loaded in $cidfmap_master, no changes\n");
+      if ($opt_remove) {
+        open(FOO, ">", $cidfmap_master) ||
+          die ("Cannot clean up $cidfmap_master: $!");
+        print FOO $newmaster;
+        close FOO;
+      } else {
+        print_info("$add already loaded in $cidfmap_master, no changes\n");
+      }
     } else {
       return if $dry_run;
+      return if $opt_remove;
       open(FOO, ">>", $cidfmap_master) ||
         die ("Cannot open $cidfmap_master for appending: $!");
       print FOO "($add) .runlibfile\n";
@@ -390,6 +426,7 @@ sub update_master_cidfmap {
     }
   } else {
     return if $dry_run;
+    return if $opt_remove;
     open(FOO, ">", $cidfmap_master) ||
       die ("Cannot open $cidfmap_master for writing: $!");
     print FOO "($add) .runlibfile\n";
@@ -405,7 +442,7 @@ sub make_dir {
       exit 1;
     }
   } else {
-    $dry_run || mkdir($d);
+    $dry_run || make_path($d);
   }
 }
 
@@ -414,8 +451,7 @@ sub do_otf_fonts {
   my $ciddest  = "$opt_output/CIDFont";
   make_dir($fontdest, "cannot create CID snippets there!");
   make_dir($ciddest,  "cannot link CID fonts there!");
-  print "opt_texfmlink = $opt_texmflink\n";
-  make_dir("$TEXMFLOCAL/fonts/opentype/cjk-gs-integrate",
+  make_dir("$opt_texmflink/fonts/opentype/cjk-gs-integrate",
            "cannot link fonts to it!")
     if $opt_texmflink;
   for my $k (keys %fontdb) {
@@ -423,7 +459,7 @@ sub do_otf_fonts {
       generate_font_snippet($fontdest,
         $k, $fontdb{$k}{'class'}, $fontdb{$k}{'target'});
       link_font($fontdb{$k}{'target'}, $ciddest, $k);
-      link_font($fontdb{$k}{'target'}, "$TEXMFLOCAL/fonts/opentype/cjk-gs-integrate")
+      link_font($fontdb{$k}{'target'}, "$opt_texmflink/fonts/opentype/cjk-gs-integrate")
         if $opt_texmflink;
     }
   }
@@ -433,6 +469,10 @@ sub generate_font_snippet {
   my ($fd, $n, $c, $f) = @_;
   return if $dry_run;
   for my $enc (@{$encode_list{$c}}) {
+    if ($opt_remove) {
+      unlink "$fd/$n-$enc" if (-f "$fd/$n-$enc");
+      next;
+    }
     open(FOO, ">$fd/$n-$enc") || 
       die("cannot open $fd/$n-$enc for writing: $!");
     print FOO "%%!PS-Adobe-3.0 Resource-Font
@@ -461,11 +501,13 @@ sub link_font {
   if ($opt_force && -e $target) {
     print_info("Removing $target prior to recreation due to --force\n");
     unlink($target) || die "Cannot unlink $target prior to recreation under --force: $!";
+    return if $opt_remove;
   }
   if (-l $target) {
     my $linkt = readlink($target);
     if ($linkt && -r $linkt) {
       if ($linkt eq $f) {
+        unlink($target) if $opt_remove;
         # do nothing, it is the same link
       } else {
         print_error("link $target already existing, but different target then $target, exiting!\n");
@@ -480,7 +522,11 @@ sub link_font {
       print_error("$target already existing, but not a link, exiting!\n");
       exit(1);
     } else {
-      symlink($f, $target) || die("Cannot link font $f to $target: $!");
+      if ($opt_remove) {
+        unlink($target);
+      } else {
+        symlink($f, $target) || die("Cannot link font $f to $target: $!");
+      }
     }
   }
 }
@@ -491,16 +537,16 @@ sub do_ttf_fonts {
   my $outp = '';
   make_dir($fontdest, "cannot create CID snippets there!");
   make_dir($cidfsubst,  "cannot link TTF fonts there!");
-  make_dir("$TEXMFLOCAL/fonts/truetype/cjk-gs-integrate",
+  make_dir("$opt_texmflink/fonts/truetype/cjk-gs-integrate",
            "cannot link fonts to it!")
     if $opt_texmflink;
   for my $k (keys %fontdb) {
     if ($fontdb{$k}{'available'} && $fontdb{$k}{'type'} eq 'TTF') {
       generate_font_snippet($fontdest,
         $k, $fontdb{$k}{'class'}, $fontdb{$k}{'target'});
-      $outp .= generate_cidfmap_entry($k, $fontdb{$k}{'class'}, $fontdb{$k}{'target'}, $fontdb{$k}{'subfont'});
-      link_font($fontdb{$k}{'target'}, $cidfsubst);
-      link_font($fontdb{$k}{'target'}, "$TEXMFLOCAL/fonts/truetype/cjk-gs-integrate")
+      $outp .= generate_cidfmap_entry($k, $fontdb{$k}{'class'}, $fontdb{$k}{'ttfname'}, $fontdb{$k}{'subfont'});
+      link_font($fontdb{$k}{'target'}, $cidfsubst, $fontdb{$k}{'ttfname'});
+      link_font($fontdb{$k}{'target'}, "$opt_texmflink/fonts/truetype/cjk-gs-integrate", $fontdb{$k}{'ttfname'})
         if $opt_texmflink;
     }
   }
@@ -515,7 +561,6 @@ sub do_ttf_fonts {
     print FOO $outp;
     close(FOO);
   }
-  print_info("adding cidfmap.local to cidfmap file ...\n");
   update_master_cidfmap('cidfmap.local');
 }
 
@@ -586,7 +631,7 @@ sub do_aliases {
   $outp .= "\n% Simplified Chinese fonts\n" . join("\n", @sal) . "\n" if @sal;
   #
   return if $dry_run;
-  if ($outp) {
+  if ($outp && !$opt_remove) {
     if (! -d "$opt_output/Init") {
       mkdir("$opt_output/Init") ||
         die("Cannot create directory $opt_output/Init: $!");
@@ -596,19 +641,18 @@ sub do_aliases {
     print FOO $outp;
     close(FOO);
   }
-  print_info("adding cidfmap.aliases to cidfmap file ...\n");
   update_master_cidfmap('cidfmap.aliases');
 }
 
 sub generate_cidfmap_entry {
   my ($n, $c, $f, $sf) = @_;
-  # we link the ttf fonts, so we use only the base name
-  # otherwise the ps2pdf breaks due to -dSAFER
-  my $bn = basename($f);
+  return "" if $opt_remove;
+  # $f is already the link target name 'ttfname'
+  # as determined by minimal priority number
   # extract subfont
   my $s = "/$n << /FileType /TrueType 
   /Path pssystemparams /GenericResourceDir get 
-  (CIDFSubst/$bn) concatstrings
+  (CIDFSubst/$f) concatstrings
   /SubfontID $sf
   /CSI [($c";
   if ($c eq "Japan") {
@@ -642,6 +686,9 @@ sub info_found_fonts {
         $fn .= "($fontdb{$k}{'subfont'})";
       }
       print "File:  $fn\n";
+      if ($fontdb{$k}{'type'} eq 'TTF') {
+        print "Link:  $fontdb{$k}{'ttfname'}\n";
+      }
       print "\n";
     }
   }
@@ -722,6 +769,10 @@ sub check_for_files {
     my $bn = basename($f);
     $bntofn{$bn} = $f;
   }
+  if ($opt_debug > 0) {
+    print_debug("dumping font database before file check:\n");
+    print_debug(Data::Dumper::Dumper(\%fontdb));
+  }
   if ($opt_debug > 1) {
     print_ddebug("dumping basename to filename list:\n");
     print_ddebug(Data::Dumper::Dumper(\%bntofn));
@@ -747,17 +798,19 @@ sub check_for_files {
   # second round to determine the winner in case of more targets
   for my $k (keys %fontdb) {
     if ($fontdb{$k}{'available'}) {
-      my $mp = 1000000; my $mf;
+      my $mp = 1000000; my $mf; my $mt;
       for my $f (keys %{$fontdb{$k}{'files'}}) {
         if ($fontdb{$k}{'files'}{$f}{'priority'} < $mp) {
           $mp = $fontdb{$k}{'files'}{$f}{'priority'};
           $mf = $f;
+          $mt = $fontdb{$k}{'files'}{$f}{'type'};
         }
       }
       # extract subfont if necessary
       my $sf = 0;
       if ($mf =~ m/^(.*)\((\d*)\)$/) { $sf = $2; }
       $fontdb{$k}{'target'} = $fontdb{$k}{'files'}{$mf}{'target'};
+      $fontdb{$k}{'type'} = $fontdb{$k}{'files'}{$mf}{'type'};
       $fontdb{$k}{'subfont'} = $sf if ($fontdb{$k}{'type'} eq 'TTF');
     }
     # not needed anymore
@@ -817,6 +870,31 @@ sub compute_aliases {
   }
 }
 
+# While the OTF link target is determined by the filename itself
+# for TTF we can have ttc with several fonts.
+# The following routine determines the link target by selecting
+# the file name of the ttf candidates with the lowest priority
+# as the link target name for TTF
+sub determine_ttf_link_target {
+  for my $k (keys %fontdb) {
+    my $ttfname;
+    my $mp = 10000000;
+    for my $f (keys %{$fontdb{$k}{'files'}}) {
+      if ($fontdb{$k}{'files'}{$f}{'type'} eq 'TTF') {
+        my $p = $fontdb{$k}{'files'}{$f}{'priority'};
+        if ($p < $mp) {
+          $ttfname = $f;
+          $ttfname =~ s/^(.*)\(\d*\)$/$1/;
+          $mp = $p;
+        }
+      }
+    }
+    if ($ttfname) {
+      $fontdb{$k}{'ttfname'} = $ttfname;
+    }
+  }
+}
+
 sub read_font_database {
   my @dbl;
   if ($opt_fontdef) {
@@ -831,7 +909,6 @@ sub read_font_database {
   # add a "final empty line" to easy parsing
   push @dbl, "";
   my $fontname = "";
-  my $fonttype = "";
   my $fontclass = "";
   my %fontprovides = ();
   my %fontfiles;
@@ -842,21 +919,23 @@ sub read_font_database {
 
     next if ($l =~ m/^\s*#/);
     if ($l =~ m/^\s*$/) {
-      if ($fontname || $fonttype || $fontclass || keys(%fontfiles)) {
-        if ($fontname && $fonttype && $fontclass && keys(%fontfiles)) {
+      if ($fontname || $fontclass || keys(%fontfiles)) {
+        if ($fontname && $fontclass && keys(%fontfiles)) {
           my $realfontname = ($psname ? $psname : $fontname);
-          $fontdb{$realfontname}{'type'} = $fonttype;
           $fontdb{$realfontname}{'class'} = $fontclass;
           $fontdb{$realfontname}{'files'} = { %fontfiles };
           $fontdb{$realfontname}{'provides'} = { %fontprovides };
+          if ($opt_debug > 1) {
+            print_ddebug("Dumping fontfiles for $realfontname: " . Data::Dumper::Dumper(\%fontfiles));
+          }
           # reset to start
-          $fontname = $fonttype = $fontclass = $psname = "";
+          $fontname = $fontclass = $psname = "";
           %fontfiles = ();
           %fontprovides = ();
         } else {
-          print_warning("incomplete entry above line $lineno for $fontname/$fonttype/$fontclass, skipping!\n");
+          print_warning("incomplete entry above line $lineno for $fontname/$fontclass, skipping!\n");
           # reset to start
-          $fontname = $fonttype = $fontclass = $psname = "";
+          $fontname = $fontclass = $psname = "";
           %fontfiles = ();
           %fontprovides = ();
         }
@@ -867,10 +946,21 @@ sub read_font_database {
     }
     if ($l =~ m/^Name:\s*(.*)$/) { $fontname = $1; next; }
     if ($l =~ m/^PSName:\s*(.*)$/) { $psname = $1; next; }
-    if ($l =~ m/^Type:\s*(.*)$/) { $fonttype = $1 ; next ; }
     if ($l =~ m/^Class:\s*(.*)$/) { $fontclass = $1 ; next ; }
     if ($l =~ m/^Filename(\((\d+)\))?:\s*(.*)$/) { 
-      $fontfiles{$3}{'priority'} = ($2 ? $2 : 10);
+      my $fn = $3;
+      $fontfiles{$fn}{'priority'} = ($2 ? $2 : 10);
+      print_ddebug("filename: $fn\n");
+      if ($fn =~ m/\.ot[fc]$/i) {
+        print_ddebug("type: cid\n");
+        $fontfiles{$fn}{'type'} = 'CID';
+      } elsif ($fn =~ m/\.tt[fc](\(\d+\))?$/i) {
+        print_ddebug("type: ttf\n");
+        $fontfiles{$fn}{'type'} = 'TTF';
+      } else{
+        print_warning("cannot determine font type of $fn at line $lineno, skipping!\n");
+        delete $fontfiles{$fn};
+      }
       next;
     }
     if ($l =~ m/^Provides\((\d+)\):\s*(.*)$/) { $fontprovides{$2} = $1; next; }
@@ -915,21 +1005,23 @@ sub Usage {
   my $usage = "[perl] $prg\[.pl\] [OPTIONS]";
   my $options = "
 -n, --dry-run         do not actually output anything
+--remove              try to remove instead of create
 -f, --fontdef FILE    specify alternate set of font definitions, if not
                       given, the built-in set is used
 -o, --output DIR      specifies the base output dir, if not provided,
-                      the Resource directory of an install GhostScript
+                      the Resource directory of an installed GhostScript
                       is searched and used.
--a, --alias LL=RR     defines an alias, or overrides a given alias
+-a, --alias LL=RR     defines an alias, or overrides a given alias;
                       illegal if LL is provided by a real font, or
-                      RR is neither available as real font or alias
+                      RR is neither available as real font or alias;
                       can be given multiple times
 --filelist FILE       read list of available font files from FILE
                       instead of searching with kpathsea
---link-texmflocal     link fonts into
-                         TEXMFLOCAL/fonts/opentype/cjk-gs-integrate
+--link-texmf [DIR]    link fonts into
+                         DIR/fonts/opentype/cjk-gs-integrate
                       and
-                         TEXMFLOCAL/fonts/truetype/cjk-gs-integrate
+                         DIR/fonts/truetype/cjk-gs-integrate
+                      where DIR defaults to TEXMFLOCAL
 --machine-readable    output of --list-aliases is machine readable
 --force               do not bail out if linked fonts already exist
 -q, --quiet           be less verbose
@@ -1036,7 +1128,7 @@ Traditional Chinese:
 
     MSung-Light MHei-Medium MKai-Medium
 
-In addition, we also includes provide entries for the OTF Morisawa names:
+In addition, we also include provide entries for the OTF Morisawa names:
     RyuminPro-Light GothicBBBPro-Medium FutoMinA101Pro-Bold
     FutoGoB101Pro-Bold Jun101Pro-Light
 
@@ -1151,7 +1243,6 @@ __DATA__
 
 Name: A-OTF-FutoGoB101Pr6N-Bold
 PSName: FutoGoB101Pr6N-Bold
-Type: CID
 Class: Japan
 Provides(10): FutoGoB101-Bold
 Provides(10): FutoGoB101Pro-Bold
@@ -1159,14 +1250,12 @@ Filename: A-OTF-FutoGoB101Pr6N-Bold.otf
 
 Name: A-OTF-FutoGoB101Pro-Bold
 PSName: FutoGoB101Pro-Bold
-Type: CID
 Class: Japan
 Provides(20): FutoGoB101-Bold
 Filename: A-OTF-FutoGoB101Pro-Bold.otf
 
 Name: A-OTF-FutoMinA101Pr6N-Bold
 PSName: FutoMinA101Pr6N-Bold
-Type: CID
 Class: Japan
 Provides(10): FutoMinA101-Bold
 Provides(10): FutoMinA101Pro-Bold
@@ -1174,14 +1263,12 @@ Filename: A-OTF-FutoMinA101Pr6N-Bold.otf
 
 Name: A-OTF-FutoMinA101Pro-Bold
 PSName: FutoMinA101Pro-Bold
-Type: CID
 Class: Japan
 Provides(20): FutoMinA101-Bold
 Filename: A-OTF-FutoMinA101Pro-Bold.otf
 
 Name: A-OTF-GothicBBBPr6N-Medium
 PSName: GothicBBBPr6N-Medium
-Type: CID
 Class: Japan
 Provides(10): GothicBBB-Medium
 Provides(10): GothicBBBPro-Medium
@@ -1189,21 +1276,18 @@ Filename: A-OTF-GothicBBBPr6N-Medium.otf
 
 Name: A-OTF-GothicBBBPro-Medium
 PSName: GothicBBBPro-Medium
-Type: CID
 Class: Japan
 Provides(20): GothicBBB-Medium
 Filename: A-OTF-GothicBBBPro-Medium.otf
 
 Name: A-OTF-Jun101Pro-Light
 PSName: Jun101Pro-Light
-Type: CID
 Class: Japan
 Provides(20): Jun101-Light
 Filename: A-OTF-Jun101Pro-Light.otf
 
 Name: A-OTF-MidashiGoPr6N-MB31
 PSName: MidashiGoPr6N-MB31
-Type: CID
 Class: Japan
 Provides(10): MidashiGo-MB31
 Provides(10): MidashiGoPro-MB31
@@ -1211,14 +1295,12 @@ Filename: A-OTF-MidashiGoPr6N-MB31.otf
 
 Name: A-OTF-MidashiGoPro-MB31
 PSName: MidashiGoPro-MB31
-Type: CID
 Class: Japan
 Provides(20): MidashiGo-MB31
 Filename: A-OTF-MidashiGoPro-MB31.otf
 
 Name: A-OTF-RyuminPr6N-Light
 PSName: RyuminPr6N-Light
-Type: CID
 Class: Japan
 Provides(10): Ryumin-Light
 Provides(10): RyuminPro-Light
@@ -1226,14 +1308,12 @@ Filename: A-OTF-RyuminPr6N-Light.otf
 
 Name: A-OTF-RyuminPro-Light
 PSName: RyuminPro-Light
-Type: CID
 Class: Japan
 Provides(20): Ryumin-Light
 Filename: A-OTF-RyuminPro-Light.otf
 
 Name: A-OTF-ShinMGoPr6N-Light
 PSName: ShinMGoPr6N-Light
-Type: CID
 Class: Japan
 Provides(10): Jun101-Light
 Provides(10): Jun101Pro-Light
@@ -1243,7 +1323,6 @@ Filename: A-OTF-ShinMGoPr6N-Light.otf
 # Hiragino
 
 Name: HiraKakuPro-W3
-Type: CID
 Class: Japan
 Provides(40): GothicBBB-Medium
 Provides(40): GothicBBBPro-Medium
@@ -1252,124 +1331,219 @@ Provides(40): GothicBBBPro-Medium
 Filename(20): ヒラギノ角ゴ Pro W3.otf
 Filename(19): ヒラギノ角ゴ Pro W3.otf
 Filename(10): HiraKakuPro-W3.otf
+Filename(30): ヒラギノ角ゴシック W3.ttc(3)
+Filename(29): ヒラギノ角ゴシック W3.ttc(3)
+Filename(28): HiraginoSans-W3.ttc(3)
 
 Name: HiraKakuPro-W6
-Type: CID
 Class: Japan
 Provides(40): FutoGoB101-Bold
 Provides(40): FutoGoB101Pro-Bold
 Filename(20): ヒラギノ角ゴ Pro W6.otf
 Filename(19): ヒラギノ角ゴ Pro W6.otf
 Filename(10): HiraKakuPro-W6.otf
+Filename(30): ヒラギノ角ゴシック W6.ttc(3)
+Filename(29): ヒラギノ角ゴシック W6.ttc(3)
+Filename(28): HiraginoSans-W6.ttc(3)
 
 Name: HiraKakuProN-W3
-Type: CID
 Class: Japan
 Provides(30): GothicBBB-Medium
 Provides(30): GothicBBBPro-Medium
 Filename(20): ヒラギノ角ゴ ProN W3.otf
 Filename(19): ヒラギノ角ゴ ProN W3.otf
 Filename(10): HiraKakuProN-W3.otf
+Filename(30): ヒラギノ角ゴシック W3.ttc(2)
+Filename(29): ヒラギノ角ゴシック W3.ttc(2)
+Filename(28): HiraginoSans-W3.ttc(2)
 
 Name: HiraKakuProN-W6
-Type: CID
 Class: Japan
 Provides(30): FutoGoB101-Bold
 Provides(30): FutoGoB101Pro-Bold
 Filename(20): ヒラギノ角ゴ ProN W6.otf
 Filename(19): ヒラギノ角ゴ ProN W6.otf
 Filename(10): HiraKakuProN-W6.otf
+Filename(30): ヒラギノ角ゴシック W6.ttc(2)
+Filename(29): ヒラギノ角ゴシック W6.ttc(2)
+Filename(28): HiraginoSans-W6.ttc(2)
 
 Name: HiraKakuStd-W8
-Type: CID
 Class: Japan
 Provides(40): MidashiGo-MB31
 Provides(40): MidashiGoPro-MB31
 Filename(20): ヒラギノ角ゴ Std W8.otf
 Filename(19): ヒラギノ角ゴ Std W8.otf
 Filename(10): HiraKakuStd-W8.otf
+Filename(30): ヒラギノ角ゴシック W8.ttc(2)
+Filename(29): ヒラギノ角ゴシック W8.ttc(2)
+Filename(28): HiraginoSans-W8.ttc(2)
 
 Name: HiraKakuStdN-W8
-Type: CID
 Class: Japan
 Provides(30): MidashiGo-MB31
 Provides(30): MidashiGoPro-MB31
 Filename(20): ヒラギノ角ゴ StdN W8.otf
 Filename(19): ヒラギノ角ゴ StdN W8.otf
 Filename(10): HiraKakuStdN-W8.otf
+Filename(30): ヒラギノ角ゴシック W8.ttc(3)
+Filename(29): ヒラギノ角ゴシック W8.ttc(3)
+Filename(28): HiraginoSans-W8.ttc(3)
+
+Name: HiraginoSans-W0
+Class: Japan
+Provides(30): HiraginoSans-W0
+Filename(30): ヒラギノ角ゴシック W0.ttc(0)
+Filename(29): ヒラギノ角ゴシック W0.ttc(0)
+Filename(28): HiraginoSans-W0.ttc(0)
+
+Name: HiraginoSans-W1
+Class: Japan
+Provides(30): HiraginoSans-W1
+Filename(30): ヒラギノ角ゴシック W1.ttc(0)
+Filename(29): ヒラギノ角ゴシック W1.ttc(0)
+Filename(28): HiraginoSans-W1.ttc(0)
+
+Name: HiraginoSans-W2
+Class: Japan
+Provides(30): HiraginoSans-W2
+Filename(30): ヒラギノ角ゴシック W2.ttc(0)
+Filename(29): ヒラギノ角ゴシック W2.ttc(0)
+Filename(28): HiraginoSans-W2.ttc(0)
+
+Name: HiraginoSans-W3
+Class: Japan
+Provides(30): HiraginoSans-W3
+Filename(30): ヒラギノ角ゴシック W3.ttc(0)
+Filename(29): ヒラギノ角ゴシック W3.ttc(0)
+Filename(28): HiraginoSans-W3.ttc(0)
+
+Name: HiraginoSans-W4
+Class: Japan
+Provides(30): HiraginoSans-W4
+Filename(30): ヒラギノ角ゴシック W4.ttc(0)
+Filename(29): ヒラギノ角ゴシック W4.ttc(0)
+Filename(28): HiraginoSans-W4.ttc(0)
+
+Name: HiraginoSans-W5
+Class: Japan
+Provides(30): HiraginoSans-W5
+Filename(30): ヒラギノ角ゴシック W5.ttc(0)
+Filename(29): ヒラギノ角ゴシック W5.ttc(0)
+Filename(28): HiraginoSans-W5.ttc(0)
+
+Name: HiraginoSans-W6
+Class: Japan
+Provides(30): HiraginoSans-W6
+Filename(30): ヒラギノ角ゴシック W6.ttc(0)
+Filename(29): ヒラギノ角ゴシック W6.ttc(0)
+Filename(28): HiraginoSans-W6.ttc(0)
+
+Name: HiraginoSans-W7
+Class: Japan
+Provides(30): HiraginoSans-W7
+Filename(30): ヒラギノ角ゴシック W7.ttc(0)
+Filename(29): ヒラギノ角ゴシック W7.ttc(0)
+Filename(28): HiraginoSans-W7.ttc(0)
+
+Name: HiraginoSans-W8
+Class: Japan
+Provides(30): HiraginoSans-W8
+Filename(30): ヒラギノ角ゴシック W8.ttc(0)
+Filename(29): ヒラギノ角ゴシック W8.ttc(0)
+Filename(28): HiraginoSans-W8.ttc(0)
+
+Name: HiraginoSans-W9
+Class: Japan
+Provides(30): HiraginoSans-W9
+Filename(30): ヒラギノ角ゴシック W9.ttc(0)
+Filename(29): ヒラギノ角ゴシック W9.ttc(0)
+Filename(28): HiraginoSans-W9.ttc(0)
 
 Name: HiraMaruPro-W4
-Type: CID
 Class: Japan
 Provides(40): Jun101-Light
 Provides(40): Jun101Pro-Light
 Filename(20): ヒラギノ丸ゴ Pro W4.otf
 Filename(19): ヒラギノ丸ゴ Pro W4.otf
 Filename(10): HiraMaruPro-W4.otf
+Filename(30): ヒラギノ丸ゴ ProN W4.ttc(0)
+Filename(29): ヒラギノ丸ゴ ProN W4.ttc(0)
+Filename(28): HiraginoSansR-W4.ttc(0)
 
 Name: HiraMaruProN-W4
-Type: CID
 Class: Japan
 Provides(30): Jun101-Light
 Provides(30): Jun101Pro-Light
 Filename(20): ヒラギノ丸ゴ ProN W4.otf
 Filename(19): ヒラギノ丸ゴ ProN W4.otf
 Filename(10): HiraMaruProN-W4.otf
+Filename(30): ヒラギノ丸ゴ ProN W4.ttc(1)
+Filename(29): ヒラギノ丸ゴ ProN W4.ttc(1)
+Filename(28): HiraginoSansR-W4.ttc(1)
 
 Name: HiraMinPro-W3
-Type: CID
 Class: Japan
 Provides(40): Ryumin-Light
 Provides(40): RyuminPro-Light
 Filename(20): ヒラギノ明朝 Pro W3.otf
 Filename(19): ヒラギノ明朝 Pro W3.otf
 Filename(10): HiraMinPro-W3.otf
+Filename(30): ヒラギノ明朝 ProN W3.ttc(1)
+Filename(29): ヒラギノ明朝 ProN W3.ttc(1)
+Filename(28): HiraginoSerif-W3.ttc(1)
 
 Name: HiraMinPro-W6
-Type: CID
 Class: Japan
 Provides(40): FutoMinA101-Bold
 Provides(40): FutoMinA101Pro-Bold
 Filename(20): ヒラギノ明朝 Pro W6.otf
 Filename(19): ヒラギノ明朝 Pro W6.otf
 Filename(10): HiraMinPro-W6.otf
+Filename(30): ヒラギノ明朝 ProN W6.ttc(1)
+Filename(29): ヒラギノ明朝 ProN W6.ttc(1)
+Filename(28): HiraginoSerif-W6.ttc(1)
 
 Name: HiraMinProN-W3
-Type: CID
 Class: Japan
 Provides(30): Ryumin-Light
 Provides(30): RyuminPro-Light
 Filename(20): ヒラギノ明朝 ProN W3.otf
 Filename(19): ヒラギノ明朝 ProN W3.otf
 Filename(10): HiraMinProN-W3.otf
+Filename(30): ヒラギノ明朝 ProN W3.ttc(0)
+Filename(29): ヒラギノ明朝 ProN W3.ttc(0)
+Filename(28): HiraginoSerif-W3.ttc(0)
+
 
 Name: HiraMinProN-W6
-Type: CID
 Class: Japan
 Provides(30): FutoMinA101-Bold
 Provides(30): FutoMinA101Pro-Bold
 Filename(20): ヒラギノ明朝 ProN W6.otf
 Filename(19): ヒラギノ明朝 ProN W6.otf
 Filename(10): HiraMinProN-W6.otf
+Filename(30): ヒラギノ明朝 ProN W6.ttc(0)
+Filename(29): ヒラギノ明朝 ProN W6.ttc(0)
+Filename(28): HiraginoSerif-W6.ttc(0)
 
 
 Name: HiraginoSansGB-W3
-Type: CID
 Class: GB
 Filename(20): Hiragino Sans GB W3.otf
 Filename(10): HiraginoSansGB-W3.otf
+Filename(30): Hiragino Sans GB W3.ttc(0)
 
 Name: HiraginoSansGB-W6
-Type: CID
 Class: GB
 Filename(20): Hiragino Sans GB W6.otf
 Filename(10): HiraginoSansGB-W6.otf
+Filename(30): Hiragino Sans GB W6.ttc(0)
 
 
 # Yu-fonts MacOS version
 
 Name: YuGo-Medium
-Type: CID
 Class: Japan
 Provides(50): GothicBBB-Medium
 Provides(50): GothicBBBPro-Medium
@@ -1377,7 +1551,6 @@ Filename(20): Yu Gothic Medium.otf
 Filename(10): YuGo-Medium.otf
 
 Name: YuGo-Bold
-Type: CID
 Class: Japan
 Provides(50): FutoGoB101-Bold
 Provides(50): FutoGoB101Pro-Bold
@@ -1389,25 +1562,32 @@ Filename(20): Yu Gothic Bold.otf
 Filename(10): YuGo-Bold.otf
 
 Name: YuMin-Medium
-Type: CID
 Class: Japan
 Provides(50): Ryumin-Light
 Provides(50): RyuminPro-Light
 Filename(20): Yu Mincho Medium.otf
 Filename(10): YuMin-Medium.otf
+Filename(30): YuMincho.ttc(0)
 
 Name: YuMin-Demibold
-Type: CID
 Class: Japan
 Provides(50): FutoMinA101-Bold
 Provides(50): FutoMinA101Pro-Bold
 Filename(20): Yu Mincho Demibold.otf
 Filename(10): YuMin-Demibold.otf
+Filename(30): YuMincho.ttc(1)
+
+Name: YuMin_36pKn-Medium
+Class: Japan
+Filename(30): YuMincho.ttc(2)
+
+Name: YuMin_36pKn-Demibold
+Class: Japan
+Filename(30): YuMincho.ttc(3)
 
 # Yu-fonts Windows version
 
 Name: YuMincho-Regular
-Type: TTF
 Class: Japan
 Provides(60): Ryumin-Light
 Provides(60): RyuminPro-Light
@@ -1415,13 +1595,11 @@ Filename(20): yumin.ttf
 Filename(10): YuMincho-Regular.ttf
 
 Name: YuMincho-Light
-Type: TTF
 Class: Japan
 Filename(20): yuminl.ttf
 Filename(10): YuMincho-Light.ttf
 
 Name: YuMincho-DemiBold
-Type: TTF
 Class: Japan
 Provides(60): FutoMinA101-Bold
 Provides(60): FutoMinA101Pro-Bold
@@ -1429,7 +1607,6 @@ Filename(20): yumindb.ttf
 Filename(10): YuMincho-DemiBold.ttf
 
 Name: YuGothic-Regular
-Type: TTF
 Class: Japan
 Provides(60): GothicBBB-Medium
 Provides(60): GothicBBBPro-Medium
@@ -1437,13 +1614,11 @@ Filename(20): yugothic.ttf
 Filename(10): YuGothic-Regular.ttf
 
 Name: YuGothic-Light
-Type: TTF
 Class: Japan
 Filename(20): yugothil.ttf
 Filename(10): YuGothic-Light.ttf
 
 Name: YuGothic-Bold
-Type: TTF
 Class: Japan
 Provides(60): FutoGoB101-Bold
 Provides(60): FutoGoB101Pro-Bold
@@ -1457,7 +1632,6 @@ Filename(10): YuGothic-Bold.ttf
 # IPA fonts
 
 Name: IPAMincho
-Type: TTF
 Class: Japan
 Provides(110): Ryumin-Light
 Provides(110): RyuminPro-Light
@@ -1467,7 +1641,6 @@ Filename(20): ipam.ttf
 Filename(10): IPAMincho.ttf
 
 Name: IPAGothic
-Type: TTF
 Class: Japan
 Provides(110): GothicBBB-Medium
 Provides(110): GothicBBBPro-Medium
@@ -1481,7 +1654,6 @@ Filename(20): ipag.ttf
 Filename(10): IPAGothic.ttf
 
 Name: IPAexMincho
-Type: TTF
 Class: Japan
 Provides(100): Ryumin-Light
 Provides(100): RyuminPro-Light
@@ -1491,7 +1663,6 @@ Filename(20): ipaexm.ttf
 Filename(10): IPAexMincho.ttf
 
 Name: IPAexGothic
-Type: TTF
 Class: Japan
 Provides(100): GothicBBB-Medium
 Provides(100): GothicBBBPro-Medium
@@ -1507,14 +1678,12 @@ Filename(10): IPAexGothic.ttf
 # Kozuka fonts
 
 Name: KozGoPr6N-Bold
-Type: CID
 Class: Japan
 Provides(70): FutoGoB101-Bold
 Provides(70): FutoGoB101Pro-Bold
 Filename: KozGoPr6N-Bold.otf
 
 Name: KozGoPr6N-Heavy
-Type: CID
 Class: Japan
 Provides(70): Jun101-Light
 Provides(70): Jun101Pro-Light
@@ -1523,47 +1692,39 @@ Provides(70): MidashiGoPro-MB31
 Filename: KozGoPr6N-Heavy.otf
 
 Name: KozGoPr6N-Medium
-Type: CID
 Class: Japan
 Provides(70): GothicBBB-Medium
 Provides(70): GothicBBBPro-Medium
 Filename: KozGoPr6N-Medium.otf
 
 Name: KozGoPr6N-Regular
-Type: CID
 Class: Japan
 Filename: KozGoPr6N-Regular.otf
 
 Name: KozGoPr6N-ExtraLight
-Type: CID
 Class: Japan
 Filename: KozGoPr6N-ExtraLight.otf
 
 Name: KozGoPr6N-Light
-Type: CID
 Class: Japan
 Filename: KozGoPr6N-Light.otf
 
 Name: KozGoPro-ExtraLight
-Type: CID
 Class: Japan
 Filename: KozGoPro-ExtraLight.otf
 
 Name: KozGoPro-Light
-Type: CID
 Class: Japan
 Filename: KozGoPro-Light.otf
 
 
 Name: KozGoPro-Bold
-Type: CID
 Class: Japan
 Provides(90): FutoGoB101-Bold
 Provides(90): FutoGoB101Pro-Bold
 Filename: KozGoPro-Bold.otf
 
 Name: KozGoPro-Heavy
-Type: CID
 Class: Japan
 Provides(90): Jun101-Light
 Provides(90): Jun101Pro-Light
@@ -1572,26 +1733,22 @@ Provides(90): MidashiGoPro-MB31
 Filename: KozGoPro-Heavy.otf
 
 Name: KozGoPro-Medium
-Type: CID
 Class: Japan
 Provides(90): GothicBBB-Medium
 Provides(90): GothicBBBPro-Medium
 Filename: KozGoPro-Medium.otf
 
 Name: KozGoPro-Regular
-Type: CID
 Class: Japan
 Filename: KozGoPro-Regular.otf
 
 Name: KozGoProVI-Bold
-Type: CID
 Class: Japan
 Provides(80): FutoGoB101-Bold
 Provides(80): FutoGoB101Pro-Bold
 Filename: KozGoProVI-Bold.otf
 
 Name: KozGoProVI-Heavy
-Type: CID
 Class: Japan
 Provides(80): Jun101-Light
 Provides(80): Jun101Pro-Light
@@ -1600,118 +1757,126 @@ Provides(80): MidashiGoPro-MB31
 Filename: KozGoProVI-Heavy.otf
 
 Name: KozGoProVI-Medium
-Type: CID
 Class: Japan
 Provides(80): GothicBBB-Medium
 Provides(80): GothicBBBPro-Medium
 Filename: KozGoProVI-Medium.otf
 
 Name: KozGoProVI-Regular
-Type: CID
 Class: Japan
 Filename: KozGoProVI-Regular.otf
 
 Name: KozMinPr6N-Bold
-Type: CID
 Class: Japan
 Provides(70): FutoMinA101-Bold
 Provides(70): FutoMinA101Pro-Bold
 Filename: KozMinPr6N-Bold.otf
 
 Name: KozMinPr6N-Light
-Type: CID
 Class: Japan
 Filename: KozMinPr6N-Light.otf
 
 Name: KozMinPr6N-Regular
-Type: CID
 Class: Japan
 Provides(70): Ryumin-Light
 Provides(70): RyuminPro-Light
 Filename: KozMinPr6N-Regular.otf
 
 Name: KozMinPro-Bold
-Type: CID
 Class: Japan
 Provides(90): FutoMinA101-Bold
 Provides(90): FutoMinA101Pro-Bold
 Filename: KozMinPro-Bold.otf
 
 Name: KozMinPro-Light
-Type: CID
 Class: Japan
 Filename: KozMinPro-Light.otf
 
 Name: KozMinPro-Regular
-Type: CID
 Class: Japan
 Provides(90): Ryumin-Light
 Provides(90): RyuminPro-Light
 Filename: KozMinPro-Regular.otf
 
 Name: KozMinProVI-Bold
-Type: CID
 Class: Japan
 Provides(80): FutoMinA101-Bold
 Provides(80): FutoMinA101Pro-Bold
 Filename: KozMinProVI-Bold.otf
 
 Name: KozMinProVI-Light
-Type: CID
 Class: Japan
 Filename: KozMinProVI-Light.otf
 
 Name: KozMinProVI-Regular
-Type: CID
 Class: Japan
 Provides(80): Ryumin-Light
 Provides(80): RyuminPro-Light
 Filename: KozMinProVI-Regular.otf
 
 Name: KozMinPr6N-ExtraLight
-Type: CID
 Class: Japan
 Filename: KozMinPr6N-ExtraLight.otf
 
 Name: KozMinPr6N-Medium
-Type: CID
 Class: Japan
 Filename: KozMinPr6N-Medium.otf
 
 Name: KozMinPr6N-Heavy
-Type: CID
 Class: Japan
 Filename: KozMinPr6N-Heavy.otf
 
 Name: KozMinPro-ExtraLight
-Type: CID
 Class: Japan
 Filename: KozMinPro-ExtraLight.otf
 
 Name: KozMinPro-Medium
-Type: CID
 Class: Japan
 Filename: KozMinPro-Medium.otf
 
 Name: KozMinPro-Heavy
-Type: CID
 Class: Japan
 Filename: KozMinPro-Heavy.otf
 
+#
+# other OSX 11 fonts
+
+# TODO TODO should they provide Maru Gothic ???
+Name: TsukuARdGothic-Regular
+Class: Japan
+Filename: TsukushiAMaruGothic.ttc(0)
+
+Name: TsukuARdGothic-Bold
+Class: Japan
+Filename: TsukushiAMaruGothic.ttc(1)
+
+Name: TsukuBRdGothic-Regular
+Class: Japan
+Filename: TsukushiBMaruGothic.ttc(0)
+
+Name: TsukuBRdGothic-Bold
+Class: Japan
+Filename: TsukushiBMaruGothic.ttc(1)
+
+Name: Klee-Medium
+Class: Japan
+Filename: Klee.ttc(1)
+
+Name: Klee-Demibold
+Class: Japan
+Filename: Klee.ttc(0)
 
 #
 # CHINESE FONTS
 #
 
 Name: LiHeiPro
-Type: TTF
 Class: CNS
 Provides(50): MHei-Medium
 Filename(20): 儷黑 Pro.ttf
 Filename(10): LiHeiPro.ttf
 
 Name: LiSongPro
-Type: TTF
 Class: CNS
 Provides(50): MSung-Medium
 Provides(50): MSung-Light
@@ -1719,48 +1884,41 @@ Filename(20): 儷宋 Pro.ttf
 Filename(10): LiSongPro.ttf
 
 Name: STXihei
-Type: TTF
 Class: GB
 Provides(20): STHeiti-Light
 Filename(20): 华文细黑.ttf
 Filename(10): STXihei.ttf
 
 Name: STHeiti
-Type: TTF
 Class: GB
 Provides(50): STHeiti-Regular
 Filename(20): 华文黑体.ttf
 Filename(10): STHeiti.ttf
 
 Name: STHeitiSC-Light
-Type: TTF
 Class: GB
 Provides(10): STHeiti-Light
 Filename(10): STHeiti Light.ttc(1)
 Filename(20): STHeitiSC-Light.ttf
 
 Name: STHeitiSC-Medium
-Type: TTF
 Class: GB
 Provides(40): STHeiti-Regular
 Filename(10): STHeiti Medium.ttc(1)
 Filename(20): STHeitiSC-Medium.ttf
 
 Name: STHeitiTC-Light
-Type: TTF
 Class: CNS
 Filename(10): STHeiti Light.ttc(0)
 Filename(20): STHeitiTC-Light.ttf
 
 Name: STHeitiTC-Medium
-Type: TTF
 Class: CNS
 Provides(40): MHei-Medium
 Filename(10): STHeiti Medium.ttc(0)
 Filename(20): STHeitiTC-Medium.ttf
 
 Name: STFangsong
-Type: TTF
 Class: GB
 Provides(40): STFangsong-Light
 Provides(40): STFangsong-Regular
@@ -1768,7 +1926,6 @@ Filename(20): 华文仿宋.ttf
 Filename(10): STFangsong.ttf
 
 Name: STSong
-Type: TTF
 Class: GB
 Provides(50): STSong-Light
 Filename(10): Songti.ttc(4)
@@ -1777,7 +1934,6 @@ Filename(30): 华文宋体.ttf
 Filename(40): STSong.ttf
 
 Name: STSongti-SC-Light
-Type: TTF
 Class: GB
 Provides(40): STSong-Light
 Filename(10): Songti.ttc(3)
@@ -1785,48 +1941,41 @@ Filename(20): 宋体.ttc(2)
 Filename(30): STSongti-SC-Light.ttf
 
 Name: STSongti-SC-Regular
-Type: TTF
 Class: GB
 Filename(10): Songti.ttc(6)
 Filename(20): 宋体.ttc(4)
 Filename(30): STSongti-SC-Regular.ttf
 
 Name: STSongti-SC-Bold
-Type: TTF
 Class: GB
 Filename(10): Songti.ttc(1)
 Filename(20): 宋体.ttc(1)
 Filename(30): STSongti-SC-Bold.ttf
 
 Name: STSongti-SC-Black
-Type: TTF
 Class: GB
 Filename(10): Songti.ttc(0)
 Filename(20): 宋体.ttc(0)
 Filename(30): STSongti-SC-Black.ttf
 
 Name: STSongti-TC-Light
-Type: TTF
 Class: CNS
 Provides(40): MSung-Light
 Filename(10): Songti.ttc(5)
 Filename(20): STSongti-TC-Light.ttf
 
 Name: STSongti-TC-Regular
-Type: TTF
 Class: CNS
 Provides(40): MSung-Medium
 Filename(10): Songti.ttc(7)
 Filename(20): STSongti-TC-Regular.ttf
 
 Name: STSongti-TC-Bold
-Type: TTF
 Class: CNS
 Filename(10): Songti.ttc(2)
 Filename(20): STSongti-TC-Bold.ttf
 
 Name: STKaiti
-Type: TTF
 Class: GB
 Provides(50): STKaiti-Regular
 Filename(10): Kaiti.ttc(4)
@@ -1835,7 +1984,6 @@ Filename(30): 华文楷体.ttf
 Filename(40): STKaiti.ttf
 
 Name: STKaiti-SC-Regular
-Type: TTF
 Class: GB
 Provides(40): STKaiti-Regular
 Filename(10): Kaiti.ttc(3)
@@ -1843,34 +1991,29 @@ Filename(20): 楷体.ttc(2)
 Filename(30): STKaiti-SC-Regular.ttf
 
 Name: STKaiti-SC-Bold
-Type: TTF
 Class: GB
 Filename(10): Kaiti.ttc(1)
 Filename(20): 楷体.ttc(1)
 Filename(30): STKaiti-SC-Bold.ttf
 
 Name: STKaiti-SC-Black
-Type: TTF
 Class: GB
 Filename(10): Kaiti.ttc(0)
 Filename(20): 楷体.ttc(0)
 Filename(30): STKaiti-SC-Black.ttf
 
 Name: STKaiTi-TC-Regular
-Type: TTF
 Class: CNS
 Provides(40): MKai-Medium
 Filename(10): Kaiti.ttc(5)
 Filename(20): STKaiTi-TC-Regular.ttf
 
 Name: STKaiTi-TC-Bold
-Type: TTF
 Class: CNS
 Filename(10): Kaiti.ttc(2)
 Filename(20): STKaiTi-TC-Bold.ttf
 
 Name: STKaiti-Adobe-CNS1
-Type: TTF
 Class: CNS
 Provides(50): MKai-Medium
 Filename(10): Kaiti.ttc(4)
@@ -1883,26 +2026,22 @@ Filename(40): STKaiti.ttf
 # simplified chinese
 
 Name: AdobeSongStd-Light
-Type: CID
 Class: GB
 Provides(30): STSong-Light
 Filename(10): AdobeSongStd-Light.otf
 
 Name: AdobeHeitiStd-Regular
-Type: CID
 Class: GB
 Provides(30): STHeiti-Regular
 Provides(30): STHeiti-Light
 Filename(20): AdobeHeitiStd-Regular.otf
 
 Name: AdobeKaitiStd-Regular
-Type: CID
 Class: GB
 Provides(30): STKaiti-Regular
 Filename(20): AdobeKaitiStd-Regular.otf
 
 Name: AdobeFangsongStd-Regular
-Type: CID
 Class: GB
 Provides(30): STFangsong-Light
 Provides(30): STFangsong-Regular
@@ -1911,14 +2050,12 @@ Filename(20): AdobeFangsongStd-Regular.otf
 # traditional chinese
 
 Name: AdobeMingStd-Light
-Type: CID
 Class: CNS
 Provides(30): MSung-Light
 Provides(30): MSung-Medium
 Filename(20): AdobeMingStd-Light.otf
 
 Name: AdobeFanHeitiStd-Bold
-Type: CID
 Class: CNS
 Provides(30): MHei-Medium
 Provides(30): MKai-Medium
@@ -1927,13 +2064,11 @@ Filename(20): AdobeFanHeitiStd-Bold.otf
 # korean
 
 Name: AdobeMyungjoStd-Medium
-Type: CID
 Class: Korea
 Provides(20): HYSMyeongJo-Medium
 Filename: AdobeMyungjoStd-Medium.otf
 
 Name: AdobeGothicStd-Bold
-Type: CID
 Class: Korea
 Provides(20): HYGoThic-Medium
 Provides(50): HYRGoThic-Medium
@@ -1946,103 +2081,84 @@ Filename: AdobeGothicStd-Bold.otf
 # apple fonts
 
 Name: AppleMyungjo
-Type: TTF
 Class: Korea
 Provides(50): HYSMyeongJo-Medium
 Filename: AppleMyungjo.ttf
 
 Name: AppleGothic
-Type: TTF
 Class: Korea
 Provides(50): HYGoThic-Medium
 Provides(80): HYRGoThic-Medium
 Filename: AppleGothic.ttf
 
 Name: NanumMyeongjo
-Type: TTF
 Class: Korea
 Provides(30): HYSMyeongJo-Medium
 Filename: NanumMyeongjo.ttc(0)
 
 Name: NanumMyeongjoBold
-Type: TTF
 Class: Korea
 Filename: NanumMyeongjo.ttc(1)
 
 Name: NanumMyeongjoExtraBold
-Type: TTF
 Class: Korea
 Filename: NanumMyeongjo.ttc(2)
 
 Name: NanumGothic
-Type: TTF
 Class: Korea
 Provides(30): HYGoThic-Medium
 Provides(60): HYRGoThic-Medium
 Filename: NanumGothic.ttc(0)
 
 Name: NanumGothicBold
-Type: TTF
 Class: Korea
 Filename: NanumGothic.ttc(1)
 
 Name: NanumGothicExtraBold
-Type: TTF
 Class: Korea
 Filename: NanumGothic.ttc(2)
 
 Name: NanumBrush
-Type: TTF
 Class: Korea
 Filename: NanumScript.ttc(0)
 
 Name: NanumPen
-Type: TTF
 Class: Korea
 Filename: NanumScript.ttc(1)
 
 Name: AppleSDGothicNeo-Thin
-Type: CID
 Class: Korea
 Filename: AppleSDGothicNeo-Thin.otf
 
 Name: AppleSDGothicNeo-UltraLight
-Type: CID
 Class: Korea
 Filename: AppleSDGothicNeo-UltraLight.otf
 
 Name: AppleSDGothicNeo-Light
-Type: CID
 Class: Korea
 Filename: AppleSDGothicNeo-Light.otf
 
 Name: AppleSDGothicNeo-Regular
-Type: CID
 Class: Korea
 Filename: AppleSDGothicNeo-Regular.otf
 
 Name: AppleSDGothicNeo-Medium
-Type: CID
 Class: Korea
 Filename: AppleSDGothicNeo-Medium.otf
 
 Name: AppleSDGothicNeo-SemiBold
-Type: CID
 Class: Korea
 Filename: AppleSDGothicNeo-SemiBold.otf
 
 Name: AppleSDGothicNeo-Bold
-Type: CID
 Class: Korea
 Filename: AppleSDGothicNeo-Bold.otf
 
 Name: AppleSDGothicNeo-ExtraBold
-Type: CID
 Class: Korea
 Filename: AppleSDGothicNeo-ExtraBold.otf
 
 Name: AppleSDGothicNeo-Heavy
-Type: CID
 Class: Korea
 Filename: AppleSDGothicNeo-Heavy.otf
 
@@ -2053,7 +2169,6 @@ Filename: AppleSDGothicNeo-Heavy.otf
 # Korea
 
 Name: Gulim
-Type: TTF
 Class: Korea
 Provides(70): HYRGoThic-Medium
 Provides(70): HYGoThic-Medium
@@ -2061,13 +2176,11 @@ Filename(30): Gulim.ttf
 Filename(50): gulim.ttc
 
 Name: Dotum
-Type: TTF
 Class: Korea
 Provides(40): HYGoThic-Medium
 Filename(50): Dotum.ttf
 
 Name: Batang
-Type: TTF
 Class: Korea
 Provides(40): HYSMyeongJo-Medium
 Filename(50): Batang.ttf
@@ -2075,7 +2188,6 @@ Filename(50): Batang.ttf
 # simplified chinese
 
 Name: SimHei
-Type: TTF
 Class: GB
 Provides(60): STHeiti-Regular
 Provides(60): STKaiti-Regular
@@ -2083,7 +2195,6 @@ Provides(60): STHeiti-Light
 Filename(50): SimHei.ttf
 
 Name: SimSun
-Type: TTF
 Class: GB
 Provides(60): STSong-Light
 Provides(60): STFangsong-Light
@@ -2093,7 +2204,6 @@ Filename(50): SimSun.ttf
 # traditional chinese
 
 Name: MingLiU
-Type: TTF
 Class: CNS
 Provides(60): MHei-Medium
 Provides(60): MKai-Medium
@@ -2102,14 +2212,12 @@ Provides(60): MSung-Light
 Filename(50): MingLiU.ttf
 
 Name: PMingLiU
-Type: TTF
 Class: CNS
 Filename(50): PMingLiU.ttf
 
 # japanese
 
 Name: MS-Gothic
-Type: TTF
 Class: Japan
 Provides(95): GothicBBB-Medium
 Provides(95): GothicBBBPro-Medium
@@ -2125,7 +2233,6 @@ Filename(50): MS Gothic.ttf
 Filename(30): MS-Gothic.ttf
 
 Name: MS-Mincho
-Type: TTF
 Class: Japan
 Provides(95): Ryumin-Light
 Provides(95): RyuminPro-Light
@@ -2135,36 +2242,30 @@ Filename(50): MS Mincho.ttf
 Filename(30): MS-Mincho.ttf
 
 Name: MS-PGothic
-Type: TTF
 Class: Japan
 Filename(50): MS PGothic.ttf
 Filename(30): MS-PGothic.ttf
 
 Name: MS-PMincho
-Type: TTF
 Class: Japan
 Filename(50): MS PMincho.ttf
 Filename(30): MS-PMincho.ttf
 
 Name: Meiryo
-Type: TTF
 Class: Japan
 Filename(50): Meiryo.ttf
 
 Name: Meiryo-Bold
-Type: TTF
 Class: Japan
 Filename(50): Meiryo Bold.ttf
 Filename(30): Meiryo-Bold.ttf
 
 Name: Meiryo-BoldItalic
-Type: TTF
 Class: Japan
 Filename(50): Meiryo Bold Italic.ttf
 Filename(30): Meiryo-BoldItalic.ttf
 
 Name: Meiryo-Italic
-Type: TTF
 Class: Japan
 Filename(50): Meiryo Italic.ttf
 Filename(30): Meiryo-Italic.ttf
-- 
cgit v1.2.3