tex-japanese-otf{,-doc}: update to 1.7b7

 * otf.sty: Scale Japanese fonts using \Cjascale if defined.
   Support jsreport.cls in jsclasses.

 * ajmacros.sty: Add \NeedsTeXFormat{pLaTeX2e} to avoid infinite loop.

3 files changed, 9 insertions, 50 deletions

diff --git a/fonts/tex-japanese-otf/Makefile b/fonts/tex-japanese-otf/Makefile
index 81906dcd376..328c5893c63 100644
--- a/fonts/tex-japanese-otf/Makefile
+++ b/fonts/tex-japanese-otf/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2017/07/27 11:11:57 markd Exp $
+# $NetBSD: Makefile,v 1.7 2018/05/06 12:07:38 markd Exp $
 
 DISTNAME=	japanese-otf
-PKGNAME=	tex-${DISTNAME}-1.7b6.42950
-PKGREVISION=	1
-TEXLIVE_REV=	42950
+PKGNAME=	tex-${DISTNAME}-1.7b7
+TEXLIVE_REV=	46598
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ctan.org/pkg/japanese-otf
diff --git a/fonts/tex-japanese-otf/PLIST b/fonts/tex-japanese-otf/PLIST
index 6f61edbc89d..676ce097be6 100644
--- a/fonts/tex-japanese-otf/PLIST
+++ b/fonts/tex-japanese-otf/PLIST
@@ -1,15 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2015/04/25 08:01:05 markd Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/05/06 12:07:38 markd Exp $
 share/texmf-dist/fonts/map/dvipdfmx/japanese-otf/otf-cktx.map
-share/texmf-dist/fonts/ofm/public/japanese-otf/hirakaku-w3-h.ofm
-share/texmf-dist/fonts/ofm/public/japanese-otf/hirakaku-w3-v.ofm
-share/texmf-dist/fonts/ofm/public/japanese-otf/hirakaku-w6-h.ofm
-share/texmf-dist/fonts/ofm/public/japanese-otf/hirakaku-w6-v.ofm
-share/texmf-dist/fonts/ofm/public/japanese-otf/hiramaru-w4-h.ofm
-share/texmf-dist/fonts/ofm/public/japanese-otf/hiramaru-w4-v.ofm
-share/texmf-dist/fonts/ofm/public/japanese-otf/hiramin-w3-h.ofm
-share/texmf-dist/fonts/ofm/public/japanese-otf/hiramin-w3-v.ofm
-share/texmf-dist/fonts/ofm/public/japanese-otf/hiramin-w6-h.ofm
-share/texmf-dist/fonts/ofm/public/japanese-otf/hiramin-w6-v.ofm
 share/texmf-dist/fonts/ofm/public/japanese-otf/otf-cjgb-h.ofm
 share/texmf-dist/fonts/ofm/public/japanese-otf/otf-cjgb-v.ofm
 share/texmf-dist/fonts/ofm/public/japanese-otf/otf-cjge-h.ofm
@@ -276,16 +266,6 @@ share/texmf-dist/fonts/tfm/public/japanese-otf/hgothr-h.tfm
 share/texmf-dist/fonts/tfm/public/japanese-otf/hgothr-v.tfm
 share/texmf-dist/fonts/tfm/public/japanese-otf/hgothrn-h.tfm
 share/texmf-dist/fonts/tfm/public/japanese-otf/hgothrn-v.tfm
-share/texmf-dist/fonts/tfm/public/japanese-otf/hirakaku-w3-h.tfm
-share/texmf-dist/fonts/tfm/public/japanese-otf/hirakaku-w3-v.tfm
-share/texmf-dist/fonts/tfm/public/japanese-otf/hirakaku-w6-h.tfm
-share/texmf-dist/fonts/tfm/public/japanese-otf/hirakaku-w6-v.tfm
-share/texmf-dist/fonts/tfm/public/japanese-otf/hiramaru-w4-h.tfm
-share/texmf-dist/fonts/tfm/public/japanese-otf/hiramaru-w4-v.tfm
-share/texmf-dist/fonts/tfm/public/japanese-otf/hiramin-w3-h.tfm
-share/texmf-dist/fonts/tfm/public/japanese-otf/hiramin-w3-v.tfm
-share/texmf-dist/fonts/tfm/public/japanese-otf/hiramin-w6-h.tfm
-share/texmf-dist/fonts/tfm/public/japanese-otf/hiramin-w6-v.tfm
 share/texmf-dist/fonts/tfm/public/japanese-otf/hmgothr-h.tfm
 share/texmf-dist/fonts/tfm/public/japanese-otf/hmgothr-v.tfm
 share/texmf-dist/fonts/tfm/public/japanese-otf/hmgothrn-h.tfm
@@ -396,16 +376,6 @@ share/texmf-dist/fonts/tfm/public/japanese-otf/otf-utgr-h.tfm
 share/texmf-dist/fonts/tfm/public/japanese-otf/otf-utgr-v.tfm
 share/texmf-dist/fonts/tfm/public/japanese-otf/otf-utmr-h.tfm
 share/texmf-dist/fonts/tfm/public/japanese-otf/otf-utmr-v.tfm
