summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2015-05-06 13:41:13 +0000
committerNorbert Preining <preining@logic.at>2015-05-06 13:41:13 +0000
commit0fe007596309c36ce1db05bcc6cbaf11b175b274 (patch)
treeefc5e446c3729868b21156e1c6b44d93f590a343 /Master
parent8649dcb7491ec124e22e99b132a0806d44daa8b6 (diff)
cjk-gs-integrate quick fix
git-svn-id: svn://tug.org/texlive/trunk@37232 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/fonts/cjk-gs-integrate/ChangeLog16
-rwxr-xr-xMaster/texmf-dist/scripts/cjk-gs-integrate/cjk-gs-integrate.pl17
2 files changed, 22 insertions, 11 deletions
diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/ChangeLog b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/ChangeLog
index 1bd7f43821f..8ec8aca5181 100644
--- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/ChangeLog
+++ b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/ChangeLog
@@ -1,6 +1,18 @@
2015-05-06 Norbert Preining <norbert@preining.info>
- * Release 20150506.0 (HEAD, master) [24db8e7]
+ * Release 20150506.1 (HEAD, master) [daf2e89]
+
+2015-05-06 Norbert Preining <norbert@preining.info>
+
+ * reactivate aliases for MSung-Light and STFangsong-Light (origin/master, origin/HEAD) [bf0d437]
+
+2015-05-06 Norbert Preining <norbert@preining.info>
+
+ * remove debug statement [cf81cb7]
+
+2015-05-06 Norbert Preining <norbert@preining.info>
+
+ * Release 20150506.0 (tag: 20150506.0) [24db8e7]
2015-05-06 Norbert Preining <norbert@preining.info>
@@ -12,7 +24,7 @@
2015-05-06 Norbert Preining <norbert@preining.info>
- * add /Library/Fonts/Microsoft to search path, add --link-texmflocal option (origin/master, origin/HEAD) [fc80300]
+ * add /Library/Fonts/Microsoft to search path, add --link-texmflocal option [fc80300]
2015-05-06 Norbert Preining <norbert@preining.info>
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 980e41329be..59badebf341 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
@@ -25,7 +25,7 @@ use File::Basename;
use strict;
(my $prg = basename($0)) =~ s/\.pl$//;
-my $version = '20150506.0';
+my $version = '20150506.1';
if (win32()) {
print_error("Sorry, currently not supported on Windows!\n");
@@ -458,7 +458,6 @@ sub link_font {
$n = basename($f);
}
my $target = "$cd/$n";
- printf STDERR "link try to $target\n";
if ($opt_force && -e $target) {
print_info("Removing $target prior to recreation due to --force\n");
unlink($target) || die "Cannot unlink $target prior to recreation under --force: $!";
@@ -1714,7 +1713,7 @@ Filename(10): LiHeiPro.ttf
Name: LiSongPro
Type: TTF
Class: CNS
-# Provides(50): MSung-Medium
+Provides(50): MSung-Medium
Provides(50): MSung-Light
Filename(20): 儷宋 Pro.ttf
Filename(10): LiSongPro.ttf
@@ -1763,7 +1762,7 @@ Filename(20): STHeitiTC-Medium.ttf
Name: STFangsong
Type: TTF
Class: GB
-# Provides(40): STFangsong-Light
+Provides(40): STFangsong-Light
Provides(40): STFangsong-Regular
Filename(20): 华文仿宋.ttf
Filename(10): STFangsong.ttf
@@ -1816,7 +1815,7 @@ Filename(20): STSongti-TC-Light.ttf
Name: STSongti-TC-Regular
Type: TTF
Class: CNS
-# Provides(40): MSung-Medium
+Provides(40): MSung-Medium
Filename(10): Songti.ttc(7)
Filename(20): STSongti-TC-Regular.ttf
@@ -1905,7 +1904,7 @@ Filename(20): AdobeKaitiStd-Regular.otf
Name: AdobeFangsongStd-Regular
Type: CID
Class: GB
-# Provides(30): STFangsong-Light
+Provides(30): STFangsong-Light
Provides(30): STFangsong-Regular
Filename(20): AdobeFangsongStd-Regular.otf
@@ -1915,7 +1914,7 @@ Name: AdobeMingStd-Light
Type: CID
Class: CNS
Provides(30): MSung-Light
-# Provides(30): MSung-Medium
+Provides(30): MSung-Medium
Filename(20): AdobeMingStd-Light.otf
Name: AdobeFanHeitiStd-Bold
@@ -2087,7 +2086,7 @@ Name: SimSun
Type: TTF
Class: GB
Provides(60): STSong-Light
-# Provides(60): STFangsong-Light
+Provides(60): STFangsong-Light
Provides(60): STFangsong-Regular
Filename(50): SimSun.ttf
@@ -2098,7 +2097,7 @@ Type: TTF
Class: CNS
Provides(60): MHei-Medium
Provides(60): MKai-Medium
-# Provides(60): MSung-Medium
+Provides(60): MSung-Medium
Provides(60): MSung-Light
Filename(50): MingLiU.ttf