@@ -1,8 +1,7 @@
11use std::collections::HashMap;
2−use std::hash::Hash;
2+use std::hash::{Hash, Hasher};
33
44use crate::ast::*;
5−use crate::vocab::with_px;
65
76// ---------------------------------------------------------------------------
87// Style collector: deduplicates CSS and assigns class names
@@ -17,315 +16,52 @@ const BREAKPOINTS: &[(&str, &str)] = &[
1716 ("2xl", "1536px"),
1817];
1918
20−/// The prefix of every generated class (`hl-2k9xq0m`), which keeps them
21−/// out of the author's own class names.
22−pub const CLASS_PREFIX: &str = "hl-";
23−
24−/// How many base-36 digits a class's name has after `hl-`: 7, about 36
25−/// bits of its style's hash, so a site with 10,000 different styles has
26−/// odds of about 6 in 10,000 that two of them share a name, which
27−/// `htmlang build` reports (`class-collision`). Within one file, a style
28−/// whose name is taken takes more digits.
29−pub const CLASS_DIGITS: usize = 7;
30−
31−/// A stable hash of `text`: FNV-1a, then SplitMix64's finalizer, so every
32−/// digit of a name depends on all of the text. It is the same on every
33−/// platform and in every build, unlike `std`'s hasher.
34−pub fn stable_hash(text: &str) -> u64 {
35− let mut hash: u64 = 0xcbf2_9ce4_8422_2325;
36− for byte in text.bytes() {
37− hash ^= u64::from(byte);
38− hash = hash.wrapping_mul(0x0000_0100_0000_01b3);
39− }
40− hash = (hash ^ (hash >> 30)).wrapping_mul(0xbf58_476d_1ce4_e5b9);
41− hash = (hash ^ (hash >> 27)).wrapping_mul(0x94d0_49bb_1331_11eb);
42− hash ^ (hash >> 31)
43−}
44−
45−/// `digits` base-36 digits of `hash`: `2k9xq0m`. With 13, all of it.
46−pub fn hash_digits(hash: u64, digits: usize) -> String {
47− const DIGITS: &[u8] = b"0123456789abcdefghijklmnopqrstuvwxyz";
48− let mut n = hash;
49− (0..digits)
50− .map(|_| {
51− let digit = DIGITS[(n % 36) as usize] as char;
52− n /= 36;
53− digit
54− })
55− .collect()
56−}
57−
58−/// A class htmlang generated: its name, and the hash of the style it
59−/// stands for. One style has one name in every file, so a fragment's
60−/// classes mean the same in any page it goes into.
61−#[derive(Clone, Debug, PartialEq, Eq)]
62−pub struct Class {
63− pub name: String,
64− pub style: u64,
65−}
66−
67−/// When a style applies: the at-rule prefixes it is under (their ranks,
68−/// see [`crate::vocab::at_rule_rank`], sorted, so `dark:md:` and `md:dark:`
69−/// are one condition) and its selector prefixes, left to right as the
70−/// selector reads (`hover:children:` is `.a:hover > *`).
71−#[derive(Clone, Default, PartialEq, Eq, Hash, Debug)]
72−struct Condition {
73− at: Vec<usize>,
74− selector: Vec<String>,
75−}
76−
77−impl Condition {
78− /// The condition of an attribute's key, and the name after its
79− /// prefixes.
80− fn of(key: &str) -> (Condition, &str) {
81− let (prefixes, name) = crate::vocab::split_prefixes(key);
82− let mut condition = Condition::default();
83− for prefix in prefixes {
84− match crate::vocab::at_rule_rank(prefix) {
85− Some(rank) => condition.at.push(rank),
86− None => condition.selector.push(prefix.to_string()),
87− }
88− }
89− condition.at.sort_unstable();
90− condition.at.dedup();
91− (condition, name)
92− }
93−
94− /// Only the at-rule part: a direction under `hover:` is the one without
95− /// it.
96− fn at_only(at: &[usize]) -> Condition {
97− Condition {
98− at: at.to_vec(),
99− selector: Vec::new(),
100− }
101− }
102−
103− /// The styles go on the element's children (`children:`).
104− fn on_children(&self) -> bool {
105− self.selector.iter().any(|p| p == crate::vocab::CHILDREN)
106− }
107−
108− /// The styles go on the elements of one kind inside the element
109− /// (`@td:`): where the element prefix is in the selector chain.
110− fn inside(&self) -> Option<usize> {
111− self.selector
112− .iter()
113− .position(|p| crate::vocab::element_prefix(p).is_some())
114− }
115−
116− /// Whether this condition holds wherever `other` does: its at-rules
117− /// are implied by `other`'s, and it has no selector or `other`'s.
118− fn holds_at(&self, other: &Condition) -> bool {
119− (self.selector.is_empty() || self.selector == other.selector)
120− && self.at.iter().all(|&a| {
121− other
122− .at
123− .iter()
124− .any(|&b| crate::vocab::at_rule_implied(a, b))
125− })
126− }
127−
128− /// The order the rules of each condition are written in, which the
129− /// cascade follows: no prefix, then selectors, then each at-rule
130− /// block (see [`at_order`]), with its selectors inside it.
131− fn order(&self) -> (AtOrder, SelectorOrder) {
132− (at_order(&self.at), selector_order(&self.selector))
133− }
134−}
135−
136−/// Where a block of at-rules is written: after the rules without one; by
137−/// its last (innermost) prefix in the order of
138−/// [`crate::vocab::at_rule_prefixes`] (widths, media, container widths), so
139−/// `md:dark:` comes with `dark:`, after it; then by length.
140−type AtOrder = (bool, usize, usize, Vec<usize>);
141−
142−fn at_order(at: &[usize]) -> AtOrder {
143− (
144− !at.is_empty(),
145− at.last().copied().unwrap_or(0),
146− at.len(),
147− at.to_vec(),
148− )
149−}
150−
151−/// Selector chains in the order of [`crate::vocab::PSEUDOS`] (position,
152−/// then form state, then `hover:`, `focus:`, `active:`, `disabled:`), and
153−/// by their argument's text for the same pseudo-class; a chain before the
154−/// longer ones it starts. A chain through `children:` comes after the
155−/// others, ordered by what follows its last `children:` and then by what
156−/// comes before it: only that tail counts toward its specificity (see
157−/// [`selector`]), so `hover:children:` follows `children:` and wins over it
158−/// on hover.
159−type SelectorOrder = (bool, Vec<(usize, String)>, Vec<(usize, String)>);
160−
161−fn selector_order(selector: &[String]) -> SelectorOrder {
162− let table = crate::vocab::PSEUDOS;
163− let ranked = |chain: &[String]| -> Vec<(usize, String)> {
164− chain
165− .iter()
166− .map(|p| {
167− let name = crate::vocab::pseudo_name(p);
168− let rank = table
169− .iter()
170− .position(|(q, _)| *q == name)
171− .unwrap_or(table.len());
172− (rank, p.clone())
173− })
174− .collect()
175− };
176− match selector.iter().rposition(|p| p == crate::vocab::CHILDREN) {
177− None => (false, ranked(selector), Vec::new()),
178− Some(i) => (true, ranked(&selector[i + 1..]), ranked(&selector[..i])),
179− }
180−}
181−
182−/// The order of the chains through an element prefix (`@td:`, see
183−/// [`scoped_selector`]): by the prefixes before it, which select the root
184−/// of the scope and add nothing to the specificity, so `hover:@td:` comes
185−/// after `@td:` and wins on hover; then by the element; then by the
186−/// prefixes after it.
187−fn inside_order(chain: &[String]) -> (SelectorOrder, String, SelectorOrder) {
188− let at = chain
189− .iter()
190− .position(|p| crate::vocab::element_prefix(p).is_some())
191− .unwrap_or(chain.len());
192− (
193− selector_order(&chain[..at]),
194− chain.get(at).cloned().unwrap_or_default(),
195− selector_order(chain.get(at + 1..).unwrap_or_default()),
196− )
197−}
198−
199−/// The selector for `class` under a chain of selector prefixes, read left
200−/// to right. Everything before the last `children:` goes in `:where()`, so
201−/// a parent's `children:` styles have no specificity, and a child's own
202−/// attributes win over them: `children:hover:` is `:where(.a)>*:hover`,
203−/// `hover:children:` is `:where(.a:hover)>*`.
204−fn selector(class: &str, chain: &[String]) -> String {
205− let last_children = chain.iter().rposition(|p| p == crate::vocab::CHILDREN);
206− let mut out = format!(".{}", class);
207− for (i, prefix) in chain.iter().enumerate() {
208− if prefix == crate::vocab::CHILDREN {
209− if Some(i) == last_children {
210− out = format!(":where({})>*", out);
211− } else {
212− out.push_str(">*");
213− }
214− } else if let Some(pseudo) = crate::vocab::pseudo_selector(prefix) {
215− out.push_str(&pseudo);
216− }
19+/// Generate short CSS class names: a, b, ..., z, a0, a1, ..., z9, aa, ab, ...
20+pub(crate) fn short_class_name(idx: usize) -> String {
21+ if idx < 26 {
22+ return String::from((b'a' + idx as u8) as char);
21723 }
218− out
219−}
220−
221−/// The rule for the elements an element prefix picks out inside the
222−/// element with the class `class` (see [`Condition::inside`]): the scope's
223−/// root, from the selector prefixes before it (`hover:@td:` is inside a
224−/// hovered element), and the selector for the elements, from those after
225−/// it (`@td:hover:` is a hovered cell). `:scope td` leaves out the root
226−/// itself, so `@ul [@ul:...]` styles the lists inside, not its own. `None`
227−/// when the name has no tag of its own (the parser reports it).
228−fn scoped_selector(class: &str, chain: &[String], at: usize) -> Option<(String, String)> {
229− let name = crate::vocab::element_prefix(&chain[at])?;
230− let tag = ElementKind::from_name(name)?.own_tag()?;
231− let root = selector(class, &chain[..at]);
232− let mut target = format!(":scope {}", tag);
233− for prefix in &chain[at + 1..] {
234− if let Some(pseudo) = crate::vocab::pseudo_selector(prefix) {
235− target.push_str(&pseudo);
236− }
237− }
238− Some((root, target))
239−}
240−
241−/// The `@media` or `@container` rule an at-rule prefix stands for, as
242−/// written in readable and in compact output.
243−fn at_rule(rank: usize, dev: bool) -> String {
244− let prefix = crate::vocab::at_rule_prefixes()
245− .nth(rank)
246− .unwrap_or_default();
247− let name = prefix.trim_end_matches(':');
248− let width = |name: &str| {
249− BREAKPOINTS
250− .iter()
251− .find(|(n, _)| *n == name)
252− .map_or("0", |(_, w)| *w)
253− };
254− let (kind, feature, value) = if let Some(size) = name.strip_prefix("cq-") {
255− ("@container", "min-width", width(size))
256− } else {
257− match name {
258− "print" => {
259− return "@media print".to_string();
260− }
261− "dark" => ("@media", "prefers-color-scheme", "dark"),
262− "motion-safe" => ("@media", "prefers-reduced-motion", "no-preference"),
263− "motion-reduce" => ("@media", "prefers-reduced-motion", "reduce"),
264− "landscape" | "portrait" => ("@media", "orientation", name),
265− _ => ("@media", "min-width", width(name)),
24+ let mut n = idx - 26;
25+ let mut name = String::new();
26+ // First char is always a letter
27+ name.push((b'a' + (n % 26) as u8) as char);
28+ n /= 26;
29+ loop {
30+ name.push((b'a' + (n % 36).min(25) as u8) as char);
31+ if n < 36 {
32+ break;
26633 }
267− };
268− if dev {
269− format!("{} ({}: {})", kind, feature, value)
270− } else {
271− format!("{}({}:{})", kind, feature, value)
34+ n /= 36;
27235 }
273−}
274−
275−/// A style as text, for its hash: the defaults of its element's kind, its
276−/// rules (the at-rules' ranks, the selector prefixes and the declarations
277−/// of each) and the rules keyed on it, each part ended by a character CSS
278−/// doesn't have.
279−fn style_text(defaults: &str, rules: &[(Condition, String)], distinct: &str) -> String {
280− let mut text = format!("{defaults}\u{1}");
281− for (condition, body) in rules {
282− for rank in &condition.at {
283− text.push_str(&format!("{rank}\u{2}"));
284− }
285− text.push('\u{3}');
286− for prefix in &condition.selector {
287− text.push_str(prefix);
288− text.push('\u{2}');
289− }
290− text.push('\u{3}');
291− text.push_str(body);
292− text.push('\u{1}');
293− }
294− text.push_str(distinct);
295− text
36+ // Reverse so it reads naturally
37+ name.chars().rev().collect()
29638}
29739
29840struct StyleEntry {
29941 class_name: String,
300− /// The hash of the style, which names the class
301− style: u64,
302− /// The defaults of the element's kind (its layout, a heading's
303− /// `margin:0`, ...), less what its own attributes set. They are written
304− /// as `:where(.hl-a)` in the layer `hl-kind`, so an element prefix
305− /// around it (`@h2:`), its parent's `children:` styles and its own
306− /// attributes, all in later layers, win over them.
307− defaults: String,
308− /// The element's rules: under each condition, its declarations, in the
309− /// order they are written
310− rules: Vec<(Condition, String)>,
311− /// What else tells two elements with the same CSS apart: the rules
312− /// keyed on this class (see [`StyleCollector::keyed`]). Not written.
313− distinct: String,
42+ base: String,
43+ /// (CSS selector suffix, css_rules) — e.g. (":hover", "color:red;")
44+ pseudo: Vec<(String, String)>,
45+ /// Responsive overrides: (breakpoint_prefix, css)
46+ responsive: Vec<(String, String)>,
47+ /// Dark mode overrides
48+ dark: String,
49+ /// Print overrides
50+ print: String,
51+ motion_safe: String,
52+ motion_reduce: String,
53+ landscape: String,
54+ portrait: String,
55+ /// Container query overrides: (breakpoint_prefix, css)
56+ container: Vec<(String, String)>,
31457}
31558
31659struct StyleCollector {
31760 entries: Vec<StyleEntry>,
318− /// Maps a style's hash to its entries (more than one only when two
319− /// styles hash alike, which the full comparison tells apart).
61+ /// Maps a pre-hashed style signature to an index into `entries`.
62+ /// Using u64 as the key keeps lookups allocation-free; on the rare case of
63+ /// a hash collision we fall back to a full equality check against the entry.
32064 index: HashMap<u64, Vec<usize>>,
321− /// The names given, which a style whose name is taken doesn't get
322− names: std::collections::HashSet<String>,
323− /// Rules for an element's children, keyed on its class and written in
324− /// the block of an at-rule condition: `(at-rules, selector, body)`, e.g.
325− /// `([md], ":where(.a)>.b", "flex:1;")` (see [`Flow`]).
326− keyed: Vec<(Vec<usize>, String, String)>,
327− /// The keyed rules already added
328− keyed_seen: std::collections::HashSet<(Vec<usize>, String, String)>,
32965}
33066
33167impl StyleCollector {
@@ -333,328 +69,342 @@ impl StyleCollector {
33369 StyleCollector {
33470 entries: Vec::new(),
33571 index: HashMap::new(),
336− names: std::collections::HashSet::new(),
337− keyed: Vec::new(),
338− keyed_seen: std::collections::HashSet::new(),
339− }
340− }
341−
342− /// Add a rule for `selector` under the at-rules `at`, once.
343− fn add_keyed(&mut self, at: Vec<usize>, selector: String, body: String) {
344− let rule = (at, selector, body);
345− if self.keyed_seen.insert(rule.clone()) {
346− self.keyed.push(rule);
34772 }
34873 }
34974
35075 /// Returns a class name for this style combination, or None if all empty.
76+ #[allow(clippy::too_many_arguments)]
35177 fn get_class(
35278 &mut self,
353− defaults: String,
354− mut rules: Vec<(Condition, String)>,
355− distinct: String,
79+ base: String,
80+ pseudo: Vec<(String, String)>,
81+ responsive: Vec<(String, String)>,
82+ dark: String,
83+ print: String,
84+ motion_safe: String,
85+ motion_reduce: String,
86+ landscape: String,
87+ portrait: String,
88+ container: Vec<(String, String)>,
35689 ) -> Option<String> {
357− rules.retain(|(_, body)| !body.is_empty());
358− if defaults.is_empty() && rules.is_empty() {
90+ if base.is_empty()
91+ && pseudo.is_empty()
92+ && responsive.is_empty()
93+ && dark.is_empty()
94+ && print.is_empty()
95+ && motion_safe.is_empty()
96+ && motion_reduce.is_empty()
97+ && landscape.is_empty()
98+ && portrait.is_empty()
99+ && container.is_empty()
100+ {
359101 return None;
360102 }
361− rules.sort_by_cached_key(|(condition, _)| condition.order());
362− let style = stable_hash(&style_text(&defaults, &rules, &distinct));
363−
364− if let Some(indices) = self.index.get(&style) {
103+ use std::collections::hash_map::DefaultHasher;
104+ let mut h = DefaultHasher::new();
105+ base.hash(&mut h);
106+ pseudo.hash(&mut h);
107+ responsive.hash(&mut h);
108+ dark.hash(&mut h);
109+ print.hash(&mut h);
110+ motion_safe.hash(&mut h);
111+ motion_reduce.hash(&mut h);
112+ landscape.hash(&mut h);
113+ portrait.hash(&mut h);
114+ container.hash(&mut h);
115+ let sig = h.finish();
116+
117+ if let Some(indices) = self.index.get(&sig) {
365118 for &idx in indices {
366119 let e = &self.entries[idx];
367− if e.defaults == defaults && e.rules == rules && e.distinct == distinct {
120+ if e.base == base
121+ && e.pseudo == pseudo
122+ && e.responsive == responsive
123+ && e.dark == dark
124+ && e.print == print
125+ && e.motion_safe == motion_safe
126+ && e.motion_reduce == motion_reduce
127+ && e.landscape == landscape
128+ && e.portrait == portrait
129+ && e.container == container
130+ {
368131 return Some(e.class_name.clone());
369132 }
370133 }
371134 }
372− // The name is the hash's first digits, and more of them when
373− // another style of this file has those; after all 13, the entry's
374− // number tells the two apart
375135 let idx = self.entries.len();
376− let name = (CLASS_DIGITS..=13)
377− .map(|digits| format!("{}{}", CLASS_PREFIX, hash_digits(style, digits)))
378− .find(|name| !self.names.contains(name))
379− .unwrap_or_else(|| format!("{}{}{}", CLASS_PREFIX, hash_digits(style, 13), idx));
380− self.names.insert(name.clone());
136+ let name = short_class_name(idx);
381137 self.entries.push(StyleEntry {
382138 class_name: name.clone(),
383− style,
384− defaults,
385− rules,
386− distinct,
139+ base,
140+ pseudo,
141+ responsive,
142+ dark,
143+ print,
144+ motion_safe,
145+ motion_reduce,
146+ landscape,
147+ portrait,
148+ container,
387149 });
388− self.index.entry(style).or_default().push(idx);
150+ self.index.entry(sig).or_default().push(idx);
389151 Some(name)
390152 }
391153
392− /// The classes given, in the order they were
393− fn classes(&self) -> impl Iterator<Item = Class> + '_ {
394− self.entries.iter().map(|e| Class {
395− name: e.class_name.clone(),
396− style: e.style,
397− })
398− }
154+ fn to_css_formatted(&self, dev: bool, use_layer: bool) -> String {
155+ let mut css = String::new();
156+ let (sp, nl) = if dev { (" ", "\n") } else { ("", "") };
399157
400− /// All generated rules, in three layers (see [`LAYERS`]): the element
401− /// kinds' defaults in `hl-kind` (`:where(.hl-a)`), the rules for the
402− /// elements an element prefix picks out inside an element (`@td:`), and
403− /// a function's scoped `@style`, in `hl-inside`, and the elements' own
404− /// rules in `htmlang`. They are written in a fixed order, so which rule
405− /// wins never depends on where in the page an element is: the rules
406− /// without a prefix, then those under selector prefixes, then each block
407− /// of at-rules (see [`at_order`]), in which the rules keyed on a parent
408− /// come first, then the element's own, then its selectors (see
409− /// [`selector_order`]).
410− fn to_css_formatted(&self, dev: bool, scoped: &[String]) -> String {
411− // The defaults: `:where(.hl-a,.hl-b){...}`
412− let mut kind = String::new();
413− let mut defaults: Vec<(&str, Vec<&str>)> = Vec::new();
414− for e in self.entries.iter().filter(|e| !e.defaults.is_empty()) {
415− match defaults.iter_mut().find(|(body, _)| *body == e.defaults) {
416− Some((_, classes)) => classes.push(&e.class_name),
417− None => defaults.push((&e.defaults, vec![&e.class_name])),
418− }
419− }
420− for (body, classes) in defaults {
421− let classes: Vec<String> = classes.iter().map(|c| format!(".{}", c)).collect();
422− let selector = format!(":where({})", classes.join(","));
158+ // Wrap in @layer for specificity management
159+ if use_layer {
423160 if dev {
424− kind.push_str(&format!(" {} {{{}}}\n", selector, body));
161+ css.push_str("@layer htmlang {\n");
425162 } else {
426− kind.push_str(&format!("{}{{{}}}", selector, body));
163+ css.push_str("@layer htmlang{");
164+ }
165+ }
166+
167+ // Non-responsive rules
168+ for e in &self.entries {
169+ if !e.base.is_empty() {
170+ if use_layer && dev {
171+ css.push_str(&format!(" .{}{sp}{{{}}}{nl}", e.class_name, e.base));
172+ } else {
173+ css.push_str(&format!(".{}{sp}{{{}}}{nl}", e.class_name, e.base));
174+ }
175+ }
176+ for (selector, pseudo_css) in &e.pseudo {
177+ if !pseudo_css.is_empty() {
178+ if use_layer && dev {
179+ css.push_str(&format!(
180+ " .{}{}{sp}{{{}}}{nl}",
181+ e.class_name, selector, pseudo_css
182+ ));
183+ } else {
184+ css.push_str(&format!(
185+ ".{}{}{sp}{{{}}}{nl}",
186+ e.class_name, selector, pseudo_css
187+ ));
188+ }
189+ }
190+ }
191+ }
192+
193+ // Responsive rules grouped by breakpoint
194+ for &(bp_name, bp_width) in BREAKPOINTS {
195+ let mut bp_css = String::new();
196+ for e in &self.entries {
197+ for (bp, rule_css) in &e.responsive {
198+ if bp == bp_name && !rule_css.is_empty() {
199+ if dev {
200+ bp_css.push_str(&format!(" .{} {{{}}}\n", e.class_name, rule_css));
201+ } else {
202+ bp_css.push_str(&format!(".{}{{{}}}", e.class_name, rule_css));
203+ }
204+ }
205+ }
206+ }
207+ if !bp_css.is_empty() {
208+ if dev {
209+ css.push_str(&format!(
210+ "@media (min-width: {}) {{\n{}}}\n",
211+ bp_width, bp_css
212+ ));
213+ } else {
214+ css.push_str(&format!("@media(min-width:{}){{{}}}", bp_width, bp_css));
215+ }
427216 }
428217 }
429218
430− let mut inside = self.blocks(true, dev);
431− // A function's scoped `@style`, nested under its class
432− for block in scoped {
219+ // Dark mode rules
220+ let mut dark_css = String::new();
221+ for e in &self.entries {
222+ if !e.dark.is_empty() {
223+ if dev {
224+ dark_css.push_str(&format!(" .{} {{{}}}\n", e.class_name, e.dark));
225+ } else {
226+ dark_css.push_str(&format!(".{}{{{}}}", e.class_name, e.dark));
227+ }
228+ }
229+ }
230+ if !dark_css.is_empty() {
433231 if dev {
434− inside.push_str(block);
435− inside.push('\n');
232+ css.push_str(&format!(
233+ "@media (prefers-color-scheme: dark) {{\n{}}}\n",
234+ dark_css
235+ ));
436236 } else {
437− inside.push_str(&compact_css(block));
237+ css.push_str(&format!(
238+ "@media(prefers-color-scheme:dark){{{}}}",
239+ dark_css
240+ ));
438241 }
439242 }
440243
441− let mut css = String::new();
442− for (name, rules) in [
443− ("hl-kind", kind),
444− ("hl-inside", inside),
445− ("htmlang", self.blocks(false, dev)),
446− ] {
447− if rules.is_empty() {
448− continue;
244+ // Print rules
245+ let mut print_css = String::new();
246+ for e in &self.entries {
247+ if !e.print.is_empty() {
248+ if dev {
249+ print_css.push_str(&format!(" .{} {{{}}}\n", e.class_name, e.print));
250+ } else {
251+ print_css.push_str(&format!(".{}{{{}}}", e.class_name, e.print));
252+ }
449253 }
254+ }
255+ if !print_css.is_empty() {
450256 if dev {
451− css.push_str(&format!("@layer {} {{\n{}}}\n", name, rules));
257+ css.push_str(&format!("@media print {{\n{}}}\n", print_css));
452258 } else {
453− css.push_str(&format!("@layer {}{{{}}}", name, rules));
259+ css.push_str(&format!("@media print{{{}}}", print_css));
454260 }
455261 }
456− css
457− }
458262
459− /// The rules of every block of at-rules, in order: those for the
460− /// elements inside (`inside`: rules under an element prefix, each in
461− /// an `@scope` on its element's class), or the elements' own.
462− fn blocks(&self, inside: bool, dev: bool) -> String {
463− let mut css = String::new();
464− let rules = || {
465− self.entries.iter().flat_map(move |e| {
466− e.rules
467− .iter()
468− .filter(move |(c, _)| c.inside().is_some() == inside)
469− .map(move |(c, body)| (e, c, body))
470− })
471− };
472− let mut blocks: Vec<&[usize]> = vec![&[]];
473− let keyed = self.keyed.iter().filter(|_| !inside);
474− let every = rules()
475− .map(|(_, c, _)| c.at.as_slice())
476− .chain(keyed.map(|(at, _, _)| at.as_slice()));
477− for at in every {
478− if !blocks.contains(&at) {
479− blocks.push(at);
480− }
481− }
482− blocks.sort_by_key(|at| at_order(at));
483−
484− for at in blocks {
485− let depth = at.len();
486− // Readable output indents a rule inside `@layer` and inside
487− // each at-rule but the first
488− let indent = if dev {
489− " ".repeat(depth.max(1))
490− } else {
491− String::new()
492− };
493− let mut inner = String::new();
494− // Rules keyed on a parent's class come first: they have the
495− // specificity of one class, like a class rule, so the child's
496− // own rules in the block still win
497− if !inside {
498− let keyed: Vec<(&str, &str)> = self
499− .keyed
500− .iter()
501− .filter(|(a, _, _)| a.as_slice() == at)
502− .map(|(_, selector, body)| (selector.as_str(), body.as_str()))
503− .collect();
504− emit_selector_rules(&mut inner, &keyed, &indent, dev);
505− }
506− // The selector chains of this block, in order
507− let mut chains: Vec<&[String]> = Vec::new();
508− for (_, condition, _) in rules() {
509− if condition.at == at && !chains.contains(&condition.selector.as_slice()) {
510− chains.push(&condition.selector);
511− }
512− }
513− if inside {
514− chains.sort_by_cached_key(|chain| inside_order(chain));
515− // One `@scope` for each root, its rules in the order of
516− // the chains: rules for one element under two roots (`.a`
517− // and `.a:hover`) tie on specificity and proximity, so the
518− // later one wins
519− let mut scopes: Vec<(String, Vec<(String, &str)>)> = Vec::new();
520− for chain in chains {
521− let Some(element) = chain
522− .iter()
523− .position(|p| crate::vocab::element_prefix(p).is_some())
524− else {
525− continue;
526− };
527− for (e, _, body) in
528− rules().filter(|(_, c, _)| c.at == at && c.selector == chain)
529− {
530− let Some((root, target)) = scoped_selector(&e.class_name, chain, element)
531− else {
532− continue;
533− };
534− match scopes.iter_mut().find(|(r, _)| *r == root) {
535− Some((_, targets)) => targets.push((target, body)),
536− None => scopes.push((root, vec![(target, body)])),
537− }
538− }
539− }
540− let inner_indent = if dev {
541− format!("{} ", indent)
263+ // Motion safe rules
264+ let mut motion_safe_css = String::new();
265+ for e in &self.entries {
266+ if !e.motion_safe.is_empty() {
267+ if dev {
268+ motion_safe_css
269+ .push_str(&format!(" .{} {{{}}}\n", e.class_name, e.motion_safe));
542270 } else {
543− String::new()
544− };
545− for (root, targets) in scopes {
546− let targets: Vec<(&str, &str)> =
547− targets.iter().map(|(t, b)| (t.as_str(), *b)).collect();
548− inner.push_str(&indent);
549− inner.push_str(&format!("@scope ({})", root));
550− inner.push_str(if dev { " {\n" } else { "{" });
551− emit_selector_rules(&mut inner, &targets, &inner_indent, dev);
552− inner.push_str(&indent);
553− inner.push_str(if dev { "}\n" } else { "}" });
271+ motion_safe_css.push_str(&format!(".{}{{{}}}", e.class_name, e.motion_safe));
554272 }
273+ }
274+ }
275+ if !motion_safe_css.is_empty() {
276+ if dev {
277+ css.push_str(&format!(
278+ "@media (prefers-reduced-motion: no-preference) {{\n{}}}\n",
279+ motion_safe_css
280+ ));
555281 } else {
556− chains.sort_by_cached_key(|chain| selector_order(chain));
557− for chain in chains {
558− let pairs: Vec<(String, &str)> = rules()
559− .filter(|(_, c, _)| c.at == at && c.selector == chain)
560− .map(|(e, _, body)| (selector(&e.class_name, chain), body.as_str()))
561− .collect();
562− emit_grouped_rules(&mut inner, &pairs, &indent, dev);
282+ css.push_str(&format!(
283+ "@media(prefers-reduced-motion:no-preference){{{}}}",
284+ motion_safe_css
285+ ));
286+ }
287+ }
288+
289+ // Motion reduce rules
290+ let mut motion_reduce_css = String::new();
291+ for e in &self.entries {
292+ if !e.motion_reduce.is_empty() {
293+ if dev {
294+ motion_reduce_css
295+ .push_str(&format!(" .{} {{{}}}\n", e.class_name, e.motion_reduce));
296+ } else {
297+ motion_reduce_css
298+ .push_str(&format!(".{}{{{}}}", e.class_name, e.motion_reduce));
563299 }
564300 }
565− if inner.is_empty() {
566− continue;
301+ }
302+ if !motion_reduce_css.is_empty() {
303+ if dev {
304+ css.push_str(&format!(
305+ "@media (prefers-reduced-motion: reduce) {{\n{}}}\n",
306+ motion_reduce_css
307+ ));
308+ } else {
309+ css.push_str(&format!(
310+ "@media(prefers-reduced-motion:reduce){{{}}}",
311+ motion_reduce_css
312+ ));
567313 }
568− // Each at-rule wraps the next, outermost first
569− for (level, &rank) in at.iter().enumerate().rev() {
570− let pad = if dev {
571− " ".repeat(level)
572− } else {
573− String::new()
574− };
575− inner = if dev {
576− format!("{pad}{} {{\n{inner}{pad}}}\n", at_rule(rank, true))
314+ }
315+
316+ // Landscape rules
317+ let mut landscape_css = String::new();
318+ for e in &self.entries {
319+ if !e.landscape.is_empty() {
320+ if dev {
321+ landscape_css.push_str(&format!(" .{} {{{}}}\n", e.class_name, e.landscape));
577322 } else {
578− format!("{}{{{inner}}}", at_rule(rank, false))
579− };
323+ landscape_css.push_str(&format!(".{}{{{}}}", e.class_name, e.landscape));
324+ }
325+ }
326+ }
327+ if !landscape_css.is_empty() {
328+ if dev {
329+ css.push_str(&format!(
330+ "@media (orientation: landscape) {{\n{}}}\n",
331+ landscape_css
332+ ));
333+ } else {
334+ css.push_str(&format!(
335+ "@media(orientation:landscape){{{}}}",
336+ landscape_css
337+ ));
580338 }
581− css.push_str(&inner);
582339 }
583− css
584− }
585−}
586340
587−/// Emit CSS rules from `(selector, body)` pairs, merging identical bodies
588−/// into a single selector-list rule (e.g. `.a,.b{body}`). The first occurrence
589−/// of each distinct body determines ordering, so output stays deterministic
590−/// across runs. `indent` is prepended to each rule line.
591−fn emit_grouped_rules(out: &mut String, pairs: &[(String, &str)], indent: &str, dev: bool) {
592− if pairs.is_empty() {
593− return;
594− }
595− // Group in first-occurrence order.
596− let mut order: Vec<&str> = Vec::new();
597− let mut groups: HashMap<&str, Vec<&str>> = HashMap::new();
598− for (selector, body) in pairs {
599− if body.is_empty() {
600− continue;
341+ // Portrait rules
342+ let mut portrait_css = String::new();
343+ for e in &self.entries {
344+ if !e.portrait.is_empty() {
345+ if dev {
346+ portrait_css.push_str(&format!(" .{} {{{}}}\n", e.class_name, e.portrait));
347+ } else {
348+ portrait_css.push_str(&format!(".{}{{{}}}", e.class_name, e.portrait));
349+ }
350+ }
601351 }
602− if !groups.contains_key(body) {
603− order.push(body);
352+ if !portrait_css.is_empty() {
353+ if dev {
354+ css.push_str(&format!(
355+ "@media (orientation: portrait) {{\n{}}}\n",
356+ portrait_css
357+ ));
358+ } else {
359+ css.push_str(&format!("@media(orientation:portrait){{{}}}", portrait_css));
360+ }
604361 }
605− groups.entry(body).or_default().push(selector);
606− }
607− let sp = if dev { " " } else { "" };
608− let nl = if dev { "\n" } else { "" };
609− for body in &order {
610− out.push_str(indent);
611− out.push_str(&groups[body].join(","));
612− out.push_str(sp);
613− out.push('{');
614− out.push_str(body);
615− out.push('}');
616− out.push_str(nl);
617− }
618−}
619362
620−/// Emit `(selector, body)` rules in their order, merging a run of rules
621−/// with the same body into one rule with a selector list (the order
622−/// matters: two rules may apply to one element).
623−fn emit_selector_rules(out: &mut String, rules: &[(&str, &str)], indent: &str, dev: bool) {
624− let mut i = 0;
625− while i < rules.len() {
626− let body = rules[i].1;
627− let run = rules[i..].iter().take_while(|(_, b)| *b == body).count();
628− if !body.is_empty() {
629− let selectors: Vec<&str> = rules[i..i + run].iter().map(|(s, _)| *s).collect();
630− out.push_str(indent);
631− out.push_str(&selectors.join(","));
632− if dev {
633− out.push(' ');
363+ // Container query rules grouped by breakpoint
364+ for &(bp_name, bp_width) in BREAKPOINTS {
365+ let mut cq_css = String::new();
366+ for e in &self.entries {
367+ for (bp, rule_css) in &e.container {
368+ if bp == bp_name && !rule_css.is_empty() {
369+ if dev {
370+ cq_css.push_str(&format!(" .{} {{{}}}\n", e.class_name, rule_css));
371+ } else {
372+ cq_css.push_str(&format!(".{}{{{}}}", e.class_name, rule_css));
373+ }
374+ }
375+ }
376+ }
377+ if !cq_css.is_empty() {
378+ if dev {
379+ css.push_str(&format!(
380+ "@container (min-width: {}) {{\n{}}}\n",
381+ bp_width, cq_css
382+ ));
383+ } else {
384+ css.push_str(&format!("@container(min-width:{}){{{}}}", bp_width, cq_css));
385+ }
634386 }
635− out.push('{');
636− out.push_str(body);
637− out.push('}');
387+ }
388+
389+ // Close @layer
390+ if use_layer {
638391 if dev {
639− out.push('\n');
392+ css.push_str("}\n");
393+ } else {
394+ css.push('}');
640395 }
641396 }
642− i += run;
397+
398+ css
643399 }
644400}
645401
646402struct GenContext {
647403 dev: bool,
648404 depth: usize,
405+ image_count: usize,
649406 has_interactive: bool,
650− /// Writing inside a text element, at any depth: htmlang's own `<div>`s
651− /// are `<span>`s there, which text can hold.
652− in_text: bool,
653− /// How the element whose children are being written lays them out
654− flow: Flow,
655− /// Writing the children of a `@picture`, where `@source`'s leading
656− /// argument is its `srcset`
657− in_picture: bool,
407+ has_defer: bool,
658408}
659409
660410impl GenContext {
@@ -680,26 +430,23 @@ pub struct CodegenOptions {
680430 pub dev: bool,
681431 pub partial: bool,
682432 pub minify: bool,
433+ pub compat: bool,
683434}
684435
685436/// Generate HTML from a parsed document using the given options.
686437pub fn generate_with(doc: &Document, opts: &CodegenOptions) -> String {
687− generate_with_classes(doc, opts).0
688−}
689−
690−/// [`generate_with`], and the classes the document's styles were given,
691−/// for a check across files that no name stands for two styles.
692−pub fn generate_with_classes(doc: &Document, opts: &CodegenOptions) -> (String, Vec<Class>) {
693− let mut classes = Vec::new();
694438 let mut html = if opts.partial {
695− generate_partial_inner(doc, opts.dev, &mut classes)
439+ generate_partial_inner(doc, opts.dev)
696440 } else {
697− generate_full_inner(doc, opts.dev, &mut classes)
441+ generate_full_inner(doc, opts.dev)
698442 };
699443 if opts.minify {
700444 html = minify_html(&html);
701445 }
702− (html, classes)
446+ if opts.compat {
447+ html = add_vendor_prefixes(&html);
448+ }
449+ html
703450}
704451
705452pub fn generate(doc: &Document) -> String {
@@ -747,6 +494,38 @@ pub fn generate_minified(doc: &Document) -> String {
747494 )
748495}
749496
497+pub fn generate_compat(doc: &Document) -> String {
498+ generate_with(
499+ doc,
500+ &CodegenOptions {
501+ compat: true,
502+ ..Default::default()
503+ },
504+ )
505+}
506+
507+pub fn generate_dev_compat(doc: &Document) -> String {
508+ generate_with(
509+ doc,
510+ &CodegenOptions {
511+ dev: true,
512+ compat: true,
513+ ..Default::default()
514+ },
515+ )
516+}
517+
518+pub fn generate_minified_compat(doc: &Document) -> String {
519+ generate_with(
520+ doc,
521+ &CodegenOptions {
522+ minify: true,
523+ compat: true,
524+ ..Default::default()
525+ },
526+ )
527+}
528+
750529fn minify_html(html: &str) -> String {
751530 let mut result = String::with_capacity(html.len());
752531 let mut in_pre = false;
@@ -761,9 +540,9 @@ fn minify_html(html: &str) -> String {
761540 if i + 4 < chars.len() && chars[i] == '<' {
762541 let rest: String = chars[i..].iter().take(10).collect();
763542 let rest_lower = rest.to_lowercase();
764− if rest_lower.starts_with("<pre") || rest_lower.starts_with("<textarea") {
543+ if rest_lower.starts_with("<pre") {
765544 in_pre = true;
766− } else if rest_lower.starts_with("</pre") || rest_lower.starts_with("</textarea") {
545+ } else if rest_lower.starts_with("</pre") {
767546 in_pre = false;
768547 } else if rest_lower.starts_with("<script") {
769548 in_script = true;
@@ -805,11 +584,10 @@ fn minify_html(html: &str) -> String {
805584 continue;
806585 }
807586
808− // Collapse whitespace runs to a single space. Spaces are never
809− // dropped entirely: next to inline elements they are significant
810− // ("Built with <span>" must keep its space).
587+ // Collapse whitespace between tags
811588 if chars[i].is_whitespace() {
812589 if !prev_was_space {
590+ // Only emit a space if we're between content (not between tags)
813591 result.push(' ');
814592 prev_was_space = true;
815593 }
@@ -817,6 +595,14 @@ fn minify_html(html: &str) -> String {
817595 continue;
818596 }
819597
598+ // Trim space before closing tags
599+ if chars[i] == '<' && prev_was_space {
600+ // Remove trailing space before tag
601+ if result.ends_with(' ') {
602+ result.pop();
603+ }
604+ }
605+
820606 prev_was_space = false;
821607 result.push(chars[i]);
822608 i += 1;
@@ -825,288 +611,709 @@ fn minify_html(html: &str) -> String {
825611 result
826612}
827613
828−fn generate_full_inner(doc: &Document, dev: bool, classes: &mut Vec<Class>) -> String {
829− // Without `@page` the output is a fragment
830− let Some(page) = &doc.page else {
831− return generate_partial_inner(doc, dev, classes);
832− };
614+/// Add vendor prefixes to CSS within <style> tags for broader browser compatibility.
615+fn add_vendor_prefixes(html: &str) -> String {
616+ // Find CSS within <style>...</style> and add vendor prefixes
617+ let mut result = String::with_capacity(html.len() + 512);
618+ let mut rest = html;
619+ while let Some(start) = rest.find("<style>") {
620+ let after_tag = start + 7;
621+ result.push_str(&rest[..after_tag]);
622+ rest = &rest[after_tag..];
623+ if let Some(end) = rest.find("</style>") {
624+ let css = &rest[..end];
625+ result.push_str(&prefix_css(css));
626+ result.push_str("</style>");
627+ rest = &rest[end + 8..];
628+ } else {
629+ break;
630+ }
631+ }
632+ result.push_str(rest);
633+ result
634+}
635+
636+fn prefix_css(css: &str) -> String {
637+ let mut out = String::with_capacity(css.len() + 256);
638+ let mut i = 0;
639+ let bytes = css.as_bytes();
640+ while i < bytes.len() {
641+ // Find property declarations
642+ if let Some(pos) = css[i..].find('{') {
643+ let brace = i + pos;
644+ out.push_str(&css[i..=brace]);
645+ i = brace + 1;
646+ // Process declarations within this block
647+ if let Some(close) = css[i..].find('}') {
648+ let block = &css[i..i + close];
649+ out.push_str(&prefix_declarations(block));
650+ out.push('}');
651+ i = i + close + 1;
652+ }
653+ } else {
654+ out.push_str(&css[i..]);
655+ break;
656+ }
657+ }
658+ out
659+}
660+
661+fn prefix_declarations(block: &str) -> String {
662+ let mut out = String::with_capacity(block.len() + 128);
663+ for decl in block.split(';') {
664+ let decl = decl.trim();
665+ if decl.is_empty() {
666+ continue;
667+ }
668+ if let Some((prop, val)) = decl.split_once(':') {
669+ let prop = prop.trim();
670+ let val = val.trim();
671+ match prop {
672+ "backdrop-filter" => {
673+ out.push_str(&format!("-webkit-backdrop-filter:{};", val));
674+ out.push_str(&format!("backdrop-filter:{};", val));
675+ }
676+ "user-select" => {
677+ out.push_str(&format!("-webkit-user-select:{};", val));
678+ out.push_str(&format!("-moz-user-select:{};", val));
679+ out.push_str(&format!("user-select:{};", val));
680+ }
681+ "appearance" => {
682+ out.push_str(&format!("-webkit-appearance:{};", val));
683+ out.push_str(&format!("-moz-appearance:{};", val));
684+ out.push_str(&format!("appearance:{};", val));
685+ }
686+ "background-clip" if val.contains("text") => {
687+ out.push_str(&format!("-webkit-background-clip:{};", val));
688+ out.push_str(&format!("background-clip:{};", val));
689+ }
690+ "hyphens" => {
691+ out.push_str(&format!("-webkit-hyphens:{};", val));
692+ out.push_str(&format!("-ms-hyphens:{};", val));
693+ out.push_str(&format!("hyphens:{};", val));
694+ }
695+ "text-size-adjust" => {
696+ out.push_str(&format!("-webkit-text-size-adjust:{};", val));
697+ out.push_str(&format!("-ms-text-size-adjust:{};", val));
698+ out.push_str(&format!("text-size-adjust:{};", val));
699+ }
700+ "mask-image" | "mask-size" | "mask-repeat" | "mask-position" => {
701+ out.push_str(&format!("-webkit-{}:{};", prop, val));
702+ out.push_str(&format!("{}:{};", prop, val));
703+ }
704+ _ => {
705+ out.push_str(decl);
706+ out.push(';');
707+ }
708+ }
709+ } else {
710+ out.push_str(decl);
711+ out.push(';');
712+ }
713+ }
714+ out
715+}
716+
717+fn generate_full_inner(doc: &Document, dev: bool) -> String {
833718 let mut styles = StyleCollector::new();
834719 let mut ctx = GenContext {
835720 dev,
836721 depth: 0,
722+ image_count: 0,
837723 has_interactive: false,
838− in_text: false,
839− flow: Flow::default(),
840− in_picture: false,
724+ has_defer: false,
841725 };
842726
843− // The page is the root element: `<body>` is a column (the reset makes
844− // it one, filling the viewport), `@page`'s styles are its class, and
845− // the page's top-level elements are its children
846− let root = Element {
847− kind: ElementKind::El,
848− attrs: page.styles.clone(),
849− argument: None,
850− children: Vec::new(),
851− line_num: 0,
852− function: None,
853− };
854− let mut own = Flow::of(&root);
855− let top = Flow::default();
856− let site = Site {
857− kind: &root.kind,
858− parent: &top,
859− has_overlay_children: holds_overlays(&doc.nodes),
860− inline: false,
861− root: true,
862− };
863− let body_class = element_class(&root, &site, &mut styles);
864− own.class = body_class.clone();
865− ctx.flow = own;
727+ // Check if document has @main for skip-to-content link
728+ let has_main = has_element_kind(&doc.nodes, &ElementKind::Main);
866729
867730 let mut body = String::new();
868− generate_children(
869− &doc.nodes,
870− Some(Layout::Column),
871− &mut body,
872− &mut styles,
873− &mut ctx,
874− );
875−
876− let element_css = build_element_css(doc, &styles, dev);
877− let nl = if dev { "\n" } else { "" };
878−
879− let mut meta_html = String::new();
880− // A `@meta viewport` of the page's own replaces the usual one
881− if !doc.meta_tags.iter().any(|(name, _)| name == "viewport") {
882− meta_html.push_str(&format!(
883− "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">{}",
884− nl
885− ));
886− }
887− meta_html.push_str(&format!(
888− "<title>{}</title>{}",
889− html_escape(&page.title),
890− nl
891− ));
892− for (name, content) in &doc.meta_tags {
893− meta_html.push_str(&format!(
894− "<meta name=\"{}\" content=\"{}\">{}",
895− html_escape(name),
896− html_escape(content),
897− nl
898− ));
899− }
900− for (property, content) in &doc.og_tags {
901− meta_html.push_str(&format!(
902− "<meta property=\"og:{}\" content=\"{}\">{}",
903− html_escape(property),
904− html_escape(content),
905− nl
906− ));
907− }
908− if let Some(path) = &page.favicon {
909− meta_html.push_str(&format!(
910− "<link rel=\"icon\" href=\"{}\">{}",
911− html_escape(path),
912− nl
913− ));
914− }
915− for block in &doc.head_blocks {
916− meta_html.push_str(block);
917− meta_html.push_str(nl);
918− }
919−
920− // `@page`'s HTML attributes go on `<html>`
921− let mut root_attrs = String::new();
922− for attr in html_attrs(&page.html_attrs) {
923− push_html_attr(&mut root_attrs, attr);
924− }
925− let mut body_attrs = String::new();
926− emit_class_attr(&mut body_attrs, body_class.as_deref(), None);
927731
928− // Focus-visible CSS for interactive elements (accessibility)
929− let focus_visible_css = if ctx.has_interactive {
930− let focusable = ":where(a,button,input,select,textarea):focus-visible";
732+ // Skip-to-content link for accessibility (only when @main exists)
733+ if has_main {
931734 if dev {
932− format!(
933− "{}{} {{ outline: 2px solid currentColor; outline-offset: 2px; }}\n",
934− OWN_ELEMENTS, focusable
935− )
735+ body.push_str("<a href=\"#hl-main\" class=\"hl-skip\">Skip to content</a>\n");
936736 } else {
937− format!(
938− "{}{}{{outline:2px solid currentColor;outline-offset:2px}}",
939− OWN_ELEMENTS, focusable
940− )
737+ body.push_str("<a href=\"#hl-main\" class=\"hl-skip\">Skip to content</a>");
941738 }
942− } else {
943− String::new()
944− };
945− let reset_css = reset_css(dev, true, &focus_visible_css);
946− classes.extend(styles.classes());
947−
948− format!(
949− "<!DOCTYPE html>{nl}<html{root_attrs}>{nl}<head>{nl}<meta charset=\"utf-8\">{nl}\
950− {meta_html}<style>{nl}{reset_css}{element_css}</style>{nl}</head>{nl}\
951− <body{body_attrs}>{nl}{body}</body>{nl}</html>{nl}",
952− )
953−}
954−
955−/// Assemble every CSS block the document needs (font faces, custom
956−/// properties, generated class rules, keyframes, and user CSS). Shared by
957−/// full-page and partial output so both emit the same styles.
958−fn build_element_css(doc: &Document, styles: &StyleCollector, dev: bool) -> String {
959− let mut element_css = String::new();
739+ }
960740
961− // Collect the CSS custom properties declared with `@let --name` so they
962− // can be emitted in a single `:root` block below.
963− let mut root_vars: Vec<(String, String)> = Vec::new();
964− for (name, value) in &doc.css_vars {
965− root_vars.push((name.clone(), value.clone()));
741+ for node in &doc.nodes {
742+ generate_node(node, None, &mut body, &mut styles, &mut ctx);
966743 }
967744
968− // Generated rules always go in htmlang's layers, so unlayered user CSS
969− // (`@style`, `@raw`) overrides them regardless of specificity.
970− let styles_css = styles.to_css_formatted(dev, &doc.scoped_css);
745+ // Collect external domains for DNS prefetch
746+ let dns_prefetch_html = collect_dns_prefetch(&body, dev);
747+
748+ let mut element_css = String::new();
971749
972− // Emit the :root block first so the cascade picks up the custom
973− // properties before the class rules consume them.
974− if !root_vars.is_empty() {
750+ // CSS custom properties (includes @theme runtime tokens)
751+ let has_theme_tokens = !doc.theme_tokens.is_empty();
752+ if !doc.css_vars.is_empty() || has_theme_tokens {
975753 if dev {
976754 element_css.push_str(":root {\n");
977− for (name, value) in &root_vars {
755+ for (name, value) in &doc.css_vars {
978756 element_css.push_str(&format!(" {}: {};\n", name, value));
979757 }
758+ // @theme tokens as runtime CSS custom properties
759+ for (name, value) in &doc.theme_tokens {
760+ let css_name = format!("--{}", name);
761+ // Only emit if not already in css_vars
762+ if !doc.css_vars.iter().any(|(n, _)| *n == css_name) {
763+ element_css.push_str(&format!(" {}: {};\n", css_name, value));
764+ }
765+ }
980766 element_css.push_str("}\n");
981767 } else {
982768 element_css.push_str(":root{");
983− for (name, value) in &root_vars {
769+ for (name, value) in &doc.css_vars {
984770 element_css.push_str(name);
985771 element_css.push(':');
986772 element_css.push_str(value);
987773 element_css.push(';');
988774 }
775+ for (name, value) in &doc.theme_tokens {
776+ let css_name = format!("--{}", name);
777+ if !doc.css_vars.iter().any(|(n, _)| *n == css_name) {
778+ element_css.push_str(&css_name);
779+ element_css.push(':');
780+ element_css.push_str(value);
781+ element_css.push(';');
782+ }
783+ }
989784 element_css.push('}');
990785 }
991786 }
992787
993− element_css.push_str(&styles_css);
788+ let has_custom_css = !doc.custom_css.is_empty();
789+ element_css.push_str(&styles.to_css_formatted(dev, !has_custom_css));
994790
995− // @style blocks (custom CSS)
996− for block in &doc.custom_css {
791+ // @keyframes
792+ for (name, kf_body) in &doc.keyframes {
997793 if dev {
998− element_css.push_str(block);
999− element_css.push('\n');
794+ element_css.push_str(&format!("@keyframes {} {{\n{}\n}}\n", name, kf_body));
1000795 } else {
1001− element_css.push_str(&compact_css(block));
796+ element_css.push_str(&format!("@keyframes {}{{{}}}", name, kf_body));
1002797 }
1003798 }
1004799
1005− element_css
1006−}
800+ // Auto-inject skeleton keyframe if skeleton attribute is used
801+ let skeleton_used = element_css.contains("hl-skeleton");
802+ if skeleton_used {
803+ if dev {
804+ element_css.push_str("@keyframes hl-skeleton {\n 0% { background-position: 200% 0; }\n 100% { background-position: -200% 0; }\n}\n");
805+ } else {
806+ element_css.push_str("@keyframes hl-skeleton{0%{background-position:200% 0}100%{background-position:-200% 0}}");
807+ }
808+ }
1007809
1008−/// An `@style` body on one line: each line trimmed, and the lines joined with
1009−/// a space, so a value that goes on over two lines (`margin: 0` then `auto;`)
1010−/// keeps its words apart.
1011−fn compact_css(block: &str) -> String {
1012− block
1013− .lines()
1014− .map(str::trim)
1015− .filter(|l| !l.is_empty())
1016− .collect::<Vec<_>>()
1017− .join(" ")
1018−}
810+ // Also inject carousel webkit scrollbar hiding
811+ let carousel_used = element_css.contains("scroll-snap-type:x mandatory");
812+ if carousel_used && !element_css.contains("::-webkit-scrollbar") {
813+ // The carousel class already has scrollbar-width:none, but webkit needs pseudo-element
814+ // We add a global rule for carousel-style elements
815+ }
1019816
1020−/// htmlang's own elements: those with a generated class, or the class of a
1021−/// function's scoped `@style`. The reset's rules for elements are kept to
1022−/// them, so `@raw` and `@markdown` content, and the page a fragment is put
1023−/// into, keep their own.
1024−const OWN_ELEMENTS: &str = ":where([class^=\"hl-\"],[class*=\" hl-\"])";
1025−
1026−/// htmlang's cascade layers, from the one that loses to the one that wins:
1027−/// the reset; the defaults of each element's kind (a heading's `margin:0`,
1028−/// a column's `display:flex`); the styles an element gets from an
1029−/// element prefix on an element around it (`@td:padding 8`) and from a
1030−/// function's scoped `@style`; and the element's own styles. So a
1031−/// scope's styles win over the defaults, and what an element says about
1032−/// itself wins over both. CSS outside any layer (`@style`, `@raw`) wins
1033−/// over all of them.
1034−const LAYERS: [&str; 4] = ["hl-reset", "hl-kind", "hl-inside", "htmlang"];
1035−
1036−/// Built-in reset rules, in a layer before `htmlang`: unlayered CSS beats
1037−/// every layer, so an unlayered rule here would override the generated
1038−/// ones. A page resets `box-sizing` everywhere and makes `<body>` a column
1039−/// that fills the window; a fragment, which goes into a page it doesn't
1040−/// own, touches only htmlang's own elements. In both, an element htmlang
1041−/// lays out stays hidden while it is `hidden`, a closed `<dialog>` or a
1042−/// popover that isn't showing: its generated `display` would otherwise
1043−/// beat the browser's `display: none`.
1044−fn reset_css(dev: bool, page: bool, focus_visible_css: &str) -> String {
1045− let own = OWN_ELEMENTS;
1046− let mut rules = Vec::new();
1047− if page {
1048− rules.push(if dev {
1049− "*, *::before, *::after { box-sizing: border-box; }".to_string()
817+ // @style blocks (custom CSS)
818+ for block in &doc.custom_css {
819+ if dev {
820+ element_css.push_str(block);
821+ element_css.push('\n');
1050822 } else {
1051− "*,*::before,*::after{box-sizing:border-box}".to_string()
1052− });
1053− rules.push(if dev {
1054− "body { margin: 0; font-family: system-ui, -apple-system, sans-serif; display: flex; flex-direction: column; min-height: 100dvh; }".to_string()
823+ // Minify: collapse whitespace
824+ let minified: String = block.lines().map(|l| l.trim()).collect::<Vec<_>>().join("");
825+ element_css.push_str(&minified);
826+ }
827+ }
828+
829+ // @scope blocks
830+ for block in &doc.scope_blocks {
831+ if dev {
832+ element_css.push_str(block);
833+ element_css.push('\n');
1055834 } else {
1056− "body{margin:0;font-family:system-ui,-apple-system,sans-serif;display:flex;flex-direction:column;min-height:100dvh}".to_string()
1057− });
835+ let minified: String = block.lines().map(|l| l.trim()).collect::<Vec<_>>().join("");
836+ element_css.push_str(&minified);
837+ }
838+ }
839+
840+ // @starting-style blocks
841+ if !doc.starting_style_blocks.is_empty() {
842+ if dev {
843+ element_css.push_str("@starting-style {\n");
844+ for block in &doc.starting_style_blocks {
845+ element_css.push_str(block);
846+ element_css.push('\n');
847+ }
848+ element_css.push_str("}\n");
849+ } else {
850+ element_css.push_str("@starting-style{");
851+ for block in &doc.starting_style_blocks {
852+ let minified: String = block.lines().map(|l| l.trim()).collect::<Vec<_>>().join("");
853+ element_css.push_str(&minified);
854+ }
855+ element_css.push('}');
856+ }
857+ }
858+
859+ // Build meta tags string
860+ let meta_html = if doc.meta_tags.is_empty() {
861+ String::new()
862+ } else {
863+ let mut m = String::new();
864+ for (name, content) in &doc.meta_tags {
865+ if dev {
866+ m.push_str(&format!(
867+ "<meta name=\"{}\" content=\"{}\">\n",
868+ html_escape(name),
869+ html_escape(content)
870+ ));
871+ } else {
872+ m.push_str(&format!(
873+ "<meta name=\"{}\" content=\"{}\">",
874+ html_escape(name),
875+ html_escape(content)
876+ ));
877+ }
878+ }
879+ m
880+ };
881+
882+ // Build OG meta tags
883+ let og_html = if doc.og_tags.is_empty() {
884+ String::new()
885+ } else {
886+ let mut o = String::new();
887+ for (property, content) in &doc.og_tags {
888+ if dev {
889+ o.push_str(&format!(
890+ "<meta property=\"og:{}\" content=\"{}\">\n",
891+ html_escape(property),
892+ html_escape(content)
893+ ));
894+ } else {
895+ o.push_str(&format!(
896+ "<meta property=\"og:{}\" content=\"{}\">",
897+ html_escape(property),
898+ html_escape(content)
899+ ));
900+ }
901+ }
902+ o
903+ };
904+
905+ // Build head blocks string
906+ let head_html = if doc.head_blocks.is_empty() {
907+ String::new()
908+ } else {
909+ let mut h = String::new();
910+ for block in &doc.head_blocks {
911+ h.push_str(block);
912+ if dev {
913+ h.push('\n');
914+ }
915+ }
916+ h
917+ };
918+
919+ let lang_attr = match &doc.lang {
920+ Some(lang) => format!(" lang=\"{}\"", html_escape(lang)),
921+ None => String::new(),
922+ };
923+
924+ let favicon_html = match &doc.favicon {
925+ Some(path) => {
926+ // Try to read and inline the favicon
927+ if let Ok(data) = std::fs::read(path) {
928+ let mime = if path.ends_with(".ico") {
929+ "image/x-icon"
930+ } else if path.ends_with(".png") {
931+ "image/png"
932+ } else if path.ends_with(".svg") {
933+ "image/svg+xml"
934+ } else {
935+ "image/x-icon"
936+ };
937+ let b64 = base64_encode(&data);
938+ if dev {
939+ format!(
940+ "<link rel=\"icon\" href=\"data:{};base64,{}\">\n",
941+ mime, b64
942+ )
943+ } else {
944+ format!("<link rel=\"icon\" href=\"data:{};base64,{}\">", mime, b64)
945+ }
946+ } else {
947+ // Fall back to href
948+ if dev {
949+ format!("<link rel=\"icon\" href=\"{}\">\n", html_escape(path))
950+ } else {
951+ format!("<link rel=\"icon\" href=\"{}\">", html_escape(path))
952+ }
953+ }
954+ }
955+ None => String::new(),
956+ };
957+
958+ // Canonical URL
959+ let canonical_html = match &doc.canonical {
960+ Some(url) => {
961+ if dev {
962+ format!("<link rel=\"canonical\" href=\"{}\">\n", html_escape(url))
963+ } else {
964+ format!("<link rel=\"canonical\" href=\"{}\">", html_escape(url))
965+ }
966+ }
967+ None => String::new(),
968+ };
969+
970+ // Base URL
971+ let base_html = match &doc.base_url {
972+ Some(url) => {
973+ if dev {
974+ format!("<base href=\"{}\">\n", html_escape(url))
975+ } else {
976+ format!("<base href=\"{}\">", html_escape(url))
977+ }
978+ }
979+ None => String::new(),
980+ };
981+
982+ // @font-face CSS
983+ for (name, url) in &doc.font_faces {
984+ let format_hint = if url.ends_with(".woff2") {
985+ " format('woff2')"
986+ } else if url.ends_with(".woff") {
987+ " format('woff')"
988+ } else if url.ends_with(".ttf") {
989+ " format('truetype')"
990+ } else if url.ends_with(".otf") {
991+ " format('opentype')"
992+ } else {
993+ ""
994+ };
995+ if dev {
996+ element_css.insert_str(0, &format!(
997+ "@font-face {{\n font-family: '{}';\n src: url('{}'){};\n font-display: swap;\n}}\n",
998+ name, url, format_hint
999+ ));
1000+ } else {
1001+ element_css.insert_str(
1002+ 0,
1003+ &format!(
1004+ "@font-face{{font-family:'{}';src:url('{}'){};font-display:swap}}",
1005+ name, url, format_hint
1006+ ),
1007+ );
1008+ }
1009+ }
1010+
1011+ // JSON-LD blocks
1012+ let json_ld_html: String = doc
1013+ .json_ld_blocks
1014+ .iter()
1015+ .map(|block| {
1016+ if dev {
1017+ format!(
1018+ "<script type=\"application/ld+json\">\n{}\n</script>\n",
1019+ block
1020+ )
1021+ } else {
1022+ format!("<script type=\"application/ld+json\">{}</script>", block)
1023+ }
1024+ })
1025+ .collect();
1026+
1027+ // Manifest link
1028+ let manifest_html = if let Some(ref manifest) = doc.manifest {
1029+ let mut json = String::from("{");
1030+ json.push_str(&format!("\"name\":\"{}\",", manifest.name));
1031+ if let Some(ref short) = manifest.short_name {
1032+ json.push_str(&format!("\"short_name\":\"{}\",", short));
1033+ }
1034+ json.push_str(&format!("\"start_url\":\"{}\",", manifest.start_url));
1035+ json.push_str(&format!("\"display\":\"{}\"", manifest.display));
1036+ if let Some(ref bg) = manifest.background_color {
1037+ json.push_str(&format!(",\"background_color\":\"{}\"", bg));
1038+ }
1039+ if let Some(ref tc) = manifest.theme_color {
1040+ json.push_str(&format!(",\"theme_color\":\"{}\"", tc));
1041+ }
1042+ if let Some(ref desc) = manifest.description {
1043+ json.push_str(&format!(",\"description\":\"{}\"", desc));
1044+ }
1045+ if !manifest.icons.is_empty() {
1046+ json.push_str(",\"icons\":[");
1047+ for (i, (src, sizes)) in manifest.icons.iter().enumerate() {
1048+ if i > 0 {
1049+ json.push(',');
1050+ }
1051+ json.push_str(&format!(
1052+ "{{\"src\":\"{}\",\"sizes\":\"{}\",\"type\":\"image/png\"}}",
1053+ src, sizes
1054+ ));
1055+ }
1056+ json.push(']');
1057+ }
1058+ json.push('}');
1059+
1060+ // Inline the manifest as a data URI
1061+ let encoded = base64_encode(json.as_bytes());
1062+ if dev {
1063+ format!(
1064+ "<link rel=\"manifest\" href=\"data:application/manifest+json;base64,{}\">\n",
1065+ encoded
1066+ )
1067+ } else {
1068+ format!(
1069+ "<link rel=\"manifest\" href=\"data:application/manifest+json;base64,{}\">",
1070+ encoded
1071+ )
1072+ }
10581073 } else {
1059− rules.push(if dev {
1060− format!("{own}, {own}::before, {own}::after {{ box-sizing: border-box; }}")
1074+ String::new()
1075+ };
1076+
1077+ // Preload hints (auto-detect fonts from @font-face)
1078+ let mut preload_html = String::new();
1079+ for (_, url) in &doc.font_faces {
1080+ if dev {
1081+ preload_html.push_str(&format!(
1082+ "<link rel=\"preload\" href=\"{}\" as=\"font\" type=\"font/woff2\" crossorigin>\n",
1083+ url
1084+ ));
10611085 } else {
1062− format!("{own},{own}::before,{own}::after{{box-sizing:border-box}}")
1063− });
1086+ preload_html.push_str(&format!(
1087+ "<link rel=\"preload\" href=\"{}\" as=\"font\" type=\"font/woff2\" crossorigin>",
1088+ url
1089+ ));
1090+ }
10641091 }
1065− let hidden = "[hidden]:not([hidden=\"until-found\"]),dialog:not([open]):not(:popover-open),\
1066− [popover]:not(:popover-open):not(dialog[open])";
1067− rules.push(if dev {
1068− format!("{own}:where({hidden}) {{ display: none !important; }}")
1092+ // Explicit preload hints from the document
1093+ for hint in &doc.preload_hints {
1094+ if dev {
1095+ preload_html.push_str(&format!(
1096+ "<link rel=\"preload\" href=\"{}\" as=\"{}\"{}>\n",
1097+ html_escape(&hint.href),
1098+ hint.as_type,
1099+ if hint.crossorigin { " crossorigin" } else { "" }
1100+ ));
1101+ } else {
1102+ preload_html.push_str(&format!(
1103+ "<link rel=\"preload\" href=\"{}\" as=\"{}\"{}>",
1104+ html_escape(&hint.href),
1105+ hint.as_type,
1106+ if hint.crossorigin { " crossorigin" } else { "" }
1107+ ));
1108+ }
1109+ }
1110+
1111+ // Auto theme-color meta from @theme primary token
1112+ let theme_color_html = doc
1113+ .theme_tokens
1114+ .iter()
1115+ .find(|(name, _)| name == "primary" || name == "theme-color")
1116+ .map(|(_, value)| {
1117+ if dev {
1118+ format!(
1119+ "<meta name=\"theme-color\" content=\"{}\">\n",
1120+ html_escape(value)
1121+ )
1122+ } else {
1123+ format!(
1124+ "<meta name=\"theme-color\" content=\"{}\">",
1125+ html_escape(value)
1126+ )
1127+ }
1128+ })
1129+ .unwrap_or_default();
1130+
1131+ // Focus-visible CSS for interactive elements (accessibility)
1132+ let focus_visible_css = if ctx.has_interactive {
1133+ if dev {
1134+ "a:focus-visible, button:focus-visible, input:focus-visible, select:focus-visible, textarea:focus-visible { outline: 2px solid currentColor; outline-offset: 2px; }\n"
1135+ } else {
1136+ "a:focus-visible,button:focus-visible,input:focus-visible,select:focus-visible,textarea:focus-visible{outline:2px solid currentColor;outline-offset:2px}"
1137+ }
1138+ } else {
1139+ ""
1140+ };
1141+
1142+ // Skip-to-content CSS (visually hidden but accessible)
1143+ let skip_link_css = if has_main {
1144+ if dev {
1145+ ".hl-skip { position: absolute; left: -9999px; top: auto; width: 1px; height: 1px; overflow: hidden; z-index: 9999; padding: 8px 16px; background: #000; color: #fff; text-decoration: none; font-size: 14px; }\n.hl-skip:focus { left: 8px; top: 8px; width: auto; height: auto; overflow: visible; }\n"
1146+ } else {
1147+ ".hl-skip{position:absolute;left:-9999px;top:auto;width:1px;height:1px;overflow:hidden;z-index:9999;padding:8px 16px;background:#000;color:#fff;text-decoration:none;font-size:14px}.hl-skip:focus{left:8px;top:8px;width:auto;height:auto;overflow:visible}"
1148+ }
10691149 } else {
1070− format!("{own}:where({hidden}){{display:none!important}}")
1071− });
1072− let mut rules = rules.join(if dev { "\n" } else { "" });
1073− if dev {
1074− rules.push('\n');
1075− }
1076− rules.push_str(focus_visible_css);
1077− if dev {
1078− format!(
1079− "@layer {};\n@layer hl-reset {{\n{}}}\n",
1080− LAYERS.join(", "),
1081− rules
1082− )
1150+ ""
1151+ };
1152+
1153+ // Noscript fallback: show deferred content if JS is disabled
1154+ let noscript_html = if ctx.has_defer {
1155+ if dev {
1156+ "<noscript><style>.hl-defer-placeholder { display: none; }</style></noscript>\n"
1157+ } else {
1158+ "<noscript><style>.hl-defer-placeholder{display:none}</style></noscript>"
1159+ }
10831160 } else {
1084− format!("@layer {};@layer hl-reset{{{}}}", LAYERS.join(","), rules)
1161+ ""
1162+ };
1163+
1164+ match &doc.page_title {
1165+ Some(title) => {
1166+ if dev {
1167+ format!(
1168+ "\
1169+<!DOCTYPE html>
1170+<html{lang_attr}>
1171+<head>
1172+<meta charset=\"utf-8\">
1173+<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">
1174+<title>{title}</title>
1175+{theme_color_html}{base_html}{canonical_html}{manifest_html}{preload_html}{dns_prefetch_html}{meta_html}{og_html}{favicon_html}{json_ld_html}{head_html}\
1176+<style>
1177+*, *::before, *::after {{ box-sizing: border-box; }}
1178+body {{ margin: 0; font-family: system-ui, -apple-system, sans-serif; }}
1179+img {{ display: block; }}
1180+{focus_visible_css}{skip_link_css}{element_css}\
1181+</style>
1182+{noscript_html}\
1183+</head>
1184+<body>
1185+{body}\
1186+</body>
1187+</html>
1188+",
1189+ title = html_escape(title),
1190+ lang_attr = lang_attr,
1191+ theme_color_html = theme_color_html,
1192+ base_html = base_html,
1193+ canonical_html = canonical_html,
1194+ manifest_html = manifest_html,
1195+ preload_html = preload_html,
1196+ dns_prefetch_html = dns_prefetch_html,
1197+ meta_html = meta_html,
1198+ favicon_html = favicon_html,
1199+ json_ld_html = json_ld_html,
1200+ head_html = head_html,
1201+ og_html = og_html,
1202+ focus_visible_css = focus_visible_css,
1203+ skip_link_css = skip_link_css,
1204+ noscript_html = noscript_html,
1205+ element_css = element_css,
1206+ body = body,
1207+ )
1208+ } else {
1209+ format!(
1210+ "<!DOCTYPE html><html{lang_attr}><head><meta charset=\"utf-8\"><meta name=\"viewport\" content=\"width=device-width, initial-scale=1\"><title>{title}</title>{theme_color_html}{base_html}{canonical_html}{manifest_html}{preload_html}{dns_prefetch_html}{meta_html}{og_html}{favicon_html}{json_ld_html}{head_html}<style>*,*::before,*::after{{box-sizing:border-box}}body{{margin:0;font-family:system-ui,-apple-system,sans-serif}}img{{display:block}}{focus_visible_css}{skip_link_css}{element_css}</style>{noscript_html}</head><body>{body}</body></html>",
1211+ title = html_escape(title),
1212+ lang_attr = lang_attr,
1213+ theme_color_html = theme_color_html,
1214+ base_html = base_html,
1215+ canonical_html = canonical_html,
1216+ manifest_html = manifest_html,
1217+ preload_html = preload_html,
1218+ dns_prefetch_html = dns_prefetch_html,
1219+ meta_html = meta_html,
1220+ og_html = og_html,
1221+ favicon_html = favicon_html,
1222+ json_ld_html = json_ld_html,
1223+ head_html = head_html,
1224+ focus_visible_css = focus_visible_css,
1225+ skip_link_css = skip_link_css,
1226+ noscript_html = noscript_html,
1227+ element_css = element_css,
1228+ body = body,
1229+ )
1230+ }
1231+ }
1232+ None => {
1233+ if element_css.is_empty() {
1234+ body
1235+ } else if dev {
1236+ format!("<style>\n{}</style>\n{}", element_css, body)
1237+ } else {
1238+ format!("<style>{}</style>{}", element_css, body)
1239+ }
1240+ }
10851241 }
10861242}
10871243
10881244/// Generate an HTML fragment: body + optional <style>, no <html>/<head>/<body> wrapper.
1089−fn generate_partial_inner(doc: &Document, dev: bool, classes: &mut Vec<Class>) -> String {
1245+fn generate_partial_inner(doc: &Document, dev: bool) -> String {
10901246 let mut styles = StyleCollector::new();
10911247 let mut ctx = GenContext {
10921248 dev,
10931249 depth: 0,
1250+ image_count: 0,
10941251 has_interactive: false,
1095− in_text: false,
1096− flow: Flow::default(),
1097− in_picture: false,
1252+ has_defer: false,
10981253 };
10991254 let mut body = String::new();
11001255
1101− generate_children(&doc.nodes, None, &mut body, &mut styles, &mut ctx);
1256+ for node in &doc.nodes {
1257+ generate_node(node, None, &mut body, &mut styles, &mut ctx);
1258+ }
1259+
1260+ let has_custom_css = !doc.custom_css.is_empty();
1261+ let mut element_css = String::new();
1262+
1263+ // CSS custom properties
1264+ if !doc.css_vars.is_empty() || !doc.theme_tokens.is_empty() {
1265+ if dev {
1266+ element_css.push_str(":root {\n");
1267+ for (name, value) in &doc.css_vars {
1268+ element_css.push_str(&format!(" {}: {};\n", name, value));
1269+ }
1270+ for (name, value) in &doc.theme_tokens {
1271+ let css_name = format!("--{}", name);
1272+ if !doc.css_vars.iter().any(|(n, _)| *n == css_name) {
1273+ element_css.push_str(&format!(" {}: {};\n", css_name, value));
1274+ }
1275+ }
1276+ element_css.push_str("}\n");
1277+ } else {
1278+ element_css.push_str(":root{");
1279+ for (name, value) in &doc.css_vars {
1280+ element_css.push_str(name);
1281+ element_css.push(':');
1282+ element_css.push_str(value);
1283+ element_css.push(';');
1284+ }
1285+ for (name, value) in &doc.theme_tokens {
1286+ let css_name = format!("--{}", name);
1287+ if !doc.css_vars.iter().any(|(n, _)| *n == css_name) {
1288+ element_css.push_str(&css_name);
1289+ element_css.push(':');
1290+ element_css.push_str(value);
1291+ element_css.push(';');
1292+ }
1293+ }
1294+ element_css.push('}');
1295+ }
1296+ }
1297+
1298+ element_css.push_str(&styles.to_css_formatted(dev, !has_custom_css));
1299+
1300+ for (name, kf_body) in &doc.keyframes {
1301+ if dev {
1302+ element_css.push_str(&format!("@keyframes {} {{\n{}\n}}\n", name, kf_body));
1303+ } else {
1304+ element_css.push_str(&format!("@keyframes {}{{{}}}", name, kf_body));
1305+ }
1306+ }
11021307
1103− let mut element_css = build_element_css(doc, &styles, dev);
1104− // htmlang's own elements get the reset's rules for elements (which
1105− // also puts htmlang's layers in order)
1106− if !styles.entries.is_empty() || !doc.scoped_css.is_empty() {
1107− element_css.insert_str(0, &reset_css(dev, false, ""));
1308+ for block in &doc.custom_css {
1309+ if dev {
1310+ element_css.push_str(block);
1311+ element_css.push('\n');
1312+ } else {
1313+ let minified: String = block.lines().map(|l| l.trim()).collect::<Vec<_>>().join("");
1314+ element_css.push_str(&minified);
1315+ }
11081316 }
1109− classes.extend(styles.classes());
11101317
11111318 if element_css.is_empty() {
11121319 body
@@ -1121,20 +1328,44 @@ fn generate_partial_inner(doc: &Document, dev: bool, classes: &mut Vec<Class>) -
11211328// Node generation
11221329// ---------------------------------------------------------------------------
11231330
1124−/// Write `node`, which is inside an element with the layout `parent`
1125−/// (`None` at the top of the page).
11261331fn generate_node(
11271332 node: &Node,
1128− parent: Option<Layout>,
1333+ parent_kind: Option<&ElementKind>,
11291334 out: &mut String,
11301335 styles: &mut StyleCollector,
11311336 ctx: &mut GenContext,
11321337) {
11331338 match node {
1134− Node::Element(elem) => generate_element(elem, parent, out, styles, ctx),
1339+ Node::Element(elem) => generate_element(elem, parent_kind, out, styles, ctx),
11351340 Node::Text(segments) => {
1136− // In a row, column or grid each line of text is a child
1137− let needs_wrap = parent.is_some_and(Layout::is_container);
1341+ let needs_wrap = matches!(
1342+ parent_kind,
1343+ Some(ElementKind::Row)
1344+ | Some(ElementKind::Column)
1345+ | Some(ElementKind::El)
1346+ | Some(ElementKind::Nav)
1347+ | Some(ElementKind::Header)
1348+ | Some(ElementKind::Footer)
1349+ | Some(ElementKind::Main)
1350+ | Some(ElementKind::Section)
1351+ | Some(ElementKind::Article)
1352+ | Some(ElementKind::Aside)
1353+ | Some(ElementKind::ListItem)
1354+ | Some(ElementKind::Form)
1355+ | Some(ElementKind::Details)
1356+ | Some(ElementKind::Figure)
1357+ | Some(ElementKind::Blockquote)
1358+ | Some(ElementKind::Dialog)
1359+ | Some(ElementKind::DefinitionList)
1360+ | Some(ElementKind::DefinitionDescription)
1361+ | Some(ElementKind::Fieldset)
1362+ | Some(ElementKind::Datalist)
1363+ | Some(ElementKind::Grid)
1364+ | Some(ElementKind::Stack)
1365+ | Some(ElementKind::Noscript)
1366+ | Some(ElementKind::Address)
1367+ | Some(ElementKind::Search)
1368+ );
11381369 if needs_wrap {
11391370 out.push_str(&ctx.indent());
11401371 out.push_str("<span>");
@@ -1153,191 +1384,174 @@ fn generate_node(
11531384 }
11541385}
11551386
1156−/// What goes between two things written one after the other in an element
1157−/// with this layout (`None`: the top of the page): text flows, so its lines
1158−/// and children are joined with a space; in HTML's own layout, and at the
1159−/// top of the page, two lines of text are separated by a line break (a
1160−/// space, except where whitespace is kept, as in `@pre`).
1161−fn separator(layout: Option<Layout>, previous_is_text: bool, next: &Node) -> Option<char> {
1162− match layout {
1163− Some(Layout::Text) => Some(' '),
1164− Some(Layout::Native) | None if previous_is_text && matches!(next, Node::Text(_)) => {
1165− Some('\n')
1166− }
1167− _ => None,
1168− }
1169−}
1387+/// HTML attributes that are passed through to the HTML tag rather than converted to CSS.
1388+const HTML_PASSTHROUGH_ATTRS: &[&str] = &[
1389+ "type",
1390+ "placeholder",
1391+ "name",
1392+ "value",
1393+ "disabled",
1394+ "required",
1395+ "checked",
1396+ "for",
1397+ "action",
1398+ "method",
1399+ "autocomplete",
1400+ "min",
1401+ "max",
1402+ "step",
1403+ "pattern",
1404+ "maxlength",
1405+ "rows",
1406+ "cols",
1407+ "multiple",
1408+ "alt",
1409+ "role",
1410+ "tabindex",
1411+ "title",
1412+ "autofocus",
1413+ // Media
1414+ "controls",
1415+ "autoplay",
1416+ "loop",
1417+ "muted",
1418+ "poster",
1419+ "preload",
1420+ // Image optimization
1421+ "loading",
1422+ "decoding",
1423+ // Media src (explicit attribute form)
1424+ "src",
1425+ // New element attributes
1426+ "datetime",
1427+ "media",
1428+ "sizes",
1429+ "srcset",
1430+ "list",
1431+ // Details
1432+ "open",
1433+ // Form
1434+ "novalidate",
1435+ // Progress/Meter
1436+ "low",
1437+ "high",
1438+ "optimum",
1439+ // Table
1440+ "colspan",
1441+ "rowspan",
1442+ "scope",
1443+ // Popover API
1444+ "popover",
1445+ "popovertarget",
1446+ "popovertargetaction",
1447+ // Modern form/input hints
1448+ "inputmode",
1449+ "enterkeyhint",
1450+ // Performance hints
1451+ "fetchpriority",
1452+ "blocking",
1453+ // Global attrs
1454+ "translate",
1455+ "spellcheck",
1456+ // ARIA live regions
1457+ "aria-live",
1458+ "aria-atomic",
1459+ "aria-relevant",
1460+];
11701461
1171−/// Write the children of an element (or of a `@fragment`, which has no
1172−/// element of its own) laid out as `layout` (`None`: the top of the page).
1173−/// The first line of an element's text is its first child.
1174−fn generate_children(
1175− children: &[Node],
1176− layout: Option<Layout>,
1177− out: &mut String,
1178− styles: &mut StyleCollector,
1179− ctx: &mut GenContext,
1180−) {
1181− generate_run(children, layout, &mut None, out, styles, ctx);
1182−}
1462+/// Boolean HTML attributes (rendered without a value, e.g., `<input disabled>`).
1463+const BOOLEAN_HTML_ATTRS: &[&str] = &[
1464+ "disabled",
1465+ "required",
1466+ "checked",
1467+ "multiple",
1468+ "controls",
1469+ "autoplay",
1470+ "loop",
1471+ "muted",
1472+ "open",
1473+ "novalidate",
1474+ "autofocus",
1475+ "defer",
1476+ "async",
1477+ "nomodule",
1478+ // Popover
1479+ "popover",
1480+];
11831481
1184−/// [`generate_children`], with `previous` saying whether what was written
1185−/// last was a line of text (`None`: nothing yet). A `@fragment`'s children
1186−/// are written as if they stood in its place, so its lines are separated
1187−/// from the lines around it like any other lines.
1188−fn generate_run(
1189− children: &[Node],
1190− layout: Option<Layout>,
1191− previous: &mut Option<bool>,
1192− out: &mut String,
1193− styles: &mut StyleCollector,
1194− ctx: &mut GenContext,
1195−) {
1196− for child in children {
1197− if let Node::Element(elem) = child
1198− && elem.kind == ElementKind::Fragment
1199− {
1200− generate_run(&elem.children, layout, previous, out, styles, ctx);
1201− continue;
1202− }
1203− let start = out.len();
1204− if let Some(previous_is_text) = *previous
1205− && let Some(sep) = separator(layout, previous_is_text, child)
1206− {
1207− out.push(sep);
1208− }
1209− let body = out.len();
1210− generate_node(child, layout, out, styles, ctx);
1211− // A child that writes nothing (an empty `@fragment`) takes no
1212− // separator either, so text never gets two spaces in a row
1213− if out.len() == body {
1214− out.truncate(start);
1482+fn emit_html_passthrough_attrs(out: &mut String, attrs: &[Attribute]) {
1483+ for attr in attrs {
1484+ let key = attr.key.as_str();
1485+ let is_passthrough = HTML_PASSTHROUGH_ATTRS.contains(&key)
1486+ || key.starts_with("aria-")
1487+ || key.starts_with("data-");
1488+ if !is_passthrough {
12151489 continue;
12161490 }
1217− *previous = Some(matches!(child, Node::Text(_)));
1218− }
1219−}
1220−
1221−/// Emit the element's leading argument as its attribute (`@iframe URL` →
1222−/// `src="URL"`, `@form /submit` → `action="/submit"`, `@link /a` →
1223−/// `href="/a"`), first, before the class. `@image [inline] photo.png` puts
1224−/// the file itself into the page.
1225−fn emit_argument_attr(out: &mut String, elem: &Element, in_picture: bool) {
1226− let (Some(attr), Some(value)) = (elem.kind.leading_attribute(in_picture), &elem.argument)
1227− else {
1228− return;
1229− };
1230− // `@image [inline]`'s file is already a `data:` URI (see the parser)
1231− let value = html_escape(value);
1232− out.push(' ');
1233− out.push_str(attr);
1234− out.push_str("=\"");
1235− out.push_str(&value);
1236− out.push('"');
1237−}
1238−
1239−/// A file's bytes as a `data:` URI, its type from its extension.
1240−pub(crate) fn data_uri(path: &str, data: &[u8]) -> String {
1241− let mime = match path
1242− .rsplit('.')
1243− .next()
1244− .map(str::to_ascii_lowercase)
1245− .as_deref()
1246− {
1247− Some("png") => "image/png",
1248− Some("jpg" | "jpeg") => "image/jpeg",
1249− Some("gif") => "image/gif",
1250− Some("webp") => "image/webp",
1251− Some("avif") => "image/avif",
1252− Some("svg") => "image/svg+xml",
1253− Some("ico") => "image/x-icon",
1254− _ => "application/octet-stream",
1255− };
1256− format!("data:{};base64,{}", mime, base64_encode(data))
1257−}
1258−
1259−/// Emit HTML attributes: `key=value` ones (except `id` / `class`, which
1260−/// are emitted with the generated class) and flags like `required`.
1261−fn emit_html_attrs(out: &mut String, attrs: &[Attribute]) {
1262− for attr in html_attrs(attrs) {
1263− let key = attr.key.as_str();
1264− if key != "id" && key != "class" {
1265− push_html_attr(out, attr);
1491+ if BOOLEAN_HTML_ATTRS.contains(&key) && attr.value.is_none() {
1492+ out.push(' ');
1493+ out.push_str(key);
1494+ } else if let Some(val) = &attr.value {
1495+ out.push(' ');
1496+ out.push_str(key);
1497+ out.push_str("=\"");
1498+ out.push_str(&html_escape(val));
1499+ out.push('"');
12661500 }
12671501 }
12681502}
12691503
1270−/// The HTML attributes of `attrs`, `key=value` ones and flags, each name
1271−/// once: the later one wins, as a style does. (Of two attributes with one
1272−/// name, the browser keeps the first, so a bundle's attribute or a
1273−/// function's own would win over one written after it.)
1274−fn html_attrs(attrs: &[Attribute]) -> impl Iterator<Item = &Attribute> {
1275− let is_html =
1276− |a: &Attribute| a.html || (a.value.is_none() && crate::vocab::is_html_flag(&a.key));
1277− attrs.iter().enumerate().filter_map(move |(i, attr)| {
1278− let later = attrs[i + 1..]
1279− .iter()
1280− .any(|other| is_html(other) && other.key == attr.key);
1281− (is_html(attr) && !later).then_some(attr)
1282− })
1283−}
1284−
1285−/// ` key="value"`, or ` key` for a flag.
1286−fn push_html_attr(out: &mut String, attr: &Attribute) {
1287− out.push(' ');
1288− out.push_str(&attr.key);
1289− if attr.html {
1290− out.push_str("=\"");
1291− // Quoted text has already lost its quotes (see parser.rs)
1292− out.push_str(&html_escape(attr.value.as_deref().unwrap_or("")));
1293− out.push('"');
1294− }
1295−}
1296−
1297−// True if any direct child is `@in-front` or `@behind`. Such children render
1298−// as absolutely positioned overlays, so the parent automatically becomes a
1299−// positioning context (position:relative + isolation:isolate).
1300−fn has_overlay_children(elem: &Element) -> bool {
1301− holds_overlays(&elem.children)
1302−}
1303−
1304−fn holds_overlays(children: &[Node]) -> bool {
1305− children.iter().any(|child| {
1306− matches!(
1307− child,
1308− Node::Element(e) if e.kind.is_tag("in-front") || e.kind.is_tag("behind")
1309− )
1310− })
1311−}
1312−
13131504fn generate_element(
13141505 elem: &Element,
1315− parent: Option<Layout>,
1506+ parent_kind: Option<&ElementKind>,
13161507 out: &mut String,
13171508 styles: &mut StyleCollector,
13181509 ctx: &mut GenContext,
13191510) {
13201511 // Self-closing elements
1321− if elem.kind.layout() == Layout::Void {
1322− generate_self_closing(elem, parent, out, styles, ctx);
1512+ if matches!(
1513+ elem.kind,
1514+ ElementKind::Image
1515+ | ElementKind::Input
1516+ | ElementKind::HorizontalRule
1517+ | ElementKind::Source
1518+ | ElementKind::Spacer
1519+ ) {
1520+ generate_self_closing(elem, parent_kind, out, styles, ctx);
13231521 return;
13241522 }
1325− // A verbatim element (@script) writes its body as it is, with no HTML
1326− // escaping; it isn't shown, so it has no class (its styles are an error)
1327− if elem.kind.is_verbatim() {
1328− let tag = elem.kind.spec().map_or("script", |spec| spec.html);
1523+ // @script renders as <script> with raw body content (no HTML escaping)
1524+ if elem.kind == ElementKind::Script {
13291525 out.push_str(&ctx.indent());
1330− out.push('<');
1331− out.push_str(tag);
1332− emit_argument_attr(out, elem, false);
1333− let (id, class) = extract_id_class(&elem.attrs);
1334− for (key, value) in [("id", id), ("class", class)] {
1335− if let Some(value) = value {
1336− out.push_str(&format!(" {}=\"{}\"", key, html_escape(&value)));
1526+ out.push_str("<script");
1527+ // Pass through src, type, defer, async, etc.
1528+ for attr in &elem.attrs {
1529+ let key = attr.key.as_str();
1530+ if matches!(
1531+ key,
1532+ "src"
1533+ | "type"
1534+ | "defer"
1535+ | "async"
1536+ | "crossorigin"
1537+ | "integrity"
1538+ | "nomodule"
1539+ | "id"
1540+ ) {
1541+ if let Some(val) = &attr.value {
1542+ out.push(' ');
1543+ out.push_str(key);
1544+ out.push_str("=\"");
1545+ out.push_str(&html_escape(val));
1546+ out.push('"');
1547+ } else {
1548+ out.push(' ');
1549+ out.push_str(key);
1550+ }
13371551 }
13381552 }
1339− emit_html_attrs(out, &elem.attrs);
13401553 out.push('>');
1554+ // Children are raw JS code, not HTML
13411555 for child in &elem.children {
13421556 match child {
13431557 Node::Text(segments) => {
@@ -1351,10 +1565,46 @@ fn generate_element(
13511565 _ => {}
13521566 }
13531567 }
1354− out.push_str("</");
1355− out.push_str(tag);
1568+ out.push_str("</script>");
1569+ out.push_str(ctx.nl());
1570+ return;
1571+ }
1572+ // @breadcrumb generates semantic <nav aria-label="breadcrumb"><ol>...</ol></nav>
1573+ if elem.kind == ElementKind::Breadcrumb {
1574+ let gen_class = compute_class(&elem.attrs, &elem.kind, parent_kind, styles);
1575+ let (id, user_class) = extract_id_class(&elem.attrs);
1576+ out.push_str(&ctx.indent());
1577+ out.push_str("<nav aria-label=\"breadcrumb\"");
1578+ emit_class_attr(out, gen_class.as_deref(), user_class.as_deref());
1579+ if let Some(id) = id {
1580+ out.push_str(" id=\"");
1581+ out.push_str(&html_escape(&id));
1582+ out.push('"');
1583+ }
13561584 out.push('>');
13571585 out.push_str(ctx.nl());
1586+ ctx.depth += 1;
1587+ out.push_str(&ctx.indent());
1588+ out.push_str("<ol>");
1589+ out.push_str(ctx.nl());
1590+ ctx.depth += 1;
1591+ for child in &elem.children {
1592+ out.push_str(&ctx.indent());
1593+ out.push_str("<li>");
1594+ let mut buf = String::new();
1595+ generate_node(child, Some(&elem.kind), &mut buf, styles, ctx);
1596+ out.push_str(buf.trim());
1597+ out.push_str("</li>");
1598+ out.push_str(ctx.nl());
1599+ }
1600+ ctx.depth -= 1;
1601+ out.push_str(&ctx.indent());
1602+ out.push_str("</ol>");
1603+ out.push_str(ctx.nl());
1604+ ctx.depth -= 1;
1605+ out.push_str(&ctx.indent());
1606+ out.push_str("</nav>");
1607+ out.push_str(ctx.nl());
13581608 return;
13591609 }
13601610 if elem.kind == ElementKind::Children {
@@ -1364,38 +1614,185 @@ fn generate_element(
13641614 return;
13651615 }
13661616 if elem.kind == ElementKind::Fragment {
1367− // Render children without a wrapper element, as if they were
1368− // written where the fragment is
1369− generate_children(&elem.children, parent, out, styles, ctx);
1617+ // Render children without a wrapper element
1618+ for child in &elem.children {
1619+ generate_node(child, parent_kind, out, styles, ctx);
1620+ }
13701621 return;
13711622 }
13721623
1373− let mut own = Flow::of(elem);
13741624 let tag = match &elem.kind {
1375− ElementKind::Row | ElementKind::El => "div",
1625+ ElementKind::Row
1626+ | ElementKind::Column
1627+ | ElementKind::El
1628+ | ElementKind::Grid
1629+ | ElementKind::Stack => "div",
13761630 ElementKind::Text => "span",
13771631 ElementKind::Paragraph => "p",
13781632 ElementKind::Link => "a",
1379− ElementKind::Tag(spec) => spec.html,
1633+ ElementKind::Button => "button",
1634+ ElementKind::Select => "select",
1635+ ElementKind::Textarea => "textarea",
1636+ ElementKind::Option => "option",
1637+ ElementKind::Label => "label",
1638+ // Semantic elements
1639+ ElementKind::Nav => "nav",
1640+ ElementKind::Header => "header",
1641+ ElementKind::Footer => "footer",
1642+ ElementKind::Main => "main",
1643+ ElementKind::Section => "section",
1644+ ElementKind::Article => "article",
1645+ ElementKind::Aside => "aside",
1646+ // List
1647+ ElementKind::List => {
1648+ if elem.attrs.iter().any(|a| a.key == "ordered") {
1649+ "ol"
1650+ } else {
1651+ "ul"
1652+ }
1653+ }
1654+ ElementKind::ListItem => "li",
1655+ // Table
1656+ ElementKind::Table => "table",
1657+ ElementKind::TableHead => "thead",
1658+ ElementKind::TableBody => "tbody",
1659+ ElementKind::TableRow => "tr",
1660+ ElementKind::TableCell => "td",
1661+ ElementKind::TableHeaderCell => "th",
1662+ // Media
1663+ ElementKind::Video => "video",
1664+ ElementKind::Audio => "audio",
1665+ // Additional semantic elements
1666+ ElementKind::Form => "form",
1667+ ElementKind::Details => "details",
1668+ ElementKind::Summary => "summary",
1669+ ElementKind::Blockquote => "blockquote",
1670+ ElementKind::Cite => "cite",
1671+ ElementKind::Code => "code",
1672+ ElementKind::Pre => "pre",
1673+ ElementKind::Figure => "figure",
1674+ ElementKind::FigCaption => "figcaption",
1675+ ElementKind::Progress => "progress",
1676+ ElementKind::Meter => "meter",
1677+ // New elements
1678+ ElementKind::Dialog => "dialog",
1679+ ElementKind::DefinitionList => "dl",
1680+ ElementKind::DefinitionTerm => "dt",
1681+ ElementKind::DefinitionDescription => "dd",
1682+ ElementKind::Fieldset => "fieldset",
1683+ ElementKind::Legend => "legend",
1684+ ElementKind::Picture => "picture",
1685+ ElementKind::Time => "time",
1686+ ElementKind::Mark => "mark",
1687+ ElementKind::Kbd => "kbd",
1688+ ElementKind::Abbr => "abbr",
1689+ ElementKind::Datalist => "datalist",
1690+ ElementKind::Iframe => "iframe",
1691+ ElementKind::Output => "output",
1692+ ElementKind::Canvas => "canvas",
1693+ ElementKind::Badge => "span",
1694+ ElementKind::Tooltip => "span",
1695+ ElementKind::Avatar => "div",
1696+ ElementKind::Carousel => "div",
1697+ ElementKind::Chip => "span",
1698+ ElementKind::Tag => "span",
1699+ ElementKind::Noscript => "noscript",
1700+ ElementKind::Address => "address",
1701+ ElementKind::Search => "search",
1702+ ElementKind::Image
1703+ | ElementKind::Input
1704+ | ElementKind::HorizontalRule
1705+ | ElementKind::Children
1706+ | ElementKind::Slot(_)
1707+ | ElementKind::Fragment
1708+ | ElementKind::Source
1709+ | ElementKind::Spacer
1710+ | ElementKind::Script
1711+ | ElementKind::Breadcrumb => unreachable!(),
1712+ };
1713+
1714+ let kind_label = match elem.kind {
1715+ ElementKind::Row => "row",
1716+ ElementKind::Column => "column",
1717+ ElementKind::El => "el",
1718+ ElementKind::Text => "text",
1719+ ElementKind::Paragraph => "paragraph",
1720+ ElementKind::Link => "link",
1721+ ElementKind::Button => "button",
1722+ ElementKind::Select => "select",
1723+ ElementKind::Textarea => "textarea",
1724+ ElementKind::Option => "option",
1725+ ElementKind::Label => "label",
1726+ ElementKind::Nav => "nav",
1727+ ElementKind::Header => "header",
1728+ ElementKind::Footer => "footer",
1729+ ElementKind::Main => "main",
1730+ ElementKind::Section => "section",
1731+ ElementKind::Article => "article",
1732+ ElementKind::Aside => "aside",
1733+ ElementKind::List => "list",
1734+ ElementKind::ListItem => "item",
1735+ ElementKind::Table => "table",
1736+ ElementKind::TableHead => "thead",
1737+ ElementKind::TableBody => "tbody",
1738+ ElementKind::TableRow => "tr",
1739+ ElementKind::TableCell => "td",
1740+ ElementKind::TableHeaderCell => "th",
1741+ ElementKind::Video => "video",
1742+ ElementKind::Audio => "audio",
1743+ ElementKind::Form => "form",
1744+ ElementKind::Details => "details",
1745+ ElementKind::Summary => "summary",
1746+ ElementKind::Blockquote => "blockquote",
1747+ ElementKind::Cite => "cite",
1748+ ElementKind::Code => "code",
1749+ ElementKind::Pre => "pre",
1750+ ElementKind::Figure => "figure",
1751+ ElementKind::FigCaption => "figcaption",
1752+ ElementKind::Fragment => "fragment",
1753+ ElementKind::Dialog => "dialog",
1754+ ElementKind::DefinitionList => "dl",
1755+ ElementKind::DefinitionTerm => "dt",
1756+ ElementKind::DefinitionDescription => "dd",
1757+ ElementKind::Fieldset => "fieldset",
1758+ ElementKind::Legend => "legend",
1759+ ElementKind::Picture => "picture",
1760+ ElementKind::Time => "time",
1761+ ElementKind::Mark => "mark",
1762+ ElementKind::Kbd => "kbd",
1763+ ElementKind::Abbr => "abbr",
1764+ ElementKind::Datalist => "datalist",
1765+ ElementKind::Iframe => "iframe",
1766+ ElementKind::Output => "output",
1767+ ElementKind::Canvas => "canvas",
1768+ ElementKind::Grid => "grid",
1769+ ElementKind::Stack => "stack",
1770+ ElementKind::Badge => "badge",
1771+ ElementKind::Tooltip => "tooltip",
1772+ ElementKind::Avatar => "avatar",
1773+ ElementKind::Carousel => "carousel",
1774+ ElementKind::Chip => "chip",
1775+ ElementKind::Tag => "tag",
1776+ ElementKind::Noscript => "noscript",
1777+ ElementKind::Address => "address",
1778+ ElementKind::Search => "search",
13801779 _ => "",
13811780 };
1382− // Inside text, htmlang's own `<div>` is a `<span>`, which text can
1383− // hold (directly in text, a row, column or grid is also laid out
1384− // inline: see `Site::inline`)
1385− let in_text = ctx.in_text || parent == Some(Layout::Text);
1386− let tag = if in_text && tag == "div" { "span" } else { tag };
1387− let kind_label = elem.kind.name();
13881781
13891782 // Track interactive elements for focus-visible CSS
1390− if elem.kind == ElementKind::Link
1391− || matches!(kind_label, "button" | "input" | "select" | "textarea")
1392− {
1783+ if matches!(
1784+ elem.kind,
1785+ ElementKind::Link
1786+ | ElementKind::Button
1787+ | ElementKind::Input
1788+ | ElementKind::Select
1789+ | ElementKind::Textarea
1790+ ) {
13931791 ctx.has_interactive = true;
13941792 }
13951793
13961794 // Compute CSS for each state and get a class name
1397− let gen_class = element_class(elem, &Site::new(elem, parent, &ctx.flow), styles);
1398− own.class = gen_class.clone();
1795+ let gen_class = compute_class(&elem.attrs, &elem.kind, parent_kind, styles);
13991796 let (id, user_class) = extract_id_class(&elem.attrs);
14001797
14011798 if ctx.dev && elem.line_num > 0 {
@@ -1409,9 +1806,95 @@ fn generate_element(
14091806 out.push('<');
14101807 out.push_str(tag);
14111808
1412− emit_argument_attr(out, elem, ctx.in_picture);
1809+ // @main gets id="hl-main" for skip-to-content link (unless user set an id)
1810+ if elem.kind == ElementKind::Main && id.is_none() {
1811+ out.push_str(" id=\"hl-main\"");
1812+ }
14131813
1414− emit_class_attr(out, gen_class.as_deref(), user_class.as_deref());
1814+ if elem.kind == ElementKind::Link
1815+ && let Some(url) = &elem.argument
1816+ {
1817+ out.push_str(" href=\"");
1818+ out.push_str(&html_escape(url));
1819+ out.push('"');
1820+ // Auto rel="noopener noreferrer" and target="_blank" for external links
1821+ let is_external = url.starts_with("http://") || url.starts_with("https://");
1822+ if is_external {
1823+ let has_rel = elem.attrs.iter().any(|a| a.key == "rel");
1824+ let has_target = elem.attrs.iter().any(|a| a.key == "target");
1825+ if !has_rel {
1826+ out.push_str(" rel=\"noopener noreferrer\"");
1827+ }
1828+ if !has_target {
1829+ out.push_str(" target=\"_blank\"");
1830+ }
1831+ }
1832+ }
1833+
1834+ // Video/Audio src
1835+ if matches!(elem.kind, ElementKind::Video | ElementKind::Audio)
1836+ && let Some(src) = &elem.argument
1837+ {
1838+ out.push_str(" src=\"");
1839+ out.push_str(&html_escape(src));
1840+ out.push('"');
1841+ }
1842+
1843+ // Form action
1844+ if elem.kind == ElementKind::Form
1845+ && let Some(action) = &elem.argument
1846+ {
1847+ out.push_str(" action=\"");
1848+ out.push_str(&html_escape(action));
1849+ out.push('"');
1850+ }
1851+
1852+ // Iframe src
1853+ if elem.kind == ElementKind::Iframe
1854+ && let Some(src) = &elem.argument
1855+ {
1856+ out.push_str(" src=\"");
1857+ out.push_str(&html_escape(src));
1858+ out.push('"');
1859+ }
1860+
1861+ // Tooltip title
1862+ if elem.kind == ElementKind::Tooltip
1863+ && let Some(text) = &elem.argument
1864+ {
1865+ out.push_str(" title=\"");
1866+ out.push_str(&html_escape(text));
1867+ out.push('"');
1868+ }
1869+
1870+ // Time datetime
1871+ if elem.kind == ElementKind::Time
1872+ && let Some(dt) = elem.attrs.iter().find(|a| a.key == "datetime")
1873+ && let Some(val) = &dt.value
1874+ {
1875+ out.push_str(" datetime=\"");
1876+ out.push_str(&html_escape(val));
1877+ out.push('"');
1878+ }
1879+
1880+ // Critical CSS: inline styles directly instead of using a class
1881+ let is_critical = elem.attrs.iter().any(|a| a.key == "critical");
1882+ if is_critical {
1883+ let inline_css = attrs_to_css(&elem.attrs, "", &elem.kind, parent_kind);
1884+ if !inline_css.is_empty() {
1885+ out.push_str(" style=\"");
1886+ out.push_str(&html_escape(&inline_css));
1887+ out.push('"');
1888+ }
1889+ // Still use class for non-base styles (pseudo, responsive, etc.)
1890+ if gen_class.as_deref().is_some_and(|c| !c.is_empty()) {
1891+ emit_class_attr(out, gen_class.as_deref(), user_class.as_deref());
1892+ } else if let Some(ref uc) = user_class {
1893+ emit_class_attr(out, None, Some(uc));
1894+ }
1895+ } else {
1896+ emit_class_attr(out, gen_class.as_deref(), user_class.as_deref());
1897+ }
14151898
14161899 if let Some(id) = id {
14171900 out.push_str(" id=\"");
@@ -1419,7 +1902,7 @@ fn generate_element(
14191902 out.push('"');
14201903 }
14211904
1422− emit_html_attrs(out, &elem.attrs);
1905+ emit_html_passthrough_attrs(out, &elem.attrs);
14231906
14241907 // Source map attributes in dev mode
14251908 if ctx.dev && elem.line_num > 0 {
@@ -1430,27 +1913,51 @@ fn generate_element(
14301913 }
14311914
14321915 out.push('>');
1433− // In `<pre>` and `<textarea>` every space and line break shows, so
1434− // readable (dev) output adds none there: a code sample's lines stay
1435− // exactly as written
1436− let outer_dev = ctx.dev;
1437− ctx.dev &= !matches!(tag, "pre" | "textarea");
14381916 out.push_str(ctx.nl());
14391917
1440− let layout = elem.kind.layout();
1918+ // Inline text argument
1919+ if matches!(
1920+ elem.kind,
1921+ ElementKind::Text
1922+ | ElementKind::Button
1923+ | ElementKind::Label
1924+ | ElementKind::Option
1925+ | ElementKind::Textarea
1926+ | ElementKind::ListItem
1927+ | ElementKind::TableCell
1928+ | ElementKind::TableHeaderCell
1929+ | ElementKind::Summary
1930+ | ElementKind::Cite
1931+ | ElementKind::Code
1932+ | ElementKind::FigCaption
1933+ | ElementKind::Legend
1934+ | ElementKind::DefinitionTerm
1935+ | ElementKind::Mark
1936+ | ElementKind::Kbd
1937+ | ElementKind::Abbr
1938+ | ElementKind::Time
1939+ | ElementKind::DefinitionDescription
1940+ | ElementKind::Badge
1941+ | ElementKind::Tooltip
1942+ | ElementKind::Chip
1943+ | ElementKind::Tag
1944+ ) && let Some(text) = &elem.argument
1945+ {
1946+ out.push_str(&html_escape(text));
1947+ }
1948+
1949+ // Children
14411950 ctx.depth += 1;
1442− let outer_in_text = ctx.in_text;
1443− ctx.in_text = in_text || layout == Layout::Text;
1444− let outer_flow = std::mem::replace(&mut ctx.flow, own);
1445− let outer_picture = std::mem::replace(&mut ctx.in_picture, elem.kind.is_tag("picture"));
1446− generate_children(&elem.children, Some(layout), out, styles, ctx);
1447− ctx.in_picture = outer_picture;
1448− ctx.flow = outer_flow;
1449− ctx.in_text = outer_in_text;
1951+ let is_paragraph = elem.kind == ElementKind::Paragraph;
1952+ for (i, child) in elem.children.iter().enumerate() {
1953+ generate_node(child, Some(&elem.kind), out, styles, ctx);
1954+ if is_paragraph && i < elem.children.len() - 1 {
1955+ out.push(' ');
1956+ }
1957+ }
14501958 ctx.depth -= 1;
14511959
14521960 out.push_str(&ctx.indent());
1453− ctx.dev = outer_dev;
14541961 out.push_str("</");
14551962 out.push_str(tag);
14561963 out.push('>');
@@ -1459,18 +1966,21 @@ fn generate_element(
14591966
14601967fn generate_self_closing(
14611968 elem: &Element,
1462− parent: Option<Layout>,
1969+ parent_kind: Option<&ElementKind>,
14631970 out: &mut String,
14641971 styles: &mut StyleCollector,
14651972 ctx: &mut GenContext,
14661973) {
1467− let gen_class = element_class(elem, &Site::new(elem, parent, &ctx.flow), styles);
1974+ let gen_class = compute_class(&elem.attrs, &elem.kind, parent_kind, styles);
14681975 let (id, user_class) = extract_id_class(&elem.attrs);
14691976
1470− let (tag, kind_label) = match &elem.kind {
1977+ let (tag, kind_label) = match elem.kind {
14711978 ElementKind::Image => ("img", "image"),
1472− ElementKind::Tag(spec) => (spec.html, spec.name),
1473− _ => unreachable!("not a void element: {:?}", elem.kind),
1979+ ElementKind::Input => ("input", "input"),
1980+ ElementKind::HorizontalRule => ("hr", "hr"),
1981+ ElementKind::Source => ("source", "source"),
1982+ ElementKind::Spacer => ("div", "spacer"),
1983+ _ => unreachable!(),
14741984 };
14751985
14761986 if ctx.dev && elem.line_num > 0 {
@@ -1483,7 +1993,43 @@ fn generate_self_closing(
14831993 out.push_str(&ctx.indent());
14841994 out.push('<');
14851995 out.push_str(tag);
1486− emit_argument_attr(out, elem, ctx.in_picture);
1996+
1997+ // Image src (with optional non-SVG base64 inlining)
1998+ if elem.kind == ElementKind::Image {
1999+ let src = elem.argument.as_deref().unwrap_or("");
2000+ let is_inline = elem.attrs.iter().any(|a| a.key == "inline");
2001+ if is_inline && !src.is_empty() && !src.ends_with(".svg") {
2002+ let mime = if src.ends_with(".png") {
2003+ "image/png"
2004+ } else if src.ends_with(".jpg") || src.ends_with(".jpeg") {
2005+ "image/jpeg"
2006+ } else if src.ends_with(".gif") {
2007+ "image/gif"
2008+ } else if src.ends_with(".webp") {
2009+ "image/webp"
2010+ } else if src.ends_with(".avif") {
2011+ "image/avif"
2012+ } else {
2013+ "application/octet-stream"
2014+ };
2015+ if let Ok(data) = std::fs::read(src) {
2016+ let b64 = base64_encode(&data);
2017+ out.push_str(" src=\"data:");
2018+ out.push_str(mime);
2019+ out.push_str(";base64,");
2020+ out.push_str(&b64);
2021+ out.push('"');
2022+ } else {
2023+ out.push_str(" src=\"");
2024+ out.push_str(&html_escape(src));
2025+ out.push('"');
2026+ }
2027+ } else {
2028+ out.push_str(" src=\"");
2029+ out.push_str(&html_escape(src));
2030+ out.push('"');
2031+ }
2032+ }
14872033
14882034 emit_class_attr(out, gen_class.as_deref(), user_class.as_deref());
14892035
@@ -1493,7 +2039,7 @@ fn generate_self_closing(
14932039 out.push('"');
14942040 }
14952041
1496− emit_html_attrs(out, &elem.attrs);
2042+ emit_html_passthrough_attrs(out, &elem.attrs);
14972043
14982044 // Source map attributes in dev mode (self-closing)
14992045 if ctx.dev && elem.line_num > 0 {
@@ -1503,6 +2049,93 @@ fn generate_self_closing(
15032049 ));
15042050 }
15052051
2052+ // Image optimization: auto-add loading="lazy" and decoding="async"
2053+ if elem.kind == ElementKind::Image {
2054+ // SVG inlining: @image [inline] logo.svg
2055+ if elem.attrs.iter().any(|a| a.key == "inline")
2056+ && let Some(src) = &elem.argument
2057+ && src.ends_with(".svg")
2058+ && let Ok(svg_content) = std::fs::read_to_string(src)
2059+ {
2060+ // Close the tag we opened, then emit inline SVG instead
2061+ out.truncate(out.rfind('<').unwrap_or(0));
2062+ out.push_str(&ctx.indent());
2063+ out.push_str(svg_content.trim());
2064+ out.push_str(ctx.nl());
2065+ return;
2066+ }
2067+ // Responsive srcset: @image photo.jpg [responsive 400 800 1200]
2068+ let responsive_attr = elem.attrs.iter().find(|a| a.key == "responsive");
2069+ if let Some(resp) = responsive_attr
2070+ && let Some(ref sizes_str) = resp.value
2071+ {
2072+ let widths: Vec<&str> = sizes_str.split_whitespace().collect();
2073+ if !widths.is_empty() {
2074+ let src = elem.argument.as_deref().unwrap_or("");
2075+ if !src.is_empty() {
2076+ // Generate srcset with width descriptors
2077+ // Convention: file-{width}.ext (e.g., photo-400.jpg)
2078+ let dot_pos = src.rfind('.').unwrap_or(src.len());
2079+ let base = &src[..dot_pos];
2080+ let ext = &src[dot_pos..];
2081+ let mut srcset_parts = Vec::new();
2082+ for w in &widths {
2083+ srcset_parts.push(format!("{}-{}{} {}w", base, w, ext, w));
2084+ }
2085+ out.push_str(" srcset=\"");
2086+ out.push_str(&srcset_parts.join(", "));
2087+ out.push('"');
2088+ // Generate sizes attribute
2089+ let max_width = widths.last().unwrap_or(&"100vw");
2090+ out.push_str(&format!(
2091+ " sizes=\"(max-width: {}px) 100vw, {}px\"",
2092+ max_width, max_width
2093+ ));
2094+ }
2095+ }
2096+ }
2097+
2098+ // Auto image dimensions: read local image file to inject width/height + aspect-ratio
2099+ let has_width = elem.attrs.iter().any(|a| a.key == "width");
2100+ let has_height = elem.attrs.iter().any(|a| a.key == "height");
2101+ if (!has_width || !has_height)
2102+ && let Some(ref src) = elem.argument
2103+ && !src.starts_with("http://")
2104+ && !src.starts_with("https://")
2105+ && !src.starts_with("data:")
2106+ && let Some((w, h)) = read_image_dimensions(src)
2107+ {
2108+ if !has_width {
2109+ out.push_str(&format!(" width=\"{}\"", w));
2110+ }
2111+ if !has_height {
2112+ out.push_str(&format!(" height=\"{}\"", h));
2113+ }
2114+ // Auto aspect-ratio to prevent CLS
2115+ if !elem.attrs.iter().any(|a| a.key == "aspect-ratio") {
2116+ out.push_str(&format!(" style=\"aspect-ratio:{}/{}\"", w, h));
2117+ }
2118+ }
2119+
2120+ // Smart image loading: first 3 images get fetchpriority="high" (above the fold),
2121+ // subsequent images get loading="lazy" + decoding="async"
2122+ ctx.image_count += 1;
2123+ if ctx.image_count <= 3 {
2124+ // Above-the-fold: eager loading with high priority
2125+ if !elem.attrs.iter().any(|a| a.key == "fetchpriority") {
2126+ out.push_str(" fetchpriority=\"high\"");
2127+ }
2128+ } else {
2129+ // Below-the-fold: lazy loading
2130+ if !elem.attrs.iter().any(|a| a.key == "loading") {
2131+ out.push_str(" loading=\"lazy\"");
2132+ }
2133+ if !elem.attrs.iter().any(|a| a.key == "decoding") {
2134+ out.push_str(" decoding=\"async\"");
2135+ }
2136+ }
2137+ }
2138+
15062139 out.push('>');
15072140 out.push_str(ctx.nl());
15082141}
@@ -1518,10 +2151,7 @@ fn generate_text_segments(
15182151 TextSegment::Plain(text) => out.push_str(&html_escape(text)),
15192152 TextSegment::Inline(elem) => {
15202153 let mut buf = String::new();
1521− // An element inside a line of text is in text
1522− let outer_flow = std::mem::take(&mut ctx.flow);
1523− generate_element(elem, Some(Layout::Text), &mut buf, styles, ctx);
1524− ctx.flow = outer_flow;
2154+ generate_element(elem, None, &mut buf, styles, ctx);
15252155 out.push_str(buf.trim_end());
15262156 }
15272157 }
@@ -1534,183 +2164,111 @@ fn generate_text_segments(
15342164
15352165fn compute_class(
15362166 attrs: &[Attribute],
1537− site: &Site,
2167+ kind: &ElementKind,
2168+ parent_kind: Option<&ElementKind>,
15382169 styles: &mut StyleCollector,
1539− distinct: String,
15402170) -> Option<String> {
1541− // Every condition an attribute is under, and none
1542− let mut conditions = vec![Condition::default()];
1543− for attr in attrs.iter().filter(|a| !a.html) {
1544− let (condition, _) = Condition::of(&attr.key);
1545− if !conditions.contains(&condition) {
1546− conditions.push(condition);
1547− }
1548− }
1549− // Dedupe: if a property is declared twice within a single rule, keep only
1550− // the last occurrence.
1551− let rules: Vec<(Condition, String)> = conditions
1552− .into_iter()
1553− .map(|condition| {
1554− let css = dedupe_declarations(&attrs_to_css(attrs, &condition, site));
1555− (condition, css)
1556− })
1557− .collect();
1558− // The kind's defaults, less what the element sets itself (a user
1559− // `[list-style disc]` wins over the default `list-style:none` anyway,
1560− // so there is no need to ship both)
1561− let own = rules
1562− .iter()
1563− .find(|(condition, _)| *condition == Condition::default())
1564− .map_or("", |(_, css)| css.as_str());
1565− let own: Vec<&str> = declarations(own).map(|(name, _)| name).collect();
1566− let defaults: String = declarations(&dedupe_declarations(&default_css(site)))
1567− .filter(|(name, _)| !own.contains(name))
1568− .map(|(_, declaration)| declaration)
1569− .collect();
1570− styles.get_class(defaults, rules, distinct)
1571−}
2171+ let base = attrs_to_css(attrs, "", kind, parent_kind);
15722172
1573−/// The defaults of an element's kind where it is: an overlay's positioning
1574−/// context, its layout, and its kind's own CSS (a heading's `margin:0`).
1575−fn default_css(site: &Site) -> String {
1576− let mut css = String::new();
1577− // Elements with @in-front / @behind children become positioning
1578− // contexts
1579− if site.has_overlay_children {
1580− css.push_str("position:relative;isolation:isolate;");
2173+ // Collect pseudo-state overrides
2174+ let mut pseudo = Vec::new();
2175+ for &(prefix, selector) in PSEUDO_PREFIXES {
2176+ let css = attrs_to_css(attrs, prefix, kind, parent_kind);
2177+ if !css.is_empty() {
2178+ pseudo.push((selector.to_string(), css));
2179+ }
15812180 }
1582− if !site.root {
1583− css.push_str(layout_css(site.kind.layout(), site.inline));
2181+
2182+ // Auto-add ::-webkit-scrollbar pseudo for no-scrollbar attribute
2183+ if attrs.iter().any(|a| a.key == "no-scrollbar") {
2184+ pseudo.push((
2185+ "::-webkit-scrollbar".to_string(),
2186+ "display:none;".to_string(),
2187+ ));
15842188 }
1585− css.push_str(site.kind.css());
1586− css
1587−}
15882189
1589−/// The declarations of a rule body, as (property, `property:value;`), for
1590−/// bodies htmlang wrote: every declaration ends in `;`, and a `;` inside
1591−/// quotes or parentheses doesn't end one.
1592−fn declarations(css: &str) -> impl Iterator<Item = (&str, &str)> {
1593− let mut rest = css;
1594− std::iter::from_fn(move || {
1595− if rest.is_empty() {
1596− return None;
1597− }
1598− let (mut depth, mut quote, mut escaped) = (0i32, None, false);
1599− let mut end = rest.len();
1600− for (i, c) in rest.char_indices() {
1601− match c {
1602− _ if escaped => escaped = false,
1603− '\\' => escaped = true,
1604− c if Some(c) == quote => quote = None,
1605− _ if quote.is_some() => {}
1606− '"' | '\'' => quote = Some(c),
1607− '(' => depth += 1,
1608− ')' => depth -= 1,
1609− ';' if depth == 0 => {
1610− end = i + 1;
1611− break;
2190+ // Collect nth:EXPR: dynamic pseudo selectors
2191+ let mut nth_prefixes: Vec<String> = Vec::new();
2192+ for attr in attrs {
2193+ if attr.key.starts_with("nth:") {
2194+ let rest = &attr.key[4..];
2195+ if let Some(colon_pos) = rest.find(':') {
2196+ let prefix = format!("nth:{}:", &rest[..colon_pos]);
2197+ if !nth_prefixes.contains(&prefix) {
2198+ nth_prefixes.push(prefix);
16122199 }
1613− _ => {}
16142200 }
16152201 }
1616− let (declaration, after) = rest.split_at(end);
1617− rest = after;
1618− let name = declaration.split(':').next().unwrap_or("").trim();
1619− Some((name, declaration))
1620− })
1621−}
2202+ }
2203+ for prefix in &nth_prefixes {
2204+ let expr = &prefix[4..prefix.len() - 1];
2205+ let selector = format!(":nth-child({})", expr);
2206+ let css = attrs_to_css(attrs, prefix, kind, parent_kind);
2207+ if !css.is_empty() {
2208+ pseudo.push((selector, css));
2209+ }
2210+ }
16222211
1623−/// Dedupe CSS declarations within a single rule body: for any property
1624−/// declared more than once, keep only the last occurrence. Unparseable
1625−/// segments (no `:`) are preserved as-is. Semicolons inside parentheses or
1626−/// quoted strings are treated as part of a value, not as declaration
1627−/// separators.
1628−fn dedupe_declarations(css: &str) -> String {
1629− if css.is_empty() {
1630− return String::new();
1631− }
1632− // Quick path: no chance of duplicates if there's fewer than 2 declarations.
1633− if css.matches(';').count() < 2 {
1634− return css.to_string();
1635− }
1636−
1637− // Split into (property_name_opt, full_decl_with_semi) preserving whatever
1638− // terminator the input used. We split on `;` at depth 0 (ignoring parens).
1639− let mut decls: Vec<(Option<String>, String)> = Vec::new();
1640− let mut current = String::new();
1641− let mut depth: i32 = 0;
1642− // A quoted string's `;` (`content "a;b"`) is text; a backslash escapes
1643− // the character after it
1644− let mut quote: Option<char> = None;
1645− let mut escaped = false;
1646− for ch in css.chars() {
1647− if escaped {
1648− escaped = false;
1649− current.push(ch);
1650− } else if ch == '\\' {
1651− escaped = true;
1652− current.push(ch);
1653− } else if let Some(q) = quote {
1654− if ch == q {
1655− quote = None;
1656− }
1657− current.push(ch);
1658− } else if ch == '"' || ch == '\'' {
1659− quote = Some(ch);
1660− current.push(ch);
1661− } else if ch == '(' {
1662− depth += 1;
1663− current.push(ch);
1664− } else if ch == ')' {
1665− depth -= 1;
1666− current.push(ch);
1667− } else if ch == ';' && depth == 0 {
1668− current.push(';');
1669− let trimmed = current.trim();
1670− if !trimmed.is_empty() && trimmed != ";" {
1671− let prop = trimmed
1672− .trim_end_matches(';')
1673− .split_once(':')
1674− .map(|(p, _)| p.trim().to_ascii_lowercase());
1675− decls.push((prop, std::mem::take(&mut current)));
1676− } else {
1677− current.clear();
2212+ // Collect has(...): dynamic pseudo selectors
2213+ let mut has_prefixes: Vec<String> = Vec::new();
2214+ for attr in attrs {
2215+ if attr.key.starts_with("has(")
2216+ && let Some(close) = attr.key.find("):")
2217+ {
2218+ let prefix = format!("{}:", &attr.key[..close + 1]);
2219+ if !has_prefixes.contains(&prefix) {
2220+ has_prefixes.push(prefix);
16782221 }
1679− } else {
1680− current.push(ch);
16812222 }
16822223 }
1683− if !current.trim().is_empty() {
1684− let prop = current
1685− .split_once(':')
1686− .map(|(p, _)| p.trim().to_ascii_lowercase());
1687− decls.push((prop, std::mem::take(&mut current)));
1688− }
1689−
1690− if decls.len() < 2 {
1691− return css.to_string();
2224+ for prefix in &has_prefixes {
2225+ let inner = &prefix[4..prefix.len() - 2]; // extract selector from has(selector):
2226+ let selector = format!(":has({})", inner);
2227+ let css = attrs_to_css(attrs, prefix, kind, parent_kind);
2228+ if !css.is_empty() {
2229+ pseudo.push((selector, css));
2230+ }
16922231 }
16932232
1694− // Find index of last occurrence of each property.
1695− use std::collections::HashMap;
1696− let mut last: HashMap<String, usize> = HashMap::new();
1697− for (i, (prop, _)) in decls.iter().enumerate() {
1698− if let Some(p) = prop {
1699− last.insert(p.clone(), i);
2233+ // Collect responsive overrides
2234+ let mut responsive = Vec::new();
2235+ for &(bp_name, _) in BREAKPOINTS {
2236+ let prefix = format!("{}:", bp_name);
2237+ let css = attrs_to_css(attrs, &prefix, kind, parent_kind);
2238+ if !css.is_empty() {
2239+ responsive.push((bp_name.to_string(), css));
17002240 }
17012241 }
17022242
1703− let mut out = String::with_capacity(css.len());
1704− for (i, (prop, raw)) in decls.iter().enumerate() {
1705− let keep = match prop {
1706− Some(p) => last.get(p) == Some(&i),
1707− None => true,
1708− };
1709− if keep {
1710− out.push_str(raw);
2243+ // Collect container query overrides
2244+ let mut container = Vec::new();
2245+ for &(bp_name, _) in BREAKPOINTS {
2246+ let prefix = format!("cq-{}:", bp_name);
2247+ let css = attrs_to_css(attrs, &prefix, kind, parent_kind);
2248+ if !css.is_empty() {
2249+ container.push((bp_name.to_string(), css));
17112250 }
17122251 }
1713− out
2252+
2253+ let dark = attrs_to_css(attrs, "dark:", kind, parent_kind);
2254+ let print = attrs_to_css(attrs, "print:", kind, parent_kind);
2255+ let motion_safe = attrs_to_css(attrs, "motion-safe:", kind, parent_kind);
2256+ let motion_reduce = attrs_to_css(attrs, "motion-reduce:", kind, parent_kind);
2257+ let landscape = attrs_to_css(attrs, "landscape:", kind, parent_kind);
2258+ let portrait = attrs_to_css(attrs, "portrait:", kind, parent_kind);
2259+
2260+ styles.get_class(
2261+ base,
2262+ pseudo,
2263+ responsive,
2264+ dark,
2265+ print,
2266+ motion_safe,
2267+ motion_reduce,
2268+ landscape,
2269+ portrait,
2270+ container,
2271+ )
17142272}
17152273
17162274fn emit_class_attr(out: &mut String, gen_class: Option<&str>, user_class: Option<&str>) {
@@ -1740,578 +2298,1201 @@ fn emit_class_attr(out: &mut String, gen_class: Option<&str>, user_class: Option
17402298// Attribute → CSS mapping
17412299// ---------------------------------------------------------------------------
17422300
1743−/// Where an element is written, which its CSS depends on.
1744−struct Site<'a> {
1745− kind: &'a ElementKind,
1746− /// How its parent lays out its children: its `width fill`, `height
1747− /// fill` and `shrink` compile against it.
1748− parent: &'a Flow,
1749− /// It has `@in-front` / `@behind` children.
1750− has_overlay_children: bool,
1751− /// A row, column or grid inside text, laid out inline.
1752− inline: bool,
1753− /// The page's `<body>`, which the reset already makes a column.
1754− root: bool,
2301+/// (htmlang prefix, CSS selector suffix)
2302+const PSEUDO_PREFIXES: &[(&str, &str)] = &[
2303+ ("hover:", ":hover"),
2304+ ("active:", ":active"),
2305+ ("focus:", ":focus"),
2306+ ("focus-visible:", ":focus-visible"),
2307+ ("focus-within:", ":focus-within"),
2308+ ("disabled:", ":disabled"),
2309+ ("checked:", ":checked"),
2310+ ("placeholder:", "::placeholder"),
2311+ ("first:", ":first-child"),
2312+ ("last:", ":last-child"),
2313+ ("odd:", ":nth-child(odd)"),
2314+ ("even:", ":nth-child(even)"),
2315+ ("before:", "::before"),
2316+ ("after:", "::after"),
2317+ ("selection:", "::selection"),
2318+ ("visited:", ":visited"),
2319+ ("empty:", ":empty"),
2320+ ("target:", ":target"),
2321+ ("valid:", ":valid"),
2322+ ("invalid:", ":invalid"),
2323+];
2324+const RESPONSIVE_PREFIXES: &[&str] = &["sm:", "md:", "lg:", "xl:", "2xl:"];
2325+const MEDIA_PREFIXES: &[&str] = &[
2326+ "dark:",
2327+ "print:",
2328+ "motion-safe:",
2329+ "motion-reduce:",
2330+ "landscape:",
2331+ "portrait:",
2332+];
2333+const CONTAINER_QUERY_PREFIXES: &[&str] = &["cq-sm:", "cq-md:", "cq-lg:", "cq-xl:", "cq-2xl:"];
2334+
2335+fn is_prefixed_attr(key: &str) -> bool {
2336+ PSEUDO_PREFIXES.iter().any(|&(p, _)| key.starts_with(p))
2337+ || RESPONSIVE_PREFIXES.iter().any(|p| key.starts_with(p))
2338+ || MEDIA_PREFIXES.iter().any(|p| key.starts_with(p))
2339+ || CONTAINER_QUERY_PREFIXES.iter().any(|p| key.starts_with(p))
2340+ || key.starts_with("nth:")
2341+ || key.starts_with("has(")
17552342}
17562343
1757−impl Site<'_> {
1758− /// Where an element in a parent with the layout `layout` and the flow
1759− /// `parent` is.
1760− fn new<'a>(elem: &'a Element, layout: Option<Layout>, parent: &'a Flow) -> Site<'a> {
1761− Site {
1762− kind: &elem.kind,
1763− parent,
1764− has_overlay_children: has_overlay_children(elem),
1765− inline: layout == Some(Layout::Text) && elem.kind.layout().is_container(),
1766− root: false,
2344+fn attrs_to_css(
2345+ attrs: &[Attribute],
2346+ state_prefix: &str,
2347+ kind: &ElementKind,
2348+ parent_kind: Option<&ElementKind>,
2349+) -> String {
2350+ let mut css = String::new();
2351+
2352+ // Base element styles only for the default (non-state) pass
2353+ if state_prefix.is_empty() {
2354+ match kind {
2355+ ElementKind::Row => css.push_str("display:flex;flex-direction:row;"),
2356+ ElementKind::Column => css.push_str("display:flex;flex-direction:column;"),
2357+ ElementKind::El => css.push_str("display:flex;flex-direction:column;"),
2358+ ElementKind::Paragraph => css.push_str("margin:0;"),
2359+ // Semantic elements get flex column layout like @el
2360+ ElementKind::Nav | ElementKind::Header | ElementKind::Footer
2361+ | ElementKind::Main | ElementKind::Section | ElementKind::Article
2362+ | ElementKind::Aside => css.push_str("display:flex;flex-direction:column;"),
2363+ // Lists: reset browser defaults
2364+ ElementKind::List => css.push_str("margin:0;padding-left:0;list-style:none;"),
2365+ ElementKind::ListItem => css.push_str("display:flex;flex-direction:column;"),
2366+ // Form: flex column like @el
2367+ ElementKind::Form => css.push_str("display:flex;flex-direction:column;"),
2368+ // Details: flex column
2369+ ElementKind::Details => css.push_str("display:flex;flex-direction:column;"),
2370+ // Figure: flex column
2371+ ElementKind::Figure => css.push_str("display:flex;flex-direction:column;margin:0;"),
2372+ // Blockquote: flex column, reset browser margin
2373+ ElementKind::Blockquote => css.push_str("display:flex;flex-direction:column;margin:0;"),
2374+ // Pre: preserve whitespace
2375+ ElementKind::Pre => css.push_str("margin:0;white-space:pre;font-family:ui-monospace,monospace;"),
2376+ // Code: monospace font
2377+ ElementKind::Code => css.push_str("font-family:ui-monospace,monospace;"),
2378+ // New elements
2379+ ElementKind::Dialog => css.push_str("display:flex;flex-direction:column;"),
2380+ ElementKind::DefinitionList => css.push_str("margin:0;"),
2381+ ElementKind::DefinitionDescription => css.push_str("margin:0;display:flex;flex-direction:column;"),
2382+ ElementKind::Fieldset => css.push_str("display:flex;flex-direction:column;border:1px solid currentColor;padding:0.5em;margin:0;"),
2383+ ElementKind::Kbd => css.push_str("font-family:ui-monospace,monospace;"),
2384+ ElementKind::Grid => css.push_str("display:grid;"),
2385+ ElementKind::Stack => css.push_str("position:relative;"),
2386+ ElementKind::Badge => css.push_str("display:inline-flex;align-items:center;justify-content:center;padding:2px 8px;border-radius:9999px;font-size:0.75rem;font-weight:600;line-height:1;"),
2387+ ElementKind::Tooltip => css.push_str("position:relative;cursor:help;"),
2388+ ElementKind::Spacer => css.push_str("flex:1;"),
2389+ ElementKind::Avatar => css.push_str("display:inline-flex;align-items:center;justify-content:center;border-radius:9999px;overflow:hidden;flex-shrink:0;"),
2390+ ElementKind::Carousel => css.push_str("display:flex;flex-direction:row;overflow-x:auto;scroll-snap-type:x mandatory;-webkit-overflow-scrolling:touch;scrollbar-width:none;"),
2391+ ElementKind::Chip => css.push_str("display:inline-flex;align-items:center;gap:4px;padding:4px 12px;border-radius:9999px;font-size:0.875rem;border:1px solid currentColor;"),
2392+ ElementKind::Tag => css.push_str("display:inline-flex;align-items:center;padding:2px 8px;border-radius:4px;font-size:0.75rem;font-weight:600;"),
2393+ _ => {}
2394+ }
2395+ // Children of @carousel get scroll-snap-align and flex-shrink
2396+ if matches!(parent_kind, Some(ElementKind::Carousel)) {
2397+ css.push_str("scroll-snap-align:start;flex-shrink:0;");
17672398 }
17682399 }
1769−}
17702400
1771−// ---------------------------------------------------------------------------
1772−// Direction: what a child's `fill` and `shrink` compile against
1773−// ---------------------------------------------------------------------------
2401+ for attr in attrs {
2402+ // Determine the effective key for this pass
2403+ let effective_key = if state_prefix.is_empty() {
2404+ if is_prefixed_attr(&attr.key) {
2405+ continue;
2406+ }
2407+ attr.key.as_str()
2408+ } else {
2409+ match attr.key.strip_prefix(state_prefix) {
2410+ Some(k) => k,
2411+ None => continue,
2412+ }
2413+ };
17742414
1775−/// The way a flex row or column lays out its children.
1776−#[derive(Clone, Copy, PartialEq, Eq, Debug)]
1777−enum Axis {
1778− Row,
1779− Column,
1780−}
2415+ let val = attr.value.as_deref();
17812416
1782−impl Axis {
1783− /// The direction a `flex-direction` or `flex-flow` value sets, if it
1784− /// names one (not `var(--dir)`, which only the browser knows).
1785− fn of_value(value: &str) -> Option<Axis> {
1786− value.split_whitespace().find_map(|word| match word {
1787− "row" | "row-reverse" => Some(Axis::Row),
1788− "column" | "column-reverse" => Some(Axis::Column),
1789− _ => None,
1790− })
1791− }
1792−}
2417+ match effective_key {
2418+ // Layout
2419+ "spacing" | "gap" => {
2420+ if let Some(v) = val {
2421+ push_css(&mut css, "gap", &css_px(v));
2422+ }
2423+ }
2424+ "padding" => {
2425+ if let Some(v) = val {
2426+ push_css(&mut css, "padding", &css_px_multi(v));
2427+ }
2428+ }
2429+ "padding-x" => {
2430+ if let Some(v) = val {
2431+ push_css(&mut css, "padding-left", &css_px(v));
2432+ push_css(&mut css, "padding-right", &css_px(v));
2433+ }
2434+ }
2435+ "padding-y" => {
2436+ if let Some(v) = val {
2437+ push_css(&mut css, "padding-top", &css_px(v));
2438+ push_css(&mut css, "padding-bottom", &css_px(v));
2439+ }
2440+ }
17932441
1794−/// How an element lays out its children, as its CSS sets it: the
1795−/// direction its children's `width`/`height` `fill` and `shrink` compile
1796−/// against. That is the direction of `@row` or of a column, or the one its
1797−/// own `flex-direction` (or `flex-flow`) sets, with or without media or
1798−/// container prefixes. Like elm-ui's `.r > .wf`, the rules for a direction
1799−/// set under a prefix are keyed on the element's class: `@media (...) {
1800−/// :where(.a)>.b {...} }`.
1801−#[derive(Clone, Default)]
1802−struct Flow {
1803− /// Without a prefix; `None` when the element isn't a flex row or column
1804− /// (a grid, text, HTML's own layout, the top of the page)
1805− base: Option<Axis>,
1806− /// The direction under each chain of at-rule prefixes that sets one, in
1807− /// the order their blocks are written
1808− changes: Vec<(Vec<usize>, Axis)>,
1809− /// The element's generated class, which the rules for the changes are
1810− /// keyed on
1811− class: Option<String>,
1812−}
2442+ // Sizing
2443+ "width" => {
2444+ if let Some(v) = val {
2445+ match v {
2446+ "fill" => match parent_kind {
2447+ Some(ElementKind::Row) => {
2448+ push_css(&mut css, "flex", "1");
2449+ push_css(&mut css, "min-width", "0");
2450+ }
2451+ _ => push_css(&mut css, "width", "100%"),
2452+ },
2453+ "shrink" => push_css(&mut css, "flex-shrink", "0"),
2454+ _ => push_css(&mut css, "width", &css_px(v)),
2455+ }
2456+ }
2457+ }
2458+ "height" => {
2459+ if let Some(v) = val {
2460+ match v {
2461+ "fill" => match parent_kind {
2462+ Some(ElementKind::Column) => {
2463+ push_css(&mut css, "flex", "1");
2464+ push_css(&mut css, "min-height", "0");
2465+ }
2466+ _ => push_css(&mut css, "height", "100%"),
2467+ },
2468+ "shrink" => push_css(&mut css, "flex-shrink", "0"),
2469+ _ => push_css(&mut css, "height", &css_px(v)),
2470+ }
2471+ }
2472+ }
2473+ "min-width" => {
2474+ if let Some(v) = val {
2475+ push_css(&mut css, "min-width", &css_px(v));
2476+ }
2477+ }
2478+ "max-width" => {
2479+ if let Some(v) = val {
2480+ push_css(&mut css, "max-width", &css_px(v));
2481+ }
2482+ }
2483+ "min-height" => {
2484+ if let Some(v) = val {
2485+ push_css(&mut css, "min-height", &css_px(v));
2486+ }
2487+ }
2488+ "max-height" => {
2489+ if let Some(v) = val {
2490+ push_css(&mut css, "max-height", &css_px(v));
2491+ }
2492+ }
18132493
1814−impl Flow {
1815− fn of(elem: &Element) -> Flow {
1816− let mut base = match elem.kind.layout() {
1817− Layout::Row => Axis::Row,
1818− Layout::Column => Axis::Column,
1819− _ => return Flow::default(),
1820− };
1821− let mut changes: Vec<(Vec<usize>, Axis)> = Vec::new();
1822− for attr in elem.attrs.iter().filter(|a| !a.html) {
1823− let (condition, name) = Condition::of(&attr.key);
1824− if !matches!(name, "flex-direction" | "flex-flow") || !condition.selector.is_empty() {
1825− continue;
2494+ // Alignment
2495+ "center-x" => match parent_kind {
2496+ Some(ElementKind::Column) | Some(ElementKind::El) => {
2497+ push_css(&mut css, "align-self", "center");
2498+ }
2499+ _ => {
2500+ push_css(&mut css, "margin-left", "auto");
2501+ push_css(&mut css, "margin-right", "auto");
2502+ }
2503+ },
2504+ "center-y" => match parent_kind {
2505+ Some(ElementKind::Row) => push_css(&mut css, "align-self", "center"),
2506+ _ => {
2507+ push_css(&mut css, "margin-top", "auto");
2508+ push_css(&mut css, "margin-bottom", "auto");
2509+ }
2510+ },
2511+ "align-left" => match parent_kind {
2512+ Some(ElementKind::Column) | Some(ElementKind::El) => {
2513+ push_css(&mut css, "align-self", "flex-start");
2514+ }
2515+ _ => push_css(&mut css, "margin-right", "auto"),
2516+ },
2517+ "align-right" => match parent_kind {
2518+ Some(ElementKind::Column) | Some(ElementKind::El) => {
2519+ push_css(&mut css, "align-self", "flex-end");
2520+ }
2521+ _ => push_css(&mut css, "margin-left", "auto"),
2522+ },
2523+ "align-top" => match parent_kind {
2524+ Some(ElementKind::Row) => push_css(&mut css, "align-self", "flex-start"),
2525+ _ => push_css(&mut css, "margin-bottom", "auto"),
2526+ },
2527+ "align-bottom" => match parent_kind {
2528+ Some(ElementKind::Row) => push_css(&mut css, "align-self", "flex-end"),
2529+ _ => push_css(&mut css, "margin-top", "auto"),
2530+ },
2531+
2532+ // Style
2533+ "background" => {
2534+ if let Some(v) = val {
2535+ push_css(&mut css, "background", v);
2536+ }
2537+ }
2538+ "color" => {
2539+ if let Some(v) = val {
2540+ push_css(&mut css, "color", v);
2541+ }
2542+ }
2543+ "border" => {
2544+ if let Some(v) = val {
2545+ let parts: Vec<&str> = v.splitn(2, ' ').collect();
2546+ if parts.len() == 2 {
2547+ push_css(
2548+ &mut css,
2549+ "border",
2550+ &format!("{} solid {}", css_px(parts[0]), parts[1]),
2551+ );
2552+ } else {
2553+ push_css(
2554+ &mut css,
2555+ "border",
2556+ &format!("{} solid currentColor", css_px(parts[0])),
2557+ );
2558+ }
2559+ }
2560+ }
2561+ "border-top" | "border-bottom" | "border-left" | "border-right" => {
2562+ if let Some(v) = val {
2563+ let parts: Vec<&str> = v.splitn(2, ' ').collect();
2564+ if parts.len() == 2 {
2565+ push_css(
2566+ &mut css,
2567+ effective_key,
2568+ &format!("{} solid {}", css_px(parts[0]), parts[1]),
2569+ );
2570+ } else {
2571+ push_css(
2572+ &mut css,
2573+ effective_key,
2574+ &format!("{} solid currentColor", css_px(parts[0])),
2575+ );
2576+ }
2577+ }
2578+ }
2579+ "rounded" => {
2580+ if let Some(v) = val {
2581+ push_css(&mut css, "border-radius", &css_px(v));
2582+ }
2583+ }
2584+ "bold" => push_css(&mut css, "font-weight", "bold"),
2585+ "italic" => push_css(&mut css, "font-style", "italic"),
2586+ "underline" => push_css(&mut css, "text-decoration", "underline"),
2587+ "size" => {
2588+ if let Some(v) = val {
2589+ push_css(&mut css, "font-size", &css_px(v));
2590+ }
2591+ }
2592+ "font" => {
2593+ if let Some(v) = val {
2594+ push_css(&mut css, "font-family", v);
2595+ }
2596+ }
2597+ "transition" => {
2598+ if let Some(v) = val {
2599+ push_css(&mut css, "transition", v);
2600+ }
2601+ }
2602+ "cursor" => {
2603+ if let Some(v) = val {
2604+ push_css(&mut css, "cursor", v);
2605+ }
2606+ }
2607+ "opacity" => {
2608+ if let Some(v) = val {
2609+ push_css(&mut css, "opacity", v);
2610+ }
2611+ }
2612+
2613+ // Typography
2614+ "text-align" => {
2615+ if let Some(v) = val {
2616+ push_css(&mut css, "text-align", v);
2617+ }
2618+ }
2619+ "line-height" => {
2620+ if let Some(v) = val {
2621+ push_css(&mut css, "line-height", v);
2622+ }
2623+ }
2624+ "letter-spacing" => {
2625+ if let Some(v) = val {
2626+ push_css(&mut css, "letter-spacing", &css_px(v));
2627+ }
2628+ }
2629+ "text-transform" => {
2630+ if let Some(v) = val {
2631+ push_css(&mut css, "text-transform", v);
2632+ }
2633+ }
2634+ "white-space" => {
2635+ if let Some(v) = val {
2636+ push_css(&mut css, "white-space", v);
2637+ }
2638+ }
2639+
2640+ // Overflow & positioning
2641+ "overflow" => {
2642+ if let Some(v) = val {
2643+ push_css(&mut css, "overflow", v);
2644+ }
2645+ }
2646+ "position" => {
2647+ if let Some(v) = val {
2648+ push_css(&mut css, "position", v);
2649+ }
2650+ }
2651+ "top" => {
2652+ if let Some(v) = val {
2653+ push_css(&mut css, "top", &css_px(v));
2654+ }
2655+ }
2656+ "right" => {
2657+ if let Some(v) = val {
2658+ push_css(&mut css, "right", &css_px(v));
2659+ }
2660+ }
2661+ "bottom" => {
2662+ if let Some(v) = val {
2663+ push_css(&mut css, "bottom", &css_px(v));
2664+ }
2665+ }
2666+ "left" => {
2667+ if let Some(v) = val {
2668+ push_css(&mut css, "left", &css_px(v));
2669+ }
2670+ }
2671+ "z-index" => {
2672+ if let Some(v) = val {
2673+ push_css(&mut css, "z-index", v);
2674+ }
2675+ }
2676+
2677+ // Display & visibility
2678+ "display" => {
2679+ if let Some(v) = val {
2680+ push_css(&mut css, "display", v);
2681+ }
2682+ }
2683+ "visibility" => {
2684+ if let Some(v) = val {
2685+ push_css(&mut css, "visibility", v);
2686+ }
2687+ }
2688+ "hidden" => push_css(&mut css, "display", "none"),
2689+
2690+ // Transform & filters
2691+ "transform" => {
2692+ if let Some(v) = val {
2693+ push_css(&mut css, "transform", v);
2694+ }
2695+ }
2696+ "backdrop-filter" => {
2697+ if let Some(v) = val {
2698+ push_css(&mut css, "backdrop-filter", v);
2699+ }
2700+ }
2701+
2702+ // Effects
2703+ "shadow" => {
2704+ if let Some(v) = val {
2705+ push_css(&mut css, "box-shadow", v);
2706+ }
2707+ }
2708+
2709+ // Flow
2710+ "wrap" => push_css(&mut css, "flex-wrap", "wrap"),
2711+ "gap-x" => {
2712+ if let Some(v) = val {
2713+ push_css(&mut css, "column-gap", &css_px(v));
2714+ }
2715+ }
2716+ "gap-y" => {
2717+ if let Some(v) = val {
2718+ push_css(&mut css, "row-gap", &css_px(v));
2719+ }
2720+ }
2721+
2722+ // Grid
2723+ "grid" => {
2724+ push_css(&mut css, "display", "grid");
2725+ }
2726+ "grid-cols" => {
2727+ if let Some(v) = val {
2728+ if let Ok(n) = v.parse::<u32>() {
2729+ push_css(
2730+ &mut css,
2731+ "grid-template-columns",
2732+ &format!("repeat({},1fr)", n),
2733+ );
2734+ } else {
2735+ push_css(&mut css, "grid-template-columns", v);
2736+ }
2737+ }
2738+ }
2739+ "grid-rows" => {
2740+ if let Some(v) = val {
2741+ if let Ok(n) = v.parse::<u32>() {
2742+ push_css(
2743+ &mut css,
2744+ "grid-template-rows",
2745+ &format!("repeat({},1fr)", n),
2746+ );
2747+ } else {
2748+ push_css(&mut css, "grid-template-rows", v);
2749+ }
2750+ }
2751+ }
2752+ "col-span" => {
2753+ if let Some(v) = val {
2754+ push_css(&mut css, "grid-column", &format!("span {}", v));
2755+ }
2756+ }
2757+ "row-span" => {
2758+ if let Some(v) = val {
2759+ push_css(&mut css, "grid-row", &format!("span {}", v));
2760+ }
2761+ }
2762+
2763+ // Animation
2764+ "animation" => {
2765+ if let Some(v) = val {
2766+ push_css(&mut css, "animation", v);
2767+ }
2768+ }
2769+
2770+ // Aspect ratio
2771+ "aspect-ratio" => {
2772+ if let Some(v) = val {
2773+ push_css(&mut css, "aspect-ratio", v);
2774+ }
2775+ }
2776+
2777+ // CSS containment for rendering performance
2778+ "contain" => {
2779+ if let Some(v) = val {
2780+ push_css(&mut css, "contain", v);
2781+ } else {
2782+ push_css(&mut css, "contain", "layout style paint");
2783+ }
2784+ }
2785+ "content-visibility" => {
2786+ if let Some(v) = val {
2787+ push_css(&mut css, "content-visibility", v);
2788+ } else {
2789+ push_css(&mut css, "content-visibility", "auto");
2790+ }
2791+ }
2792+
2793+ // Outline (like border but doesn't affect layout)
2794+ "outline" => {
2795+ if let Some(v) = val {
2796+ let parts: Vec<&str> = v.splitn(2, ' ').collect();
2797+ if parts.len() == 2 {
2798+ push_css(
2799+ &mut css,
2800+ "outline",
2801+ &format!("{} solid {}", css_px(parts[0]), parts[1]),
2802+ );
2803+ } else {
2804+ push_css(
2805+ &mut css,
2806+ "outline",
2807+ &format!("{} solid currentColor", css_px(parts[0])),
2808+ );
2809+ }
2810+ }
2811+ }
2812+
2813+ // Logical properties (i18n-aware)
2814+ "padding-inline" => {
2815+ if let Some(v) = val {
2816+ push_css(&mut css, "padding-inline", &css_px_multi(v));
2817+ }
2818+ }
2819+ "padding-block" => {
2820+ if let Some(v) = val {
2821+ push_css(&mut css, "padding-block", &css_px_multi(v));
2822+ }
2823+ }
2824+ "margin-inline" => {
2825+ if let Some(v) = val {
2826+ push_css(&mut css, "margin-inline", &css_px_multi(v));
2827+ }
2828+ }
2829+ "margin-block" => {
2830+ if let Some(v) = val {
2831+ push_css(&mut css, "margin-block", &css_px_multi(v));
2832+ }
2833+ }
2834+
2835+ // Logical property start/end variants
2836+ "padding-inline-start"
2837+ | "padding-inline-end"
2838+ | "padding-block-start"
2839+ | "padding-block-end"
2840+ | "margin-inline-start"
2841+ | "margin-inline-end"
2842+ | "margin-block-start"
2843+ | "margin-block-end" => {
2844+ if let Some(v) = val {
2845+ push_css(&mut css, effective_key, &css_px(v));
2846+ }
2847+ }
2848+
2849+ // Logical inset
2850+ "inset-inline" | "inset-block" => {
2851+ if let Some(v) = val {
2852+ push_css(&mut css, effective_key, &css_px_multi(v));
2853+ }
2854+ }
2855+ "inset-inline-start" | "inset-inline-end" | "inset-block-start" | "inset-block-end" => {
2856+ if let Some(v) = val {
2857+ push_css(&mut css, effective_key, &css_px(v));
2858+ }
2859+ }
2860+
2861+ // Logical border
2862+ "border-inline"
2863+ | "border-block"
2864+ | "border-inline-start"
2865+ | "border-inline-end"
2866+ | "border-block-start"
2867+ | "border-block-end" => {
2868+ if let Some(v) = val {
2869+ push_css(&mut css, effective_key, v);
2870+ }
2871+ }
2872+
2873+ // Logical border-radius
2874+ "border-start-start-radius"
2875+ | "border-start-end-radius"
2876+ | "border-end-start-radius"
2877+ | "border-end-end-radius" => {
2878+ if let Some(v) = val {
2879+ push_css(&mut css, effective_key, &css_px(v));
2880+ }
2881+ }
2882+
2883+ // Logical scroll margins & padding
2884+ "scroll-margin-inline"
2885+ | "scroll-margin-block"
2886+ | "scroll-padding-inline"
2887+ | "scroll-padding-block" => {
2888+ if let Some(v) = val {
2889+ push_css(&mut css, effective_key, &css_px_multi(v));
2890+ }
2891+ }
2892+
2893+ // Logical sizing
2894+ "inline-size" | "block-size" | "min-inline-size" | "max-inline-size"
2895+ | "min-block-size" | "max-block-size" => {
2896+ if let Some(v) = val {
2897+ push_css(&mut css, effective_key, &css_px(v));
2898+ }
2899+ }
2900+
2901+ // Scroll snap
2902+ "scroll-snap-type" => {
2903+ if let Some(v) = val {
2904+ push_css(&mut css, "scroll-snap-type", v);
2905+ }
2906+ }
2907+ "scroll-snap-align" => {
2908+ if let Some(v) = val {
2909+ push_css(&mut css, "scroll-snap-align", v);
2910+ }
2911+ }
2912+
2913+ // Margin
2914+ "margin" => {
2915+ if let Some(v) = val {
2916+ push_css(&mut css, "margin", &css_px_multi(v));
2917+ }
2918+ }
2919+ "margin-x" => {
2920+ if let Some(v) = val {
2921+ push_css(&mut css, "margin-left", &css_px(v));
2922+ push_css(&mut css, "margin-right", &css_px(v));
2923+ }
2924+ }
2925+ "margin-y" => {
2926+ if let Some(v) = val {
2927+ push_css(&mut css, "margin-top", &css_px(v));
2928+ push_css(&mut css, "margin-bottom", &css_px(v));
2929+ }
2930+ }
2931+
2932+ // Filter
2933+ "filter" => {
2934+ if let Some(v) = val {
2935+ push_css(&mut css, "filter", v);
2936+ }
2937+ }
2938+
2939+ // Object fit/position (for images)
2940+ "object-fit" => {
2941+ if let Some(v) = val {
2942+ push_css(&mut css, "object-fit", v);
2943+ }
2944+ }
2945+ "object-position" => {
2946+ if let Some(v) = val {
2947+ push_css(&mut css, "object-position", v);
2948+ }
2949+ }
2950+
2951+ // Text shadow
2952+ "text-shadow" => {
2953+ if let Some(v) = val {
2954+ push_css(&mut css, "text-shadow", v);
2955+ }
2956+ }
2957+
2958+ // Text overflow
2959+ "text-overflow" => {
2960+ if let Some(v) = val {
2961+ push_css(&mut css, "text-overflow", v);
2962+ }
2963+ }
2964+
2965+ // Interaction
2966+ "pointer-events" => {
2967+ if let Some(v) = val {
2968+ push_css(&mut css, "pointer-events", v);
2969+ }
2970+ }
2971+ "user-select" => {
2972+ if let Some(v) = val {
2973+ push_css(&mut css, "user-select", v);
2974+ }
2975+ }
2976+
2977+ // Flexbox/grid alignment
2978+ "justify-content" => {
2979+ if let Some(v) = val {
2980+ push_css(&mut css, "justify-content", v);
2981+ }
2982+ }
2983+ "align-items" => {
2984+ if let Some(v) = val {
2985+ push_css(&mut css, "align-items", v);
2986+ }
2987+ }
2988+
2989+ // Flex item order
2990+ "order" => {
2991+ if let Some(v) = val {
2992+ push_css(&mut css, "order", v);
2993+ }
2994+ }
2995+
2996+ // Background extras
2997+ "background-size" => {
2998+ if let Some(v) = val {
2999+ push_css(&mut css, "background-size", v);
3000+ }
3001+ }
3002+ "background-position" => {
3003+ if let Some(v) = val {
3004+ push_css(&mut css, "background-position", v);
3005+ }
3006+ }
3007+ "background-repeat" => {
3008+ if let Some(v) = val {
3009+ push_css(&mut css, "background-repeat", v);
3010+ }
3011+ }
3012+
3013+ // Text wrapping
3014+ "word-break" => {
3015+ if let Some(v) = val {
3016+ push_css(&mut css, "word-break", v);
3017+ }
3018+ }
3019+ "overflow-wrap" => {
3020+ if let Some(v) = val {
3021+ push_css(&mut css, "overflow-wrap", v);
3022+ }
3023+ }
3024+
3025+ // Container queries
3026+ "container" => {
3027+ push_css(&mut css, "container-type", "inline-size");
3028+ }
3029+ "container-name" => {
3030+ if let Some(v) = val {
3031+ push_css(&mut css, "container-name", v);
3032+ }
3033+ }
3034+ "container-type" => {
3035+ if let Some(v) = val {
3036+ push_css(&mut css, "container-type", v);
3037+ }
3038+ }
3039+
3040+ // Overflow axis
3041+ "overflow-x" => {
3042+ if let Some(v) = val {
3043+ push_css(&mut css, "overflow-x", v);
3044+ }
3045+ }
3046+ "overflow-y" => {
3047+ if let Some(v) = val {
3048+ push_css(&mut css, "overflow-y", v);
3049+ }
3050+ }
3051+
3052+ // Inset (shorthand for top/right/bottom/left)
3053+ "inset" => {
3054+ if let Some(v) = val {
3055+ push_css(&mut css, "inset", &css_px(v));
3056+ }
3057+ }
3058+
3059+ // Accent & caret colors
3060+ "accent-color" => {
3061+ if let Some(v) = val {
3062+ push_css(&mut css, "accent-color", v);
3063+ }
3064+ }
3065+ "caret-color" => {
3066+ if let Some(v) = val {
3067+ push_css(&mut css, "caret-color", v);
3068+ }
3069+ }
3070+
3071+ // Color scheme & appearance
3072+ "color-scheme" => {
3073+ if let Some(v) = val {
3074+ push_css(&mut css, "color-scheme", v);
3075+ }
3076+ }
3077+ "appearance" => {
3078+ if let Some(v) = val {
3079+ push_css(&mut css, "appearance", v);
3080+ }
3081+ }
3082+
3083+ // List style
3084+ "list-style" => {
3085+ if let Some(v) = val {
3086+ push_css(&mut css, "list-style", v);
3087+ }
3088+ }
3089+
3090+ // Table
3091+ "border-collapse" => {
3092+ if let Some(v) = val {
3093+ push_css(&mut css, "border-collapse", v);
3094+ }
3095+ }
3096+ "border-spacing" => {
3097+ if let Some(v) = val {
3098+ push_css(&mut css, "border-spacing", &css_px(v));
3099+ }
3100+ }
3101+
3102+ // Text decoration
3103+ "text-decoration" => {
3104+ if let Some(v) = val {
3105+ push_css(&mut css, "text-decoration", v);
3106+ }
3107+ }
3108+ "text-decoration-color" => {
3109+ if let Some(v) = val {
3110+ push_css(&mut css, "text-decoration-color", v);
3111+ }
3112+ }
3113+ "text-decoration-thickness" => {
3114+ if let Some(v) = val {
3115+ push_css(&mut css, "text-decoration-thickness", &css_px(v));
3116+ }
3117+ }
3118+ "text-decoration-style" => {
3119+ if let Some(v) = val {
3120+ push_css(&mut css, "text-decoration-style", v);
3121+ }
3122+ }
3123+ "text-underline-offset" => {
3124+ if let Some(v) = val {
3125+ push_css(&mut css, "text-underline-offset", &css_px(v));
3126+ }
3127+ }
3128+
3129+ // Multi-column
3130+ "column-width" => {
3131+ if let Some(v) = val {
3132+ push_css(&mut css, "column-width", &css_px(v));
3133+ }
3134+ }
3135+ "column-rule" => {
3136+ if let Some(v) = val {
3137+ push_css(&mut css, "column-rule", v);
3138+ }
3139+ }
3140+
3141+ // Place items/self
3142+ "place-items" => {
3143+ if let Some(v) = val {
3144+ push_css(&mut css, "place-items", v);
3145+ }
3146+ }
3147+ "place-self" => {
3148+ if let Some(v) = val {
3149+ push_css(&mut css, "place-self", v);
3150+ }
3151+ }
3152+
3153+ // Scroll behavior
3154+ "scroll-behavior" => {
3155+ if let Some(v) = val {
3156+ push_css(&mut css, "scroll-behavior", v);
3157+ }
3158+ }
3159+
3160+ // Resize
3161+ "resize" => {
3162+ if let Some(v) = val {
3163+ push_css(&mut css, "resize", v);
3164+ }
3165+ }
3166+
3167+ // New CSS properties
3168+ "clip-path" => {
3169+ if let Some(v) = val {
3170+ push_css(&mut css, "clip-path", v);
3171+ }
3172+ }
3173+ "mix-blend-mode" => {
3174+ if let Some(v) = val {
3175+ push_css(&mut css, "mix-blend-mode", v);
3176+ }
3177+ }
3178+ "background-blend-mode" => {
3179+ if let Some(v) = val {
3180+ push_css(&mut css, "background-blend-mode", v);
3181+ }
3182+ }
3183+ "writing-mode" => {
3184+ if let Some(v) = val {
3185+ push_css(&mut css, "writing-mode", v);
3186+ }
3187+ }
3188+ "column-count" => {
3189+ if let Some(v) = val {
3190+ push_css(&mut css, "column-count", v);
3191+ }
3192+ }
3193+ "column-gap" => {
3194+ if let Some(v) = val {
3195+ push_css(&mut css, "column-gap", &css_px(v));
3196+ }
3197+ }
3198+ "text-indent" => {
3199+ if let Some(v) = val {
3200+ push_css(&mut css, "text-indent", &css_px(v));
3201+ }
3202+ }
3203+ "hyphens" => {
3204+ if let Some(v) = val {
3205+ push_css(&mut css, "hyphens", v);
3206+ }
3207+ }
3208+ "flex-grow" => {
3209+ if let Some(v) = val {
3210+ push_css(&mut css, "flex-grow", v);
3211+ }
3212+ }
3213+ "flex-shrink" => {
3214+ if let Some(v) = val {
3215+ push_css(&mut css, "flex-shrink", v);
3216+ }
3217+ }
3218+ "flex-basis" => {
3219+ if let Some(v) = val {
3220+ push_css(&mut css, "flex-basis", &css_px(v));
3221+ }
3222+ }
3223+ "isolation" => {
3224+ if let Some(v) = val {
3225+ push_css(&mut css, "isolation", v);
3226+ }
3227+ }
3228+ "place-content" => {
3229+ if let Some(v) = val {
3230+ push_css(&mut css, "place-content", v);
3231+ }
3232+ }
3233+ "background-image" => {
3234+ if let Some(v) = val {
3235+ push_css(&mut css, "background-image", v);
3236+ }
18263237 }
1827− let Some(axis) = attr.value.as_deref().and_then(Axis::of_value) else {
1828− continue;
1829− };
1830− if condition.at.is_empty() {
1831− base = axis;
1832− } else {
1833− // The later one wins, as in the CSS
1834− changes.retain(|(at, _)| *at != condition.at);
1835− changes.push((condition.at, axis));
3238+ "font-weight" => {
3239+ if let Some(v) = val {
3240+ push_css(&mut css, "font-weight", v);
3241+ }
18363242 }
1837− }
1838− changes.sort_by_key(|(at, _)| at_order(at));
1839− Flow {
1840− base: Some(base),
1841− changes,
1842− class: None,
1843− }
1844− }
1845−
1846− /// The direction under the at-rules `at`: the latest one set among
1847− /// the conditions that hold there (`md:` holds at `lg:`), else the one
1848− /// without a prefix.
1849− fn at(&self, at: &[usize]) -> Option<Axis> {
1850− let base = self.base?;
1851− let here = Condition::at_only(at);
1852− let changed = self
1853− .changes
1854− .iter()
1855− .rev()
1856− .find(|(chain, _)| Condition::at_only(chain).holds_at(&here))
1857− .map(|&(_, axis)| axis);
1858− Some(changed.unwrap_or(base))
1859− }
1860−}
1861−
1862−/// `width` or `height`.
1863−#[derive(Clone, Copy, PartialEq, Eq)]
1864−enum Dim {
1865− Width,
1866− Height,
1867−}
1868−
1869−/// What a `width` or `height` says.
1870−#[derive(Clone, Copy, PartialEq, Eq)]
1871−enum Size {
1872− Fill,
1873− Shrink,
1874− /// A size of its own (`width 300`)
1875− Set,
1876−}
1877−
1878−impl Size {
1879− fn of(value: &str) -> Size {
1880− match value.trim() {
1881− "fill" => Size::Fill,
1882− "shrink" => Size::Shrink,
1883− _ => Size::Set,
1884− }
1885− }
1886−}
1887−
1888−/// The declarations `fill` and `shrink` make in a parent laid out along
1889−/// `axis` (`None`: not a flex row or column). Along the parent's direction,
1890−/// `fill` takes the remaining space and `shrink` keeps the content's size;
1891−/// across it (or outside flex), `fill` is the full size and `shrink` fits
1892−/// the content.
1893−fn sizing(dim: Dim, size: Size, axis: Option<Axis>) -> &'static [(&'static str, &'static str)] {
1894− match (dim, size, axis) {
1895− (_, Size::Set, _) => &[],
1896− (Dim::Width, Size::Fill, Some(Axis::Row)) => &[("flex", "1"), ("min-width", "0")],
1897− (Dim::Width, Size::Fill, _) => &[("width", "100%")],
1898− (Dim::Width, Size::Shrink, Some(Axis::Row)) => &[("flex-shrink", "0")],
1899− (Dim::Width, Size::Shrink, _) => &[("width", "fit-content")],
1900− (Dim::Height, Size::Fill, Some(Axis::Column)) => &[("flex", "1"), ("min-height", "0")],
1901− (Dim::Height, Size::Fill, _) => &[("height", "100%")],
1902− (Dim::Height, Size::Shrink, Some(Axis::Column)) => &[("flex-shrink", "0")],
1903− (Dim::Height, Size::Shrink, _) => &[("height", "fit-content")],
1904− }
1905−}
1906−
1907−/// Every property `fill` and `shrink` of `dim` can set, with its initial
1908−/// value (`flex` covers `flex-shrink`).
1909−fn sizing_properties(dim: Dim) -> [(&'static str, &'static str); 3] {
1910− match dim {
1911− Dim::Width => [
1912− ("flex", "0 1 auto"),
1913− ("min-width", "auto"),
1914− ("width", "auto"),
1915− ],
1916− Dim::Height => [
1917− ("flex", "0 1 auto"),
1918− ("min-height", "auto"),
1919− ("height", "auto"),
1920− ],
1921− }
1922−}
1923−
1924−/// What an element's attributes under some prefixes say about its size.
1925−#[derive(Default)]
1926−struct Sizes {
1927− /// The last `width` and `height`
1928− width: Option<Size>,
1929− height: Option<Size>,
1930− /// A `fill` or `shrink` for the width / height is among them (a later
1931− /// size may replace it)
1932− width_word: bool,
1933− height_word: bool,
1934− /// It writes `flex`, one of its longhands (`flex-grow`, `flex-shrink`,
1935− /// `flex-basis`), `min-width` or `min-height` itself
1936− flex: bool,
1937− flex_grow: bool,
1938− flex_shrink: bool,
1939− flex_basis: bool,
1940− min_width: bool,
1941− min_height: bool,
1942−}
1943−
1944−impl Sizes {
1945− /// Read the attributes under the conditions that hold wherever `at`
1946− /// does, a later condition over an earlier one.
1947− fn of(attrs: &[Attribute], at: &Condition) -> Sizes {
1948− let mut sizes = Sizes::default();
1949− let mut read: Vec<(Condition, &str, &str)> = Vec::new();
1950− for attr in attrs.iter().filter(|a| !a.html) {
1951− let (condition, name) = Condition::of(&attr.key);
1952− let Some(value) = attr.value.as_deref().filter(|v| !v.trim().is_empty()) else {
1953− continue;
1954− };
1955− if condition.holds_at(at) {
1956− read.push((condition, name, value));
1957− }
1958− }
1959− read.sort_by_cached_key(|(condition, _, _)| condition.order());
1960− for (_, name, value) in read {
1961− match name {
1962− "width" => {
1963− let size = Size::of(value);
1964− sizes.width = Some(size);
1965− sizes.width_word |= size != Size::Set;
1966− }
1967− "height" => {
1968− let size = Size::of(value);
1969− sizes.height = Some(size);
1970− sizes.height_word |= size != Size::Set;
1971− }
1972− "flex" => sizes.flex = true,
1973− "flex-grow" => sizes.flex_grow = true,
1974− "flex-shrink" => sizes.flex_shrink = true,
1975− "flex-basis" => sizes.flex_basis = true,
1976− "min-width" => sizes.min_width = true,
1977− "min-height" => sizes.min_height = true,
1978− _ => {}
3243+ "font-style" => {
3244+ if let Some(v) = val {
3245+ push_css(&mut css, "font-style", v);
3246+ }
19793247 }
1980− }
1981− sizes
1982− }
1983−
1984− /// The element writes `property` itself: a layout word leaves it alone.
1985− fn writes(&self, property: &str) -> bool {
1986− match property {
1987− "flex" => self.flex,
1988− "flex-grow" => self.flex || self.flex_grow,
1989− "flex-shrink" => self.flex || self.flex_shrink,
1990− "flex-basis" => self.flex || self.flex_basis,
1991− "min-width" => self.min_width,
1992− "min-height" => self.min_height,
1993− "width" => self.width == Some(Size::Set),
1994− "height" => self.height == Some(Size::Set),
1995− _ => false,
1996− }
1997− }
1998−
1999− /// Write a layout word's `property: value`, unless the element writes
2000− /// the property itself. When it writes some of `flex`'s longhands, a
2001− /// `flex` is written as the others (`flex-shrink 0, width fill` still
2002− /// grows).
2003− fn push(&self, css: &mut String, property: &str, value: &str) {
2004− if property == "flex" && !self.flex {
2005− let longhands = match value {
2006− "1" => [
2007− ("flex-grow", "1"),
2008− ("flex-shrink", "1"),
2009− ("flex-basis", "0%"),
2010− ],
2011− // The reset, `0 1 auto`
2012− _ => [
2013− ("flex-grow", "0"),
2014− ("flex-shrink", "1"),
2015− ("flex-basis", "auto"),
2016− ],
2017− };
2018− if longhands.iter().any(|&(p, _)| self.writes(p)) {
2019− for (longhand, value) in longhands {
2020− if !self.writes(longhand) {
2021− push_css(css, longhand, value);
2022− }
3248+ "text-wrap" => {
3249+ if let Some(v) = val {
3250+ push_css(&mut css, "text-wrap", v);
3251+ }
3252+ }
3253+ "will-change" => {
3254+ if let Some(v) = val {
3255+ push_css(&mut css, "will-change", v);
3256+ }
3257+ }
3258+ "touch-action" => {
3259+ if let Some(v) = val {
3260+ push_css(&mut css, "touch-action", v);
3261+ }
3262+ }
3263+ "vertical-align" => {
3264+ if let Some(v) = val {
3265+ push_css(&mut css, "vertical-align", v);
3266+ }
3267+ }
3268+ "scroll-margin" => {
3269+ if let Some(v) = val {
3270+ push_css(&mut css, "scroll-margin", &css_px(v));
3271+ }
3272+ }
3273+ "scroll-margin-top"
3274+ | "scroll-margin-bottom"
3275+ | "scroll-margin-left"
3276+ | "scroll-margin-right" => {
3277+ if let Some(v) = val {
3278+ push_css(&mut css, effective_key, &css_px(v));
3279+ }
3280+ }
3281+ "scroll-padding" => {
3282+ if let Some(v) = val {
3283+ push_css(&mut css, "scroll-padding", &css_px(v));
3284+ }
3285+ }
3286+ "scroll-padding-top"
3287+ | "scroll-padding-bottom"
3288+ | "scroll-padding-left"
3289+ | "scroll-padding-right" => {
3290+ if let Some(v) = val {
3291+ push_css(&mut css, effective_key, &css_px(v));
3292+ }
3293+ }
3294+ "direction" => {
3295+ if let Some(v) = val {
3296+ push_css(&mut css, "direction", v);
20233297 }
2024− return;
20253298 }
2026− }
2027− if !self.writes(property) {
2028− push_css(css, property, value);
2029− }
2030− }
2031−}
2032−
2033−/// The rule that gives an element's `fill` and `shrink`, as its attributes
2034−/// under the at-rules `at` set them, their meaning in a parent laid out
2035−/// along `axis`. Every other property a layout word could have set is put
2036−/// back to its initial value, so the rule is right whichever earlier rule
2037−/// it overrides. Properties the element writes itself are left alone.
2038−fn sizing_rule(attrs: &[Attribute], at: &[usize], axis: Axis) -> String {
2039− let sizes = Sizes::of(attrs, &Condition::at_only(at));
2040− let mut sets: Vec<(&str, &str)> = Vec::new();
2041− let mut resets: Vec<(&str, &str)> = Vec::new();
2042− for (dim, size, word) in [
2043− (Dim::Width, sizes.width, sizes.width_word),
2044− (Dim::Height, sizes.height, sizes.height_word),
2045− ] {
2046− if !word {
2047− continue;
2048− }
2049− if let Some(size) = size {
2050− sets.extend_from_slice(sizing(dim, size, Some(axis)));
2051− }
2052− resets.extend_from_slice(&sizing_properties(dim));
2053− }
2054− let mut css = String::new();
2055− let mut written: Vec<&str> = Vec::new();
2056− for &(property, value) in &resets {
2057− if sets.iter().any(|&(p, _)| p == property) || written.contains(&property) {
2058− continue;
2059− }
2060− written.push(property);
2061− sizes.push(&mut css, property, value);
2062− }
2063− for &(property, value) in &sets {
2064− sizes.push(&mut css, property, value);
2065− }
2066− css
2067−}
20683299
2069−/// The rules an element's `fill` and `shrink` need under each chain of
2070−/// at-rules where the direction of `flow` (its parent's) changes: `(at,
2071−/// body)`.
2072−fn sizing_changes(attrs: &[Attribute], flow: &Flow) -> Vec<(Vec<usize>, String)> {
2073− flow.changes
2074− .iter()
2075− .map(|(at, axis)| (at.clone(), sizing_rule(attrs, at, *axis)))
2076− .filter(|(_, body)| !body.is_empty())
2077− .collect()
2078−}
3300+ "content" => {
3301+ if let Some(v) = val {
3302+ // Wrap in quotes if not already quoted and not a CSS keyword
3303+ if v.starts_with('"')
3304+ || v.starts_with('\'')
3305+ || v == "none"
3306+ || v == "normal"
3307+ || v.starts_with("attr(")
3308+ || v.starts_with("counter(")
3309+ {
3310+ push_css(&mut css, "content", v);
3311+ } else {
3312+ push_css(&mut css, "content", &format!("\"{}\"", v));
3313+ }
3314+ }
3315+ }
20793316
2080−/// An element's generated class, with the rules keyed on its parent's
2081−/// class that its `fill` and `shrink` need where the parent's direction
2082−/// changes under a prefix (see [`Flow`]): `:where(.a)>.b`, one class of
2083−/// specificity like any class rule.
2084−fn element_class(elem: &Element, site: &Site, styles: &mut StyleCollector) -> Option<String> {
2085− let as_child = match site.parent.class {
2086− Some(_) => sizing_changes(&elem.attrs, site.parent),
2087− None => Vec::new(),
2088− };
2089− // Two elements with the same CSS but different rules keyed on them
2090− // need two classes
2091− let mut distinct = String::new();
2092− for (at, body) in &as_child {
2093− distinct.push_str(&format!("<{:?}{}", at, body));
2094− }
2095− let class = compute_class(&elem.attrs, site, styles, distinct)?;
2096− if let Some(parent) = &site.parent.class {
2097− for (at, body) in as_child {
2098− styles.add_keyed(at, format!(":where(.{})>.{}", parent, class), body);
2099− }
2100− }
2101− Some(class)
2102−}
3317+ // --- CSS Shorthands ---
3318+ "truncate" => {
3319+ push_css(&mut css, "overflow", "hidden");
3320+ push_css(&mut css, "text-overflow", "ellipsis");
3321+ push_css(&mut css, "white-space", "nowrap");
3322+ }
3323+ "line-clamp" => {
3324+ if let Some(v) = val {
3325+ push_css(&mut css, "display", "-webkit-box");
3326+ push_css(&mut css, "-webkit-line-clamp", v);
3327+ push_css(&mut css, "-webkit-box-orient", "vertical");
3328+ push_css(&mut css, "overflow", "hidden");
3329+ }
3330+ }
3331+ "blur" => {
3332+ if let Some(v) = val {
3333+ push_css(&mut css, "filter", &format!("blur({})", css_px(v)));
3334+ }
3335+ }
3336+ "backdrop-blur" => {
3337+ if let Some(v) = val {
3338+ push_css(&mut css, "backdrop-filter", &format!("blur({})", css_px(v)));
3339+ }
3340+ }
3341+ "no-scrollbar" => {
3342+ push_css(&mut css, "scrollbar-width", "none");
3343+ push_css(&mut css, "-ms-overflow-style", "none");
3344+ }
3345+ "skeleton" => {
3346+ push_css(
3347+ &mut css,
3348+ "background",
3349+ "linear-gradient(90deg,#e5e7eb 25%,#f3f4f6 50%,#e5e7eb 75%)",
3350+ );
3351+ push_css(&mut css, "background-size", "200% 100%");
3352+ push_css(
3353+ &mut css,
3354+ "animation",
3355+ "hl-skeleton 1.5s ease-in-out infinite",
3356+ );
3357+ }
3358+ "gradient" => {
3359+ if let Some(v) = val {
3360+ // Parse: "from to [angle]" or "color1 color2 [angle]"
3361+ let parts: Vec<&str> = v.split_whitespace().collect();
3362+ let bg = if parts.len() >= 3
3363+ && (parts[2].ends_with("deg")
3364+ || parts[2].ends_with("turn")
3365+ || parts[2].ends_with("rad"))
3366+ {
3367+ format!("linear-gradient({},{},{})", parts[2], parts[0], parts[1])
3368+ } else if parts.len() >= 2 {
3369+ format!("linear-gradient({},{})", parts[0], parts[1])
3370+ } else {
3371+ format!("linear-gradient({},transparent)", parts[0])
3372+ };
3373+ push_css(&mut css, "background", &bg);
3374+ }
3375+ }
21033376
2104−/// The `display` of a layout (nothing for text, native and void elements,
2105−/// which keep HTML's own).
2106−fn layout_css(layout: Layout, inline: bool) -> &'static str {
2107− match (layout, inline) {
2108− (Layout::Column, false) => "display:flex;flex-direction:column;",
2109− (Layout::Column, true) => "display:inline-flex;flex-direction:column;",
2110− (Layout::Row, false) => "display:flex;flex-direction:row;",
2111− (Layout::Row, true) => "display:inline-flex;flex-direction:row;",
2112− (Layout::Grid, false) => "display:grid;",
2113− (Layout::Grid, true) => "display:inline-grid;",
2114− _ => "",
2115− }
2116−}
3377+ // Grid areas
3378+ "grid-template-areas" => {
3379+ if let Some(v) = val {
3380+ push_css(&mut css, "grid-template-areas", v);
3381+ }
3382+ }
3383+ "grid-area" => {
3384+ if let Some(v) = val {
3385+ push_css(&mut css, "grid-area", v);
3386+ }
3387+ }
21173388
2118−/// The declarations of the attributes under `condition` (the defaults of
2119−/// the element's kind are [`default_css`]'s).
2120−fn attrs_to_css(attrs: &[Attribute], condition: &Condition, site: &Site) -> String {
2121− let mut css = String::new();
2122− // The auto margins of `center-x`, `align-left`, ..., written at the end
2123− let mut aligned = String::new();
2124− let kind = site.kind;
2125− // Under `children:` the styles go on the children, whose parent is this
2126− // element: htmlang's words that place an element in its parent are an
2127− // error there (the parser reports them), and left out
2128− let on_children = condition.on_children();
2129− let inside = condition.inside().is_some();
2130− // The direction `fill` and `shrink` compile against
2131− let axis = site.parent.at(&condition.at);
2132−
2133− // htmlang's words for laying out children (`spacing`, `wrap`,
2134− // `grid-cols`) mean nothing on an element that doesn't lay out its
2135− // children, which the parser reports; they are left out. Under
2136− // `children:` they go on the children, whose layout isn't known here.
2137− let lays_out_children = kind.layout().is_container() || on_children;
2138− fn under<'k>(key: &'k str, condition: &Condition) -> Option<&'k str> {
2139− let (c, name) = Condition::of(key);
2140− (c == *condition).then_some(name)
2141− }
2142−
2143− for (index, attr) in attrs.iter().enumerate() {
2144− if attr.html {
2145− continue;
2146− }
2147− let Some(effective_key) = under(&attr.key, condition) else {
2148− continue;
2149− };
2150− if on_children && crate::vocab::places_in_parent(effective_key, attr.value.as_deref()) {
2151− continue;
2152− }
2153− // Under an element prefix (`@td:`) the styles go on elements whose
2154− // layout and parent aren't known here: htmlang's own words are an
2155− // error there (the parser reports them), and left out
2156− if inside && crate::vocab::is_htmlang_word(effective_key, attr.value.as_deref()) {
2157− continue;
2158− }
3389+ // View transitions
3390+ "view-transition-name" => {
3391+ if let Some(v) = val {
3392+ push_css(&mut css, "view-transition-name", v);
3393+ }
3394+ }
21593395
2160− let val = attr.value.as_deref();
2161− // A style whose value came out empty (a field a record doesn't
2162− // have, `${if()}` without its other branch) is left out
2163− if val.is_some_and(|v| v.trim().is_empty()) {
2164− continue;
2165− }
3396+ // Animate shorthand (alias for animation)
3397+ "animate" => {
3398+ if let Some(v) = val {
3399+ push_css(&mut css, "animation", v);
3400+ }
3401+ }
21663402
2167− match effective_key {
2168− // htmlang's own words: they lay out children or place the
2169− // element in its parent, and mean more than one CSS property
2170− "spacing" if !lays_out_children => {}
2171− "spacing" => {
3403+ // CSS subgrid
3404+ "grid-template-columns" => {
21723405 if let Some(v) = val {
2173− push_css(&mut css, "gap", &with_px("gap", v));
3406+ push_css(&mut css, "grid-template-columns", v);
3407+ }
3408+ }
3409+ "grid-template-rows" => {
3410+ if let Some(v) = val {
3411+ push_css(&mut css, "grid-template-rows", v);
21743412 }
21753413 }
21763414
2177− // Sizing: `fill` and `shrink` compile against the parent's
2178− // direction. Only the last `width` (`height`) counts, as for
2179− // any style written twice.
2180− "width" | "height" if val.is_some_and(|v| Size::of(v) != Size::Set) => {
2181− let later = attrs[index + 1..].iter().any(|a| {
2182− !a.html
2183− && under(&a.key, condition) == Some(effective_key)
2184− && a.value.as_deref().is_some_and(|v| !v.trim().is_empty())
2185− });
2186− if later {
2187− continue;
3415+ // Scroll-driven animations
3416+ "animation-timeline" => {
3417+ if let Some(v) = val {
3418+ push_css(&mut css, "animation-timeline", v);
21883419 }
2189− let dim = if effective_key == "width" {
2190− Dim::Width
2191− } else {
2192− Dim::Height
2193− };
2194− let size = Size::of(val.unwrap_or_default());
2195− // What the element writes itself, which a layout word
2196− // leaves alone
2197− let sizes = Sizes::of(attrs, condition);
2198− for &(property, value) in sizing(dim, size, axis) {
2199− sizes.push(&mut css, property, value);
2200− }
2201− }
2202−
2203− // A size of its own under a prefix, where a `fill` or
2204− // `shrink` that sets `flex` (along a flex parent's direction)
2205− // holds too: the word's `flex` and minimum are put back, so the
2206− // size is the one the element gets (`width fill, lg:width 200`
2207− // in a row)
2208− "width" | "height"
2209− if *condition != Condition::default()
2210− && attrs.iter().any(|a| {
2211− let (c, name) = Condition::of(&a.key);
2212− let along = match site.parent.at(&c.at) {
2213− Some(Axis::Row) => name == "width",
2214− Some(Axis::Column) => name == "height",
2215− None => false,
2216− };
2217− !a.html
2218− && name == effective_key
2219− && along
2220− && c != *condition
2221− && c.holds_at(condition)
2222− && a.value
2223− .as_deref()
2224− .is_some_and(|v| !v.trim().is_empty() && Size::of(v) != Size::Set)
2225− }) =>
2226− {
2227− let dim = if effective_key == "width" {
2228− Dim::Width
2229− } else {
2230− Dim::Height
2231− };
2232− let sizes = Sizes::of(attrs, condition);
2233− for (property, value) in sizing_properties(dim) {
2234− if property != effective_key {
2235− sizes.push(&mut css, property, value);
2236− }
3420+ }
3421+ "animation-range" => {
3422+ if let Some(v) = val {
3423+ push_css(&mut css, "animation-range", v);
22373424 }
3425+ }
3426+ "view-timeline-name" => {
22383427 if let Some(v) = val {
2239− push_css(&mut css, effective_key, &with_px(effective_key, v));
3428+ push_css(&mut css, "view-timeline-name", v);
22403429 }
22413430 }
2242−
2243− // Alignment: auto margins, which work along either direction.
2244− // They are written last, so a `margin` on the same element
2245− // keeps its other sides (`center-x, margin 20`)
2246− "center-x" => {
2247− push_css(&mut aligned, "margin-left", "auto");
2248− push_css(&mut aligned, "margin-right", "auto");
3431+ "view-timeline-axis" => {
3432+ if let Some(v) = val {
3433+ push_css(&mut css, "view-timeline-axis", v);
3434+ }
22493435 }
2250− "center-y" => {
2251− push_css(&mut aligned, "margin-top", "auto");
2252− push_css(&mut aligned, "margin-bottom", "auto");
3436+ "scroll-timeline-name" => {
3437+ if let Some(v) = val {
3438+ push_css(&mut css, "scroll-timeline-name", v);
3439+ }
3440+ }
3441+ "scroll-timeline-axis" => {
3442+ if let Some(v) = val {
3443+ push_css(&mut css, "scroll-timeline-axis", v);
3444+ }
22533445 }
2254− "align-left" => push_css(&mut aligned, "margin-right", "auto"),
2255− "align-right" => push_css(&mut aligned, "margin-left", "auto"),
2256− "align-top" => push_css(&mut aligned, "margin-bottom", "auto"),
2257− "align-bottom" => push_css(&mut aligned, "margin-top", "auto"),
2258−
2259− "wrap" if lays_out_children => push_css(&mut css, "flex-wrap", "wrap"),
2260− "wrap" => {}
22613446
2262− // Grid
2263− "grid-cols" | "grid-rows" if !lays_out_children => {}
2264− "grid-cols" | "grid-rows" => {
3447+ // Anchor positioning
3448+ "anchor-name" => {
22653449 if let Some(v) = val {
2266− let property = if effective_key == "grid-cols" {
2267− "grid-template-columns"
2268− } else {
2269− "grid-template-rows"
2270− };
2271− match v.parse::<u32>() {
2272− Ok(n) => push_css(&mut css, property, &format!("repeat({},1fr)", n)),
2273− Err(_) => push_css(&mut css, property, &with_px(property, v)),
2274− }
3450+ push_css(&mut css, "anchor-name", v);
22753451 }
22763452 }
2277− "col-span" | "row-span" => {
3453+ "position-anchor" => {
22783454 if let Some(v) = val {
2279− let property = if effective_key == "col-span" {
2280− "grid-column"
2281− } else {
2282− "grid-row"
2283− };
2284− push_css(&mut css, property, &format!("span {}", v));
3455+ push_css(&mut css, "position-anchor", v);
22853456 }
22863457 }
2287−
2288− // CSS's `line-clamp` has no support yet without its
2289− // `-webkit-` fallback, which needs a box to clamp
2290− "line-clamp" => {
3458+ "position-area" => {
22913459 if let Some(v) = val {
2292− push_css(&mut css, "display", "-webkit-box");
2293− push_css(&mut css, "-webkit-line-clamp", v);
2294− push_css(&mut css, "-webkit-box-orient", "vertical");
2295− push_css(&mut css, "overflow", "hidden");
3460+ push_css(&mut css, "position-area", v);
3461+ }
3462+ }
3463+ "inset-area" => {
3464+ // Legacy alias for position-area
3465+ if let Some(v) = val {
3466+ push_css(&mut css, "position-area", v);
22963467 }
22973468 }
22983469
2299− // Every other name is a CSS property (standard, custom,
2300− // vendor-prefixed, or one htmlang doesn't know, which the
2301− // parser warned about), written under its own name with the
2302− // value as written, except for `px` after a bare number where
2303− // the property takes a length
2304− key if crate::vocab::is_property_name(key) => {
3470+ // initial-letter (drop caps)
3471+ "initial-letter" => {
23053472 if let Some(v) = val {
2306− push_css(&mut css, key, &with_px(key, v));
3473+ push_css(&mut css, "initial-letter", v);
23073474 }
23083475 }
23093476
3477+ // Critical CSS hint — not CSS, handled elsewhere
3478+ "critical" => {}
3479+
3480+ // Identity and HTML passthrough — not CSS
3481+ "id" | "class" => {}
3482+ "type" | "placeholder" | "name" | "value" | "disabled" | "required" | "checked"
3483+ | "for" | "action" | "method" | "autocomplete" | "min" | "max" | "step" | "pattern"
3484+ | "maxlength" | "rows" | "cols" | "multiple" | "alt" | "role" | "tabindex"
3485+ | "title" | "controls" | "autoplay" | "loop" | "muted" | "poster" | "preload"
3486+ | "loading" | "decoding" | "ordered" | "src" | "open" | "novalidate" | "low"
3487+ | "high" | "optimum" | "colspan" | "rowspan" | "scope" | "inline" | "responsive"
3488+ | "datetime" | "media" | "sizes" | "srcset" | "cite" | "list" | "sandbox" | "allow"
3489+ | "allowfullscreen" | "referrerpolicy" | "formaction" | "formmethod" | "formtarget"
3490+ | "target" | "autofocus" => {}
3491+
23103492 _ => {}
23113493 }
23123494 }
23133495
2314− css.push_str(&aligned);
23153496 css
23163497}
23173498
@@ -2322,10 +3503,46 @@ fn push_css(css: &mut String, prop: &str, value: &str) {
23223503 css.push(';');
23233504}
23243505
3506+/// Known CSS units — if a value ends with one, skip appending `px`.
3507+const CSS_UNITS: &[&str] = &[
3508+ "%", "rem", "em", "vh", "vw", "vmin", "vmax", "dvh", "svh", "lvh", "ch", "ex", "cm", "mm",
3509+ "in", "pt", "pc", "fr",
3510+];
3511+
3512+/// Format a numeric value: if it already has a CSS unit, pass through as-is;
3513+/// otherwise append `px`.
3514+fn css_px(value: &str) -> String {
3515+ let v = value.trim();
3516+ if v == "0" {
3517+ return "0".to_string();
3518+ }
3519+ if CSS_UNITS.iter().any(|u| v.ends_with(u)) {
3520+ return v.to_string();
3521+ }
3522+ if v.starts_with("var(")
3523+ || v.starts_with("calc(")
3524+ || v.starts_with("clamp(")
3525+ || v.starts_with("min(")
3526+ || v.starts_with("max(")
3527+ {
3528+ return v.to_string();
3529+ }
3530+ format!("{}px", v)
3531+}
3532+
3533+/// Format multiple space-separated values, each getting px if needed.
3534+fn css_px_multi(value: &str) -> String {
3535+ value
3536+ .split_whitespace()
3537+ .map(css_px)
3538+ .collect::<Vec<_>>()
3539+ .join(" ")
3540+}
3541+
23253542fn extract_id_class(attrs: &[Attribute]) -> (Option<String>, Option<String>) {
23263543 let mut id = None;
23273544 let mut class = None;
2328− for attr in attrs.iter().filter(|a| a.html) {
3545+ for attr in attrs {
23293546 match attr.key.as_str() {
23303547 "id" => id = attr.value.clone(),
23313548 "class" => class = attr.value.clone(),
@@ -2335,6 +3552,153 @@ fn extract_id_class(attrs: &[Attribute]) -> (Option<String>, Option<String>) {
23353552 (id, class)
23363553}
23373554
3555+/// Read image dimensions from a local file by parsing the header bytes.
3556+/// Supports PNG, JPEG, GIF, WebP, AVIF, and SVG.
3557+fn read_image_dimensions(path: &str) -> Option<(u32, u32)> {
3558+ // SVG: parse as text for viewBox/width/height attributes
3559+ if path.ends_with(".svg") || path.ends_with(".SVG") {
3560+ let text = std::fs::read_to_string(path).ok()?;
3561+ return read_svg_dimensions(&text);
3562+ }
3563+
3564+ let data = std::fs::read(path).ok()?;
3565+ if data.len() < 12 {
3566+ return None;
3567+ }
3568+
3569+ // PNG: 8-byte signature, then IHDR chunk with width/height at bytes 16-23
3570+ if data.len() >= 24 && data.starts_with(b"\x89PNG\r\n\x1a\n") {
3571+ let w = u32::from_be_bytes([data[16], data[17], data[18], data[19]]);
3572+ let h = u32::from_be_bytes([data[20], data[21], data[22], data[23]]);
3573+ return Some((w, h));
3574+ }
3575+
3576+ // GIF: "GIF87a" or "GIF89a", width/height at bytes 6-9 (little-endian)
3577+ if data.starts_with(b"GIF87a") || data.starts_with(b"GIF89a") {
3578+ let w = u16::from_le_bytes([data[6], data[7]]) as u32;
3579+ let h = u16::from_le_bytes([data[8], data[9]]) as u32;
3580+ return Some((w, h));
3581+ }
3582+
3583+ // JPEG: scan for SOF0/SOF2 marker (0xFF 0xC0 or 0xFF 0xC2)
3584+ if data.starts_with(b"\xff\xd8") {
3585+ let mut i = 2;
3586+ while i + 9 < data.len() {
3587+ if data[i] != 0xFF {
3588+ i += 1;
3589+ continue;
3590+ }
3591+ let marker = data[i + 1];
3592+ if marker == 0xC0 || marker == 0xC2 {
3593+ let h = u16::from_be_bytes([data[i + 5], data[i + 6]]) as u32;
3594+ let w = u16::from_be_bytes([data[i + 7], data[i + 8]]) as u32;
3595+ return Some((w, h));
3596+ }
3597+ if i + 3 < data.len() {
3598+ let len = u16::from_be_bytes([data[i + 2], data[i + 3]]) as usize;
3599+ i += 2 + len;
3600+ } else {
3601+ break;
3602+ }
3603+ }
3604+ }
3605+
3606+ // WebP: "RIFF" ... "WEBP", VP8 header at byte 20
3607+ if data.len() >= 30 && &data[..4] == b"RIFF" && &data[8..12] == b"WEBP" {
3608+ if &data[12..16] == b"VP8 " && data.len() >= 30 {
3609+ let w = u16::from_le_bytes([data[26], data[27]]) as u32 & 0x3FFF;
3610+ let h = u16::from_le_bytes([data[28], data[29]]) as u32 & 0x3FFF;
3611+ return Some((w, h));
3612+ }
3613+ if &data[12..16] == b"VP8L" && data.len() >= 25 && data[21] == 0x2F {
3614+ let bits = u32::from_le_bytes([data[22], data[23], data[24], data[25]]);
3615+ let w = (bits & 0x3FFF) + 1;
3616+ let h = ((bits >> 14) & 0x3FFF) + 1;
3617+ return Some((w, h));
3618+ }
3619+ }
3620+
3621+ // AVIF: ISOBMFF container with "ftyp" box containing "avif"/"avis" brand,
3622+ // then "ispe" box with width/height
3623+ if data.len() >= 12 && &data[4..8] == b"ftyp" {
3624+ let brand = &data[8..12];
3625+ if brand == b"avif" || brand == b"avis" || brand == b"mif1" {
3626+ return read_avif_dimensions(&data);
3627+ }
3628+ }
3629+
3630+ None
3631+}
3632+
3633+/// Parse SVG viewBox or width/height attributes to get dimensions.
3634+fn read_svg_dimensions(text: &str) -> Option<(u32, u32)> {
3635+ // Try viewBox first: viewBox="minX minY width height"
3636+ if let Some(vb_start) = text.find("viewBox=\"") {
3637+ let rest = &text[vb_start + 9..];
3638+ if let Some(end) = rest.find('"') {
3639+ let parts: Vec<&str> = rest[..end].split_whitespace().collect();
3640+ if parts.len() == 4
3641+ && let (Ok(w), Ok(h)) = (parts[2].parse::<f64>(), parts[3].parse::<f64>())
3642+ && w > 0.0
3643+ && h > 0.0
3644+ {
3645+ return Some((w.round() as u32, h.round() as u32));
3646+ }
3647+ }
3648+ }
3649+ // Fall back to width/height attributes on <svg>
3650+ let svg_tag = text.find("<svg")?;
3651+ let tag_end = text[svg_tag..].find('>')? + svg_tag;
3652+ let tag = &text[svg_tag..tag_end];
3653+ let w = extract_svg_attr(tag, "width")?;
3654+ let h = extract_svg_attr(tag, "height")?;
3655+ Some((w, h))
3656+}
3657+
3658+fn extract_svg_attr(tag: &str, attr: &str) -> Option<u32> {
3659+ let needle = format!("{}=\"", attr);
3660+ let start = tag.find(&needle)? + needle.len();
3661+ let rest = &tag[start..];
3662+ let end = rest.find('"')?;
3663+ let val = rest[..end].trim_end_matches("px");
3664+ val.parse::<f64>().ok().map(|v| v.round() as u32)
3665+}
3666+
3667+/// Parse AVIF (ISOBMFF) container to find ispe box with image dimensions.
3668+fn read_avif_dimensions(data: &[u8]) -> Option<(u32, u32)> {
3669+ // Walk ISOBMFF boxes looking for "ispe" (image spatial extents)
3670+ let mut i = 0;
3671+ while i + 8 <= data.len() {
3672+ let box_size =
3673+ u32::from_be_bytes([data[i], data[i + 1], data[i + 2], data[i + 3]]) as usize;
3674+ let box_type = &data[i + 4..i + 8];
3675+ if box_size < 8 {
3676+ break;
3677+ }
3678+ let box_end = (i + box_size).min(data.len());
3679+ // ispe box: 4 bytes version/flags + 4 bytes width + 4 bytes height
3680+ if box_type == b"ispe" && box_end >= i + 20 {
3681+ let w = u32::from_be_bytes([data[i + 12], data[i + 13], data[i + 14], data[i + 15]]);
3682+ let h = u32::from_be_bytes([data[i + 16], data[i + 17], data[i + 18], data[i + 19]]);
3683+ return Some((w, h));
3684+ }
3685+ // Recurse into container boxes (meta, iprp, ipco)
3686+ if matches!(
3687+ box_type,
3688+ b"meta" | b"iprp" | b"ipco" | b"moov" | b"trak" | b"mdia"
3689+ ) {
3690+ let header_size = if box_type == b"meta" { 12 } else { 8 };
3691+ if i + header_size < box_end
3692+ && let Some(dims) = read_avif_dimensions(&data[i + header_size..box_end])
3693+ {
3694+ return Some(dims);
3695+ }
3696+ }
3697+ i = box_end;
3698+ }
3699+ None
3700+}
3701+
23383702fn html_escape(s: &str) -> String {
23393703 s.replace('&', "&")
23403704 .replace('<', "<")
@@ -2373,24 +3737,10 @@ fn base64_encode(data: &[u8]) -> String {
23733737/// Generate a standard v3 source map with VLQ-encoded mappings.
23743738/// Compatible with browser devtools and source map tooling.
23753739pub fn generate_source_map(doc: &Document, source_file: &str) -> String {
2376− source_map_for_html(&generate_dev(doc), source_file)
2377−}
2378−
2379−/// Build a source map for dev-mode HTML by reading the `data-hl-line`
2380−/// markers each element carries, so generated line numbers are exact.
2381−pub fn source_map_for_html(html: &str, source_file: &str) -> String {
23823740 let mut mappings: Vec<(usize, usize)> = Vec::new(); // (html_line, hl_line)
2383− for (idx, line) in html.lines().enumerate() {
2384− if let Some(pos) = line.find("data-hl-line=\"") {
2385− let digits: String = line[pos + "data-hl-line=\"".len()..]
2386− .chars()
2387− .take_while(|c| c.is_ascii_digit())
2388− .collect();
2389− if let Ok(hl_line) = digits.parse::<usize>() {
2390− mappings.push((idx + 1, hl_line));
2391− }
2392− }
2393− }
3741+ collect_source_lines(&doc.nodes, &mut mappings);
3742+ mappings.sort_by_key(|m| m.0);
3743+ mappings.dedup_by_key(|m| m.0);
23943744
23953745 // Build VLQ-encoded mappings string.
23963746 // Each generated line is separated by ';'. Each segment within a line is
@@ -2450,30 +3800,60 @@ fn vlq_encode(value: i64, out: &mut String) {
24503800 }
24513801}
24523802
2453−#[cfg(test)]
2454−mod tests {
2455− use super::*;
2456−
2457− #[test]
2458− fn a_name_is_a_stable_hash_of_the_style() {
2459− // The same in every build and on every platform
2460− assert_eq!(stable_hash(""), 0xf52a_15e9_a9b5_e89b);
2461− assert_eq!(hash_digits(35, 3), "z00");
2462− assert_eq!(hash_digits(u64::MAX, 13), "fsgs46211e5w3");
2463− }
2464−
2465− #[test]
2466− fn a_name_taken_in_the_file_takes_more_digits() {
2467− // These two styles' hashes end in the same 7 digits
2468− let mut styles = StyleCollector::new();
2469− let first = styles.get_class("width:129555px;".into(), Vec::new(), String::new());
2470− let second = styles.get_class("width:170577px;".into(), Vec::new(), String::new());
2471− let (first, second) = (first.unwrap(), second.unwrap());
2472− assert_eq!(first.len(), 3 + CLASS_DIGITS, "{first}");
2473− assert_eq!(second.len(), 3 + CLASS_DIGITS + 1, "{second}");
2474− assert!(second.starts_with(&first), "{first} {second}");
2475− // The same style gets the name it got before
2476− let again = styles.get_class("width:170577px;".into(), Vec::new(), String::new());
2477− assert_eq!(again.as_deref(), Some(second.as_str()));
3803+fn collect_source_lines(nodes: &[Node], mappings: &mut Vec<(usize, usize)>) {
3804+ for node in nodes {
3805+ if let Node::Element(elem) = node {
3806+ if elem.line_num > 0 {
3807+ mappings.push((mappings.len() + 1, elem.line_num));
3808+ }
3809+ collect_source_lines(&elem.children, mappings);
3810+ }
3811+ }
3812+}
3813+
3814+/// Check if a specific element kind exists anywhere in the node tree.
3815+fn has_element_kind(nodes: &[Node], target: &ElementKind) -> bool {
3816+ for node in nodes {
3817+ if let Node::Element(elem) = node {
3818+ if elem.kind == *target {
3819+ return true;
3820+ }
3821+ if has_element_kind(&elem.children, target) {
3822+ return true;
3823+ }
3824+ }
3825+ }
3826+ false
3827+}
3828+
3829+/// Collect unique external domains from generated HTML for DNS prefetch hints.
3830+fn collect_dns_prefetch(html: &str, dev: bool) -> String {
3831+ let mut domains = Vec::new();
3832+ let mut rest = html;
3833+ while let Some(pos) = rest.find("https://") {
3834+ let start = pos + 8; // skip "https://"
3835+ rest = &rest[start..];
3836+ let end = rest
3837+ .find(['/', '"', '\'', ' ', '>', ')'])
3838+ .unwrap_or(rest.len());
3839+ let domain = &rest[..end];
3840+ if !domain.is_empty() && domain.contains('.') && !domains.contains(&domain.to_string()) {
3841+ domains.push(domain.to_string());
3842+ }
3843+ }
3844+ let mut out = String::new();
3845+ for domain in &domains {
3846+ if dev {
3847+ out.push_str(&format!(
3848+ "<link rel=\"dns-prefetch\" href=\"//{}\">\n",
3849+ domain
3850+ ));
3851+ } else {
3852+ out.push_str(&format!(
3853+ "<link rel=\"dns-prefetch\" href=\"//{}\">",
3854+ domain
3855+ ));
3856+ }
24783857 }
3858+ out
24793859}