\str_if_eq_x:nn -> \str_if_eq:ee

diff --git a/src/addons/luatexja-fontspec-25c.sty b/src/addons/luatexja-fontspec-25c.sty
index 9c67b70..1e227b4 100644 (file)
--- a/src/addons/luatexja-fontspec-25c.sty
+++ b/src/addons/luatexja-fontspec-25c.sty
@@ -104,7 +104,7 @@
     \__fontspec_update_featstr:n {cid=##1}
   }
   \ltj_fontspec_define_option:nn {Kanjiskip} {
-    \str_if_eq_x:nnTF {false} { \str_lower_case:n { ##1 } }{
+    \str_if_eq:eeTF {false} { \str_lower_case:n { ##1 } }{
       \__fontspec_update_featstr:n {-ltjksp}
     } {
       \__fontspec_update_featstr:n {+ltjksp}

diff --git a/src/addons/luatexja-fontspec-26h.sty b/src/addons/luatexja-fontspec-26h.sty
index 1472633..a84fb72 100644 (file)
--- a/src/addons/luatexja-fontspec-26h.sty
+++ b/src/addons/luatexja-fontspec-26h.sty
@@ -131,7 +131,7 @@
     \__fontspec_update_featstr:n {cid=##1}
   }
   \__ltj_fontspec_define_option:nn {Kanjiskip} {
-    \str_if_eq_x:nnTF {false} { \str_lower_case:n { ##1 } }{
+    \str_if_eq:eeTF {false} { \str_lower_case:n { ##1 } }{
       \__fontspec_update_featstr:n {-ltjksp}
     } {
       \__fontspec_update_featstr:n {+ltjksp}

diff --git a/src/addons/luatexja-fontspec-27c.sty b/src/addons/luatexja-fontspec-27c.sty
index 88d6b37..d872da8 100644 (file)
--- a/src/addons/luatexja-fontspec-27c.sty
+++ b/src/addons/luatexja-fontspec-27c.sty
@@ -131,7 +131,7 @@
     \__fontspec_update_featstr:n {cid=##1}
   }
   \__ltj_fontspec_define_option:nn {Kanjiskip} {
-    \str_if_eq_x:nnTF {false} { \str_lower_case:n { ##1 } }{
+    \str_if_eq:eeTF {false} { \str_lower_case:n { ##1 } }{
       \__fontspec_update_featstr:n {-ltjksp}
     } {
       \__fontspec_update_featstr:n {+ltjksp}

diff --git a/src/patches/lltjp-fontspec.sty b/src/patches/lltjp-fontspec.sty
index 6f469fc..c58ac1c 100644 (file)
--- a/src/patches/lltjp-fontspec.sty
+++ b/src/patches/lltjp-fontspec.sty
@@ -28,7 +28,7 @@
             \exp_not:N \selectfont
           }
       }
-    \str_if_eq_x:nnT {\familydefault} {\rmdefault}
+    \str_if_eq:eeT {\familydefault} {\rmdefault}
       { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl }
     \__fontspec_setmainfont_hook:nn {#1} {#2}
     \normalfont
@@ -47,7 +47,7 @@
             \exp_not:N \selectfont
           }
       }
-    \str_if_eq_x:nnT {\familydefault} {\sfdefault}
+    \str_if_eq:eeT {\familydefault} {\sfdefault}
       { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl }
     \__fontspec_setsansfont_hook:nn {#1} {#2}
     \normalfont
@@ -66,7 +66,7 @@
             \exp_not:N \selectfont
           }
       }
-    \str_if_eq_x:nnT {\familydefault} {\ttdefault}
+    \str_if_eq:eeT {\familydefault} {\ttdefault}
       { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl }
     \__fontspec_setmonofont_hook:nn {#1} {#2}
     \normalfont
@@ -84,7 +84,7 @@
     \exp_not:N \selectfont
    }
   }
-  \str_if_eq_x:nnT {\familydefault} {\rmdefault}
+  \str_if_eq:eeT {\familydefault} {\rmdefault}
     { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl }
   \normalfont
   \ignorespaces
@@ -101,7 +101,7 @@
     \exp_not:N \selectfont
    }
   }
-  \str_if_eq_x:nnT {\familydefault} {\sfdefault}
+  \str_if_eq:eeT {\familydefault} {\sfdefault}
     { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl }
   \normalfont
   \ignorespaces
@@ -118,7 +118,7 @@
     \exp_not:N \selectfont
    }
   }
-  \str_if_eq_x:nnT {\familydefault} {\ttdefault}
+  \str_if_eq:eeT {\familydefault} {\ttdefault}
     { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl }
   \normalfont
   \ignorespaces