Skip to content

Fix selector bug when handling Inkscape attributes #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sameer merged 2 commits into from
Jun 2, 2026
Merged

Fix selector bug when handling Inkscape attributes #122

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b49a1a3
CSS selector character escaping with backslash
sameer May 22, 2026
395f8ce
Fix namespacing lookup bug
sameer May 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 26 additions & 6 deletions star/src/lower/selector.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,17 @@ peg::parser!(grammar selector_parser() for str {
rule _() = whitespace()*
rule s() = whitespace()+

rule escape() -> char = "\\" c:[_] { c }

rule ident_char() -> char
= escape()
/ c:['a'..='z' | 'A'..='Z' | '0'..='9' | '-' | '_'] { c }

// Tag names, class names, and IDs
rule ident() -> String = s:$(['a'..='z' | 'A'..='Z' | '0'..='9' | '-' | '_']+) { s.to_string() }
rule ident() -> String = chars:ident_char()+ { chars.into_iter().collect() }

// Attribute names
rule attr_name() -> String = s:$(['a'..='z' | 'A'..='Z' | '0'..='9' | '-' | '_' | ':']+) { s.to_string() }
rule attr_name() -> String = chars:ident_char()+ { chars.into_iter().collect() }

// Attribute value
rule unquoted() -> char = [c if c != ']' && !c.is_ascii_whitespace()]
Expand Down Expand Up @@ -298,7 +304,17 @@ impl AttributeSelector {
// like `inkscape:label` which roxmltree may expose under a namespace.
let value = node
.attributes()
.find(|a| a.name() == self.name)
.find(|a| {
if let Some((prefix, local)) = self.name.split_once(':') {
if let Some(ns_uri) = node.lookup_namespace_uri(Some(prefix)) {
a.namespace() == Some(ns_uri) && a.name() == local
} else {
false
}
} else {
a.name() == self.name
}
})
.map(|a| a.value());

match (&self.op, value) {
Expand Down Expand Up @@ -343,7 +359,9 @@ mod tests {
("[id=foo]", true),
("[id=\"foo bar\"]", true),
("[style*=\"display:none\"]", true),
("[inkscape:label=\"Layer 1\"]", true),
("[inkscape\\:label=\"Layer 1\"]", true),
("[inkscape:label=\"Layer 1\"]", false),
("g\\#layer1", true),
// combinators
("g path", true),
("g > path", true),
Expand Down Expand Up @@ -385,8 +403,8 @@ mod tests {

#[test]
fn test_match() {
let svg = r#"<svg>
<g id="layer1">
let svg = r#"<svg xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape">
<g id="layer1" inkscape:label="Layer 1">
<path id="p-cut" class="cut"/>
<path id="p-draft" class="draft"/>
<g id="nested">
Expand Down Expand Up @@ -415,6 +433,8 @@ mod tests {
// attribute selector
("[style*=\"display:none\"]", "p-outer", true),
("[style*=\"display:none\"]", "r-draft", false),
("[inkscape\\:label=\"Layer 1\"]", "layer1", true),
("[inkscape\\:label=\"Layer 1\"]", "p-cut", false),
// descendant combinator — p-cut is inside layer1, p-outer is not
("#layer1 path", "p-cut", true),
("#layer1 path", "p-nested", true),
Expand Down