haranoaji (18apr20)

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

11 files changed, 27 insertions, 10 deletions

diff --git a/Master/texmf-dist/doc/fonts/haranoaji/README b/Master/texmf-dist/doc/fonts/haranoaji/README
index 384b7300337..f4522a8801a 100644
--- a/Master/texmf-dist/doc/fonts/haranoaji/README
+++ b/Master/texmf-dist/doc/fonts/haranoaji/README
@@ -1,4 +1,4 @@
-# Harano Aji Fonts ver. 20200215
+# Harano Aji Fonts ver. 20200418
 
 https://github.com/trueroad/HaranoAjiFonts
 
diff --git a/Master/texmf-dist/fonts/opentype/public/haranoaji/HaranoAjiGothic-Bold.otf b/Master/texmf-dist/fonts/opentype/public/haranoaji/HaranoAjiGothic-Bold.otf
index a5017407260..7f221e00fed 100644
--- a/Master/texmf-dist/fonts/opentype/public/haranoaji/HaranoAjiGothic-Bold.otf
+++ b/Master/texmf-dist/fonts/opentype/public/haranoaji/HaranoAjiGothic-Bold.otf
diff --git a/Master/texmf-dist/fonts/opentype/public/haranoaji/HaranoAjiGothic-Heavy.otf b/Master/texmf-dist/fonts/opentype/public/haranoaji/HaranoAjiGothic-Heavy.otf
index 6f9fefbae88..b632bd6a0f7 100644
--- a/Master/texmf-dist/fonts/opentype/public/haranoaji/HaranoAjiGothic-Heavy.otf
+++ b/Master/texmf-dist/fonts/opentype/public/haranoaji/HaranoAjiGothic-Heavy.otf
diff --git a/Master/texmf-dist/fonts/opentype/public/haranoaji/HaranoAjiGothic-Medium.otf b/Master/texmf-dist/fonts/opentype/public/haranoaji/HaranoAjiGothic-Medium.otf
index f5e9279cac9..34394078e28 100644
--- a/Master/texmf-dist/fonts/opentype/public/haranoaji/HaranoAjiGothic-Medium.otf
+++ b/Master/texmf-dist/fonts/opentype/public/haranoaji/HaranoAjiGothic-Medium.otf
diff --git a/Master/texmf-dist/fonts/opentype/public/haranoaji/HaranoAjiGothic-Regular.otf b/Master/texmf-dist/fonts/opentype/public/haranoaji/HaranoAjiGothic-Regular.otf
index c80f7df79dc..ec402f4caaf 100644
--- a/Master/texmf-dist/fonts/opentype/public/haranoaji/HaranoAjiGothic-Regular.otf
+++ b/Master/texmf-dist/fonts/opentype/public/haranoaji/HaranoAjiGothic-Regular.otf
diff --git a/Master/texmf-dist/fonts/opentype/public/haranoaji/HaranoAjiMincho-Bold.otf b/Master/texmf-dist/fonts/opentype/public/haranoaji/HaranoAjiMincho-Bold.otf
index 00c8d7d5d11..f8c652ff0be 100644
--- a/Master/texmf-dist/fonts/opentype/public/haranoaji/HaranoAjiMincho-Bold.otf
+++ b/Master/texmf-dist/fonts/opentype/public/haranoaji/HaranoAjiMincho-Bold.otf
diff --git a/Master/texmf-dist/fonts/opentype/public/haranoaji/HaranoAjiMincho-Light.otf b/Master/texmf-dist/fonts/opentype/public/haranoaji/HaranoAjiMincho-Light.otf
index fe2d4127dd6..9a80654f4f8 100644
--- a/Master/texmf-dist/fonts/opentype/public/haranoaji/HaranoAjiMincho-Light.otf
+++ b/Master/texmf-dist/fonts/opentype/public/haranoaji/HaranoAjiMincho-Light.otf
diff --git a/Master/texmf-dist/fonts/opentype/public/haranoaji/HaranoAjiMincho-Regular.otf b/Master/texmf-dist/fonts/opentype/public/haranoaji/HaranoAjiMincho-Regular.otf
index 2472eab5b01..0e8248f42af 100644
--- a/Master/texmf-dist/fonts/opentype/public/haranoaji/HaranoAjiMincho-Regular.otf
+++ b/Master/texmf-dist/fonts/opentype/public/haranoaji/HaranoAjiMincho-Regular.otf
diff --git a/Master/texmf-dist/tex/latex/haranoaji/HaranoAjiGothic.fontspec b/Master/texmf-dist/tex/latex/haranoaji/HaranoAjiGothic.fontspec
new file mode 100644
index 00000000000..f8201d7a7e6
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/haranoaji/HaranoAjiGothic.fontspec
@@ -0,0 +1,8 @@
+\defaultfontfeatures[HaranoAjiGothic]
+  {
+    Extension = .otf,
+    UprightFont = *-Regular,
+    BoldFont = *-Bold,
+    FontFace = {l}{\shapedefault}{ *-Regular },
+    FontFace = {eb}{\shapedefault}{ *-Heavy }
+  }
diff --git a/Master/texmf-dist/tex/latex/haranoaji/HaranoAjiMincho.fontspec b/Master/texmf-dist/tex/latex/haranoaji/HaranoAjiMincho.fontspec
new file mode 100644
index 00000000000..da0801d0b2c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/haranoaji/HaranoAjiMincho.fontspec
@@ -0,0 +1,8 @@
+\defaultfontfeatures[HaranoAjiMincho]
+  {
+    Extension = .otf,
+    UprightFont = *-Regular,
+    BoldFont = *-Bold,
+    FontFace = {l}{\shapedefault}{ *-Light },
+    FontFace = {eb}{\shapedefault}{ *-Bold }
+  }
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 8851204aed0..cff604094dc 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1509,6 +1509,7 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`);
  'grotesq'              => '&POSTgrotesq',
  'grverb'               => '&POSTgrverb',
  'guide-latex-fr'       => '&POST_rmsymlink',
+ 'haranoaji'		=> 'POST_preserve_postcode',
  'hmtrump'		=> '&POSThmtrump',
  'hustthesis'		=> '&POSThustthesis',
  'ibygrk'               => '&POSTibygrk',
@@ -1560,7 +1561,7 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`);
  'pst-cox'              => '&POSTpstcox',
  'pst-geo'              => '&POSTpstgeo',
  'ptex-fontmaps'        => '&POSTptex_fontmaps',
