summaryrefslogtreecommitdiff
path: root/macros/luatex/generic/luaxml/luaxml-parse-query.lua
diff options
context:
space:
mode:
Diffstat (limited to 'macros/luatex/generic/luaxml/luaxml-parse-query.lua')
-rw-r--r--macros/luatex/generic/luaxml/luaxml-parse-query.lua19
1 files changed, 16 insertions, 3 deletions
diff --git a/macros/luatex/generic/luaxml/luaxml-parse-query.lua b/macros/luatex/generic/luaxml/luaxml-parse-query.lua
index 7931fa193f..17ddeb82c5 100644
--- a/macros/luatex/generic/luaxml/luaxml-parse-query.lua
+++ b/macros/luatex/generic/luaxml/luaxml-parse-query.lua
@@ -12,11 +12,19 @@ do
end
local alphanum = R("az", "AZ", "09")
local num = R("09")
+local quotes = S("'\"") ^ 1
local white = S(" \t\n") ^ 0
--- this is a deviation from the upstream, we allow ":" in the tag name, because
+-- this is a deviation from the upstream, we allow "|" in the tag name, because
-- luaxml doesn't support XML namespaces and elements must be queried using
--- dom:query_selector("namespace:element")
+-- dom:query_selector("namespace|element")
local word = (alphanum + S("_-") + S("|")) ^ 1
+
+local combinators = S(">~+")
+
+local attr_name = (alphanum + S("_-")) ^ 1
+local attr_function = S("~|^$*") ^ 0
+
+local attr_content = C((P(1) - quotes) ^ 1)
local mark
mark = function(name)
return function(...)
@@ -34,8 +42,13 @@ parse_query = function(query)
local any = P("*") / mark("any")
local nth = P(":nth-child(") * C(num ^ 1) * ")" / mark("nth-child")
local first = P(":first-child") / mark("first-child")
+ local first_of_type = P(":first-of-type") / mark("first-of-type")
+ local last = P(":last-child") / mark("last-child")
+ local last_of_type = P(":last-of-type") / mark("last-of-type")
local attr = P("[") * C(word) * P("]") / mark("attr")
- local selector = Ct((any + nth + first + tag + cls + id + attr) ^ 1)
+ local attr_value = P("[") * C(attr_name ) * C(attr_function)* P("=") * quotes * attr_content * quotes * P("]") / mark("attr_value")
+ local combinator = C(combinators) / mark("combinator")
+ local selector = Ct((any + nth + first + first_of_type + last + last_of_type + tag + cls + id + attr + attr_value + combinator) ^ 1)
local pq = Ct(selector * (white * selector) ^ 0)
local pqs = Ct(pq * (white * P(",") * white * pq) ^ 0)
pqs = pqs * (white * -1)