more fix

[luatex-ja/luatexja.git] / src / patches / lltjp-fontspec.sty

diff --git a/src/patches/lltjp-fontspec.sty b/src/patches/lltjp-fontspec.sty
index 4ba873b..4db2ffe 100644 (file)
--- a/src/patches/lltjp-fontspec.sty
+++ b/src/patches/lltjp-fontspec.sty
@@ -3,17 +3,26 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjp-fontspec}[2013/05/14 Patch to fontspec for LuaTeX-ja]
+\ProvidesPackage{lltjp-fontspec}[2017/08/07 Patch to fontspec for LuaTeX-ja]
 
 \RequirePackage{fontspec,luatexja}
 \ExplSyntaxOn
 
-\cs_set:Nn \fontspec_visible_space:
- {
-  \font_glyph_if_exist:NnTF \font {"2423}
-   { \ltjalchar"2423\scan_stop: }
-   { \fontspec_visible_space_fallback: }
- }
+\@ifpackagelater{fontspec}{2017/01/01}{
+  \cs_set:Nn \fontspec_visible_space:
+   {
+   \__fontspec_primitive_font_glyph_if_exist:NnTF \font {"2423}
+     { \ltjalchar"2423\scan_stop: }
+     { \fontspec_visible_space_fallback: }
+   }
+}{
+  \cs_set:Nn \fontspec_visible_space:
+   {
+   \font_glyph_if_exist:NnTF \font {"2423}
+     { \ltjalchar"2423\scan_stop: }
+     { \fontspec_visible_space_fallback: }
+   }
+}
 \def\verb
  {
   \relax\ifmmode\hbox\else\leavevmode\fi % same as lltjcore
@@ -23,5 +32,11 @@
     \@ifstar\__fontspecsverb\@verb
  }
 
+
+%%%%%%%% shapes in \em
+\cs_set:Npn \emshape { \gtfamily \itshape }
+\cs_set:Npn \eminnershape { \mcfamily \upshape }
+
 \ExplSyntaxOff
+\expandafter\patchcmd\csname TU\string\textasteriskcentered\endcsname{\char}{\ltjalchar}{}{}
 \endinput