- 'ptex2pdf'		=> '&POSTptex2pdf',
+ 'ptex2pdf'		=> '&POST_preserve_postcode',
  'pxbase'               => '&POSTpxbase',
  'pxchfon'              => '&POSTpxchfon',
  'recipebook'		=> '&POST_rmsymlink',
@@ -6438,14 +6439,6 @@ sub POSTptex_fontmaps {
   &SYSTEM ("$MV database $fmiscdest/$package");
 }
 
-sub POSTptex2pdf {
-  print "POST$package - preserve tlpostcode/ptex2pdf-tlpost.pl\n";
-  my $dirpath = "tlpkg/tlpostcode";
-  my $dest = "$TOPDEST/$dirpath";
-  &xmkdir ($dest);
-  &SYSTEM ("$CP $Master/$dirpath/ptex2pdf-tlpost.pl $dest/");
-}
-
 sub POSTknitting {
   print "POST$package - move generic .tex file\n";
   my $dest = "$DEST/tex/plain/$package";
@@ -6914,6 +6907,14 @@ sub POST_otherformat {
   &SYSTEM ("$MV $DEST/tex/$package/$package/* $DEST/tex/$package/");
 }
 
+sub POST_preserve_postcode {
+  print "POST$package - preserve tlpostcode/$package-tlpost.pl\n";
+  my $dirpath = "tlpkg/tlpostcode";
+  my $dest = "$TOPDEST/$dirpath";
+  &xmkdir ($dest);
+  &SYSTEM ("$CP $Master/$dirpath/$package-tlpost.pl $dest/");
+}
+
 sub POST_preserve_man {
   print "POST$package - preserve man pages\n";
   &preserve_man_pages ($package);