diff options
| author | Philipp Gesang <phg42.2a@gmail.com> | 2013-05-21 13:41:00 -0700 |
|---|---|---|
| committer | Philipp Gesang <phg42.2a@gmail.com> | 2013-05-21 13:41:00 -0700 |
| commit | 1b1890c3b306e42a451465e64c5dbd8f0f094303 (patch) | |
| tree | fca2e364841ccf8cf2c61d851446092c05ce2ce9 /luaotfload-features.lua | |
| parent | e7b6210272a3287205d0692c995d35d5b783c189 (diff) | |
| parent | bd84183e5fb0e97e974b4a9c5fdfac776fdf369a (diff) | |
| download | luaotfload-1b1890c3b306e42a451465e64c5dbd8f0f094303.tar.gz | |
Merge pull request #88 from phi-gamma/master
fix request parser; fix name matching bug; better workaround for ``mkdirs()``; sync with latest Contest
Diffstat (limited to 'luaotfload-features.lua')
| -rw-r--r-- | luaotfload-features.lua | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/luaotfload-features.lua b/luaotfload-features.lua index 9713f95..a4d495e 100644 --- a/luaotfload-features.lua +++ b/luaotfload-features.lua @@ -1015,18 +1015,15 @@ local field = field_char^1 --- switches are “+key” | “-key” local normal_option = C(field) * ws * equals * ws * C(field) * ws local xetex_option = P"+" * ws * normal_option +local ignore_option = (1 - equals)^1 * equals * (1 - featuresep)^1 local assignment = xetex_option / handle_xetex_option + normal_option / handle_normal_option ------ assignment = (field / strip_leading_sign) * ws ------ * equals * ws ------ * (field / toboolean) + + ignore_option / handle_invalid_option local switch = P"+" * ws * C(field) * Cc(true) + P"-" * ws * C(field) * Cc(false) --- + C(field) * Cc(true) -- catch crap -local ignore = (1 - featuresep)^1 --- ignores one option - / handle_invalid_option + + C(field) * Cc(true) --- default local feature_expr = ws * Cg(assignment + switch) * ws -local option = feature_expr + ignore +local option = feature_expr local feature_list = Cf(Ct"" * option * (featuresep * option)^0 |