typo

diff --git a/src/addons/luatexja-preset.sty b/src/addons/luatexja-preset.sty
index 984b9c0..4b92a88 100644 (file)
--- a/src/addons/luatexja-preset.sty
+++ b/src/addons/luatexja-preset.sty
@@ -1,5 +1,5 @@
 % luatexja-preset.sty
-\ProvidesPackage{luatexja-preset}[2017/05/05 Japanese font presets]
+\ProvidesPackage{luatexja-preset}[2017/06/25 Japanese font presets]
 
 \RequirePackage{expl3,l3keys2e}
 \RequirePackage{luatexja}
@@ -473,7 +473,7 @@
   \ltj_preset_define_family:nnn {ltjpmg} {m}  {\ltjpreset_font_mg:}
   \ltj_preset_define_family:nnn {ltjpg}  {eb} {\ltjpreset_font_gt_eb:}
   \def\ebdefault{eb}
-  \DeclareRobustCommand\ebseries { \not@math@alphabet\ebseries\relaxfontseries\ebdefault\selectfont }
+  \DeclareRobustCommand\ebseries { \not@math@alphabet\ebseries\relax\fontseries\ebdefault\selectfont }
   \DeclareRobustCommand\gtebfamily { \kanjifamily{ltjpg}\fontseries{\ebdefault}\selectfont }
   \DeclareTextFontCommand{\textgteb}{\gtebfamily}
   \DeclareRobustCommand\mgfamily { \not@math@alphabet\mgfamily\relax\kanjifamily{ltjpmg}\selectfont }

diff --git a/test/test16-preset.pdf b/test/test16-preset.pdf
index 373b6c7..f644eeb 100644 (file)
Binary files a/test/test16-preset.pdf and b/test/test16-preset.pdf differ

diff --git a/test/test16-preset.tex b/test/test16-preset.tex
index a012452..71fe1f1 100644 (file)
--- a/test/test16-preset.tex
+++ b/test/test16-preset.tex
@@ -1,13 +1,20 @@
 %#!lualatex test16-preset && pdffonts test16-preset.pdf
-\documentclass{ltjarticle}
-\usepackage[moga-mobo,deluxe,expert, nfssonly, jis2004, match]{luatexja-preset}
+\documentclass{ltjtarticle}
+\makeatletter
+\let\ltj@orig@DeclareFontShape@=\DeclareFontShape@
+\def\DeclareFontShape@#1#2#3#4#5#6{%
+      \immediate\typeout{DFS |#1|#2|#3|#4|#5|#6|}%
+      \ltj@orig@DeclareFontShape@{#1}{#2}{#3}{#4}{#5}{#6}%
+      }
+\makeatother
+\usepackage[noto-otf,deluxe,expert,nfssonly,jis2004, match]{luatexja-preset}
 \begin{document}
 \makeatletter
 \def\r#1#2{ \csname #1family \endcsname \csname #2series \endcsname
   %\addjfontfeature {CJKShape=JIS1983}
   {\romanfamily{\ttdefault}\selectfont<\k@family><\k@series><\k@shape>}\\
-  {\tt#1, #2\ \ \ \ \ }: ã\81\82ã\81\84ã\81\86ã\81\88ã\81\8aabcæ¼¢å­\97ï¼\8cã\81\82ï¼\81ã\81\84ï¼\8cè¾»\\
-  {\tt#1, #2 (rb)}: {\rubyfamily あいうえおabc漢字，あ！い，辻}
+  {\tt#1, #2\ \ \ \ \ }: ã\81\82ã\83¼ã\81\84ã\81\86ã\81\88ã\81\8aabcæ¼¢å­\97ï¼\8cã\81\82ï¼\81ã\81\84ï¼\8cè¾»ã\81\81ã\81\8c\\
+  {\tt#1, #2 (rb)}: {\rubyfamily あいうえおabc漢字，あ！い，辻ぁが}
 }
 \@namedef{..series}{\relax}
 
@@ -16,7 +23,6 @@
 \r{mc}{bf}
 
 
-
 \r{gt}{md}
 
 \r{gt}{bf}
@@ -26,7 +32,7 @@
 \fi
 
 \ifdefined\gtebfamily
-\r{gteb}{..}
+\r{gt}{eb}
 \fi
 
 \r{tt}{md}
@@ -37,6 +43,5 @@ $あいう\mathgt{あいう}$
 
 \normalfont
 {あいうえおabc \sf あいうえおabc}
-\end{document}
 
-3.88
+\end{document}