summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-parsers.lua
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-01-18 22:36:39 +0000
committerKarl Berry <karl@freefriends.org>2019-01-18 22:36:39 +0000
commit9fe86978e3c05cc8ffe90251487f8240f3765402 (patch)
treefcccbc6193e9111774462036fb5a130adad6319e /Master/texmf-dist/tex/luatex/luaotfload/luaotfload-parsers.lua
parent1da73770bc3b5546208cb6511e69cbc7f86bc33e (diff)
luaotfload (18jan19)
git-svn-id: svn://tug.org/texlive/trunk@49747 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luaotfload/luaotfload-parsers.lua')
-rw-r--r--Master/texmf-dist/tex/luatex/luaotfload/luaotfload-parsers.lua68
1 files changed, 16 insertions, 52 deletions
diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-parsers.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-parsers.lua
index 2605b6fec3c..a40356872fc 100644
--- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-parsers.lua
+++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-parsers.lua
@@ -7,8 +7,8 @@
local ProvidesLuaModule = {
name = "luaotfload-parsers",
- version = "2.93", --TAGVERSION
- date = "2018-10-28", --TAGDATE
+ version = "2.94", --TAGVERSION
+ date = "2018-12-19", --TAGDATE
description = "luaotfload submodule / filelist",
license = "GPL v2.0"
}
@@ -495,17 +495,6 @@ local splitcomma = Ct((C(noncomma^1) + comma)^1)
--doc]]------------------------------------------------------------------------
-local handle_normal_option = function (key, val)
- val = stringlower(val)
- --- the former “toboolean()” handler
- if val == "true" then
- val = true
- elseif val == "false" then
- val = false
- end
- return key, val
-end
-
--[[doc--
Xetex style indexing begins at zero which we just increment before
@@ -513,35 +502,8 @@ end
--doc]]--
-local handle_xetex_option = function (key, val)
- val = stringlower(val)
- local numeric = tonumber(val) --- decimal only; keeps colors intact
- if numeric then --- ugh
- if mathceil(numeric) == numeric then -- integer, possible index
- val = tostring(numeric + 1)
- end
- elseif val == "true" then
- val = true
- elseif val == "false" then
- val = false
- end
- return key, val
-end
-
---[[doc--
-
- Instead of silently ignoring invalid options we emit a warning to
- the log.
-
- Note that we have to return a pair to please rawset(). This creates
- an entry on the resulting features hash which will later be removed
- during set_default_features().
-
---doc]]--
-
-local handle_invalid_option = function (opt)
- logreport("log", 0, "load", "font option %q unknown.", opt)
- return "", false
+local handle_xetex_option = function (val)
+ return tostring(1 + tonumber(val))
end
--[[doc--
@@ -674,22 +636,24 @@ local path_lookup = lbrk * Cg(Cs(path_balanced), "path") * rbrk
* subfont^-1
--- features ----------------------------------------------------------
-local field_char = anum + S"+-.!?" --- sic!
-local field = field_char^1
+local balanced_braces = P{((1 - S'{}') + '{' * V(1) * '}')^0}
+local field_char = '{' * C(balanced_braces) * '}' + (1 - S'={}' - featuresep)
+local field = '{' * C(balanced_braces) * '}' + C(field_char^1)
--- assignments are “lhs=rhs”
--- or “+lhs=rhs” (Xetex-style)
--- switches are “+key” | “-key”
-local normal_option = C(field) * ws * equals * ws * C(field) * ws
-local xetex_option = P"+" * ws * normal_option
+local normal_option = field * ws * equals * ws * field
+local xetex_option = P"+" * ws * ( field * ws * equals * ws
+ * (digit^1/handle_xetex_option)
+ + normal_option)
local ignore_option = (1 - equals - featuresep)^1
* equals
* (1 - featuresep)^1
-local assignment = xetex_option / handle_xetex_option
- + normal_option / handle_normal_option
- + ignore_option / handle_invalid_option
-local switch = P"+" * ws * C(field) * Cc(true)
- + P"-" * ws * C(field) * Cc(false)
- + C(field) * Cc(true) --- default
+local assignment = xetex_option
+ + normal_option
+local switch = P"+" * ws * field * Cc(true)
+ + P"-" * ws * field * Cc(false)
+ + field * Cc(true) --- default
local feature_expr = ws * Cg(assignment + switch) * ws
local option = feature_expr
local feature_list = Cf(Ct""