diff options
206 files changed, 4720 insertions, 5102 deletions
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 a1e56aec236..892dbb5ffe6 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 @@ -2,11 +2,16 @@ # # cjk-gs-integrate - setup Ghostscript for CID/TTF CJK fonts # -# Copyright 2015-2017 by Norbert Preining -# Copyright 2016-2017 by Japanese TeX Development Community +# Copyright 2015-2018 by Norbert Preining +# Copyright 2016-2018 by Japanese TeX Development Community # -# Based on research and work by Yusuke Kuroki, Bruno Voisin, Munehiro Yamamoto -# and the TeX Q&A wiki page +# This work is based on research and work by (in alphabetical order) +# Yusuke Kuroki +# Yusuke Terada +# Bruno Voisin +# Munehiro Yamamoto +# Hironobu Yamashita +# and the Japanese TeX Q&A wiki page # # This file is licensed under GPL version 3 or any later version. # For copyright statements see end of file. @@ -14,8 +19,14 @@ # For development see # https://github.com/texjporg/cjk-gs-support # +# LIMITATIONS: +# - Running the script (with default mode = actual setup/removing operations) +# always overwrites "cidfmap.local" and "cidfmap.aliases" without asking, +# whose file names might be common enough. If you choose to run the script, +# leave these files untouched. (Do NOT edit these files by yourself!) +# (This note also applies to MacTeX pre-shipped configuration files.) +# # TODO: -# - how to deal with MacTeX pre-shipped configuration files? # - interoperability with kanji-config-updmap # # Note that symlink names should be consistent with ptex-fontmaps! @@ -28,7 +39,7 @@ use Cwd 'abs_path'; use strict; (my $prg = basename($0)) =~ s/\.pl$//; -my $version = '20170624.0'; +my $version = '20180306.0'; if (win32()) { # conversion between internal (utf-8) and console (cp932): @@ -46,6 +57,16 @@ if (win32()) { print_warning("Sorry, we have only partial support for Windows!\n"); } +# The followings are installed by ptex-fontmaps (texjporg): +# * 2004-H +# * 2004-V +# The followings are created by Adobe but not considered official +# (see https://forums.adobe.com/thread/537415) +# * GB-RKSJ-H +# * GBT-RKSJ-H +# * KSC-RKSJ-H +# All others are provided in the latest Adobe CMap Resources: +# https://github.com/adobe-type-tools/cmap-resources my %encode_list = ( Japan => [ qw/ 2004-H @@ -117,7 +138,8 @@ my %encode_list = ( UniJISX02132004-UTF32-H UniJISX02132004-UTF32-V V - WP-Symbol/ ], + WP-Symbol + / ], GB => [ qw/ Adobe-GB1-0 Adobe-GB1-1 @@ -154,7 +176,8 @@ my %encode_list = ( UniGB-UTF32-H UniGB-UTF32-V UniGB-UTF8-H - UniGB-UTF8-V/ ], + UniGB-UTF8-V + / ], CNS => [ qw/ Adobe-CNS1-0 Adobe-CNS1-1 @@ -163,6 +186,7 @@ my %encode_list = ( Adobe-CNS1-4 Adobe-CNS1-5 Adobe-CNS1-6 + Adobe-CNS1-7 B5-H B5-V B5pc-H @@ -200,7 +224,8 @@ my %encode_list = ( UniCNS-UTF32-H UniCNS-UTF32-V UniCNS-UTF8-H - UniCNS-UTF8-V/ ], + UniCNS-UTF8-V + / ], Korea => [ qw/ Adobe-Korea1-0 Adobe-Korea1-1 @@ -227,7 +252,8 @@ my %encode_list = ( UniKS-UTF32-H UniKS-UTF32-V UniKS-UTF8-H - UniKS-UTF8-V/ ] ); + UniKS-UTF8-V + / ] ); # # location where links to fonts in texmf are created, relative to TEXMF @@ -254,6 +280,7 @@ my $dump_datafile = "$prg-data.dat"; my $opt_output; my $opt_fontdef; +my @opt_fontdef_add; my @opt_aliases; my $opt_filelist; my $opt_texmflink; @@ -279,6 +306,7 @@ my $opt_markdown = 0; if (! GetOptions( "o|output=s" => \$opt_output, "f|fontdef=s" => \$opt_fontdef, + "fontdef-add=s" => \@opt_fontdef_add, "a|alias=s" => \@opt_aliases, "filelist=s" => \$opt_filelist, "link-texmf:s" => \$opt_texmflink, @@ -314,20 +342,52 @@ my %user_aliases; if ($opt_help || $opt_markdown) { Usage(); - exit 0; + exit(0); } -if ($opt_debug) { +if ($opt_debug >= 2) { require Data::Dumper; $Data::Dumper::Indent = 1; } +my $otfinfo_available; +chomp(my $otfinfo_help = `otfinfo --help 2>$nul`); +if ($?) { + print_warning("The program 'otfinfo' not found in PATH.\n"); + print_warning("Sorry, we can't be safe enough to distinguish\n"); + print_warning("uppercase / lowercase file names.\n"); + $otfinfo_available = 0; +} else { + $otfinfo_available = 1; +} + +if (macosx()) { + # due to frequent incompatible changes in font file names by Apple, + # our built-in database doesn't support OS X 10.11 El Capitan or + # later versions + my $macos_ver = `sw_vers -productVersion`; + my $macos_ver_major = $macos_ver; + $macos_ver_major =~ s/^(\d+)\.(\d+).*/$1/; + my $macos_ver_minor = $macos_ver; + $macos_ver_minor =~ s/^(\d+)\.(\d+).*/$2/; + if ($macos_ver_major==10 && $macos_ver_minor>=8) { + if (!$opt_cleanup && !$opt_fontdef && !@opt_fontdef_add) { # if built-in only + print_warning("Our built-in database does not support recent\n"); + print_warning("versions of Mac OS (10.8 Mountain Lion or later)!\n"); + print_warning("If you want to use Hiragino fonts bundled with\n"); + print_warning("your OS, obtain external database file and\n"); + print_warning("specify it with --fontdef-add option!\n"); + print_warning("I'll continue with my built-in database ...\n"); + } + } +} + 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`); + chomp($foo = `kpsewhich -var-value=TEXMFLOCAL`); } else { # option was passed with an argument # -> use it @@ -342,7 +402,7 @@ if (defined($opt_akotfps)) { if (defined($opt_texmflink)) { $foo = $opt_texmflink; } else { - chomp( $foo = `kpsewhich -var-value=TEXMFLOCAL`); + chomp($foo = `kpsewhich -var-value=TEXMFLOCAL`); } } else { $foo = $opt_akotfps; @@ -382,10 +442,6 @@ if (defined($opt_dump_data)) { } else { $opt_dump_data = 0; } -if ($opt_dump_data && $opt_fontdef) { - print_warning("-f/--fontdef option ignored due to --dump-data\n"); - $opt_fontdef = 0; -} if ($opt_cleanup) { $opt_remove = 1; @@ -395,10 +451,24 @@ if ($opt_info) { $opt_listfonts = 1; $opt_listaliases = 1; } + +# check exclusive options; unsafe due to make_all_available() +if ($opt_listallaliases && $opt_listaliases) { + print_error("Both --list-all-aliases and --list-aliases!? I'm confused!\n"); + exit(1); +} if ($opt_listallaliases && $opt_listfonts) { print_error("Options --list-all-aliases and --list-fonts cannot be used at the same time!\n"); exit(1); } +if ($opt_cleanup && $opt_listfonts) { + print_error("Options --cleanup and --list-fonts cannot be used at the same time!\n"); + exit(1); +} +if ($opt_cleanup && $opt_listaliases) { + print_error("Options --cleanup and --list-aliases cannot be used at the same time!\n"); + exit(1); +} main(@ARGV); @@ -407,10 +477,11 @@ main(@ARGV); # sub main { # first, read font database to obtain %fontdb - # if $opt_dump_data is given, exit after dumping <DATA> to $dump_datafile print_info("reading font database ...\n"); read_font_database(); if ($opt_dump_data) { + # with --dump-data, dump only effective database and exit + dump_font_database(); if (-f $dump_datafile) { print_info("*** Data dumped to $dump_datafile ***\n"); exit(0); @@ -464,8 +535,8 @@ sub main { } } if (! -d $opt_output) { - $dry_run || mkdir($opt_output) || - die ("Cannot create directory $opt_output: $!"); + $dry_run || mkdir($opt_output) || + die("Cannot create directory $opt_output: $!"); } if ($opt_cleanup) { print_info("going to clean up $opt_output\n"); @@ -592,7 +663,7 @@ sub do_nonotf_fonts { 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}{'ttfname'}, $fontdb{$k}{'subfont'}); + $outp .= generate_cidfmap_entry($k, $fontdb{$k}{'class'}, $fontdb{$k}{'ttfname'}, -1); link_font($fontdb{$k}{'target'}, $cidfsubst, $fontdb{$k}{'ttfname'}); link_font($fontdb{$k}{'target'}, "$opt_texmflink/$ttf_pathpart", $fontdb{$k}{'ttfname'}) if $opt_texmflink; @@ -620,8 +691,8 @@ sub do_nonotf_fonts { mkdir("$opt_output/Init") || die("Cannot create directory $opt_output/Init: $!"); } - open(FOO, ">$opt_output/$cidfmap_local_pathpart") || - die "Cannot open $opt_output/$cidfmap_local_pathpart: $!"; + open(FOO, ">$opt_output/$cidfmap_local_pathpart") || + die("Cannot open $opt_output/$cidfmap_local_pathpart: $!"); print FOO $outp; close(FOO); } @@ -630,20 +701,16 @@ sub do_nonotf_fonts { sub do_aliases { my $fontdest = "$opt_output/Font"; + my $ciddest = "$opt_output/CIDFont"; # required for Heisei* check only my $cidfsubst = "$opt_output/CIDFSubst"; my $outp = ''; # # alias handling - # we use two levels of aliases, one is for the default names that - # are not actual fonts: - # Ryumin-Light, GothicBBB-Medium, FutoMinA101-Bold, FutoGoB101-Bold, - # Jun101-Light which are the original Morisawa names. - # - # the second level of aliases is for Morisawa OTF font names: - # RyuminPro-Light, GothicBBBPro-Medium, - # FutoMinA101Pro-Bold, FutoGoB101Pro-Bold - # Jun101Pro-Light - # + # we use two levels of aliases + # * one is for the default generic names (these are not actual fonts) + # Ryumin-Light, GothicBBB-Medium, ... etc. + # * the second level of aliases is for Morisawa OTF font names + # RyuminPro-Light, GothicBBBPro-Medium, ... etc. # the order of fonts selected is # defined in the Provides(Priority): Name in the font definiton # @@ -667,7 +734,10 @@ sub do_aliases { } } if (!$class) { - print_warning("Alias candidate for $al is empty!\n") if (!%{$aliases{$al}}); + if (!%{$aliases{$al}}) { + print_warning("Alias candidate for $al is empty, skipping!\n"); + next; + } # search lowest number my @ks = keys(%{$aliases{$al}}); my $first = (sort { $a <=> $b} @ks)[0]; @@ -689,6 +759,11 @@ sub do_aliases { print STDERR "unknown class $class for $al\n"; } } + # special case for native CID fonts in ancient days + # if not readable, add aliases for substitution + push @jal, "/HeiseiMin-W3 /Ryumin-Light ;" if (! -r "$ciddest/HeiseiMin-W3"); + push @jal, "/HeiseiKakuGo-W5 /GothicBBB-Medium ;" if (! -r "$ciddest/HeiseiKakuGo-W5"); + # $outp .= "\n% Japanese fonts\n" . join("\n", @jal) . "\n" if @jal; $outp .= "\n% Korean fonts\n" . join("\n", @kal) . "\n" if @kal; $outp .= "\n% Traditional Chinese fonts\n" . join("\n", @tal) . "\n" if @tal; @@ -700,8 +775,8 @@ sub do_aliases { mkdir("$opt_output/Init") || die("Cannot create directory $opt_output/Init: $!"); } - open(FOO, ">$opt_output/$cidfmap_aliases_pathpart") || - die "Cannot open $opt_output/$cidfmap_aliases_pathpart: $!"; + open(FOO, ">$opt_output/$cidfmap_aliases_pathpart") || + die("Cannot open $opt_output/$cidfmap_aliases_pathpart: $!"); print FOO $outp; close(FOO); } @@ -713,46 +788,70 @@ sub do_aliases { } sub update_master_cidfmap { + # what we have to do is: + # in add mode: + # * add an entry for the given argument + # * for tlgs.win32 pre-shipped cidfmap, prepend '%' to override + # the default of "(cidfmap.TeXLive) .runlibfile", + # in remove mode: + # * remove an entry for the given argument + # * for tlgs.win32 pre-shipped cidfmap, remove '%' to restore the default my $add = shift; my $cidfmap_master = "$opt_output/$cidfmap_pathpart"; - print_info(sprintf("%s $add %s cidfmap file ...\n", + 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: $!"); + die("Cannot open $cidfmap_master for reading: $!"); my $found = 0; + my $found_tl = 0; my $newmaster = ""; # in add mode: just search for the entry and set $found # in remove mode: collect all lines that do not match + # also, we handle "cidfmap.TeXLive" now while(<FOO>) { if (m/^\s*\(\Q$add\E\)\s\s*\.runlibfile\s*$/) { $found = 1; + } elsif (m/^\s*\(cidfmap\.TeXLive\)\s\s*\.runlibfile\s*$/) { + # if found, it has to be disabled in add mode in a way in which it can + # be detected in the (future) remove mode + next if ($found_tl); # skip it as duplicate (though unlikely to happen) + $found_tl = 1; + $newmaster .= "\%" if (!$opt_remove); # in add mode, disable it + $newmaster .= $_; # pass it as-is + } elsif (m/^\s*\%\%*\s*\(cidfmap\.TeXLive\)\s\s*\.runlibfile\s*$/) { + # if found, it should be the one disabled by myself in the previous run; + # restore it in remove mode + next if ($found_tl); # skip it as duplicate (though unlikely to happen) + $found_tl = 1; + $_ =~ s/\%//g if ($opt_remove); # in remove mode, enable it + $newmaster .= $_; # pass it } else { $newmaster .= $_; } } close(FOO); - # if the master cidfmap has a new line at end of file, + # if the original master cidfmap has a new line at end of file, # then $newmaster should end with "\n". # otherwise we add a new line, since there is a possibility of %EOF comment # without trailing new line (e.g. TL before r44039) - $newmaster =~ s/\n$//g; - $newmaster =~ s/$/\n/g; + $newmaster =~ s/\n$//; + $newmaster =~ s/$/\n/; if ($opt_remove) { - if ($found) { + if ($found || $found_tl) { return if $dry_run; open(FOO, ">", $cidfmap_master) || - die ("Cannot clean up $cidfmap_master: $!"); + die("Cannot clean up $cidfmap_master: $!"); print FOO $newmaster; close FOO; } } else { - if ($found) { + if ($found && !$found_tl) { print_info("$add already loaded in $cidfmap_master, no changes\n"); } else { return if $dry_run; open(FOO, ">", $cidfmap_master) || - die ("Cannot open $cidfmap_master for appending: $!"); + die("Cannot open $cidfmap_master for appending: $!"); print FOO $newmaster; print FOO "($add) .runlibfile\n"; close(FOO); @@ -762,7 +861,7 @@ sub update_master_cidfmap { return if $dry_run; return if $opt_remove; open(FOO, ">", $cidfmap_master) || - die ("Cannot open $cidfmap_master for writing: $!"); + die("Cannot open $cidfmap_master for writing: $!"); print FOO "($add) .runlibfile\n"; close(FOO); } @@ -776,9 +875,11 @@ sub generate_cidfmap_entry { # extract subfont my $s = "/$n << /FileType /TrueType /Path pssystemparams /GenericResourceDir get - (CIDFSubst/$f) concatstrings - /SubfontID $sf - /CSI [($c"; + (CIDFSubst/$f) concatstrings\n"; + if ($sf >= 0) { # in this script, $sf < 0 represents TTF + $s .= " /SubfontID $sf\n"; + } + $s .= " /CSI [($c"; if ($c eq "Japan") { $s .= "1) 6]"; } elsif ($c eq "GB") { @@ -807,7 +908,7 @@ sub generate_font_snippet { unlink "$fd/$n-$enc" if (-f "$fd/$n-$enc"); next; } - open(FOO, ">$fd/$n-$enc") || + open(FOO, ">$fd/$n-$enc") || die("cannot open $fd/$n-$enc for writing: $!"); print FOO "%!PS-Adobe-3.0 Resource-Font %%DocumentNeededResources: $enc (CMap) @@ -835,7 +936,7 @@ sub add_akotfps_data { # # link_font operation -# $opt_force is *not* treated first to warn only +# $opt_force is *not* treated first to warn only # at really critical cases # case 1: # exists, is link, link targets agree @@ -861,7 +962,7 @@ sub add_akotfps_data { # not exists # $opt_force is ignored # do nothing or add according to $opt_remove -# +# sub link_font { my ($f, $cd, $n) = @_; return if $dry_run; @@ -927,7 +1028,7 @@ sub make_dir { if (-r $d) { if (! -d $d) { print_error("$d is not a directory, $w\n"); - exit 1; + exit(1); } } else { $dry_run || make_path($d); @@ -1015,7 +1116,7 @@ sub maybe_unlink { # write batch file (windows only) sub write_winbatch { return if $dry_run; - open(FOO, ">$winbatch") || + open(FOO, ">$winbatch") || die("cannot open $winbatch for writing: $!"); # $winbatch_content may contain multibyte characters, and they # should be encoded in cp932 in batch file @@ -1032,7 +1133,7 @@ sub write_akotfps_datafile { return if $dry_run; make_dir("$opt_akotfps/$akotfps_pathpart", "cannot create $akotfps_datafilename in it!"); - open(FOO, ">$opt_akotfps/$akotfps_pathpart/$akotfps_datafilename") || + open(FOO, ">$opt_akotfps/$akotfps_pathpart/$akotfps_datafilename") || die("cannot open $opt_akotfps/$akotfps_pathpart/$akotfps_datafilename for writing: $!"); print FOO "% psnames-for-otf % @@ -1158,7 +1259,7 @@ sub make_all_available { sub check_for_files { my @foundfiles; if ($opt_filelist) { - open(FOO, "<", $opt_filelist) || die "Cannot open $opt_filelist: $!"; + open(FOO, "<", $opt_filelist) || die("Cannot open $opt_filelist: $!"); @foundfiles = <FOO>; close(FOO) || warn "Cannot close $opt_filelist: $!"; } else { @@ -1166,7 +1267,7 @@ sub check_for_files { my @fn; for my $k (keys %fontdb) { for my $f (keys %{$fontdb{$k}{'files'}}) { - # check for subfont extension + # check for subfont extension if ($f =~ m/^(.*)\(\d*\)$/) { push @fn, $1; } else { @@ -1181,11 +1282,20 @@ sub check_for_files { push @extradirs, "c:/windows/fonts//"; } else { # other dirs to check, for normal unix? - for my $d (qw!/Library/Fonts /System/Library/Fonts /System/Library/Assets /Network/Library/Fonts /usr/share/fonts!) { + for my $d (qw!/Library/Fonts /System/Library/Fonts /System/Library/Assets + /Network/Library/Fonts /usr/share/fonts!) { push @extradirs, "$d//" if (-d $d); # recursive search } - # macosx specific; the path contains white space, so hack required - for my $d (qw!/Applications/Microsoft__Word.app /Applications/Microsoft__Excel.app /Applications/Microsoft__PowerPoint.app!) { + # the path contains white space, so hack required + for my $d (qw!/Library/Application__Support/Apple/Fonts!) { + my $sd = $d; + $sd =~ s/__/ /; + push @extradirs, "$sd//" if (-d "$sd"); # recursive search + } + # office for mac 2016 + for my $d (qw!/Applications/Microsoft__Word.app + /Applications/Microsoft__Excel.app + /Applications/Microsoft__PowerPoint.app!) { my $sd = $d; $sd =~ s/__/ /; push @extradirs, "$sd/Contents/Resources/Fonts/" if (-d "$sd/Contents/Resources/Fonts"); @@ -1267,30 +1377,66 @@ sub check_for_files { } my $bn = basename($f); # kpsewhich -all might return multiple files with the same basename; - # choose the first one among them - $bntofn{$bn} = $realf if (!$bntofn{$bn}); + # collect all of them + $bntofn{$bn}{$realf} = 1; } # show the %fontdb before file check - if ($opt_debug > 0) { - print_debug("dumping font database before file check:\n"); - print_debug(Data::Dumper::Dumper(\%fontdb)); + if ($opt_debug >= 2) { + print_ddebug("dumping font database before file check:\n"); + print_ddebug(Data::Dumper::Dumper(\%fontdb)); } - if ($opt_debug > 1) { - print_ddebug("dumping basename to filename list:\n"); - print_ddebug(Data::Dumper::Dumper(\%bntofn)); + if ($opt_debug >= 3) { + print_dddebug("dumping basename to filename list:\n"); + print_dddebug(Data::Dumper::Dumper(\%bntofn)); } # update the %fontdb with the found files for my $k (keys %fontdb) { $fontdb{$k}{'available'} = 0; for my $f (keys %{$fontdb{$k}{'files'}}) { - # check for subfont extension + # check for subfont extension my $realfile = $f; $realfile =~ s/^(.*)\(\d*\)$/$1/; - if ($bntofn{$realfile}) { + # check for casefolding + # we might catch different names (batang/Batang) and identify them wrongly on + # * case-insensitive file systems (like HFS on MacOS) + # * kpathsea 6.3.0 or later, with casefolding fallback search (TL2018) + # check the actual psname using otfinfo utility, only when we "know" + # both uppercase/lowercase font files are possible and they are different + my $actualpsname; + my $bname; + for my $b (keys %{$bntofn{$realfile}}) { + if ($fontdb{$k}{'casefold'} && $otfinfo_available && + ($fontdb{$k}{'files'}{$f}{'type'} eq 'OTF' || $fontdb{$k}{'files'}{$f}{'type'} eq 'TTF')) { + print_debug("We need to test whether\n"); + print_debug(" $b\n"); + print_debug("is the correct one. Invoking otfinfo ...\n"); + chomp($actualpsname = `otfinfo -p "$b"`); + if ($?) { + # something is wrong with the font file, or otfinfo does not support it; + # still there is a chance that Ghostscript supports, so don't discard it + print_debug("... command exited with $?!\n"); + print_debug("OK, I'll take this, but it may not work properly.\n"); + $bname = $b; + last; + } + if ($actualpsname ne $k) { + print_debug("... PSName returned by otfinfo ($actualpsname) is\n"); + print_debug("different from our database ($k), discarding!\n"); + } else { + print_debug("... test passed.\n"); + $bname = $b; + last; + } + } else { + $bname = $b; + last; + } + } + if ($bname) { # we found a representative, make it available - $fontdb{$k}{'files'}{$f}{'target'} = $bntofn{$realfile}; + $fontdb{$k}{'files'}{$f}{'target'} = $bname; $fontdb{$k}{'available'} = 1; } else { # delete the entry for convenience @@ -1313,14 +1459,14 @@ sub check_for_files { 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' || $fontdb{$k}{'type'} eq 'TTC' || $fontdb{$k}{'type'} eq 'OTC'); + $fontdb{$k}{'subfont'} = $sf if ($fontdb{$k}{'type'} eq 'TTC' || $fontdb{$k}{'type'} eq 'OTC'); } # not needed anymore # delete $fontdb{$k}{'files'}; } - if ($opt_debug > 0) { - print_debug("dumping font database:\n"); - print_debug(Data::Dumper::Dumper(\%fontdb)); + if ($opt_debug >= 2) { + print_ddebug("dumping font database:\n"); + print_ddebug(Data::Dumper::Dumper(\%fontdb)); } } @@ -1374,9 +1520,9 @@ sub compute_aliases { $user_aliases{$ll} = $rr; } } - if ($opt_debug > 0) { - print_debug("dumping aliases:\n"); - print_debug(Data::Dumper::Dumper(\%aliases)); + if ($opt_debug >= 2) { + print_ddebug("dumping aliases:\n"); + print_ddebug(Data::Dumper::Dumper(\%aliases)); } } @@ -1431,56 +1577,73 @@ sub determine_nonotf_link_name { sub read_font_database { my @dbl; + # if --fontdef=foo is given, disregard built-in database and + # use "foo" as a substitute; otherwise, use built-in database if ($opt_fontdef) { - open (FDB, "<$opt_fontdef") || - die "Cannot find $opt_fontdef: $!"; + my $foo = kpse_miscfont($opt_fontdef); + open(FDB, "<$foo") || + die("Cannot find $opt_fontdef: $!"); @dbl = <FDB>; close(FDB); } else { @dbl = <DATA>; } - chomp(@dbl); - # add a "final empty line" to easy parsing - push @dbl, ""; - - if ($opt_dump_data) { - open(FOO, ">$dump_datafile") || - die("cannot open $dump_datafile for writing: $!"); + read_each_font_database(@dbl); + # if --fontdef-add=bar is given, use "bar" as an addition + # to the current database; if the same Name entry appears, + # overwrite existing one (that is, the addition wins) + for (@opt_fontdef_add) { + my $foo = kpse_miscfont($_); + open(FDB, "<$foo") || + die("Cannot find $_: $!"); + @dbl = <FDB>; + close(FDB); + read_each_font_database(@dbl); } +} +sub read_each_font_database { + my (@curdbl) = @_; my $fontname = ""; my $fontclass = ""; my %fontprovides = (); + my $fontcasefold = ""; my %fontfiles; my $psname = ""; my $lineno = 0; - for my $l (@dbl) { - if ($opt_dump_data) { - print FOO "$l\n"; - next; - } - + chomp(@curdbl); + push @curdbl, ""; # add a "final empty line" to easy parsing + for my $l (@curdbl) { $lineno++; - next if ($l =~ m/^\s*#/); - if ($l =~ m/^\s*$/) { + next if ($l =~ m/^\s*#/); # skip comment line + $l =~ s/\s*#.*$//; # skip comment after '#' + if ($l =~ m/^\s*$/) { # empty line is a separator between entries if ($fontname || $fontclass || keys(%fontfiles)) { if ($fontname && $fontclass && keys(%fontfiles)) { my $realfontname = ($psname ? $psname : $fontname); + if ($fontdb{$realfontname}{'origname'}) { + # needed for --fontdef-add, which allows overwriting with external database given by user + print_debug("$fontdb{$realfontname}{'origname'} is already registered in database,\n"); + print_debug("overwriting with the new one ...\n"); + } $fontdb{$realfontname}{'origname'} = $fontname; $fontdb{$realfontname}{'class'} = $fontclass; + $fontdb{$realfontname}{'casefold'} = $fontcasefold; $fontdb{$realfontname}{'files'} = { %fontfiles }; $fontdb{$realfontname}{'provides'} = { %fontprovides }; - if ($opt_debug > 1) { - print_ddebug("Dumping fontfiles for $realfontname: " . Data::Dumper::Dumper(\%fontfiles)); + if ($opt_debug >= 3) { + print_dddebug("Dumping fontfiles for $realfontname: " . Data::Dumper::Dumper(\%fontfiles)); } # reset to start $fontname = $fontclass = $psname = ""; + $fontcasefold = ""; %fontfiles = (); %fontprovides = (); } else { print_warning("incomplete entry above line $lineno for $fontname/$fontclass, skipping!\n"); # reset to start $fontname = $fontclass = $psname = ""; + $fontcasefold = ""; %fontfiles = (); %fontprovides = (); } @@ -1489,9 +1652,38 @@ sub read_font_database { } next; } + if ($l =~ m/^!INCLUDE\s*(.*)$/) { # for remove-only database + next if (!$opt_cleanup); + my @dbl; + my $foo = kpse_miscfont($1); + if (!open(FDB, "<$foo")) { + print_warning("Cannot find $1, skipping!\n"); + next; + } + @dbl = <FDB>; + close(FDB); + print_debug("Reading database file $1...\n"); + read_each_font_database(@dbl); + next; + } + if ($l =~ m/^INCLUDE\s*(.*)$/) { + my @dbl; + my $foo = kpse_miscfont($1); + if (!open(FDB, "<$foo")) { + print_warning("Cannot find $1, skipping!\n"); + next; + } + @dbl = <FDB>; + close(FDB); + print_debug("Reading database file $1...\n"); + read_each_font_database(@dbl); + next; + } if ($l =~ m/^Name:\s*(.*)$/) { $fontname = $1; next; } if ($l =~ m/^PSName:\s*(.*)$/) { $psname = $1; next; } if ($l =~ m/^Class:\s*(.*)$/) { $fontclass = $1 ; next ; } + if ($l =~ m/^Provides\((\d+)\):\s*(.*)$/) { $fontprovides{$2} = $1; next; } + if ($l =~ m/^Casefold:\s*(.*)$/) { $fontcasefold = $1 ; next ; } # new code: distinguish 4 types (otf, otc, ttf, ttc) if ($l =~ m/^OTFname(\((\d+)\))?:\s*(.*)$/) { my $fn = $3; @@ -1501,8 +1693,8 @@ sub read_font_database { if (win32()) { $encoded_fn = encode_utftocp($fn); } - print_ddebug("filename: ", ($encoded_fn ? "$encoded_fn" : "$fn"), "\n"); - print_ddebug("type: otf\n"); + print_dddebug("filename: ", ($encoded_fn ? "$encoded_fn" : "$fn"), "\n"); + print_dddebug("type: otf\n"); $fontfiles{$fn}{'type'} = 'OTF'; next; } @@ -1514,8 +1706,8 @@ sub read_font_database { if (win32()) { $encoded_fn = encode_utftocp($fn); } - print_ddebug("filename: ", ($encoded_fn ? "$encoded_fn" : "$fn"), "\n"); - print_ddebug("type: otc\n"); + print_dddebug("filename: ", ($encoded_fn ? "$encoded_fn" : "$fn"), "\n"); + print_dddebug("type: otc\n"); $fontfiles{$fn}{'type'} = 'OTC'; next; } @@ -1527,8 +1719,8 @@ sub read_font_database { if (win32()) { $encoded_fn = encode_utftocp($fn); } - print_ddebug("filename: ", ($encoded_fn ? "$encoded_fn" : "$fn"), "\n"); - print_ddebug("type: ttf\n"); + print_dddebug("filename: ", ($encoded_fn ? "$encoded_fn" : "$fn"), "\n"); + print_dddebug("type: ttf\n"); $fontfiles{$fn}{'type'} = 'TTF'; next; } @@ -1540,8 +1732,8 @@ sub read_font_database { if (win32()) { $encoded_fn = encode_utftocp($fn); } - print_ddebug("filename: ", ($encoded_fn ? "$encoded_fn" : "$fn"), "\n"); - print_ddebug("type: ttc\n"); + print_dddebug("filename: ", ($encoded_fn ? "$encoded_fn" : "$fn"), "\n"); + print_dddebug("type: ttc\n"); $fontfiles{$fn}{'type'} = 'TTC'; next; } @@ -1554,18 +1746,18 @@ sub read_font_database { if (win32()) { $encoded_fn = encode_utftocp($fn); } - print_ddebug("filename: ", ($encoded_fn ? "$encoded_fn" : "$fn"), "\n"); + print_dddebug("filename: ", ($encoded_fn ? "$encoded_fn" : "$fn"), "\n"); if ($fn =~ m/\.otf$/i) { - print_ddebug("type: otf\n"); + print_dddebug("type: otf\n"); $fontfiles{$fn}{'type'} = 'OTF'; } elsif ($fn =~ m/\.otc(\(\d+\))?$/i) { - print_ddebug("type: otc\n"); + print_dddebug("type: otc\n"); $fontfiles{$fn}{'type'} = 'OTC'; } elsif ($fn =~ m/\.ttf$/i) { - print_ddebug("type: ttf\n"); + print_dddebug("type: ttf\n"); $fontfiles{$fn}{'type'} = 'TTF'; } elsif ($fn =~ m/\.ttc(\(\d+\))?$/i) { - print_ddebug("type: ttc\n"); + print_dddebug("type: ttc\n"); $fontfiles{$fn}{'type'} = 'TTC'; } else { print_warning("cannot determine font type of $fn at line $lineno, skipping!\n"); @@ -1573,24 +1765,57 @@ sub read_font_database { } next; } - if ($l =~ m/^Provides\((\d+)\):\s*(.*)$/) { $fontprovides{$2} = $1; next; } + # only for removing + if ($l =~ m/^RMVname(\((\d+)\))?:\s*(.*)$/) { + my $fn = $3; + $fontfiles{$fn}{'priority'} = ($2 ? $2 : 10); + # cp932 for win32 console + my $encoded_fn; + if (win32()) { + $encoded_fn = encode_utftocp($fn); + } + print_dddebug("filename: ", ($encoded_fn ? "$encoded_fn" : "$fn"), "\n"); + print_dddebug("type: remove\n"); + $fontfiles{$fn}{'type'} = 'RMV'; + next; + } # we are still here?? - print_error("Cannot parse this file at line $lineno, exiting. Strange line: >>>$l<<<\n"); - exit (1); + print_error("Cannot parse this file at line $lineno, exiting. + Strange line: >>>$l<<<\n"); + exit(1); } +} - if ($opt_dump_data) { - close(FOO); +sub dump_font_database { + open(FOO, ">$dump_datafile") || + die("cannot open $dump_datafile for writing: $!"); + for my $k (sort keys %fontdb) { + print FOO "Name: $fontdb{$k}{'origname'}\n"; + print FOO "PSName: $k\n" if ($fontdb{$k}{'origname'} ne $k); + print FOO "Class: $fontdb{$k}{'class'}\n"; + for my $p (sort keys %{$fontdb{$k}{'provides'}}) { + print FOO "Provides($fontdb{$k}{'provides'}{$p}): $p\n"; + } + print FOO "Casefold: $fontdb{$k}{'casefold'}\n" if ($fontdb{$k}{'casefold'}); + for my $f (sort { $fontdb{$k}{'files'}{$a}{'priority'} + <=> + $fontdb{$k}{'files'}{$b}{'priority'} } + keys %{$fontdb{$k}{'files'}}) { + print FOO "$fontdb{$k}{'files'}{$f}{'type'}name($fontdb{$k}{'files'}{$f}{'priority'}): $f\n"; + } + print FOO "\n"; # empty line is a separator between entries } + close(FOO); } sub find_gs_resource { my $foundres = ''; if (win32()) { # determine tlgs or native gs - chomp( my $foo = `kpsewhich -var-value=SELFAUTOPARENT`); + chomp(my $foo = `kpsewhich -var-value=SELFAUTOPARENT`); if ( -d "$foo/tlpkg/tlgs" ) { # should be texlive with tlgs + print_debug("Assuming tlgs win32 ...\n"); $foundres = "$foo/tlpkg/tlgs/Resource"; # for TL2016, tlgs binary has built-in Resource, # so we cannot set up CJK fonts correctly. @@ -1605,25 +1830,54 @@ sub find_gs_resource { $cidfmap_local_pathpart = "../lib/cidfmap.local"; $cidfmap_aliases_pathpart = "../lib/cidfmap.aliases"; } else { - # TODO: we assume gswin32c is in the path - # paths other than c:/gs/gs$gsver/Resource are not considered - chomp( my $gsver = `gswin32c --version 2>$nul` ); - $foundres = "c:/gs/gs$gsver/Resource"; - if ( ! -d $foundres ) { - $foundres = ''; + # we assume gswin32c is in the path + # TODO: what should we do for gswin64c? + chomp($foundres = `where gswin32c 2>$nul`); # assume 'where' is available + if ($?) { + print_error("Cannot run where gswin32c ...\n"); + } else { + # trial 1: assume the relative path + # when C:\path\to\bin\gswin32c.exe is found, then there should be + # C:\path\to\Resource (note that 'where' returns backslash-ed path) + print_debug("Finding gs resource by assuming relative path ...\n"); + $foundres = encode_cptoutf($foundres); # 99.99% unnecessary + $foundres =~ s!\\!/!g; + $foundres =~ s!/bin/gswin32c\.exe$!/Resource!; + if ( ! -d $foundres ) { + $foundres = ''; + } + if (!$foundres) { + print_debug("Found gs but no resource, try another routine ...\n"); + } + } + if (!$foundres) { + chomp(my $gsver = `gswin32c --version 2>$nul`); + if ($?) { + print_error("Cannot run gswin32c --version ...\n"); + } else { + # trial 2: assume the fixed path, c:/gs/gs$gsver/Resource + print_debug("Finding gs resource by assuming fixed path ...\n"); + $foundres = "c:/gs/gs$gsver/Resource"; + if ( ! -d $foundres ) { + $foundres = ''; + } + if (!$foundres) { + print_error("Found gs but no resource???\n"); + } + } } } } else { # we assume that gs is in the path - chomp( my $gsver = `gs --version 2>$nul` ); + chomp(my $gsver = `gs --version 2>$nul`); if ($?) { - print_error("Cannot get gs version ...\n"); + print_error("Cannot run gs --version ...\n"); } else { # trial 1: assume the relative path # when /path/to/bin/gs is found, then there should be # /path/to/share/ghostscript/$(gs --version)/Resource print_debug("Finding gs resource by assuming relative path ...\n"); - chomp( $foundres = `which gs` ); + chomp($foundres = `which gs`); $foundres =~ s!/bin/gs$!/share/ghostscript/$gsver/Resource!; if ( ! -d $foundres ) { $foundres = ''; @@ -1633,7 +1887,7 @@ sub find_gs_resource { } } if (!$foundres) { - chomp( my @ret = `gs --help 2>$nul` ); + chomp(my @ret = `gs --help 2>$nul`); if ($?) { print_error("Cannot run gs --help ...\n"); } else { @@ -1659,6 +1913,16 @@ sub find_gs_resource { return $foundres; } +sub kpse_miscfont { + my ($file) = @_; + chomp(my $foo = `kpsewhich -format=miscfont $file`); + # for GitHub repository diretory structure + if ($foo eq "") { + $foo = "database/$file" if (-f "database/$file"); + } + return $foo; +} + sub encode_utftocp { my ($foo) = @_; $foo = Encode::decode('utf-8', $foo); @@ -1687,6 +1951,9 @@ sub Usage { is searched and used. -f, --fontdef FILE specify alternate set of font definitions, if not given, the built-in set is used +--fontdef-add FILE specify additional set of font definitions, to + overwrite subset of built-in definitions; + can be given multiple times -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; @@ -1722,9 +1989,10 @@ sub Usage { "; my $commandoptions = " ---dump-data [FILE] dump the built-in set of font definitions; you can - easily modify it, and tell me with -f (or --fontdef) - the data file name defaults to $dump_datafile +--dump-data [FILE] dump the set of font definitions which is currently + effective, where FILE (the dump output) defaults to + $dump_datafile; you can easily modify it, + and tell me with -f (or --fontdef) option --only-aliases regenerate only cidfmap.aliases file, instead of all --list-aliases lists the available aliases and their options, with the selected option on top @@ -1765,7 +2033,7 @@ The `<Resource>` dir is either given by `-o`/`--output`, or otherwise searched from an installed Ghostscript (binary name is assumed to be 'gs' on unix, 'gswin32c' on win32). -Aliases are added to +Aliases are added to <Resource>/Init/cidfmap.aliases -- if you are using tlgs win32, tlpkg/tlgs/lib/cidfmap.aliases instead @@ -1819,7 +2087,8 @@ are added: Japanese: - Ryumin-Light GothicBBB-Medium FutoMinA101-Bold FutoGoB101-Bold Jun101-Light + Ryumin-Light GothicBBB-Medium FutoMinA101-Bold FutoGoB101-Bold + MidashiMin-MA31 MidashiGo-MB31 Jun101-Light Korean: @@ -1835,20 +2104,23 @@ Traditional Chinese: MSung-Light MSung-Medium 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 Pr6N, Morisawa, Hiragino ProN, Hiragino, - Kozuka Pr6N, Kozuka ProVI, Kozuka, Yu OSX, Yu Win, - MS, Moga-Mobo-ex, Moga-Mobo, IPAex, IPA, Ume + RyuminPro-Light GothicBBBPro-Medium + FutoMinA101Pro-Bold FutoGoB101Pro-Bold + MidashiMinPro-MA31 MidashiGoPro-MB31 Jun101Pro-Light +The order is determined by the `Provides` setting in the font database. That is, the first font found in this order will be used to provide the alias if necessary. +For the Japanese fonts: + Morisawa Pr6N, Morisawa, Hiragino ProN, Hiragino, + Kozuka Pr6N, Kozuka ProVI, Kozuka Pro, Kozuka Std, + Yu OS X, Yu Win, MS, + Moga-Mobo-ex, Moga-Mobo, IPAex, IPA, Ume + For the Korean fonts: - (Hanyang,) Adobe, Solaris-hanyang, MS, Unfonts, Baekmuk + (Hanyang,) Adobe, Solaris, MS, Unfonts, Baekmuk For the Simplified Chinese: Adobe, Fandol, Hiragino, Founder, MS, CJKUnifonts, Arphic, CJKUnifonts-ttf @@ -1867,8 +2139,11 @@ requirements of `LL` and `RR` must be fulfilled: my $authors = " The script and its documentation was written by Norbert Preining, based -on research and work by Yusuke Kuroki, Bruno Voisin, Hironobu Yamashita, -Munehiro Yamamoto and the TeX Q&A wiki page. +on research and work by Yusuke Kuroki, Yusuke Terada, Bruno Voisin, +Hironobu Yamashita, Munehiro Yamamoto and the TeX Q&A wiki page. + +Maintained by Japanese TeX Development Community. For development, see + https://github.com/texjporg/cjk-gs-support The script is licensed under GNU General Public License Version 3 or later. The contained font data is not copyrightable. @@ -1916,12 +2191,12 @@ The contained font data is not copyrightable. print_for_out($authors, " "); print "\n"; } - exit 0; + exit(0); } sub print_for_out { my ($what, $indent) = @_; - for (split /\n/, $what) { + for (split /\n/, $what) { next if m/`````/; s/\s*####\s*//g; if ($_ eq '') { @@ -1941,7 +2216,7 @@ sub print_verbose { print STDOUT "$prg: ", @_; } sub print_warning { - print STDERR "$prg [WARNING]: ", @_ if (!$opt_quiet) + print STDERR "$prg [WARNING]: ", @_ if (!$opt_quiet) } sub print_error { print STDERR "$prg [ERROR]: ", @_; @@ -1952,6 +2227,9 @@ sub print_debug { sub print_ddebug { print STDERR "$prg [DEBUG]: ", @_ if ($opt_debug >= 2); } +sub print_dddebug { + print STDERR "$prg [DEBUG]: ", @_ if ($opt_debug >= 3); +} __DATA__ @@ -1963,616 +2241,42 @@ __DATA__ # JAPANESE FONTS # -# Morisawa - -Name: A-OTF-RyuminPr6N-Light -PSName: RyuminPr6N-Light -Class: Japan -Provides(10): Ryumin-Light -Provides(10): RyuminPro-Light -Provides(10): HiraMinProN-W3 -Provides(10): HiraMinPro-W3 -OTFname: A-OTF-RyuminPr6N-Light.otf - -Name: A-OTF-RyuminPro-Light -PSName: RyuminPro-Light -Class: Japan -Provides(20): Ryumin-Light -Provides(20): HiraMinPro-W3 -OTFname: A-OTF-RyuminPro-Light.otf - -Name: A-OTF-FutoMinA101Pr6N-Bold -PSName: FutoMinA101Pr6N-Bold -Class: Japan -Provides(10): FutoMinA101-Bold -Provides(10): FutoMinA101Pro-Bold -Provides(10): HiraMinProN-W6 -Provides(10): HiraMinPro-W6 -OTFname: A-OTF-FutoMinA101Pr6N-Bold.otf - -Name: A-OTF-FutoMinA101Pro-Bold -PSName: FutoMinA101Pro-Bold -Class: Japan -Provides(20): FutoMinA101-Bold -Provides(20): HiraMinPro-W6 -OTFname: A-OTF-FutoMinA101Pro-Bold.otf - -Name: A-OTF-GothicBBBPr6N-Medium -PSName: GothicBBBPr6N-Medium -Class: Japan -Provides(10): GothicBBB-Medium -Provides(10): GothicBBBPro-Medium -Provides(10): HiraKakuProN-W3 -Provides(10): HiraKakuPro-W3 -OTFname: A-OTF-GothicBBBPr6N-Medium.otf - -Name: A-OTF-GothicBBBPro-Medium -PSName: GothicBBBPro-Medium -Class: Japan -Provides(20): GothicBBB-Medium -Provides(20): HiraKakuPro-W3 -OTFname: A-OTF-GothicBBBPro-Medium.otf - -Name: A-OTF-FutoGoB101Pr6N-Bold -PSName: FutoGoB101Pr6N-Bold -Class: Japan -Provides(10): FutoGoB101-Bold -Provides(10): FutoGoB101Pro-Bold -Provides(10): HiraKakuProN-W6 -Provides(10): HiraKakuPro-W6 -OTFname: A-OTF-FutoGoB101Pr6N-Bold.otf - -Name: A-OTF-FutoGoB101Pro-Bold -PSName: FutoGoB101Pro-Bold -Class: Japan -Provides(20): FutoGoB101-Bold -Provides(20): HiraKakuPro-W6 -OTFname: A-OTF-FutoGoB101Pro-Bold.otf - -Name: A-OTF-MidashiGoPr6N-MB31 -PSName: MidashiGoPr6N-MB31 -Class: Japan -Provides(10): MidashiGo-MB31 -Provides(10): MidashiGoPro-MB31 -Provides(10): HiraKakuStdN-W8 -Provides(10): HiraKakuStd-W8 -OTFname: A-OTF-MidashiGoPr6N-MB31.otf - -Name: A-OTF-MidashiGoPro-MB31 -PSName: MidashiGoPro-MB31 -Class: Japan -Provides(20): MidashiGo-MB31 -Provides(20): HiraKakuStd-W8 -OTFname: A-OTF-MidashiGoPro-MB31.otf - -# A-OTF-Jun101Pr6N-Light has been replaced by A-OTF-ShinMGoPr6N-Light -# in otf-(up-)morisawa-pr6n.map since jfontmaps 20140301.0 -# now unnecessary, but reserved for backward compatibility -Name: A-OTF-Jun101Pr6N-Light -PSName: Jun101Pr6N-Light -Class: Japan -Provides(11): Jun101-Light -Provides(11): Jun101Pro-Light -Provides(11): HiraMaruProN-W4 -Provides(11): HiraMaruPro-W4 -OTFname: A-OTF-Jun101Pr6N-Light.otf - -Name: A-OTF-Jun101Pro-Light -PSName: Jun101Pro-Light -Class: Japan -Provides(20): Jun101-Light -Provides(20): HiraMaruPro-W4 -OTFname: A-OTF-Jun101Pro-Light.otf - -Name: A-OTF-ShinMGoPr6N-Light -PSName: ShinMGoPr6N-Light -Class: Japan -Provides(10): Jun101-Light -Provides(10): Jun101Pro-Light -Provides(10): HiraMaruProN-W4 -Provides(10): HiraMaruPro-W4 -OTFname: A-OTF-ShinMGoPr6N-Light.otf - -# Morisawa others (for moriprop); -# A-OTF-Jun101Pro-Light.otf and A-OTF-RyuminPro-Light.otf already added - -Name: A-OTF-Jun201Pro-Regular -PSName: Jun201Pro-Regular -Class: Japan -Provides(20): Jun201-Regular -OTFname: A-OTF-Jun201Pro-Regular.otf - -Name: A-OTF-Jun34Pro-Medium -PSName: Jun34Pro-Medium -Class: Japan -Provides(20): Jun34-Medium -OTFname: A-OTF-Jun34Pro-Medium.otf - -Name: A-OTF-Jun501Pro-Bold -PSName: Jun501Pro-Bold -Class: Japan -Provides(20): Jun501-Bold -OTFname: A-OTF-Jun501Pro-Bold.otf - -Name: A-OTF-RyuminPro-Regular -PSName: RyuminPro-Regular -Class: Japan -Provides(20): Ryumin-Regular -OTFname: A-OTF-RyuminPro-Regular.otf - -Name: A-OTF-RyuminPro-Medium -PSName: RyuminPro-Medium -Class: Japan -Provides(20): Ryumin-Medium -OTFname: A-OTF-RyuminPro-Medium.otf - -Name: A-OTF-RyuminPro-Bold -PSName: RyuminPro-Bold -Class: Japan -Provides(20): Ryumin-Bold -OTFname: A-OTF-RyuminPro-Bold.otf - -Name: A-OTF-RyuminPro-Heavy -PSName: RyuminPro-Heavy -Class: Japan -Provides(20): Ryumin-Heavy -OTFname: A-OTF-RyuminPro-Heavy.otf - -Name: A-OTF-RyuminPro-Ultra -PSName: RyuminPro-Ultra -Class: Japan -Provides(20): Ryumin-Ultra -OTFname: A-OTF-RyuminPro-Ultra.otf - -Name: A-OTF-ShinGoPro-Light -PSName: ShinGoPro-Light -Class: Japan -Provides(20): ShinGo-Light -OTFname: A-OTF-ShinGoPro-Light.otf - -Name: A-OTF-ShinGoPro-Regular -PSName: ShinGoPro-Regular -Class: Japan -Provides(20): ShinGo-Regular -OTFname: A-OTF-ShinGoPro-Regular.otf +# Morisawa -- Provides level 10(Pr6N), 15(Pr6), 18(Pr5), 20(Pro) +INCLUDE cjkgs-morisawa.dat +INCLUDE cjkgs-morisawa-extra.dat -Name: A-OTF-ShinGoPro-Medium -PSName: ShinGoPro-Medium -Class: Japan -Provides(20): ShinGo-Medium -OTFname: A-OTF-ShinGoPro-Medium.otf +# Hiragino -- Provides level 30(ProN), 40(Pro) +INCLUDE cjkgs-hiragino.dat -Name: A-OTF-ShinGoPro-Bold -PSName: ShinGoPro-Bold -Class: Japan -Provides(20): ShinGo-Bold -OTFname: A-OTF-ShinGoPro-Bold.otf +# Kozuka -- Provides level 50(Pr6N), 55(ProVI), 60(Pro), 65(Std) +INCLUDE cjkgs-kozuka.dat +INCLUDE cjkgs-ryokana.dat -Name: A-OTF-ShinGoPro-Heavy -PSName: ShinGoPro-Heavy -Class: Japan -Provides(20): ShinGo-Heavy -OTFname: A-OTF-ShinGoPro-Heavy.otf - -Name: A-OTF-ShinGoPro-Ultra -PSName: ShinGoPro-Ultra -Class: Japan -Provides(20): ShinGo-Ultra -OTFname: A-OTF-ShinGoPro-Ultra.otf - -# Hiragino (OS X) - -# Note about Mac OS X: -# ヒラギノ角ゴ {Pro,ProN} {W3,W6}.otf -# ヒラギノ角ゴ {Std,StdN} W8.otf -# ヒラギノ丸ゴ {Pro,ProN} W4.otf -# ヒラギノ明朝 {Pro,ProN} {W3,W6}.otf -# are bundled with OS X 10.10.5 Yosemite or earlier versions. -# ヒラギノ角ゴシック {W0,...W9}.ttc -# ヒラギノ丸ゴ ProN W4.ttc -# ヒラギノ明朝 ProN {W3,W6}.ttc -# are bundled with OS X 10.11 El Capitan or later versions. - -Name: HiraKakuPro-W3 -Class: Japan -Provides(40): GothicBBB-Medium -Provides(40): GothicBBBPro-Medium -# the following two are *not* the same -# one is in decomposed form (for Mac), one is in composed form (for the rest) -OTFname(20): ヒラギノ角ゴ Pro W3.otf -OTFname(19): ヒラギノ角ゴ Pro W3.otf -OTFname(10): HiraKakuPro-W3.otf -OTCname(30): ヒラギノ角ゴシック W3.ttc(3) -OTCname(29): ヒラギノ角ゴシック W3.ttc(3) -OTCname(28): HiraginoSans-W3.ttc(3) - -Name: HiraKakuPro-W6 -Class: Japan -Provides(40): FutoGoB101-Bold -Provides(40): FutoGoB101Pro-Bold -OTFname(20): ヒラギノ角ゴ Pro W6.otf -OTFname(19): ヒラギノ角ゴ Pro W6.otf -OTFname(10): HiraKakuPro-W6.otf -OTCname(30): ヒラギノ角ゴシック W6.ttc(3) -OTCname(29): ヒラギノ角ゴシック W6.ttc(3) -OTCname(28): HiraginoSans-W6.ttc(3) - -Name: HiraKakuProN-W3 -Class: Japan -Provides(30): GothicBBB-Medium -Provides(30): GothicBBBPro-Medium -OTFname(20): ヒラギノ角ゴ ProN W3.otf -OTFname(19): ヒラギノ角ゴ ProN W3.otf -OTFname(10): HiraKakuProN-W3.otf -OTCname(30): ヒラギノ角ゴシック W3.ttc(2) -OTCname(29): ヒラギノ角ゴシック W3.ttc(2) -OTCname(28): HiraginoSans-W3.ttc(2) - -Name: HiraKakuProN-W6 -Class: Japan -Provides(30): FutoGoB101-Bold -Provides(30): FutoGoB101Pro-Bold -OTFname(20): ヒラギノ角ゴ ProN W6.otf -OTFname(19): ヒラギノ角ゴ ProN W6.otf -OTFname(10): HiraKakuProN-W6.otf -OTCname(30): ヒラギノ角ゴシック W6.ttc(2) -OTCname(29): ヒラギノ角ゴシック W6.ttc(2) -OTCname(28): HiraginoSans-W6.ttc(2) - -Name: HiraKakuStd-W8 -Class: Japan -Provides(40): MidashiGo-MB31 -Provides(40): MidashiGoPro-MB31 -OTFname(20): ヒラギノ角ゴ Std W8.otf -OTFname(19): ヒラギノ角ゴ Std W8.otf -OTFname(10): HiraKakuStd-W8.otf -OTCname(30): ヒラギノ角ゴシック W8.ttc(2) -OTCname(29): ヒラギノ角ゴシック W8.ttc(2) -OTCname(28): HiraginoSans-W8.ttc(2) - -Name: HiraKakuStdN-W8 -Class: Japan -Provides(30): MidashiGo-MB31 -Provides(30): MidashiGoPro-MB31 -OTFname(20): ヒラギノ角ゴ StdN W8.otf -OTFname(19): ヒラギノ角ゴ StdN W8.otf -OTFname(10): HiraKakuStdN-W8.otf -OTCname(30): ヒラギノ角ゴシック W8.ttc(3) -OTCname(29): ヒラギノ角ゴシック W8.ttc(3) -OTCname(28): HiraginoSans-W8.ttc(3) - -Name: HiraginoSans-W0 -Class: Japan -OTCname(30): ヒラギノ角ゴシック W0.ttc(0) -OTCname(29): ヒラギノ角ゴシック W0.ttc(0) -OTCname(28): HiraginoSans-W0.ttc(0) +# Yu-fonts MacOS version -- Provides level 80 +INCLUDE cjkgs-yu-osx.dat -Name: HiraginoSans-W1 -Class: Japan -OTCname(30): ヒラギノ角ゴシック W1.ttc(0) -OTCname(29): ヒラギノ角ゴシック W1.ttc(0) -OTCname(28): HiraginoSans-W1.ttc(0) +# Yu-fonts Windows/MSOffice version -- Provides level 90 +INCLUDE cjkgs-yu-win.dat -Name: HiraginoSans-W2 -Class: Japan -OTCname(30): ヒラギノ角ゴシック W2.ttc(0) -OTCname(29): ヒラギノ角ゴシック W2.ttc(0) -OTCname(28): HiraginoSans-W2.ttc(0) +# MS -- Provides level 95 +INCLUDE cjkgs-microsoft.dat -Name: HiraginoSans-W3 -Class: Japan -OTCname(30): ヒラギノ角ゴシック W3.ttc(0) -OTCname(29): ヒラギノ角ゴシック W3.ttc(0) -OTCname(28): HiraginoSans-W3.ttc(0) +# TypeBank +INCLUDE cjkgs-typebank.dat -Name: HiraginoSans-W4 -Class: Japan -OTCname(30): ヒラギノ角ゴシック W4.ttc(0) -OTCname(29): ヒラギノ角ゴシック W4.ttc(0) -OTCname(28): HiraginoSans-W4.ttc(0) +# Fontworks +INCLUDE cjkgs-fontworks.dat -Name: HiraginoSans-W5 -Class: Japan -OTCname(30): ヒラギノ角ゴシック W5.ttc(0) -OTCname(29): ヒラギノ角ゴシック W5.ttc(0) -OTCname(28): HiraginoSans-W5.ttc(0) +# Toppan +INCLUDE cjkgs-toppan.dat -Name: HiraginoSans-W6 -Class: Japan -OTCname(30): ヒラギノ角ゴシック W6.ttc(0) -OTCname(29): ヒラギノ角ゴシック W6.ttc(0) -OTCname(28): HiraginoSans-W6.ttc(0) +# Moga-Mobo from Y.Oz Vox (free) -- Provides level 100(Ex), 110(none) +INCLUDE cjkgs-mogamobo.dat -Name: HiraginoSans-W7 -Class: Japan -OTCname(30): ヒラギノ角ゴシック W7.ttc(0) -OTCname(29): ヒラギノ角ゴシック W7.ttc(0) -OTCname(28): HiraginoSans-W7.ttc(0) - -Name: HiraginoSans-W8 -Class: Japan -OTCname(30): ヒラギノ角ゴシック W8.ttc(0) -OTCname(29): ヒラギノ角ゴシック W8.ttc(0) -OTCname(28): HiraginoSans-W8.ttc(0) - -Name: HiraginoSans-W9 -Class: Japan -OTCname(30): ヒラギノ角ゴシック W9.ttc(0) -OTCname(29): ヒラギノ角ゴシック W9.ttc(0) -OTCname(28): HiraginoSans-W9.ttc(0) - -Name: HiraMaruPro-W4 -Class: Japan -Provides(40): Jun101-Light -Provides(40): Jun101Pro-Light -OTFname(20): ヒラギノ丸ゴ Pro W4.otf -OTFname(19): ヒラギノ丸ゴ Pro W4.otf -OTFname(10): HiraMaruPro-W4.otf -OTCname(30): ヒラギノ丸ゴ ProN W4.ttc(0) -OTCname(29): ヒラギノ丸ゴ ProN W4.ttc(0) -OTCname(28): HiraginoSansR-W4.ttc(0) - -Name: HiraMaruProN-W4 -Class: Japan -Provides(30): Jun101-Light -Provides(30): Jun101Pro-Light -OTFname(20): ヒラギノ丸ゴ ProN W4.otf -OTFname(19): ヒラギノ丸ゴ ProN W4.otf -OTFname(10): HiraMaruProN-W4.otf -OTCname(30): ヒラギノ丸ゴ ProN W4.ttc(1) -OTCname(29): ヒラギノ丸ゴ ProN W4.ttc(1) -OTCname(28): HiraginoSansR-W4.ttc(1) - -Name: HiraMinPro-W3 -Class: Japan -Provides(40): Ryumin-Light -Provides(40): RyuminPro-Light -OTFname(20): ヒラギノ明朝 Pro W3.otf -OTFname(19): ヒラギノ明朝 Pro W3.otf -OTFname(10): HiraMinPro-W3.otf -OTCname(30): ヒラギノ明朝 ProN W3.ttc(1) -OTCname(29): ヒラギノ明朝 ProN W3.ttc(1) -OTCname(28): HiraginoSerif-W3.ttc(1) - -Name: HiraMinPro-W6 -Class: Japan -Provides(40): FutoMinA101-Bold -Provides(40): FutoMinA101Pro-Bold -OTFname(20): ヒラギノ明朝 Pro W6.otf -OTFname(19): ヒラギノ明朝 Pro W6.otf -OTFname(10): HiraMinPro-W6.otf -OTCname(30): ヒラギノ明朝 ProN W6.ttc(1) -OTCname(29): ヒラギノ明朝 ProN W6.ttc(1) -OTCname(28): HiraginoSerif-W6.ttc(1) - -Name: HiraMinProN-W3 -Class: Japan -Provides(30): Ryumin-Light -Provides(30): RyuminPro-Light -OTFname(20): ヒラギノ明朝 ProN W3.otf -OTFname(19): ヒラギノ明朝 ProN W3.otf -OTFname(10): HiraMinProN-W3.otf -OTCname(30): ヒラギノ明朝 ProN W3.ttc(0) -OTCname(29): ヒラギノ明朝 ProN W3.ttc(0) -OTCname(28): HiraginoSerif-W3.ttc(0) - -Name: HiraMinProN-W6 -Class: Japan -Provides(30): FutoMinA101-Bold -Provides(30): FutoMinA101Pro-Bold -OTFname(20): ヒラギノ明朝 ProN W6.otf -OTFname(19): ヒラギノ明朝 ProN W6.otf -OTFname(10): HiraMinProN-W6.otf -OTCname(30): ヒラギノ明朝 ProN W6.ttc(0) -OTCname(29): ヒラギノ明朝 ProN W6.ttc(0) -OTCname(28): HiraginoSerif-W6.ttc(0) - -# Following Hiragino fonts are not bundled with OS X, -# but used in ptex-fontmaps - -Name: HiraMinPro-W2 -Class: Japan -OTFname(20): ヒラギノ明朝 Pro W2.otf -OTFname(19): ヒラギノ明朝 Pro W2.otf -OTFname(10): HiraMinPro-W2.otf - -Name: HiraMinProN-W2 -Class: Japan -OTFname(20): ヒラギノ明朝 ProN W2.otf -OTFname(19): ヒラギノ明朝 ProN W2.otf -OTFname(10): HiraMinProN-W2.otf - -# Yu-fonts MacOS version - -# Note about Mac OS X: -# Yu Gothic Medium.otf -# Yu Gothic Bold.otf -# are bundled with OS X 10.9 Mavericks or later versions. -# Yu Mincho Medium.otf -# Yu Mincho Demibold.otf -# are bundled with OS X 10.9 Mavericks -- 10.10.5 Yosemite. -# YuMincho.ttc -# index 0: YuMin-Medium -# index 1: YuMin-Demibold -# index 2: YuMin_36pKn-Medium -# index 3: YuMin_36pKn-Demibold -# is bundled with OS X 10.11 -- 10.11.6 El Capitan. -# YuMincho.ttc -# index 0: YuMin-Medium -# index 1: YuMin-Demibold -# index 2: YuMin-Extrabold -# index 3: YuMin_36pKn-Medium -# index 4: YuMin_36pKn-Demibold -# index 5: YuMin_36pKn-Extrabold -# is bundled with macOS 10.12.0 Sierra or later versions. - -Name: YuGo-Medium -Class: Japan -Provides(80): GothicBBB-Medium -Provides(80): GothicBBBPro-Medium -OTFname(20): Yu Gothic Medium.otf -OTFname(10): YuGo-Medium.otf - -Name: YuGo-Bold -Class: Japan -Provides(80): FutoGoB101-Bold -Provides(80): FutoGoB101Pro-Bold -Provides(80): Jun101-Light -Provides(80): Jun101Pro-Light -Provides(80): MidashiGo-MB31 -Provides(80): MidashiGoPro-MB31 -OTFname(20): Yu Gothic Bold.otf -OTFname(10): YuGo-Bold.otf - -Name: YuMin-Medium -Class: Japan -Provides(80): Ryumin-Light -Provides(80): RyuminPro-Light -OTFname(20): Yu Mincho Medium.otf -OTFname(10): YuMin-Medium.otf -OTCname(30): YuMincho.ttc(0) - -Name: YuMin-Demibold -Class: Japan -Provides(80): FutoMinA101-Bold -Provides(80): FutoMinA101Pro-Bold -OTFname(20): Yu Mincho Demibold.otf -OTFname(10): YuMin-Demibold.otf -OTCname(30): YuMincho.ttc(1) +# Ume-font (free) -- Provides level 140 +INCLUDE cjkgs-ume.dat -# Following four entries are for macOS 10.12 Sierra -# The index for OS X 10.11.x El Capitan is different! - -Name: YuMin-Extrabold -Class: Japan -OTCname(30): YuMincho.ttc(2) - -Name: YuMin_36pKn-Medium -Class: Japan -OTCname(30): YuMincho.ttc(3) - -Name: YuMin_36pKn-Demibold -Class: Japan -OTCname(30): YuMincho.ttc(4) - -Name: YuMin_36pKn-Extrabold -Class: Japan -OTCname(30): YuMincho.ttc(5) - -# Yu-fonts Windows version - -# Note about Windows: -# yugothi{b,c,l}.ttf -# yumin.ttf, yumin{db,l}.ttf -# are bundled with Windows 8.1. -# YuGoth{B,L,M,R}.ttc -# yumin.ttf, yumin{db,l}.ttf -# are bundled with Windows 10. -# YUGOTH{B,L,M,R}.TTC -# YUMIN.TTF, YUMIN{DB,L}.TTF -# are bundled with Yu Font Pack for MSOffice 2010/2013. -# YuGothic.ttf -# YuGothic-Bold.ttf -# are bundled with VS2013 or later versions. -# YuGoth{B,L,M,R}.ttf -# yumin.ttf, yumin{db,l}.ttf -# are bundled with Office for Mac 2016. - -# In the following database, Yu Font Pack entries do not appear -# as separate lines, but they are implied by Windows 10 entries -# since win32 is case-insensitive. -# Currently we don't add VS2013 YuGothic.ttf (YuGothic) and -# YuGothic-Bold.ttf (YuGothic-Bold) on purpose, because these files -# are smaller than Windows 8.1 yugothic.ttf and yugothib.ttf - -Name: YuMincho-Regular -Class: Japan -Provides(90): Ryumin-Light -Provides(90): RyuminPro-Light -Provides(90): HiraMinProN-W3 -Provides(90): HiraMinPro-W3 -TTFname(20): yumin.ttf -#TTFname(50): YuMincho-Regular.ttf # never existed - -Name: YuMincho-Light -Class: Japan -TTFname(20): yuminl.ttf -#TTFname(50): YuMincho-Light.ttf # never existed - -Name: YuMincho-DemiBold -Class: Japan -Provides(90): FutoMinA101-Bold -Provides(90): FutoMinA101Pro-Bold -Provides(90): HiraMinProN-W6 -Provides(90): HiraMinPro-W6 -TTFname(20): yumindb.ttf -#TTFname(50): YuMincho-DemiBold.ttf # never existed - -Name: YuGothic-Regular -Class: Japan -Provides(90): GothicBBB-Medium -Provides(90): GothicBBBPro-Medium -Provides(90): HiraKakuProN-W3 -Provides(90): HiraKakuPro-W3 -TTFname(25): yugothic.ttf -TTCname(20): YuGothR.ttc(0) -TTFname(40): YuGothR.ttf -#TTFname(50): YuGothic-Regular.ttf # never existed - -Name: YuGothic-Medium -Class: Japan -TTCname(20): YuGothM.ttc(0) -TTFname(40): YuGothM.ttf - -Name: YuGothic-Light -Class: Japan -TTFname(25): yugothil.ttf -TTCname(20): YuGothL.ttc(0) -TTFname(40): YuGothL.ttf -#TTFname(50): YuGothic-Light.ttf # never existed - -Name: YuGothic-Bold -Class: Japan -Provides(90): FutoGoB101-Bold -Provides(90): FutoGoB101Pro-Bold -Provides(90): HiraKakuProN-W6 -Provides(90): HiraKakuPro-W6 -Provides(90): Jun101-Light -Provides(90): Jun101Pro-Light -Provides(90): HiraMaruProN-W4 -Provides(90): HiraMaruPro-W4 -Provides(90): MidashiGo-MB31 -Provides(90): MidashiGoPro-MB31 -Provides(90): HiraKakuStdN-W8 -Provides(90): HiraKakuStd-W8 -TTFname(25): yugothib.ttf -TTCname(20): YuGothB.ttc(0) -TTFname(40): YuGothB.ttf -#TTFname(50): YuGothic-Bold.ttf - -# Yu-UI-fonts (Windows only) - -Name: YuGothicUI-Semilight -Class: Japan -TTCname(20): YuGothR.ttc(1) - -Name: YuGothicUI-Regular -Class: Japan -TTCname(20): YuGothM.ttc(1) - -Name: YuGothicUI-Light -Class: Japan -TTCname(20): YuGothL.ttc(1) - -Name: YuGothicUI-Bold -Class: Japan -TTCname(20): YuGothB.ttc(1) - -Name: YuGothicUI-Semibold -Class: Japan -TTCname(20): YuGothB.ttc(2) - -# IPA (free) +# IPA (free) -- Provides level 120(Ex), 130(none) Name: IPAMincho Class: Japan @@ -2584,6 +2288,8 @@ Provides(130): FutoMinA101-Bold Provides(130): FutoMinA101Pro-Bold Provides(130): HiraMinProN-W6 Provides(130): HiraMinPro-W6 +Provides(130): MidashiMin-MA31 +Provides(130): MidashiMinPro-MA31 TTFname(20): ipam.ttf #TTFname(21): IPAMincho.ttf @@ -2597,14 +2303,14 @@ Provides(130): FutoGoB101-Bold Provides(130): FutoGoB101Pro-Bold Provides(130): HiraKakuProN-W6 Provides(130): HiraKakuPro-W6 -Provides(130): Jun101-Light -Provides(130): Jun101Pro-Light -Provides(130): HiraMaruProN-W4 -Provides(130): HiraMaruPro-W4 Provides(130): MidashiGo-MB31 Provides(130): MidashiGoPro-MB31 Provides(130): HiraKakuStdN-W8 Provides(130): HiraKakuStd-W8 +Provides(130): Jun101-Light +Provides(130): Jun101Pro-Light +Provides(130): HiraMaruProN-W4 +Provides(130): HiraMaruPro-W4 TTFname(20): ipag.ttf #TTFname(21): IPAGothic.ttf @@ -2618,6 +2324,8 @@ Provides(120): FutoMinA101-Bold Provides(120): FutoMinA101Pro-Bold Provides(120): HiraMinProN-W6 Provides(120): HiraMinPro-W6 +Provides(120): MidashiMin-MA31 +Provides(120): MidashiMinPro-MA31 TTFname(20): ipaexm.ttf #TTFname(21): IPAexMincho.ttf @@ -2631,14 +2339,14 @@ Provides(120): FutoGoB101-Bold Provides(120): FutoGoB101Pro-Bold Provides(120): HiraKakuProN-W6 Provides(120): HiraKakuPro-W6 -Provides(120): Jun101-Light -Provides(120): Jun101Pro-Light -Provides(120): HiraMaruProN-W4 -Provides(120): HiraMaruPro-W4 Provides(120): MidashiGo-MB31 Provides(120): MidashiGoPro-MB31 Provides(120): HiraKakuStdN-W8 Provides(120): HiraKakuStd-W8 +Provides(120): Jun101-Light +Provides(120): Jun101Pro-Light +Provides(120): HiraMaruProN-W4 +Provides(120): HiraMaruPro-W4 TTFname(20): ipaexg.ttf #TTFname(21): IPAexGothic.ttf @@ -2654,299 +2362,11 @@ Class: Japan TTFname(20): ipagp.ttf #TTFname(21): IPAPGothic.ttf -# Moga-Mobo from Y.Oz Vox (free) - -Name: MogaMincho-Regular -Class: Japan -Provides(110): Ryumin-Light -Provides(110): RyuminPro-Light -Provides(110): HiraMinProN-W3 -Provides(110): HiraMinPro-W3 -TTCname: mogam.ttc(0) - -Name: MogaExMincho-Regular -Class: Japan -Provides(100): Ryumin-Light -Provides(100): RyuminPro-Light -Provides(100): HiraMinProN-W3 -Provides(100): HiraMinPro-W3 -TTCname: mogam.ttc(1) - -Name: MogaExMincho-Italic -Class: Japan -TTCname: mogam.ttc(2) - -Name: Moga90Mincho-Regular -Class: Japan -TTCname: mogam.ttc(3) - -Name: MogaEx90Mincho-Regular -Class: Japan -TTCname: mogam.ttc(4) - -Name: MogaEx90Mincho-Italic -Class: Japan -TTCname: mogam.ttc(5) - -Name: MogaMincho-Bold -Class: Japan -Provides(110): FutoMinA101-Bold -Provides(110): FutoMinA101Pro-Bold -Provides(110): HiraMinProN-W6 -Provides(110): HiraMinPro-W6 -TTCname: mogamb.ttc(0) - -Name: MogaExMincho-Bold -Class: Japan -Provides(100): FutoMinA101-Bold -Provides(100): FutoMinA101Pro-Bold -Provides(100): HiraMinProN-W6 -Provides(100): HiraMinPro-W6 -TTCname: mogamb.ttc(1) - -Name: Moga90Mincho-Bold -Class: Japan -TTCname: mogamb.ttc(2) - -Name: MogaEx90Mincho-Bold -Class: Japan -TTCname: mogamb.ttc(3) - -Name: MogaHMincho-Regular -Class: Japan -TTCname: mogahm.ttc(0) - -Name: MogaExHMincho-Regular -Class: Japan -TTCname: mogahm.ttc(1) - -Name: MogaExHMincho-Italic -Class: Japan -TTCname: mogahm.ttc(2) - -Name: Moga90HMincho-Regular -Class: Japan -TTCname: mogahm.ttc(3) - -Name: MogaEx90HMincho-Regular -Class: Japan -TTCname: mogahm.ttc(4) - -Name: MogaEx90HMincho-Italic -Class: Japan -TTCname: mogahm.ttc(5) - -Name: MogaHMincho-Bold -Class: Japan -TTCname: mogahmb.ttc(0) - -Name: MogaExHMincho-Bold -Class: Japan -TTCname: mogahmb.ttc(1) - -Name: Moga90HMincho-Bold -Class: Japan -TTCname: mogahmb.ttc(2) - -Name: MogaEx90HMincho-Bold -Class: Japan -TTCname: mogahmb.ttc(3) - -Name: MogaGothic-Regular -Class: Japan -Provides(110): GothicBBB-Medium -Provides(110): GothicBBBPro-Medium -Provides(110): HiraKakuProN-W3 -Provides(110): HiraKakuPro-W3 -TTCname: mogag.ttc(0) - -Name: MogaExGothic-Regular -Class: Japan -Provides(100): GothicBBB-Medium -Provides(100): GothicBBBPro-Medium -Provides(100): HiraKakuProN-W3 -Provides(100): HiraKakuPro-W3 -TTCname: mogag.ttc(1) - -Name: Moga90Gothic-Regular -Class: Japan -TTCname: mogag.ttc(2) - -Name: MogaEx90Gothic-Regular -Class: Japan -TTCname: mogag.ttc(3) - -Name: MogaGothic-Bold -Class: Japan -Provides(110): FutoGoB101-Bold -Provides(110): FutoGoB101Pro-Bold -Provides(110): HiraKakuProN-W6 -Provides(110): HiraKakuPro-W6 -Provides(110): MidashiGo-MB31 -Provides(110): MidashiGoPro-MB31 -Provides(110): HiraKakuStdN-W8 -Provides(110): HiraKakuStd-W8 -TTCname: mogagb.ttc(0) - -Name: MogaExGothic-Bold -Class: Japan -Provides(100): FutoGoB101-Bold -Provides(100): FutoGoB101Pro-Bold -Provides(100): HiraKakuProN-W6 -Provides(100): HiraKakuPro-W6 -Provides(100): MidashiGo-MB31 -Provides(100): MidashiGoPro-MB31 -Provides(100): HiraKakuStdN-W8 -Provides(100): HiraKakuStd-W8 -TTCname: mogagb.ttc(1) - -Name: Moga90Gothic-Bold -Class: Japan -TTCname: mogagb.ttc(2) - -Name: MogaEx90Gothic-Bold -Class: Japan -TTCname: mogagb.ttc(3) - -Name: MoboGothic-Regular -Class: Japan -Provides(110): Jun101-Light -Provides(110): Jun101Pro-Light -Provides(110): HiraMaruProN-W4 -Provides(110): HiraMaruPro-W4 -TTCname: mobog.ttc(0) - -Name: MoboExGothic-Regular -Class: Japan -Provides(100): Jun101-Light -Provides(100): Jun101Pro-Light -Provides(100): HiraMaruProN-W4 -Provides(100): HiraMaruPro-W4 -TTCname: mobog.ttc(1) - -Name: Mobo90Gothic-Regular -Class: Japan -TTCname: mobog.ttc(2) - -Name: MoboEx90Gothic-Regular -Class: Japan -TTCname: mobog.ttc(3) - -Name: MoboGothic-Bold -Class: Japan -TTCname: mobogb.ttc(0) - -Name: MoboExGothic-Bold -Class: Japan -TTCname: mobogb.ttc(1) - -Name: Mobo90Gothic-Bold -Class: Japan -TTCname: mobogb.ttc(2) - -Name: MoboEx90Gothic-Bold -Class: Japan -TTCname: mobogb.ttc(3) - -# Ume-font (free) -# note: in the current release (2016-09-03 umefont_660.7z), -# ume-tms.ttf and ume-pms.ttf ("studybook" family) share the same PSName -# as ume-tmo.ttf and ume-pmo.ttf; we don't add these database -# intentionally -- HY (2017/01/17) - -Name: Ume-Mincho -Class: Japan -Provides(140): Ryumin-Light -Provides(140): RyuminPro-Light -Provides(140): HiraMinProN-W3 -Provides(140): HiraMinPro-W3 -Provides(140): FutoMinA101-Bold -Provides(140): FutoMinA101Pro-Bold -Provides(140): HiraMinProN-W6 -Provides(140): HiraMinPro-W6 -TTFname(10): ume-tmo3.ttf -#TTFname(11): ume-tms3.ttf - -Name: Ume-Gothic -Class: Japan -Provides(140): GothicBBB-Medium -Provides(140): GothicBBBPro-Medium -Provides(140): HiraKakuProN-W3 -Provides(140): HiraKakuPro-W3 -Provides(140): FutoGoB101-Bold -Provides(140): FutoGoB101Pro-Bold -Provides(140): HiraKakuProN-W6 -Provides(140): HiraKakuPro-W6 -Provides(140): Jun101-Light -Provides(140): Jun101Pro-Light -Provides(140): HiraMaruProN-W4 -Provides(140): HiraMaruPro-W4 -Provides(140): MidashiGo-MB31 -Provides(140): MidashiGoPro-MB31 -Provides(140): HiraKakuStdN-W8 -Provides(140): HiraKakuStd-W8 -TTFname(10): ume-tgo4.ttf - -Name: Ume-Gothic-O5 -Class: Japan -TTFname(10): ume-tgo5.ttf - -Name: Ume-Gothic-C4 -Class: Japan -TTFname(10): ume-tgc4.ttf - -Name: Ume-Gothic-C5 -Class: Japan -TTFname(10): ume-tgc5.ttf - -Name: Ume-Gothic-S4 -Class: Japan -TTFname(10): ume-tgs4.ttf - -Name: Ume-Gothic-S5 -Class: Japan -TTFname(10): ume-tgs5.ttf - -Name: Ume-P-Mincho -Class: Japan -TTFname(10): ume-pmo3.ttf -#TTFname(11): ume-pms3.ttf - -Name: Ume-P-Gothic -Class: Japan -TTFname(10): ume-pgo4.ttf - -Name: Ume-P-Gothic-O5 -Class: Japan -TTFname(10): ume-pgo5.ttf - -Name: Ume-P-Gothic-C4 -Class: Japan -TTFname(10): ume-pgc4.ttf - -Name: Ume-P-Gothic-C5 -Class: Japan -TTFname(10): ume-pgc5.ttf - -Name: Ume-P-Gothic-S4 -Class: Japan -TTFname(10): ume-pgs4.ttf - -Name: Ume-P-Gothic-S5 -Class: Japan -TTFname(10): ume-pgs5.ttf - -Name: Ume-UI-Gothic -Class: Japan -TTFname(10): ume-ugo4.ttf +# IPA MJ (free) -Name: Ume-UI-Gothic-O5 +Name: IPAmjMincho Class: Japan -TTFname(10): ume-ugo5.ttf - -Name: Ume-Hy-Gothic -Class: Japan -TTFname(10): ume-hgo4.ttf +TTFname: ipamjm.ttf # Sazanami (free) @@ -2968,740 +2388,24 @@ Name: Osaka-Mono Class: Japan TTFname: OsakaMono.ttf -# Kozuka (Adobe) - -Name: KozGoPr6N-Bold -Class: Japan -Provides(50): FutoGoB101-Bold -Provides(50): FutoGoB101Pro-Bold -Provides(50): HiraKakuProN-W6 -Provides(50): HiraKakuPro-W6 -OTFname: KozGoPr6N-Bold.otf - -Name: KozGoPr6N-Heavy -Class: Japan -Provides(50): Jun101-Light -Provides(50): Jun101Pro-Light -Provides(50): HiraMaruProN-W4 -Provides(50): HiraMaruPro-W4 -Provides(50): MidashiGo-MB31 -Provides(50): MidashiGoPro-MB31 -Provides(50): HiraKakuStdN-W8 -Provides(50): HiraKakuStd-W8 -OTFname: KozGoPr6N-Heavy.otf - -Name: KozGoPr6N-Medium -Class: Japan -Provides(50): GothicBBB-Medium -Provides(50): GothicBBBPro-Medium -Provides(50): HiraKakuProN-W3 -Provides(50): HiraKakuPro-W3 -OTFname: KozGoPr6N-Medium.otf - -Name: KozGoPr6N-Regular -Class: Japan -OTFname: KozGoPr6N-Regular.otf - -Name: KozGoPr6N-ExtraLight -Class: Japan -OTFname: KozGoPr6N-ExtraLight.otf - -Name: KozGoPr6N-Light -Class: Japan -OTFname: KozGoPr6N-Light.otf - -Name: KozGoPro-Bold -Class: Japan -Provides(70): FutoGoB101-Bold -Provides(70): FutoGoB101Pro-Bold -Provides(70): HiraKakuProN-W6 -Provides(70): HiraKakuPro-W6 -OTFname: KozGoPro-Bold.otf - -Name: KozGoPro-Heavy -Class: Japan -Provides(70): Jun101-Light -Provides(70): Jun101Pro-Light -Provides(70): HiraMaruProN-W4 -Provides(70): HiraMaruPro-W4 -Provides(70): MidashiGo-MB31 -Provides(70): MidashiGoPro-MB31 -Provides(70): HiraKakuStdN-W8 -Provides(70): HiraKakuStd-W8 -OTFname: KozGoPro-Heavy.otf - -Name: KozGoPro-Medium -Class: Japan -Provides(70): GothicBBB-Medium -Provides(70): GothicBBBPro-Medium -Provides(70): HiraKakuProN-W3 -Provides(70): HiraKakuPro-W3 -OTFname: KozGoPro-Medium.otf - -Name: KozGoPro-Regular -Class: Japan -OTFname: KozGoPro-Regular.otf - -Name: KozGoPro-ExtraLight -Class: Japan -OTFname: KozGoPro-ExtraLight.otf - -Name: KozGoPro-Light -Class: Japan -OTFname: KozGoPro-Light.otf - -Name: KozGoProVI-Bold -Class: Japan -Provides(60): FutoGoB101-Bold -Provides(60): FutoGoB101Pro-Bold -Provides(60): HiraKakuProN-W6 -Provides(60): HiraKakuPro-W6 -OTFname: KozGoProVI-Bold.otf - -Name: KozGoProVI-Heavy -Class: Japan -Provides(60): Jun101-Light -Provides(60): Jun101Pro-Light -Provides(60): HiraMaruProN-W4 -Provides(60): HiraMaruPro-W4 -Provides(60): MidashiGo-MB31 -Provides(60): MidashiGoPro-MB31 -Provides(60): HiraKakuStdN-W8 -Provides(60): HiraKakuStd-W8 -OTFname: KozGoProVI-Heavy.otf - -Name: KozGoProVI-Medium -Class: Japan -Provides(60): GothicBBB-Medium -Provides(60): GothicBBBPro-Medium -Provides(60): HiraKakuProN-W3 -Provides(60): HiraKakuPro-W3 -OTFname: KozGoProVI-Medium.otf - -Name: KozGoProVI-Regular -Class: Japan -OTFname: KozGoProVI-Regular.otf - -Name: KozMinPr6N-Bold -Class: Japan -Provides(50): FutoMinA101-Bold -Provides(50): FutoMinA101Pro-Bold -Provides(50): HiraMinProN-W6 -Provides(50): HiraMinPro-W6 -OTFname: KozMinPr6N-Bold.otf - -Name: KozMinPr6N-Heavy -Class: Japan -OTFname: KozMinPr6N-Heavy.otf - -Name: KozMinPr6N-Medium -Class: Japan -OTFname: KozMinPr6N-Medium.otf - -Name: KozMinPr6N-Regular -Class: Japan -Provides(50): Ryumin-Light -Provides(50): RyuminPro-Light -Provides(50): HiraMinProN-W3 -Provides(50): HiraMinPro-W3 -OTFname: KozMinPr6N-Regular.otf - -Name: KozMinPr6N-ExtraLight -Class: Japan -OTFname: KozMinPr6N-ExtraLight.otf - -Name: KozMinPr6N-Light -Class: Japan -OTFname: KozMinPr6N-Light.otf - -Name: KozMinPro-Bold -Class: Japan -Provides(70): FutoMinA101-Bold -Provides(70): FutoMinA101Pro-Bold -Provides(70): HiraMinProN-W6 -Provides(70): HiraMinPro-W6 -OTFname: KozMinPro-Bold.otf - -Name: KozMinPro-Heavy -Class: Japan -OTFname: KozMinPro-Heavy.otf - -Name: KozMinPro-Medium -Class: Japan -OTFname: KozMinPro-Medium.otf - -Name: KozMinPro-Regular -Class: Japan -Provides(70): Ryumin-Light -Provides(70): RyuminPro-Light -Provides(70): HiraMinProN-W3 -Provides(70): HiraMinPro-W3 -OTFname: KozMinPro-Regular.otf - -Name: KozMinPro-ExtraLight -Class: Japan -OTFname: KozMinPro-ExtraLight.otf - -Name: KozMinPro-Light -Class: Japan -OTFname: KozMinPro-Light.otf - -Name: KozMinProVI-Bold -Class: Japan -Provides(60): FutoMinA101-Bold -Provides(60): FutoMinA101Pro-Bold -Provides(60): HiraMinProN-W6 -Provides(60): HiraMinPro-W6 -OTFname: KozMinProVI-Bold.otf - -Name: KozMinProVI-Regular -Class: Japan -Provides(60): Ryumin-Light -Provides(60): RyuminPro-Light -Provides(60): HiraMinProN-W3 -Provides(60): HiraMinPro-W3 -OTFname: KozMinProVI-Regular.otf - -Name: KozMinProVI-Light -Class: Japan -OTFname: KozMinProVI-Light.otf - -# other Mac OS X fonts - -# Note about Mac OS X: -# Klee.ttc -# Tsukushi{A,B}MaruGothic.ttc -# are bundled with OS X 10.11 El Capitan or later versions. -# Kyokasho.ttc -# ToppanBunkyuMincho-Regular.otf -# ToppanBunkyuGothic.ttc -# ToppanBunkyuMidashiMincho-ExtraBold.otf -# ToppanBunkyuMidashiGothic-ExtraBold.otf -# are bundled with macOS 10.12 Sierra or later versions. - -Name: TsukuARdGothic-Regular -Class: Japan -OTCname: TsukushiAMaruGothic.ttc(0) - -Name: TsukuARdGothic-Bold -Class: Japan -OTCname: TsukushiAMaruGothic.ttc(1) - -Name: TsukuBRdGothic-Regular -Class: Japan -OTCname: TsukushiBMaruGothic.ttc(0) - -Name: TsukuBRdGothic-Bold -Class: Japan -OTCname: TsukushiBMaruGothic.ttc(1) - -Name: Klee-Medium -Class: Japan -OTCname: Klee.ttc(1) - -Name: Klee-Demibold -Class: Japan -OTCname: Klee.ttc(0) - -Name: YuKyo_Yoko-Medium -Class: Japan -OTCname: Kyokasho.ttc(0) - -Name: YuKyo_Yoko-Bold -Class: Japan -OTCname: Kyokasho.ttc(1) - -Name: YuKyo-Medium -Class: Japan -OTCname: Kyokasho.ttc(2) - -Name: YuKyo-Bold -Class: Japan -OTCname: Kyokasho.ttc(3) - -Name: ToppanBunkyuMincho-Regular -PSName: ToppanBunkyuMinchoPr6N-Regular -Class: Japan -OTFname: ToppanBunkyuMincho-Regular.otf - -Name: ToppanBunkyuGothicPr6N-DB -Class: Japan -OTCname: ToppanBunkyuGothic.ttc(0) - -Name: ToppanBunkyuGothicPr6N-Regular -Class: Japan -OTCname: ToppanBunkyuGothic.ttc(1) - -Name: ToppanBunkyuMidashiMincho-ExtraBold -PSName: ToppanBunkyuMidashiMinchoStdN-ExtraBold -Class: Japan -OTFname: ToppanBunkyuMidashiMincho-ExtraBold.otf - -Name: ToppanBunkyuMidashiGothic-ExtraBold -PSName: ToppanBunkyuMidashiGothicStdN-ExtraBold -Class: Japan -OTFname: ToppanBunkyuMidashiGothic-ExtraBold.otf - # # CHINESE FONTS # -# Hiragino chinese (OS X) +# Adobe -- Provides level 30 +INCLUDE cjkgs-adobe.dat -Name: HiraginoSansGB-W3 -Class: GB -Provides(50): STHeiti-Light -OTFname(20): Hiragino Sans GB W3.otf -OTFname(10): HiraginoSansGB-W3.otf -OTCname(30): Hiragino Sans GB W3.ttc(0) -OTCname(28): HiraginoSansGB-W3.ttc(0) +# Hiragino -- Provides level 50 +# (already included in JAPANESE section) -Name: HiraginoSansGB-W6 -Class: GB -Provides(50): STHeiti-Regular -OTFname(20): Hiragino Sans GB W6.otf -OTFname(10): HiraginoSansGB-W6.otf -OTCname(30): Hiragino Sans GB W6.ttc(0) -OTCname(28): HiraginoSansGB-W6.ttc(0) +# Beijing Founder Electronics -- Provides level 55 +INCLUDE cjkgs-founder.dat -Name: HiraginoSansCNS-W3 -Class: CNS -OTCname(30): Hiragino Sans CNS.ttc(0) -OTCname(28): HiraginoSansCNS.ttc(0) +# DynaComware -- Provides level ?? +INCLUDE cjkgs-dynacomware.dat -Name: HiraginoSansCNS-W6 -Class: CNS -OTCname(30): Hiragino Sans CNS.ttc(1) -OTCname(28): HiraginoSansCNS.ttc(1) - -# DynaComware (OS X) - -Name: LiHeiPro -Class: CNS -#Provides(??): MHei-Medium # fails -TTFname(20): 儷黑 Pro.ttf -TTFname(10): LiHeiPro.ttf - -Name: LiSongPro -Class: CNS -#Provides(??): MSung-Medium # fails -#Provides(??): MSung-Light # fails -TTFname(20): 儷宋 Pro.ttf -TTFname(10): LiSongPro.ttf - -Name: PingFangTC-Regular -Class: CNS -OTCname: PingFang.ttc(1) - -Name: PingFangSC-Regular -Class: GB -OTCname: PingFang.ttc(2) - -Name: PingFangTC-Medium -Class: CNS -OTCname: PingFang.ttc(4) - -Name: PingFangSC-Medium -Class: GB -OTCname: PingFang.ttc(5) - -Name: PingFangTC-Semibold -Class: CNS -OTCname: PingFang.ttc(7) - -Name: PingFangSC-Semibold -Class: GB -OTCname: PingFang.ttc(8) - -Name: PingFangTC-Light -Class: CNS -OTCname: PingFang.ttc(10) - -Name: PingFangSC-Light -Class: GB -OTCname: PingFang.ttc(11) - -Name: PingFangTC-Thin -Class: CNS -OTCname: PingFang.ttc(13) - -Name: PingFangSC-Thin -Class: GB -OTCname: PingFang.ttc(14) - -Name: PingFangTC-Ultralight -Class: CNS -OTCname: PingFang.ttc(16) - -Name: PingFangSC-Ultralight -Class: GB -OTCname: PingFang.ttc(17) - -# Changzhou SinoType (OS X) - -Name: STXihei -Class: GB -#Provides(??): STHeiti-Light # fails -TTFname(20): 华文细黑.ttf -TTFname(10): STXihei.ttf - -Name: STHeiti -Class: GB -#Provides(??): STHeiti-Regular # fails -TTFname(20): 华文黑体.ttf -TTFname(10): STHeiti.ttf - -Name: STHeitiSC-Light -Class: GB -#Provides(??): STHeiti-Light # fails -TTCname(10): STHeiti-Light.ttc(1) -TTCname(20): STHeiti Light.ttc(1) -#TTFname(30): STHeitiSC-Light.ttf - -Name: STHeitiSC-Medium -Class: GB -#Provides(??): STHeiti-Regular # fails -TTCname(10): STHeiti-Medium.ttc(1) -TTCname(20): STHeiti Medium.ttc(1) -#TTFname(30): STHeitiSC-Medium.ttf - -Name: STHeitiTC-Light -Class: CNS -TTCname(10): STHeiti-Light.ttc(0) -TTCname(20): STHeiti Light.ttc(0) -#TTFname(30): STHeitiTC-Light.ttf - -Name: STHeitiTC-Medium -Class: CNS -#Provides(??): MHei-Medium # fails -TTCname(10): STHeiti-Medium.ttc(0) -TTCname(20): STHeiti Medium.ttc(0) -#TTFname(30): STHeitiTC-Medium.ttf - -Name: STFangsong -Class: GB -#Provides(??): STFangsong-Light # fails -#Provides(??): STFangsong-Regular # fails -TTFname(20): 华文仿宋.ttf -TTFname(10): STFangsong.ttf - -# TTC entry for Mountain Lion (10.8) or later -# TTF entry for Lion (10.7) or earlier -Name: STSong -Class: GB -#Provides(??): STSong-Light # fails -#Provides(??): STSong-Regular # fails -TTCname(10): Songti.ttc(4) -TTCname(20): 宋体.ttc(3) -TTFname(30): STSong.ttf -TTFname(40): 华文宋体.ttf - -Name: STSongti-SC-Light -Class: GB -#Provides(??): STSong-Light # fails -#Provides(??): STSong-Regular # fails -TTCname(10): Songti.ttc(3) -TTCname(20): 宋体.ttc(2) -#TTFname(30): STSongti-SC-Light.ttf - -Name: STSongti-SC-Regular -Class: GB -TTCname(10): Songti.ttc(6) -TTCname(20): 宋体.ttc(4) -#TTFname(30): STSongti-SC-Regular.ttf - -Name: STSongti-SC-Bold -Class: GB -TTCname(10): Songti.ttc(1) -TTCname(20): 宋体.ttc(1) -#TTFname(30): STSongti-SC-Bold.ttf - -Name: STSongti-SC-Black -Class: GB -TTCname(10): Songti.ttc(0) -TTCname(20): 宋体.ttc(0) -#TTFname(30): STSongti-SC-Black.ttf - -Name: STSongti-TC-Light -Class: CNS -#Provides(??): MSung-Light # fails -TTCname(10): Songti.ttc(5) -#TTFname(20): STSongti-TC-Light.ttf - -Name: STSongti-TC-Regular -Class: CNS -#Provides(??): MSung-Medium # fails -TTCname(10): Songti.ttc(7) -#TTFname(20): STSongti-TC-Regular.ttf - -Name: STSongti-TC-Bold -Class: CNS -TTCname(10): Songti.ttc(2) -#TTFname(20): STSongti-TC-Bold.ttf - -# Note about Mac OS X: -# Kaiti.ttc -# contained 6 fonts before OS X 10.11.6 El Capitan. -# After macOS 10.12 Sierra, it contains 7 fonts and -# the order of ttc index has completely changed. - -# TTF entry for Lion (10.7) or earlier -# TTC entry for Mountain Lion (10.8) or later -Name: STKaiti -Class: GB -#Provides(??): STKaiti-Regular # fails -## for Sierra (10.12) or later -TTCname(10): Kaiti.ttc(1) -## for El Capitan (10.11.6) or earlier -#TTCname(10): Kaiti.ttc(4) -TTCname(20): 楷体.ttc(3) -TTFname(30): STKaiti.ttf -TTFname(40): 华文楷体.ttf - -# TTF entry for Lion (10.7) or earlier -# TTC entry for Mountain Lion (10.8) or later -Name: STKaiti-Adobe-CNS1 -Class: CNS -#Provides(??): MKai-Medium # fails -## for Sierra (10.12) or later -TTCname(10): Kaiti.ttc(1) -## for El Capitan (10.11.6) or earlier -#TTCname(10): Kaiti.ttc(4) -TTCname(20): 楷体.ttc(3) -TTFname(30): STKaiti.ttf -TTFname(40): 华文楷体.ttf - -# for El Capitan (10.11.6) or earlier -Name: STKaiti-SC-Regular -Class: GB -#Provides(??): STKaiti-Regular # fails -TTCname(10): Kaiti.ttc(3) -TTCname(20): 楷体.ttc(2) -#TTFname(30): STKaiti-SC-Regular.ttf - -# for Sierra (10.12) or later -Name: STKaitiSC-Regular -Class: GB -#Provides(??): STKaiti-Regular # fails -TTCname(10): Kaiti.ttc(0) - -# for El Capitan (10.11.6) or earlier -Name: STKaiti-SC-Bold -Class: GB -TTCname(10): Kaiti.ttc(1) -TTCname(20): 楷体.ttc(1) -#TTFname(30): STKaiti-SC-Bold.ttf - -# for Sierra (10.12) or later -Name: STKaitiSC-Bold -Class: GB -TTCname(10): Kaiti.ttc(3) - -# for El Capitan (10.11.6) or earlier -Name: STKaiti-SC-Black -Class: GB -TTCname(10): Kaiti.ttc(0) -TTCname(20): 楷体.ttc(0) -#TTFname(30): STKaiti-SC-Black.ttf - -# for Sierra (10.12) or later -Name: STKaitiSC-Black -Class: GB -TTCname(10): Kaiti.ttc(5) - -# for El Capitan (10.11.6) or earlier -Name: STKaiTi-TC-Regular -Class: CNS -#Provides(??): MKai-Medium # fails -TTCname(10): Kaiti.ttc(5) -#TTFname(20): STKaiTi-TC-Regular.ttf - -# for Sierra (10.12) or later -Name: STKaitiTC-Regular -Class: CNS -#Provides(??): MKai-Medium # fails -TTCname(10): Kaiti.ttc(2) - -# for El Capitan (10.11.6) or earlier -Name: STKaiTi-TC-Bold -Class: CNS -TTCname(10): Kaiti.ttc(2) -#TTFname(20): STKaiTi-TC-Bold.ttf - -# for Sierra (10.12) or later -Name: STKaitiTC-Bold -Class: CNS -TTCname(10): Kaiti.ttc(4) - -# for Sierra (10.12) or later (New!) -Name: STKaitiTC-Black -Class: CNS -TTCname(10): Kaiti.ttc(6) - -Name: STBaoliSC-Regular -Class: GB -TTCname: Baoli.ttc(0) - -Name: STBaoliTC-Regular -Class: CNS -TTCname: Baoli.ttc(1) - -Name: STLibianSC-Regular -Class: GB -TTCname: Libian.ttc(0) - -Name: STLibianTC-Regular -Class: CNS -TTCname: Libian.ttc(1) - -Name: STXingkaiSC-Bold -Class: GB -TTCname: Xingkai.ttc(0) - -Name: STXingkaiTC-Bold -Class: CNS -TTCname: Xingkai.ttc(1) - -Name: STXingkaiSC-Light -Class: GB -TTCname: Xingkai.ttc(2) - -Name: STXingkaiTC-Light -Class: CNS -TTCname: Xingkai.ttc(3) - -Name: STYuanti-SC-Regular -Class: GB -TTCname: Yuanti.ttc(0) - -Name: STYuanti-TC-Regular -Class: CNS -TTCname: Yuanti.ttc(1) - -Name: STYuanti-SC-Bold -Class: GB -TTCname: Yuanti.ttc(2) - -Name: STYuanti-TC-Bold -Class: CNS -TTCname: Yuanti.ttc(3) - -Name: STYuanti-SC-Light -Class: GB -TTCname: Yuanti.ttc(4) - -Name: STYuanti-TC-Light -Class: CNS -TTCname: Yuanti.ttc(5) - -# Beijing Founder Electronics -# note: -# FZ****.TTF (13 files) -# are bundled with with WPS Office (formerly Kingsoft Office) Linux. -# Lantinghei.ttc -# is bundled with OS X 10.9 Mavericks or later versions. - -# FZShuSong-Z01 -Name: FZSSK--GBK1-0 -Class: GB -Provides(55): STSong-Light -TTFname: FZSSK.TTF - -# FZXiaoBiaoSong-B05 -Name: FZXBSK--GBK1-0 -Class: GB -Provides(55): STSong-Regular -TTFname: FZXBSK.TTF - -# FZXiHeiI-Z08 -Name: FZXH1K--GBK1-0 -Class: GB -Provides(55): STHeiti-Light -TTFname: FZXH1K.TTF - -# FZHei-B01 -Name: FZHTK--GBK1-0 -Class: GB -Provides(55): STHeiti-Regular -TTFname: FZHTK.TTF - -# FZKai-Z03 -Name: FZKTK--GBK1-0 -Class: GB -Provides(55): STKaiti-Regular -TTFname: FZKTK.TTF - -# FZFangSong-Z02 -Name: FZFSK--GBK1-0 -Class: GB -Provides(55): STFangsong-Light -Provides(55): STFangsong-Regular -TTFname: FZFSK.TTF - -# FZXingKai-S04 -Name: FZXKK--GBK1-0 -Class: GB -TTFname: FZXKK.TTF - -# FZWeiBei-S03 -Name: FZWBK--GBK1-0 -Class: GB -TTFname: FZWBK.TTF - -# FZChaoCuHei-M10 -Name: FZCCHK--GBK1-0 -Class: GB -TTFname: FZCCHK.TTF - -# FZLiShu-S01 -Name: FZLSK--GBK1-0 -Class: GB -TTFname: FZLSK.TTF - -# FZYaoTi-M06 -Name: FZYTK--GBK1-0 -Class: GB -TTFname: FZYTK.TTF - -# FZSongS-Extended -Name: FZSONGS--GB1-5 -Class: GB -TTFname: FZSongS_20100603.TTF - -# FZSongS-Extended(SIP) -Name: FZSONGS_SIP--GB1-5 -Class: GB -TTFname: FZSongS(SIP)_2010603.TTF - -# Lantinghei SC Demibold -Name: FZLTZHK--GBK1-0 -Class: GB -TTCname: Lantinghei.ttc(0) - -# Lantinghei SC Extralight -Name: FZLTXHK--GBK1-0 -Class: GB -TTCname: Lantinghei.ttc(1) - -# Lantinghei SC Heavy -Name: FZLTTHK--GBK1-0 -Class: GB -TTCname: Lantinghei.ttc(2) - -# Lantinghei TC Demibold -Name: FZLTZHB--B51-0 -Class: CNS -TTCname: Lantinghei.ttc(3) - -# Lantinghei TC Extralight -Name: FZLTXHB--B51-0 -Class: CNS -TTCname: Lantinghei.ttc(4) - -# Lantinghei TC Heavy -Name: FZLTTHB--B51-0 -Class: CNS -TTCname: Lantinghei.ttc(5) +# Changzhou SinoType -- Provides level ?? +INCLUDE cjkgs-sinotype.dat # Arphic Font Design Team (OS X) @@ -3803,47 +2507,6 @@ Class: CNS TTFname(20): Apple LiGothic Medium.ttf TTFname(10): LiGothicMed.ttf -# Adobe chinese fonts - -# simplified chinese - -Name: AdobeSongStd-Light -Class: GB -Provides(30): STSong-Light -Provides(30): STSong-Regular -OTFname(10): AdobeSongStd-Light.otf - -Name: AdobeHeitiStd-Regular -Class: GB -Provides(30): STHeiti-Regular -Provides(30): STHeiti-Light -OTFname(20): AdobeHeitiStd-Regular.otf - -Name: AdobeKaitiStd-Regular -Class: GB -Provides(30): STKaiti-Regular -OTFname(20): AdobeKaitiStd-Regular.otf - -Name: AdobeFangsongStd-Regular -Class: GB -Provides(30): STFangsong-Light -Provides(30): STFangsong-Regular -OTFname(20): AdobeFangsongStd-Regular.otf - -# traditional chinese - -Name: AdobeMingStd-Light -Class: CNS -Provides(30): MSung-Light -Provides(30): MSung-Medium -OTFname(20): AdobeMingStd-Light.otf - -Name: AdobeFanHeitiStd-Bold -Class: CNS -Provides(30): MHei-Medium -Provides(30): MKai-Medium -OTFname(20): AdobeFanHeitiStd-Bold.otf - # Fandol (free) Name: FandolSong-Regular @@ -4048,34 +2711,11 @@ TTFname: cwfs.ttf # KOREAN FONTS # -# Solaris-hanyang (Solaris 10, 11) - -Name: Myeongjo -Class: Korea -Provides(40): HYSMyeongJo-Medium -TTFname: h2mjsm.ttf +# Adobe -- Provides level 30 +# (already included in CHINESE section) -Name: Gothic -Class: Korea -Provides(40): HYGoThic-Medium -TTFname: h2gtrm.ttf - -Name: RoundedGothic -Class: Korea -Provides(40): HYRGoThic-Medium -TTFname: h2drrm.ttf - -Name: Haeseo -Class: Korea -TTFname: h2hsrm.ttf - -Name: SunDotum -Class: Korea -TTFname: sundotump.ttf - -Name: SunDotumChe -Class: Korea -TTFname: sundotumf.ttf +# Solaris -- Provides level 40 +INCLUDE cjkgs-solaris.dat # Baekmuk (free) # This is a special case, because "batang.ttf" in baekmuk and @@ -4086,6 +2726,7 @@ TTFname: sundotumf.ttf Name: Baekmuk-Batang Class: Korea Provides(70): HYSMyeongJo-Medium +Casefold: true TTFname(20): batang.ttf TTFname(10): Baekmuk-Batang.ttf @@ -4098,6 +2739,7 @@ TTFname(10): Baekmuk-Dotum.ttf Name: Baekmuk-Gulim Class: Korea Provides(70): HYRGoThic-Medium +Casefold: true TTFname(20): gulim.ttf TTFname(10): Baekmuk-Gulim.ttf @@ -4402,23 +3044,6 @@ Name: JCHEadA Class: Korea TTFname: HeadlineA.ttf -# Adobe korean fonts - -Name: AdobeMyungjoStd-Medium -Class: Korea -Provides(30): HYSMyeongJo-Medium -OTFname: AdobeMyungjoStd-Medium.otf - -Name: AdobeGothicStd-Bold -Class: Korea -Provides(30): HYGoThic-Medium -Provides(80): HYRGoThic-Medium -OTFname: AdobeGothicStd-Bold.otf - -Name: AdobeGothicStd-Light -Class: Korea -OTFname: AdobeGothicStd-Light.otf - # # Microsoft Windows, Windows/Mac Office fonts # @@ -4427,6 +3052,7 @@ OTFname: AdobeGothicStd-Light.otf Name: Batang Class: Korea +Casefold: true TTFname(50): Batang.ttf TTCname(20): batang.ttc(0) @@ -4446,6 +3072,7 @@ TTCname(20): gulim.ttc(3) Name: Gulim Class: Korea +Casefold: true TTFname(50): Gulim.ttf TTCname(20): gulim.ttc(0) @@ -4489,6 +3116,7 @@ Class: GB Provides(60): STSong-Light Provides(60): STSong-Regular TTFname(50): SimSun.ttf +TTFname(21): simsun.ttf TTCname(20): simsun.ttc(0) Name: NSimSun @@ -4508,6 +3136,16 @@ Provides(60): STFangsong-Regular TTFname(40): Fangsong.ttf TTFname(20): simfang.ttf +Name: LiSu +Class: GB +TTCname(20): SIMLI.TTF +TTCname(19): simli.ttf + +Name: YouYuan +Class: GB +TTCname(20): SIMYOU.TTF +TTCname(19): simyou.ttf + Name: MicrosoftYaHei Class: GB TTFname(20): msyh.ttf @@ -4535,26 +3173,6 @@ Name: DengXian-Light Class: GB TTFname: Dengl.ttf -Name: STZhongsong -Class: GB -TTFname: STZHONGS.ttf - -Name: STXinwei -Class: GB -TTFname: STXINWEI.ttf - -Name: STXingkai -Class: GB -TTFname: STXINGKA.ttf - -Name: STLiti -Class: GB -TTFname: STLITI.ttf - -Name: STHupo -Class: GB -TTFname: STHUPO.ttf - # traditional chinese Name: MingLiU @@ -4601,227 +3219,10 @@ Name: MicrosoftMHei-Bold Class: CNS TTFname(10): MSMHei-Bold.ttf -# japanese - -Name: MS-Gothic -Class: Japan -Provides(95): GothicBBB-Medium -Provides(95): GothicBBBPro-Medium -Provides(95): HiraKakuProN-W3 -Provides(95): HiraKakuPro-W3 -Provides(95): FutoGoB101-Bold -Provides(95): FutoGoB101Pro-Bold -Provides(95): HiraKakuProN-W6 -Provides(95): HiraKakuPro-W6 -Provides(95): MidashiGo-MB31 -Provides(95): MidashiGoPro-MB31 -Provides(95): HiraKakuStdN-W8 -Provides(95): HiraKakuStd-W8 -Provides(95): Jun101-Light -Provides(95): Jun101Pro-Light -Provides(95): HiraMaruProN-W4 -Provides(95): HiraMaruPro-W4 -TTFname(50): MS Gothic.ttf -TTFname(30): MS-Gothic.ttf -TTCname(20): msgothic.ttc(0) - -Name: MS-Mincho -Class: Japan -Provides(95): Ryumin-Light -Provides(95): RyuminPro-Light -Provides(95): HiraMinProN-W3 -Provides(95): HiraMinPro-W3 -Provides(95): FutoMinA101-Bold -Provides(95): FutoMinA101Pro-Bold -Provides(95): HiraMinProN-W6 -Provides(95): HiraMinPro-W6 -TTFname(50): MS Mincho.ttf -TTFname(30): MS-Mincho.ttf -TTCname(20): msmincho.ttc(0) - -Name: MS-PGothic -Class: Japan -TTFname(50): MS PGothic.ttf -TTFname(30): MS-PGothic.ttf -TTCname(20): msgothic.ttc(1) - -Name: MS-PMincho -Class: Japan -TTFname(50): MS PMincho.ttf -TTFname(30): MS-PMincho.ttf -TTCname(20): msmincho.ttc(1) - -Name: MS-UIGothic -Class: Japan -TTCname(20): msgothic.ttc(2) - -Name: Meiryo -Class: Japan -TTFname(50): Meiryo.ttf -TTCname(20): meiryo.ttc(0) - -Name: Meiryo-Bold -Class: Japan -TTFname(50): Meiryo Bold.ttf -TTFname(40): MeiryoBold.ttf -TTFname(30): Meiryo-Bold.ttf -TTCname(20): meiryob.ttc(0) - -Name: Meiryo-BoldItalic -Class: Japan -TTFname(50): Meiryo Bold Italic.ttf -TTFname(40): MeiryoBoldItalic.ttf -TTFname(30): Meiryo-BoldItalic.ttf -TTCname(20): meiryob.ttc(1) - -Name: Meiryo-Italic -Class: Japan -TTFname(50): Meiryo Italic.ttf -TTFname(40): MeiryoItalic.ttf -TTFname(30): Meiryo-Italic.ttf -TTCname(20): meiryo.ttc(1) - -Name: MeiryoUI -Class: Japan -TTCname(20): meiryo.ttc(2) - -Name: MeiryoUI-Bold -Class: Japan -TTCname(20): meiryob.ttc(2) - -Name: MeiryoUI-BoldItalic -Class: Japan -TTCname(20): meiryob.ttc(3) - -Name: MeiryoUI-Italic -Class: Japan -TTCname(20): meiryo.ttc(3) - -Name: HGGothicE -Class: Japan -TTCname(50): HGRGE.ttc(0) -TTCname(20): HGRGE.TTC(0) - -Name: HGPGothicE -Class: Japan -TTCname(50): HGRGE.ttc(1) -TTCname(20): HGRGE.TTC(1) - -Name: HGSGothicE -Class: Japan -TTCname(50): HGRGE.ttc(2) -TTCname(20): HGRGE.TTC(2) - -Name: HGGothicM -Class: Japan -TTCname(20): HGRGM.TTC(0) - -Name: HGPGothicM -Class: Japan -TTCname(20): HGRGM.TTC(1) - -Name: HGSGothicM -Class: Japan -TTCname(20): HGRGM.TTC(2) - -Name: HGMinchoE -Class: Japan -TTCname(50): HGRME.ttc(0) -TTCname(20): HGRME.TTC(0) - -Name: HGPMinchoE -Class: Japan -TTCname(50): HGRME.ttc(1) -TTCname(20): HGRME.TTC(2) - -Name: HGSMinchoE -Class: Japan -TTCname(50): HGRME.ttc(2) -TTCname(20): HGRME.TTC(2) - -Name: HGMinchoB -Class: Japan -TTCname(20): HGRMB.TTC(0) - -Name: HGPMinchoB -Class: Japan -TTCname(20): HGRMB.TTC(1) - -Name: HGPMinchoB -Class: Japan -TTCname(20): HGRMB.TTC(2) - -Name: HGSoeiKakugothicUB -Class: Japan -TTCname(50): HGRSGU.ttc(0) -TTCname(20): HGRSGU.TTC(0) - -Name: HGPSoeiKakugothicUB -Class: Japan -TTCname(50): HGRSGU.ttc(1) -TTCname(20): HGRSGU.TTC(1) - -Name: HGSSoeiKakugothicUB -Class: Japan -TTCname(50): HGRSGU.ttc(2) -TTCname(20): HGRSGU.TTC(2) - -Name: HGSoeiKakupoptai -Class: Japan -TTCname(20): HGRPP1.TTC(0) - -Name: HGPSoeiKakupoptai -Class: Japan -TTCname(20): HGRPP1.TTC(1) - -Name: HGSSoeiKakupoptai -Class: Japan -TTCname(20): HGRPP1.TTC(2) - -Name: HGSoeiPresenceEB -Class: Japan -TTCname(20): HGRPRE.TTC(0) - -Name: HGPSoeiPresenceEB -Class: Japan -TTCname(20): HGRPRE.TTC(1) - -Name: HGSSoeiPresenceEB -Class: Japan -TTCname(20): HGRPRE.TTC(2) - -Name: HGKyokashotai -Class: Japan -TTCname(20): HGRKK.TTC(0) - -Name: HGPKyokashotai -Class: Japan -TTCname(20): HGRKK.TTC(1) - -Name: HGSKyokashotai -Class: Japan -TTCname(20): HGRKK.TTC(2) - -Name: HGGyoshotai -Class: Japan -TTCname(20): HGRGY.TTC(0) - -Name: HGPGyoshotai -Class: Japan -TTCname(20): HGRGY.TTC(1) - -Name: HGSGyoshotai -Class: Japan -TTCname(20): HGRGY.TTC(2) - -Name: HGMaruGothicMPRO -Class: Japan -TTFname(40): HGRSMP.ttf -TTFname(20): HGRSMP.TTF - -Name: HGSeikaishotaiPRO -Class: Japan -TTFname(20): HGRSKP.TTF +# Remove-only database (should begin with !INCLUDE) +# that is, entries which contain at least one 'RMVname' line +# note that this line should come at the _end_ of all INCLUDE files +!INCLUDE cjkgs-macos-removeonly.dat ### Local Variables: diff --git a/Master/bin/amd64-freebsd/biber b/Master/bin/amd64-freebsd/biber Binary files differindex 4fa224b0b87..5443896d206 100755 --- a/Master/bin/amd64-freebsd/biber +++ b/Master/bin/amd64-freebsd/biber diff --git a/Master/bin/armhf-linux/afm2pl b/Master/bin/armhf-linux/afm2pl Binary files differindex 6e1c28d583a..f5678c1a190 100755 --- a/Master/bin/armhf-linux/afm2pl +++ b/Master/bin/armhf-linux/afm2pl diff --git a/Master/bin/armhf-linux/afm2tfm b/Master/bin/armhf-linux/afm2tfm Binary files differindex 280c06fc612..debd9ffc434 100755 --- a/Master/bin/armhf-linux/afm2tfm +++ b/Master/bin/armhf-linux/afm2tfm diff --git a/Master/bin/armhf-linux/aleph b/Master/bin/armhf-linux/aleph Binary files differindex 4a36f49b4ff..3cdd10bef6f 100755 --- a/Master/bin/armhf-linux/aleph +++ b/Master/bin/armhf-linux/aleph diff --git a/Master/bin/armhf-linux/asy b/Master/bin/armhf-linux/asy Binary files differindex a6257af40e9..14c4b8f6714 100755 --- a/Master/bin/armhf-linux/asy +++ b/Master/bin/armhf-linux/asy diff --git a/Master/bin/armhf-linux/autosp b/Master/bin/armhf-linux/autosp Binary files differindex 891a43b4233..30b8b93ebec 100755 --- a/Master/bin/armhf-linux/autosp +++ b/Master/bin/armhf-linux/autosp diff --git a/Master/bin/armhf-linux/axohelp b/Master/bin/armhf-linux/axohelp Binary files differnew file mode 100755 index 00000000000..95791db680c --- /dev/null +++ b/Master/bin/armhf-linux/axohelp diff --git a/Master/bin/armhf-linux/bbox b/Master/bin/armhf-linux/bbox Binary files differindex 129c5aa00f1..54f31c2c155 100755 --- a/Master/bin/armhf-linux/bbox +++ b/Master/bin/armhf-linux/bbox diff --git a/Master/bin/armhf-linux/bg5conv b/Master/bin/armhf-linux/bg5conv Binary files differindex 65350ca51a0..01b242cad40 100755 --- a/Master/bin/armhf-linux/bg5conv +++ b/Master/bin/armhf-linux/bg5conv diff --git a/Master/bin/armhf-linux/bibtex b/Master/bin/armhf-linux/bibtex Binary files differindex e4c71175dce..869a7ed2e57 100755 --- a/Master/bin/armhf-linux/bibtex +++ b/Master/bin/armhf-linux/bibtex diff --git a/Master/bin/armhf-linux/bibtex8 b/Master/bin/armhf-linux/bibtex8 Binary files differindex 587a62ab9e6..dd0640e8c6d 100755 --- a/Master/bin/armhf-linux/bibtex8 +++ b/Master/bin/armhf-linux/bibtex8 diff --git a/Master/bin/armhf-linux/bibtexu b/Master/bin/armhf-linux/bibtexu Binary files differindex fe8fa6c12aa..836bb6e778b 100755 --- a/Master/bin/armhf-linux/bibtexu +++ b/Master/bin/armhf-linux/bibtexu diff --git a/Master/bin/armhf-linux/cef5conv b/Master/bin/armhf-linux/cef5conv Binary files differindex 3495c46cd84..7fadbd455ab 100755 --- a/Master/bin/armhf-linux/cef5conv +++ b/Master/bin/armhf-linux/cef5conv diff --git a/Master/bin/armhf-linux/cefconv b/Master/bin/armhf-linux/cefconv Binary files differindex b3a43a3335e..72108fa8d52 100755 --- a/Master/bin/armhf-linux/cefconv +++ b/Master/bin/armhf-linux/cefconv diff --git a/Master/bin/armhf-linux/cefsconv b/Master/bin/armhf-linux/cefsconv Binary files differindex d098d2ffdbd..b7e28f51ba4 100755 --- a/Master/bin/armhf-linux/cefsconv +++ b/Master/bin/armhf-linux/cefsconv diff --git a/Master/bin/armhf-linux/cfftot1 b/Master/bin/armhf-linux/cfftot1 Binary files differindex 91362b149cd..8214b3ad11d 100755 --- a/Master/bin/armhf-linux/cfftot1 +++ b/Master/bin/armhf-linux/cfftot1 diff --git a/Master/bin/armhf-linux/chktex b/Master/bin/armhf-linux/chktex Binary files differindex 9f6c4ed4daa..dface3ab9bb 100755 --- a/Master/bin/armhf-linux/chktex +++ b/Master/bin/armhf-linux/chktex diff --git a/Master/bin/armhf-linux/ctangle b/Master/bin/armhf-linux/ctangle Binary files differindex ebf0afc1b3b..a54cac30e90 100755 --- a/Master/bin/armhf-linux/ctangle +++ b/Master/bin/armhf-linux/ctangle diff --git a/Master/bin/armhf-linux/ctie b/Master/bin/armhf-linux/ctie Binary files differindex 2d54cbf648d..6ad8854497c 100755 --- a/Master/bin/armhf-linux/ctie +++ b/Master/bin/armhf-linux/ctie diff --git a/Master/bin/armhf-linux/cweave b/Master/bin/armhf-linux/cweave Binary files differindex e03c34fa420..8c740a39f63 100755 --- a/Master/bin/armhf-linux/cweave +++ b/Master/bin/armhf-linux/cweave diff --git a/Master/bin/armhf-linux/detex b/Master/bin/armhf-linux/detex Binary files differindex 76fca31d528..3327831d2cf 100755 --- a/Master/bin/armhf-linux/detex +++ b/Master/bin/armhf-linux/detex diff --git a/Master/bin/armhf-linux/devnag b/Master/bin/armhf-linux/devnag Binary files differindex 898443b8e70..25004462cf5 100755 --- a/Master/bin/armhf-linux/devnag +++ b/Master/bin/armhf-linux/devnag diff --git a/Master/bin/armhf-linux/disdvi b/Master/bin/armhf-linux/disdvi Binary files differindex 804ca61107e..10a42058248 100755 --- a/Master/bin/armhf-linux/disdvi +++ b/Master/bin/armhf-linux/disdvi diff --git a/Master/bin/armhf-linux/dt2dv b/Master/bin/armhf-linux/dt2dv Binary files differindex eadfbe2e5a4..c3d11f50617 100755 --- a/Master/bin/armhf-linux/dt2dv +++ b/Master/bin/armhf-linux/dt2dv diff --git a/Master/bin/armhf-linux/dv2dt b/Master/bin/armhf-linux/dv2dt Binary files differindex 1a222ba54fb..24a26d1dd5d 100755 --- a/Master/bin/armhf-linux/dv2dt +++ b/Master/bin/armhf-linux/dv2dt diff --git a/Master/bin/armhf-linux/dvi2tty b/Master/bin/armhf-linux/dvi2tty Binary files differindex 7acf12b8306..db9a2a1574e 100755 --- a/Master/bin/armhf-linux/dvi2tty +++ b/Master/bin/armhf-linux/dvi2tty diff --git a/Master/bin/armhf-linux/dvibook b/Master/bin/armhf-linux/dvibook Binary files differindex 8b55c7e7c21..788def0e17b 100755 --- a/Master/bin/armhf-linux/dvibook +++ b/Master/bin/armhf-linux/dvibook diff --git a/Master/bin/armhf-linux/dviconcat b/Master/bin/armhf-linux/dviconcat Binary files differindex 2886676a82f..b0ed1d8d319 100755 --- a/Master/bin/armhf-linux/dviconcat +++ b/Master/bin/armhf-linux/dviconcat diff --git a/Master/bin/armhf-linux/dvicopy b/Master/bin/armhf-linux/dvicopy Binary files differindex bc6d0875f72..2ef2bfe9467 100755 --- a/Master/bin/armhf-linux/dvicopy +++ b/Master/bin/armhf-linux/dvicopy diff --git a/Master/bin/armhf-linux/dvidvi b/Master/bin/armhf-linux/dvidvi Binary files differindex c6c6b643131..a2270cd5aaa 100755 --- a/Master/bin/armhf-linux/dvidvi +++ b/Master/bin/armhf-linux/dvidvi diff --git a/Master/bin/armhf-linux/dvihp b/Master/bin/armhf-linux/dvihp index fdaf3fb87bf..03a2dbe9605 100755 --- a/Master/bin/armhf-linux/dvihp +++ b/Master/bin/armhf-linux/dvihp @@ -6,14 +6,11 @@ : ${DVILJ=dvilj4} # the dvilj variant to run : ${SPOOL=lpr} # used to print an LJ file -: ${TMPDIR=${TEMP-${TMP-/tmp}}} # for the dvicopy output -tmpdir="${TMPDIR}"/dvihp$$ -(umask 077; mkdir "$tmpdir") \ +tmpdir=`mktemp -d` \ || { echo "cannot create directory \`$tmpdir'."; exit 1; } trap ' - cd "${TMPDIR}" test -d "$tmpdir" && { rm -f "$tmpdir"/*; rmdir "$tmpdir"; } exit 0 ' 0 1 2 3 6 7 13 15 diff --git a/Master/bin/armhf-linux/dvilj b/Master/bin/armhf-linux/dvilj Binary files differindex 2d7bd97998c..8ad04ae1a6b 100755 --- a/Master/bin/armhf-linux/dvilj +++ b/Master/bin/armhf-linux/dvilj diff --git a/Master/bin/armhf-linux/dvilj2p b/Master/bin/armhf-linux/dvilj2p Binary files differindex 39cf22b316a..dd79486962b 100755 --- a/Master/bin/armhf-linux/dvilj2p +++ b/Master/bin/armhf-linux/dvilj2p diff --git a/Master/bin/armhf-linux/dvilj4 b/Master/bin/armhf-linux/dvilj4 Binary files differindex dd7d0833d53..72646797347 100755 --- a/Master/bin/armhf-linux/dvilj4 +++ b/Master/bin/armhf-linux/dvilj4 diff --git a/Master/bin/armhf-linux/dvilj4l b/Master/bin/armhf-linux/dvilj4l Binary files differindex c9b6bf65301..a53479c33dd 100755 --- a/Master/bin/armhf-linux/dvilj4l +++ b/Master/bin/armhf-linux/dvilj4l diff --git a/Master/bin/armhf-linux/dvipng b/Master/bin/armhf-linux/dvipng Binary files differindex 5017682da22..fc4f550a7cf 100755 --- a/Master/bin/armhf-linux/dvipng +++ b/Master/bin/armhf-linux/dvipng diff --git a/Master/bin/armhf-linux/dvipos b/Master/bin/armhf-linux/dvipos Binary files differindex 6c226327e14..14b2a350ed7 100755 --- a/Master/bin/armhf-linux/dvipos +++ b/Master/bin/armhf-linux/dvipos diff --git a/Master/bin/armhf-linux/dvips b/Master/bin/armhf-linux/dvips Binary files differindex 321d9d4e2b6..47f8804a6ac 100755 --- a/Master/bin/armhf-linux/dvips +++ b/Master/bin/armhf-linux/dvips diff --git a/Master/bin/armhf-linux/dviselect b/Master/bin/armhf-linux/dviselect Binary files differindex 98d6baad939..839923db75f 100755 --- a/Master/bin/armhf-linux/dviselect +++ b/Master/bin/armhf-linux/dviselect diff --git a/Master/bin/armhf-linux/dvisvgm b/Master/bin/armhf-linux/dvisvgm Binary files differindex 3c06e2baaca..559af31c4a8 100755 --- a/Master/bin/armhf-linux/dvisvgm +++ b/Master/bin/armhf-linux/dvisvgm diff --git a/Master/bin/armhf-linux/dvitodvi b/Master/bin/armhf-linux/dvitodvi Binary files differindex 7b3b2c22517..0cbfeef95af 100755 --- a/Master/bin/armhf-linux/dvitodvi +++ b/Master/bin/armhf-linux/dvitodvi diff --git a/Master/bin/armhf-linux/dvitype b/Master/bin/armhf-linux/dvitype Binary files differindex 13ecf7e1c55..ae5d11228c7 100755 --- a/Master/bin/armhf-linux/dvitype +++ b/Master/bin/armhf-linux/dvitype diff --git a/Master/bin/armhf-linux/epsffit b/Master/bin/armhf-linux/epsffit Binary files differindex a50f7ad54e1..4ea9b81e4d1 100755 --- a/Master/bin/armhf-linux/epsffit +++ b/Master/bin/armhf-linux/epsffit diff --git a/Master/bin/armhf-linux/eptex b/Master/bin/armhf-linux/eptex Binary files differindex 6c71c655d15..7043676f48b 100755 --- a/Master/bin/armhf-linux/eptex +++ b/Master/bin/armhf-linux/eptex diff --git a/Master/bin/armhf-linux/euptex b/Master/bin/armhf-linux/euptex Binary files differindex a3305200f1f..d7c1cf85f26 100755 --- a/Master/bin/armhf-linux/euptex +++ b/Master/bin/armhf-linux/euptex diff --git a/Master/bin/armhf-linux/extconv b/Master/bin/armhf-linux/extconv Binary files differindex f0b6432847e..c62cf4f9dab 100755 --- a/Master/bin/armhf-linux/extconv +++ b/Master/bin/armhf-linux/extconv diff --git a/Master/bin/armhf-linux/gftodvi b/Master/bin/armhf-linux/gftodvi Binary files differindex 1124a3c14e4..6297ae0e1cd 100755 --- a/Master/bin/armhf-linux/gftodvi +++ b/Master/bin/armhf-linux/gftodvi diff --git a/Master/bin/armhf-linux/gftopk b/Master/bin/armhf-linux/gftopk Binary files differindex 0c8eee04ed3..8d1dcab21a4 100755 --- a/Master/bin/armhf-linux/gftopk +++ b/Master/bin/armhf-linux/gftopk diff --git a/Master/bin/armhf-linux/gftype b/Master/bin/armhf-linux/gftype Binary files differindex 1dc59031429..33c9e764f91 100755 --- a/Master/bin/armhf-linux/gftype +++ b/Master/bin/armhf-linux/gftype diff --git a/Master/bin/armhf-linux/gregorio b/Master/bin/armhf-linux/gregorio Binary files differindex 99e96ece24c..3aab577deec 100755 --- a/Master/bin/armhf-linux/gregorio +++ b/Master/bin/armhf-linux/gregorio diff --git a/Master/bin/armhf-linux/gsftopk b/Master/bin/armhf-linux/gsftopk Binary files differindex 4ecb8ea18d4..c3df7fbb537 100755 --- a/Master/bin/armhf-linux/gsftopk +++ b/Master/bin/armhf-linux/gsftopk diff --git a/Master/bin/armhf-linux/hbf2gf b/Master/bin/armhf-linux/hbf2gf Binary files differindex 00cec008c95..b8e7305c3fe 100755 --- a/Master/bin/armhf-linux/hbf2gf +++ b/Master/bin/armhf-linux/hbf2gf diff --git a/Master/bin/armhf-linux/kpseaccess b/Master/bin/armhf-linux/kpseaccess Binary files differindex 66ec29e1166..35076b6590a 100755 --- a/Master/bin/armhf-linux/kpseaccess +++ b/Master/bin/armhf-linux/kpseaccess diff --git a/Master/bin/armhf-linux/kpsereadlink b/Master/bin/armhf-linux/kpsereadlink Binary files differindex 2d5d705c19f..5632bec6075 100755 --- a/Master/bin/armhf-linux/kpsereadlink +++ b/Master/bin/armhf-linux/kpsereadlink diff --git a/Master/bin/armhf-linux/kpsestat b/Master/bin/armhf-linux/kpsestat Binary files differindex 1bd88e15a99..c788426d59f 100755 --- a/Master/bin/armhf-linux/kpsestat +++ b/Master/bin/armhf-linux/kpsestat diff --git a/Master/bin/armhf-linux/kpsewhich b/Master/bin/armhf-linux/kpsewhich Binary files differindex 7af988bb3b5..f208432b25e 100755 --- a/Master/bin/armhf-linux/kpsewhich +++ b/Master/bin/armhf-linux/kpsewhich diff --git a/Master/bin/armhf-linux/lacheck b/Master/bin/armhf-linux/lacheck Binary files differindex 7aaac70bce8..9feaf1f2549 100755 --- a/Master/bin/armhf-linux/lacheck +++ b/Master/bin/armhf-linux/lacheck diff --git a/Master/bin/armhf-linux/luajittex b/Master/bin/armhf-linux/luajittex Binary files differindex b7c54907d58..873682164d8 100755 --- a/Master/bin/armhf-linux/luajittex +++ b/Master/bin/armhf-linux/luajittex diff --git a/Master/bin/armhf-linux/luatex b/Master/bin/armhf-linux/luatex Binary files differindex c0b5aa6f303..69540c9887f 100755 --- a/Master/bin/armhf-linux/luatex +++ b/Master/bin/armhf-linux/luatex diff --git a/Master/bin/armhf-linux/luatex53 b/Master/bin/armhf-linux/luatex53 Binary files differnew file mode 100755 index 00000000000..2d70f8bc787 --- /dev/null +++ b/Master/bin/armhf-linux/luatex53 diff --git a/Master/bin/armhf-linux/mag b/Master/bin/armhf-linux/mag Binary files differindex f8e96f32c18..356687bbd6e 100755 --- a/Master/bin/armhf-linux/mag +++ b/Master/bin/armhf-linux/mag diff --git a/Master/bin/armhf-linux/makeindex b/Master/bin/armhf-linux/makeindex Binary files differindex 26bba617db5..4c406458565 100755 --- a/Master/bin/armhf-linux/makeindex +++ b/Master/bin/armhf-linux/makeindex diff --git a/Master/bin/armhf-linux/makejvf b/Master/bin/armhf-linux/makejvf Binary files differindex 7dd417ac384..56289fd1988 100755 --- a/Master/bin/armhf-linux/makejvf +++ b/Master/bin/armhf-linux/makejvf diff --git a/Master/bin/armhf-linux/mendex b/Master/bin/armhf-linux/mendex Binary files differindex 2d2b3a2f5fc..377bfaec89b 100755 --- a/Master/bin/armhf-linux/mendex +++ b/Master/bin/armhf-linux/mendex diff --git a/Master/bin/armhf-linux/mf b/Master/bin/armhf-linux/mf Binary files differindex 3b2ad30a71e..9717b0d730a 100755 --- a/Master/bin/armhf-linux/mf +++ b/Master/bin/armhf-linux/mf diff --git a/Master/bin/armhf-linux/mf-nowin b/Master/bin/armhf-linux/mf-nowin Binary files differindex 086e19b108a..f04bdcc6167 100755 --- a/Master/bin/armhf-linux/mf-nowin +++ b/Master/bin/armhf-linux/mf-nowin diff --git a/Master/bin/armhf-linux/mflua b/Master/bin/armhf-linux/mflua Binary files differindex c4df3f03fdb..f28dd999064 100755 --- a/Master/bin/armhf-linux/mflua +++ b/Master/bin/armhf-linux/mflua diff --git a/Master/bin/armhf-linux/mfluajit b/Master/bin/armhf-linux/mfluajit Binary files differindex 61c1e44ed1c..851602e8088 100755 --- a/Master/bin/armhf-linux/mfluajit +++ b/Master/bin/armhf-linux/mfluajit diff --git a/Master/bin/armhf-linux/mft b/Master/bin/armhf-linux/mft Binary files differindex dbf8e9fb1b0..ca0db8534c6 100755 --- a/Master/bin/armhf-linux/mft +++ b/Master/bin/armhf-linux/mft diff --git a/Master/bin/armhf-linux/mktexlsr b/Master/bin/armhf-linux/mktexlsr index 3161a5317ec..5fde39e2c2d 100755 --- a/Master/bin/armhf-linux/mktexlsr +++ b/Master/bin/armhf-linux/mktexlsr @@ -10,7 +10,7 @@ # Originally written as `texhash' by Thomas Esser, Okt., 1994. # Public domain. -version='$Id: mktexlsr 36855 2015-04-14 12:15:08Z preining $' +version='$Id: mktexlsr 46343 2018-01-17 00:55:32Z preining $' progname=`echo $0 | sed 's%.*/%%'` usage="Usage: $progname [OPTION]... [DIR]... @@ -73,7 +73,18 @@ if tty -s; then verbose=true; else verbose=false; fi dry_run=false trees= -treefile="${TMPDIR-/tmp}/mktexlsrtrees$$.tmp" +# initialize treefile by either mktemp or some random name +# code taken from pdfjam and adjusted +{ + treefile=` + (umask 077 && mktemp "${TMPDIR-/tmp}/mktexlsrtrees.XXXXXXXXXX") 2>/dev/null + ` && test -n "$treefile" && test -f "$treefile" +} || { + ## We'll use awk to make random number, for portability + random=`awk 'END { srand(); printf ("%d\n", rand()*1000000); }' /dev/null` + treefile="${TMPDIR-/tmp}/mktexlsrtrees$$.$random" +} || exit $? + trap 'cd /; rm -f $treefile; test -z "$db_dir_tmp" || rm -rf "$db_dir_tmp"; exit' 0 1 2 3 7 13 15 diff --git a/Master/bin/armhf-linux/mmafm b/Master/bin/armhf-linux/mmafm Binary files differindex 483cea0b2a6..83d8f9c9bdb 100755 --- a/Master/bin/armhf-linux/mmafm +++ b/Master/bin/armhf-linux/mmafm diff --git a/Master/bin/armhf-linux/mmpfb b/Master/bin/armhf-linux/mmpfb Binary files differindex 389d39cc20a..57c76b5bfa9 100755 --- a/Master/bin/armhf-linux/mmpfb +++ b/Master/bin/armhf-linux/mmpfb diff --git a/Master/bin/armhf-linux/mpost b/Master/bin/armhf-linux/mpost Binary files differindex 98ae25b470b..514cbec7fd5 100755 --- a/Master/bin/armhf-linux/mpost +++ b/Master/bin/armhf-linux/mpost diff --git a/Master/bin/armhf-linux/msxlint b/Master/bin/armhf-linux/msxlint Binary files differindex cb2fed354d5..f4b7e16c49d 100755 --- a/Master/bin/armhf-linux/msxlint +++ b/Master/bin/armhf-linux/msxlint diff --git a/Master/bin/armhf-linux/odvicopy b/Master/bin/armhf-linux/odvicopy Binary files differindex d80afcc2fda..9cf0c9749d2 100755 --- a/Master/bin/armhf-linux/odvicopy +++ b/Master/bin/armhf-linux/odvicopy diff --git a/Master/bin/armhf-linux/odvitype b/Master/bin/armhf-linux/odvitype Binary files differindex ea8dce7271a..4f6301fd826 100755 --- a/Master/bin/armhf-linux/odvitype +++ b/Master/bin/armhf-linux/odvitype diff --git a/Master/bin/armhf-linux/omfonts b/Master/bin/armhf-linux/omfonts Binary files differindex 8fef4fbb876..f08df59cb82 100755 --- a/Master/bin/armhf-linux/omfonts +++ b/Master/bin/armhf-linux/omfonts diff --git a/Master/bin/armhf-linux/otangle b/Master/bin/armhf-linux/otangle Binary files differindex 08aabede58e..5019b3f2ed4 100755 --- a/Master/bin/armhf-linux/otangle +++ b/Master/bin/armhf-linux/otangle diff --git a/Master/bin/armhf-linux/otfinfo b/Master/bin/armhf-linux/otfinfo Binary files differindex 51504de1cee..27c7c81810f 100755 --- a/Master/bin/armhf-linux/otfinfo +++ b/Master/bin/armhf-linux/otfinfo diff --git a/Master/bin/armhf-linux/otftotfm b/Master/bin/armhf-linux/otftotfm Binary files differindex 1ef59343d53..55adf257a0f 100755 --- a/Master/bin/armhf-linux/otftotfm +++ b/Master/bin/armhf-linux/otftotfm diff --git a/Master/bin/armhf-linux/otp2ocp b/Master/bin/armhf-linux/otp2ocp Binary files differindex 72f01ee271d..c975fbd2dda 100755 --- a/Master/bin/armhf-linux/otp2ocp +++ b/Master/bin/armhf-linux/otp2ocp diff --git a/Master/bin/armhf-linux/outocp b/Master/bin/armhf-linux/outocp Binary files differindex 1b6ed31323d..ca0d43f00b5 100755 --- a/Master/bin/armhf-linux/outocp +++ b/Master/bin/armhf-linux/outocp diff --git a/Master/bin/armhf-linux/patgen b/Master/bin/armhf-linux/patgen Binary files differindex ced5339f9c7..eabc5195dc3 100755 --- a/Master/bin/armhf-linux/patgen +++ b/Master/bin/armhf-linux/patgen diff --git a/Master/bin/armhf-linux/pbibtex b/Master/bin/armhf-linux/pbibtex Binary files differindex 747092a0324..fa00ed5391c 100755 --- a/Master/bin/armhf-linux/pbibtex +++ b/Master/bin/armhf-linux/pbibtex diff --git a/Master/bin/armhf-linux/pdfclose b/Master/bin/armhf-linux/pdfclose Binary files differindex 260b4b477d7..3a5475f09ac 100755 --- a/Master/bin/armhf-linux/pdfclose +++ b/Master/bin/armhf-linux/pdfclose diff --git a/Master/bin/armhf-linux/pdfopen b/Master/bin/armhf-linux/pdfopen Binary files differindex f85c2d195be..34cc2c1453b 100755 --- a/Master/bin/armhf-linux/pdfopen +++ b/Master/bin/armhf-linux/pdfopen diff --git a/Master/bin/armhf-linux/pdftex b/Master/bin/armhf-linux/pdftex Binary files differindex c6dbcc706cf..aa9ae4e7a80 100755 --- a/Master/bin/armhf-linux/pdftex +++ b/Master/bin/armhf-linux/pdftex diff --git a/Master/bin/armhf-linux/pdftosrc b/Master/bin/armhf-linux/pdftosrc Binary files differindex 6461850f41e..7ace91dfa3d 100755 --- a/Master/bin/armhf-linux/pdftosrc +++ b/Master/bin/armhf-linux/pdftosrc diff --git a/Master/bin/armhf-linux/pdvitype b/Master/bin/armhf-linux/pdvitype Binary files differindex d306358a12a..46445eb632c 100755 --- a/Master/bin/armhf-linux/pdvitype +++ b/Master/bin/armhf-linux/pdvitype diff --git a/Master/bin/armhf-linux/pfb2pfa b/Master/bin/armhf-linux/pfb2pfa Binary files differindex 5609d22208d..eed3bfc1a74 100755 --- a/Master/bin/armhf-linux/pfb2pfa +++ b/Master/bin/armhf-linux/pfb2pfa diff --git a/Master/bin/armhf-linux/pk2bm b/Master/bin/armhf-linux/pk2bm Binary files differindex 7dbd20013f0..1dd96bbb4fa 100755 --- a/Master/bin/armhf-linux/pk2bm +++ b/Master/bin/armhf-linux/pk2bm diff --git a/Master/bin/armhf-linux/pktogf b/Master/bin/armhf-linux/pktogf Binary files differindex c0d677ee2b1..f98d992bc80 100755 --- a/Master/bin/armhf-linux/pktogf +++ b/Master/bin/armhf-linux/pktogf diff --git a/Master/bin/armhf-linux/pktype b/Master/bin/armhf-linux/pktype Binary files differindex 5299f7909c4..318c1643919 100755 --- a/Master/bin/armhf-linux/pktype +++ b/Master/bin/armhf-linux/pktype diff --git a/Master/bin/armhf-linux/pltotf b/Master/bin/armhf-linux/pltotf Binary files differindex 19e27d1dd10..91ff8da774e 100755 --- a/Master/bin/armhf-linux/pltotf +++ b/Master/bin/armhf-linux/pltotf diff --git a/Master/bin/armhf-linux/pmpost b/Master/bin/armhf-linux/pmpost Binary files differindex f58063c4c6f..cf8084bcf72 100755 --- a/Master/bin/armhf-linux/pmpost +++ b/Master/bin/armhf-linux/pmpost diff --git a/Master/bin/armhf-linux/pmxab b/Master/bin/armhf-linux/pmxab Binary files differindex 33c416642a9..6087ca495f8 100755 --- a/Master/bin/armhf-linux/pmxab +++ b/Master/bin/armhf-linux/pmxab diff --git a/Master/bin/armhf-linux/pooltype b/Master/bin/armhf-linux/pooltype Binary files differindex 71430d400d3..0b8406a7d57 100755 --- a/Master/bin/armhf-linux/pooltype +++ b/Master/bin/armhf-linux/pooltype diff --git a/Master/bin/armhf-linux/ppltotf b/Master/bin/armhf-linux/ppltotf Binary files differindex bd80bd46d7a..cf89ae3c292 100755 --- a/Master/bin/armhf-linux/ppltotf +++ b/Master/bin/armhf-linux/ppltotf diff --git a/Master/bin/armhf-linux/prepmx b/Master/bin/armhf-linux/prepmx Binary files differindex d0efa4ecfca..f3d8429a1c7 100755 --- a/Master/bin/armhf-linux/prepmx +++ b/Master/bin/armhf-linux/prepmx diff --git a/Master/bin/armhf-linux/ps2pk b/Master/bin/armhf-linux/ps2pk Binary files differindex f3ede25ef79..94c1095f985 100755 --- a/Master/bin/armhf-linux/ps2pk +++ b/Master/bin/armhf-linux/ps2pk diff --git a/Master/bin/armhf-linux/psbook b/Master/bin/armhf-linux/psbook Binary files differindex 467f37d87fe..1dd6fd15010 100755 --- a/Master/bin/armhf-linux/psbook +++ b/Master/bin/armhf-linux/psbook diff --git a/Master/bin/armhf-linux/psnup b/Master/bin/armhf-linux/psnup Binary files differindex 4004f8b9072..0aeaa3105bb 100755 --- a/Master/bin/armhf-linux/psnup +++ b/Master/bin/armhf-linux/psnup diff --git a/Master/bin/armhf-linux/psresize b/Master/bin/armhf-linux/psresize Binary files differindex 44f100d26eb..83defcf9a11 100755 --- a/Master/bin/armhf-linux/psresize +++ b/Master/bin/armhf-linux/psresize diff --git a/Master/bin/armhf-linux/psselect b/Master/bin/armhf-linux/psselect Binary files differindex c902d544789..8e8446a707a 100755 --- a/Master/bin/armhf-linux/psselect +++ b/Master/bin/armhf-linux/psselect diff --git a/Master/bin/armhf-linux/pstops b/Master/bin/armhf-linux/pstops Binary files differindex 274003fb9a7..3ce97beb22b 100755 --- a/Master/bin/armhf-linux/pstops +++ b/Master/bin/armhf-linux/pstops diff --git a/Master/bin/armhf-linux/ptex b/Master/bin/armhf-linux/ptex Binary files differindex 0f62b78176b..a9bf0a335a6 100755 --- a/Master/bin/armhf-linux/ptex +++ b/Master/bin/armhf-linux/ptex diff --git a/Master/bin/armhf-linux/ptftopl b/Master/bin/armhf-linux/ptftopl Binary files differindex 65b73836842..e80042dd618 100755 --- a/Master/bin/armhf-linux/ptftopl +++ b/Master/bin/armhf-linux/ptftopl diff --git a/Master/bin/armhf-linux/scor2prt b/Master/bin/armhf-linux/scor2prt Binary files differindex fec8cf87b54..157e9bd72e3 100755 --- a/Master/bin/armhf-linux/scor2prt +++ b/Master/bin/armhf-linux/scor2prt diff --git a/Master/bin/armhf-linux/sjisconv b/Master/bin/armhf-linux/sjisconv Binary files differindex 60b52801656..2a12dffe1ef 100755 --- a/Master/bin/armhf-linux/sjisconv +++ b/Master/bin/armhf-linux/sjisconv diff --git a/Master/bin/armhf-linux/synctex b/Master/bin/armhf-linux/synctex Binary files differindex c08c70abce9..d8b35a3fec7 100755 --- a/Master/bin/armhf-linux/synctex +++ b/Master/bin/armhf-linux/synctex diff --git a/Master/bin/armhf-linux/t1ascii b/Master/bin/armhf-linux/t1ascii Binary files differindex 8f89400ba3a..ccad1ee255b 100755 --- a/Master/bin/armhf-linux/t1ascii +++ b/Master/bin/armhf-linux/t1ascii diff --git a/Master/bin/armhf-linux/t1asm b/Master/bin/armhf-linux/t1asm Binary files differindex 29486107ccf..12705a67e32 100755 --- a/Master/bin/armhf-linux/t1asm +++ b/Master/bin/armhf-linux/t1asm diff --git a/Master/bin/armhf-linux/t1binary b/Master/bin/armhf-linux/t1binary Binary files differindex 5028dc6f552..6a6e95aa4f5 100755 --- a/Master/bin/armhf-linux/t1binary +++ b/Master/bin/armhf-linux/t1binary diff --git a/Master/bin/armhf-linux/t1disasm b/Master/bin/armhf-linux/t1disasm Binary files differindex bd0680019fb..98920d1ff61 100755 --- a/Master/bin/armhf-linux/t1disasm +++ b/Master/bin/armhf-linux/t1disasm diff --git a/Master/bin/armhf-linux/t1dotlessj b/Master/bin/armhf-linux/t1dotlessj Binary files differindex fa227e50bc2..fa08b067a9f 100755 --- a/Master/bin/armhf-linux/t1dotlessj +++ b/Master/bin/armhf-linux/t1dotlessj diff --git a/Master/bin/armhf-linux/t1lint b/Master/bin/armhf-linux/t1lint Binary files differindex 73b824f5ba9..48eddb136f6 100755 --- a/Master/bin/armhf-linux/t1lint +++ b/Master/bin/armhf-linux/t1lint diff --git a/Master/bin/armhf-linux/t1mac b/Master/bin/armhf-linux/t1mac Binary files differindex 37438e651ce..d14c1146542 100755 --- a/Master/bin/armhf-linux/t1mac +++ b/Master/bin/armhf-linux/t1mac diff --git a/Master/bin/armhf-linux/t1rawafm b/Master/bin/armhf-linux/t1rawafm Binary files differindex d80d181517b..13ec62134c4 100755 --- a/Master/bin/armhf-linux/t1rawafm +++ b/Master/bin/armhf-linux/t1rawafm diff --git a/Master/bin/armhf-linux/t1reencode b/Master/bin/armhf-linux/t1reencode Binary files differindex 0744080a430..99e239258cc 100755 --- a/Master/bin/armhf-linux/t1reencode +++ b/Master/bin/armhf-linux/t1reencode diff --git a/Master/bin/armhf-linux/t1testpage b/Master/bin/armhf-linux/t1testpage Binary files differindex 5cfb3d8a903..f63642173bf 100755 --- a/Master/bin/armhf-linux/t1testpage +++ b/Master/bin/armhf-linux/t1testpage diff --git a/Master/bin/armhf-linux/t1unmac b/Master/bin/armhf-linux/t1unmac Binary files differindex b81e7b91aa9..08dbca5e66c 100755 --- a/Master/bin/armhf-linux/t1unmac +++ b/Master/bin/armhf-linux/t1unmac diff --git a/Master/bin/armhf-linux/t4ht b/Master/bin/armhf-linux/t4ht Binary files differindex 6aaa7153ed2..11c4fe1e3df 100755 --- a/Master/bin/armhf-linux/t4ht +++ b/Master/bin/armhf-linux/t4ht diff --git a/Master/bin/armhf-linux/tangle b/Master/bin/armhf-linux/tangle Binary files differindex 4576ec7f196..ec30c7bd9ec 100755 --- a/Master/bin/armhf-linux/tangle +++ b/Master/bin/armhf-linux/tangle diff --git a/Master/bin/armhf-linux/teckit_compile b/Master/bin/armhf-linux/teckit_compile Binary files differindex 4e4a349cb5f..9aa718b09a7 100755 --- a/Master/bin/armhf-linux/teckit_compile +++ b/Master/bin/armhf-linux/teckit_compile diff --git a/Master/bin/armhf-linux/tex b/Master/bin/armhf-linux/tex Binary files differindex df6abb82bc0..bc86fb0cbd2 100755 --- a/Master/bin/armhf-linux/tex +++ b/Master/bin/armhf-linux/tex diff --git a/Master/bin/armhf-linux/tex2aspc b/Master/bin/armhf-linux/tex2aspc Binary files differnew file mode 100755 index 00000000000..011e998330f --- /dev/null +++ b/Master/bin/armhf-linux/tex2aspc diff --git a/Master/bin/armhf-linux/tex2xindy b/Master/bin/armhf-linux/tex2xindy Binary files differindex 60aaecc92c6..4ca4223cc98 100755 --- a/Master/bin/armhf-linux/tex2xindy +++ b/Master/bin/armhf-linux/tex2xindy diff --git a/Master/bin/armhf-linux/tex4ht b/Master/bin/armhf-linux/tex4ht Binary files differindex 87d8829cb9d..7ebb21ff70e 100755 --- a/Master/bin/armhf-linux/tex4ht +++ b/Master/bin/armhf-linux/tex4ht diff --git a/Master/bin/armhf-linux/texlua53 b/Master/bin/armhf-linux/texlua53 new file mode 120000 index 00000000000..f0f9550b720 --- /dev/null +++ b/Master/bin/armhf-linux/texlua53 @@ -0,0 +1 @@ +luatex53
\ No newline at end of file diff --git a/Master/bin/armhf-linux/texlua53c b/Master/bin/armhf-linux/texlua53c new file mode 120000 index 00000000000..f0f9550b720 --- /dev/null +++ b/Master/bin/armhf-linux/texlua53c @@ -0,0 +1 @@ +luatex53
\ No newline at end of file diff --git a/Master/bin/armhf-linux/tftopl b/Master/bin/armhf-linux/tftopl Binary files differindex 5cc13999432..7345223c6cf 100755 --- a/Master/bin/armhf-linux/tftopl +++ b/Master/bin/armhf-linux/tftopl diff --git a/Master/bin/armhf-linux/tie b/Master/bin/armhf-linux/tie Binary files differindex ef9cac9bc72..532288f2ee6 100755 --- a/Master/bin/armhf-linux/tie +++ b/Master/bin/armhf-linux/tie diff --git a/Master/bin/armhf-linux/ttf2afm b/Master/bin/armhf-linux/ttf2afm Binary files differindex eb9db5d0856..e952367177d 100755 --- a/Master/bin/armhf-linux/ttf2afm +++ b/Master/bin/armhf-linux/ttf2afm diff --git a/Master/bin/armhf-linux/ttf2pk b/Master/bin/armhf-linux/ttf2pk Binary files differindex 06f0fc45ef2..bea40d06102 100755 --- a/Master/bin/armhf-linux/ttf2pk +++ b/Master/bin/armhf-linux/ttf2pk diff --git a/Master/bin/armhf-linux/ttf2tfm b/Master/bin/armhf-linux/ttf2tfm Binary files differindex 77f77245e80..6a952f34e99 100755 --- a/Master/bin/armhf-linux/ttf2tfm +++ b/Master/bin/armhf-linux/ttf2tfm diff --git a/Master/bin/armhf-linux/ttfdump b/Master/bin/armhf-linux/ttfdump Binary files differindex afcafbed48e..24d3a9c0cc1 100755 --- a/Master/bin/armhf-linux/ttfdump +++ b/Master/bin/armhf-linux/ttfdump diff --git a/Master/bin/armhf-linux/ttftotype42 b/Master/bin/armhf-linux/ttftotype42 Binary files differindex 05363bb0e5c..4c691750758 100755 --- a/Master/bin/armhf-linux/ttftotype42 +++ b/Master/bin/armhf-linux/ttftotype42 diff --git a/Master/bin/armhf-linux/upbibtex b/Master/bin/armhf-linux/upbibtex Binary files differindex 6e665cee0ff..408c0e49345 100755 --- a/Master/bin/armhf-linux/upbibtex +++ b/Master/bin/armhf-linux/upbibtex diff --git a/Master/bin/armhf-linux/updvitype b/Master/bin/armhf-linux/updvitype Binary files differindex 8b5e3810532..e445d77461b 100755 --- a/Master/bin/armhf-linux/updvitype +++ b/Master/bin/armhf-linux/updvitype diff --git a/Master/bin/armhf-linux/upmendex b/Master/bin/armhf-linux/upmendex Binary files differindex e4bf58f8cb6..c50ff2e3d1b 100755 --- a/Master/bin/armhf-linux/upmendex +++ b/Master/bin/armhf-linux/upmendex diff --git a/Master/bin/armhf-linux/upmpost b/Master/bin/armhf-linux/upmpost Binary files differindex 43326222461..40c49a8b3da 100755 --- a/Master/bin/armhf-linux/upmpost +++ b/Master/bin/armhf-linux/upmpost diff --git a/Master/bin/armhf-linux/uppltotf b/Master/bin/armhf-linux/uppltotf Binary files differindex c0d86b65551..7fb8c41a995 100755 --- a/Master/bin/armhf-linux/uppltotf +++ b/Master/bin/armhf-linux/uppltotf diff --git a/Master/bin/armhf-linux/uptex b/Master/bin/armhf-linux/uptex Binary files differindex 8e2db9d7758..36f04adf86f 100755 --- a/Master/bin/armhf-linux/uptex +++ b/Master/bin/armhf-linux/uptex diff --git a/Master/bin/armhf-linux/uptftopl b/Master/bin/armhf-linux/uptftopl Binary files differindex ba204f709f0..792e234049f 100755 --- a/Master/bin/armhf-linux/uptftopl +++ b/Master/bin/armhf-linux/uptftopl diff --git a/Master/bin/armhf-linux/vftovp b/Master/bin/armhf-linux/vftovp Binary files differindex 0e09ad36acb..f174a334c5e 100755 --- a/Master/bin/armhf-linux/vftovp +++ b/Master/bin/armhf-linux/vftovp diff --git a/Master/bin/armhf-linux/vlna b/Master/bin/armhf-linux/vlna Binary files differindex a45fde1264b..55cb7e9c9ca 100755 --- a/Master/bin/armhf-linux/vlna +++ b/Master/bin/armhf-linux/vlna diff --git a/Master/bin/armhf-linux/vptovf b/Master/bin/armhf-linux/vptovf Binary files differindex 7ed2cf15ea3..93ca4ccd86f 100755 --- a/Master/bin/armhf-linux/vptovf +++ b/Master/bin/armhf-linux/vptovf diff --git a/Master/bin/armhf-linux/weave b/Master/bin/armhf-linux/weave Binary files differindex 5dc0174053e..7ec3e49b238 100755 --- a/Master/bin/armhf-linux/weave +++ b/Master/bin/armhf-linux/weave diff --git a/Master/bin/armhf-linux/wofm2opl b/Master/bin/armhf-linux/wofm2opl Binary files differindex 7bc9c3b1504..e8f62ac17e6 100755 --- a/Master/bin/armhf-linux/wofm2opl +++ b/Master/bin/armhf-linux/wofm2opl diff --git a/Master/bin/armhf-linux/wopl2ofm b/Master/bin/armhf-linux/wopl2ofm Binary files differindex 122fcaa4b38..46509f6fd09 100755 --- a/Master/bin/armhf-linux/wopl2ofm +++ b/Master/bin/armhf-linux/wopl2ofm diff --git a/Master/bin/armhf-linux/wovf2ovp b/Master/bin/armhf-linux/wovf2ovp Binary files differindex f06611a3190..5bf75ac64af 100755 --- a/Master/bin/armhf-linux/wovf2ovp +++ b/Master/bin/armhf-linux/wovf2ovp diff --git a/Master/bin/armhf-linux/wovp2ovf b/Master/bin/armhf-linux/wovp2ovf Binary files differindex 98de00c3efa..c6641a349b3 100755 --- a/Master/bin/armhf-linux/wovp2ovf +++ b/Master/bin/armhf-linux/wovp2ovf diff --git a/Master/bin/armhf-linux/xdvi-xaw b/Master/bin/armhf-linux/xdvi-xaw Binary files differindex 22bf7b431c0..fb886723605 100755 --- a/Master/bin/armhf-linux/xdvi-xaw +++ b/Master/bin/armhf-linux/xdvi-xaw diff --git a/Master/bin/armhf-linux/xdvipdfmx b/Master/bin/armhf-linux/xdvipdfmx Binary files differindex 29d4738079f..24f1affad52 100755 --- a/Master/bin/armhf-linux/xdvipdfmx +++ b/Master/bin/armhf-linux/xdvipdfmx diff --git a/Master/bin/armhf-linux/xetex b/Master/bin/armhf-linux/xetex Binary files differindex 1b4a86c0f06..21c80e65e08 100755 --- a/Master/bin/armhf-linux/xetex +++ b/Master/bin/armhf-linux/xetex diff --git a/Master/bin/armhf-linux/xindy.mem b/Master/bin/armhf-linux/xindy.mem Binary files differindex 8551dedece6..0b619c2a702 100644 --- a/Master/bin/armhf-linux/xindy.mem +++ b/Master/bin/armhf-linux/xindy.mem diff --git a/Master/bin/armhf-linux/xindy.run b/Master/bin/armhf-linux/xindy.run Binary files differindex 1e838069cf0..d2f493729e4 100755 --- a/Master/bin/armhf-linux/xindy.run +++ b/Master/bin/armhf-linux/xindy.run diff --git a/Master/bin/i386-cygwin/biber.exe b/Master/bin/i386-cygwin/biber.exe Binary files differindex 941d6f6ac3c..7183f255e22 100755 --- a/Master/bin/i386-cygwin/biber.exe +++ b/Master/bin/i386-cygwin/biber.exe diff --git a/Master/bin/i386-darwin/biber b/Master/bin/i386-darwin/biber Binary files differindex 13c83659b37..f751452dda0 100755 --- a/Master/bin/i386-darwin/biber +++ b/Master/bin/i386-darwin/biber diff --git a/Master/bin/i386-freebsd/biber b/Master/bin/i386-freebsd/biber Binary files differindex adc52503653..58510586899 100755 --- a/Master/bin/i386-freebsd/biber +++ b/Master/bin/i386-freebsd/biber diff --git a/Master/bin/i386-linux/biber b/Master/bin/i386-linux/biber Binary files differindex 0829bb77d5f..7e88e4638ce 100755 --- a/Master/bin/i386-linux/biber +++ b/Master/bin/i386-linux/biber diff --git a/Master/bin/i386-solaris/biber b/Master/bin/i386-solaris/biber Binary files differnew file mode 100755 index 00000000000..df076c50bbf --- /dev/null +++ b/Master/bin/i386-solaris/biber diff --git a/Master/bin/win32/biber.exe b/Master/bin/win32/biber.exe Binary files differindex fd708d90112..25638d83e08 100755 --- a/Master/bin/win32/biber.exe +++ b/Master/bin/win32/biber.exe diff --git a/Master/bin/x86_64-cygwin/biber.exe b/Master/bin/x86_64-cygwin/biber.exe Binary files differindex d6899036892..5acddca7763 100755 --- a/Master/bin/x86_64-cygwin/biber.exe +++ b/Master/bin/x86_64-cygwin/biber.exe diff --git a/Master/bin/x86_64-darwin/biber b/Master/bin/x86_64-darwin/biber Binary files differindex 6951fe14b85..fd4267fd40a 100755 --- a/Master/bin/x86_64-darwin/biber +++ b/Master/bin/x86_64-darwin/biber diff --git a/Master/bin/x86_64-darwinlegacy/biber b/Master/bin/x86_64-darwinlegacy/biber Binary files differindex 6951fe14b85..fd4267fd40a 100755 --- a/Master/bin/x86_64-darwinlegacy/biber +++ b/Master/bin/x86_64-darwinlegacy/biber diff --git a/Master/bin/x86_64-linux/biber b/Master/bin/x86_64-linux/biber Binary files differindex 8d1869f2477..fa42bf92e93 100755 --- a/Master/bin/x86_64-linux/biber +++ b/Master/bin/x86_64-linux/biber diff --git a/Master/bin/x86_64-solaris/biber b/Master/bin/x86_64-solaris/biber Binary files differindex 0559c643dc1..7094985a706 100755 --- a/Master/bin/x86_64-solaris/biber +++ b/Master/bin/x86_64-solaris/biber diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/ChangeLog b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/ChangeLog index 5b7bcbd4fb4..5b927b62198 100644 --- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/ChangeLog +++ b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/ChangeLog @@ -1,10 +1,370 @@ +2018-03-06 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Release 20180306.0 (HEAD -> master) [6c941b5] + +2018-03-06 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Release 20180306.0 (tag: 20180306.0, origin/master, origin/HEAD) [409e696] + +2018-03-06 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * release.sh [4205a94] + +2018-03-06 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * release.sh [0ee14c4] + +2018-02-18 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * database helper scripts [5cae691] + +2018-02-18 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Makefile, release.sh: adjustment [ba488b3] + +2018-02-18 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * move database files to database/ [63f9b4e] + +2018-02-15 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * don't discard when otfinfo exits with non-zero (origin/otfinfo-rewrite, otfinfo-rewrite) [9e630e3] + +2018-02-15 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * forgotten initialization of casefold flag [9abf580] + +2018-02-15 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Guard against unavailable 'otfinfo' command, skip OTC/TTC [bab740e] + +2018-02-15 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Use 'otfinfo' command for casefolding search safety (WIP) [fccf54a] + +2018-01-13 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * cjk-gs-integrate-macos.pl: typo [ca1bba1] + +2018-01-13 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Add a wrapper cjk-gs-integrate-macos.pl [f820eec] + +2018-01-13 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Add typebank database (based on Win10 Fall Creators Update) [e5a9733] + +2017-12-21 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * removeonly database should be read only in cleanup mode [cbb0b84] + +2017-12-21 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * separate ume database [b1a2269] + +2017-12-11 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * separate mogamobo database [cb36720] + +2017-12-08 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * regenerate README.md [3eca807] + +2017-12-08 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * tools/release.sh: adjusted [789b6c7] + +2017-12-08 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * built-in database does not support >=10.8 [59f0912] + +2017-12-08 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * forgotten entry for removeonly database [6e03baf] + +2017-12-08 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * add removeonly database [2e16cdc] + +2017-12-08 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * tweaked database for sierra/highsierra [3281f12] + +2017-12-08 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * implement 'RMVname' entry for removing-only database [6e49733] + +2017-12-03 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * CRLF -> LF [a5db0ee] + +2017-12-02 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * separate founder database [afe9fc5] + +2017-12-02 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * separate adobe database [983cc3b] + +2017-12-02 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * separate solaris database [d27777a] + +2017-12-02 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Add '/Library/Application Support/Apple/Fonts//' to search path [b3caba8] + +2017-11-26 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * checked latest CMap resources [9c274fb] + +2017-11-26 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * add simli.ttf and simyou.ttf [44e62dd] + +2017-11-25 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * separate toppan database [125a2a3] + +2017-11-25 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * cjkgs-morisawa.dat: non-existent ShinMGoPr5-* [7609991] + +2017-11-25 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * separate fontworks database [c1c9735] + +2017-11-18 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * special case for native CID fonts in ancient days [b1b0d5f] + +2017-11-18 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * fix a mistake in previous commit [6c131a8] + +2017-11-18 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * handle tlgs.win32 pre-shipped cidfmap [5458fba] + +2017-11-18 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * separate microsoft database [2f22f8d] + +2017-11-17 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * support more aliases [9c81832] + +2017-11-17 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * update help message [56f97aa] + +2017-11-12 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * allow partial comment [c4119ff] + +2017-11-12 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * separate dynacomware database [005f5c2] + +2017-11-11 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * separate macOS-specific sinotype database [918d868] + +2017-11-11 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * update sinotype database (WIP) [48de9e3] + +2017-11-10 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * rename cjkgs-morisawa-standard.dat -> cjkgs-morisawa.dat (aminophen/master) [3afc59a] + +2017-11-10 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * update sinotype database [e1e781c] + +2017-11-09 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * database comment (more) [16446f9] + +2017-11-09 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * database comment (more) [27de76e] + +2017-11-09 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * database comment [b2b8c70] + +2017-11-09 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * update sinotype database (WIP) [e35f7bf] + +2017-11-09 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * separate sinotype database (WIP) [2e41fae] + +2017-11-09 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * database order [2d749fd] + +2017-10-29 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Update README-macos.md [c53e9be] + +2017-10-29 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * tweaked datbase [cec6e62] + +2017-10-29 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * separate yu-osx/win database [9bbf637] + +2017-10-29 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * perl syntax [3711113] + +2017-10-29 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Support 'INCLUDE' syntax in database [a884634] + +2017-10-29 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Rename: cjkgs-adobe.dat -> cjkgs-ryokana.dat [b4cee4e] + +2017-10-26 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Update help message, regenerate README.md [363cda0] + +2017-10-26 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * separate hiragino database [07bd9c2] + +2017-10-26 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * separate kozuka database [a56a8e3] + +2017-10-22 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Shorten .dat namespace (macos), separate morisawa standard [a49e730] + +2017-10-22 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Removed non-existent A-OTF-Jun101Pr6N-Light.otf entry [d675ad6] + +2017-10-21 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Add cjk-gs-integrate-adobe.dat (ryokana) [994fb3e] + +2017-10-14 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * dump PSName only when required [94021d0] + +2017-10-01 Norbert Preining <norbert@preining.info> + + * fix format [0053b99] + +2017-10-01 Norbert Preining <norbert@preining.info> + + * work on the README-macos [6d2e22b] + +2017-10-01 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Add GitHub repository URL [88fed5d] + +2017-10-01 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * README-macos.md: more information [4db2895] + +2017-10-01 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Add draft README-macos.md, adjust tools/release.sh [9f6464f] + +2017-10-01 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Add Makefile [2ad0d1b] + +2017-10-01 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * revised debug level (0:none -- 3:most verbose) [5fe9d00] + +2017-10-01 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * --fontdef-add can be given multiple times [70b5042] + +2017-09-30 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * database overwrite warning too noisy, switching to debug [e0fad54] + +2017-09-30 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * ignore cjk-gs-integrate-data.dat this is the default of --dump-data [cdeaed6] + +2017-09-30 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * search external database using kpsewhich -format=miscfont [3987272] + +2017-09-30 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Warning on Mac OS 10.11 or later without --fontdef-add [05599ae] + +2017-09-30 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * separate hiragino chinese [6c012e3] + +2017-09-30 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Clean up macOS database [d516eab] + +2017-09-28 doraTeX <taylorkgb@gmail.com> + + * Separate macOS fonts [9c48c51] + +2017-09-27 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * implement --fontdef-add option this works as an addition (not a substitution) to the already-available database. it would be useful for OS-specific additional database [2562926] + +2017-09-23 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * SubfontID is unnecessary for TTF, omit it [0c5187e] + +2017-09-23 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * re-implement --dump-data option Now usable for dumping effective database only [d3e2154] + +2017-09-23 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * --dump-data option is unsupported temporarily I'll re-implement this option as a dumper of only effective database, not a merely copying the built-in database [f56585f] + +2017-09-23 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * fix typo in database [faafa60] + +2017-09-23 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * start code refactoring I'd like to implement --fontdef-add option, to allow multiple database input. First in this commit, separate database catching and database reading. [c06d27d] + +2017-09-23 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * tweaked [bcfc0b1] + +2017-07-01 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Add lowercase link name for simsun.ttf [42e61f0] + +2017-06-24 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * more likely to find gswin32c Resource [1a873db] + +2017-06-24 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * strict check for exclusive options [ca86015] + 2017-06-24 Hironobu Yamashita <h.y.acetaminophen@gmail.com> - * Release 20170624.0 (HEAD -> master) [962f02b] + * Release 20170624.0 (tag: 20170624.0) [962f02b] 2017-06-24 Hironobu Yamashita <h.y.acetaminophen@gmail.com> - * Better comments, update README.md from source (origin/master, origin/HEAD) [b204205] + * Better comments, update README.md from source [b204205] 2017-06-24 Hironobu Yamashita <h.y.acetaminophen@gmail.com> @@ -16,7 +376,7 @@ 2017-06-23 Hironobu Yamashita <h.y.acetaminophen@gmail.com> - * TTC preferred to TTF for Yu-win, OTC warnings to debug [35065fe] + * TTC preferred to TTF for Yu-win, OTC warnings to debug (aminophen/cleanup) [35065fe] 2017-06-21 Hironobu Yamashita <h.y.acetaminophen@gmail.com> @@ -24,7 +384,7 @@ 2017-06-20 Hironobu Yamashita <h.y.acetaminophen@gmail.com> - * NTFS symlink on win32 has file size = 0, we can distinguish it [ab9b543] + * NTFS symlink on win32 has file size = 0, we can distinguish it (origin/cleanup) [ab9b543] 2017-06-20 Hironobu Yamashita <h.y.acetaminophen@gmail.com> @@ -116,7 +476,7 @@ 2017-05-05 Hironobu Yamashita <h.y.acetaminophen@gmail.com> - * fix a mistake, adjust help message for search path (origin/win32-support, win32-support) [8fd2c88] + * fix a mistake, adjust help message for search path (origin/win32-support, aminophen/win32-support) [8fd2c88] 2017-05-02 Hironobu Yamashita <h.y.acetaminophen@gmail.com> @@ -236,7 +596,7 @@ 2017-03-07 Hironobu Yamashita <h.y.acetaminophen@gmail.com> - * comment (origin/hira-aliases) [efcd6ec] + * comment [efcd6ec] 2017-03-07 Hironobu Yamashita <h.y.acetaminophen@gmail.com> @@ -344,7 +704,7 @@ 2016-12-13 aminophen <h.y.acetaminophen@gmail.com> - * Fix for Name entry different from PSName [fcd2515] + * Fix for Name entry different from PSName (aminophen/ttc-ttf-otc) [fcd2515] 2016-12-13 aminophen <h.y.acetaminophen@gmail.com> diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/Makefile b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/Makefile new file mode 100644 index 00000000000..21f16209ff9 --- /dev/null +++ b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/Makefile @@ -0,0 +1,20 @@ +PROJECT=cjk-gs-integrate +TEXMF = $(shell kpsewhich -var-value=TEXMFHOME) + +.PHONY: default install release +default: README.md + + +README.md: cjk-gs-integrate.pl + perl cjk-gs-integrate.pl --markdown > README.md + +install: README.md + mkdir -p ${TEXMF}/doc/fonts/$(PROJECT) + cp *.md ${TEXMF}/doc/fonts/$(PROJECT)/ + mkdir -p ${TEXMF}/scripts/$(PROJECT) + cp *.pl ${TEXMF}/scripts/$(PROJECT)/ + mkdir -p ${TEXMF}/fonts/misc/$(PROJECT) + cp database/*.dat ${TEXMF}/fonts/misc/$(PROJECT)/ + +release: README.md + sh tools/release.sh diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/README.md b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/README.md index c9d6727ea49..a2d9feec265 100644 --- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/README.md +++ b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/README.md @@ -21,6 +21,9 @@ Usage is searched and used. -f, --fontdef FILE specify alternate set of font definitions, if not given, the built-in set is used + --fontdef-add FILE specify additional set of font definitions, to + overwrite subset of built-in definitions; + can be given multiple times -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; @@ -60,9 +63,10 @@ Usage #### Command like options #### ````` - --dump-data [FILE] dump the built-in set of font definitions; you can - easily modify it, and tell me with -f (or --fontdef) - the data file name defaults to cjk-gs-integrate-data.dat + --dump-data [FILE] dump the set of font definitions which is currently + effective, where FILE (the dump output) defaults to + cjk-gs-integrate-data.dat; you can easily modify it, + and tell me with -f (or --fontdef) option --only-aliases regenerate only cidfmap.aliases file, instead of all --list-aliases lists the available aliases and their options, with the selected option on top @@ -98,7 +102,7 @@ The `<Resource>` dir is either given by `-o`/`--output`, or otherwise searched from an installed Ghostscript (binary name is assumed to be 'gs' on unix, 'gswin32c' on win32). -Aliases are added to +Aliases are added to <Resource>/Init/cidfmap.aliases -- if you are using tlgs win32, tlpkg/tlgs/lib/cidfmap.aliases instead @@ -155,7 +159,8 @@ are added: Japanese: - Ryumin-Light GothicBBB-Medium FutoMinA101-Bold FutoGoB101-Bold Jun101-Light + Ryumin-Light GothicBBB-Medium FutoMinA101-Bold FutoGoB101-Bold + MidashiMin-MA31 MidashiGo-MB31 Jun101-Light Korean: @@ -171,20 +176,23 @@ Traditional Chinese: MSung-Light MSung-Medium 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 Pr6N, Morisawa, Hiragino ProN, Hiragino, - Kozuka Pr6N, Kozuka ProVI, Kozuka, Yu OSX, Yu Win, - MS, Moga-Mobo-ex, Moga-Mobo, IPAex, IPA, Ume + RyuminPro-Light GothicBBBPro-Medium + FutoMinA101Pro-Bold FutoGoB101Pro-Bold + MidashiMinPro-MA31 MidashiGoPro-MB31 Jun101Pro-Light +The order is determined by the `Provides` setting in the font database. That is, the first font found in this order will be used to provide the alias if necessary. +For the Japanese fonts: + Morisawa Pr6N, Morisawa, Hiragino ProN, Hiragino, + Kozuka Pr6N, Kozuka ProVI, Kozuka Pro, Kozuka Std, + Yu OS X, Yu Win, MS, + Moga-Mobo-ex, Moga-Mobo, IPAex, IPA, Ume + For the Korean fonts: - (Hanyang,) Adobe, Solaris-hanyang, MS, Unfonts, Baekmuk + (Hanyang,) Adobe, Solaris, MS, Unfonts, Baekmuk For the Simplified Chinese: Adobe, Fandol, Hiragino, Founder, MS, CJKUnifonts, Arphic, CJKUnifonts-ttf @@ -204,8 +212,11 @@ Authors, Contributors, and Copyright ------------------------------------ The script and its documentation was written by Norbert Preining, based -on research and work by Yusuke Kuroki, Bruno Voisin, Hironobu Yamashita, -Munehiro Yamamoto and the TeX Q&A wiki page. +on research and work by Yusuke Kuroki, Yusuke Terada, Bruno Voisin, +Hironobu Yamashita, Munehiro Yamamoto and the TeX Q&A wiki page. + +Maintained by Japanese TeX Development Community. For development, see + https://github.com/texjporg/cjk-gs-support 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/database/cjkgs-adobe.dat b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-adobe.dat new file mode 100644 index 00000000000..0081d845d20 --- /dev/null +++ b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-adobe.dat @@ -0,0 +1,58 @@ +# Adobe + +### SIMPLIFIED CHINESE ### + +Name: AdobeSongStd-Light +Class: GB +Provides(30): STSong-Light +Provides(30): STSong-Regular +OTFname(10): AdobeSongStd-Light.otf + +Name: AdobeHeitiStd-Regular +Class: GB +Provides(30): STHeiti-Regular +Provides(30): STHeiti-Light +OTFname(20): AdobeHeitiStd-Regular.otf + +Name: AdobeKaitiStd-Regular +Class: GB +Provides(30): STKaiti-Regular +OTFname(20): AdobeKaitiStd-Regular.otf + +Name: AdobeFangsongStd-Regular +Class: GB +Provides(30): STFangsong-Light +Provides(30): STFangsong-Regular +OTFname(20): AdobeFangsongStd-Regular.otf + +### TRADITIONAL CHINESE ### + +Name: AdobeMingStd-Light +Class: CNS +Provides(30): MSung-Light +Provides(30): MSung-Medium +OTFname(20): AdobeMingStd-Light.otf + +Name: AdobeFanHeitiStd-Bold +Class: CNS +Provides(30): MHei-Medium +Provides(30): MKai-Medium +OTFname(20): AdobeFanHeitiStd-Bold.otf + +### KOREAN ### + +Name: AdobeMyungjoStd-Medium +Class: Korea +Provides(30): HYSMyeongJo-Medium +OTFname: AdobeMyungjoStd-Medium.otf + +Name: AdobeGothicStd-Bold +Class: Korea +Provides(30): HYGoThic-Medium +Provides(80): HYRGoThic-Medium +OTFname: AdobeGothicStd-Bold.otf + +Name: AdobeGothicStd-Light +Class: Korea +OTFname: AdobeGothicStd-Light.otf + diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-dynacomware.dat b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-dynacomware.dat new file mode 100644 index 00000000000..ac99b67c334 --- /dev/null +++ b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-dynacomware.dat @@ -0,0 +1,101 @@ +# DynaComware + +### SIMPLIFIED/TRADITIONAL CHINESE ### + +# Note about Mac (Mac OS X 10.6 -- macOS 10.13) +# 儷黑 Pro.ttf +# 儷宋 Pro.ttf +# are bundled with macOS 10.12.6 Sierra or earlier versions. +# LiHeiPro.ttf +# LiSongPro.ttf +# are bundled with macOS 10.13 High Sierra or later versions. +# PingFang.ttc +# index 0--17: PingFang* +# index 18--35: .PingFang* (hidden fonts) +# is bundled with OS X 10.11 El Capitan or later versions. + +Name: LiHeiPro +Class: CNS +#Provides(??): MHei-Medium # fails +TTFname(20): 儷黑 Pro.ttf +TTFname(10): LiHeiPro.ttf + +Name: LiSongPro +Class: CNS +#Provides(??): MSung-Medium # fails +#Provides(??): MSung-Light # fails +TTFname(20): 儷宋 Pro.ttf +TTFname(10): LiSongPro.ttf + +Name: PingFangHK-Regular +Class: CNS # HK +OTCname: PingFang.ttc(0) + +Name: PingFangTC-Regular +Class: CNS +OTCname: PingFang.ttc(1) + +Name: PingFangSC-Regular +Class: GB +OTCname: PingFang.ttc(2) + +Name: PingFangHK-Medium +Class: CNS # HK +OTCname: PingFang.ttc(3) + +Name: PingFangTC-Medium +Class: CNS +OTCname: PingFang.ttc(4) + +Name: PingFangSC-Medium +Class: GB +OTCname: PingFang.ttc(5) + +Name: PingFangHK-Semibold +Class: CNS # HK +OTCname: PingFang.ttc(6) + +Name: PingFangTC-Semibold +Class: CNS +OTCname: PingFang.ttc(7) + +Name: PingFangSC-Semibold +Class: GB +OTCname: PingFang.ttc(8) + +Name: PingFangHK-Light +Class: CNS # HK +OTCname: PingFang.ttc(9) + +Name: PingFangTC-Light +Class: CNS +OTCname: PingFang.ttc(10) + +Name: PingFangSC-Light +Class: GB +OTCname: PingFang.ttc(11) + +Name: PingFangHK-Thin +Class: CNS # HK +OTCname: PingFang.ttc(12) + +Name: PingFangTC-Thin +Class: CNS +OTCname: PingFang.ttc(13) + +Name: PingFangSC-Thin +Class: GB +OTCname: PingFang.ttc(14) + +Name: PingFangHK-Ultralight +Class: CNS # HK +OTCname: PingFang.ttc(15) + +Name: PingFangTC-Ultralight +Class: CNS +OTCname: PingFang.ttc(16) + +Name: PingFangSC-Ultralight +Class: GB +OTCname: PingFang.ttc(17) + diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-fontworks.dat b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-fontworks.dat new file mode 100644 index 00000000000..0a40e4f5efd --- /dev/null +++ b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-fontworks.dat @@ -0,0 +1,69 @@ +# Fontworks (including Fontworks MacOS version) + +### JAPANESE ### + +# Note about Mac (Mac OS X 10.6 -- macOS 10.13) +# Klee.ttc +# Tsukushi{A,B}MaruGothic.ttc +# are bundled with OS X 10.11 El Capitan or later versions. + +Name: FOT-KleePro-M +PSName: KleePro-M +Class: Japan +OTFname: FOT-KleePro-M.otf + +Name: FOT-KleePro-DB +PSName: KleePro-DB +Class: Japan +OTFname: FOT-KleePro-DB.otf + +Name: FOT-TsukuARdGothicStd-L +PSName: TsukuARdGothicStd-L +Class: Japan +OTFname: FOT-TsukuARdGothicStd-L.otf + +Name: FOT-TsukuARdGothicStd-R +PSName: TsukuARdGothicStd-R +Class: Japan +OTFname: FOT-TsukuARdGothicStd-R.otf + +Name: FOT-TsukuARdGothicStd-M +PSName: TsukuARdGothicStd-M +Class: Japan +OTFname: FOT-TsukuARdGothicStd-M.otf + +Name: FOT-TsukuARdGothicStd-D +PSName: TsukuARdGothicStd-D +Class: Japan +OTFname: FOT-TsukuARdGothicStd-D.otf + +Name: FOT-TsukuARdGothicStd-E +PSName: TsukuARdGothicStd-E +Class: Japan +OTFname: FOT-TsukuARdGothicStd-E.otf + +Name: FOT-TsukuBRdGothicStd-L +PSName: TsukuBRdGothicStd-L +Class: Japan +OTFname: FOT-TsukuBRdGothicStd-L.otf + +Name: FOT-TsukuBRdGothicStd-R +PSName: TsukuBRdGothicStd-R +Class: Japan +OTFname: FOT-TsukuBRdGothicStd-R.otf + +Name: FOT-TsukuBRdGothicStd-M +PSName: TsukuBRdGothicStd-M +Class: Japan +OTFname: FOT-TsukuBRdGothicStd-M.otf + +Name: FOT-TsukuBRdGothicStd-D +PSName: TsukuBRdGothicStd-D +Class: Japan +OTFname: FOT-TsukuBRdGothicStd-D.otf + +Name: FOT-TsukuBRdGothicStd-E +PSName: TsukuBRdGothicStd-E +Class: Japan +OTFname: FOT-TsukuBRdGothicStd-E.otf + diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-founder.dat b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-founder.dat new file mode 100644 index 00000000000..8951754865b --- /dev/null +++ b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-founder.dat @@ -0,0 +1,112 @@ +# Beijing Founder Electronics + +### SIMPLIFIED CHINESE ### + +# Note: +# FZ****.TTF (13 files) +# are bundled with with WPS Office (formerly Kingsoft Office) Linux. +# Lantinghei.ttc +# is bundled with OS X 10.9 Mavericks or later versions. + +# FZShuSong-Z01 +Name: FZSSK--GBK1-0 +Class: GB +Provides(55): STSong-Light +TTFname: FZSSK.TTF + +# FZXiaoBiaoSong-B05 +Name: FZXBSK--GBK1-0 +Class: GB +Provides(55): STSong-Regular +TTFname: FZXBSK.TTF + +# FZXiHeiI-Z08 +Name: FZXH1K--GBK1-0 +Class: GB +Provides(55): STHeiti-Light +TTFname: FZXH1K.TTF + +# FZHei-B01 +Name: FZHTK--GBK1-0 +Class: GB +Provides(55): STHeiti-Regular +TTFname: FZHTK.TTF + +# FZKai-Z03 +Name: FZKTK--GBK1-0 +Class: GB +Provides(55): STKaiti-Regular +TTFname: FZKTK.TTF + +# FZFangSong-Z02 +Name: FZFSK--GBK1-0 +Class: GB +Provides(55): STFangsong-Light +Provides(55): STFangsong-Regular +TTFname: FZFSK.TTF + +# FZXingKai-S04 +Name: FZXKK--GBK1-0 +Class: GB +TTFname: FZXKK.TTF + +# FZWeiBei-S03 +Name: FZWBK--GBK1-0 +Class: GB +TTFname: FZWBK.TTF + +# FZChaoCuHei-M10 +Name: FZCCHK--GBK1-0 +Class: GB +TTFname: FZCCHK.TTF + +# FZLiShu-S01 +Name: FZLSK--GBK1-0 +Class: GB +TTFname: FZLSK.TTF + +# FZYaoTi-M06 +Name: FZYTK--GBK1-0 +Class: GB +TTFname: FZYTK.TTF + +# FZSongS-Extended +Name: FZSONGS--GB1-5 +Class: GB +TTFname: FZSongS_20100603.TTF + +# FZSongS-Extended(SIP) +Name: FZSONGS_SIP--GB1-5 +Class: GB +TTFname: FZSongS(SIP)_2010603.TTF + +# Lantinghei SC Demibold +Name: FZLTZHK--GBK1-0 +Class: GB +TTCname: Lantinghei.ttc(0) + +# Lantinghei SC Extralight +Name: FZLTXHK--GBK1-0 +Class: GB +TTCname: Lantinghei.ttc(1) + +# Lantinghei SC Heavy +Name: FZLTTHK--GBK1-0 +Class: GB +TTCname: Lantinghei.ttc(2) + +# Lantinghei TC Demibold +Name: FZLTZHB--B51-0 +Class: CNS +TTCname: Lantinghei.ttc(3) + +# Lantinghei TC Extralight +Name: FZLTXHB--B51-0 +Class: CNS +TTCname: Lantinghei.ttc(4) + +# Lantinghei TC Heavy +Name: FZLTTHB--B51-0 +Class: CNS +TTCname: Lantinghei.ttc(5) + diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-hiragino.dat b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-hiragino.dat new file mode 100644 index 00000000000..94b4a07e698 --- /dev/null +++ b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-hiragino.dat @@ -0,0 +1,160 @@ +# Hiragino + +### JAPANESE ### + +# Note about Mac (Mac OS X 10.6 -- macOS 10.13) +# ヒラギノ角ゴ {Pro,ProN} {W3,W6}.otf +# ヒラギノ角ゴ {Std,StdN} W8.otf +# ヒラギノ丸ゴ {Pro,ProN} W4.otf +# ヒラギノ明朝 {Pro,ProN} {W3,W6}.otf +# are bundled with OS X 10.10.5 Yosemite or earlier versions. +# ヒラギノ角ゴシック {W0,...W9}.ttc +# ヒラギノ丸ゴ ProN W4.ttc +# are bundled with OS X 10.11 El Capitan or later versions. +# ヒラギノ明朝 ProN {W3,W6}.ttc +# are bundled with OS X 10.11 El Capitan -- macOS 10.12.6 Sierra. +# ヒラギノ明朝 ProN.ttc +# is bundled with macOS 10.13 High Sierra or later versions. + +Name: HiraMinProN-W3 +Class: Japan +Provides(30): Ryumin-Light +Provides(30): RyuminPro-Light +# the following two are *not* the same +# one is in decomposed form (for Mac), one is in composed form (for the rest) +OTFname(20): ヒラギノ明朝 ProN W3.otf +OTFname(19): ヒラギノ明朝 ProN W3.otf +OTFname(10): HiraMinProN-W3.otf + +Name: HiraMinProN-W6 +Class: Japan +Provides(30): FutoMinA101-Bold +Provides(30): FutoMinA101Pro-Bold +Provides(30): MidashiMin-MA31 +Provides(30): MidashiMinPro-MA31 +OTFname(20): ヒラギノ明朝 ProN W6.otf +OTFname(19): ヒラギノ明朝 ProN W6.otf +OTFname(10): HiraMinProN-W6.otf + +Name: HiraKakuProN-W3 +Class: Japan +Provides(30): GothicBBB-Medium +Provides(30): GothicBBBPro-Medium +OTFname(20): ヒラギノ角ゴ ProN W3.otf +OTFname(19): ヒラギノ角ゴ ProN W3.otf +OTFname(10): HiraKakuProN-W3.otf + +Name: HiraKakuProN-W6 +Class: Japan +Provides(30): FutoGoB101-Bold +Provides(30): FutoGoB101Pro-Bold +OTFname(20): ヒラギノ角ゴ ProN W6.otf +OTFname(19): ヒラギノ角ゴ ProN W6.otf +OTFname(10): HiraKakuProN-W6.otf + +Name: HiraKakuStdN-W8 +Class: Japan +Provides(30): MidashiGo-MB31 +Provides(30): MidashiGoPro-MB31 +OTFname(20): ヒラギノ角ゴ StdN W8.otf +OTFname(19): ヒラギノ角ゴ StdN W8.otf +OTFname(10): HiraKakuStdN-W8.otf + +Name: HiraMaruProN-W4 +Class: Japan +Provides(30): Jun101-Light +Provides(30): Jun101Pro-Light +OTFname(20): ヒラギノ丸ゴ ProN W4.otf +OTFname(19): ヒラギノ丸ゴ ProN W4.otf +OTFname(10): HiraMaruProN-W4.otf + +Name: HiraMinPro-W3 +Class: Japan +Provides(40): Ryumin-Light +Provides(40): RyuminPro-Light +OTFname(20): ヒラギノ明朝 Pro W3.otf +OTFname(19): ヒラギノ明朝 Pro W3.otf +OTFname(10): HiraMinPro-W3.otf + +Name: HiraMinPro-W6 +Class: Japan +Provides(40): FutoMinA101-Bold +Provides(40): FutoMinA101Pro-Bold +Provides(40): MidashiMin-MA31 +Provides(40): MidashiMinPro-MA31 +OTFname(20): ヒラギノ明朝 Pro W6.otf +OTFname(19): ヒラギノ明朝 Pro W6.otf +OTFname(10): HiraMinPro-W6.otf + +Name: HiraKakuPro-W3 +Class: Japan +Provides(40): GothicBBB-Medium +Provides(40): GothicBBBPro-Medium +OTFname(20): ヒラギノ角ゴ Pro W3.otf +OTFname(19): ヒラギノ角ゴ Pro W3.otf +OTFname(10): HiraKakuPro-W3.otf + +Name: HiraKakuPro-W6 +Class: Japan +Provides(40): FutoGoB101-Bold +Provides(40): FutoGoB101Pro-Bold +OTFname(20): ヒラギノ角ゴ Pro W6.otf +OTFname(19): ヒラギノ角ゴ Pro W6.otf +OTFname(10): HiraKakuPro-W6.otf + +Name: HiraKakuStd-W8 +Class: Japan +Provides(40): MidashiGo-MB31 +Provides(40): MidashiGoPro-MB31 +OTFname(20): ヒラギノ角ゴ Std W8.otf +OTFname(19): ヒラギノ角ゴ Std W8.otf +OTFname(10): HiraKakuStd-W8.otf + +Name: HiraMaruPro-W4 +Class: Japan +Provides(40): Jun101-Light +Provides(40): Jun101Pro-Light +OTFname(20): ヒラギノ丸ゴ Pro W4.otf +OTFname(19): ヒラギノ丸ゴ Pro W4.otf +OTFname(10): HiraMaruPro-W4.otf + +# Following Hiragino fonts are not bundled with OS X, +# but used in ptex-fontmaps + +Name: HiraMinProN-W2 +Class: Japan +OTFname(20): ヒラギノ明朝 ProN W2.otf +OTFname(19): ヒラギノ明朝 ProN W2.otf +OTFname(10): HiraMinProN-W2.otf + +Name: HiraMinPro-W2 +Class: Japan +OTFname(20): ヒラギノ明朝 Pro W2.otf +OTFname(19): ヒラギノ明朝 Pro W2.otf +OTFname(10): HiraMinPro-W2.otf + +### SIMPLIFIED/TRADITIONAL CHINESE ### + +# Note about Mac OS X: +# Hiragino Sans GB {W3,W6}.otf +# are bundled with OS X 10.10.5 Yosemite or earlier versions. +# Hiragino Sans GB {W3,W6}.ttc +# are bundled with OS X 10.11 El Capitan -- macOS 10.12.6 Sierra. +# Hiragino Sans CNS.ttc +# is bundled with macOS 10.12 Sierra -- macOS 10.12.6 Sierra. +# Hiragino Sans GB.ttc +# Hiragino_Sans_CNS.ttc +# are bundled with macOS 10.13 High Sierra or later versions. + +Name: HiraginoSansGB-W3 +Class: GB +Provides(50): STHeiti-Light +OTFname(20): Hiragino Sans GB W3.otf +OTFname(10): HiraginoSansGB-W3.otf + +Name: HiraginoSansGB-W6 +Class: GB +Provides(50): STHeiti-Regular +OTFname(20): Hiragino Sans GB W6.otf +OTFname(10): HiraginoSansGB-W6.otf + diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-kozuka.dat b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-kozuka.dat new file mode 100644 index 00000000000..f9fb1a44dd4 --- /dev/null +++ b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-kozuka.dat @@ -0,0 +1,302 @@ +# Kozuka (Adobe) + +### JAPANESE ### + +# Some of the {Pr6N,ProVI,Pro} variants are used in ptex-fontmaps. + +Name: KozMinPr6N-ExtraLight +Class: Japan +OTFname: KozMinPr6N-ExtraLight.otf + +Name: KozMinPr6N-Light +Class: Japan +OTFname: KozMinPr6N-Light.otf + +Name: KozMinPr6N-Regular +Class: Japan +Provides(50): Ryumin-Light +Provides(50): RyuminPro-Light +Provides(50): HiraMinProN-W3 +Provides(50): HiraMinPro-W3 +OTFname: KozMinPr6N-Regular.otf + +Name: KozMinPr6N-Medium +Class: Japan +OTFname: KozMinPr6N-Medium.otf + +Name: KozMinPr6N-Bold +Class: Japan +Provides(50): FutoMinA101-Bold +Provides(50): FutoMinA101Pro-Bold +Provides(50): HiraMinProN-W6 +Provides(50): HiraMinPro-W6 +OTFname: KozMinPr6N-Bold.otf + +Name: KozMinPr6N-Heavy +Class: Japan +Provides(50): MidashiMin-MA31 +Provides(50): MidashiMinPro-MA31 +OTFname: KozMinPr6N-Heavy.otf + +Name: KozMinProVI-ExtraLight +Class: Japan +OTFname: KozMinProVI-ExtraLight.otf + +Name: KozMinProVI-Light +Class: Japan +OTFname: KozMinProVI-Light.otf + +Name: KozMinProVI-Regular +Class: Japan +Provides(55): Ryumin-Light +Provides(55): RyuminPro-Light +Provides(55): HiraMinProN-W3 +Provides(55): HiraMinPro-W3 +OTFname: KozMinProVI-Regular.otf + +Name: KozMinProVI-Medium +Class: Japan +OTFname: KozMinProVI-Medium.otf + +Name: KozMinProVI-Bold +Class: Japan +Provides(55): FutoMinA101-Bold +Provides(55): FutoMinA101Pro-Bold +Provides(55): HiraMinProN-W6 +Provides(55): HiraMinPro-W6 +OTFname: KozMinProVI-Bold.otf + +Name: KozMinProVI-Heavy +Class: Japan +Provides(55): MidashiMin-MA31 +Provides(55): MidashiMinPro-MA31 +OTFname: KozMinProVI-Heavy.otf + +Name: KozMinPro-ExtraLight +Class: Japan +OTFname: KozMinPro-ExtraLight.otf + +Name: KozMinPro-Light +Class: Japan +OTFname: KozMinPro-Light.otf + +Name: KozMinPro-Regular +Class: Japan +Provides(60): Ryumin-Light +Provides(60): RyuminPro-Light +Provides(60): HiraMinProN-W3 +Provides(60): HiraMinPro-W3 +OTFname: KozMinPro-Regular.otf + +Name: KozMinPro-Medium +Class: Japan +OTFname: KozMinPro-Medium.otf + +Name: KozMinPro-Bold +Class: Japan +Provides(60): FutoMinA101-Bold +Provides(60): FutoMinA101Pro-Bold +Provides(60): HiraMinProN-W6 +Provides(60): HiraMinPro-W6 +OTFname: KozMinPro-Bold.otf + +Name: KozMinPro-Heavy +Class: Japan +Provides(60): MidashiMin-MA31 +Provides(60): MidashiMinPro-MA31 +OTFname: KozMinPro-Heavy.otf + +Name: KozMinStd-ExtraLight +Class: Japan +OTFname: KozMinStd-ExtraLight.otf + +Name: KozMinStd-Light +Class: Japan +OTFname: KozMinStd-Light.otf + +Name: KozMinStd-Regular +Class: Japan +Provides(65): Ryumin-Light +Provides(65): RyuminPro-Light +Provides(65): HiraMinProN-W3 +Provides(65): HiraMinPro-W3 +OTFname: KozMinStd-Regular.otf + +Name: KozMinStd-Medium +Class: Japan +OTFname: KozMinStd-Medium.otf + +Name: KozMinStd-Bold +Class: Japan +Provides(65): FutoMinA101-Bold +Provides(65): FutoMinA101Pro-Bold +Provides(65): HiraMinProN-W6 +Provides(65): HiraMinPro-W6 +OTFname: KozMinStd-Bold.otf + +Name: KozMinStd-Heavy +Class: Japan +Provides(65): MidashiMin-MA31 +Provides(65): MidashiMinPro-MA31 +OTFname: KozMinStd-Heavy.otf + +Name: KozGoPr6N-ExtraLight +Class: Japan +OTFname: KozGoPr6N-ExtraLight.otf + +Name: KozGoPr6N-Light +Class: Japan +OTFname: KozGoPr6N-Light.otf + +Name: KozGoPr6N-Regular +Class: Japan +OTFname: KozGoPr6N-Regular.otf + +Name: KozGoPr6N-Medium +Class: Japan +Provides(50): GothicBBB-Medium +Provides(50): GothicBBBPro-Medium +Provides(50): HiraKakuProN-W3 +Provides(50): HiraKakuPro-W3 +OTFname: KozGoPr6N-Medium.otf + +Name: KozGoPr6N-Bold +Class: Japan +Provides(50): FutoGoB101-Bold +Provides(50): FutoGoB101Pro-Bold +Provides(50): HiraKakuProN-W6 +Provides(50): HiraKakuPro-W6 +OTFname: KozGoPr6N-Bold.otf + +Name: KozGoPr6N-Heavy +Class: Japan +Provides(50): MidashiGo-MB31 +Provides(50): MidashiGoPro-MB31 +Provides(50): HiraKakuStdN-W8 +Provides(50): HiraKakuStd-W8 +Provides(50): Jun101-Light +Provides(50): Jun101Pro-Light +Provides(50): HiraMaruProN-W4 +Provides(50): HiraMaruPro-W4 +OTFname: KozGoPr6N-Heavy.otf + +Name: KozGoProVI-ExtraLight +Class: Japan +OTFname: KozGoProVI-ExtraLight.otf + +Name: KozGoProVI-Light +Class: Japan +OTFname: KozGoProVI-Light.otf + +Name: KozGoProVI-Regular +Class: Japan +OTFname: KozGoProVI-Regular.otf + +Name: KozGoProVI-Medium +Class: Japan +Provides(55): GothicBBB-Medium +Provides(55): GothicBBBPro-Medium +Provides(55): HiraKakuProN-W3 +Provides(55): HiraKakuPro-W3 +OTFname: KozGoProVI-Medium.otf + +Name: KozGoProVI-Bold +Class: Japan +Provides(55): FutoGoB101-Bold +Provides(55): FutoGoB101Pro-Bold +Provides(55): HiraKakuProN-W6 +Provides(55): HiraKakuPro-W6 +OTFname: KozGoProVI-Bold.otf + +Name: KozGoProVI-Heavy +Class: Japan +Provides(55): MidashiGo-MB31 +Provides(55): MidashiGoPro-MB31 +Provides(55): HiraKakuStdN-W8 +Provides(55): HiraKakuStd-W8 +Provides(55): Jun101-Light +Provides(55): Jun101Pro-Light +Provides(55): HiraMaruProN-W4 +Provides(55): HiraMaruPro-W4 +OTFname: KozGoProVI-Heavy.otf + +Name: KozGoPro-ExtraLight +Class: Japan +OTFname: KozGoPro-ExtraLight.otf + +Name: KozGoPro-Light +Class: Japan +OTFname: KozGoPro-Light.otf + +Name: KozGoPro-Regular +Class: Japan +OTFname: KozGoPro-Regular.otf + +Name: KozGoPro-Medium +Class: Japan +Provides(60): GothicBBB-Medium +Provides(60): GothicBBBPro-Medium +Provides(60): HiraKakuProN-W3 +Provides(60): HiraKakuPro-W3 +OTFname: KozGoPro-Medium.otf + +Name: KozGoPro-Bold +Class: Japan +Provides(60): FutoGoB101-Bold +Provides(60): FutoGoB101Pro-Bold +Provides(60): HiraKakuProN-W6 +Provides(60): HiraKakuPro-W6 +OTFname: KozGoPro-Bold.otf + +Name: KozGoPro-Heavy +Class: Japan +Provides(60): MidashiGo-MB31 +Provides(60): MidashiGoPro-MB31 +Provides(60): HiraKakuStdN-W8 +Provides(60): HiraKakuStd-W8 +Provides(60): Jun101-Light +Provides(60): Jun101Pro-Light +Provides(60): HiraMaruProN-W4 +Provides(60): HiraMaruPro-W4 +OTFname: KozGoPro-Heavy.otf + +Name: KozGoStd-ExtraLight +Class: Japan +OTFname: KozGoStd-ExtraLight.otf + +Name: KozGoStd-Light +Class: Japan +OTFname: KozGoStd-Light.otf + +Name: KozGoStd-Regular +Class: Japan +OTFname: KozGoStd-Regular.otf + +Name: KozGoStd-Medium +Class: Japan +Provides(65): GothicBBB-Medium +Provides(65): GothicBBBPro-Medium +Provides(65): HiraKakuProN-W3 +Provides(65): HiraKakuPro-W3 +OTFname: KozGoStd-Medium.otf + +Name: KozGoStd-Bold +Class: Japan +Provides(65): FutoGoB101-Bold +Provides(65): FutoGoB101Pro-Bold +Provides(65): HiraKakuProN-W6 +Provides(65): HiraKakuPro-W6 +OTFname: KozGoStd-Bold.otf + +Name: KozGoStd-Heavy +Class: Japan +Provides(65): MidashiGo-MB31 +Provides(65): MidashiGoPro-MB31 +Provides(65): HiraKakuStdN-W8 +Provides(65): HiraKakuStd-W8 +Provides(65): Jun101-Light +Provides(65): Jun101Pro-Light +Provides(65): HiraMaruProN-W4 +Provides(65): HiraMaruPro-W4 +OTFname: KozGoStd-Heavy.otf + diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-macos-removeonly.dat b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-macos-removeonly.dat new file mode 100644 index 00000000000..cc6440d73f9 --- /dev/null +++ b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-macos-removeonly.dat @@ -0,0 +1,562 @@ +# Remove-only database for Mac OS + +### JAPANESE ### + +# Hiragino + +Name: HiraMinProN-W3 +Class: Japan +Provides(30): Ryumin-Light +Provides(30): RyuminPro-Light +OTFname(20): ヒラギノ明朝 ProN W3.otf +OTFname(19): ヒラギノ明朝 ProN W3.otf +OTFname(10): HiraMinProN-W3.otf +RMVname(30): ヒラギノ明朝 ProN W3.ttc(0) +RMVname(29): ヒラギノ明朝 ProN W3.ttc(0) +RMVname(28): HiraginoSerif-W3.ttc(0) +RMVname(40): ヒラギノ明朝 ProN.ttc(0) +RMVname(39): ヒラギノ明朝 ProN.ttc(0) +RMVname(38): HiraginoSerif.ttc(0) + +Name: HiraMinProN-W6 +Class: Japan +Provides(30): FutoMinA101-Bold +Provides(30): FutoMinA101Pro-Bold +Provides(30): MidashiMin-MA31 +Provides(30): MidashiMinPro-MA31 +OTFname(20): ヒラギノ明朝 ProN W6.otf +OTFname(19): ヒラギノ明朝 ProN W6.otf +OTFname(10): HiraMinProN-W6.otf +RMVname(30): ヒラギノ明朝 ProN W6.ttc(0) +RMVname(29): ヒラギノ明朝 ProN W6.ttc(0) +RMVname(28): HiraginoSerif-W6.ttc(0) +RMVname(40): ヒラギノ明朝 ProN.ttc(2) +RMVname(39): ヒラギノ明朝 ProN.ttc(2) +RMVname(38): HiraginoSerif.ttc(2) + +Name: HiraKakuProN-W3 +Class: Japan +Provides(30): GothicBBB-Medium +Provides(30): GothicBBBPro-Medium +OTFname(20): ヒラギノ角ゴ ProN W3.otf +OTFname(19): ヒラギノ角ゴ ProN W3.otf +OTFname(10): HiraKakuProN-W3.otf +RMVname(30): ヒラギノ角ゴシック W3.ttc(2) +RMVname(29): ヒラギノ角ゴシック W3.ttc(2) +RMVname(28): HiraginoSans-W3.ttc(2) + +Name: HiraKakuProN-W6 +Class: Japan +Provides(30): FutoGoB101-Bold +Provides(30): FutoGoB101Pro-Bold +OTFname(20): ヒラギノ角ゴ ProN W6.otf +OTFname(19): ヒラギノ角ゴ ProN W6.otf +OTFname(10): HiraKakuProN-W6.otf +RMVname(30): ヒラギノ角ゴシック W6.ttc(2) +RMVname(29): ヒラギノ角ゴシック W6.ttc(2) +RMVname(28): HiraginoSans-W6.ttc(2) + +Name: HiraKakuStdN-W8 +Class: Japan +Provides(30): MidashiGo-MB31 +Provides(30): MidashiGoPro-MB31 +OTFname(20): ヒラギノ角ゴ StdN W8.otf +OTFname(19): ヒラギノ角ゴ StdN W8.otf +OTFname(10): HiraKakuStdN-W8.otf +RMVname(30): ヒラギノ角ゴシック W8.ttc(3) +RMVname(29): ヒラギノ角ゴシック W8.ttc(3) +RMVname(28): HiraginoSans-W8.ttc(3) + +Name: HiraMaruProN-W4 +Class: Japan +Provides(30): Jun101-Light +Provides(30): Jun101Pro-Light +OTFname(20): ヒラギノ丸ゴ ProN W4.otf +OTFname(19): ヒラギノ丸ゴ ProN W4.otf +OTFname(10): HiraMaruProN-W4.otf +RMVname(30): ヒラギノ丸ゴ ProN W4.ttc(1) +RMVname(29): ヒラギノ丸ゴ ProN W4.ttc(1) +RMVname(28): HiraginoSansR-W4.ttc(1) + +Name: HiraMinPro-W3 +Class: Japan +Provides(40): Ryumin-Light +Provides(40): RyuminPro-Light +OTFname(20): ヒラギノ明朝 Pro W3.otf +OTFname(19): ヒラギノ明朝 Pro W3.otf +OTFname(10): HiraMinPro-W3.otf +RMVname(30): ヒラギノ明朝 ProN W3.ttc(1) +RMVname(29): ヒラギノ明朝 ProN W3.ttc(1) +RMVname(28): HiraginoSerif-W3.ttc(1) +RMVname(40): ヒラギノ明朝 ProN.ttc(1) +RMVname(39): ヒラギノ明朝 ProN.ttc(1) +RMVname(38): HiraginoSerif.ttc(1) + +Name: HiraMinPro-W6 +Class: Japan +Provides(40): FutoMinA101-Bold +Provides(40): FutoMinA101Pro-Bold +Provides(40): MidashiMin-MA31 +Provides(40): MidashiMinPro-MA31 +OTFname(20): ヒラギノ明朝 Pro W6.otf +OTFname(19): ヒラギノ明朝 Pro W6.otf +OTFname(10): HiraMinPro-W6.otf +RMVname(30): ヒラギノ明朝 ProN W6.ttc(1) +RMVname(29): ヒラギノ明朝 ProN W6.ttc(1) +RMVname(28): HiraginoSerif-W6.ttc(1) +RMVname(40): ヒラギノ明朝 ProN.ttc(3) +RMVname(39): ヒラギノ明朝 ProN.ttc(3) +RMVname(38): HiraginoSerif.ttc(3) + +Name: HiraKakuPro-W3 +Class: Japan +Provides(40): GothicBBB-Medium +Provides(40): GothicBBBPro-Medium +OTFname(20): ヒラギノ角ゴ Pro W3.otf +OTFname(19): ヒラギノ角ゴ Pro W3.otf +OTFname(10): HiraKakuPro-W3.otf +RMVname(30): ヒラギノ角ゴシック W3.ttc(3) +RMVname(29): ヒラギノ角ゴシック W3.ttc(3) +RMVname(28): HiraginoSans-W3.ttc(3) + +Name: HiraKakuPro-W6 +Class: Japan +Provides(40): FutoGoB101-Bold +Provides(40): FutoGoB101Pro-Bold +OTFname(20): ヒラギノ角ゴ Pro W6.otf +OTFname(19): ヒラギノ角ゴ Pro W6.otf +OTFname(10): HiraKakuPro-W6.otf +RMVname(30): ヒラギノ角ゴシック W6.ttc(3) +RMVname(29): ヒラギノ角ゴシック W6.ttc(3) +RMVname(28): HiraginoSans-W6.ttc(3) + +Name: HiraKakuStd-W8 +Class: Japan +Provides(40): MidashiGo-MB31 +Provides(40): MidashiGoPro-MB31 +OTFname(20): ヒラギノ角ゴ Std W8.otf +OTFname(19): ヒラギノ角ゴ Std W8.otf +OTFname(10): HiraKakuStd-W8.otf +RMVname(30): ヒラギノ角ゴシック W8.ttc(2) +RMVname(29): ヒラギノ角ゴシック W8.ttc(2) +RMVname(28): HiraginoSans-W8.ttc(2) + +Name: HiraMaruPro-W4 +Class: Japan +Provides(40): Jun101-Light +Provides(40): Jun101Pro-Light +OTFname(20): ヒラギノ丸ゴ Pro W4.otf +OTFname(19): ヒラギノ丸ゴ Pro W4.otf +OTFname(10): HiraMaruPro-W4.otf +RMVname(30): ヒラギノ丸ゴ ProN W4.ttc(0) +RMVname(29): ヒラギノ丸ゴ ProN W4.ttc(0) +RMVname(28): HiraginoSansR-W4.ttc(0) + +Name: HiraginoSans-W0 +Class: Japan +RMVname(30): ヒラギノ角ゴシック W0.ttc(0) +RMVname(29): ヒラギノ角ゴシック W0.ttc(0) +RMVname(28): HiraginoSans-W0.ttc(0) + +Name: HiraginoSans-W1 +Class: Japan +RMVname(30): ヒラギノ角ゴシック W1.ttc(0) +RMVname(29): ヒラギノ角ゴシック W1.ttc(0) +RMVname(28): HiraginoSans-W1.ttc(0) + +Name: HiraginoSans-W2 +Class: Japan +RMVname(30): ヒラギノ角ゴシック W2.ttc(0) +RMVname(29): ヒラギノ角ゴシック W2.ttc(0) +RMVname(28): HiraginoSans-W2.ttc(0) + +Name: HiraginoSans-W3 +Class: Japan +RMVname(30): ヒラギノ角ゴシック W3.ttc(0) +RMVname(29): ヒラギノ角ゴシック W3.ttc(0) +RMVname(28): HiraginoSans-W3.ttc(0) + +Name: HiraginoSans-W4 +Class: Japan +RMVname(30): ヒラギノ角ゴシック W4.ttc(0) +RMVname(29): ヒラギノ角ゴシック W4.ttc(0) +RMVname(28): HiraginoSans-W4.ttc(0) + +Name: HiraginoSans-W5 +Class: Japan +RMVname(30): ヒラギノ角ゴシック W5.ttc(0) +RMVname(29): ヒラギノ角ゴシック W5.ttc(0) +RMVname(28): HiraginoSans-W5.ttc(0) + +Name: HiraginoSans-W6 +Class: Japan +RMVname(30): ヒラギノ角ゴシック W6.ttc(0) +RMVname(29): ヒラギノ角ゴシック W6.ttc(0) +RMVname(28): HiraginoSans-W6.ttc(0) + +Name: HiraginoSans-W7 +Class: Japan +RMVname(30): ヒラギノ角ゴシック W7.ttc(0) +RMVname(29): ヒラギノ角ゴシック W7.ttc(0) +RMVname(28): HiraginoSans-W7.ttc(0) + +Name: HiraginoSans-W8 +Class: Japan +RMVname(30): ヒラギノ角ゴシック W8.ttc(0) +RMVname(29): ヒラギノ角ゴシック W8.ttc(0) +RMVname(28): HiraginoSans-W8.ttc(0) + +Name: HiraginoSans-W9 +Class: Japan +RMVname(30): ヒラギノ角ゴシック W9.ttc(0) +RMVname(29): ヒラギノ角ゴシック W9.ttc(0) +RMVname(28): HiraginoSans-W9.ttc(0) + +# Yu-fonts MacOS version + +Name: YuMin-Medium +Class: Japan +Provides(80): Ryumin-Light +Provides(80): RyuminPro-Light +Provides(80): HiraMinProN-W3 +Provides(80): HiraMinPro-W3 +OTFname(20): Yu Mincho Medium.otf +OTFname(10): YuMin-Medium.otf +RMVname(30): YuMincho.ttc(0) + +Name: YuMin-Demibold +Class: Japan +Provides(80): FutoMinA101-Bold +Provides(80): FutoMinA101Pro-Bold +Provides(80): HiraMinProN-W6 +Provides(80): HiraMinPro-W6 +Provides(80): MidashiMin-MA31 +Provides(80): MidashiMinPro-MA31 +OTFname(20): Yu Mincho Demibold.otf +OTFname(10): YuMin-Demibold.otf +RMVname(30): YuMincho.ttc(1) + +Name: YuMin-Extrabold +Class: Japan +RMVname(30): YuMincho.ttc(2) + +Name: YuMin_36pKn-Medium +Class: Japan +RMVname(30): YuMincho.ttc(3) + +Name: YuMin_36pKn-Demibold +Class: Japan +RMVname(30): YuMincho.ttc(4) + +Name: YuMin_36pKn-Extrabold +Class: Japan +RMVname(30): YuMincho.ttc(5) + +Name: YuKyo_Yoko-Medium +Class: Japan +RMVname: Kyokasho.ttc(0) + +Name: YuKyo_Yoko-Bold +Class: Japan +RMVname: Kyokasho.ttc(1) + +Name: YuKyo-Medium +Class: Japan +RMVname: Kyokasho.ttc(2) + +Name: YuKyo-Bold +Class: Japan +RMVname: Kyokasho.ttc(3) + +# Fontworks MacOS version + +Name: Klee-Medium +Class: Japan +RMVname: Klee.ttc(1) + +Name: Klee-Demibold +Class: Japan +RMVname: Klee.ttc(0) + +Name: TsukuARdGothic-Regular +Class: Japan +RMVname: TsukushiAMaruGothic.ttc(0) + +Name: TsukuARdGothic-Bold +Class: Japan +RMVname: TsukushiAMaruGothic.ttc(1) + +Name: TsukuBRdGothic-Regular +Class: Japan +RMVname: TsukushiBMaruGothic.ttc(0) + +Name: TsukuBRdGothic-Bold +Class: Japan +RMVname: TsukushiBMaruGothic.ttc(1) + +# Toppan MacOS version + +Name: ToppanBunkyuMincho-Regular +PSName: ToppanBunkyuMinchoPr6N-Regular +Class: Japan +RMVname(20): ToppanBunkyuMincho-Regular.otf + +#Name: ToppanBunkyuMinchoPr6N-Regular +#Class: Japan +#RMVname(10): ToppanBunkyuMinchoPr6N-Regular.otf + +Name: ToppanBunkyuGothicPr6N-DB +Class: Japan +RMVname(20): ToppanBunkyuGothic.ttc(0) +RMVname(10): ToppanBunkyuGothicPr6N.ttc(0) + +Name: ToppanBunkyuGothicPr6N-Regular +Class: Japan +RMVname(20): ToppanBunkyuGothic.ttc(1) +RMVname(10): ToppanBunkyuGothicPr6N.ttc(1) + +Name: ToppanBunkyuMidashiMincho-ExtraBold +PSName: ToppanBunkyuMidashiMinchoStdN-ExtraBold +Class: Japan +RMVname(20): ToppanBunkyuMidashiMincho-ExtraBold.otf + +#Name: ToppanBunkyuMidashiMinchoStdN-ExtraBold +#Class: Japan +#RMVname(10): ToppanBunkyuMidashiMinchoStdN-ExtraBold.otf + +Name: ToppanBunkyuMidashiGothic-ExtraBold +PSName: ToppanBunkyuMidashiGothicStdN-ExtraBold +Class: Japan +RMVname(20): ToppanBunkyuMidashiGothic-ExtraBold.otf + +#Name: ToppanBunkyuMidashiGothicStdN-ExtraBold +#Class: Japan +#RMVname(10): ToppanBunkyuMidashiGothicStdN-ExtraBold.otf + +### SIMPLIFIED/TRADITIONAL CHINESE ### + +# Hiragino chinese + +Name: HiraginoSansGB-W3 +Class: GB +Provides(50): STHeiti-Light +OTFname(20): Hiragino Sans GB W3.otf +OTFname(10): HiraginoSansGB-W3.otf +RMVname(30): Hiragino Sans GB W3.ttc(0) +RMVname(28): HiraginoSansGB-W3.ttc(0) +RMVname(40): Hiragino Sans GB.ttc(0) +RMVname(38): HiraginoSansGB.ttc(0) + +Name: HiraginoSansGB-W6 +Class: GB +Provides(50): STHeiti-Regular +OTFname(20): Hiragino Sans GB W6.otf +OTFname(10): HiraginoSansGB-W6.otf +RMVname(30): Hiragino Sans GB W6.ttc(0) +RMVname(28): HiraginoSansGB-W6.ttc(0) +RMVname(40): Hiragino Sans GB.ttc(2) +RMVname(38): HiraginoSansGB.ttc(2) + +Name: HiraginoSansCNS-W3 +Class: CNS +RMVname(30): Hiragino Sans CNS.ttc(0) +RMVname(29): Hiragino_Sans_CNS.ttc(0) +RMVname(28): HiraginoSansCNS.ttc(0) + +Name: HiraginoSansCNS-W6 +Class: CNS +RMVname(30): Hiragino Sans CNS.ttc(1) +RMVname(29): Hiragino_Sans_CNS.ttc(1) +RMVname(28): HiraginoSansCNS.ttc(1) + +# Changzhou SinoType + +Name: STSong +Class: GB +#Provides(??): STSong-Light # fails +#Provides(??): STSong-Regular # fails +TTFname(10): STSong.ttf +TTFname(11): STSONG.TTF +TTFname(20): 华文宋体.ttf +RMVname(30): Songti.ttc(4) +RMVname(39): Songti-mountainlion.ttc(3) +RMVname(40): 宋体.ttc(3) + +Name: STKaiti +Class: GB +#Provides(??): STKaiti-Regular # fails +TTFname(10): STKaiti.ttf +TTFname(11): STKAITI.TTF +TTFname(20): 华文楷体.ttf +RMVname(30): Kaiti.ttc(1) +RMVname(39): Kaiti-mountainlion.ttc(3) +RMVname(40): 楷体.ttc(3) + +Name: STKaiti-Adobe-CNS1 +Class: CNS +#Provides(??): MKai-Medium # fails +TTFname(10): STKaiti.ttf +TTFname(11): STKAITI.TTF +TTFname(20): 华文楷体.ttf +RMVname(30): Kaiti.ttc(1) +RMVname(39): Kaiti-mountainlion.ttc(3) +RMVname(40): 楷体.ttc(3) + +Name: STSongti-SC-Black +Class: GB +RMVname(30): Songti.ttc(0) +RMVname(39): Songti-mountainlion.ttc(0) +RMVname(40): 宋体.ttc(0) + +Name: STSongti-SC-Bold +Class: GB +RMVname(30): Songti.ttc(1) +RMVname(39): Songti-mountainlion.ttc(1) +RMVname(40): 宋体.ttc(1) + +Name: STSongti-TC-Bold +Class: CNS +RMVname(30): Songti.ttc(2) + +Name: STSongti-SC-Light +Class: GB +RMVname(30): Songti.ttc(3) +RMVname(39): Songti-mountainlion.ttc(2) +RMVname(40): 宋体.ttc(2) + +Name: STSongti-TC-Light +Class: CNS +RMVname(30): Songti.ttc(5) + +Name: STSongti-SC-Regular +Class: GB +RMVname(30): Songti.ttc(6) +RMVname(39): Songti-mountainlion.ttc(4) +RMVname(40): 宋体.ttc(4) + +Name: STSongti-TC-Regular +Class: CNS +RMVname(30): Songti.ttc(7) + +Name: STKaitiSC-Regular +Class: GB +RMVname(30): Kaiti.ttc(0) + +Name: STKaitiTC-Regular +Class: CNS +RMVname(30): Kaiti.ttc(2) + +Name: STKaitiSC-Bold +Class: GB +RMVname(30): Kaiti.ttc(3) + +Name: STKaitiTC-Bold +Class: CNS +RMVname(30): Kaiti.ttc(4) + +Name: STKaitiSC-Black +Class: GB +RMVname(30): Kaiti.ttc(5) + +Name: STKaitiTC-Black +Class: CNS +RMVname(30): Kaiti.ttc(6) + +Name: STKaiti-SC-Black +Class: GB +RMVname(30): Kaiti.ttc(0) +RMVname(39): Kaiti-mountainlion.ttc(0) +RMVname(40): 楷体.ttc(0) + +Name: STKaiti-SC-Bold +Class: GB +RMVname(30): Kaiti.ttc(1) +RMVname(39): Kaiti-mountainlion.ttc(1) +RMVname(40): 楷体.ttc(1) + +Name: STKaiTi-TC-Bold +Class: CNS +RMVname(30): Kaiti.ttc(2) + +Name: STKaiti-SC-Regular +Class: GB +RMVname(30): Kaiti.ttc(3) +RMVname(39): Kaiti-mountainlion.ttc(2) +RMVname(40): 楷体.ttc(2) + +Name: STKaiTi-TC-Regular +Class: CNS +RMVname(30): Kaiti.ttc(5) + +Name: STBaoliSC-Regular +Class: GB +RMVname(30): Baoli.ttc(0) + +Name: STBaoliTC-Regular +Class: CNS +RMVname(30): Baoli.ttc(1) + +Name: STBaoli-SC-Regular +Class: GB +RMVname(30): Baoli.ttc(0) + +Name: STLibianSC-Regular +Class: GB +RMVname(30): Libian.ttc(0) + +Name: STLibianTC-Regular +Class: CNS +RMVname(30): Libian.ttc(1) + +Name: STLibian-SC-Regular +Class: GB +RMVname(30): Libian.ttc(0) + +Name: STXingkaiSC-Bold +Class: GB +RMVname(30): Xingkai.ttc(0) + +Name: STXingkaiTC-Bold +Class: CNS +RMVname(30): Xingkai.ttc(1) + +Name: STXingkaiSC-Light +Class: GB +RMVname(30): Xingkai.ttc(2) + +Name: STXingkaiTC-Light +Class: CNS +RMVname(30): Xingkai.ttc(3) + +Name: STXingkai-SC-Bold +Class: GB +RMVname(30): Xingkai.ttc(0) + +Name: STXingkai-SC-Light +Class: GB +RMVname(30): Xingkai.ttc(1) + +Name: STYuanti-SC-Bold +Class: GB +RMVname(30): Yuanti.ttc(0) + +Name: STYuanti-TC-Bold +Class: CNS +RMVname(30): Yuanti.ttc(1) + +Name: STYuanti-SC-Light +Class: GB +RMVname(30): Yuanti.ttc(2) + +Name: STYuanti-TC-Light +Class: CNS +RMVname(30): Yuanti.ttc(3) + +Name: STYuanti-SC-Regular +Class: GB +RMVname(30): Yuanti.ttc(4) + +Name: STYuanti-TC-Regular +Class: CNS +RMVname(30): Yuanti.ttc(5) + diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-microsoft.dat b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-microsoft.dat new file mode 100644 index 00000000000..19e70596ec0 --- /dev/null +++ b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-microsoft.dat @@ -0,0 +1,256 @@ +# Microsoft Windows, Windows/Mac Office fonts + +### JAPANESE ### + +# Note about Windows: +# MSMINCHO.TTC +# MSGOTHIC.TTC +# are bundled with Windows XP. +# msmincho.ttc +# msgothic.ttc +# are bundled with Windows Vista or later versions. +# meiryo.ttc +# meiryob.ttc +# are bundled with Windows Vista or later versions, +# and "Japanese ClearType fonts for Windows XP". + +# Note about MSOffice: +# MS Mincho.ttf +# MS Gothic.ttf +# Meiryo.ttf +# Meiryo Bold.ttf +# Meiryo Bold Italic.ttf +# Meiryo Italic.ttf +# are bundled with Office for Mac 2011. +# msmincho.ttc +# msgothic.ttc +# Meiryo.ttf +# MeiryoBold.ttf +# MeiryoBoldItalic.ttf +# MeiryoItalic.ttf +# are bundled with Office for Mac 2016. + +# [TODO] Check about HG* fonts, and move Chinese/Korean fonts + +Name: MS-Mincho +Class: Japan +Provides(95): Ryumin-Light +Provides(95): RyuminPro-Light +Provides(95): HiraMinProN-W3 +Provides(95): HiraMinPro-W3 +Provides(95): FutoMinA101-Bold +Provides(95): FutoMinA101Pro-Bold +Provides(95): HiraMinProN-W6 +Provides(95): HiraMinPro-W6 +Provides(95): MidashiMin-MA31 +Provides(95): MidashiMinPro-MA31 +TTFname(50): MS Mincho.ttf +TTFname(30): MS-Mincho.ttf +TTCname(20): msmincho.ttc(0) + +Name: MS-Gothic +Class: Japan +Provides(95): GothicBBB-Medium +Provides(95): GothicBBBPro-Medium +Provides(95): HiraKakuProN-W3 +Provides(95): HiraKakuPro-W3 +Provides(95): FutoGoB101-Bold +Provides(95): FutoGoB101Pro-Bold +Provides(95): HiraKakuProN-W6 +Provides(95): HiraKakuPro-W6 +Provides(95): MidashiGo-MB31 +Provides(95): MidashiGoPro-MB31 +Provides(95): HiraKakuStdN-W8 +Provides(95): HiraKakuStd-W8 +Provides(95): Jun101-Light +Provides(95): Jun101Pro-Light +Provides(95): HiraMaruProN-W4 +Provides(95): HiraMaruPro-W4 +TTFname(50): MS Gothic.ttf +TTFname(30): MS-Gothic.ttf +TTCname(20): msgothic.ttc(0) + +Name: MS-PMincho +Class: Japan +TTFname(50): MS PMincho.ttf +TTFname(30): MS-PMincho.ttf +TTCname(20): msmincho.ttc(1) + +Name: MS-PGothic +Class: Japan +TTFname(50): MS PGothic.ttf +TTFname(30): MS-PGothic.ttf +TTCname(20): msgothic.ttc(1) + +Name: MS-UIGothic +Class: Japan +TTCname(20): msgothic.ttc(2) + +Name: Meiryo +Class: Japan +TTFname(50): Meiryo.ttf +TTCname(20): meiryo.ttc(0) + +Name: Meiryo-Bold +Class: Japan +TTFname(50): Meiryo Bold.ttf +TTFname(40): MeiryoBold.ttf +TTFname(30): Meiryo-Bold.ttf +TTCname(20): meiryob.ttc(0) + +Name: Meiryo-BoldItalic +Class: Japan +TTFname(50): Meiryo Bold Italic.ttf +TTFname(40): MeiryoBoldItalic.ttf +TTFname(30): Meiryo-BoldItalic.ttf +TTCname(20): meiryob.ttc(1) + +Name: Meiryo-Italic +Class: Japan +TTFname(50): Meiryo Italic.ttf +TTFname(40): MeiryoItalic.ttf +TTFname(30): Meiryo-Italic.ttf +TTCname(20): meiryo.ttc(1) + +Name: MeiryoUI +Class: Japan +TTCname(20): meiryo.ttc(2) + +Name: MeiryoUI-Bold +Class: Japan +TTCname(20): meiryob.ttc(2) + +Name: MeiryoUI-BoldItalic +Class: Japan +TTCname(20): meiryob.ttc(3) + +Name: MeiryoUI-Italic +Class: Japan +TTCname(20): meiryo.ttc(3) + +Name: HGGothicE +Class: Japan +TTCname(50): HGRGE.ttc(0) +TTCname(20): HGRGE.TTC(0) + +Name: HGPGothicE +Class: Japan +TTCname(50): HGRGE.ttc(1) +TTCname(20): HGRGE.TTC(1) + +Name: HGSGothicE +Class: Japan +TTCname(50): HGRGE.ttc(2) +TTCname(20): HGRGE.TTC(2) + +Name: HGGothicM +Class: Japan +TTCname(20): HGRGM.TTC(0) + +Name: HGPGothicM +Class: Japan +TTCname(20): HGRGM.TTC(1) + +Name: HGSGothicM +Class: Japan +TTCname(20): HGRGM.TTC(2) + +Name: HGMinchoE +Class: Japan +TTCname(50): HGRME.ttc(0) +TTCname(20): HGRME.TTC(0) + +Name: HGPMinchoE +Class: Japan +TTCname(50): HGRME.ttc(1) +TTCname(20): HGRME.TTC(2) + +Name: HGSMinchoE +Class: Japan +TTCname(50): HGRME.ttc(2) +TTCname(20): HGRME.TTC(2) + +Name: HGMinchoB +Class: Japan +TTCname(20): HGRMB.TTC(0) + +Name: HGPMinchoB +Class: Japan +TTCname(20): HGRMB.TTC(1) + +Name: HGSMinchoB +Class: Japan +TTCname(20): HGRMB.TTC(2) + +Name: HGSoeiKakugothicUB +Class: Japan +TTCname(50): HGRSGU.ttc(0) +TTCname(20): HGRSGU.TTC(0) + +Name: HGPSoeiKakugothicUB +Class: Japan +TTCname(50): HGRSGU.ttc(1) +TTCname(20): HGRSGU.TTC(1) + +Name: HGSSoeiKakugothicUB +Class: Japan +TTCname(50): HGRSGU.ttc(2) +TTCname(20): HGRSGU.TTC(2) + +Name: HGSoeiKakupoptai +Class: Japan +TTCname(20): HGRPP1.TTC(0) + +Name: HGPSoeiKakupoptai +Class: Japan +TTCname(20): HGRPP1.TTC(1) + +Name: HGSSoeiKakupoptai +Class: Japan +TTCname(20): HGRPP1.TTC(2) + +Name: HGSoeiPresenceEB +Class: Japan +TTCname(20): HGRPRE.TTC(0) + +Name: HGPSoeiPresenceEB +Class: Japan +TTCname(20): HGRPRE.TTC(1) + +Name: HGSSoeiPresenceEB +Class: Japan +TTCname(20): HGRPRE.TTC(2) + +Name: HGKyokashotai +Class: Japan +TTCname(20): HGRKK.TTC(0) + +Name: HGPKyokashotai +Class: Japan +TTCname(20): HGRKK.TTC(1) + +Name: HGSKyokashotai +Class: Japan +TTCname(20): HGRKK.TTC(2) + +Name: HGGyoshotai +Class: Japan +TTCname(20): HGRGY.TTC(0) + +Name: HGPGyoshotai +Class: Japan +TTCname(20): HGRGY.TTC(1) + +Name: HGSGyoshotai +Class: Japan +TTCname(20): HGRGY.TTC(2) + +Name: HGMaruGothicMPRO +Class: Japan +TTFname(40): HGRSMP.ttf +TTFname(20): HGRSMP.TTF + +Name: HGSeikaishotaiPRO +Class: Japan +TTFname(20): HGRSKP.TTF + diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-mogamobo.dat b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-mogamobo.dat new file mode 100644 index 00000000000..bddebd45e15 --- /dev/null +++ b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-mogamobo.dat @@ -0,0 +1,200 @@ +# Moga-Mobo from Y.Oz Vox (free) + +### JAPANESE ### + +Name: MogaMincho-Regular +Class: Japan +Provides(110): Ryumin-Light +Provides(110): RyuminPro-Light +Provides(110): HiraMinProN-W3 +Provides(110): HiraMinPro-W3 +TTCname: mogam.ttc(0) + +Name: MogaExMincho-Regular +Class: Japan +Provides(100): Ryumin-Light +Provides(100): RyuminPro-Light +Provides(100): HiraMinProN-W3 +Provides(100): HiraMinPro-W3 +TTCname: mogam.ttc(1) + +Name: MogaExMincho-Italic +Class: Japan +TTCname: mogam.ttc(2) + +Name: Moga90Mincho-Regular +Class: Japan +TTCname: mogam.ttc(3) + +Name: MogaEx90Mincho-Regular +Class: Japan +TTCname: mogam.ttc(4) + +Name: MogaEx90Mincho-Italic +Class: Japan +TTCname: mogam.ttc(5) + +Name: MogaMincho-Bold +Class: Japan +Provides(110): FutoMinA101-Bold +Provides(110): FutoMinA101Pro-Bold +Provides(110): HiraMinProN-W6 +Provides(110): HiraMinPro-W6 +Provides(110): MidashiMin-MA31 +Provides(110): MidashiMinPro-MA31 +TTCname: mogamb.ttc(0) + +Name: MogaExMincho-Bold +Class: Japan +Provides(100): FutoMinA101-Bold +Provides(100): FutoMinA101Pro-Bold +Provides(100): HiraMinProN-W6 +Provides(100): HiraMinPro-W6 +Provides(100): MidashiMin-MA31 +Provides(100): MidashiMinPro-MA31 +TTCname: mogamb.ttc(1) + +Name: Moga90Mincho-Bold +Class: Japan +TTCname: mogamb.ttc(2) + +Name: MogaEx90Mincho-Bold +Class: Japan +TTCname: mogamb.ttc(3) + +Name: MogaHMincho-Regular +Class: Japan +TTCname: mogahm.ttc(0) + +Name: MogaExHMincho-Regular +Class: Japan +TTCname: mogahm.ttc(1) + +Name: MogaExHMincho-Italic +Class: Japan +TTCname: mogahm.ttc(2) + +Name: Moga90HMincho-Regular +Class: Japan +TTCname: mogahm.ttc(3) + +Name: MogaEx90HMincho-Regular +Class: Japan +TTCname: mogahm.ttc(4) + +Name: MogaEx90HMincho-Italic +Class: Japan +TTCname: mogahm.ttc(5) + +Name: MogaHMincho-Bold +Class: Japan +TTCname: mogahmb.ttc(0) + +Name: MogaExHMincho-Bold +Class: Japan +TTCname: mogahmb.ttc(1) + +Name: Moga90HMincho-Bold +Class: Japan +TTCname: mogahmb.ttc(2) + +Name: MogaEx90HMincho-Bold +Class: Japan +TTCname: mogahmb.ttc(3) + +Name: MogaGothic-Regular +Class: Japan +Provides(110): GothicBBB-Medium +Provides(110): GothicBBBPro-Medium +Provides(110): HiraKakuProN-W3 +Provides(110): HiraKakuPro-W3 +TTCname: mogag.ttc(0) + +Name: MogaExGothic-Regular +Class: Japan +Provides(100): GothicBBB-Medium +Provides(100): GothicBBBPro-Medium +Provides(100): HiraKakuProN-W3 +Provides(100): HiraKakuPro-W3 +TTCname: mogag.ttc(1) + +Name: Moga90Gothic-Regular +Class: Japan +TTCname: mogag.ttc(2) + +Name: MogaEx90Gothic-Regular +Class: Japan +TTCname: mogag.ttc(3) + +Name: MogaGothic-Bold +Class: Japan +Provides(110): FutoGoB101-Bold +Provides(110): FutoGoB101Pro-Bold +Provides(110): HiraKakuProN-W6 +Provides(110): HiraKakuPro-W6 +Provides(110): MidashiGo-MB31 +Provides(110): MidashiGoPro-MB31 +Provides(110): HiraKakuStdN-W8 +Provides(110): HiraKakuStd-W8 +TTCname: mogagb.ttc(0) + +Name: MogaExGothic-Bold +Class: Japan +Provides(100): FutoGoB101-Bold +Provides(100): FutoGoB101Pro-Bold +Provides(100): HiraKakuProN-W6 +Provides(100): HiraKakuPro-W6 +Provides(100): MidashiGo-MB31 +Provides(100): MidashiGoPro-MB31 +Provides(100): HiraKakuStdN-W8 +Provides(100): HiraKakuStd-W8 +TTCname: mogagb.ttc(1) + +Name: Moga90Gothic-Bold +Class: Japan +TTCname: mogagb.ttc(2) + +Name: MogaEx90Gothic-Bold +Class: Japan +TTCname: mogagb.ttc(3) + +Name: MoboGothic-Regular +Class: Japan +Provides(110): Jun101-Light +Provides(110): Jun101Pro-Light +Provides(110): HiraMaruProN-W4 +Provides(110): HiraMaruPro-W4 +TTCname: mobog.ttc(0) + +Name: MoboExGothic-Regular +Class: Japan +Provides(100): Jun101-Light +Provides(100): Jun101Pro-Light +Provides(100): HiraMaruProN-W4 +Provides(100): HiraMaruPro-W4 +TTCname: mobog.ttc(1) + +Name: Mobo90Gothic-Regular +Class: Japan +TTCname: mobog.ttc(2) + +Name: MoboEx90Gothic-Regular +Class: Japan +TTCname: mobog.ttc(3) + +Name: MoboGothic-Bold +Class: Japan +TTCname: mobogb.ttc(0) + +Name: MoboExGothic-Bold +Class: Japan +TTCname: mobogb.ttc(1) + +Name: Mobo90Gothic-Bold +Class: Japan +TTCname: mobogb.ttc(2) + +Name: MoboEx90Gothic-Bold +Class: Japan +TTCname: mobogb.ttc(3) + diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-morisawa.dat b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-morisawa.dat new file mode 100644 index 00000000000..740c7b683cb --- /dev/null +++ b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-morisawa.dat @@ -0,0 +1,705 @@ +# Morisawa standard sets + +### JAPANESE ### + +# Some of the {Pr6N,Pro} variants are used in morisawa (ptex-fontmaps) +# or in moriprop (S. Saito). + +# Note: +# A-OTF-Jun101Pr6N-Light appeared in otf-(up-)morisawa-pr6n.map +# which is older than jfontmaps 20140301.0 +# however, such a Pr6N variant never existed, so removed +# https://www.tug.org/pipermail/tex-live/2014-February/034855.html + +Name: A-OTF-RyuminPr6N-Light +PSName: RyuminPr6N-Light +Class: Japan +Provides(10): Ryumin-Light +Provides(10): RyuminPro-Light +Provides(10): HiraMinProN-W3 +Provides(10): HiraMinPro-W3 +OTFname: A-OTF-RyuminPr6N-Light.otf + +Name: A-OTF-RyuminPr6N-Regular +PSName: RyuminPr6N-Regular +Class: Japan +Provides(10): Ryumin-Regular +OTFname: A-OTF-RyuminPr6N-Regular.otf + +Name: A-OTF-RyuminPr6N-Medium +PSName: RyuminPr6N-Medium +Class: Japan +Provides(10): Ryumin-Medium +OTFname: A-OTF-RyuminPr6N-Medium.otf + +Name: A-OTF-RyuminPr6N-Bold +PSName: RyuminPr6N-Bold +Class: Japan +Provides(10): Ryumin-Bold +OTFname: A-OTF-RyuminPr6N-Bold.otf + +Name: A-OTF-RyuminPr6N-ExBold +PSName: RyuminPr6N-ExBold +Class: Japan +Provides(10): Ryumin-ExBold +OTFname: A-OTF-RyuminPr6N-ExBold.otf + +Name: A-OTF-RyuminPr6N-Heavy +PSName: RyuminPr6N-Heavy +Class: Japan +Provides(10): Ryumin-Heavy +OTFname: A-OTF-RyuminPr6N-Heavy.otf + +Name: A-OTF-RyuminPr6N-ExHeavy +PSName: RyuminPr6N-ExHeavy +Class: Japan +Provides(10): Ryumin-ExHeavy +OTFname: A-OTF-RyuminPr6N-ExHeavy.otf + +Name: A-OTF-RyuminPr6N-Ultra +PSName: RyuminPr6N-Ultra +Class: Japan +Provides(10): Ryumin-Ultra +OTFname: A-OTF-RyuminPr6N-Ultra.otf + +Name: A-OTF-RyuminPr6-Light +PSName: RyuminPr6-Light +Class: Japan +Provides(15): Ryumin-Light +Provides(15): HiraMinPro-W3 +OTFname: A-OTF-RyuminPr6-Light.otf + +Name: A-OTF-RyuminPr6-Regular +PSName: RyuminPr6-Regular +Class: Japan +Provides(15): Ryumin-Regular +OTFname: A-OTF-RyuminPr6-Regular.otf + +Name: A-OTF-RyuminPr6-Medium +PSName: RyuminPr6-Medium +Class: Japan +Provides(15): Ryumin-Medium +OTFname: A-OTF-RyuminPr6-Medium.otf + +Name: A-OTF-RyuminPr6-Bold +PSName: RyuminPr6-Bold +Class: Japan +Provides(15): Ryumin-Bold +OTFname: A-OTF-RyuminPr6-Bold.otf + +Name: A-OTF-RyuminPr6-ExBold +PSName: RyuminPr6-ExBold +Class: Japan +Provides(15): Ryumin-ExBold +OTFname: A-OTF-RyuminPr6-ExBold.otf + +Name: A-OTF-RyuminPr6-Heavy +PSName: RyuminPr6-Heavy +Class: Japan +Provides(15): Ryumin-Heavy +OTFname: A-OTF-RyuminPr6-Heavy.otf + +Name: A-OTF-RyuminPr6-ExHeavy +PSName: RyuminPr6-ExHeavy +Class: Japan +Provides(15): Ryumin-ExHeavy +OTFname: A-OTF-RyuminPr6-ExHeavy.otf + +Name: A-OTF-RyuminPr6-Ultra +PSName: RyuminPr6-Ultra +Class: Japan +Provides(15): Ryumin-Ultra +OTFname: A-OTF-RyuminPr6-Ultra.otf + +Name: A-OTF-RyuminPr5-Light +PSName: RyuminPr5-Light +Class: Japan +Provides(18): Ryumin-Light +Provides(18): HiraMinPro-W3 +OTFname: A-OTF-RyuminPr5-Light.otf + +Name: A-OTF-RyuminPr5-Regular +PSName: RyuminPr5-Regular +Class: Japan +Provides(18): Ryumin-Regular +OTFname: A-OTF-RyuminPr5-Regular.otf + +Name: A-OTF-RyuminPr5-Medium +PSName: RyuminPr5-Medium +Class: Japan +Provides(18): Ryumin-Medium +OTFname: A-OTF-RyuminPr5-Medium.otf + +Name: A-OTF-RyuminPr5-Bold +PSName: RyuminPr5-Bold +Class: Japan +Provides(18): Ryumin-Bold +OTFname: A-OTF-RyuminPr5-Bold.otf + +Name: A-OTF-RyuminPr5-ExBold +PSName: RyuminPr5-ExBold +Class: Japan +Provides(18): Ryumin-ExBold +OTFname: A-OTF-RyuminPr5-ExBold.otf + +Name: A-OTF-RyuminPr5-Heavy +PSName: RyuminPr5-Heavy +Class: Japan +Provides(18): Ryumin-Heavy +OTFname: A-OTF-RyuminPr5-Heavy.otf + +Name: A-OTF-RyuminPr5-ExHeavy +PSName: RyuminPr5-ExHeavy +Class: Japan +Provides(18): Ryumin-ExHeavy +OTFname: A-OTF-RyuminPr5-ExHeavy.otf + +Name: A-OTF-RyuminPr5-Ultra +PSName: RyuminPr5-Ultra +Class: Japan +Provides(18): Ryumin-Ultra +OTFname: A-OTF-RyuminPr5-Ultra.otf + +Name: A-OTF-RyuminPro-Light +PSName: RyuminPro-Light +Class: Japan +Provides(20): Ryumin-Light +Provides(20): HiraMinPro-W3 +OTFname: A-OTF-RyuminPro-Light.otf + +Name: A-OTF-RyuminPro-Regular +PSName: RyuminPro-Regular +Class: Japan +Provides(20): Ryumin-Regular +OTFname: A-OTF-RyuminPro-Regular.otf + +Name: A-OTF-RyuminPro-Medium +PSName: RyuminPro-Medium +Class: Japan +Provides(20): Ryumin-Medium +OTFname: A-OTF-RyuminPro-Medium.otf + +Name: A-OTF-RyuminPro-Bold +PSName: RyuminPro-Bold +Class: Japan +Provides(20): Ryumin-Bold +OTFname: A-OTF-RyuminPro-Bold.otf + +Name: A-OTF-RyuminPro-ExBold +PSName: RyuminPro-ExBold +Class: Japan +Provides(20): Ryumin-ExBold +OTFname: A-OTF-RyuminPro-ExBold.otf + +Name: A-OTF-RyuminPro-Heavy +PSName: RyuminPro-Heavy +Class: Japan +Provides(20): Ryumin-Heavy +OTFname: A-OTF-RyuminPro-Heavy.otf + +Name: A-OTF-RyuminPro-ExHeavy +PSName: RyuminPro-ExHeavy +Class: Japan +Provides(20): Ryumin-ExHeavy +OTFname: A-OTF-RyuminPro-ExHeavy.otf + +Name: A-OTF-RyuminPro-Ultra +PSName: RyuminPro-Ultra +Class: Japan +Provides(20): Ryumin-Ultra +OTFname: A-OTF-RyuminPro-Ultra.otf + +Name: A-OTF-FutoMinA101Pr6N-Bold +PSName: FutoMinA101Pr6N-Bold +Class: Japan +Provides(10): FutoMinA101-Bold +Provides(10): FutoMinA101Pro-Bold +Provides(10): HiraMinProN-W6 +Provides(10): HiraMinPro-W6 +OTFname: A-OTF-FutoMinA101Pr6N-Bold.otf + +Name: A-OTF-FutoMinA101Pr6-Bold +PSName: FutoMinA101Pr6-Bold +Class: Japan +Provides(15): FutoMinA101-Bold +Provides(15): HiraMinPro-W6 +OTFname: A-OTF-FutoMinA101Pr6-Bold.otf + +Name: A-OTF-FutoMinA101Pr5-Bold +PSName: FutoMinA101Pr5-Bold +Class: Japan +Provides(18): FutoMinA101-Bold +Provides(18): HiraMinPro-W6 +OTFname: A-OTF-FutoMinA101Pr5-Bold.otf + +Name: A-OTF-FutoMinA101Pro-Bold +PSName: FutoMinA101Pro-Bold +Class: Japan +Provides(20): FutoMinA101-Bold +Provides(20): HiraMinPro-W6 +OTFname: A-OTF-FutoMinA101Pro-Bold.otf + +Name: A-OTF-GothicBBBPr6N-Medium +PSName: GothicBBBPr6N-Medium +Class: Japan +Provides(10): GothicBBB-Medium +Provides(10): GothicBBBPro-Medium +Provides(10): HiraKakuProN-W3 +Provides(10): HiraKakuPro-W3 +OTFname: A-OTF-GothicBBBPr6N-Medium.otf + +Name: A-OTF-GothicBBBPr6-Medium +PSName: GothicBBBPr6-Medium +Class: Japan +Provides(15): GothicBBB-Medium +Provides(15): HiraKakuPro-W3 +OTFname: A-OTF-GothicBBBPr6-Medium.otf + +Name: A-OTF-GothicBBBPr5-Medium +PSName: GothicBBBPr5-Medium +Class: Japan +Provides(18): GothicBBB-Medium +Provides(18): HiraKakuPro-W3 +OTFname: A-OTF-GothicBBBPr5-Medium.otf + +Name: A-OTF-GothicBBBPro-Medium +PSName: GothicBBBPro-Medium +Class: Japan +Provides(20): GothicBBB-Medium +Provides(20): HiraKakuPro-W3 +OTFname: A-OTF-GothicBBBPro-Medium.otf + +Name: A-OTF-FutoGoB101Pr6N-Bold +PSName: FutoGoB101Pr6N-Bold +Class: Japan +Provides(10): FutoGoB101-Bold +Provides(10): FutoGoB101Pro-Bold +Provides(10): HiraKakuProN-W6 +Provides(10): HiraKakuPro-W6 +OTFname: A-OTF-FutoGoB101Pr6N-Bold.otf + +Name: A-OTF-FutoGoB101Pr6-Bold +PSName: FutoGoB101Pr6-Bold +Class: Japan +Provides(15): FutoGoB101-Bold +Provides(15): HiraKakuPro-W6 +OTFname: A-OTF-FutoGoB101Pr6-Bold.otf + +Name: A-OTF-FutoGoB101Pr5-Bold +PSName: FutoGoB101Pr5-Bold +Class: Japan +Provides(18): FutoGoB101-Bold +Provides(18): HiraKakuPro-W6 +OTFname: A-OTF-FutoGoB101Pr5-Bold.otf + +Name: A-OTF-FutoGoB101Pro-Bold +PSName: FutoGoB101Pro-Bold +Class: Japan +Provides(20): FutoGoB101-Bold +Provides(20): HiraKakuPro-W6 +OTFname: A-OTF-FutoGoB101Pro-Bold.otf + +Name: A-OTF-MidashiGoPr6N-MB31 +PSName: MidashiGoPr6N-MB31 +Class: Japan +Provides(10): MidashiGo-MB31 +Provides(10): MidashiGoPro-MB31 +Provides(10): HiraKakuStdN-W8 +Provides(10): HiraKakuStd-W8 +OTFname: A-OTF-MidashiGoPr6N-MB31.otf + +Name: A-OTF-MidashiGoPr6-MB31 +PSName: MidashiGoPr6-MB31 +Class: Japan +Provides(15): MidashiGo-MB31 +Provides(15): HiraKakuStd-W8 +OTFname: A-OTF-MidashiGoPr6-MB31.otf + +Name: A-OTF-MidashiGoPr5-MB31 +PSName: MidashiGoPr5-MB31 +Class: Japan +Provides(18): MidashiGo-MB31 +Provides(18): HiraKakuStd-W8 +OTFname: A-OTF-MidashiGoPr5-MB31.otf + +Name: A-OTF-MidashiGoPro-MB31 +PSName: MidashiGoPro-MB31 +Class: Japan +Provides(20): MidashiGo-MB31 +Provides(20): HiraKakuStd-W8 +OTFname: A-OTF-MidashiGoPro-MB31.otf + +Name: A-OTF-Jun101Pro-Light +PSName: Jun101Pro-Light +Class: Japan +Provides(20): Jun101-Light +Provides(20): HiraMaruPro-W4 +OTFname: A-OTF-Jun101Pro-Light.otf + +Name: A-OTF-Jun201Pro-Regular +PSName: Jun201Pro-Regular +Class: Japan +Provides(20): Jun201-Regular +OTFname: A-OTF-Jun201Pro-Regular.otf + +Name: A-OTF-Jun34Pro-Medium +PSName: Jun34Pro-Medium +Class: Japan +Provides(20): Jun34-Medium +OTFname: A-OTF-Jun34Pro-Medium.otf + +Name: A-OTF-Jun501Pro-Bold +PSName: Jun501Pro-Bold +Class: Japan +Provides(20): Jun501-Bold +OTFname: A-OTF-Jun501Pro-Bold.otf + +Name: A-OTF-ShinGoPr6N-ExLight +PSName: ShinGoPr6N-ExLight +Class: Japan +Provides(10): ShinGo-ExLight +OTFname: A-OTF-ShinGoPr6N-ExLight.otf + +Name: A-OTF-ShinGoPr6N-Light +PSName: ShinGoPr6N-Light +Class: Japan +Provides(10): ShinGo-Light +OTFname: A-OTF-ShinGoPr6N-Light.otf + +Name: A-OTF-ShinGoPr6N-Regular +PSName: ShinGoPr6N-Regular +Class: Japan +Provides(10): ShinGo-Regular +OTFname: A-OTF-ShinGoPr6N-Regular.otf + +Name: A-OTF-ShinGoPr6N-Medium +PSName: ShinGoPr6N-Medium +Class: Japan +Provides(10): ShinGo-Medium +OTFname: A-OTF-ShinGoPr6N-Medium.otf + +Name: A-OTF-ShinGoPr6N-DeBold +PSName: ShinGoPr6N-DeBold +Class: Japan +Provides(10): ShinGo-DeBold +OTFname: A-OTF-ShinGoPr6N-DeBold.otf + +Name: A-OTF-ShinGoPr6N-Bold +PSName: ShinGoPr6N-Bold +Class: Japan +Provides(10): ShinGo-Bold +OTFname: A-OTF-ShinGoPr6N-Bold.otf + +Name: A-OTF-ShinGoPr6N-Heavy +PSName: ShinGoPr6N-Heavy +Class: Japan +Provides(10): ShinGo-Heavy +OTFname: A-OTF-ShinGoPr6N-Heavy.otf + +Name: A-OTF-ShinGoPr6N-Ultra +PSName: ShinGoPr6N-Ultra +Class: Japan +Provides(10): ShinGo-Ultra +OTFname: A-OTF-ShinGoPr6N-Ultra.otf + +Name: A-OTF-ShinGoPr6-ExLight +PSName: ShinGoPr6-ExLight +Class: Japan +Provides(15): ShinGo-ExLight +OTFname: A-OTF-ShinGoPr6-ExLight.otf + +Name: A-OTF-ShinGoPr6-Light +PSName: ShinGoPr6-Light +Class: Japan +Provides(15): ShinGo-Light +OTFname: A-OTF-ShinGoPr6-Light.otf + +Name: A-OTF-ShinGoPr6-Regular +PSName: ShinGoPr6-Regular +Class: Japan +Provides(15): ShinGo-Regular +OTFname: A-OTF-ShinGoPr6-Regular.otf + +Name: A-OTF-ShinGoPr6-Medium +PSName: ShinGoPr6-Medium +Class: Japan +Provides(15): ShinGo-Medium +OTFname: A-OTF-ShinGoPr6-Medium.otf + +Name: A-OTF-ShinGoPr6-DeBold +PSName: ShinGoPr6-DeBold +Class: Japan +Provides(15): ShinGo-DeBold +OTFname: A-OTF-ShinGoPr6-DeBold.otf + +Name: A-OTF-ShinGoPr6-Bold +PSName: ShinGoPr6-Bold +Class: Japan +Provides(15): ShinGo-Bold +OTFname: A-OTF-ShinGoPr6-Bold.otf + +Name: A-OTF-ShinGoPr6-Heavy +PSName: ShinGoPr6-Heavy +Class: Japan +Provides(15): ShinGo-Heavy +OTFname: A-OTF-ShinGoPr6-Heavy.otf + +Name: A-OTF-ShinGoPr6-Ultra +PSName: ShinGoPr6-Ultra +Class: Japan +Provides(15): ShinGo-Ultra +OTFname: A-OTF-ShinGoPr6-Ultra.otf + +Name: A-OTF-ShinGoPr5-ExLight +PSName: ShinGoPr5-ExLight +Class: Japan +Provides(18): ShinGo-ExLight +OTFname: A-OTF-ShinGoPr5-ExLight.otf + +Name: A-OTF-ShinGoPr5-Light +PSName: ShinGoPr5-Light +Class: Japan +Provides(18): ShinGo-Light +OTFname: A-OTF-ShinGoPr5-Light.otf + +Name: A-OTF-ShinGoPr5-Regular +PSName: ShinGoPr5-Regular +Class: Japan +Provides(18): ShinGo-Regular +OTFname: A-OTF-ShinGoPr5-Regular.otf + +Name: A-OTF-ShinGoPr5-Medium +PSName: ShinGoPr5-Medium +Class: Japan +Provides(18): ShinGo-Medium +OTFname: A-OTF-ShinGoPr5-Medium.otf + +Name: A-OTF-ShinGoPr5-DeBold +PSName: ShinGoPr5-DeBold +Class: Japan +Provides(18): ShinGo-DeBold +OTFname: A-OTF-ShinGoPr5-DeBold.otf + +Name: A-OTF-ShinGoPr5-Bold +PSName: ShinGoPr5-Bold +Class: Japan +Provides(18): ShinGo-Bold +OTFname: A-OTF-ShinGoPr5-Bold.otf + +Name: A-OTF-ShinGoPr5-Heavy +PSName: ShinGoPr5-Heavy +Class: Japan +Provides(18): ShinGo-Heavy +OTFname: A-OTF-ShinGoPr5-Heavy.otf + +Name: A-OTF-ShinGoPr5-Ultra +PSName: ShinGoPr5-Ultra +Class: Japan +Provides(18): ShinGo-Ultra +OTFname: A-OTF-ShinGoPr5-Ultra.otf + +Name: A-OTF-ShinGoPro-ExLight +PSName: ShinGoPro-ExLight +Class: Japan +Provides(20): ShinGo-ExLight +OTFname: A-OTF-ShinGoPro-ExLight.otf + +Name: A-OTF-ShinGoPro-Light +PSName: ShinGoPro-Light +Class: Japan +Provides(20): ShinGo-Light +OTFname: A-OTF-ShinGoPro-Light.otf + +Name: A-OTF-ShinGoPro-Regular +PSName: ShinGoPro-Regular +Class: Japan +Provides(20): ShinGo-Regular +OTFname: A-OTF-ShinGoPro-Regular.otf + +Name: A-OTF-ShinGoPro-Medium +PSName: ShinGoPro-Medium +Class: Japan +Provides(20): ShinGo-Medium +OTFname: A-OTF-ShinGoPro-Medium.otf + +Name: A-OTF-ShinGoPro-DeBold +PSName: ShinGoPro-DeBold +Class: Japan +Provides(20): ShinGo-DeBold +OTFname: A-OTF-ShinGoPro-DeBold.otf + +Name: A-OTF-ShinGoPro-Bold +PSName: ShinGoPro-Bold +Class: Japan +Provides(20): ShinGo-Bold +OTFname: A-OTF-ShinGoPro-Bold.otf + +Name: A-OTF-ShinGoPro-Heavy +PSName: ShinGoPro-Heavy +Class: Japan +Provides(20): ShinGo-Heavy +OTFname: A-OTF-ShinGoPro-Heavy.otf + +Name: A-OTF-ShinGoPro-Ultra +PSName: ShinGoPro-Ultra +Class: Japan +Provides(20): ShinGo-Ultra +OTFname: A-OTF-ShinGoPro-Ultra.otf + +Name: A-OTF-ShinMGoPr6N-Light +PSName: ShinMGoPr6N-Light +Class: Japan +Provides(10): Jun101-Light +Provides(10): Jun101Pro-Light +Provides(10): HiraMaruProN-W4 +Provides(10): HiraMaruPro-W4 +Provides(10): ShinMGo-Light +OTFname: A-OTF-ShinMGoPr6N-Light.otf + +Name: A-OTF-ShinMGoPr6N-Regular +PSName: ShinMGoPr6N-Regular +Class: Japan +Provides(10): ShinMGo-Regular +OTFname: A-OTF-ShinMGoPr6N-Regular.otf + +Name: A-OTF-ShinMGoPr6N-Medium +PSName: ShinMGoPr6N-Medium +Class: Japan +Provides(10): ShinMGo-Medium +OTFname: A-OTF-ShinMGoPr6N-Medium.otf + +Name: A-OTF-ShinMGoPr6N-DeBold +PSName: ShinMGoPr6N-DeBold +Class: Japan +Provides(10): ShinMGo-DeBold +OTFname: A-OTF-ShinMGoPr6N-DeBold.otf + +Name: A-OTF-ShinMGoPr6N-Bold +PSName: ShinMGoPr6N-Bold +Class: Japan +Provides(10): ShinMGo-Bold +OTFname: A-OTF-ShinMGoPr6N-Bold.otf + +Name: A-OTF-ShinMGoPr6N-Heavy +PSName: ShinMGoPr6N-Heavy +Class: Japan +Provides(10): ShinMGo-Heavy +OTFname: A-OTF-ShinMGoPr6N-Heavy.otf + +Name: A-OTF-ShinMGoPr6N-Ultra +PSName: ShinMGoPr6N-Ultra +Class: Japan +Provides(10): ShinMGo-Ultra +OTFname: A-OTF-ShinMGoPr6N-Ultra.otf + +Name: A-OTF-ShinMGoPr6-Light +PSName: ShinMGoPr6-Light +Class: Japan +Provides(15): Jun101-Light +Provides(15): HiraMaruPro-W4 +Provides(15): ShinMGo-Light +OTFname: A-OTF-ShinMGoPr6-Light.otf + +Name: A-OTF-ShinMGoPr6-Regular +PSName: ShinMGoPr6-Regular +Class: Japan +Provides(15): ShinMGo-Regular +OTFname: A-OTF-ShinMGoPr6-Regular.otf + +Name: A-OTF-ShinMGoPr6-Medium +PSName: ShinMGoPr6-Medium +Class: Japan +Provides(15): ShinMGo-Medium +OTFname: A-OTF-ShinMGoPr6-Medium.otf + +Name: A-OTF-ShinMGoPr6-DeBold +PSName: ShinMGoPr6-DeBold +Class: Japan +Provides(15): ShinMGo-DeBold +OTFname: A-OTF-ShinMGoPr6-DeBold.otf + +Name: A-OTF-ShinMGoPr6-Bold +PSName: ShinMGoPr6-Bold +Class: Japan +Provides(15): ShinMGo-Bold +OTFname: A-OTF-ShinMGoPr6-Bold.otf + +Name: A-OTF-ShinMGoPr6-Heavy +PSName: ShinMGoPr6-Heavy +Class: Japan +Provides(15): ShinMGo-Heavy +OTFname: A-OTF-ShinMGoPr6-Heavy.otf + +Name: A-OTF-ShinMGoPr6-Ultra +PSName: ShinMGoPr6-Ultra +Class: Japan +Provides(15): ShinMGo-Ultra +OTFname: A-OTF-ShinMGoPr6-Ultra.otf + +Name: A-OTF-ShinMGoPro-Light +PSName: ShinMGoPro-Light +Class: Japan +Provides(20): ShinMGo-Light +OTFname: A-OTF-ShinMGoPro-Light.otf + +Name: A-OTF-ShinMGoPro-Regular +PSName: ShinMGoPro-Regular +Class: Japan +Provides(20): ShinMGo-Regular +OTFname: A-OTF-ShinMGoPro-Regular.otf + +Name: A-OTF-ShinMGoPro-Medium +PSName: ShinMGoPro-Medium +Class: Japan +Provides(20): ShinMGo-Medium +OTFname: A-OTF-ShinMGoPro-Medium.otf + +Name: A-OTF-ShinMGoPro-DeBold +PSName: ShinMGoPro-DeBold +Class: Japan +Provides(20): ShinMGo-DeBold +OTFname: A-OTF-ShinMGoPro-DeBold.otf + +Name: A-OTF-ShinMGoPro-Bold +PSName: ShinMGoPro-Bold +Class: Japan +Provides(20): ShinMGo-Bold +OTFname: A-OTF-ShinMGoPro-Bold.otf + +Name: A-OTF-ShinMGoPro-Heavy +PSName: ShinMGoPro-Heavy +Class: Japan +Provides(20): ShinMGo-Heavy +OTFname: A-OTF-ShinMGoPro-Heavy.otf + +Name: A-OTF-ShinMGoPro-Ultra +PSName: ShinMGoPro-Ultra +Class: Japan +Provides(20): ShinMGo-Ultra +OTFname: A-OTF-ShinMGoPro-Ultra.otf + +Name: A-OTF-MidashiMinPr6N-MA31 +PSName: MidashiMinPr6N-MA31 +Class: Japan +Provides(10): MidashiMin-MA31 +Provides(10): MidashiMinPro-MA31 +OTFname: A-OTF-MidashiMinPr6N-MA31.otf + +Name: A-OTF-MidashiMinPr6-MA31 +PSName: MidashiMinPr6-MA31 +Class: Japan +Provides(15): MidashiMin-MA31 +OTFname: A-OTF-MidashiMinPr6-MA31.otf + +Name: A-OTF-MidashiMinPr5-MA31 +PSName: MidashiMinPr5-MA31 +Class: Japan +Provides(18): MidashiMin-MA31 +OTFname: A-OTF-MidashiMinPr5-MA31.otf + +Name: A-OTF-MidashiMinPro-MA31 +PSName: MidashiMinPro-MA31 +Class: Japan +Provides(20): MidashiMin-MA31 +OTFname: A-OTF-MidashiMinPro-MA31.otf + diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-ryokana.dat b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-ryokana.dat new file mode 100644 index 00000000000..9364cc55a27 --- /dev/null +++ b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-ryokana.dat @@ -0,0 +1,141 @@ +# Ryo PlusN (Kana + Kozuka Std) and Ryo Std (Kana only) + +### JAPANESE ### + +# Note about Adobe Creative Suite: +# RyoTextStd: CS1, CS2, CS3 +# RyoTextPlusN: CS4, CS5, CS5.5 +# RyoDispStd: CS1, CS2, CS3, CS4 +# RyoDispPlusN: CS5, CS5.5 +# RyoGothicStd: CS3 +# RyoGothicPlusN: CS4, CS5, CS5.5 +# are bundled in DVD installer/data. + +Name: RyoTextPlusN-ExtraLight +Class: Japan +OTFname: RyoTextPlusN-ExtraLight.otf + +Name: RyoTextPlusN-Light +Class: Japan +OTFname: RyoTextPlusN-Light.otf + +Name: RyoTextPlusN-Regular +Class: Japan +OTFname: RyoTextPlusN-Regular.otf + +Name: RyoTextPlusN-Medium +Class: Japan +OTFname: RyoTextPlusN-Medium.otf + +Name: RyoDispPlusN-Medium +Class: Japan +OTFname: RyoDispPlusN-Medium.otf + +Name: RyoDispPlusN-SemiBold +Class: Japan +OTFname: RyoDispPlusN-SemiBold.otf + +Name: RyoDispPlusN-Bold +Class: Japan +OTFname: RyoDispPlusN-Bold.otf + +Name: RyoDispPlusN-ExtraBold +Class: Japan +OTFname: RyoDispPlusN-ExtraBold.otf + +Name: RyoDispPlusN-Heavy +Class: Japan +OTFname: RyoDispPlusN-Heavy + +Name: RyoTextStd-ExtraLight +Class: Japan +OTFname: RyoTextStd-ExtraLight.otf + +Name: RyoTextStd-Light +Class: Japan +OTFname: RyoTextStd-Light.otf + +Name: RyoTextStd-Regular +Class: Japan +OTFname: RyoTextStd-Regular.otf + +Name: RyoTextStd-Medium +Class: Japan +OTFname: RyoTextStd-Medium.otf + +Name: RyoDispStd-Medium +Class: Japan +OTFname: RyoDispStd-Medium.otf + +Name: RyoDispStd-SemiBold +Class: Japan +OTFname: RyoDispStd-SemiBold.otf + +Name: RyoDispStd-Bold +Class: Japan +OTFname: RyoDispStd-Bold.otf + +Name: RyoDispStd-ExtraBold +Class: Japan +OTFname: RyoDispStd-ExtraBold.otf + +Name: RyoDispStd-Heavy +Class: Japan +OTFname: RyoDispStd-Heavy.otf + +Name: RyoGothicPlusN-ExtraLight +Class: Japan +OTFname: RyoGothicPlusN-ExtraLight.otf + +Name: RyoGothicPlusN-Light +Class: Japan +OTFname: RyoGothicPlusN-Light.otf + +Name: RyoGothicPlusN-Regular +Class: Japan +OTFname: RyoGothicPlusN-Regular.otf + +Name: RyoGothicPlusN-Medium +Class: Japan +OTFname: RyoGothicPlusN-Medium.otf + +Name: RyoGothicPlusN-Bold +Class: Japan +OTFname: RyoGothicPlusN-Bold.otf + +Name: RyoGothicPlusN-Heavy +Class: Japan +OTFname: RyoGothicPlusN-Heavy.otf + +Name: RyoGothicPlusN-UltraHeavy +Class: Japan +OTFname: RyoGothicPlusN-UltraHeavy.otf + +Name: RyoGothicStd-ExtraLight +Class: Japan +OTFname: RyoGothicStd-ExtraLight.otf + +Name: RyoGothicStd-Light +Class: Japan +OTFname: RyoGothicStd-Light.otf + +Name: RyoGothicStd-Regular +Class: Japan +OTFname: RyoGothicStd-Regular.otf + +Name: RyoGothicStd-Medium +Class: Japan +OTFname: RyoGothicStd-Medium.otf + +Name: RyoGothicStd-Bold +Class: Japan +OTFname: RyoGothicStd-Bold.otf + +Name: RyoGothicStd-Heavy +Class: Japan +OTFname: RyoGothicStd-Heavy.otf + +Name: RyoGothicStd-UltraHeavy +Class: Japan +OTFname: RyoGothicStd-UltraHeavy.otf + diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-sinotype.dat b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-sinotype.dat new file mode 100644 index 00000000000..37a032391e2 --- /dev/null +++ b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-sinotype.dat @@ -0,0 +1,194 @@ +# Changzhou SinoType + +### SIMPLIFIED/TRADITIONAL CHINESE ### + +# Note about Mac (Mac OS X 10.6 -- macOS 10.13) +# STHeiti Light.ttc +# STHeiti Medium.ttc +# are bundled with all versions. +# 华文细黑.ttf +# 华文黑体.ttf +# 华文仿宋.ttf +# are bundled with macOS 10.12.6 Sierra or earlier versions. +# STXIHEI.ttf +# STHEITI.ttf +# STFANGSO.ttf +# are bundled with macOS 10.13 High Sierra or later versions. +# 华文宋体.ttf +# 华文楷体.ttf +# are bundled with Mac OS X 10.7.5 Lion or earlier versions. +# 宋体.ttc +# 楷体.ttc +# are bundled with OS X 10.8 -- 10.8.5 Mountain Lion. +# Songti.ttc +# index 0: STSongti-SC-Black +# index 1: STSongti-SC-Bold +# index 2: STSongti-TC-Bold +# index 3: STSongti-SC-Light +# index 4: STSong +# index 5: STSongti-TC-Light +# index 6: STSongti-SC-Regular +# index 7: STSongti-TC-Regular +# is bundled with OS X 10.9 or later versions. +# Kaiti.ttc +# index 0: STKaiti-SC-Black +# index 1: STKaiti-SC-Bold +# index 2: STKaiTi-TC-Bold +# index 3: STKaiti-SC-Regular +# index 4: STKaiti +# index 5: STKaiTi-TC-Regular +# is bundled with OS X 10.9 -- 10.11.6 El Capitan. +# Kaiti.ttc +# index 0: STKaitiSC-Regular +# index 1: STKaiti +# index 2: STKaitiTC-Regular +# index 3: STKaitiSC-Bold +# index 4: STKaitiTC-Bold +# index 5: STKaitiSC-Black +# index 6: STKaitiTC-Black +# is bundled with macOS 10.12 Sierra or later versions. +# Baoli.ttc +# index 0: STBaoli-SC-Regular +# Libian.ttc +# index 0: STLibian-SC-Regular +# Xingkai.ttc +# index 0: STXingkai-SC-Bold +# index 1: STXingkai-SC-Light +# are bundled with OS X 10.9 Mavericks -- 10.11.6 El Capitan. +# Baoli.ttc +# index 0: STBaoliSC-Regular +# index 1: STBaoliTC-Regular +# Libian.ttc +# index 0: STLibianSC-Regular +# index 1: STLibianTC-Regular +# Xingkai.ttc +# index 0: STXingkaiSC-Bold +# index 1: STXingkaiTC-Bold +# index 2: STXingkaiSC-Light +# index 3: STXingkaiTC-Light +# are bundled with macOS 10.12 Sierra or later versions. +# Yuanti.ttc +# index 0: STYuanti-SC-Bold +# index 1: STYuanti-SC-Light +# index 2: STYuanti-SC-Regular +# is bundled with OS X 10.9 Mavericks -- 10.10.5 Yosemite. +# Yuanti.ttc +# index 0: STYuanti-SC-Bold +# index 1: STYuanti-TC-Bold +# index 2: STYuanti-SC-Light +# index 3: STYuanti-TC-Light +# index 4: STYuanti-SC-Regular +# index 5: STYuanti-TC-Regular +# is bundled with OS X 10.11 -- 10.11.6 El Capitan. +# Yuanti.ttc +# index 0: STYuanti-SC-Regular +# index 1: STYuanti-TC-Regular +# index 2: STYuanti-SC-Bold +# index 3: STYuanti-TC-Bold +# index 4: STYuanti-SC-Light +# index 5: STYuanti-TC-Light +# is bundled with macOS 10.12 Sierra or later versions. + +# Note about MSOffice: +# STZHONGS.ttf +# STXINWEI.ttf +# STXINGKA.ttf +# STLITI.ttf +# STHUPO.ttf +# are bundled with Office for Mac 2016. + +Name: STSong +Class: GB +#Provides(??): STSong-Light # fails +#Provides(??): STSong-Regular # fails +TTFname(10): STSong.ttf +TTFname(11): STSONG.TTF +TTFname(20): 华文宋体.ttf + +Name: STKaiti +Class: GB +#Provides(??): STKaiti-Regular # fails +TTFname(10): STKaiti.ttf +TTFname(11): STKAITI.TTF +TTFname(20): 华文楷体.ttf + +Name: STKaiti-Adobe-CNS1 +Class: CNS +#Provides(??): MKai-Medium # fails +TTFname(10): STKaiti.ttf +TTFname(11): STKAITI.TTF +TTFname(20): 华文楷体.ttf + +Name: STXihei +Class: GB +#Provides(??): STHeiti-Light # fails +TTFname(10): STXihei.ttf +TTFname(11): STXIHEI.TTF +TTFname(19): STXIHEI.ttf +TTFname(20): 华文细黑.ttf + +Name: STHeiti +Class: GB +#Provides(??): STHeiti-Regular # fails +TTFname(10): STHeiti.ttf +TTFname(19): STHEITI.ttf +TTFname(20): 华文黑体.ttf + +Name: STFangsong +Class: GB +#Provides(??): STFangsong-Light # fails +#Provides(??): STFangsong-Regular # fails +TTFname(10): STFangsong.ttf +TTFname(11): STFANGSO.TTF +TTFname(19): STFANGSO.ttf +TTFname(20): 华文仿宋.ttf + +Name: STZhongsong +Class: GB +TTFname(11): STZHONGS.TTF +TTFname(12): STZHONGS.ttf + +Name: STXinwei +Class: GB +TTFname(11): STXINWEI.TTF +TTFname(12): STXINWEI.ttf + +Name: STXingkai +Class: GB +TTFname(11): STXINGKA.TTF +TTFname(12): STXINGKA.ttf + +Name: STLiti +Class: GB +TTFname(11): STLITI.TTF +TTFname(12): STLITI.ttf + +Name: STHupo +Class: GB +TTFname(11): STHUPO.TTF +TTFname(12): STHUPO.ttf + +Name: STCaiyun +Class: GB +TTFname(11): STCAIYUN.TTF + +Name: STHeitiSC-Light +Class: GB +TTCname(30): STHeiti-Light.ttc(1) +TTCname(40): STHeiti Light.ttc(1) + +Name: STHeitiTC-Light +Class: CNS +TTCname(30): STHeiti-Light.ttc(0) +TTCname(40): STHeiti Light.ttc(0) + +Name: STHeitiSC-Medium +Class: GB +TTCname(30): STHeiti-Medium.ttc(1) +TTCname(40): STHeiti Medium.ttc(1) + +Name: STHeitiTC-Medium +Class: CNS +TTCname(30): STHeiti-Medium.ttc(0) +TTCname(40): STHeiti Medium.ttc(0) + diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-solaris.dat b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-solaris.dat new file mode 100644 index 00000000000..157f84327f9 --- /dev/null +++ b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-solaris.dat @@ -0,0 +1,33 @@ +# Solaris + +# All these fonts are bundled with Solaris 10, 11. + +### KOREAN ### + +Name: Myeongjo +Class: Korea +Provides(40): HYSMyeongJo-Medium +TTFname: h2mjsm.ttf + +Name: Gothic +Class: Korea +Provides(40): HYGoThic-Medium +TTFname: h2gtrm.ttf + +Name: RoundedGothic +Class: Korea +Provides(40): HYRGoThic-Medium +TTFname: h2drrm.ttf + +Name: Haeseo +Class: Korea +TTFname: h2hsrm.ttf + +Name: SunDotum +Class: Korea +TTFname: sundotump.ttf + +Name: SunDotumChe +Class: Korea +TTFname: sundotumf.ttf + diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-toppan.dat b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-toppan.dat new file mode 100644 index 00000000000..f4bc4a54fa2 --- /dev/null +++ b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-toppan.dat @@ -0,0 +1,69 @@ +# Toppan (including Fontworks MacOS version) + +### JAPANESE ### + +# Note about Mac (Mac OS X 10.6 -- macOS 10.13) +# ToppanBunkyuMincho-Regular.otf +# ToppanBunkyuGothic.ttc +# ToppanBunkyuMidashiMincho-ExtraBold.otf +# ToppanBunkyuMidashiGothic-ExtraBold.otf +# are bundled with macOS 10.12 -- 10.12.6 Sierra. +# ToppanBunkyuMinchoPr6N-Regular.otf +# ToppanBunkyuGothicPr6N.ttc +# ToppanBunkyuMidashiMinchoStdN-ExtraBold.otf +# ToppanBunkyuMidashiGothicStdN-ExtraBold.otf +# are bundled with macOS 10.13 High Sierra or later versions. + +# based on Morisawa Passport +# ("P" stands for pair kerning) + +Name: AP-OTF-BunkyuMinPr6N-R +PSName: PBunkyuMinPr6N-R +Class: Japan +OTFname: AP-OTF-BunkyuMinPr6N-R.otf + +Name: AP-OTF-BunkyuMinPr6-R +PSName: PBunkyuMinPr6-R +Class: Japan +OTFname: AP-OTF-BunkyuMinPr6-R.otf + +Name: AP-OTF-BunkyuMdMinStdN-EB +PSName: PBunkyuMdMinStdN-EB +Class: Japan +OTFname: AP-OTF-BunkyuMdMinStdN-EB.otf + +Name: AP-OTF-BunkyuMdMinStd-EB +PSName: PBunkyuMdMinStd-EB +Class: Japan +OTFname: AP-OTF-BunkyuMdMinStd-EB.otf + +Name: AP-OTF-BunkyuGoPr6N-DB +PSName: PBunkyuGoPr6N-DB +Class: Japan +OTFname: AP-OTF-BunkyuGoPr6N-DB.otf + +Name: AP-OTF-BunkyuGoPr6N-R +PSName: PBunkyuGoPr6N-R +Class: Japan +OTFname: AP-OTF-BunkyuGoPr6N-R.otf + +Name: AP-OTF-BunkyuGoPr6-DB +PSName: PBunkyuGoPr6-DB +Class: Japan +OTFname: AP-OTF-BunkyuGoPr6-DB.otf + +Name: AP-OTF-BunkyuGoPr6-R +PSName: PBunkyuGoPr6-R +Class: Japan +OTFname: AP-OTF-BunkyuGoPr6-R.otf + +Name: AP-OTF-BunkyuMdGoStdN-EB +PSName: PBunkyuMdGoStdN-EB +Class: Japan +OTFname: AP-OTF-BunkyuMdGoStdN-EB.otf + +Name: AP-OTF-BunkyuMdGoStd-EB +PSName: PBunkyuMdGoStd-EB +Class: Japan +OTFname: AP-OTF-BunkyuMdGoStd-EB.otf + diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-typebank.dat b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-typebank.dat new file mode 100644 index 00000000000..d0fac9c1f7e --- /dev/null +++ b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-typebank.dat @@ -0,0 +1,33 @@ +# TypeBank + +### JAPANESE ### + +# Note about Windows: +# UDDigiKyokashoN-R.ttc +# UDDigiKyokashoN-B.ttc +# are bundled with Windows 10 (Fall Creators Update). + +Name: UDDigiKyokashoN-R +Class: Japan +TTCname: UDDigiKyokashoN-R.ttc(0) + +Name: UDDigiKyokashoNP-R +Class: Japan +TTCname: UDDigiKyokashoN-R.ttc(1) + +Name: UDDigiKyokashoNK-R +Class: Japan +TTCname: UDDigiKyokashoN-R.ttc(2) + +Name: UDDigiKyokashoN-B +Class: Japan +TTCname: UDDigiKyokashoN-B.ttc(0) + +Name: UDDigiKyokashoNP-B +Class: Japan +TTCname: UDDigiKyokashoN-B.ttc(1) + +Name: UDDigiKyokashoNK-B +Class: Japan +TTCname: UDDigiKyokashoN-B.ttc(2) + diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-ume.dat b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-ume.dat new file mode 100644 index 00000000000..dc0e129b8f4 --- /dev/null +++ b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-ume.dat @@ -0,0 +1,106 @@ +# Ume-font (free) + +### JAPANESE ### + +# Note: +# in the current release (2016-09-03 umefont_660.7z), +# ume-tms.ttf and ume-pms.ttf ("studybook" family) share the same PSName +# as ume-tmo.ttf and ume-pmo.ttf; we don't add these database +# intentionally -- HY (2017/01/17) + +Name: Ume-Mincho +Class: Japan +Provides(140): Ryumin-Light +Provides(140): RyuminPro-Light +Provides(140): HiraMinProN-W3 +Provides(140): HiraMinPro-W3 +Provides(140): FutoMinA101-Bold +Provides(140): FutoMinA101Pro-Bold +Provides(140): HiraMinProN-W6 +Provides(140): HiraMinPro-W6 +Provides(140): MidashiMin-MA31 +Provides(140): MidashiMinPro-MA31 +TTFname(10): ume-tmo3.ttf +#TTFname(11): ume-tms3.ttf + +Name: Ume-Gothic +Class: Japan +Provides(140): GothicBBB-Medium +Provides(140): GothicBBBPro-Medium +Provides(140): HiraKakuProN-W3 +Provides(140): HiraKakuPro-W3 +Provides(140): FutoGoB101-Bold +Provides(140): FutoGoB101Pro-Bold +Provides(140): HiraKakuProN-W6 +Provides(140): HiraKakuPro-W6 +Provides(140): MidashiGo-MB31 +Provides(140): MidashiGoPro-MB31 +Provides(140): HiraKakuStdN-W8 +Provides(140): HiraKakuStd-W8 +Provides(140): Jun101-Light +Provides(140): Jun101Pro-Light +Provides(140): HiraMaruProN-W4 +Provides(140): HiraMaruPro-W4 +TTFname(10): ume-tgo4.ttf + +Name: Ume-Gothic-O5 +Class: Japan +TTFname(10): ume-tgo5.ttf + +Name: Ume-Gothic-C4 +Class: Japan +TTFname(10): ume-tgc4.ttf + +Name: Ume-Gothic-C5 +Class: Japan +TTFname(10): ume-tgc5.ttf + +Name: Ume-Gothic-S4 +Class: Japan +TTFname(10): ume-tgs4.ttf + +Name: Ume-Gothic-S5 +Class: Japan +TTFname(10): ume-tgs5.ttf + +Name: Ume-P-Mincho +Class: Japan +TTFname(10): ume-pmo3.ttf +#TTFname(11): ume-pms3.ttf + +Name: Ume-P-Gothic +Class: Japan +TTFname(10): ume-pgo4.ttf + +Name: Ume-P-Gothic-O5 +Class: Japan +TTFname(10): ume-pgo5.ttf + +Name: Ume-P-Gothic-C4 +Class: Japan +TTFname(10): ume-pgc4.ttf + +Name: Ume-P-Gothic-C5 +Class: Japan +TTFname(10): ume-pgc5.ttf + +Name: Ume-P-Gothic-S4 +Class: Japan +TTFname(10): ume-pgs4.ttf + +Name: Ume-P-Gothic-S5 +Class: Japan +TTFname(10): ume-pgs5.ttf + +Name: Ume-UI-Gothic +Class: Japan +TTFname(10): ume-ugo4.ttf + +Name: Ume-UI-Gothic-O5 +Class: Japan +TTFname(10): ume-ugo5.ttf + +Name: Ume-Hy-Gothic +Class: Japan +TTFname(10): ume-hgo4.ttf + diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-yu-osx.dat b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-yu-osx.dat new file mode 100644 index 00000000000..68866fe2f95 --- /dev/null +++ b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-yu-osx.dat @@ -0,0 +1,79 @@ +# Yu-fonts MacOS version + +### JAPANESE ### + +# Note about Mac (Mac OS X 10.6 -- macOS 10.13) +# Yu Gothic Medium.otf +# Yu Gothic Bold.otf +# are bundled with OS X 10.9 Mavericks -- macOS 10.12.6 Sierra. +# YuGothic-Medium.otf +# YuGothic-Bold.otf +# are bundled with macOS 10.13 High Sierra or later versions. +# Yu Mincho Medium.otf +# Yu Mincho Demibold.otf +# are bundled with OS X 10.9 Mavericks -- 10.10.5 Yosemite. +# YuMincho.ttc +# index 0: YuMin-Medium +# index 1: YuMin-Demibold +# index 2: YuMin_36pKn-Medium +# index 3: YuMin_36pKn-Demibold +# is bundled with OS X 10.11 -- 10.11.6 El Capitan. +# YuMincho.ttc +# index 0: YuMin-Medium +# index 1: YuMin-Demibold +# index 2: YuMin-Extrabold +# index 3: YuMin_36pKn-Medium +# index 4: YuMin_36pKn-Demibold +# index 5: YuMin_36pKn-Extrabold +# is bundled with macOS 10.12 Sierra or later versions. +# Kyokasho.ttc +# is bundled with macOS 10.12 Sierra or later versions. + +Name: YuMin-Medium +Class: Japan +Provides(80): Ryumin-Light +Provides(80): RyuminPro-Light +Provides(80): HiraMinProN-W3 +Provides(80): HiraMinPro-W3 +OTFname(20): Yu Mincho Medium.otf +OTFname(10): YuMin-Medium.otf + +Name: YuMin-Demibold +Class: Japan +Provides(80): FutoMinA101-Bold +Provides(80): FutoMinA101Pro-Bold +Provides(80): HiraMinProN-W6 +Provides(80): HiraMinPro-W6 +Provides(80): MidashiMin-MA31 +Provides(80): MidashiMinPro-MA31 +OTFname(20): Yu Mincho Demibold.otf +OTFname(10): YuMin-Demibold.otf + +Name: YuGo-Medium +Class: Japan +Provides(80): GothicBBB-Medium +Provides(80): GothicBBBPro-Medium +Provides(80): HiraKakuProN-W3 +Provides(80): HiraKakuPro-W3 +OTFname(20): Yu Gothic Medium.otf +OTFname(19): YuGothic-Medium.otf +OTFname(10): YuGo-Medium.otf + +Name: YuGo-Bold +Class: Japan +Provides(80): FutoGoB101-Bold +Provides(80): FutoGoB101Pro-Bold +Provides(80): HiraKakuProN-W6 +Provides(80): HiraKakuPro-W6 +Provides(80): MidashiGo-MB31 +Provides(80): MidashiGoPro-MB31 +Provides(80): HiraKakuStdN-W8 +Provides(80): HiraKakuStd-W8 +Provides(80): Jun101-Light +Provides(80): Jun101Pro-Light +Provides(80): HiraMaruProN-W4 +Provides(80): HiraMaruPro-W4 +OTFname(20): Yu Gothic Bold.otf +OTFname(19): YuGothic-Bold.otf +OTFname(10): YuGo-Bold.otf + diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-yu-win.dat b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-yu-win.dat new file mode 100644 index 00000000000..34d2e1be6f1 --- /dev/null +++ b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-yu-win.dat @@ -0,0 +1,119 @@ +# Yu-fonts Windows/MSOffice version + +### JAPANESE ### + +# Note about Windows: +# yugothi{b,c,l}.ttf +# yumin.ttf, yumin{db,l}.ttf +# are bundled with Windows 8.1. +# YuGoth{B,L,M,R}.ttc +# yumin.ttf, yumin{db,l}.ttf +# are bundled with Windows 10. +# YUGOTH{B,L,M,R}.TTC +# YUMIN.TTF, YUMIN{DB,L}.TTF +# are bundled with "Yu Font Pack for MSOffice 2010/2013". +# YuGothic.ttf +# YuGothic-Bold.ttf +# are bundled with VS2013 or later versions. + +# Note about MSOffice: +# YuGoth{B,L,M,R}.ttf +# yumin.ttf, yumin{db,l}.ttf +# are bundled with Office for Mac 2016. + +# In the following database, Yu Font Pack entries do not appear +# as separate lines, but they are implied by Windows 10 entries +# since win32 is case-insensitive. +# Currently we don't add VS2013 YuGothic.ttf (YuGothic) and +# YuGothic-Bold.ttf (YuGothic-Bold) on purpose, because these files +# are smaller than Windows 8.1 yugothic.ttf and yugothib.ttf + +Name: YuMincho-Regular +Class: Japan +Provides(90): Ryumin-Light +Provides(90): RyuminPro-Light +Provides(90): HiraMinProN-W3 +Provides(90): HiraMinPro-W3 +TTFname(20): yumin.ttf +#TTFname(50): YuMincho-Regular.ttf # never existed + +Name: YuMincho-Light +Class: Japan +TTFname(20): yuminl.ttf +#TTFname(50): YuMincho-Light.ttf # never existed + +Name: YuMincho-DemiBold +Class: Japan +Provides(90): FutoMinA101-Bold +Provides(90): FutoMinA101Pro-Bold +Provides(90): HiraMinProN-W6 +Provides(90): HiraMinPro-W6 +Provides(90): MidashiMin-MA31 +Provides(90): MidashiMinPro-MA31 +TTFname(20): yumindb.ttf +#TTFname(50): YuMincho-DemiBold.ttf # never existed + +Name: YuGothic-Regular +Class: Japan +Provides(90): GothicBBB-Medium +Provides(90): GothicBBBPro-Medium +Provides(90): HiraKakuProN-W3 +Provides(90): HiraKakuPro-W3 +TTFname(25): yugothic.ttf +TTCname(20): YuGothR.ttc(0) +TTFname(40): YuGothR.ttf +#TTFname(50): YuGothic-Regular.ttf # never existed + +Name: YuGothic-Medium +Class: Japan +TTCname(20): YuGothM.ttc(0) +TTFname(40): YuGothM.ttf + +Name: YuGothic-Light +Class: Japan +TTFname(25): yugothil.ttf +TTCname(20): YuGothL.ttc(0) +TTFname(40): YuGothL.ttf +#TTFname(50): YuGothic-Light.ttf # never existed + +Name: YuGothic-Bold +Class: Japan +Provides(90): FutoGoB101-Bold +Provides(90): FutoGoB101Pro-Bold +Provides(90): HiraKakuProN-W6 +Provides(90): HiraKakuPro-W6 +Provides(90): MidashiGo-MB31 +Provides(90): MidashiGoPro-MB31 +Provides(90): HiraKakuStdN-W8 +Provides(90): HiraKakuStd-W8 +Provides(90): Jun101-Light +Provides(90): Jun101Pro-Light +Provides(90): HiraMaruProN-W4 +Provides(90): HiraMaruPro-W4 +TTFname(25): yugothib.ttf +TTCname(20): YuGothB.ttc(0) +TTFname(40): YuGothB.ttf +#TTFname(50): YuGothic-Bold.ttf + +# Yu-UI-fonts (Windows only) + +Name: YuGothicUI-Semilight +Class: Japan +TTCname(20): YuGothR.ttc(1) + +Name: YuGothicUI-Regular +Class: Japan +TTCname(20): YuGothM.ttc(1) + +Name: YuGothicUI-Light +Class: Japan +TTCname(20): YuGothL.ttc(1) + +Name: YuGothicUI-Bold +Class: Japan +TTCname(20): YuGothB.ttc(1) + +Name: YuGothicUI-Semibold +Class: Japan +TTCname(20): YuGothB.ttc(2) + diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/Makefile b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/Makefile deleted file mode 100644 index 0a4847f36c6..00000000000 --- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/Makefile +++ /dev/null @@ -1,12 +0,0 @@ - - -all = gb cns korea japan - -$(all) all: - bash test-runner.sh $@ - -clean: - rm -f *.log *.dvi *.aux - -realclean: clean - rm -f *.pdf *.ps diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-CNS1.tex b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-CNS1.tex deleted file mode 100644 index f10654f5592..00000000000 --- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-CNS1.tex +++ /dev/null @@ -1,40 +0,0 @@ -\ifx\dviware\undefined \def\dviware{dvipdfmx}\fi -\documentclass[\dviware]{jsarticle} -\usepackage{cidtable} - -\begin{document} -\begin{center} -Adobe-CNS1 Glyphs\\ - \begin{tabular}{ll} \hline - Supplement & Color \\ \hline - 0 & \colorsample{0} \\ - 1 & \colorsample{1} \\ - 2 & \colorsample{2} \\ - 3 & \colorsample{3} \\ - 4 & \colorsample{4} \\ - 5 & \colorsample{5} \\ - 6 & \colorsample{6} \\ \hline - \end{tabular} -\end{center} - -\newcount\code\global\code=0 -\newcount\supplement\global\supplement=0 - -\noindent -\foreach \row in {0,...,957}{% -\hbox to 7ex{\hfill\number\code}\quad -\foreach \col in {0,...,19}{% -\ifcase\supplement% -\ifnum\code>14098 \global\advance\supplement by 1\fi\or -\ifnum\code>17407 \global\advance\supplement by 1\fi\or -\ifnum\code>17600 \global\advance\supplement by 1\fi\or -\ifnum\code>18845 \global\advance\supplement by 1\fi\or -\ifnum\code>18964 \global\advance\supplement by 1\fi\or -\ifnum\code>19087 \global\advance\supplement by 1\fi\fi -\ifnum\code < 19156 - \colorbox{\colorname{\supplement}}{\CIDT{\code}}\ -\fi -\global\advance\code by 1 -}\\ -} -\end{document} diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-GB1-012.tex b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-GB1-012.tex deleted file mode 100644 index 109404aacec..00000000000 --- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-GB1-012.tex +++ /dev/null @@ -1,38 +0,0 @@ -\ifx\dviware\undefined \def\dviware{dvipdfmx}\fi -\documentclass[\dviware]{jsarticle} -\usepackage{cidtable} - -\begin{document} -\begin{center} -Adobe-GB1 Glyphs\\ - \begin{tabular}{ll} \hline - Supplement & Color \\ \hline - 0 & \colorsample{0} \\ - 1 & \colorsample{1} \\ - 2 & \colorsample{2} \\ - 3 & \colorsample{3} \\ - 4 & \colorsample{4} \\ - 5 & \colorsample{5} \\ \hline - \end{tabular} -\end{center} - -\newcount\code\global\code=0 -\newcount\supplement\global\supplement=0 - -\noindent -\foreach \row in {0,...,1514}{% -\hbox to 7ex{\hfill\number\code}\quad -\foreach \col in {0,...,19}{% -\ifcase\supplement% -\ifnum\code>7716 \global\advance\supplement by 1\fi\or -\ifnum\code>9896 \global\advance\supplement by 1\fi\or -\ifnum\code>22126 \global\advance\supplement by 1\fi\or -\ifnum\code>22352 \global\advance\supplement by 1\fi\or -\ifnum\code>29063 \global\advance\supplement by 1\fi\fi -\ifnum\code < 22353 - \colorbox{\colorname{\supplement}}{\CIDC{\code}}\ -\fi -\global\advance\code by 1 -}\\ -} -\end{document} diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-GB1-345.tex b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-GB1-345.tex deleted file mode 100644 index 820c7660ae9..00000000000 --- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-GB1-345.tex +++ /dev/null @@ -1,39 +0,0 @@ -\ifx\dviware\undefined \def\dviware{dvipdfmx}\fi -\documentclass[\dviware]{jsarticle} -\usepackage{cidtable} - -\begin{document} -\begin{center} -Adobe-GB1 Glyphs\\ - \begin{tabular}{ll} \hline - Supplement & Color \\ \hline - 0 & \colorsample{0} \\ - 1 & \colorsample{1} \\ - 2 & \colorsample{2} \\ - 3 & \colorsample{3} \\ - 4 & \colorsample{4} \\ - 5 & \colorsample{5} \\ \hline - \end{tabular} -\end{center} - -\newcount\code\global\code=0 -\newcount\supplement\global\supplement=0 - -\noindent -\foreach \row in {0,...,1514}{% -\hbox to 7ex{\hfill\number\code}\quad -\foreach \col in {0,...,19}{% -\ifcase\supplement% -\ifnum\code>7716 \global\advance\supplement by 1\fi\or -\ifnum\code>9896 \global\advance\supplement by 1\fi\or -\ifnum\code>22126 \global\advance\supplement by 1\fi\or -\ifnum\code>22352 \global\advance\supplement by 1\fi\or -\ifnum\code>29063 \global\advance\supplement by 1\fi\fi -\ifnum\code < 30284 - \ifnum\code > 22126 - \colorbox{\colorname{\supplement}}{\CIDC{\code}}\ -\fi\fi -\global\advance\code by 1 -}\\ -} -\end{document} diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-GB1.tex b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-GB1.tex deleted file mode 100644 index 883592a76fb..00000000000 --- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-GB1.tex +++ /dev/null @@ -1,38 +0,0 @@ -\ifx\dviware\undefined \def\dviware{dvipdfmx}\fi -\documentclass[\dviware]{jsarticle} -\usepackage{cidtable} - -\begin{document} -\begin{center} -Adobe-GB1 Glyphs\\ - \begin{tabular}{ll} \hline - Supplement & Color \\ \hline - 0 & \colorsample{0} \\ - 1 & \colorsample{1} \\ - 2 & \colorsample{2} \\ - 3 & \colorsample{3} \\ - 4 & \colorsample{4} \\ - 5 & \colorsample{5} \\ \hline - \end{tabular} -\end{center} - -\newcount\code\global\code=0 -\newcount\supplement\global\supplement=0 - -\noindent -\foreach \row in {0,...,1514}{% -\hbox to 7ex{\hfill\number\code}\quad -\foreach \col in {0,...,19}{% -\ifcase\supplement% -\ifnum\code>7716 \global\advance\supplement by 1\fi\or -\ifnum\code>9896 \global\advance\supplement by 1\fi\or -\ifnum\code>22126 \global\advance\supplement by 1\fi\or -\ifnum\code>22352 \global\advance\supplement by 1\fi\or -\ifnum\code>29063 \global\advance\supplement by 1\fi\fi -\ifnum\code < 30284 - \colorbox{\colorname{\supplement}}{\CIDC{\code}}\ -\fi -\global\advance\code by 1 -}\\ -} -\end{document} diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-Japan1.tex b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-Japan1.tex deleted file mode 100644 index 0793a5248d7..00000000000 --- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-Japan1.tex +++ /dev/null @@ -1,40 +0,0 @@ -\ifx\dviware\undefined \def\dviware{dvipdfmx}\fi -\documentclass[\dviware]{jsarticle} -\usepackage{cidtable} - -\begin{document} -\begin{center} -Adobe-Japan1 Glyphs\\ - \begin{tabular}{ll} \hline - Supplement & Color \\ \hline - 0 & \colorsample{0} \\ - 1 & \colorsample{1} \\ - 2 & \colorsample{2} \\ - 3 & \colorsample{3} \\ - 4 & \colorsample{4} \\ - 5 & \colorsample{5} \\ - 6 & \colorsample{6} \\ \hline - \end{tabular} -\end{center} - -\newcount\code\global\code=0 -\newcount\supplement\global\supplement=0 - -\noindent -\foreach \row in {0,...,1152}{% -\hbox to 7ex{\hfill\number\code}\quad -\foreach \col in {0,...,19}{% -\ifcase\supplement% -\ifnum\code>8283 \global\advance\supplement by 1\fi\or -\ifnum\code>8358 \global\advance\supplement by 1\fi\or -\ifnum\code>8719 \global\advance\supplement by 1\fi\or -\ifnum\code>9353 \global\advance\supplement by 1\fi\or -\ifnum\code>15443 \global\advance\supplement by 1\fi\or -\ifnum\code>20316 \global\advance\supplement by 1\fi\fi -\ifnum\code < 23058 - \colorbox{\colorname{\supplement}}{\CID{\code}}\ -\fi -\global\advance\code by 1 -}\\ -} -\end{document} diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-Korea1.tex b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-Korea1.tex deleted file mode 100644 index 2aad5ae5269..00000000000 --- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/adobe-Korea1.tex +++ /dev/null @@ -1,32 +0,0 @@ -\ifx\dviware\undefined \def\dviware{dvipdfmx}\fi -\documentclass[\dviware]{jsarticle} -\usepackage{cidtable} - -\begin{document} -\begin{center} -Adobe-Korea1 Glyphs\\ - \begin{tabular}{ll} \hline - Supplement & Color \\ \hline - 0 & \colorsample{0} \\ - 1 & \colorsample{1} \\ - 2 & \colorsample{2} \\ \hline - \end{tabular} -\end{center} - -\newcount\code\global\code=0 -\newcount\supplement\global\supplement=0 - -\noindent -\foreach \row in {0,...,917}{% -\hbox to 7ex{\hfill\number\code}\quad -\foreach \col in {0,...,19}{% -\ifcase\supplement% -\ifnum\code>9332 \global\advance\supplement by 1\fi\or -\ifnum\code>18154 \global\advance\supplement by 1\fi\fi -\ifnum\code < 18352 - \colorbox{\colorname{\supplement}}{\CIDK{\code}}\ -\fi -\global\advance\code by 1 -}\\ -} -\end{document} diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/cidtable.sty b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/cidtable.sty deleted file mode 100644 index 18ee5cbdbb6..00000000000 --- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/cidtable.sty +++ /dev/null @@ -1,21 +0,0 @@ -\usepackage[deluxe, expert, multi]{otf} -\usepackage{pgffor} -\usepackage{color} -\setlength{\fboxsep}{0pt} -%\setlength{\fboxrule}{0.2pt} -\definecolor{UClightgray}{cmyk}{.15,.10,.10,0} -\definecolor{UClightpink}{cmyk}{0,.25,.15,0} -\definecolor{UClightyellowgreen}{cmyk}{.25,0,.80,0} -\definecolor{UClightskyblue}{cmyk}{.30,0,0,0} -\definecolor{UCbeige}{cmyk}{0,.25,.45,0} -\definecolor{UClightgreen}{cmyk}{.45,0,.45,0} -\definecolor{UCcream}{cmyk}{0,0,.40,0} -\definecolor{UClightpurple}{cmyk}{.25,.30,0,0} - -\newcommand\colorname[1]{\ifcase#1% -UClightpink\or -UClightyellowgreen\or UClightskyblue\or UCbeige\or -UClightgreen\or UCcream\or UClightpurple\fi} -\newcommand{\colorsample}[1]{{\color{\colorname{#1}}\rule{10pt}{10pt}} \colorname{#1}} - -\endinput diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/japanese-updmap-tests/do-tests b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/japanese-updmap-tests/do-tests deleted file mode 100644 index 33b52d61630..00000000000 --- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/japanese-updmap-tests/do-tests +++ /dev/null @@ -1,11 +0,0 @@ - -PATH=~/tl/2014/bin/x86_64-linux/:$PATH -export PATH - -platex prn-variants.tex -for i in hiragino hiragino-pron kozuka-pr6n kozuka morisawa yu-win yu-osx ipa ipaex ; do - kanji-config-updmap-sys $i - dvips prn-variants.dvi -o prn-variants-$i.ps - ps2pdf prn-variants-$i.ps -done - diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/japanese-updmap-tests/prn-variants.tex b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/japanese-updmap-tests/prn-variants.tex deleted file mode 100644 index a1495a5b164..00000000000 --- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/japanese-updmap-tests/prn-variants.tex +++ /dev/null @@ -1,12 +0,0 @@ -\documentclass{jsarticle} -\usepackage[deluxe]{otf} - -\begin{document}\noindent -\begin{tabular}{ll} - Mincho & {いくつかの漢字の例です：葛芦辻逗飴薩晦茨祇巷卿鯖溢噌} \\ - Mincho bold & {\bfseries いくつかの漢字の例です：葛芦辻逗飴薩晦茨祇巷卿鯖溢噌} \\ - Gothic & {\gtfamily いくつかの漢字の例です：葛芦辻逗飴薩晦茨祇巷卿鯖溢噌} \\ - Gothic bold & {\gtfamily\bfseries いくつかの漢字の例です：葛芦辻逗飴薩晦茨祇巷卿鯖溢噌} \\ - Maru gothic & {\mgfamily いくつかの漢字の例です：葛芦辻逗飴薩晦茨祇巷卿鯖溢噌} -\end{tabular} -\end{document}
\ No newline at end of file diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/japanese-updmap-tests/report b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/japanese-updmap-tests/report deleted file mode 100644 index 7568e267707..00000000000 --- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/japanese-updmap-tests/report +++ /dev/null @@ -1,4 +0,0 @@ -Yu-Win: - YuGothic-Regular-H not found - seems to be problematic - diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/otfcidsample.tex b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/otfcidsample.tex deleted file mode 100644 index e1a03ba5a98..00000000000 --- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/otfcidsample.tex +++ /dev/null @@ -1,46 +0,0 @@ -% -*- coding: utf-8-unix -*- -\documentclass{jsarticle} -\usepackage[deluxe,multi]{otf} -\newcommand{\sampleSC}{\UTFC{76F4}\UTFC{9AA8}} -\newcommand{\sampleTC}{\UTFT{76F4}\UTFT{9AA8}} -\newcommand{\sampleJ}{\UTF{76F4}\UTF{9AA8}} -\newcommand{\sampleK}{\UTFK{76F4}\UTFK{9AA8}} - -\begin{document}\noindent -\begin{center} - \begin{tabular}{lllll} - & SC & TC & J & K\\ - Serif - & {\sampleSC} - & %{\sampleTC} - & {\sampleJ} - & {\sampleK} - \\ - Serif bold - & %{\bfseries\sampleSC} - & %{\bfseries\sampleTC} - & {\bfseries\sampleJ} - & {\bfseries\sampleK} - \\ - Sans serif - & {\gtfamily\sampleSC} - & %{\gtfamily\sampleTC} - & {\gtfamily\sampleJ} - & {\gtfamily\sampleK} - \\ - Sans serif bold - & %{\gtfamily\bfseries\sampleSC} - & %{\gtfamily\bfseries\sampleTC} - & {\gtfamily\bfseries\sampleJ} - & {\gtfamily\bfseries\sampleK} - \\ - Sans serif variant - & %{\mgfamily\sampleSC} - & %{\mgfamily\sampleTC} - & {\mgfamily\sampleJ} - & {\mgfamily\sampleK} - \end{tabular} -\end{center} - -Note. SC: Simplified Chinese, TC: Traditional Chinese, J: Japanese, K: Korean. -\end{document} diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/test-runner.sh b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/test-runner.sh deleted file mode 100644 index 2f903064cf5..00000000000 --- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tests/test-runner.sh +++ /dev/null @@ -1,96 +0,0 @@ -#! /bin/sh - - -do_gb() { -# simplified chinese uses STSong-Light -platex "\def\dviware{dvipdfmx}\input adobe-GB1-012.tex" && \ - dvipdfmx -o adobe-GB1-012.dvipdfmx.pdf adobe-GB1-012.dvi -platex "\def\dviware{dvips}\input adobe-GB1-012.tex" && \ - dvips adobe-GB1-012.dvi -platex "\def\dviware{dvipdfmx}\input adobe-GB1-345.tex" && \ - dvipdfmx -o adobe-GB1-345.dvipdfmx.pdf adobe-GB1-345.dvi -platex "\def\dviware{dvips}\input adobe-GB1-345.tex" && \ - dvips adobe-GB1-345.dvi - -for i in `perl ../cjk-gs-integrate.pl --list-aliases --machine-readable -q | grep ^STSong-Light: | awk -F: '{print$3}'`; do - perl ../cjk-gs-integrate.pl --only-aliases --alias STSong-Light=$i - echo ps2pdf adobe-GB1-012.ps -o "adobe-GB1-012-$i.pdf" - if ps2pdf adobe-GB1-012.ps "adobe-GB1-012-$i.pdf" > "adobe-GB1-012-$i.ps2pdf.log" 2>&1 ; then - echo "success GB1-012 $i" >> status - else - echo "failure GB1-012 $i" >> status - fi - echo ps2pdf adobe-GB1-345.ps -o "adobe-GB1-345-$i.pdf" - if ps2pdf adobe-GB1-345.ps "adobe-GB1-345-$i.pdf" > "adobe-GB1-345-$i.ps2pdf.log" 2>&1 ; then - echo "success GB1-345 $i" >> status - else - echo "failure GB1-345 $i" >> status - fi -done -} - - -do_cns() { -# traditional chinese uses MSung-Light -platex "\def\dviware{dvipdfmx}\input adobe-CNS1.tex" && \ - dvipdfmx -o adobe-CNS1.dvipdfmx.pdf adobe-CNS1.dvi -platex "\def\dviware{dvips}\input adobe-CNS1.tex" && \ - dvips adobe-CNS1.dvi -for i in `perl ../cjk-gs-integrate.pl --list-aliases --machine-readable -q | grep ^MSung-Light: | awk -F: '{print$3}'`; do - perl ../cjk-gs-integrate.pl --only-aliases --alias MSung-Light=$i - echo ps2pdf adobe-CNS1.ps -o "adobe-CNS1-$i.pdf" - if ps2pdf adobe-CNS1.ps "adobe-CNS1-$i.pdf" > "adobe-CNS1-$i.ps2pdf.log" 2>&1 ; then - echo "success CNS1 $i" >> status - else - echo "failure CNS1 $i" >> status - fi -done -} - -do_korea() { -# korean uses HYSMyeongJo-Medium -platex "\def\dviware{dvipdfmx}\input adobe-Korea1.tex" && \ - dvipdfmx -o adobe-Korea1.dvipdfmx.pdf adobe-Korea1.dvi -platex "\def\dviware{dvips}\input adobe-Korea1.tex" && \ - dvips adobe-Korea1.dvi -for i in `perl ../cjk-gs-integrate.pl --list-aliases --machine-readable -q | grep ^HYSMyeongJo-Medium: | awk -F: '{print$3}'`; do - perl ../cjk-gs-integrate.pl --only-aliases --alias HYSMyeongJo-Medium=$i - echo ps2pdf adobe-Korea1.ps -o "adobe-Korea1-$i.pdf" - if ps2pdf adobe-Korea1.ps "adobe-Korea1-$i.pdf" > "adobe-Korea1-$i.ps2pdf.log" 2>&1 ; then - echo "success Korea1 $i" >> status - else - echo "failure Korea1 $i" >> status - fi -done -} - -do_japan() { -# japanese uses Ryumin-Light -platex "\def\dviware{dvipdfmx}\input adobe-Japan1.tex" && \ - dvipdfmx -o adobe-Japan1.dvipdfmx.pdf adobe-Japan1.dvi -platex "\def\dviware{dvips}\input adobe-Japan1.tex" && \ - dvips adobe-Japan1.dvi -for i in `perl ../cjk-gs-integrate.pl --list-aliases --machine-readable -q | grep ^Ryumin-Light: | awk -F: '{print$3}'`; do - perl ../cjk-gs-integrate.pl --only-aliases --alias Ryumin-Light=$i - echo ps2pdf adobe-Japan1.ps -o "adobe-Japan1-$i.pdf" - if ps2pdf adobe-Japan1.ps "adobe-Japan1-$i.pdf" > "adobe-Japan1-$i.ps2pdf.log" 2>&1 ; then - echo "success Japan1 $i" >> status - else - echo "failure Japan1 $i" >> status - fi -done -} - -if [ "$1" = "gb" -o "$1" = "all" ] ; then - do_gb -fi -if [ "$1" = "cns" -o "$1" = "all" ] ; then - do_cns -fi -if [ "$1" = "korea" -o "$1" = "all" ] ; then - do_korea -fi -if [ "$1" = "japan" -o "$1" = "all" ] ; then - do_japan -fi - diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tools/mkgsfntspecs.sh b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tools/mkgsfntspecs.sh deleted file mode 100644 index ec97a97c138..00000000000 --- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tools/mkgsfntspecs.sh +++ /dev/null @@ -1,397 +0,0 @@ -#!/bin/bash - -# This program is licensed under the terms of the MIT License. -# -# Copyright (c) 2014 Munehiro Yamamoto <munepixyz@gmail.com> -# Modified 05/04/2015 by Bruno Voisin <bvoisin@mac.com> for testing purposes -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -GSRESDIR=$(pwd)/Work/share/ghostscript/9.16/Resource - -echo -n "Checking your Ghostscript's resource directory..." -[ -d ${GSRESDIR} ] || exit 1 -echo ${GSRESDIR} - -# -# settings for Hiragino fonts -# -FontList=( - ## Morisawa NewCID - Ryumin-Light,Japan - GothicBBB-Medium,Japan - FutoMinA101-Bold,Japan - FutoGoB101-Bold,Japan - Jun101-Light,Japan - A-OTF-RyuminPro-Light,Japan - A-OTF-GothicBBBPro-Medium,Japan - A-OTF-FutoMinA101Pro-Bold,Japan - A-OTF-FutoGoB101Pro-Bold,Japan - A-OTF-Jun101Pro-Light,Japan - ## Screen Hiragino bundled in OS X - HiraKakuPro-W3,Japan - HiraKakuPro-W6,Japan - HiraKakuStd-W8,Japan - HiraMaruPro-W4,Japan - HiraMinPro-W3,Japan - HiraMinPro-W6,Japan - HiraKakuProN-W3,Japan - HiraKakuProN-W6,Japan - HiraKakuStdN-W8,Japan - HiraMaruProN-W4,Japan - HiraMinProN-W3,Japan - HiraMinProN-W6,Japan - HiraginoSansGB-W3,GB - HiraginoSansGB-W6,GB - # HiraginoSansCNS-W3,CNS - # HiraginoSansCNS-W6,CNS - ## Jiyukobo Yu bundled in OS X - YuGo-Bold,Japan - YuGo-Medium,Japan - YuMin-Demibold,Japan - YuMin-Medium,Japan - ## Japanese IPA fonts bundled in TeX Live - IPAexMincho,Japan - IPAexGothic,Japan - IPAMincho,Japan - IPAGothic,Japan - ## Chinese fonts bundled in OS X - STHeiti,GB - STXihei,GB - STHeitiSC-Light,GB - STHeitiSC-Medium,GB - STHeitiTC-Light,GB - STHeitiTC-Medium,GB - STSong,GB - STSongti-SC-Light,GB - STSongti-SC-Regular,GB - STSongti-SC-Bold,GB - STSongti-SC-Black,GB - STSongti-TC-Light,GB - STSongti-TC-Regular,GB - STSongti-TC-Bold,GB - STKaiti,GB - STKaiti-SC-Regular,GB - STKaiti-SC-Bold,GB - STKaiti-SC-Black,GB - STKaiTi-TC-Regular,GB - STKaiTi-TC-Bold,GB - STKaiti-Adobe-CNS1,CNS - STKaiti-SC-Regular-Adobe-CNS1,CNS - STKaiti-SC-Bold-Adobe-CNS1,CNS - STKaiti-SC-Black-Adobe-CNS1,CNS - STKaiTi-TC-Regular-Adobe-CNS1,CNS - STKaiTi-TC-Bold-Adobe-CNS1,CNS - STFangsong,GB - LiHeiPro,CNS - LiSongPro,CNS -) - -EncodeList_Japan=( - 78-EUC-H - 78-EUC-V - 78-H - 78-RKSJ-H - 78-RKSJ-V - 78-V - 78ms-RKSJ-H - 78ms-RKSJ-V - 83pv-RKSJ-H - 90ms-RKSJ-H - 90ms-RKSJ-V - 90msp-RKSJ-H - 90msp-RKSJ-V - 90pv-RKSJ-H - 90pv-RKSJ-V - Add-H - Add-RKSJ-H - Add-RKSJ-V - Add-V - Adobe-Japan1-0 - Adobe-Japan1-1 - Adobe-Japan1-2 - Adobe-Japan1-3 - Adobe-Japan1-4 - Adobe-Japan1-5 - Adobe-Japan1-6 - EUC-H - EUC-V - Ext-H - Ext-RKSJ-H - Ext-RKSJ-V - Ext-V - H - Hankaku - Hiragana - Identity-H - Identity-V - Katakana - NWP-H - NWP-V - RKSJ-H - RKSJ-V - Roman - UniJIS-UCS2-H - UniJIS-UCS2-HW-H - UniJIS-UCS2-HW-V - UniJIS-UCS2-V - UniJIS-UTF16-H - UniJIS-UTF16-V - UniJIS-UTF32-H - UniJIS-UTF32-V - UniJIS-UTF8-H - UniJIS-UTF8-V - UniJIS2004-UTF16-H - UniJIS2004-UTF16-V - UniJIS2004-UTF32-H - UniJIS2004-UTF32-V - UniJIS2004-UTF8-H - UniJIS2004-UTF8-V - UniJISPro-UCS2-HW-V - UniJISPro-UCS2-V - UniJISPro-UTF8-V - UniJISX0213-UTF32-H - UniJISX0213-UTF32-V - UniJISX02132004-UTF32-H - UniJISX02132004-UTF32-V - V - WP-Symbol -) - -EncodeList_GB=( - Adobe-GB1-0 - Adobe-GB1-1 - Adobe-GB1-2 - Adobe-GB1-3 - Adobe-GB1-4 - Adobe-GB1-5 - GB-EUC-H - GB-EUC-V - GB-H - GB-RKSJ-H - GB-V - GBK-EUC-H - GBK-EUC-V - GBK2K-H - GBK2K-V - GBKp-EUC-H - GBKp-EUC-V - GBT-EUC-H - GBT-EUC-V - GBT-H - GBT-RKSJ-H - GBT-V - GBTpc-EUC-H - GBTpc-EUC-V - GBpc-EUC-H - GBpc-EUC-V - Identity-H - Identity-V - UniGB-UCS2-H - UniGB-UCS2-V - UniGB-UTF16-H - UniGB-UTF16-V - UniGB-UTF32-H - UniGB-UTF32-V - UniGB-UTF8-H - UniGB-UTF8-V -) - -EncodeList_CNS=( - Adobe-CNS1-0 - Adobe-CNS1-1 - Adobe-CNS1-2 - Adobe-CNS1-3 - Adobe-CNS1-4 - Adobe-CNS1-5 - Adobe-CNS1-6 - B5-H - B5-V - B5pc-H - B5pc-V - CNS-EUC-H - CNS-EUC-V - CNS1-H - CNS1-V - CNS2-H - CNS2-V - ETHK-B5-H - ETHK-B5-V - ETen-B5-H - ETen-B5-V - ETenms-B5-H - ETenms-B5-V - HKdla-B5-H - HKdla-B5-V - HKdlb-B5-H - HKdlb-B5-V - HKgccs-B5-H - HKgccs-B5-V - HKm314-B5-H - HKm314-B5-V - HKm471-B5-H - HKm471-B5-V - HKscs-B5-H - HKscs-B5-V - Identity-H - Identity-V - UniCNS-UCS2-H - UniCNS-UCS2-V - UniCNS-UTF16-H - UniCNS-UTF16-V - UniCNS-UTF32-H - UniCNS-UTF32-V - UniCNS-UTF8-H - UniCNS-UTF8-V -) - -EncodeList_Korea=( - Adobe-Korea1-0 - Adobe-Korea1-1 - Adobe-Korea1-2 - Identity-H - Identity-V - KSC-EUC-H - KSC-EUC-V - KSC-H - KSC-Johab-H - KSC-Johab-V - KSC-RKSJ-H - KSC-V - KSCms-UHC-H - KSCms-UHC-HW-H - KSCms-UHC-HW-V - KSCms-UHC-V - KSCpc-EUC-H - KSCpc-EUC-V - UniKS-UCS2-H - UniKS-UCS2-V - UniKS-UTF16-H - UniKS-UTF16-V - UniKS-UTF32-H - UniKS-UTF32-V - UniKS-UTF8-H - UniKS-UTF8-V -) - -## mkgsfontspec [fontname] [encode] > [fontspec] -mkgsfontspec(){ - local fontname=$1 - local encode=$2 - cat <<EOT -%!PS-Adobe-3.0 Resource-Font -%%DocumentNeededResources: ${encode} (CMap) -%%IncludeResource: ${encode} (CMap) -%%BeginResource: Font (${fontname}-${encode}) -(${fontname}-${encode}) -(${encode}) /CMap findresource -[(${fontname}) /CIDFont findresource] -composefont -pop -%%EndResource -%%EOF -EOT -} - -## mkfontspec [fontspec dir] -mkfontspec(){ - local FONTSPECDIR=$1 - - mkdir -p $FONTSPECDIR - - for i in ${FontList[@]}; do - fnt=$(echo $i | cut -f1 -d",") - enc=$(echo $i | cut -f2 -d",") - - case $enc in - Japan) enclist="${EncodeList_Japan[@]}";; - GB) enclist="${EncodeList_GB[@]}";; - CNS) enclist="${EncodeList_CNS[@]}";; - Korea) enclist="${EncodeList_Korea[@]}";; - *) exit 1;; - esac - - for j in $enclist; do - mkgsfontspec ${fnt} ${j} > ${FONTSPECDIR}/${fnt}-${j} - done - done - - return 0 -} - -## mkcidfonts [cidfonts dir] -mkcidfonts(){ - local CIDFONTSDIR=$1 - - mkdir -p $CIDFONTSDIR - (cd $CIDFONTSDIR - rm -f HiraMinPro{,N}-W{3,6} - rm -f HiraMaruPro{,N}-W4 - rm -f HiraKakuPro{,N}-W{3,6} - rm -f HiraKakuStd{,N}-W8 - rm -f HiraginoSansGB-W{3,6} - - ln -s "/Library/Fonts/ヒラギノ明朝 Pro W3.otf" HiraMinPro-W3 - ln -s "/Library/Fonts/ヒラギノ明朝 Pro W6.otf" HiraMinPro-W6 - ln -s "/Library/Fonts/ヒラギノ丸ゴ Pro W4.otf" HiraMaruPro-W4 - ln -s "/Library/Fonts/ヒラギノ角ゴ Pro W3.otf" HiraKakuPro-W3 - ln -s "/Library/Fonts/ヒラギノ角ゴ Pro W6.otf" HiraKakuPro-W6 - ln -s "/Library/Fonts/ヒラギノ角ゴ Std W8.otf" HiraKakuStd-W8 - ln -s "/System/Library/Fonts/ヒラギノ明朝 ProN W3.otf" HiraMinProN-W3 - ln -s "/System/Library/Fonts/ヒラギノ明朝 ProN W6.otf" HiraMinProN-W6 - ln -s "/Library/Fonts/ヒラギノ丸ゴ ProN W4.otf" HiraMaruProN-W4 - ln -s "/System/Library/Fonts/ヒラギノ角ゴ ProN W3.otf" HiraKakuProN-W3 - ln -s "/System/Library/Fonts/ヒラギノ角ゴ ProN W6.otf" HiraKakuProN-W6 - ln -s "/Library/Fonts/ヒラギノ角ゴ StdN W8.otf" HiraKakuStdN-W8 - ln -s "/Library/Fonts/Hiragino Sans GB W3.otf" HiraginoSansGB-W3 - ln -s "/Library/Fonts/Hiragino Sans GB W6.otf" HiraginoSansGB-W6 - - rm -f YuMin-{Medium,Demibold} - rm -f YuGo-{Medium,Bold} - - ln -s "/Library/Fonts/Yu Mincho Medium.otf" YuMin-Medium - ln -s "/Library/Fonts/Yu Mincho Demibold.otf" YuMin-Demibold - ln -s "/Library/Fonts/Yu Gothic Medium.otf" YuGo-Medium - ln -s "/Library/Fonts/Yu Gothic Bold.otf" YuGo-Bold - - rm -f STHeiti.ttf - rm -f STXihei.ttf - rm -f STFangsong.ttf - rm -f LiHeiPro.ttf - rm -f LiSongPro.ttf - - ln -s /Library/Fonts/华文黑体.ttf STHeiti.ttf - ln -s /Library/Fonts/华文细黑.ttf STXihei.ttf - ln -s /Library/Fonts/华文仿宋.ttf STFangsong.ttf - ln -s "/Library/Fonts/儷黑 Pro.ttf" LiHeiPro.ttf - ln -s "/Library/Fonts/儷宋 Pro.ttf" LiSongPro.ttf - ) - - return 0 -} - - -# generate the Ghostscript FontSpec files for the Hiragino fonts -# bundled on Mac OS X -mkfontspec ${GSRESDIR}/Font -mkcidfonts ${GSRESDIR}/CIDFont - -echo $(basename $0): done - -# end of file 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 deleted file mode 100755 index 1b37c1a0603..00000000000 --- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tools/release.sh +++ /dev/null @@ -1,58 +0,0 @@ -# -# release.sh -# copied from jfontmaps project and adapted - -PROJECT=cjk-gs-integrate -DIR=`pwd`/.. -VER=${VER:-`date +%Y%m%d.0`} - -TEMP=/tmp - -echo "Making Release $VER. Ctrl-C to cancel." -read REPLY -if test -d "$TEMP/$PROJECT-$VER"; then - echo "Warning: the directory '$TEMP/$PROJECT-$VER' is found:" - echo - ls $TEMP/$PROJECT-$VER - echo - echo -n "I'm going to remove this directory. Continue? yes/No" - echo - read REPLY <&2 - case $REPLY in - y*|Y*) rm -rf $TEMP/$PROJECT-$VER;; - *) echo "Aborted."; exit 1;; - esac -fi -echo -git commit -m "Release $VER" --allow-empty -git archive --format=tar --prefix=$PROJECT-$VER/ HEAD | (cd $TEMP && tar xf -) -git --no-pager log --date=short --format='%ad %aN <%ae>%n%n%x09* %s%d [%h]%n' > $TEMP/$PROJECT-$VER/ChangeLog -cd $TEMP -rm -rf $PROJECT-$VER-orig -cp -r $PROJECT-$VER $PROJECT-$VER-orig -cd $PROJECT-$VER -rm -f .gitignore -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 -# not necessary anymore, README.md is acceptable -#mv README.md README -cd .. -diff -urN $PROJECT-$VER-orig $PROJECT-$VER -tar zcf $DIR/$PROJECT-$VER.tar.gz $PROJECT-$VER -echo -echo You should execute -echo -echo " git push && git tag $VER && git push origin $VER" -echo -echo Informations for submitting CTAN: -echo " CONTRIBUTION: $PROJECT" -echo " VERSION: $VER" -echo " AUTHOR: Japanese TeX Development Community" -echo " SUMMARY: Tools to integrate CJK fonts into Ghostscript" -echo " DIRECTORY: fonts/utilities/$PROJECT" -echo " LICENSE: free/GPLv3" -echo " FILE: $DIR/$PROJECT-$VER.tar.gz" - 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 a1e56aec236..892dbb5ffe6 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 @@ -2,11 +2,16 @@ # # cjk-gs-integrate - setup Ghostscript for CID/TTF CJK fonts # -# Copyright 2015-2017 by Norbert Preining -# Copyright 2016-2017 by Japanese TeX Development Community +# Copyright 2015-2018 by Norbert Preining +# Copyright 2016-2018 by Japanese TeX Development Community # -# Based on research and work by Yusuke Kuroki, Bruno Voisin, Munehiro Yamamoto -# and the TeX Q&A wiki page +# This work is based on research and work by (in alphabetical order) +# Yusuke Kuroki +# Yusuke Terada +# Bruno Voisin +# Munehiro Yamamoto +# Hironobu Yamashita +# and the Japanese TeX Q&A wiki page # # This file is licensed under GPL version 3 or any later version. # For copyright statements see end of file. @@ -14,8 +19,14 @@ # For development see # https://github.com/texjporg/cjk-gs-support # +# LIMITATIONS: +# - Running the script (with default mode = actual setup/removing operations) +# always overwrites "cidfmap.local" and "cidfmap.aliases" without asking, +# whose file names might be common enough. If you choose to run the script, +# leave these files untouched. (Do NOT edit these files by yourself!) +# (This note also applies to MacTeX pre-shipped configuration files.) +# # TODO: -# - how to deal with MacTeX pre-shipped configuration files? # - interoperability with kanji-config-updmap # # Note that symlink names should be consistent with ptex-fontmaps! @@ -28,7 +39,7 @@ use Cwd 'abs_path'; use strict; (my $prg = basename($0)) =~ s/\.pl$//; -my $version = '20170624.0'; +my $version = '20180306.0'; if (win32()) { # conversion between internal (utf-8) and console (cp932): @@ -46,6 +57,16 @@ if (win32()) { print_warning("Sorry, we have only partial support for Windows!\n"); } +# The followings are installed by ptex-fontmaps (texjporg): +# * 2004-H +# * 2004-V +# The followings are created by Adobe but not considered official +# (see https://forums.adobe.com/thread/537415) +# * GB-RKSJ-H +# * GBT-RKSJ-H +# * KSC-RKSJ-H +# All others are provided in the latest Adobe CMap Resources: +# https://github.com/adobe-type-tools/cmap-resources my %encode_list = ( Japan => [ qw/ 2004-H @@ -117,7 +138,8 @@ my %encode_list = ( UniJISX02132004-UTF32-H UniJISX02132004-UTF32-V V - WP-Symbol/ ], + WP-Symbol + / ], GB => [ qw/ Adobe-GB1-0 Adobe-GB1-1 @@ -154,7 +176,8 @@ my %encode_list = ( UniGB-UTF32-H UniGB-UTF32-V UniGB-UTF8-H - UniGB-UTF8-V/ ], + UniGB-UTF8-V + / ], CNS => [ qw/ Adobe-CNS1-0 Adobe-CNS1-1 @@ -163,6 +186,7 @@ my %encode_list = ( Adobe-CNS1-4 Adobe-CNS1-5 Adobe-CNS1-6 + Adobe-CNS1-7 B5-H B5-V B5pc-H @@ -200,7 +224,8 @@ my %encode_list = ( UniCNS-UTF32-H UniCNS-UTF32-V UniCNS-UTF8-H - UniCNS-UTF8-V/ ], + UniCNS-UTF8-V + / ], Korea => [ qw/ Adobe-Korea1-0 Adobe-Korea1-1 @@ -227,7 +252,8 @@ my %encode_list = ( UniKS-UTF32-H UniKS-UTF32-V UniKS-UTF8-H - UniKS-UTF8-V/ ] ); + UniKS-UTF8-V + / ] ); # # location where links to fonts in texmf are created, relative to TEXMF @@ -254,6 +280,7 @@ my $dump_datafile = "$prg-data.dat"; my $opt_output; my $opt_fontdef; +my @opt_fontdef_add; my @opt_aliases; my $opt_filelist; my $opt_texmflink; @@ -279,6 +306,7 @@ my $opt_markdown = 0; if (! GetOptions( "o|output=s" => \$opt_output, "f|fontdef=s" => \$opt_fontdef, + "fontdef-add=s" => \@opt_fontdef_add, "a|alias=s" => \@opt_aliases, "filelist=s" => \$opt_filelist, "link-texmf:s" => \$opt_texmflink, @@ -314,20 +342,52 @@ my %user_aliases; if ($opt_help || $opt_markdown) { Usage(); - exit 0; + exit(0); } -if ($opt_debug) { +if ($opt_debug >= 2) { require Data::Dumper; $Data::Dumper::Indent = 1; } +my $otfinfo_available; +chomp(my $otfinfo_help = `otfinfo --help 2>$nul`); +if ($?) { + print_warning("The program 'otfinfo' not found in PATH.\n"); + print_warning("Sorry, we can't be safe enough to distinguish\n"); + print_warning("uppercase / lowercase file names.\n"); + $otfinfo_available = 0; +} else { + $otfinfo_available = 1; +} + +if (macosx()) { + # due to frequent incompatible changes in font file names by Apple, + # our built-in database doesn't support OS X 10.11 El Capitan or + # later versions + my $macos_ver = `sw_vers -productVersion`; + my $macos_ver_major = $macos_ver; + $macos_ver_major =~ s/^(\d+)\.(\d+).*/$1/; + my $macos_ver_minor = $macos_ver; + $macos_ver_minor =~ s/^(\d+)\.(\d+).*/$2/; + if ($macos_ver_major==10 && $macos_ver_minor>=8) { + if (!$opt_cleanup && !$opt_fontdef && !@opt_fontdef_add) { # if built-in only + print_warning("Our built-in database does not support recent\n"); + print_warning("versions of Mac OS (10.8 Mountain Lion or later)!\n"); + print_warning("If you want to use Hiragino fonts bundled with\n"); + print_warning("your OS, obtain external database file and\n"); + print_warning("specify it with --fontdef-add option!\n"); + print_warning("I'll continue with my built-in database ...\n"); + } + } +} + 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`); + chomp($foo = `kpsewhich -var-value=TEXMFLOCAL`); } else { # option was passed with an argument # -> use it @@ -342,7 +402,7 @@ if (defined($opt_akotfps)) { if (defined($opt_texmflink)) { $foo = $opt_texmflink; } else { - chomp( $foo = `kpsewhich -var-value=TEXMFLOCAL`); + chomp($foo = `kpsewhich -var-value=TEXMFLOCAL`); } } else { $foo = $opt_akotfps; @@ -382,10 +442,6 @@ if (defined($opt_dump_data)) { } else { $opt_dump_data = 0; } -if ($opt_dump_data && $opt_fontdef) { - print_warning("-f/--fontdef option ignored due to --dump-data\n"); - $opt_fontdef = 0; -} if ($opt_cleanup) { $opt_remove = 1; @@ -395,10 +451,24 @@ if ($opt_info) { $opt_listfonts = 1; $opt_listaliases = 1; } + +# check exclusive options; unsafe due to make_all_available() +if ($opt_listallaliases && $opt_listaliases) { + print_error("Both --list-all-aliases and --list-aliases!? I'm confused!\n"); + exit(1); +} if ($opt_listallaliases && $opt_listfonts) { print_error("Options --list-all-aliases and --list-fonts cannot be used at the same time!\n"); exit(1); } +if ($opt_cleanup && $opt_listfonts) { + print_error("Options --cleanup and --list-fonts cannot be used at the same time!\n"); + exit(1); +} +if ($opt_cleanup && $opt_listaliases) { + print_error("Options --cleanup and --list-aliases cannot be used at the same time!\n"); + exit(1); +} main(@ARGV); @@ -407,10 +477,11 @@ main(@ARGV); # sub main { # first, read font database to obtain %fontdb - # if $opt_dump_data is given, exit after dumping <DATA> to $dump_datafile print_info("reading font database ...\n"); read_font_database(); if ($opt_dump_data) { + # with --dump-data, dump only effective database and exit + dump_font_database(); if (-f $dump_datafile) { print_info("*** Data dumped to $dump_datafile ***\n"); exit(0); @@ -464,8 +535,8 @@ sub main { } } if (! -d $opt_output) { - $dry_run || mkdir($opt_output) || - die ("Cannot create directory $opt_output: $!"); + $dry_run || mkdir($opt_output) || + die("Cannot create directory $opt_output: $!"); } if ($opt_cleanup) { print_info("going to clean up $opt_output\n"); @@ -592,7 +663,7 @@ sub do_nonotf_fonts { 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}{'ttfname'}, $fontdb{$k}{'subfont'}); + $outp .= generate_cidfmap_entry($k, $fontdb{$k}{'class'}, $fontdb{$k}{'ttfname'}, -1); link_font($fontdb{$k}{'target'}, $cidfsubst, $fontdb{$k}{'ttfname'}); link_font($fontdb{$k}{'target'}, "$opt_texmflink/$ttf_pathpart", $fontdb{$k}{'ttfname'}) if $opt_texmflink; @@ -620,8 +691,8 @@ sub do_nonotf_fonts { mkdir("$opt_output/Init") || die("Cannot create directory $opt_output/Init: $!"); } - open(FOO, ">$opt_output/$cidfmap_local_pathpart") || - die "Cannot open $opt_output/$cidfmap_local_pathpart: $!"; + open(FOO, ">$opt_output/$cidfmap_local_pathpart") || + die("Cannot open $opt_output/$cidfmap_local_pathpart: $!"); print FOO $outp; close(FOO); } @@ -630,20 +701,16 @@ sub do_nonotf_fonts { sub do_aliases { my $fontdest = "$opt_output/Font"; + my $ciddest = "$opt_output/CIDFont"; # required for Heisei* check only my $cidfsubst = "$opt_output/CIDFSubst"; my $outp = ''; # # alias handling - # we use two levels of aliases, one is for the default names that - # are not actual fonts: - # Ryumin-Light, GothicBBB-Medium, FutoMinA101-Bold, FutoGoB101-Bold, - # Jun101-Light which are the original Morisawa names. - # - # the second level of aliases is for Morisawa OTF font names: - # RyuminPro-Light, GothicBBBPro-Medium, - # FutoMinA101Pro-Bold, FutoGoB101Pro-Bold - # Jun101Pro-Light - # + # we use two levels of aliases + # * one is for the default generic names (these are not actual fonts) + # Ryumin-Light, GothicBBB-Medium, ... etc. + # * the second level of aliases is for Morisawa OTF font names + # RyuminPro-Light, GothicBBBPro-Medium, ... etc. # the order of fonts selected is # defined in the Provides(Priority): Name in the font definiton # @@ -667,7 +734,10 @@ sub do_aliases { } } if (!$class) { - print_warning("Alias candidate for $al is empty!\n") if (!%{$aliases{$al}}); + if (!%{$aliases{$al}}) { + print_warning("Alias candidate for $al is empty, skipping!\n"); + next; + } # search lowest number my @ks = keys(%{$aliases{$al}}); my $first = (sort { $a <=> $b} @ks)[0]; @@ -689,6 +759,11 @@ sub do_aliases { print STDERR "unknown class $class for $al\n"; } } + # special case for native CID fonts in ancient days + # if not readable, add aliases for substitution + push @jal, "/HeiseiMin-W3 /Ryumin-Light ;" if (! -r "$ciddest/HeiseiMin-W3"); + push @jal, "/HeiseiKakuGo-W5 /GothicBBB-Medium ;" if (! -r "$ciddest/HeiseiKakuGo-W5"); + # $outp .= "\n% Japanese fonts\n" . join("\n", @jal) . "\n" if @jal; $outp .= "\n% Korean fonts\n" . join("\n", @kal) . "\n" if @kal; $outp .= "\n% Traditional Chinese fonts\n" . join("\n", @tal) . "\n" if @tal; @@ -700,8 +775,8 @@ sub do_aliases { mkdir("$opt_output/Init") || die("Cannot create directory $opt_output/Init: $!"); } - open(FOO, ">$opt_output/$cidfmap_aliases_pathpart") || - die "Cannot open $opt_output/$cidfmap_aliases_pathpart: $!"; + open(FOO, ">$opt_output/$cidfmap_aliases_pathpart") || + die("Cannot open $opt_output/$cidfmap_aliases_pathpart: $!"); print FOO $outp; close(FOO); } @@ -713,46 +788,70 @@ sub do_aliases { } sub update_master_cidfmap { + # what we have to do is: + # in add mode: + # * add an entry for the given argument + # * for tlgs.win32 pre-shipped cidfmap, prepend '%' to override + # the default of "(cidfmap.TeXLive) .runlibfile", + # in remove mode: + # * remove an entry for the given argument + # * for tlgs.win32 pre-shipped cidfmap, remove '%' to restore the default my $add = shift; my $cidfmap_master = "$opt_output/$cidfmap_pathpart"; - print_info(sprintf("%s $add %s cidfmap file ...\n", + 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: $!"); + die("Cannot open $cidfmap_master for reading: $!"); my $found = 0; + my $found_tl = 0; my $newmaster = ""; # in add mode: just search for the entry and set $found # in remove mode: collect all lines that do not match + # also, we handle "cidfmap.TeXLive" now while(<FOO>) { if (m/^\s*\(\Q$add\E\)\s\s*\.runlibfile\s*$/) { $found = 1; + } elsif (m/^\s*\(cidfmap\.TeXLive\)\s\s*\.runlibfile\s*$/) { + # if found, it has to be disabled in add mode in a way in which it can + # be detected in the (future) remove mode + next if ($found_tl); # skip it as duplicate (though unlikely to happen) + $found_tl = 1; + $newmaster .= "\%" if (!$opt_remove); # in add mode, disable it + $newmaster .= $_; # pass it as-is + } elsif (m/^\s*\%\%*\s*\(cidfmap\.TeXLive\)\s\s*\.runlibfile\s*$/) { + # if found, it should be the one disabled by myself in the previous run; + # restore it in remove mode + next if ($found_tl); # skip it as duplicate (though unlikely to happen) + $found_tl = 1; + $_ =~ s/\%//g if ($opt_remove); # in remove mode, enable it + $newmaster .= $_; # pass it } else { $newmaster .= $_; } } close(FOO); - # if the master cidfmap has a new line at end of file, + # if the original master cidfmap has a new line at end of file, # then $newmaster should end with "\n". # otherwise we add a new line, since there is a possibility of %EOF comment # without trailing new line (e.g. TL before r44039) - $newmaster =~ s/\n$//g; - $newmaster =~ s/$/\n/g; + $newmaster =~ s/\n$//; + $newmaster =~ s/$/\n/; if ($opt_remove) { - if ($found) { + if ($found || $found_tl) { return if $dry_run; open(FOO, ">", $cidfmap_master) || - die ("Cannot clean up $cidfmap_master: $!"); + die("Cannot clean up $cidfmap_master: $!"); print FOO $newmaster; close FOO; } } else { - if ($found) { + if ($found && !$found_tl) { print_info("$add already loaded in $cidfmap_master, no changes\n"); } else { return if $dry_run; open(FOO, ">", $cidfmap_master) || - die ("Cannot open $cidfmap_master for appending: $!"); + die("Cannot open $cidfmap_master for appending: $!"); print FOO $newmaster; print FOO "($add) .runlibfile\n"; close(FOO); @@ -762,7 +861,7 @@ sub update_master_cidfmap { return if $dry_run; return if $opt_remove; open(FOO, ">", $cidfmap_master) || - die ("Cannot open $cidfmap_master for writing: $!"); + die("Cannot open $cidfmap_master for writing: $!"); print FOO "($add) .runlibfile\n"; close(FOO); } @@ -776,9 +875,11 @@ sub generate_cidfmap_entry { # extract subfont my $s = "/$n << /FileType /TrueType /Path pssystemparams /GenericResourceDir get - (CIDFSubst/$f) concatstrings - /SubfontID $sf - /CSI [($c"; + (CIDFSubst/$f) concatstrings\n"; + if ($sf >= 0) { # in this script, $sf < 0 represents TTF + $s .= " /SubfontID $sf\n"; + } + $s .= " /CSI [($c"; if ($c eq "Japan") { $s .= "1) 6]"; } elsif ($c eq "GB") { @@ -807,7 +908,7 @@ sub generate_font_snippet { unlink "$fd/$n-$enc" if (-f "$fd/$n-$enc"); next; } - open(FOO, ">$fd/$n-$enc") || + open(FOO, ">$fd/$n-$enc") || die("cannot open $fd/$n-$enc for writing: $!"); print FOO "%!PS-Adobe-3.0 Resource-Font %%DocumentNeededResources: $enc (CMap) @@ -835,7 +936,7 @@ sub add_akotfps_data { # # link_font operation -# $opt_force is *not* treated first to warn only +# $opt_force is *not* treated first to warn only # at really critical cases # case 1: # exists, is link, link targets agree @@ -861,7 +962,7 @@ sub add_akotfps_data { # not exists # $opt_force is ignored # do nothing or add according to $opt_remove -# +# sub link_font { my ($f, $cd, $n) = @_; return if $dry_run; @@ -927,7 +1028,7 @@ sub make_dir { if (-r $d) { if (! -d $d) { print_error("$d is not a directory, $w\n"); - exit 1; + exit(1); } } else { $dry_run || make_path($d); @@ -1015,7 +1116,7 @@ sub maybe_unlink { # write batch file (windows only) sub write_winbatch { return if $dry_run; - open(FOO, ">$winbatch") || + open(FOO, ">$winbatch") || die("cannot open $winbatch for writing: $!"); # $winbatch_content may contain multibyte characters, and they # should be encoded in cp932 in batch file @@ -1032,7 +1133,7 @@ sub write_akotfps_datafile { return if $dry_run; make_dir("$opt_akotfps/$akotfps_pathpart", "cannot create $akotfps_datafilename in it!"); - open(FOO, ">$opt_akotfps/$akotfps_pathpart/$akotfps_datafilename") || + open(FOO, ">$opt_akotfps/$akotfps_pathpart/$akotfps_datafilename") || die("cannot open $opt_akotfps/$akotfps_pathpart/$akotfps_datafilename for writing: $!"); print FOO "% psnames-for-otf % @@ -1158,7 +1259,7 @@ sub make_all_available { sub check_for_files { my @foundfiles; if ($opt_filelist) { - open(FOO, "<", $opt_filelist) || die "Cannot open $opt_filelist: $!"; + open(FOO, "<", $opt_filelist) || die("Cannot open $opt_filelist: $!"); @foundfiles = <FOO>; close(FOO) || warn "Cannot close $opt_filelist: $!"; } else { @@ -1166,7 +1267,7 @@ sub check_for_files { my @fn; for my $k (keys %fontdb) { for my $f (keys %{$fontdb{$k}{'files'}}) { - # check for subfont extension + # check for subfont extension if ($f =~ m/^(.*)\(\d*\)$/) { push @fn, $1; } else { @@ -1181,11 +1282,20 @@ sub check_for_files { push @extradirs, "c:/windows/fonts//"; } else { # other dirs to check, for normal unix? - for my $d (qw!/Library/Fonts /System/Library/Fonts /System/Library/Assets /Network/Library/Fonts /usr/share/fonts!) { + for my $d (qw!/Library/Fonts /System/Library/Fonts /System/Library/Assets + /Network/Library/Fonts /usr/share/fonts!) { push @extradirs, "$d//" if (-d $d); # recursive search } - # macosx specific; the path contains white space, so hack required - for my $d (qw!/Applications/Microsoft__Word.app /Applications/Microsoft__Excel.app /Applications/Microsoft__PowerPoint.app!) { + # the path contains white space, so hack required + for my $d (qw!/Library/Application__Support/Apple/Fonts!) { + my $sd = $d; + $sd =~ s/__/ /; + push @extradirs, "$sd//" if (-d "$sd"); # recursive search + } + # office for mac 2016 + for my $d (qw!/Applications/Microsoft__Word.app + /Applications/Microsoft__Excel.app + /Applications/Microsoft__PowerPoint.app!) { my $sd = $d; $sd =~ s/__/ /; push @extradirs, "$sd/Contents/Resources/Fonts/" if (-d "$sd/Contents/Resources/Fonts"); @@ -1267,30 +1377,66 @@ sub check_for_files { } my $bn = basename($f); # kpsewhich -all might return multiple files with the same basename; - # choose the first one among them - $bntofn{$bn} = $realf if (!$bntofn{$bn}); + # collect all of them + $bntofn{$bn}{$realf} = 1; } # show the %fontdb before file check - if ($opt_debug > 0) { - print_debug("dumping font database before file check:\n"); - print_debug(Data::Dumper::Dumper(\%fontdb)); + if ($opt_debug >= 2) { + print_ddebug("dumping font database before file check:\n"); + print_ddebug(Data::Dumper::Dumper(\%fontdb)); } - if ($opt_debug > 1) { - print_ddebug("dumping basename to filename list:\n"); - print_ddebug(Data::Dumper::Dumper(\%bntofn)); + if ($opt_debug >= 3) { + print_dddebug("dumping basename to filename list:\n"); + print_dddebug(Data::Dumper::Dumper(\%bntofn)); } # update the %fontdb with the found files for my $k (keys %fontdb) { $fontdb{$k}{'available'} = 0; for my $f (keys %{$fontdb{$k}{'files'}}) { - # check for subfont extension + # check for subfont extension my $realfile = $f; $realfile =~ s/^(.*)\(\d*\)$/$1/; - if ($bntofn{$realfile}) { + # check for casefolding + # we might catch different names (batang/Batang) and identify them wrongly on + # * case-insensitive file systems (like HFS on MacOS) + # * kpathsea 6.3.0 or later, with casefolding fallback search (TL2018) + # check the actual psname using otfinfo utility, only when we "know" + # both uppercase/lowercase font files are possible and they are different + my $actualpsname; + my $bname; + for my $b (keys %{$bntofn{$realfile}}) { + if ($fontdb{$k}{'casefold'} && $otfinfo_available && + ($fontdb{$k}{'files'}{$f}{'type'} eq 'OTF' || $fontdb{$k}{'files'}{$f}{'type'} eq 'TTF')) { + print_debug("We need to test whether\n"); + print_debug(" $b\n"); + print_debug("is the correct one. Invoking otfinfo ...\n"); + chomp($actualpsname = `otfinfo -p "$b"`); + if ($?) { + # something is wrong with the font file, or otfinfo does not support it; + # still there is a chance that Ghostscript supports, so don't discard it + print_debug("... command exited with $?!\n"); + print_debug("OK, I'll take this, but it may not work properly.\n"); + $bname = $b; + last; + } + if ($actualpsname ne $k) { + print_debug("... PSName returned by otfinfo ($actualpsname) is\n"); + print_debug("different from our database ($k), discarding!\n"); + } else { + print_debug("... test passed.\n"); + $bname = $b; + last; + } + } else { + $bname = $b; + last; + } + } + if ($bname) { # we found a representative, make it available - $fontdb{$k}{'files'}{$f}{'target'} = $bntofn{$realfile}; + $fontdb{$k}{'files'}{$f}{'target'} = $bname; $fontdb{$k}{'available'} = 1; } else { # delete the entry for convenience @@ -1313,14 +1459,14 @@ sub check_for_files { 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' || $fontdb{$k}{'type'} eq 'TTC' || $fontdb{$k}{'type'} eq 'OTC'); + $fontdb{$k}{'subfont'} = $sf if ($fontdb{$k}{'type'} eq 'TTC' || $fontdb{$k}{'type'} eq 'OTC'); } # not needed anymore # delete $fontdb{$k}{'files'}; } - if ($opt_debug > 0) { - print_debug("dumping font database:\n"); - print_debug(Data::Dumper::Dumper(\%fontdb)); + if ($opt_debug >= 2) { + print_ddebug("dumping font database:\n"); + print_ddebug(Data::Dumper::Dumper(\%fontdb)); } } @@ -1374,9 +1520,9 @@ sub compute_aliases { $user_aliases{$ll} = $rr; } } - if ($opt_debug > 0) { - print_debug("dumping aliases:\n"); - print_debug(Data::Dumper::Dumper(\%aliases)); + if ($opt_debug >= 2) { + print_ddebug("dumping aliases:\n"); + print_ddebug(Data::Dumper::Dumper(\%aliases)); } } @@ -1431,56 +1577,73 @@ sub determine_nonotf_link_name { sub read_font_database { my @dbl; + # if --fontdef=foo is given, disregard built-in database and + # use "foo" as a substitute; otherwise, use built-in database if ($opt_fontdef) { - open (FDB, "<$opt_fontdef") || - die "Cannot find $opt_fontdef: $!"; + my $foo = kpse_miscfont($opt_fontdef); + open(FDB, "<$foo") || + die("Cannot find $opt_fontdef: $!"); @dbl = <FDB>; close(FDB); } else { @dbl = <DATA>; } - chomp(@dbl); - # add a "final empty line" to easy parsing - push @dbl, ""; - - if ($opt_dump_data) { - open(FOO, ">$dump_datafile") || - die("cannot open $dump_datafile for writing: $!"); + read_each_font_database(@dbl); + # if --fontdef-add=bar is given, use "bar" as an addition + # to the current database; if the same Name entry appears, + # overwrite existing one (that is, the addition wins) + for (@opt_fontdef_add) { + my $foo = kpse_miscfont($_); + open(FDB, "<$foo") || + die("Cannot find $_: $!"); + @dbl = <FDB>; + close(FDB); + read_each_font_database(@dbl); } +} +sub read_each_font_database { + my (@curdbl) = @_; my $fontname = ""; my $fontclass = ""; my %fontprovides = (); + my $fontcasefold = ""; my %fontfiles; my $psname = ""; my $lineno = 0; - for my $l (@dbl) { - if ($opt_dump_data) { - print FOO "$l\n"; - next; - } - + chomp(@curdbl); + push @curdbl, ""; # add a "final empty line" to easy parsing + for my $l (@curdbl) { $lineno++; - next if ($l =~ m/^\s*#/); - if ($l =~ m/^\s*$/) { + next if ($l =~ m/^\s*#/); # skip comment line + $l =~ s/\s*#.*$//; # skip comment after '#' + if ($l =~ m/^\s*$/) { # empty line is a separator between entries if ($fontname || $fontclass || keys(%fontfiles)) { if ($fontname && $fontclass && keys(%fontfiles)) { my $realfontname = ($psname ? $psname : $fontname); + if ($fontdb{$realfontname}{'origname'}) { + # needed for --fontdef-add, which allows overwriting with external database given by user + print_debug("$fontdb{$realfontname}{'origname'} is already registered in database,\n"); + print_debug("overwriting with the new one ...\n"); + } $fontdb{$realfontname}{'origname'} = $fontname; $fontdb{$realfontname}{'class'} = $fontclass; + $fontdb{$realfontname}{'casefold'} = $fontcasefold; $fontdb{$realfontname}{'files'} = { %fontfiles }; $fontdb{$realfontname}{'provides'} = { %fontprovides }; - if ($opt_debug > 1) { - print_ddebug("Dumping fontfiles for $realfontname: " . Data::Dumper::Dumper(\%fontfiles)); + if ($opt_debug >= 3) { + print_dddebug("Dumping fontfiles for $realfontname: " . Data::Dumper::Dumper(\%fontfiles)); } # reset to start $fontname = $fontclass = $psname = ""; + $fontcasefold = ""; %fontfiles = (); %fontprovides = (); } else { print_warning("incomplete entry above line $lineno for $fontname/$fontclass, skipping!\n"); # reset to start $fontname = $fontclass = $psname = ""; + $fontcasefold = ""; %fontfiles = (); %fontprovides = (); } @@ -1489,9 +1652,38 @@ sub read_font_database { } next; } + if ($l =~ m/^!INCLUDE\s*(.*)$/) { # for remove-only database + next if (!$opt_cleanup); + my @dbl; + my $foo = kpse_miscfont($1); + if (!open(FDB, "<$foo")) { + print_warning("Cannot find $1, skipping!\n"); + next; + } + @dbl = <FDB>; + close(FDB); + print_debug("Reading database file $1...\n"); + read_each_font_database(@dbl); + next; + } + if ($l =~ m/^INCLUDE\s*(.*)$/) { + my @dbl; + my $foo = kpse_miscfont($1); + if (!open(FDB, "<$foo")) { + print_warning("Cannot find $1, skipping!\n"); + next; + } + @dbl = <FDB>; + close(FDB); + print_debug("Reading database file $1...\n"); + read_each_font_database(@dbl); + next; + } if ($l =~ m/^Name:\s*(.*)$/) { $fontname = $1; next; } if ($l =~ m/^PSName:\s*(.*)$/) { $psname = $1; next; } if ($l =~ m/^Class:\s*(.*)$/) { $fontclass = $1 ; next ; } + if ($l =~ m/^Provides\((\d+)\):\s*(.*)$/) { $fontprovides{$2} = $1; next; } + if ($l =~ m/^Casefold:\s*(.*)$/) { $fontcasefold = $1 ; next ; } # new code: distinguish 4 types (otf, otc, ttf, ttc) if ($l =~ m/^OTFname(\((\d+)\))?:\s*(.*)$/) { my $fn = $3; @@ -1501,8 +1693,8 @@ sub read_font_database { if (win32()) { $encoded_fn = encode_utftocp($fn); } - print_ddebug("filename: ", ($encoded_fn ? "$encoded_fn" : "$fn"), "\n"); - print_ddebug("type: otf\n"); + print_dddebug("filename: ", ($encoded_fn ? "$encoded_fn" : "$fn"), "\n"); + print_dddebug("type: otf\n"); $fontfiles{$fn}{'type'} = 'OTF'; next; } @@ -1514,8 +1706,8 @@ sub read_font_database { if (win32()) { $encoded_fn = encode_utftocp($fn); } - print_ddebug("filename: ", ($encoded_fn ? "$encoded_fn" : "$fn"), "\n"); - print_ddebug("type: otc\n"); + print_dddebug("filename: ", ($encoded_fn ? "$encoded_fn" : "$fn"), "\n"); + print_dddebug("type: otc\n"); $fontfiles{$fn}{'type'} = 'OTC'; next; } @@ -1527,8 +1719,8 @@ sub read_font_database { if (win32()) { $encoded_fn = encode_utftocp($fn); } - print_ddebug("filename: ", ($encoded_fn ? "$encoded_fn" : "$fn"), "\n"); - print_ddebug("type: ttf\n"); + print_dddebug("filename: ", ($encoded_fn ? "$encoded_fn" : "$fn"), "\n"); + print_dddebug("type: ttf\n"); $fontfiles{$fn}{'type'} = 'TTF'; next; } @@ -1540,8 +1732,8 @@ sub read_font_database { if (win32()) { $encoded_fn = encode_utftocp($fn); } - print_ddebug("filename: ", ($encoded_fn ? "$encoded_fn" : "$fn"), "\n"); - print_ddebug("type: ttc\n"); + print_dddebug("filename: ", ($encoded_fn ? "$encoded_fn" : "$fn"), "\n"); + print_dddebug("type: ttc\n"); $fontfiles{$fn}{'type'} = 'TTC'; next; } @@ -1554,18 +1746,18 @@ sub read_font_database { if (win32()) { $encoded_fn = encode_utftocp($fn); } - print_ddebug("filename: ", ($encoded_fn ? "$encoded_fn" : "$fn"), "\n"); + print_dddebug("filename: ", ($encoded_fn ? "$encoded_fn" : "$fn"), "\n"); if ($fn =~ m/\.otf$/i) { - print_ddebug("type: otf\n"); + print_dddebug("type: otf\n"); $fontfiles{$fn}{'type'} = 'OTF'; } elsif ($fn =~ m/\.otc(\(\d+\))?$/i) { - print_ddebug("type: otc\n"); + print_dddebug("type: otc\n"); $fontfiles{$fn}{'type'} = 'OTC'; } elsif ($fn =~ m/\.ttf$/i) { - print_ddebug("type: ttf\n"); + print_dddebug("type: ttf\n"); $fontfiles{$fn}{'type'} = 'TTF'; } elsif ($fn =~ m/\.ttc(\(\d+\))?$/i) { - print_ddebug("type: ttc\n"); + print_dddebug("type: ttc\n"); $fontfiles{$fn}{'type'} = 'TTC'; } else { print_warning("cannot determine font type of $fn at line $lineno, skipping!\n"); @@ -1573,24 +1765,57 @@ sub read_font_database { } next; } - if ($l =~ m/^Provides\((\d+)\):\s*(.*)$/) { $fontprovides{$2} = $1; next; } + # only for removing + if ($l =~ m/^RMVname(\((\d+)\))?:\s*(.*)$/) { + my $fn = $3; + $fontfiles{$fn}{'priority'} = ($2 ? $2 : 10); + # cp932 for win32 console + my $encoded_fn; + if (win32()) { + $encoded_fn = encode_utftocp($fn); + } + print_dddebug("filename: ", ($encoded_fn ? "$encoded_fn" : "$fn"), "\n"); + print_dddebug("type: remove\n"); + $fontfiles{$fn}{'type'} = 'RMV'; + next; + } # we are still here?? - print_error("Cannot parse this file at line $lineno, exiting. Strange line: >>>$l<<<\n"); - exit (1); + print_error("Cannot parse this file at line $lineno, exiting. + Strange line: >>>$l<<<\n"); + exit(1); } +} - if ($opt_dump_data) { - close(FOO); +sub dump_font_database { + open(FOO, ">$dump_datafile") || + die("cannot open $dump_datafile for writing: $!"); + for my $k (sort keys %fontdb) { + print FOO "Name: $fontdb{$k}{'origname'}\n"; + print FOO "PSName: $k\n" if ($fontdb{$k}{'origname'} ne $k); + print FOO "Class: $fontdb{$k}{'class'}\n"; + for my $p (sort keys %{$fontdb{$k}{'provides'}}) { + print FOO "Provides($fontdb{$k}{'provides'}{$p}): $p\n"; + } + print FOO "Casefold: $fontdb{$k}{'casefold'}\n" if ($fontdb{$k}{'casefold'}); + for my $f (sort { $fontdb{$k}{'files'}{$a}{'priority'} + <=> + $fontdb{$k}{'files'}{$b}{'priority'} } + keys %{$fontdb{$k}{'files'}}) { + print FOO "$fontdb{$k}{'files'}{$f}{'type'}name($fontdb{$k}{'files'}{$f}{'priority'}): $f\n"; + } + print FOO "\n"; # empty line is a separator between entries } + close(FOO); } sub find_gs_resource { my $foundres = ''; if (win32()) { # determine tlgs or native gs - chomp( my $foo = `kpsewhich -var-value=SELFAUTOPARENT`); + chomp(my $foo = `kpsewhich -var-value=SELFAUTOPARENT`); if ( -d "$foo/tlpkg/tlgs" ) { # should be texlive with tlgs + print_debug("Assuming tlgs win32 ...\n"); $foundres = "$foo/tlpkg/tlgs/Resource"; # for TL2016, tlgs binary has built-in Resource, # so we cannot set up CJK fonts correctly. @@ -1605,25 +1830,54 @@ sub find_gs_resource { $cidfmap_local_pathpart = "../lib/cidfmap.local"; $cidfmap_aliases_pathpart = "../lib/cidfmap.aliases"; } else { - # TODO: we assume gswin32c is in the path - # paths other than c:/gs/gs$gsver/Resource are not considered - chomp( my $gsver = `gswin32c --version 2>$nul` ); - $foundres = "c:/gs/gs$gsver/Resource"; - if ( ! -d $foundres ) { - $foundres = ''; + # we assume gswin32c is in the path + # TODO: what should we do for gswin64c? + chomp($foundres = `where gswin32c 2>$nul`); # assume 'where' is available + if ($?) { + print_error("Cannot run where gswin32c ...\n"); + } else { + # trial 1: assume the relative path + # when C:\path\to\bin\gswin32c.exe is found, then there should be + # C:\path\to\Resource (note that 'where' returns backslash-ed path) + print_debug("Finding gs resource by assuming relative path ...\n"); + $foundres = encode_cptoutf($foundres); # 99.99% unnecessary + $foundres =~ s!\\!/!g; + $foundres =~ s!/bin/gswin32c\.exe$!/Resource!; + if ( ! -d $foundres ) { + $foundres = ''; + } + if (!$foundres) { + print_debug("Found gs but no resource, try another routine ...\n"); + } + } + if (!$foundres) { + chomp(my $gsver = `gswin32c --version 2>$nul`); + if ($?) { + print_error("Cannot run gswin32c --version ...\n"); + } else { + # trial 2: assume the fixed path, c:/gs/gs$gsver/Resource + print_debug("Finding gs resource by assuming fixed path ...\n"); + $foundres = "c:/gs/gs$gsver/Resource"; + if ( ! -d $foundres ) { + $foundres = ''; + } + if (!$foundres) { + print_error("Found gs but no resource???\n"); + } + } } } } else { # we assume that gs is in the path - chomp( my $gsver = `gs --version 2>$nul` ); + chomp(my $gsver = `gs --version 2>$nul`); if ($?) { - print_error("Cannot get gs version ...\n"); + print_error("Cannot run gs --version ...\n"); } else { # trial 1: assume the relative path # when /path/to/bin/gs is found, then there should be # /path/to/share/ghostscript/$(gs --version)/Resource print_debug("Finding gs resource by assuming relative path ...\n"); - chomp( $foundres = `which gs` ); + chomp($foundres = `which gs`); $foundres =~ s!/bin/gs$!/share/ghostscript/$gsver/Resource!; if ( ! -d $foundres ) { $foundres = ''; @@ -1633,7 +1887,7 @@ sub find_gs_resource { } } if (!$foundres) { - chomp( my @ret = `gs --help 2>$nul` ); + chomp(my @ret = `gs --help 2>$nul`); if ($?) { print_error("Cannot run gs --help ...\n"); } else { @@ -1659,6 +1913,16 @@ sub find_gs_resource { return $foundres; } +sub kpse_miscfont { + my ($file) = @_; + chomp(my $foo = `kpsewhich -format=miscfont $file`); + # for GitHub repository diretory structure + if ($foo eq "") { + $foo = "database/$file" if (-f "database/$file"); + } + return $foo; +} + sub encode_utftocp { my ($foo) = @_; $foo = Encode::decode('utf-8', $foo); @@ -1687,6 +1951,9 @@ sub Usage { is searched and used. -f, --fontdef FILE specify alternate set of font definitions, if not given, the built-in set is used +--fontdef-add FILE specify additional set of font definitions, to + overwrite subset of built-in definitions; + can be given multiple times -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; @@ -1722,9 +1989,10 @@ sub Usage { "; my $commandoptions = " ---dump-data [FILE] dump the built-in set of font definitions; you can - easily modify it, and tell me with -f (or --fontdef) - the data file name defaults to $dump_datafile +--dump-data [FILE] dump the set of font definitions which is currently + effective, where FILE (the dump output) defaults to + $dump_datafile; you can easily modify it, + and tell me with -f (or --fontdef) option --only-aliases regenerate only cidfmap.aliases file, instead of all --list-aliases lists the available aliases and their options, with the selected option on top @@ -1765,7 +2033,7 @@ The `<Resource>` dir is either given by `-o`/`--output`, or otherwise searched from an installed Ghostscript (binary name is assumed to be 'gs' on unix, 'gswin32c' on win32). -Aliases are added to +Aliases are added to <Resource>/Init/cidfmap.aliases -- if you are using tlgs win32, tlpkg/tlgs/lib/cidfmap.aliases instead @@ -1819,7 +2087,8 @@ are added: Japanese: - Ryumin-Light GothicBBB-Medium FutoMinA101-Bold FutoGoB101-Bold Jun101-Light + Ryumin-Light GothicBBB-Medium FutoMinA101-Bold FutoGoB101-Bold + MidashiMin-MA31 MidashiGo-MB31 Jun101-Light Korean: @@ -1835,20 +2104,23 @@ Traditional Chinese: MSung-Light MSung-Medium 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 Pr6N, Morisawa, Hiragino ProN, Hiragino, - Kozuka Pr6N, Kozuka ProVI, Kozuka, Yu OSX, Yu Win, - MS, Moga-Mobo-ex, Moga-Mobo, IPAex, IPA, Ume + RyuminPro-Light GothicBBBPro-Medium + FutoMinA101Pro-Bold FutoGoB101Pro-Bold + MidashiMinPro-MA31 MidashiGoPro-MB31 Jun101Pro-Light +The order is determined by the `Provides` setting in the font database. That is, the first font found in this order will be used to provide the alias if necessary. +For the Japanese fonts: + Morisawa Pr6N, Morisawa, Hiragino ProN, Hiragino, + Kozuka Pr6N, Kozuka ProVI, Kozuka Pro, Kozuka Std, + Yu OS X, Yu Win, MS, + Moga-Mobo-ex, Moga-Mobo, IPAex, IPA, Ume + For the Korean fonts: - (Hanyang,) Adobe, Solaris-hanyang, MS, Unfonts, Baekmuk + (Hanyang,) Adobe, Solaris, MS, Unfonts, Baekmuk For the Simplified Chinese: Adobe, Fandol, Hiragino, Founder, MS, CJKUnifonts, Arphic, CJKUnifonts-ttf @@ -1867,8 +2139,11 @@ requirements of `LL` and `RR` must be fulfilled: my $authors = " The script and its documentation was written by Norbert Preining, based -on research and work by Yusuke Kuroki, Bruno Voisin, Hironobu Yamashita, -Munehiro Yamamoto and the TeX Q&A wiki page. +on research and work by Yusuke Kuroki, Yusuke Terada, Bruno Voisin, +Hironobu Yamashita, Munehiro Yamamoto and the TeX Q&A wiki page. + +Maintained by Japanese TeX Development Community. For development, see + https://github.com/texjporg/cjk-gs-support The script is licensed under GNU General Public License Version 3 or later. The contained font data is not copyrightable. @@ -1916,12 +2191,12 @@ The contained font data is not copyrightable. print_for_out($authors, " "); print "\n"; } - exit 0; + exit(0); } sub print_for_out { my ($what, $indent) = @_; - for (split /\n/, $what) { + for (split /\n/, $what) { next if m/`````/; s/\s*####\s*//g; if ($_ eq '') { @@ -1941,7 +2216,7 @@ sub print_verbose { print STDOUT "$prg: ", @_; } sub print_warning { - print STDERR "$prg [WARNING]: ", @_ if (!$opt_quiet) + print STDERR "$prg [WARNING]: ", @_ if (!$opt_quiet) } sub print_error { print STDERR "$prg [ERROR]: ", @_; @@ -1952,6 +2227,9 @@ sub print_debug { sub print_ddebug { print STDERR "$prg [DEBUG]: ", @_ if ($opt_debug >= 2); } +sub print_dddebug { + print STDERR "$prg [DEBUG]: ", @_ if ($opt_debug >= 3); +} __DATA__ @@ -1963,616 +2241,42 @@ __DATA__ # JAPANESE FONTS # -# Morisawa - -Name: A-OTF-RyuminPr6N-Light -PSName: RyuminPr6N-Light -Class: Japan -Provides(10): Ryumin-Light -Provides(10): RyuminPro-Light -Provides(10): HiraMinProN-W3 -Provides(10): HiraMinPro-W3 -OTFname: A-OTF-RyuminPr6N-Light.otf - -Name: A-OTF-RyuminPro-Light -PSName: RyuminPro-Light -Class: Japan -Provides(20): Ryumin-Light -Provides(20): HiraMinPro-W3 -OTFname: A-OTF-RyuminPro-Light.otf - -Name: A-OTF-FutoMinA101Pr6N-Bold -PSName: FutoMinA101Pr6N-Bold -Class: Japan -Provides(10): FutoMinA101-Bold -Provides(10): FutoMinA101Pro-Bold -Provides(10): HiraMinProN-W6 -Provides(10): HiraMinPro-W6 -OTFname: A-OTF-FutoMinA101Pr6N-Bold.otf - -Name: A-OTF-FutoMinA101Pro-Bold -PSName: FutoMinA101Pro-Bold -Class: Japan -Provides(20): FutoMinA101-Bold -Provides(20): HiraMinPro-W6 -OTFname: A-OTF-FutoMinA101Pro-Bold.otf - -Name: A-OTF-GothicBBBPr6N-Medium -PSName: GothicBBBPr6N-Medium -Class: Japan -Provides(10): GothicBBB-Medium -Provides(10): GothicBBBPro-Medium -Provides(10): HiraKakuProN-W3 -Provides(10): HiraKakuPro-W3 -OTFname: A-OTF-GothicBBBPr6N-Medium.otf - -Name: A-OTF-GothicBBBPro-Medium -PSName: GothicBBBPro-Medium -Class: Japan -Provides(20): GothicBBB-Medium -Provides(20): HiraKakuPro-W3 -OTFname: A-OTF-GothicBBBPro-Medium.otf - -Name: A-OTF-FutoGoB101Pr6N-Bold -PSName: FutoGoB101Pr6N-Bold -Class: Japan -Provides(10): FutoGoB101-Bold -Provides(10): FutoGoB101Pro-Bold -Provides(10): HiraKakuProN-W6 -Provides(10): HiraKakuPro-W6 -OTFname: A-OTF-FutoGoB101Pr6N-Bold.otf - -Name: A-OTF-FutoGoB101Pro-Bold -PSName: FutoGoB101Pro-Bold -Class: Japan -Provides(20): FutoGoB101-Bold -Provides(20): HiraKakuPro-W6 -OTFname: A-OTF-FutoGoB101Pro-Bold.otf - -Name: A-OTF-MidashiGoPr6N-MB31 -PSName: MidashiGoPr6N-MB31 -Class: Japan -Provides(10): MidashiGo-MB31 -Provides(10): MidashiGoPro-MB31 -Provides(10): HiraKakuStdN-W8 -Provides(10): HiraKakuStd-W8 -OTFname: A-OTF-MidashiGoPr6N-MB31.otf - -Name: A-OTF-MidashiGoPro-MB31 -PSName: MidashiGoPro-MB31 -Class: Japan -Provides(20): MidashiGo-MB31 -Provides(20): HiraKakuStd-W8 -OTFname: A-OTF-MidashiGoPro-MB31.otf - -# A-OTF-Jun101Pr6N-Light has been replaced by A-OTF-ShinMGoPr6N-Light -# in otf-(up-)morisawa-pr6n.map since jfontmaps 20140301.0 -# now unnecessary, but reserved for backward compatibility -Name: A-OTF-Jun101Pr6N-Light -PSName: Jun101Pr6N-Light -Class: Japan -Provides(11): Jun101-Light -Provides(11): Jun101Pro-Light -Provides(11): HiraMaruProN-W4 -Provides(11): HiraMaruPro-W4 -OTFname: A-OTF-Jun101Pr6N-Light.otf - -Name: A-OTF-Jun101Pro-Light -PSName: Jun101Pro-Light -Class: Japan -Provides(20): Jun101-Light -Provides(20): HiraMaruPro-W4 -OTFname: A-OTF-Jun101Pro-Light.otf - -Name: A-OTF-ShinMGoPr6N-Light -PSName: ShinMGoPr6N-Light -Class: Japan -Provides(10): Jun101-Light -Provides(10): Jun101Pro-Light -Provides(10): HiraMaruProN-W4 -Provides(10): HiraMaruPro-W4 -OTFname: A-OTF-ShinMGoPr6N-Light.otf - -# Morisawa others (for moriprop); -# A-OTF-Jun101Pro-Light.otf and A-OTF-RyuminPro-Light.otf already added - -Name: A-OTF-Jun201Pro-Regular -PSName: Jun201Pro-Regular -Class: Japan -Provides(20): Jun201-Regular -OTFname: A-OTF-Jun201Pro-Regular.otf - -Name: A-OTF-Jun34Pro-Medium -PSName: Jun34Pro-Medium -Class: Japan -Provides(20): Jun34-Medium -OTFname: A-OTF-Jun34Pro-Medium.otf - -Name: A-OTF-Jun501Pro-Bold -PSName: Jun501Pro-Bold -Class: Japan -Provides(20): Jun501-Bold -OTFname: A-OTF-Jun501Pro-Bold.otf - -Name: A-OTF-RyuminPro-Regular -PSName: RyuminPro-Regular -Class: Japan -Provides(20): Ryumin-Regular -OTFname: A-OTF-RyuminPro-Regular.otf - -Name: A-OTF-RyuminPro-Medium -PSName: RyuminPro-Medium -Class: Japan -Provides(20): Ryumin-Medium -OTFname: A-OTF-RyuminPro-Medium.otf - -Name: A-OTF-RyuminPro-Bold -PSName: RyuminPro-Bold -Class: Japan -Provides(20): Ryumin-Bold -OTFname: A-OTF-RyuminPro-Bold.otf - -Name: A-OTF-RyuminPro-Heavy -PSName: RyuminPro-Heavy -Class: Japan -Provides(20): Ryumin-Heavy -OTFname: A-OTF-RyuminPro-Heavy.otf - -Name: A-OTF-RyuminPro-Ultra -PSName: RyuminPro-Ultra -Class: Japan -Provides(20): Ryumin-Ultra -OTFname: A-OTF-RyuminPro-Ultra.otf - -Name: A-OTF-ShinGoPro-Light -PSName: ShinGoPro-Light -Class: Japan -Provides(20): ShinGo-Light -OTFname: A-OTF-ShinGoPro-Light.otf - -Name: A-OTF-ShinGoPro-Regular -PSName: ShinGoPro-Regular -Class: Japan -Provides(20): ShinGo-Regular -OTFname: A-OTF-ShinGoPro-Regular.otf +# Morisawa -- Provides level 10(Pr6N), 15(Pr6), 18(Pr5), 20(Pro) +INCLUDE cjkgs-morisawa.dat +INCLUDE cjkgs-morisawa-extra.dat -Name: A-OTF-ShinGoPro-Medium -PSName: ShinGoPro-Medium -Class: Japan -Provides(20): ShinGo-Medium -OTFname: A-OTF-ShinGoPro-Medium.otf +# Hiragino -- Provides level 30(ProN), 40(Pro) +INCLUDE cjkgs-hiragino.dat -Name: A-OTF-ShinGoPro-Bold -PSName: ShinGoPro-Bold -Class: Japan -Provides(20): ShinGo-Bold -OTFname: A-OTF-ShinGoPro-Bold.otf +# Kozuka -- Provides level 50(Pr6N), 55(ProVI), 60(Pro), 65(Std) +INCLUDE cjkgs-kozuka.dat +INCLUDE cjkgs-ryokana.dat -Name: A-OTF-ShinGoPro-Heavy -PSName: ShinGoPro-Heavy -Class: Japan -Provides(20): ShinGo-Heavy -OTFname: A-OTF-ShinGoPro-Heavy.otf - -Name: A-OTF-ShinGoPro-Ultra -PSName: ShinGoPro-Ultra -Class: Japan -Provides(20): ShinGo-Ultra -OTFname: A-OTF-ShinGoPro-Ultra.otf - -# Hiragino (OS X) - -# Note about Mac OS X: -# ヒラギノ角ゴ {Pro,ProN} {W3,W6}.otf -# ヒラギノ角ゴ {Std,StdN} W8.otf -# ヒラギノ丸ゴ {Pro,ProN} W4.otf -# ヒラギノ明朝 {Pro,ProN} {W3,W6}.otf -# are bundled with OS X 10.10.5 Yosemite or earlier versions. -# ヒラギノ角ゴシック {W0,...W9}.ttc -# ヒラギノ丸ゴ ProN W4.ttc -# ヒラギノ明朝 ProN {W3,W6}.ttc -# are bundled with OS X 10.11 El Capitan or later versions. - -Name: HiraKakuPro-W3 -Class: Japan -Provides(40): GothicBBB-Medium -Provides(40): GothicBBBPro-Medium -# the following two are *not* the same -# one is in decomposed form (for Mac), one is in composed form (for the rest) -OTFname(20): ヒラギノ角ゴ Pro W3.otf -OTFname(19): ヒラギノ角ゴ Pro W3.otf -OTFname(10): HiraKakuPro-W3.otf -OTCname(30): ヒラギノ角ゴシック W3.ttc(3) -OTCname(29): ヒラギノ角ゴシック W3.ttc(3) -OTCname(28): HiraginoSans-W3.ttc(3) - -Name: HiraKakuPro-W6 -Class: Japan -Provides(40): FutoGoB101-Bold -Provides(40): FutoGoB101Pro-Bold -OTFname(20): ヒラギノ角ゴ Pro W6.otf -OTFname(19): ヒラギノ角ゴ Pro W6.otf -OTFname(10): HiraKakuPro-W6.otf -OTCname(30): ヒラギノ角ゴシック W6.ttc(3) -OTCname(29): ヒラギノ角ゴシック W6.ttc(3) -OTCname(28): HiraginoSans-W6.ttc(3) - -Name: HiraKakuProN-W3 -Class: Japan -Provides(30): GothicBBB-Medium -Provides(30): GothicBBBPro-Medium -OTFname(20): ヒラギノ角ゴ ProN W3.otf -OTFname(19): ヒラギノ角ゴ ProN W3.otf -OTFname(10): HiraKakuProN-W3.otf -OTCname(30): ヒラギノ角ゴシック W3.ttc(2) -OTCname(29): ヒラギノ角ゴシック W3.ttc(2) -OTCname(28): HiraginoSans-W3.ttc(2) - -Name: HiraKakuProN-W6 -Class: Japan -Provides(30): FutoGoB101-Bold -Provides(30): FutoGoB101Pro-Bold -OTFname(20): ヒラギノ角ゴ ProN W6.otf -OTFname(19): ヒラギノ角ゴ ProN W6.otf -OTFname(10): HiraKakuProN-W6.otf -OTCname(30): ヒラギノ角ゴシック W6.ttc(2) -OTCname(29): ヒラギノ角ゴシック W6.ttc(2) -OTCname(28): HiraginoSans-W6.ttc(2) - -Name: HiraKakuStd-W8 -Class: Japan -Provides(40): MidashiGo-MB31 -Provides(40): MidashiGoPro-MB31 -OTFname(20): ヒラギノ角ゴ Std W8.otf -OTFname(19): ヒラギノ角ゴ Std W8.otf -OTFname(10): HiraKakuStd-W8.otf -OTCname(30): ヒラギノ角ゴシック W8.ttc(2) -OTCname(29): ヒラギノ角ゴシック W8.ttc(2) -OTCname(28): HiraginoSans-W8.ttc(2) - -Name: HiraKakuStdN-W8 -Class: Japan -Provides(30): MidashiGo-MB31 -Provides(30): MidashiGoPro-MB31 -OTFname(20): ヒラギノ角ゴ StdN W8.otf -OTFname(19): ヒラギノ角ゴ StdN W8.otf -OTFname(10): HiraKakuStdN-W8.otf -OTCname(30): ヒラギノ角ゴシック W8.ttc(3) -OTCname(29): ヒラギノ角ゴシック W8.ttc(3) -OTCname(28): HiraginoSans-W8.ttc(3) - -Name: HiraginoSans-W0 -Class: Japan -OTCname(30): ヒラギノ角ゴシック W0.ttc(0) -OTCname(29): ヒラギノ角ゴシック W0.ttc(0) -OTCname(28): HiraginoSans-W0.ttc(0) +# Yu-fonts MacOS version -- Provides level 80 +INCLUDE cjkgs-yu-osx.dat -Name: HiraginoSans-W1 -Class: Japan -OTCname(30): ヒラギノ角ゴシック W1.ttc(0) -OTCname(29): ヒラギノ角ゴシック W1.ttc(0) -OTCname(28): HiraginoSans-W1.ttc(0) +# Yu-fonts Windows/MSOffice version -- Provides level 90 +INCLUDE cjkgs-yu-win.dat -Name: HiraginoSans-W2 -Class: Japan -OTCname(30): ヒラギノ角ゴシック W2.ttc(0) -OTCname(29): ヒラギノ角ゴシック W2.ttc(0) -OTCname(28): HiraginoSans-W2.ttc(0) +# MS -- Provides level 95 +INCLUDE cjkgs-microsoft.dat -Name: HiraginoSans-W3 -Class: Japan -OTCname(30): ヒラギノ角ゴシック W3.ttc(0) -OTCname(29): ヒラギノ角ゴシック W3.ttc(0) -OTCname(28): HiraginoSans-W3.ttc(0) +# TypeBank +INCLUDE cjkgs-typebank.dat -Name: HiraginoSans-W4 -Class: Japan -OTCname(30): ヒラギノ角ゴシック W4.ttc(0) -OTCname(29): ヒラギノ角ゴシック W4.ttc(0) -OTCname(28): HiraginoSans-W4.ttc(0) +# Fontworks +INCLUDE cjkgs-fontworks.dat -Name: HiraginoSans-W5 -Class: Japan -OTCname(30): ヒラギノ角ゴシック W5.ttc(0) -OTCname(29): ヒラギノ角ゴシック W5.ttc(0) -OTCname(28): HiraginoSans-W5.ttc(0) +# Toppan +INCLUDE cjkgs-toppan.dat -Name: HiraginoSans-W6 -Class: Japan -OTCname(30): ヒラギノ角ゴシック W6.ttc(0) -OTCname(29): ヒラギノ角ゴシック W6.ttc(0) -OTCname(28): HiraginoSans-W6.ttc(0) +# Moga-Mobo from Y.Oz Vox (free) -- Provides level 100(Ex), 110(none) +INCLUDE cjkgs-mogamobo.dat -Name: HiraginoSans-W7 -Class: Japan -OTCname(30): ヒラギノ角ゴシック W7.ttc(0) -OTCname(29): ヒラギノ角ゴシック W7.ttc(0) -OTCname(28): HiraginoSans-W7.ttc(0) - -Name: HiraginoSans-W8 -Class: Japan -OTCname(30): ヒラギノ角ゴシック W8.ttc(0) -OTCname(29): ヒラギノ角ゴシック W8.ttc(0) -OTCname(28): HiraginoSans-W8.ttc(0) - -Name: HiraginoSans-W9 -Class: Japan -OTCname(30): ヒラギノ角ゴシック W9.ttc(0) -OTCname(29): ヒラギノ角ゴシック W9.ttc(0) -OTCname(28): HiraginoSans-W9.ttc(0) - -Name: HiraMaruPro-W4 -Class: Japan -Provides(40): Jun101-Light -Provides(40): Jun101Pro-Light -OTFname(20): ヒラギノ丸ゴ Pro W4.otf -OTFname(19): ヒラギノ丸ゴ Pro W4.otf -OTFname(10): HiraMaruPro-W4.otf -OTCname(30): ヒラギノ丸ゴ ProN W4.ttc(0) -OTCname(29): ヒラギノ丸ゴ ProN W4.ttc(0) -OTCname(28): HiraginoSansR-W4.ttc(0) - -Name: HiraMaruProN-W4 -Class: Japan -Provides(30): Jun101-Light -Provides(30): Jun101Pro-Light -OTFname(20): ヒラギノ丸ゴ ProN W4.otf -OTFname(19): ヒラギノ丸ゴ ProN W4.otf -OTFname(10): HiraMaruProN-W4.otf -OTCname(30): ヒラギノ丸ゴ ProN W4.ttc(1) -OTCname(29): ヒラギノ丸ゴ ProN W4.ttc(1) -OTCname(28): HiraginoSansR-W4.ttc(1) - -Name: HiraMinPro-W3 -Class: Japan -Provides(40): Ryumin-Light -Provides(40): RyuminPro-Light -OTFname(20): ヒラギノ明朝 Pro W3.otf -OTFname(19): ヒラギノ明朝 Pro W3.otf -OTFname(10): HiraMinPro-W3.otf -OTCname(30): ヒラギノ明朝 ProN W3.ttc(1) -OTCname(29): ヒラギノ明朝 ProN W3.ttc(1) -OTCname(28): HiraginoSerif-W3.ttc(1) - -Name: HiraMinPro-W6 -Class: Japan -Provides(40): FutoMinA101-Bold -Provides(40): FutoMinA101Pro-Bold -OTFname(20): ヒラギノ明朝 Pro W6.otf -OTFname(19): ヒラギノ明朝 Pro W6.otf -OTFname(10): HiraMinPro-W6.otf -OTCname(30): ヒラギノ明朝 ProN W6.ttc(1) -OTCname(29): ヒラギノ明朝 ProN W6.ttc(1) -OTCname(28): HiraginoSerif-W6.ttc(1) - -Name: HiraMinProN-W3 -Class: Japan -Provides(30): Ryumin-Light -Provides(30): RyuminPro-Light -OTFname(20): ヒラギノ明朝 ProN W3.otf -OTFname(19): ヒラギノ明朝 ProN W3.otf -OTFname(10): HiraMinProN-W3.otf -OTCname(30): ヒラギノ明朝 ProN W3.ttc(0) -OTCname(29): ヒラギノ明朝 ProN W3.ttc(0) -OTCname(28): HiraginoSerif-W3.ttc(0) - -Name: HiraMinProN-W6 -Class: Japan -Provides(30): FutoMinA101-Bold -Provides(30): FutoMinA101Pro-Bold -OTFname(20): ヒラギノ明朝 ProN W6.otf -OTFname(19): ヒラギノ明朝 ProN W6.otf -OTFname(10): HiraMinProN-W6.otf -OTCname(30): ヒラギノ明朝 ProN W6.ttc(0) -OTCname(29): ヒラギノ明朝 ProN W6.ttc(0) -OTCname(28): HiraginoSerif-W6.ttc(0) - -# Following Hiragino fonts are not bundled with OS X, -# but used in ptex-fontmaps - -Name: HiraMinPro-W2 -Class: Japan -OTFname(20): ヒラギノ明朝 Pro W2.otf -OTFname(19): ヒラギノ明朝 Pro W2.otf -OTFname(10): HiraMinPro-W2.otf - -Name: HiraMinProN-W2 -Class: Japan -OTFname(20): ヒラギノ明朝 ProN W2.otf -OTFname(19): ヒラギノ明朝 ProN W2.otf -OTFname(10): HiraMinProN-W2.otf - -# Yu-fonts MacOS version - -# Note about Mac OS X: -# Yu Gothic Medium.otf -# Yu Gothic Bold.otf -# are bundled with OS X 10.9 Mavericks or later versions. -# Yu Mincho Medium.otf -# Yu Mincho Demibold.otf -# are bundled with OS X 10.9 Mavericks -- 10.10.5 Yosemite. -# YuMincho.ttc -# index 0: YuMin-Medium -# index 1: YuMin-Demibold -# index 2: YuMin_36pKn-Medium -# index 3: YuMin_36pKn-Demibold -# is bundled with OS X 10.11 -- 10.11.6 El Capitan. -# YuMincho.ttc -# index 0: YuMin-Medium -# index 1: YuMin-Demibold -# index 2: YuMin-Extrabold -# index 3: YuMin_36pKn-Medium -# index 4: YuMin_36pKn-Demibold -# index 5: YuMin_36pKn-Extrabold -# is bundled with macOS 10.12.0 Sierra or later versions. - -Name: YuGo-Medium -Class: Japan -Provides(80): GothicBBB-Medium -Provides(80): GothicBBBPro-Medium -OTFname(20): Yu Gothic Medium.otf -OTFname(10): YuGo-Medium.otf - -Name: YuGo-Bold -Class: Japan -Provides(80): FutoGoB101-Bold -Provides(80): FutoGoB101Pro-Bold -Provides(80): Jun101-Light -Provides(80): Jun101Pro-Light -Provides(80): MidashiGo-MB31 -Provides(80): MidashiGoPro-MB31 -OTFname(20): Yu Gothic Bold.otf -OTFname(10): YuGo-Bold.otf - -Name: YuMin-Medium -Class: Japan -Provides(80): Ryumin-Light -Provides(80): RyuminPro-Light -OTFname(20): Yu Mincho Medium.otf -OTFname(10): YuMin-Medium.otf -OTCname(30): YuMincho.ttc(0) - -Name: YuMin-Demibold -Class: Japan -Provides(80): FutoMinA101-Bold -Provides(80): FutoMinA101Pro-Bold -OTFname(20): Yu Mincho Demibold.otf -OTFname(10): YuMin-Demibold.otf -OTCname(30): YuMincho.ttc(1) +# Ume-font (free) -- Provides level 140 +INCLUDE cjkgs-ume.dat -# Following four entries are for macOS 10.12 Sierra -# The index for OS X 10.11.x El Capitan is different! - -Name: YuMin-Extrabold -Class: Japan -OTCname(30): YuMincho.ttc(2) - -Name: YuMin_36pKn-Medium -Class: Japan -OTCname(30): YuMincho.ttc(3) - -Name: YuMin_36pKn-Demibold -Class: Japan -OTCname(30): YuMincho.ttc(4) - -Name: YuMin_36pKn-Extrabold -Class: Japan -OTCname(30): YuMincho.ttc(5) - -# Yu-fonts Windows version - -# Note about Windows: -# yugothi{b,c,l}.ttf -# yumin.ttf, yumin{db,l}.ttf -# are bundled with Windows 8.1. -# YuGoth{B,L,M,R}.ttc -# yumin.ttf, yumin{db,l}.ttf -# are bundled with Windows 10. -# YUGOTH{B,L,M,R}.TTC -# YUMIN.TTF, YUMIN{DB,L}.TTF -# are bundled with Yu Font Pack for MSOffice 2010/2013. -# YuGothic.ttf -# YuGothic-Bold.ttf -# are bundled with VS2013 or later versions. -# YuGoth{B,L,M,R}.ttf -# yumin.ttf, yumin{db,l}.ttf -# are bundled with Office for Mac 2016. - -# In the following database, Yu Font Pack entries do not appear -# as separate lines, but they are implied by Windows 10 entries -# since win32 is case-insensitive. -# Currently we don't add VS2013 YuGothic.ttf (YuGothic) and -# YuGothic-Bold.ttf (YuGothic-Bold) on purpose, because these files -# are smaller than Windows 8.1 yugothic.ttf and yugothib.ttf - -Name: YuMincho-Regular -Class: Japan -Provides(90): Ryumin-Light -Provides(90): RyuminPro-Light -Provides(90): HiraMinProN-W3 -Provides(90): HiraMinPro-W3 -TTFname(20): yumin.ttf -#TTFname(50): YuMincho-Regular.ttf # never existed - -Name: YuMincho-Light -Class: Japan -TTFname(20): yuminl.ttf -#TTFname(50): YuMincho-Light.ttf # never existed - -Name: YuMincho-DemiBold -Class: Japan -Provides(90): FutoMinA101-Bold -Provides(90): FutoMinA101Pro-Bold -Provides(90): HiraMinProN-W6 -Provides(90): HiraMinPro-W6 -TTFname(20): yumindb.ttf -#TTFname(50): YuMincho-DemiBold.ttf # never existed - -Name: YuGothic-Regular -Class: Japan -Provides(90): GothicBBB-Medium -Provides(90): GothicBBBPro-Medium -Provides(90): HiraKakuProN-W3 -Provides(90): HiraKakuPro-W3 -TTFname(25): yugothic.ttf -TTCname(20): YuGothR.ttc(0) -TTFname(40): YuGothR.ttf -#TTFname(50): YuGothic-Regular.ttf # never existed - -Name: YuGothic-Medium -Class: Japan -TTCname(20): YuGothM.ttc(0) -TTFname(40): YuGothM.ttf - -Name: YuGothic-Light -Class: Japan -TTFname(25): yugothil.ttf -TTCname(20): YuGothL.ttc(0) -TTFname(40): YuGothL.ttf -#TTFname(50): YuGothic-Light.ttf # never existed - -Name: YuGothic-Bold -Class: Japan -Provides(90): FutoGoB101-Bold -Provides(90): FutoGoB101Pro-Bold -Provides(90): HiraKakuProN-W6 -Provides(90): HiraKakuPro-W6 -Provides(90): Jun101-Light -Provides(90): Jun101Pro-Light -Provides(90): HiraMaruProN-W4 -Provides(90): HiraMaruPro-W4 -Provides(90): MidashiGo-MB31 -Provides(90): MidashiGoPro-MB31 -Provides(90): HiraKakuStdN-W8 -Provides(90): HiraKakuStd-W8 -TTFname(25): yugothib.ttf -TTCname(20): YuGothB.ttc(0) -TTFname(40): YuGothB.ttf -#TTFname(50): YuGothic-Bold.ttf - -# Yu-UI-fonts (Windows only) - -Name: YuGothicUI-Semilight -Class: Japan -TTCname(20): YuGothR.ttc(1) - -Name: YuGothicUI-Regular -Class: Japan -TTCname(20): YuGothM.ttc(1) - -Name: YuGothicUI-Light -Class: Japan -TTCname(20): YuGothL.ttc(1) - -Name: YuGothicUI-Bold -Class: Japan -TTCname(20): YuGothB.ttc(1) - -Name: YuGothicUI-Semibold -Class: Japan -TTCname(20): YuGothB.ttc(2) - -# IPA (free) +# IPA (free) -- Provides level 120(Ex), 130(none) Name: IPAMincho Class: Japan @@ -2584,6 +2288,8 @@ Provides(130): FutoMinA101-Bold Provides(130): FutoMinA101Pro-Bold Provides(130): HiraMinProN-W6 Provides(130): HiraMinPro-W6 +Provides(130): MidashiMin-MA31 +Provides(130): MidashiMinPro-MA31 TTFname(20): ipam.ttf #TTFname(21): IPAMincho.ttf @@ -2597,14 +2303,14 @@ Provides(130): FutoGoB101-Bold Provides(130): FutoGoB101Pro-Bold Provides(130): HiraKakuProN-W6 Provides(130): HiraKakuPro-W6 -Provides(130): Jun101-Light -Provides(130): Jun101Pro-Light -Provides(130): HiraMaruProN-W4 -Provides(130): HiraMaruPro-W4 Provides(130): MidashiGo-MB31 Provides(130): MidashiGoPro-MB31 Provides(130): HiraKakuStdN-W8 Provides(130): HiraKakuStd-W8 +Provides(130): Jun101-Light +Provides(130): Jun101Pro-Light +Provides(130): HiraMaruProN-W4 +Provides(130): HiraMaruPro-W4 TTFname(20): ipag.ttf #TTFname(21): IPAGothic.ttf @@ -2618,6 +2324,8 @@ Provides(120): FutoMinA101-Bold Provides(120): FutoMinA101Pro-Bold Provides(120): HiraMinProN-W6 Provides(120): HiraMinPro-W6 +Provides(120): MidashiMin-MA31 +Provides(120): MidashiMinPro-MA31 TTFname(20): ipaexm.ttf #TTFname(21): IPAexMincho.ttf @@ -2631,14 +2339,14 @@ Provides(120): FutoGoB101-Bold Provides(120): FutoGoB101Pro-Bold Provides(120): HiraKakuProN-W6 Provides(120): HiraKakuPro-W6 -Provides(120): Jun101-Light -Provides(120): Jun101Pro-Light -Provides(120): HiraMaruProN-W4 -Provides(120): HiraMaruPro-W4 Provides(120): MidashiGo-MB31 Provides(120): MidashiGoPro-MB31 Provides(120): HiraKakuStdN-W8 Provides(120): HiraKakuStd-W8 +Provides(120): Jun101-Light +Provides(120): Jun101Pro-Light +Provides(120): HiraMaruProN-W4 +Provides(120): HiraMaruPro-W4 TTFname(20): ipaexg.ttf #TTFname(21): IPAexGothic.ttf @@ -2654,299 +2362,11 @@ Class: Japan TTFname(20): ipagp.ttf #TTFname(21): IPAPGothic.ttf -# Moga-Mobo from Y.Oz Vox (free) - -Name: MogaMincho-Regular -Class: Japan -Provides(110): Ryumin-Light -Provides(110): RyuminPro-Light -Provides(110): HiraMinProN-W3 -Provides(110): HiraMinPro-W3 -TTCname: mogam.ttc(0) - -Name: MogaExMincho-Regular -Class: Japan -Provides(100): Ryumin-Light -Provides(100): RyuminPro-Light -Provides(100): HiraMinProN-W3 -Provides(100): HiraMinPro-W3 -TTCname: mogam.ttc(1) - -Name: MogaExMincho-Italic -Class: Japan -TTCname: mogam.ttc(2) - -Name: Moga90Mincho-Regular -Class: Japan -TTCname: mogam.ttc(3) - -Name: MogaEx90Mincho-Regular -Class: Japan -TTCname: mogam.ttc(4) - -Name: MogaEx90Mincho-Italic -Class: Japan -TTCname: mogam.ttc(5) - -Name: MogaMincho-Bold -Class: Japan -Provides(110): FutoMinA101-Bold -Provides(110): FutoMinA101Pro-Bold -Provides(110): HiraMinProN-W6 -Provides(110): HiraMinPro-W6 -TTCname: mogamb.ttc(0) - -Name: MogaExMincho-Bold -Class: Japan -Provides(100): FutoMinA101-Bold -Provides(100): FutoMinA101Pro-Bold -Provides(100): HiraMinProN-W6 -Provides(100): HiraMinPro-W6 -TTCname: mogamb.ttc(1) - -Name: Moga90Mincho-Bold -Class: Japan -TTCname: mogamb.ttc(2) - -Name: MogaEx90Mincho-Bold -Class: Japan -TTCname: mogamb.ttc(3) - -Name: MogaHMincho-Regular -Class: Japan -TTCname: mogahm.ttc(0) - -Name: MogaExHMincho-Regular -Class: Japan -TTCname: mogahm.ttc(1) - -Name: MogaExHMincho-Italic -Class: Japan -TTCname: mogahm.ttc(2) - -Name: Moga90HMincho-Regular -Class: Japan -TTCname: mogahm.ttc(3) - -Name: MogaEx90HMincho-Regular -Class: Japan -TTCname: mogahm.ttc(4) - -Name: MogaEx90HMincho-Italic -Class: Japan -TTCname: mogahm.ttc(5) - -Name: MogaHMincho-Bold -Class: Japan -TTCname: mogahmb.ttc(0) - -Name: MogaExHMincho-Bold -Class: Japan -TTCname: mogahmb.ttc(1) - -Name: Moga90HMincho-Bold -Class: Japan -TTCname: mogahmb.ttc(2) - -Name: MogaEx90HMincho-Bold -Class: Japan -TTCname: mogahmb.ttc(3) - -Name: MogaGothic-Regular -Class: Japan -Provides(110): GothicBBB-Medium -Provides(110): GothicBBBPro-Medium -Provides(110): HiraKakuProN-W3 -Provides(110): HiraKakuPro-W3 -TTCname: mogag.ttc(0) - -Name: MogaExGothic-Regular -Class: Japan -Provides(100): GothicBBB-Medium -Provides(100): GothicBBBPro-Medium -Provides(100): HiraKakuProN-W3 -Provides(100): HiraKakuPro-W3 -TTCname: mogag.ttc(1) - -Name: Moga90Gothic-Regular -Class: Japan -TTCname: mogag.ttc(2) - -Name: MogaEx90Gothic-Regular -Class: Japan -TTCname: mogag.ttc(3) - -Name: MogaGothic-Bold -Class: Japan -Provides(110): FutoGoB101-Bold -Provides(110): FutoGoB101Pro-Bold -Provides(110): HiraKakuProN-W6 -Provides(110): HiraKakuPro-W6 -Provides(110): MidashiGo-MB31 -Provides(110): MidashiGoPro-MB31 -Provides(110): HiraKakuStdN-W8 -Provides(110): HiraKakuStd-W8 -TTCname: mogagb.ttc(0) - -Name: MogaExGothic-Bold -Class: Japan -Provides(100): FutoGoB101-Bold -Provides(100): FutoGoB101Pro-Bold -Provides(100): HiraKakuProN-W6 -Provides(100): HiraKakuPro-W6 -Provides(100): MidashiGo-MB31 -Provides(100): MidashiGoPro-MB31 -Provides(100): HiraKakuStdN-W8 -Provides(100): HiraKakuStd-W8 -TTCname: mogagb.ttc(1) - -Name: Moga90Gothic-Bold -Class: Japan -TTCname: mogagb.ttc(2) - -Name: MogaEx90Gothic-Bold -Class: Japan -TTCname: mogagb.ttc(3) - -Name: MoboGothic-Regular -Class: Japan -Provides(110): Jun101-Light -Provides(110): Jun101Pro-Light -Provides(110): HiraMaruProN-W4 -Provides(110): HiraMaruPro-W4 -TTCname: mobog.ttc(0) - -Name: MoboExGothic-Regular -Class: Japan -Provides(100): Jun101-Light -Provides(100): Jun101Pro-Light -Provides(100): HiraMaruProN-W4 -Provides(100): HiraMaruPro-W4 -TTCname: mobog.ttc(1) - -Name: Mobo90Gothic-Regular -Class: Japan -TTCname: mobog.ttc(2) - -Name: MoboEx90Gothic-Regular -Class: Japan -TTCname: mobog.ttc(3) - -Name: MoboGothic-Bold -Class: Japan -TTCname: mobogb.ttc(0) - -Name: MoboExGothic-Bold -Class: Japan -TTCname: mobogb.ttc(1) - -Name: Mobo90Gothic-Bold -Class: Japan -TTCname: mobogb.ttc(2) - -Name: MoboEx90Gothic-Bold -Class: Japan -TTCname: mobogb.ttc(3) - -# Ume-font (free) -# note: in the current release (2016-09-03 umefont_660.7z), -# ume-tms.ttf and ume-pms.ttf ("studybook" family) share the same PSName -# as ume-tmo.ttf and ume-pmo.ttf; we don't add these database -# intentionally -- HY (2017/01/17) - -Name: Ume-Mincho -Class: Japan -Provides(140): Ryumin-Light -Provides(140): RyuminPro-Light -Provides(140): HiraMinProN-W3 -Provides(140): HiraMinPro-W3 -Provides(140): FutoMinA101-Bold -Provides(140): FutoMinA101Pro-Bold -Provides(140): HiraMinProN-W6 -Provides(140): HiraMinPro-W6 -TTFname(10): ume-tmo3.ttf -#TTFname(11): ume-tms3.ttf - -Name: Ume-Gothic -Class: Japan -Provides(140): GothicBBB-Medium -Provides(140): GothicBBBPro-Medium -Provides(140): HiraKakuProN-W3 -Provides(140): HiraKakuPro-W3 -Provides(140): FutoGoB101-Bold -Provides(140): FutoGoB101Pro-Bold -Provides(140): HiraKakuProN-W6 -Provides(140): HiraKakuPro-W6 -Provides(140): Jun101-Light -Provides(140): Jun101Pro-Light -Provides(140): HiraMaruProN-W4 -Provides(140): HiraMaruPro-W4 -Provides(140): MidashiGo-MB31 -Provides(140): MidashiGoPro-MB31 -Provides(140): HiraKakuStdN-W8 -Provides(140): HiraKakuStd-W8 -TTFname(10): ume-tgo4.ttf - -Name: Ume-Gothic-O5 -Class: Japan -TTFname(10): ume-tgo5.ttf - -Name: Ume-Gothic-C4 -Class: Japan -TTFname(10): ume-tgc4.ttf - -Name: Ume-Gothic-C5 -Class: Japan -TTFname(10): ume-tgc5.ttf - -Name: Ume-Gothic-S4 -Class: Japan -TTFname(10): ume-tgs4.ttf - -Name: Ume-Gothic-S5 -Class: Japan -TTFname(10): ume-tgs5.ttf - -Name: Ume-P-Mincho -Class: Japan -TTFname(10): ume-pmo3.ttf -#TTFname(11): ume-pms3.ttf - -Name: Ume-P-Gothic -Class: Japan -TTFname(10): ume-pgo4.ttf - -Name: Ume-P-Gothic-O5 -Class: Japan -TTFname(10): ume-pgo5.ttf - -Name: Ume-P-Gothic-C4 -Class: Japan -TTFname(10): ume-pgc4.ttf - -Name: Ume-P-Gothic-C5 -Class: Japan -TTFname(10): ume-pgc5.ttf - -Name: Ume-P-Gothic-S4 -Class: Japan -TTFname(10): ume-pgs4.ttf - -Name: Ume-P-Gothic-S5 -Class: Japan -TTFname(10): ume-pgs5.ttf - -Name: Ume-UI-Gothic -Class: Japan -TTFname(10): ume-ugo4.ttf +# IPA MJ (free) -Name: Ume-UI-Gothic-O5 +Name: IPAmjMincho Class: Japan -TTFname(10): ume-ugo5.ttf - -Name: Ume-Hy-Gothic -Class: Japan -TTFname(10): ume-hgo4.ttf +TTFname: ipamjm.ttf # Sazanami (free) @@ -2968,740 +2388,24 @@ Name: Osaka-Mono Class: Japan TTFname: OsakaMono.ttf -# Kozuka (Adobe) - -Name: KozGoPr6N-Bold -Class: Japan -Provides(50): FutoGoB101-Bold -Provides(50): FutoGoB101Pro-Bold -Provides(50): HiraKakuProN-W6 -Provides(50): HiraKakuPro-W6 -OTFname: KozGoPr6N-Bold.otf - -Name: KozGoPr6N-Heavy -Class: Japan -Provides(50): Jun101-Light -Provides(50): Jun101Pro-Light -Provides(50): HiraMaruProN-W4 -Provides(50): HiraMaruPro-W4 -Provides(50): MidashiGo-MB31 -Provides(50): MidashiGoPro-MB31 -Provides(50): HiraKakuStdN-W8 -Provides(50): HiraKakuStd-W8 -OTFname: KozGoPr6N-Heavy.otf - -Name: KozGoPr6N-Medium -Class: Japan -Provides(50): GothicBBB-Medium -Provides(50): GothicBBBPro-Medium -Provides(50): HiraKakuProN-W3 -Provides(50): HiraKakuPro-W3 -OTFname: KozGoPr6N-Medium.otf - -Name: KozGoPr6N-Regular -Class: Japan -OTFname: KozGoPr6N-Regular.otf - -Name: KozGoPr6N-ExtraLight -Class: Japan -OTFname: KozGoPr6N-ExtraLight.otf - -Name: KozGoPr6N-Light -Class: Japan -OTFname: KozGoPr6N-Light.otf - -Name: KozGoPro-Bold -Class: Japan -Provides(70): FutoGoB101-Bold -Provides(70): FutoGoB101Pro-Bold -Provides(70): HiraKakuProN-W6 -Provides(70): HiraKakuPro-W6 -OTFname: KozGoPro-Bold.otf - -Name: KozGoPro-Heavy -Class: Japan -Provides(70): Jun101-Light -Provides(70): Jun101Pro-Light -Provides(70): HiraMaruProN-W4 -Provides(70): HiraMaruPro-W4 -Provides(70): MidashiGo-MB31 -Provides(70): MidashiGoPro-MB31 -Provides(70): HiraKakuStdN-W8 -Provides(70): HiraKakuStd-W8 -OTFname: KozGoPro-Heavy.otf - -Name: KozGoPro-Medium -Class: Japan -Provides(70): GothicBBB-Medium -Provides(70): GothicBBBPro-Medium -Provides(70): HiraKakuProN-W3 -Provides(70): HiraKakuPro-W3 -OTFname: KozGoPro-Medium.otf - -Name: KozGoPro-Regular -Class: Japan -OTFname: KozGoPro-Regular.otf - -Name: KozGoPro-ExtraLight -Class: Japan -OTFname: KozGoPro-ExtraLight.otf - -Name: KozGoPro-Light -Class: Japan -OTFname: KozGoPro-Light.otf - -Name: KozGoProVI-Bold -Class: Japan -Provides(60): FutoGoB101-Bold -Provides(60): FutoGoB101Pro-Bold -Provides(60): HiraKakuProN-W6 -Provides(60): HiraKakuPro-W6 -OTFname: KozGoProVI-Bold.otf - -Name: KozGoProVI-Heavy -Class: Japan -Provides(60): Jun101-Light -Provides(60): Jun101Pro-Light -Provides(60): HiraMaruProN-W4 -Provides(60): HiraMaruPro-W4 -Provides(60): MidashiGo-MB31 -Provides(60): MidashiGoPro-MB31 -Provides(60): HiraKakuStdN-W8 -Provides(60): HiraKakuStd-W8 -OTFname: KozGoProVI-Heavy.otf - -Name: KozGoProVI-Medium -Class: Japan -Provides(60): GothicBBB-Medium -Provides(60): GothicBBBPro-Medium -Provides(60): HiraKakuProN-W3 -Provides(60): HiraKakuPro-W3 -OTFname: KozGoProVI-Medium.otf - -Name: KozGoProVI-Regular -Class: Japan -OTFname: KozGoProVI-Regular.otf - -Name: KozMinPr6N-Bold -Class: Japan -Provides(50): FutoMinA101-Bold -Provides(50): FutoMinA101Pro-Bold -Provides(50): HiraMinProN-W6 -Provides(50): HiraMinPro-W6 -OTFname: KozMinPr6N-Bold.otf - -Name: KozMinPr6N-Heavy -Class: Japan -OTFname: KozMinPr6N-Heavy.otf - -Name: KozMinPr6N-Medium -Class: Japan -OTFname: KozMinPr6N-Medium.otf - -Name: KozMinPr6N-Regular -Class: Japan -Provides(50): Ryumin-Light -Provides(50): RyuminPro-Light -Provides(50): HiraMinProN-W3 -Provides(50): HiraMinPro-W3 -OTFname: KozMinPr6N-Regular.otf - -Name: KozMinPr6N-ExtraLight -Class: Japan -OTFname: KozMinPr6N-ExtraLight.otf - -Name: KozMinPr6N-Light -Class: Japan -OTFname: KozMinPr6N-Light.otf - -Name: KozMinPro-Bold -Class: Japan -Provides(70): FutoMinA101-Bold -Provides(70): FutoMinA101Pro-Bold -Provides(70): HiraMinProN-W6 -Provides(70): HiraMinPro-W6 -OTFname: KozMinPro-Bold.otf - -Name: KozMinPro-Heavy -Class: Japan -OTFname: KozMinPro-Heavy.otf - -Name: KozMinPro-Medium -Class: Japan -OTFname: KozMinPro-Medium.otf - -Name: KozMinPro-Regular -Class: Japan -Provides(70): Ryumin-Light -Provides(70): RyuminPro-Light -Provides(70): HiraMinProN-W3 -Provides(70): HiraMinPro-W3 -OTFname: KozMinPro-Regular.otf - -Name: KozMinPro-ExtraLight -Class: Japan -OTFname: KozMinPro-ExtraLight.otf - -Name: KozMinPro-Light -Class: Japan -OTFname: KozMinPro-Light.otf - -Name: KozMinProVI-Bold -Class: Japan -Provides(60): FutoMinA101-Bold -Provides(60): FutoMinA101Pro-Bold -Provides(60): HiraMinProN-W6 -Provides(60): HiraMinPro-W6 -OTFname: KozMinProVI-Bold.otf - -Name: KozMinProVI-Regular -Class: Japan -Provides(60): Ryumin-Light -Provides(60): RyuminPro-Light -Provides(60): HiraMinProN-W3 -Provides(60): HiraMinPro-W3 -OTFname: KozMinProVI-Regular.otf - -Name: KozMinProVI-Light -Class: Japan -OTFname: KozMinProVI-Light.otf - -# other Mac OS X fonts - -# Note about Mac OS X: -# Klee.ttc -# Tsukushi{A,B}MaruGothic.ttc -# are bundled with OS X 10.11 El Capitan or later versions. -# Kyokasho.ttc -# ToppanBunkyuMincho-Regular.otf -# ToppanBunkyuGothic.ttc -# ToppanBunkyuMidashiMincho-ExtraBold.otf -# ToppanBunkyuMidashiGothic-ExtraBold.otf -# are bundled with macOS 10.12 Sierra or later versions. - -Name: TsukuARdGothic-Regular -Class: Japan -OTCname: TsukushiAMaruGothic.ttc(0) - -Name: TsukuARdGothic-Bold -Class: Japan -OTCname: TsukushiAMaruGothic.ttc(1) - -Name: TsukuBRdGothic-Regular -Class: Japan -OTCname: TsukushiBMaruGothic.ttc(0) - -Name: TsukuBRdGothic-Bold -Class: Japan -OTCname: TsukushiBMaruGothic.ttc(1) - -Name: Klee-Medium -Class: Japan -OTCname: Klee.ttc(1) - -Name: Klee-Demibold -Class: Japan -OTCname: Klee.ttc(0) - -Name: YuKyo_Yoko-Medium -Class: Japan -OTCname: Kyokasho.ttc(0) - -Name: YuKyo_Yoko-Bold -Class: Japan -OTCname: Kyokasho.ttc(1) - -Name: YuKyo-Medium -Class: Japan -OTCname: Kyokasho.ttc(2) - -Name: YuKyo-Bold -Class: Japan -OTCname: Kyokasho.ttc(3) - -Name: ToppanBunkyuMincho-Regular -PSName: ToppanBunkyuMinchoPr6N-Regular -Class: Japan -OTFname: ToppanBunkyuMincho-Regular.otf - -Name: ToppanBunkyuGothicPr6N-DB -Class: Japan -OTCname: ToppanBunkyuGothic.ttc(0) - -Name: ToppanBunkyuGothicPr6N-Regular -Class: Japan -OTCname: ToppanBunkyuGothic.ttc(1) - -Name: ToppanBunkyuMidashiMincho-ExtraBold -PSName: ToppanBunkyuMidashiMinchoStdN-ExtraBold -Class: Japan -OTFname: ToppanBunkyuMidashiMincho-ExtraBold.otf - -Name: ToppanBunkyuMidashiGothic-ExtraBold -PSName: ToppanBunkyuMidashiGothicStdN-ExtraBold -Class: Japan -OTFname: ToppanBunkyuMidashiGothic-ExtraBold.otf - # # CHINESE FONTS # -# Hiragino chinese (OS X) +# Adobe -- Provides level 30 +INCLUDE cjkgs-adobe.dat -Name: HiraginoSansGB-W3 -Class: GB -Provides(50): STHeiti-Light -OTFname(20): Hiragino Sans GB W3.otf -OTFname(10): HiraginoSansGB-W3.otf -OTCname(30): Hiragino Sans GB W3.ttc(0) -OTCname(28): HiraginoSansGB-W3.ttc(0) +# Hiragino -- Provides level 50 +# (already included in JAPANESE section) -Name: HiraginoSansGB-W6 -Class: GB -Provides(50): STHeiti-Regular -OTFname(20): Hiragino Sans GB W6.otf -OTFname(10): HiraginoSansGB-W6.otf -OTCname(30): Hiragino Sans GB W6.ttc(0) -OTCname(28): HiraginoSansGB-W6.ttc(0) +# Beijing Founder Electronics -- Provides level 55 +INCLUDE cjkgs-founder.dat -Name: HiraginoSansCNS-W3 -Class: CNS -OTCname(30): Hiragino Sans CNS.ttc(0) -OTCname(28): HiraginoSansCNS.ttc(0) +# DynaComware -- Provides level ?? +INCLUDE cjkgs-dynacomware.dat -Name: HiraginoSansCNS-W6 -Class: CNS -OTCname(30): Hiragino Sans CNS.ttc(1) -OTCname(28): HiraginoSansCNS.ttc(1) - -# DynaComware (OS X) - -Name: LiHeiPro -Class: CNS -#Provides(??): MHei-Medium # fails -TTFname(20): 儷黑 Pro.ttf -TTFname(10): LiHeiPro.ttf - -Name: LiSongPro -Class: CNS -#Provides(??): MSung-Medium # fails -#Provides(??): MSung-Light # fails -TTFname(20): 儷宋 Pro.ttf -TTFname(10): LiSongPro.ttf - -Name: PingFangTC-Regular -Class: CNS -OTCname: PingFang.ttc(1) - -Name: PingFangSC-Regular -Class: GB -OTCname: PingFang.ttc(2) - -Name: PingFangTC-Medium -Class: CNS -OTCname: PingFang.ttc(4) - -Name: PingFangSC-Medium -Class: GB -OTCname: PingFang.ttc(5) - -Name: PingFangTC-Semibold -Class: CNS -OTCname: PingFang.ttc(7) - -Name: PingFangSC-Semibold -Class: GB -OTCname: PingFang.ttc(8) - -Name: PingFangTC-Light -Class: CNS -OTCname: PingFang.ttc(10) - -Name: PingFangSC-Light -Class: GB -OTCname: PingFang.ttc(11) - -Name: PingFangTC-Thin -Class: CNS -OTCname: PingFang.ttc(13) - -Name: PingFangSC-Thin -Class: GB -OTCname: PingFang.ttc(14) - -Name: PingFangTC-Ultralight -Class: CNS -OTCname: PingFang.ttc(16) - -Name: PingFangSC-Ultralight -Class: GB -OTCname: PingFang.ttc(17) - -# Changzhou SinoType (OS X) - -Name: STXihei -Class: GB -#Provides(??): STHeiti-Light # fails -TTFname(20): 华文细黑.ttf -TTFname(10): STXihei.ttf - -Name: STHeiti -Class: GB -#Provides(??): STHeiti-Regular # fails -TTFname(20): 华文黑体.ttf -TTFname(10): STHeiti.ttf - -Name: STHeitiSC-Light -Class: GB -#Provides(??): STHeiti-Light # fails -TTCname(10): STHeiti-Light.ttc(1) -TTCname(20): STHeiti Light.ttc(1) -#TTFname(30): STHeitiSC-Light.ttf - -Name: STHeitiSC-Medium -Class: GB -#Provides(??): STHeiti-Regular # fails -TTCname(10): STHeiti-Medium.ttc(1) -TTCname(20): STHeiti Medium.ttc(1) -#TTFname(30): STHeitiSC-Medium.ttf - -Name: STHeitiTC-Light -Class: CNS -TTCname(10): STHeiti-Light.ttc(0) -TTCname(20): STHeiti Light.ttc(0) -#TTFname(30): STHeitiTC-Light.ttf - -Name: STHeitiTC-Medium -Class: CNS -#Provides(??): MHei-Medium # fails -TTCname(10): STHeiti-Medium.ttc(0) -TTCname(20): STHeiti Medium.ttc(0) -#TTFname(30): STHeitiTC-Medium.ttf - -Name: STFangsong -Class: GB -#Provides(??): STFangsong-Light # fails -#Provides(??): STFangsong-Regular # fails -TTFname(20): 华文仿宋.ttf -TTFname(10): STFangsong.ttf - -# TTC entry for Mountain Lion (10.8) or later -# TTF entry for Lion (10.7) or earlier -Name: STSong -Class: GB -#Provides(??): STSong-Light # fails -#Provides(??): STSong-Regular # fails -TTCname(10): Songti.ttc(4) -TTCname(20): 宋体.ttc(3) -TTFname(30): STSong.ttf -TTFname(40): 华文宋体.ttf - -Name: STSongti-SC-Light -Class: GB -#Provides(??): STSong-Light # fails -#Provides(??): STSong-Regular # fails -TTCname(10): Songti.ttc(3) -TTCname(20): 宋体.ttc(2) -#TTFname(30): STSongti-SC-Light.ttf - -Name: STSongti-SC-Regular -Class: GB -TTCname(10): Songti.ttc(6) -TTCname(20): 宋体.ttc(4) -#TTFname(30): STSongti-SC-Regular.ttf - -Name: STSongti-SC-Bold -Class: GB -TTCname(10): Songti.ttc(1) -TTCname(20): 宋体.ttc(1) -#TTFname(30): STSongti-SC-Bold.ttf - -Name: STSongti-SC-Black -Class: GB -TTCname(10): Songti.ttc(0) -TTCname(20): 宋体.ttc(0) -#TTFname(30): STSongti-SC-Black.ttf - -Name: STSongti-TC-Light -Class: CNS -#Provides(??): MSung-Light # fails -TTCname(10): Songti.ttc(5) -#TTFname(20): STSongti-TC-Light.ttf - -Name: STSongti-TC-Regular -Class: CNS -#Provides(??): MSung-Medium # fails -TTCname(10): Songti.ttc(7) -#TTFname(20): STSongti-TC-Regular.ttf - -Name: STSongti-TC-Bold -Class: CNS -TTCname(10): Songti.ttc(2) -#TTFname(20): STSongti-TC-Bold.ttf - -# Note about Mac OS X: -# Kaiti.ttc -# contained 6 fonts before OS X 10.11.6 El Capitan. -# After macOS 10.12 Sierra, it contains 7 fonts and -# the order of ttc index has completely changed. - -# TTF entry for Lion (10.7) or earlier -# TTC entry for Mountain Lion (10.8) or later -Name: STKaiti -Class: GB -#Provides(??): STKaiti-Regular # fails -## for Sierra (10.12) or later -TTCname(10): Kaiti.ttc(1) -## for El Capitan (10.11.6) or earlier -#TTCname(10): Kaiti.ttc(4) -TTCname(20): 楷体.ttc(3) -TTFname(30): STKaiti.ttf -TTFname(40): 华文楷体.ttf - -# TTF entry for Lion (10.7) or earlier -# TTC entry for Mountain Lion (10.8) or later -Name: STKaiti-Adobe-CNS1 -Class: CNS -#Provides(??): MKai-Medium # fails -## for Sierra (10.12) or later -TTCname(10): Kaiti.ttc(1) -## for El Capitan (10.11.6) or earlier -#TTCname(10): Kaiti.ttc(4) -TTCname(20): 楷体.ttc(3) -TTFname(30): STKaiti.ttf -TTFname(40): 华文楷体.ttf - -# for El Capitan (10.11.6) or earlier -Name: STKaiti-SC-Regular -Class: GB -#Provides(??): STKaiti-Regular # fails -TTCname(10): Kaiti.ttc(3) -TTCname(20): 楷体.ttc(2) -#TTFname(30): STKaiti-SC-Regular.ttf - -# for Sierra (10.12) or later -Name: STKaitiSC-Regular -Class: GB -#Provides(??): STKaiti-Regular # fails -TTCname(10): Kaiti.ttc(0) - -# for El Capitan (10.11.6) or earlier -Name: STKaiti-SC-Bold -Class: GB -TTCname(10): Kaiti.ttc(1) -TTCname(20): 楷体.ttc(1) -#TTFname(30): STKaiti-SC-Bold.ttf - -# for Sierra (10.12) or later -Name: STKaitiSC-Bold -Class: GB -TTCname(10): Kaiti.ttc(3) - -# for El Capitan (10.11.6) or earlier -Name: STKaiti-SC-Black -Class: GB -TTCname(10): Kaiti.ttc(0) -TTCname(20): 楷体.ttc(0) -#TTFname(30): STKaiti-SC-Black.ttf - -# for Sierra (10.12) or later -Name: STKaitiSC-Black -Class: GB -TTCname(10): Kaiti.ttc(5) - -# for El Capitan (10.11.6) or earlier -Name: STKaiTi-TC-Regular -Class: CNS -#Provides(??): MKai-Medium # fails -TTCname(10): Kaiti.ttc(5) -#TTFname(20): STKaiTi-TC-Regular.ttf - -# for Sierra (10.12) or later -Name: STKaitiTC-Regular -Class: CNS -#Provides(??): MKai-Medium # fails -TTCname(10): Kaiti.ttc(2) - -# for El Capitan (10.11.6) or earlier -Name: STKaiTi-TC-Bold -Class: CNS -TTCname(10): Kaiti.ttc(2) -#TTFname(20): STKaiTi-TC-Bold.ttf - -# for Sierra (10.12) or later -Name: STKaitiTC-Bold -Class: CNS -TTCname(10): Kaiti.ttc(4) - -# for Sierra (10.12) or later (New!) -Name: STKaitiTC-Black -Class: CNS -TTCname(10): Kaiti.ttc(6) - -Name: STBaoliSC-Regular -Class: GB -TTCname: Baoli.ttc(0) - -Name: STBaoliTC-Regular -Class: CNS -TTCname: Baoli.ttc(1) - -Name: STLibianSC-Regular -Class: GB -TTCname: Libian.ttc(0) - -Name: STLibianTC-Regular -Class: CNS -TTCname: Libian.ttc(1) - -Name: STXingkaiSC-Bold -Class: GB -TTCname: Xingkai.ttc(0) - -Name: STXingkaiTC-Bold -Class: CNS -TTCname: Xingkai.ttc(1) - -Name: STXingkaiSC-Light -Class: GB -TTCname: Xingkai.ttc(2) - -Name: STXingkaiTC-Light -Class: CNS -TTCname: Xingkai.ttc(3) - -Name: STYuanti-SC-Regular -Class: GB -TTCname: Yuanti.ttc(0) - -Name: STYuanti-TC-Regular -Class: CNS -TTCname: Yuanti.ttc(1) - -Name: STYuanti-SC-Bold -Class: GB -TTCname: Yuanti.ttc(2) - -Name: STYuanti-TC-Bold -Class: CNS -TTCname: Yuanti.ttc(3) - -Name: STYuanti-SC-Light -Class: GB -TTCname: Yuanti.ttc(4) - -Name: STYuanti-TC-Light -Class: CNS -TTCname: Yuanti.ttc(5) - -# Beijing Founder Electronics -# note: -# FZ****.TTF (13 files) -# are bundled with with WPS Office (formerly Kingsoft Office) Linux. -# Lantinghei.ttc -# is bundled with OS X 10.9 Mavericks or later versions. - -# FZShuSong-Z01 -Name: FZSSK--GBK1-0 -Class: GB -Provides(55): STSong-Light -TTFname: FZSSK.TTF - -# FZXiaoBiaoSong-B05 -Name: FZXBSK--GBK1-0 -Class: GB -Provides(55): STSong-Regular -TTFname: FZXBSK.TTF - -# FZXiHeiI-Z08 -Name: FZXH1K--GBK1-0 -Class: GB -Provides(55): STHeiti-Light -TTFname: FZXH1K.TTF - -# FZHei-B01 -Name: FZHTK--GBK1-0 -Class: GB -Provides(55): STHeiti-Regular -TTFname: FZHTK.TTF - -# FZKai-Z03 -Name: FZKTK--GBK1-0 -Class: GB -Provides(55): STKaiti-Regular -TTFname: FZKTK.TTF - -# FZFangSong-Z02 -Name: FZFSK--GBK1-0 -Class: GB -Provides(55): STFangsong-Light -Provides(55): STFangsong-Regular -TTFname: FZFSK.TTF - -# FZXingKai-S04 -Name: FZXKK--GBK1-0 -Class: GB -TTFname: FZXKK.TTF - -# FZWeiBei-S03 -Name: FZWBK--GBK1-0 -Class: GB -TTFname: FZWBK.TTF - -# FZChaoCuHei-M10 -Name: FZCCHK--GBK1-0 -Class: GB -TTFname: FZCCHK.TTF - -# FZLiShu-S01 -Name: FZLSK--GBK1-0 -Class: GB -TTFname: FZLSK.TTF - -# FZYaoTi-M06 -Name: FZYTK--GBK1-0 -Class: GB -TTFname: FZYTK.TTF - -# FZSongS-Extended -Name: FZSONGS--GB1-5 -Class: GB -TTFname: FZSongS_20100603.TTF - -# FZSongS-Extended(SIP) -Name: FZSONGS_SIP--GB1-5 -Class: GB -TTFname: FZSongS(SIP)_2010603.TTF - -# Lantinghei SC Demibold -Name: FZLTZHK--GBK1-0 -Class: GB -TTCname: Lantinghei.ttc(0) - -# Lantinghei SC Extralight -Name: FZLTXHK--GBK1-0 -Class: GB -TTCname: Lantinghei.ttc(1) - -# Lantinghei SC Heavy -Name: FZLTTHK--GBK1-0 -Class: GB -TTCname: Lantinghei.ttc(2) - -# Lantinghei TC Demibold -Name: FZLTZHB--B51-0 -Class: CNS -TTCname: Lantinghei.ttc(3) - -# Lantinghei TC Extralight -Name: FZLTXHB--B51-0 -Class: CNS -TTCname: Lantinghei.ttc(4) - -# Lantinghei TC Heavy -Name: FZLTTHB--B51-0 -Class: CNS -TTCname: Lantinghei.ttc(5) +# Changzhou SinoType -- Provides level ?? +INCLUDE cjkgs-sinotype.dat # Arphic Font Design Team (OS X) @@ -3803,47 +2507,6 @@ Class: CNS TTFname(20): Apple LiGothic Medium.ttf TTFname(10): LiGothicMed.ttf -# Adobe chinese fonts - -# simplified chinese - -Name: AdobeSongStd-Light -Class: GB -Provides(30): STSong-Light -Provides(30): STSong-Regular -OTFname(10): AdobeSongStd-Light.otf - -Name: AdobeHeitiStd-Regular -Class: GB -Provides(30): STHeiti-Regular -Provides(30): STHeiti-Light -OTFname(20): AdobeHeitiStd-Regular.otf - -Name: AdobeKaitiStd-Regular -Class: GB -Provides(30): STKaiti-Regular -OTFname(20): AdobeKaitiStd-Regular.otf - -Name: AdobeFangsongStd-Regular -Class: GB -Provides(30): STFangsong-Light -Provides(30): STFangsong-Regular -OTFname(20): AdobeFangsongStd-Regular.otf - -# traditional chinese - -Name: AdobeMingStd-Light -Class: CNS -Provides(30): MSung-Light -Provides(30): MSung-Medium -OTFname(20): AdobeMingStd-Light.otf - -Name: AdobeFanHeitiStd-Bold -Class: CNS -Provides(30): MHei-Medium -Provides(30): MKai-Medium -OTFname(20): AdobeFanHeitiStd-Bold.otf - # Fandol (free) Name: FandolSong-Regular @@ -4048,34 +2711,11 @@ TTFname: cwfs.ttf # KOREAN FONTS # -# Solaris-hanyang (Solaris 10, 11) - -Name: Myeongjo -Class: Korea -Provides(40): HYSMyeongJo-Medium -TTFname: h2mjsm.ttf +# Adobe -- Provides level 30 +# (already included in CHINESE section) -Name: Gothic -Class: Korea -Provides(40): HYGoThic-Medium -TTFname: h2gtrm.ttf - -Name: RoundedGothic -Class: Korea -Provides(40): HYRGoThic-Medium -TTFname: h2drrm.ttf - -Name: Haeseo -Class: Korea -TTFname: h2hsrm.ttf - -Name: SunDotum -Class: Korea -TTFname: sundotump.ttf - -Name: SunDotumChe -Class: Korea -TTFname: sundotumf.ttf +# Solaris -- Provides level 40 +INCLUDE cjkgs-solaris.dat # Baekmuk (free) # This is a special case, because "batang.ttf" in baekmuk and @@ -4086,6 +2726,7 @@ TTFname: sundotumf.ttf Name: Baekmuk-Batang Class: Korea Provides(70): HYSMyeongJo-Medium +Casefold: true TTFname(20): batang.ttf TTFname(10): Baekmuk-Batang.ttf @@ -4098,6 +2739,7 @@ TTFname(10): Baekmuk-Dotum.ttf Name: Baekmuk-Gulim Class: Korea Provides(70): HYRGoThic-Medium +Casefold: true TTFname(20): gulim.ttf TTFname(10): Baekmuk-Gulim.ttf @@ -4402,23 +3044,6 @@ Name: JCHEadA Class: Korea TTFname: HeadlineA.ttf -# Adobe korean fonts - -Name: AdobeMyungjoStd-Medium -Class: Korea -Provides(30): HYSMyeongJo-Medium -OTFname: AdobeMyungjoStd-Medium.otf - -Name: AdobeGothicStd-Bold -Class: Korea -Provides(30): HYGoThic-Medium -Provides(80): HYRGoThic-Medium -OTFname: AdobeGothicStd-Bold.otf - -Name: AdobeGothicStd-Light -Class: Korea -OTFname: AdobeGothicStd-Light.otf - # # Microsoft Windows, Windows/Mac Office fonts # @@ -4427,6 +3052,7 @@ OTFname: AdobeGothicStd-Light.otf Name: Batang Class: Korea +Casefold: true TTFname(50): Batang.ttf TTCname(20): batang.ttc(0) @@ -4446,6 +3072,7 @@ TTCname(20): gulim.ttc(3) Name: Gulim Class: Korea +Casefold: true TTFname(50): Gulim.ttf TTCname(20): gulim.ttc(0) @@ -4489,6 +3116,7 @@ Class: GB Provides(60): STSong-Light Provides(60): STSong-Regular TTFname(50): SimSun.ttf +TTFname(21): simsun.ttf TTCname(20): simsun.ttc(0) Name: NSimSun @@ -4508,6 +3136,16 @@ Provides(60): STFangsong-Regular TTFname(40): Fangsong.ttf TTFname(20): simfang.ttf +Name: LiSu +Class: GB +TTCname(20): SIMLI.TTF +TTCname(19): simli.ttf + +Name: YouYuan +Class: GB +TTCname(20): SIMYOU.TTF +TTCname(19): simyou.ttf + Name: MicrosoftYaHei Class: GB TTFname(20): msyh.ttf @@ -4535,26 +3173,6 @@ Name: DengXian-Light Class: GB TTFname: Dengl.ttf -Name: STZhongsong -Class: GB -TTFname: STZHONGS.ttf - -Name: STXinwei -Class: GB -TTFname: STXINWEI.ttf - -Name: STXingkai -Class: GB -TTFname: STXINGKA.ttf - -Name: STLiti -Class: GB -TTFname: STLITI.ttf - -Name: STHupo -Class: GB -TTFname: STHUPO.ttf - # traditional chinese Name: MingLiU @@ -4601,227 +3219,10 @@ Name: MicrosoftMHei-Bold Class: CNS TTFname(10): MSMHei-Bold.ttf -# japanese - -Name: MS-Gothic -Class: Japan -Provides(95): GothicBBB-Medium -Provides(95): GothicBBBPro-Medium -Provides(95): HiraKakuProN-W3 -Provides(95): HiraKakuPro-W3 -Provides(95): FutoGoB101-Bold -Provides(95): FutoGoB101Pro-Bold -Provides(95): HiraKakuProN-W6 -Provides(95): HiraKakuPro-W6 -Provides(95): MidashiGo-MB31 -Provides(95): MidashiGoPro-MB31 -Provides(95): HiraKakuStdN-W8 -Provides(95): HiraKakuStd-W8 -Provides(95): Jun101-Light -Provides(95): Jun101Pro-Light -Provides(95): HiraMaruProN-W4 -Provides(95): HiraMaruPro-W4 -TTFname(50): MS Gothic.ttf -TTFname(30): MS-Gothic.ttf -TTCname(20): msgothic.ttc(0) - -Name: MS-Mincho -Class: Japan -Provides(95): Ryumin-Light -Provides(95): RyuminPro-Light -Provides(95): HiraMinProN-W3 -Provides(95): HiraMinPro-W3 -Provides(95): FutoMinA101-Bold -Provides(95): FutoMinA101Pro-Bold -Provides(95): HiraMinProN-W6 -Provides(95): HiraMinPro-W6 -TTFname(50): MS Mincho.ttf -TTFname(30): MS-Mincho.ttf -TTCname(20): msmincho.ttc(0) - -Name: MS-PGothic -Class: Japan -TTFname(50): MS PGothic.ttf -TTFname(30): MS-PGothic.ttf -TTCname(20): msgothic.ttc(1) - -Name: MS-PMincho -Class: Japan -TTFname(50): MS PMincho.ttf -TTFname(30): MS-PMincho.ttf -TTCname(20): msmincho.ttc(1) - -Name: MS-UIGothic -Class: Japan -TTCname(20): msgothic.ttc(2) - -Name: Meiryo -Class: Japan -TTFname(50): Meiryo.ttf -TTCname(20): meiryo.ttc(0) - -Name: Meiryo-Bold -Class: Japan -TTFname(50): Meiryo Bold.ttf -TTFname(40): MeiryoBold.ttf -TTFname(30): Meiryo-Bold.ttf -TTCname(20): meiryob.ttc(0) - -Name: Meiryo-BoldItalic -Class: Japan -TTFname(50): Meiryo Bold Italic.ttf -TTFname(40): MeiryoBoldItalic.ttf -TTFname(30): Meiryo-BoldItalic.ttf -TTCname(20): meiryob.ttc(1) - -Name: Meiryo-Italic -Class: Japan -TTFname(50): Meiryo Italic.ttf -TTFname(40): MeiryoItalic.ttf -TTFname(30): Meiryo-Italic.ttf -TTCname(20): meiryo.ttc(1) - -Name: MeiryoUI -Class: Japan -TTCname(20): meiryo.ttc(2) - -Name: MeiryoUI-Bold -Class: Japan -TTCname(20): meiryob.ttc(2) - -Name: MeiryoUI-BoldItalic -Class: Japan -TTCname(20): meiryob.ttc(3) - -Name: MeiryoUI-Italic -Class: Japan -TTCname(20): meiryo.ttc(3) - -Name: HGGothicE -Class: Japan -TTCname(50): HGRGE.ttc(0) -TTCname(20): HGRGE.TTC(0) - -Name: HGPGothicE -Class: Japan -TTCname(50): HGRGE.ttc(1) -TTCname(20): HGRGE.TTC(1) - -Name: HGSGothicE -Class: Japan -TTCname(50): HGRGE.ttc(2) -TTCname(20): HGRGE.TTC(2) - -Name: HGGothicM -Class: Japan -TTCname(20): HGRGM.TTC(0) - -Name: HGPGothicM -Class: Japan -TTCname(20): HGRGM.TTC(1) - -Name: HGSGothicM -Class: Japan -TTCname(20): HGRGM.TTC(2) - -Name: HGMinchoE -Class: Japan -TTCname(50): HGRME.ttc(0) -TTCname(20): HGRME.TTC(0) - -Name: HGPMinchoE -Class: Japan -TTCname(50): HGRME.ttc(1) -TTCname(20): HGRME.TTC(2) - -Name: HGSMinchoE -Class: Japan -TTCname(50): HGRME.ttc(2) -TTCname(20): HGRME.TTC(2) - -Name: HGMinchoB -Class: Japan -TTCname(20): HGRMB.TTC(0) - -Name: HGPMinchoB -Class: Japan -TTCname(20): HGRMB.TTC(1) - -Name: HGPMinchoB -Class: Japan -TTCname(20): HGRMB.TTC(2) - -Name: HGSoeiKakugothicUB -Class: Japan -TTCname(50): HGRSGU.ttc(0) -TTCname(20): HGRSGU.TTC(0) - -Name: HGPSoeiKakugothicUB -Class: Japan -TTCname(50): HGRSGU.ttc(1) -TTCname(20): HGRSGU.TTC(1) - -Name: HGSSoeiKakugothicUB -Class: Japan -TTCname(50): HGRSGU.ttc(2) -TTCname(20): HGRSGU.TTC(2) - -Name: HGSoeiKakupoptai -Class: Japan -TTCname(20): HGRPP1.TTC(0) - -Name: HGPSoeiKakupoptai -Class: Japan -TTCname(20): HGRPP1.TTC(1) - -Name: HGSSoeiKakupoptai -Class: Japan -TTCname(20): HGRPP1.TTC(2) - -Name: HGSoeiPresenceEB -Class: Japan -TTCname(20): HGRPRE.TTC(0) - -Name: HGPSoeiPresenceEB -Class: Japan -TTCname(20): HGRPRE.TTC(1) - -Name: HGSSoeiPresenceEB -Class: Japan -TTCname(20): HGRPRE.TTC(2) - -Name: HGKyokashotai -Class: Japan -TTCname(20): HGRKK.TTC(0) - -Name: HGPKyokashotai -Class: Japan -TTCname(20): HGRKK.TTC(1) - -Name: HGSKyokashotai -Class: Japan -TTCname(20): HGRKK.TTC(2) - -Name: HGGyoshotai -Class: Japan -TTCname(20): HGRGY.TTC(0) - -Name: HGPGyoshotai -Class: Japan -TTCname(20): HGRGY.TTC(1) - -Name: HGSGyoshotai -Class: Japan -TTCname(20): HGRGY.TTC(2) - -Name: HGMaruGothicMPRO -Class: Japan -TTFname(40): HGRSMP.ttf -TTFname(20): HGRSMP.TTF - -Name: HGSeikaishotaiPRO -Class: Japan -TTFname(20): HGRSKP.TTF +# Remove-only database (should begin with !INCLUDE) +# that is, entries which contain at least one 'RMVname' line +# note that this line should come at the _end_ of all INCLUDE files +!INCLUDE cjkgs-macos-removeonly.dat ### Local Variables: |