-share/texmf-dist/fonts/tfm/public/japanese-otf/phirakakuw3-h.tfm
-share/texmf-dist/fonts/tfm/public/japanese-otf/phirakakuw3-v.tfm
-share/texmf-dist/fonts/tfm/public/japanese-otf/phirakakuw6-h.tfm
-share/texmf-dist/fonts/tfm/public/japanese-otf/phirakakuw6-v.tfm
-share/texmf-dist/fonts/tfm/public/japanese-otf/phiramaruw4-h.tfm
-share/texmf-dist/fonts/tfm/public/japanese-otf/phiramaruw4-v.tfm
-share/texmf-dist/fonts/tfm/public/japanese-otf/phiraminw3-h.tfm
-share/texmf-dist/fonts/tfm/public/japanese-otf/phiraminw3-v.tfm
-share/texmf-dist/fonts/tfm/public/japanese-otf/phiraminw6-h.tfm
-share/texmf-dist/fonts/tfm/public/japanese-otf/phiraminw6-v.tfm
 share/texmf-dist/fonts/tfm/public/japanese-otf/rubygothb-h.tfm
 share/texmf-dist/fonts/tfm/public/japanese-otf/rubygothb-v.tfm
 share/texmf-dist/fonts/tfm/public/japanese-otf/rubygotheb-h.tfm
@@ -1392,16 +1362,6 @@ share/texmf-dist/fonts/vf/public/japanese-otf/nmlminr-h.vf
 share/texmf-dist/fonts/vf/public/japanese-otf/nmlminr-v.vf
 share/texmf-dist/fonts/vf/public/japanese-otf/nmlminrn-h.vf
 share/texmf-dist/fonts/vf/public/japanese-otf/nmlminrn-v.vf
-share/texmf-dist/fonts/vf/public/japanese-otf/phirakakuw3-h.vf
-share/texmf-dist/fonts/vf/public/japanese-otf/phirakakuw3-v.vf
-share/texmf-dist/fonts/vf/public/japanese-otf/phirakakuw6-h.vf
-share/texmf-dist/fonts/vf/public/japanese-otf/phirakakuw6-v.vf
-share/texmf-dist/fonts/vf/public/japanese-otf/phiramaruw4-h.vf
-share/texmf-dist/fonts/vf/public/japanese-otf/phiramaruw4-v.vf
-share/texmf-dist/fonts/vf/public/japanese-otf/phiraminw3-h.vf
-share/texmf-dist/fonts/vf/public/japanese-otf/phiraminw3-v.vf
-share/texmf-dist/fonts/vf/public/japanese-otf/phiraminw6-h.vf
-share/texmf-dist/fonts/vf/public/japanese-otf/phiraminw6-v.vf
 share/texmf-dist/fonts/vf/public/japanese-otf/rubygothb-h.vf
 share/texmf-dist/fonts/vf/public/japanese-otf/rubygothb-v.vf
 share/texmf-dist/fonts/vf/public/japanese-otf/rubygotheb-h.vf
diff --git a/fonts/tex-japanese-otf/distinfo b/fonts/tex-japanese-otf/distinfo
index 49a40c8eb8a..6951f7fdef8 100644
--- a/fonts/tex-japanese-otf/distinfo
+++ b/fonts/tex-japanese-otf/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2017/06/21 07:24:07 markd Exp $
+$NetBSD: distinfo,v 1.7 2018/05/06 12:07:38 markd Exp $
 
-SHA1 (tex-japanese-otf-42950/japanese-otf.tar.xz) = 9832eaea6271d0da67807961d17ce638dd2da1aa
-RMD160 (tex-japanese-otf-42950/japanese-otf.tar.xz) = 21bddf309bbc01efd509749bcb22aa74bf9b7db1
-SHA512 (tex-japanese-otf-42950/japanese-otf.tar.xz) = 7772f8a9c86c55f84afe5b2d4866a7e96fb088ec6df2f9f2217e741eda00ffa7b759b7e8727ff8d956e0da6d04cf2d5c72054f88ee5eafa296623a180597f581
-Size (tex-japanese-otf-42950/japanese-otf.tar.xz) = 418956 bytes
+SHA1 (tex-japanese-otf-46598/japanese-otf.tar.xz) = 6b6965ab46401ab5f4b89526653b4177c94d388f
+RMD160 (tex-japanese-otf-46598/japanese-otf.tar.xz) = 6855144d83bbe72d511a2df8974408f03f7a56b8
+SHA512 (tex-japanese-otf-46598/japanese-otf.tar.xz) = ffa12f631de025553c73599afa0bdd0d8375e2d49dc3d854ac77135e8eb80e2414c36139180d81cdf33c855f42e1d500b878835275c5beba6934f1d8d08a83d5
+Size (tex-japanese-otf-46598/japanese-otf.tar.xz) = 393204 bytes