jfm feature: ignore spaces around '=' and ','

diff --git a/src/ltj-jfont.lua b/src/ltj-jfont.lua
index 4c19e33..64cb1a0 100644 (file)
--- a/src/ltj-jfont.lua
+++ b/src/ltj-jfont.lua
@@ -404,12 +404,12 @@ do
     local semicolon         = P';'
     local comma             = P','
     local equals            = P'='
-    local jf_field_char     = 1 - S'/{};,='
+    local jf_field_char     = 1 - S'/{};,= \t\v'
     local jf_field          = C(jf_field_char^1)
-    local jf_assignment     = jf_field * equals * jf_field
-    local jf_switch         = P'-'    * jf_field * Cc(false) + P'+'^-1 * jf_field * Cc(true)
-    local jf_feature_expr   = Cg(jf_assignment + jf_switch) * comma^0
-    local jf_feature_list   = P'{' * jf_feature_expr^0 * P'}' + jf_feature_expr^0
+    local jf_assignment     = jf_field * ws * equals * ws * jf_field
+    local jf_switch         = P'-' * jf_field * Cc(false) + P'+'^-1 * jf_field * Cc(true)
+    local jf_feature_expr   = Cg(jf_assignment + jf_switch) * ws * comma^0 * ws
+    local jf_feature_list   = ws * ( P'{' * ws * jf_feature_expr^0 * P'}' + jf_feature_expr^0 )
     local jf_list           = C((1-slash)^1) * (slash * Cf(Ct'' * jf_feature_list, rawset))^-1
     local jf_value          = (1 - semicolon)^1
     local function rem(name,value)

diff --git a/test/test33-jfm_feature.tex b/test/test33-jfm_feature.tex
index bdda537..da89897 100644 (file)
--- a/test/test33-jfm_feature.tex
+++ b/test/test33-jfm_feature.tex
@@ -61,7 +61,7 @@
   }\par
 }
 
-\jfont\testP=KozMinPr6N-Regular:jfm=ujis/h,-p,l=g,z=true;jfm=testf/q,-d,l=f,z=h,e,hwid;trad  at 9pt
+\jfont\testP="KozMinPr6N-Regular:jfm=ujis/h,-p,l=g,z=true;jfm=testf/ -so , lw = tr ,q,-d,-po, l=f,z=h,e, hwid;trad"  at 9pt
 \printjfmfeat\testP
 \testP イ医学