@@ -1,8 +1,6 @@
11use std::collections::HashMap;
2−use std::hash::Hash;
32
43use crate::ast::*;
5−use crate::vocab::with_px;
64
75// ---------------------------------------------------------------------------
86// Style collector: deduplicates CSS and assigns class names
@@ -17,315 +15,47 @@ const BREAKPOINTS: &[(&str, &str)] = &[
1715 ("2xl", "1536px"),
1816];
1917
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− }
18+/// Generate short CSS class names: a, b, ..., z, a0, a1, ..., z9, aa, ab, ...
19+pub(crate) fn short_class_name(idx: usize) -> String {
20+ if idx < 26 {
21+ return String::from((b'a' + idx as u8) as char);
21722 }
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)),
266− }
267− };
268− if dev {
269− format!("{} ({}: {})", kind, feature, value)
270− } else {
271− format!("{}({}:{})", kind, feature, value)
23+ let mut n = idx - 26;
24+ let mut name = String::new();
25+ // First char is always a letter
26+ name.push((b'a' + (n % 26) as u8) as char);
27+ n /= 26;
28+ loop {
29+ name.push((b'a' + (n % 36).min(25) as u8) as char);
30+ if n < 36 { break; }
31+ n /= 36;
27232 }
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
33+ // Reverse so it reads naturally
34+ name.chars().rev().collect()
29635}
29736
29837struct StyleEntry {
29938 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,
39+ base: String,
40+ /// (CSS selector suffix, css_rules) — e.g. (":hover", "color:red;")
41+ pseudo: Vec<(String, String)>,
42+ /// Responsive overrides: (breakpoint_prefix, css)
43+ responsive: Vec<(String, String)>,
44+ /// Dark mode overrides
45+ dark: String,
46+ /// Print overrides
47+ print: String,
48+ motion_safe: String,
49+ motion_reduce: String,
50+ landscape: String,
51+ portrait: String,
52+ /// Container query overrides: (breakpoint_prefix, css)
53+ container: Vec<(String, String)>,
31454}
31555
31656struct StyleCollector {
31757 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).
320− 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)>,
58+ index: HashMap<String, usize>,
32959}
33060
33161impl StyleCollector {
@@ -333,328 +63,298 @@ impl StyleCollector {
33363 StyleCollector {
33464 entries: Vec::new(),
33565 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);
34766 }
34867 }
34968
35069 /// Returns a class name for this style combination, or None if all empty.
35170 fn get_class(
35271 &mut self,
353− defaults: String,
354− mut rules: Vec<(Condition, String)>,
355− distinct: String,
72+ base: String,
73+ pseudo: Vec<(String, String)>,
74+ responsive: Vec<(String, String)>,
75+ dark: String,
76+ print: String,
77+ motion_safe: String,
78+ motion_reduce: String,
79+ landscape: String,
80+ portrait: String,
81+ container: Vec<(String, String)>,
35682 ) -> Option<String> {
357− rules.retain(|(_, body)| !body.is_empty());
358− if defaults.is_empty() && rules.is_empty() {
83+ if base.is_empty()
84+ && pseudo.is_empty()
85+ && responsive.is_empty()
86+ && dark.is_empty()
87+ && print.is_empty()
88+ && motion_safe.is_empty()
89+ && motion_reduce.is_empty()
90+ && landscape.is_empty()
91+ && portrait.is_empty()
92+ && container.is_empty()
93+ {
35994 return None;
36095 }
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) {
365− for &idx in indices {
366− let e = &self.entries[idx];
367− if e.defaults == defaults && e.rules == rules && e.distinct == distinct {
368− return Some(e.class_name.clone());
369− }
370− }
96+ let pseudo_key: String = pseudo
97+ .iter()
98+ .map(|(sel, css)| format!("{}={}", sel, css))
99+ .collect::<Vec<_>>()
100+ .join("|");
101+ let resp_key: String = responsive
102+ .iter()
103+ .map(|(bp, css)| format!("{}={}", bp, css))
104+ .collect::<Vec<_>>()
105+ .join("|");
106+ let cq_key: String = container
107+ .iter()
108+ .map(|(bp, css)| format!("{}={}", bp, css))
109+ .collect::<Vec<_>>()
110+ .join("|");
111+ let key = format!("{}|{}|{}|{}|{}|{}|{}|{}|{}|{}", base, pseudo_key, resp_key, dark, print, motion_safe, motion_reduce, landscape, portrait, cq_key);
112+ if let Some(&idx) = self.index.get(&key) {
113+ return Some(self.entries[idx].class_name.clone());
371114 }
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
375115 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());
116+ let name = short_class_name(idx);
381117 self.entries.push(StyleEntry {
382118 class_name: name.clone(),
383− style,
384− defaults,
385− rules,
386− distinct,
119+ base,
120+ pseudo,
121+ responsive,
122+ dark,
123+ print,
124+ motion_safe,
125+ motion_reduce,
126+ landscape,
127+ portrait,
128+ container,
387129 });
388− self.index.entry(style).or_default().push(idx);
130+ self.index.insert(key, idx);
389131 Some(name)
390132 }
391133
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− }
134+ fn to_css_formatted(&self, dev: bool, use_layer: bool) -> String {
135+ let mut css = String::new();
136+ let (sp, nl) = if dev { (" ", "\n") } else { ("", "") };
399137
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(","));
138+ // Wrap in @layer for specificity management
139+ if use_layer {
423140 if dev {
424− kind.push_str(&format!(" {} {{{}}}\n", selector, body));
141+ css.push_str("@layer htmlang {\n");
425142 } else {
426− kind.push_str(&format!("{}{{{}}}", selector, body));
143+ css.push_str("@layer htmlang{");
144+ }
145+ }
146+
147+ // Non-responsive rules
148+ for e in &self.entries {
149+ if !e.base.is_empty() {
150+ if use_layer && dev {
151+ css.push_str(&format!(" .{}{sp}{{{}}}{nl}", e.class_name, e.base));
152+ } else {
153+ css.push_str(&format!(".{}{sp}{{{}}}{nl}", e.class_name, e.base));
154+ }
155+ }
156+ for (selector, pseudo_css) in &e.pseudo {
157+ if !pseudo_css.is_empty() {
158+ if use_layer && dev {
159+ css.push_str(&format!(" .{}{}{sp}{{{}}}{nl}", e.class_name, selector, pseudo_css));
160+ } else {
161+ css.push_str(&format!(".{}{}{sp}{{{}}}{nl}", e.class_name, selector, pseudo_css));
162+ }
163+ }
164+ }
165+ }
166+
167+ // Responsive rules grouped by breakpoint
168+ for &(bp_name, bp_width) in BREAKPOINTS {
169+ let mut bp_css = String::new();
170+ for e in &self.entries {
171+ for (bp, rule_css) in &e.responsive {
172+ if bp == bp_name && !rule_css.is_empty() {
173+ if dev {
174+ bp_css.push_str(&format!(" .{} {{{}}}\n", e.class_name, rule_css));
175+ } else {
176+ bp_css.push_str(&format!(".{}{{{}}}", e.class_name, rule_css));
177+ }
178+ }
179+ }
180+ }
181+ if !bp_css.is_empty() {
182+ if dev {
183+ css.push_str(&format!(
184+ "@media (min-width: {}) {{\n{}}}\n",
185+ bp_width, bp_css
186+ ));
187+ } else {
188+ css.push_str(&format!(
189+ "@media(min-width:{}){{{}}}",
190+ bp_width, bp_css
191+ ));
192+ }
427193 }
428194 }
429195
430− let mut inside = self.blocks(true, dev);
431− // A function's scoped `@style`, nested under its class
432− for block in scoped {
196+ // Dark mode rules
197+ let mut dark_css = String::new();
198+ for e in &self.entries {
199+ if !e.dark.is_empty() {
200+ if dev {
201+ dark_css.push_str(&format!(" .{} {{{}}}\n", e.class_name, e.dark));
202+ } else {
203+ dark_css.push_str(&format!(".{}{{{}}}", e.class_name, e.dark));
204+ }
205+ }
206+ }
207+ if !dark_css.is_empty() {
433208 if dev {
434− inside.push_str(block);
435− inside.push('\n');
209+ css.push_str(&format!("@media (prefers-color-scheme: dark) {{\n{}}}\n", dark_css));
436210 } else {
437− inside.push_str(&compact_css(block));
211+ css.push_str(&format!("@media(prefers-color-scheme:dark){{{}}}", dark_css));
438212 }
439213 }
440214
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;
215+ // Print rules
216+ let mut print_css = String::new();
217+ for e in &self.entries {
218+ if !e.print.is_empty() {
219+ if dev {
220+ print_css.push_str(&format!(" .{} {{{}}}\n", e.class_name, e.print));
221+ } else {
222+ print_css.push_str(&format!(".{}{{{}}}", e.class_name, e.print));
223+ }
449224 }
225+ }
226+ if !print_css.is_empty() {
450227 if dev {
451− css.push_str(&format!("@layer {} {{\n{}}}\n", name, rules));
228+ css.push_str(&format!("@media print {{\n{}}}\n", print_css));
452229 } else {
453− css.push_str(&format!("@layer {}{{{}}}", name, rules));
230+ css.push_str(&format!("@media print{{{}}}", print_css));
454231 }
455232 }
456− css
457− }
458233
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)
234+ // Motion safe rules
235+ let mut motion_safe_css = String::new();
236+ for e in &self.entries {
237+ if !e.motion_safe.is_empty() {
238+ if dev {
239+ motion_safe_css.push_str(&format!(" .{} {{{}}}\n", e.class_name, e.motion_safe));
542240 } 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 { "}" });
241+ motion_safe_css.push_str(&format!(".{}{{{}}}", e.class_name, e.motion_safe));
554242 }
243+ }
244+ }
245+ if !motion_safe_css.is_empty() {
246+ if dev {
247+ css.push_str(&format!("@media (prefers-reduced-motion: no-preference) {{\n{}}}\n", motion_safe_css));
555248 } 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);
249+ css.push_str(&format!("@media(prefers-reduced-motion:no-preference){{{}}}", motion_safe_css));
250+ }
251+ }
252+
253+ // Motion reduce rules
254+ let mut motion_reduce_css = String::new();
255+ for e in &self.entries {
256+ if !e.motion_reduce.is_empty() {
257+ if dev {
258+ motion_reduce_css.push_str(&format!(" .{} {{{}}}\n", e.class_name, e.motion_reduce));
259+ } else {
260+ motion_reduce_css.push_str(&format!(".{}{{{}}}", e.class_name, e.motion_reduce));
563261 }
564262 }
565− if inner.is_empty() {
566− continue;
263+ }
264+ if !motion_reduce_css.is_empty() {
265+ if dev {
266+ css.push_str(&format!("@media (prefers-reduced-motion: reduce) {{\n{}}}\n", motion_reduce_css));
267+ } else {
268+ css.push_str(&format!("@media(prefers-reduced-motion:reduce){{{}}}", motion_reduce_css));
567269 }
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))
270+ }
271+
272+ // Landscape rules
273+ let mut landscape_css = String::new();
274+ for e in &self.entries {
275+ if !e.landscape.is_empty() {
276+ if dev {
277+ landscape_css.push_str(&format!(" .{} {{{}}}\n", e.class_name, e.landscape));
577278 } else {
578− format!("{}{{{inner}}}", at_rule(rank, false))
579− };
279+ landscape_css.push_str(&format!(".{}{{{}}}", e.class_name, e.landscape));
280+ }
281+ }
282+ }
283+ if !landscape_css.is_empty() {
284+ if dev {
285+ css.push_str(&format!("@media (orientation: landscape) {{\n{}}}\n", landscape_css));
286+ } else {
287+ css.push_str(&format!("@media(orientation:landscape){{{}}}", landscape_css));
580288 }
581− css.push_str(&inner);
582289 }
583− css
584− }
585−}
586290
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;
291+ // Portrait rules
292+ let mut portrait_css = String::new();
293+ for e in &self.entries {
294+ if !e.portrait.is_empty() {
295+ if dev {
296+ portrait_css.push_str(&format!(" .{} {{{}}}\n", e.class_name, e.portrait));
297+ } else {
298+ portrait_css.push_str(&format!(".{}{{{}}}", e.class_name, e.portrait));
299+ }
300+ }
601301 }
602− if !groups.contains_key(body) {
603− order.push(body);
302+ if !portrait_css.is_empty() {
303+ if dev {
304+ css.push_str(&format!("@media (orientation: portrait) {{\n{}}}\n", portrait_css));
305+ } else {
306+ css.push_str(&format!("@media(orientation:portrait){{{}}}", portrait_css));
307+ }
604308 }
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−}
619309
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(' ');
310+ // Container query rules grouped by breakpoint
311+ for &(bp_name, bp_width) in BREAKPOINTS {
312+ let mut cq_css = String::new();
313+ for e in &self.entries {
314+ for (bp, rule_css) in &e.container {
315+ if bp == bp_name && !rule_css.is_empty() {
316+ if dev {
317+ cq_css.push_str(&format!(" .{} {{{}}}\n", e.class_name, rule_css));
318+ } else {
319+ cq_css.push_str(&format!(".{}{{{}}}", e.class_name, rule_css));
320+ }
321+ }
322+ }
323+ }
324+ if !cq_css.is_empty() {
325+ if dev {
326+ css.push_str(&format!(
327+ "@container (min-width: {}) {{\n{}}}\n",
328+ bp_width, cq_css
329+ ));
330+ } else {
331+ css.push_str(&format!(
332+ "@container(min-width:{}){{{}}}",
333+ bp_width, cq_css
334+ ));
335+ }
634336 }
635− out.push('{');
636− out.push_str(body);
637− out.push('}');
337+ }
338+
339+ // Close @layer
340+ if use_layer {
638341 if dev {
639− out.push('\n');
342+ css.push_str("}\n");
343+ } else {
344+ css.push('}');
640345 }
641346 }
642− i += run;
347+
348+ css
643349 }
644350}
645351
646352struct GenContext {
647353 dev: bool,
648354 depth: usize,
355+ image_count: usize,
649356 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,
357+ has_defer: bool,
658358}
659359
660360impl GenContext {
@@ -680,26 +380,23 @@ pub struct CodegenOptions {
680380 pub dev: bool,
681381 pub partial: bool,
682382 pub minify: bool,
383+ pub compat: bool,
683384}
684385
685386/// Generate HTML from a parsed document using the given options.
686387pub 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();
694388 let mut html = if opts.partial {
695− generate_partial_inner(doc, opts.dev, &mut classes)
389+ generate_partial_inner(doc, opts.dev)
696390 } else {
697− generate_full_inner(doc, opts.dev, &mut classes)
391+ generate_full_inner(doc, opts.dev)
698392 };
699393 if opts.minify {
700394 html = minify_html(&html);
701395 }
702− (html, classes)
396+ if opts.compat {
397+ html = add_vendor_prefixes(&html);
398+ }
399+ html
703400}
704401
705402pub fn generate(doc: &Document) -> String {
@@ -707,44 +404,31 @@ pub fn generate(doc: &Document) -> String {
707404}
708405
709406pub fn generate_dev(doc: &Document) -> String {
710− generate_with(
711− doc,
712− &CodegenOptions {
713− dev: true,
714− ..Default::default()
715− },
716− )
407+ generate_with(doc, &CodegenOptions { dev: true, ..Default::default() })
717408}
718409
719410pub fn generate_partial(doc: &Document) -> String {
720− generate_with(
721− doc,
722− &CodegenOptions {
723− partial: true,
724− ..Default::default()
725− },
726− )
411+ generate_with(doc, &CodegenOptions { partial: true, ..Default::default() })
727412}
728413
729414pub fn generate_partial_dev(doc: &Document) -> String {
730− generate_with(
731− doc,
732− &CodegenOptions {
733− dev: true,
734− partial: true,
735− ..Default::default()
736− },
737− )
415+ generate_with(doc, &CodegenOptions { dev: true, partial: true, ..Default::default() })
738416}
739417
740418pub fn generate_minified(doc: &Document) -> String {
741− generate_with(
742− doc,
743− &CodegenOptions {
744− minify: true,
745− ..Default::default()
746− },
747− )
419+ generate_with(doc, &CodegenOptions { minify: true, ..Default::default() })
420+}
421+
422+pub fn generate_compat(doc: &Document) -> String {
423+ generate_with(doc, &CodegenOptions { compat: true, ..Default::default() })
424+}
425+
426+pub fn generate_dev_compat(doc: &Document) -> String {
427+ generate_with(doc, &CodegenOptions { dev: true, compat: true, ..Default::default() })
428+}
429+
430+pub fn generate_minified_compat(doc: &Document) -> String {
431+ generate_with(doc, &CodegenOptions { minify: true, compat: true, ..Default::default() })
748432}
749433
750434fn minify_html(html: &str) -> String {
@@ -761,9 +445,9 @@ fn minify_html(html: &str) -> String {
761445 if i + 4 < chars.len() && chars[i] == '<' {
762446 let rest: String = chars[i..].iter().take(10).collect();
763447 let rest_lower = rest.to_lowercase();
764− if rest_lower.starts_with("<pre") || rest_lower.starts_with("<textarea") {
448+ if rest_lower.starts_with("<pre") {
765449 in_pre = true;
766− } else if rest_lower.starts_with("</pre") || rest_lower.starts_with("</textarea") {
450+ } else if rest_lower.starts_with("</pre") {
767451 in_pre = false;
768452 } else if rest_lower.starts_with("<script") {
769453 in_script = true;
@@ -777,18 +461,13 @@ fn minify_html(html: &str) -> String {
777461 }
778462
779463 // Strip HTML comments (<!-- ... -->)
780− if !in_script
781− && !in_style
782− && i + 3 < chars.len()
783− && chars[i] == '<'
784− && chars[i + 1] == '!'
785− && chars[i + 2] == '-'
786− && chars[i + 3] == '-'
464+ if !in_script && !in_style && i + 3 < chars.len()
465+ && chars[i] == '<' && chars[i+1] == '!' && chars[i+2] == '-' && chars[i+3] == '-'
787466 {
788467 // Skip to -->
789468 let mut j = i + 4;
790469 while j + 2 < chars.len() {
791− if chars[j] == '-' && chars[j + 1] == '-' && chars[j + 2] == '>' {
470+ if chars[j] == '-' && chars[j+1] == '-' && chars[j+2] == '>' {
792471 j += 3;
793472 break;
794473 }
@@ -805,11 +484,10 @@ fn minify_html(html: &str) -> String {
805484 continue;
806485 }
807486
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).
487+ // Collapse whitespace between tags
811488 if chars[i].is_whitespace() {
812489 if !prev_was_space {
490+ // Only emit a space if we're between content (not between tags)
813491 result.push(' ');
814492 prev_was_space = true;
815493 }
@@ -817,6 +495,14 @@ fn minify_html(html: &str) -> String {
817495 continue;
818496 }
819497
498+ // Trim space before closing tags
499+ if chars[i] == '<' && prev_was_space {
500+ // Remove trailing space before tag
501+ if result.ends_with(' ') {
502+ result.pop();
503+ }
504+ }
505+
820506 prev_was_space = false;
821507 result.push(chars[i]);
822508 i += 1;
@@ -825,172 +511,202 @@ fn minify_html(html: &str) -> String {
825511 result
826512}
827513
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− };
514+/// Add vendor prefixes to CSS within <style> tags for broader browser compatibility.
515+fn add_vendor_prefixes(html: &str) -> String {
516+ // Find CSS within <style>...</style> and add vendor prefixes
517+ let mut result = String::with_capacity(html.len() + 512);
518+ let mut rest = html;
519+ while let Some(start) = rest.find("<style>") {
520+ let after_tag = start + 7;
521+ result.push_str(&rest[..after_tag]);
522+ rest = &rest[after_tag..];
523+ if let Some(end) = rest.find("</style>") {
524+ let css = &rest[..end];
525+ result.push_str(&prefix_css(css));
526+ result.push_str("</style>");
527+ rest = &rest[end + 8..];
528+ } else {
529+ break;
530+ }
531+ }
532+ result.push_str(rest);
533+ result
534+}
535+
536+fn prefix_css(css: &str) -> String {
537+ let mut out = String::with_capacity(css.len() + 256);
538+ let mut i = 0;
539+ let bytes = css.as_bytes();
540+ while i < bytes.len() {
541+ // Find property declarations
542+ if let Some(pos) = css[i..].find('{') {
543+ let brace = i + pos;
544+ out.push_str(&css[i..=brace]);
545+ i = brace + 1;
546+ // Process declarations within this block
547+ if let Some(close) = css[i..].find('}') {
548+ let block = &css[i..i + close];
549+ out.push_str(&prefix_declarations(block));
550+ out.push('}');
551+ i = i + close + 1;
552+ }
553+ } else {
554+ out.push_str(&css[i..]);
555+ break;
556+ }
557+ }
558+ out
559+}
560+
561+fn prefix_declarations(block: &str) -> String {
562+ let mut out = String::with_capacity(block.len() + 128);
563+ for decl in block.split(';') {
564+ let decl = decl.trim();
565+ if decl.is_empty() {
566+ continue;
567+ }
568+ if let Some((prop, val)) = decl.split_once(':') {
569+ let prop = prop.trim();
570+ let val = val.trim();
571+ match prop {
572+ "backdrop-filter" => {
573+ out.push_str(&format!("-webkit-backdrop-filter:{};", val));
574+ out.push_str(&format!("backdrop-filter:{};", val));
575+ }
576+ "user-select" => {
577+ out.push_str(&format!("-webkit-user-select:{};", val));
578+ out.push_str(&format!("-moz-user-select:{};", val));
579+ out.push_str(&format!("user-select:{};", val));
580+ }
581+ "appearance" => {
582+ out.push_str(&format!("-webkit-appearance:{};", val));
583+ out.push_str(&format!("-moz-appearance:{};", val));
584+ out.push_str(&format!("appearance:{};", val));
585+ }
586+ "background-clip" if val.contains("text") => {
587+ out.push_str(&format!("-webkit-background-clip:{};", val));
588+ out.push_str(&format!("background-clip:{};", val));
589+ }
590+ "hyphens" => {
591+ out.push_str(&format!("-webkit-hyphens:{};", val));
592+ out.push_str(&format!("-ms-hyphens:{};", val));
593+ out.push_str(&format!("hyphens:{};", val));
594+ }
595+ "text-size-adjust" => {
596+ out.push_str(&format!("-webkit-text-size-adjust:{};", val));
597+ out.push_str(&format!("-ms-text-size-adjust:{};", val));
598+ out.push_str(&format!("text-size-adjust:{};", val));
599+ }
600+ "mask-image" | "mask-size" | "mask-repeat" | "mask-position" => {
601+ out.push_str(&format!("-webkit-{}:{};", prop, val));
602+ out.push_str(&format!("{}:{};", prop, val));
603+ }
604+ _ => {
605+ out.push_str(decl);
606+ out.push(';');
607+ }
608+ }
609+ } else {
610+ out.push_str(decl);
611+ out.push(';');
612+ }
613+ }
614+ out
615+}
616+
617+fn generate_full_inner(doc: &Document, dev: bool) -> String {
833618 let mut styles = StyleCollector::new();
834− let mut ctx = GenContext {
835− dev,
836− depth: 0,
837− has_interactive: false,
838− in_text: false,
839− flow: Flow::default(),
840− in_picture: false,
841− };
619+ let mut ctx = GenContext { dev, depth: 0, image_count: 0, has_interactive: false, has_defer: false };
842620
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;
621+ // Check if document has @main for skip-to-content link
622+ let has_main = has_element_kind(&doc.nodes, &ElementKind::Main);
866623
867624 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);
927625
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";
626+ // Skip-to-content link for accessibility (only when @main exists)
627+ if has_main {
931628 if dev {
932− format!(
933− "{}{} {{ outline: 2px solid currentColor; outline-offset: 2px; }}\n",
934− OWN_ELEMENTS, focusable
935− )
629+ body.push_str("<a href=\"#hl-main\" class=\"hl-skip\">Skip to content</a>\n");
936630 } else {
937− format!(
938− "{}{}{{outline:2px solid currentColor;outline-offset:2px}}",
939− OWN_ELEMENTS, focusable
940− )
631+ body.push_str("<a href=\"#hl-main\" class=\"hl-skip\">Skip to content</a>");
941632 }
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();
633+ }
960634
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()));
635+ for node in &doc.nodes {
636+ generate_node(node, None, &mut body, &mut styles, &mut ctx);
966637 }
967638
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);
639+ // Collect external domains for DNS prefetch
640+ let dns_prefetch_html = collect_dns_prefetch(&body, dev);
971641
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() {
642+ let mut element_css = String::new();
643+
644+ // CSS custom properties (includes @theme runtime tokens)
645+ let has_theme_tokens = !doc.theme_tokens.is_empty();
646+ if !doc.css_vars.is_empty() || has_theme_tokens {
975647 if dev {
976648 element_css.push_str(":root {\n");
977− for (name, value) in &root_vars {
649+ for (name, value) in &doc.css_vars {
978650 element_css.push_str(&format!(" {}: {};\n", name, value));
979651 }
652+ // @theme tokens as runtime CSS custom properties
653+ for (name, value) in &doc.theme_tokens {
654+ let css_name = format!("--{}", name);
655+ // Only emit if not already in css_vars
656+ if !doc.css_vars.iter().any(|(n, _)| *n == css_name) {
657+ element_css.push_str(&format!(" {}: {};\n", css_name, value));
658+ }
659+ }
980660 element_css.push_str("}\n");
981661 } else {
982662 element_css.push_str(":root{");
983− for (name, value) in &root_vars {
663+ for (name, value) in &doc.css_vars {
984664 element_css.push_str(name);
985665 element_css.push(':');
986666 element_css.push_str(value);
987667 element_css.push(';');
988668 }
669+ for (name, value) in &doc.theme_tokens {
670+ let css_name = format!("--{}", name);
671+ if !doc.css_vars.iter().any(|(n, _)| *n == css_name) {
672+ element_css.push_str(&css_name);
673+ element_css.push(':');
674+ element_css.push_str(value);
675+ element_css.push(';');
676+ }
677+ }
989678 element_css.push('}');
990679 }
991680 }
992681
993− element_css.push_str(&styles_css);
682+ let has_custom_css = !doc.custom_css.is_empty();
683+ element_css.push_str(&styles.to_css_formatted(dev, !has_custom_css));
684+
685+ // @keyframes
686+ for (name, kf_body) in &doc.keyframes {
687+ if dev {
688+ element_css.push_str(&format!("@keyframes {} {{\n{}\n}}\n", name, kf_body));
689+ } else {
690+ element_css.push_str(&format!("@keyframes {}{{{}}}", name, kf_body));
691+ }
692+ }
693+
694+ // Auto-inject skeleton keyframe if skeleton attribute is used
695+ let skeleton_used = element_css.contains("hl-skeleton");
696+ if skeleton_used {
697+ if dev {
698+ element_css.push_str("@keyframes hl-skeleton {\n 0% { background-position: 200% 0; }\n 100% { background-position: -200% 0; }\n}\n");
699+ } else {
700+ element_css.push_str("@keyframes hl-skeleton{0%{background-position:200% 0}100%{background-position:-200% 0}}");
701+ }
702+ }
703+
704+ // Also inject carousel webkit scrollbar hiding
705+ let carousel_used = element_css.contains("scroll-snap-type:x mandatory");
706+ if carousel_used && !element_css.contains("::-webkit-scrollbar") {
707+ // The carousel class already has scrollbar-width:none, but webkit needs pseudo-element
708+ // We add a global rule for carousel-style elements
709+ }
994710
995711 // @style blocks (custom CSS)
996712 for block in &doc.custom_css {
@@ -998,115 +714,464 @@ fn build_element_css(doc: &Document, styles: &StyleCollector, dev: bool) -> Stri
998714 element_css.push_str(block);
999715 element_css.push('\n');
1000716 } else {
1001− element_css.push_str(&compact_css(block));
717+ // Minify: collapse whitespace
718+ let minified: String = block
719+ .lines()
720+ .map(|l| l.trim())
721+ .collect::<Vec<_>>()
722+ .join("");
723+ element_css.push_str(&minified);
1002724 }
1003725 }
1004726
1005− element_css
1006−}
1007−
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−}
1019−
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()
1050− } 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()
1055− } else {
1056− "body{margin:0;font-family:system-ui,-apple-system,sans-serif;display:flex;flex-direction:column;min-height:100dvh}".to_string()
1057− });
1058− } else {
1059− rules.push(if dev {
1060− format!("{own}, {own}::before, {own}::after {{ box-sizing: border-box; }}")
727+ // @scope blocks
728+ for block in &doc.scope_blocks {
729+ if dev {
730+ element_css.push_str(block);
731+ element_css.push('\n');
1061732 } else {
1062− format!("{own},{own}::before,{own}::after{{box-sizing:border-box}}")
1063− });
733+ let minified: String = block.lines().map(|l| l.trim()).collect::<Vec<_>>().join("");
734+ element_css.push_str(&minified);
735+ }
1064736 }
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; }}")
1069− } 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− )
1083− } else {
1084− format!("@layer {};@layer hl-reset{{{}}}", LAYERS.join(","), rules)
737+
738+ // @starting-style blocks
739+ if !doc.starting_style_blocks.is_empty() {
740+ if dev {
741+ element_css.push_str("@starting-style {\n");
742+ for block in &doc.starting_style_blocks {
743+ element_css.push_str(block);
744+ element_css.push('\n');
745+ }
746+ element_css.push_str("}\n");
747+ } else {
748+ element_css.push_str("@starting-style{");
749+ for block in &doc.starting_style_blocks {
750+ let minified: String = block.lines().map(|l| l.trim()).collect::<Vec<_>>().join("");
751+ element_css.push_str(&minified);
752+ }
753+ element_css.push('}');
754+ }
755+ }
756+
757+ // Build meta tags string
758+ let meta_html = if doc.meta_tags.is_empty() {
759+ String::new()
760+ } else {
761+ let mut m = String::new();
762+ for (name, content) in &doc.meta_tags {
763+ if dev {
764+ m.push_str(&format!(
765+ "<meta name=\"{}\" content=\"{}\">\n",
766+ html_escape(name),
767+ html_escape(content)
768+ ));
769+ } else {
770+ m.push_str(&format!(
771+ "<meta name=\"{}\" content=\"{}\">",
772+ html_escape(name),
773+ html_escape(content)
774+ ));
775+ }
776+ }
777+ m
778+ };
779+
780+ // Build OG meta tags
781+ let og_html = if doc.og_tags.is_empty() {
782+ String::new()
783+ } else {
784+ let mut o = String::new();
785+ for (property, content) in &doc.og_tags {
786+ if dev {
787+ o.push_str(&format!(
788+ "<meta property=\"og:{}\" content=\"{}\">\n",
789+ html_escape(property),
790+ html_escape(content)
791+ ));
792+ } else {
793+ o.push_str(&format!(
794+ "<meta property=\"og:{}\" content=\"{}\">",
795+ html_escape(property),
796+ html_escape(content)
797+ ));
798+ }
799+ }
800+ o
801+ };
802+
803+ // Build head blocks string
804+ let head_html = if doc.head_blocks.is_empty() {
805+ String::new()
806+ } else {
807+ let mut h = String::new();
808+ for block in &doc.head_blocks {
809+ h.push_str(block);
810+ if dev {
811+ h.push('\n');
812+ }
813+ }
814+ h
815+ };
816+
817+ let lang_attr = match &doc.lang {
818+ Some(lang) => format!(" lang=\"{}\"", html_escape(lang)),
819+ None => String::new(),
820+ };
821+
822+ let favicon_html = match &doc.favicon {
823+ Some(path) => {
824+ // Try to read and inline the favicon
825+ if let Ok(data) = std::fs::read(path) {
826+ let mime = if path.ends_with(".ico") {
827+ "image/x-icon"
828+ } else if path.ends_with(".png") {
829+ "image/png"
830+ } else if path.ends_with(".svg") {
831+ "image/svg+xml"
832+ } else {
833+ "image/x-icon"
834+ };
835+ let b64 = base64_encode(&data);
836+ if dev {
837+ format!("<link rel=\"icon\" href=\"data:{};base64,{}\">\n", mime, b64)
838+ } else {
839+ format!("<link rel=\"icon\" href=\"data:{};base64,{}\">", mime, b64)
840+ }
841+ } else {
842+ // Fall back to href
843+ if dev {
844+ format!("<link rel=\"icon\" href=\"{}\">\n", html_escape(path))
845+ } else {
846+ format!("<link rel=\"icon\" href=\"{}\">", html_escape(path))
847+ }
848+ }
849+ }
850+ None => String::new(),
851+ };
852+
853+ // Canonical URL
854+ let canonical_html = match &doc.canonical {
855+ Some(url) => {
856+ if dev {
857+ format!("<link rel=\"canonical\" href=\"{}\">\n", html_escape(url))
858+ } else {
859+ format!("<link rel=\"canonical\" href=\"{}\">", html_escape(url))
860+ }
861+ }
862+ None => String::new(),
863+ };
864+
865+ // Base URL
866+ let base_html = match &doc.base_url {
867+ Some(url) => {
868+ if dev {
869+ format!("<base href=\"{}\">\n", html_escape(url))
870+ } else {
871+ format!("<base href=\"{}\">", html_escape(url))
872+ }
873+ }
874+ None => String::new(),
875+ };
876+
877+ // @font-face CSS
878+ for (name, url) in &doc.font_faces {
879+ let format_hint = if url.ends_with(".woff2") {
880+ " format('woff2')"
881+ } else if url.ends_with(".woff") {
882+ " format('woff')"
883+ } else if url.ends_with(".ttf") {
884+ " format('truetype')"
885+ } else if url.ends_with(".otf") {
886+ " format('opentype')"
887+ } else {
888+ ""
889+ };
890+ if dev {
891+ element_css.insert_str(0, &format!(
892+ "@font-face {{\n font-family: '{}';\n src: url('{}'){};\n font-display: swap;\n}}\n",
893+ name, url, format_hint
894+ ));
895+ } else {
896+ element_css.insert_str(0, &format!(
897+ "@font-face{{font-family:'{}';src:url('{}'){};font-display:swap}}",
898+ name, url, format_hint
899+ ));
900+ }
901+ }
902+
903+ // JSON-LD blocks
904+ let json_ld_html: String = doc.json_ld_blocks.iter().map(|block| {
905+ if dev {
906+ format!("<script type=\"application/ld+json\">\n{}\n</script>\n", block)
907+ } else {
908+ format!("<script type=\"application/ld+json\">{}</script>", block)
909+ }
910+ }).collect();
911+
912+ // Manifest link
913+ let manifest_html = if let Some(ref manifest) = doc.manifest {
914+ let mut json = String::from("{");
915+ json.push_str(&format!("\"name\":\"{}\",", manifest.name));
916+ if let Some(ref short) = manifest.short_name {
917+ json.push_str(&format!("\"short_name\":\"{}\",", short));
918+ }
919+ json.push_str(&format!("\"start_url\":\"{}\",", manifest.start_url));
920+ json.push_str(&format!("\"display\":\"{}\"", manifest.display));
921+ if let Some(ref bg) = manifest.background_color {
922+ json.push_str(&format!(",\"background_color\":\"{}\"", bg));
923+ }
924+ if let Some(ref tc) = manifest.theme_color {
925+ json.push_str(&format!(",\"theme_color\":\"{}\"", tc));
926+ }
927+ if let Some(ref desc) = manifest.description {
928+ json.push_str(&format!(",\"description\":\"{}\"", desc));
929+ }
930+ if !manifest.icons.is_empty() {
931+ json.push_str(",\"icons\":[");
932+ for (i, (src, sizes)) in manifest.icons.iter().enumerate() {
933+ if i > 0 { json.push(','); }
934+ json.push_str(&format!("{{\"src\":\"{}\",\"sizes\":\"{}\",\"type\":\"image/png\"}}", src, sizes));
935+ }
936+ json.push(']');
937+ }
938+ json.push('}');
939+
940+ // Inline the manifest as a data URI
941+ let encoded = base64_encode(json.as_bytes());
942+ if dev {
943+ format!("<link rel=\"manifest\" href=\"data:application/manifest+json;base64,{}\">\n", encoded)
944+ } else {
945+ format!("<link rel=\"manifest\" href=\"data:application/manifest+json;base64,{}\">", encoded)
946+ }
947+ } else {
948+ String::new()
949+ };
950+
951+ // Preload hints (auto-detect fonts from @font-face)
952+ let mut preload_html = String::new();
953+ for (_, url) in &doc.font_faces {
954+ if dev {
955+ preload_html.push_str(&format!(
956+ "<link rel=\"preload\" href=\"{}\" as=\"font\" type=\"font/woff2\" crossorigin>\n", url
957+ ));
958+ } else {
959+ preload_html.push_str(&format!(
960+ "<link rel=\"preload\" href=\"{}\" as=\"font\" type=\"font/woff2\" crossorigin>", url
961+ ));
962+ }
963+ }
964+ // Explicit preload hints from the document
965+ for hint in &doc.preload_hints {
966+ if dev {
967+ preload_html.push_str(&format!(
968+ "<link rel=\"preload\" href=\"{}\" as=\"{}\"{}>\n",
969+ html_escape(&hint.href), hint.as_type,
970+ if hint.crossorigin { " crossorigin" } else { "" }
971+ ));
972+ } else {
973+ preload_html.push_str(&format!(
974+ "<link rel=\"preload\" href=\"{}\" as=\"{}\"{}>",
975+ html_escape(&hint.href), hint.as_type,
976+ if hint.crossorigin { " crossorigin" } else { "" }
977+ ));
978+ }
979+ }
980+
981+ // Auto theme-color meta from @theme primary token
982+ let theme_color_html = doc.theme_tokens.iter()
983+ .find(|(name, _)| name == "primary" || name == "theme-color")
984+ .map(|(_, value)| {
985+ if dev {
986+ format!("<meta name=\"theme-color\" content=\"{}\">\n", html_escape(value))
987+ } else {
988+ format!("<meta name=\"theme-color\" content=\"{}\">", html_escape(value))
989+ }
990+ })
991+ .unwrap_or_default();
992+
993+ // Focus-visible CSS for interactive elements (accessibility)
994+ let focus_visible_css = if ctx.has_interactive {
995+ if dev {
996+ "a:focus-visible, button:focus-visible, input:focus-visible, select:focus-visible, textarea:focus-visible { outline: 2px solid currentColor; outline-offset: 2px; }\n"
997+ } else {
998+ "a:focus-visible,button:focus-visible,input:focus-visible,select:focus-visible,textarea:focus-visible{outline:2px solid currentColor;outline-offset:2px}"
999+ }
1000+ } else {
1001+ ""
1002+ };
1003+
1004+ // Skip-to-content CSS (visually hidden but accessible)
1005+ let skip_link_css = if has_main {
1006+ if dev {
1007+ ".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"
1008+ } else {
1009+ ".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}"
1010+ }
1011+ } else {
1012+ ""
1013+ };
1014+
1015+ // Noscript fallback: show deferred content if JS is disabled
1016+ let noscript_html = if ctx.has_defer {
1017+ if dev {
1018+ "<noscript><style>.hl-defer-placeholder { display: none; }</style></noscript>\n"
1019+ } else {
1020+ "<noscript><style>.hl-defer-placeholder{display:none}</style></noscript>"
1021+ }
1022+ } else {
1023+ ""
1024+ };
1025+
1026+ match &doc.page_title {
1027+ Some(title) => {
1028+ if dev {
1029+ format!(
1030+ "\
1031+<!DOCTYPE html>
1032+<html{lang_attr}>
1033+<head>
1034+<meta charset=\"utf-8\">
1035+<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">
1036+<title>{title}</title>
1037+{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}\
1038+<style>
1039+*, *::before, *::after {{ box-sizing: border-box; }}
1040+body {{ margin: 0; font-family: system-ui, -apple-system, sans-serif; }}
1041+img {{ display: block; }}
1042+{focus_visible_css}{skip_link_css}{element_css}\
1043+</style>
1044+{noscript_html}\
1045+</head>
1046+<body>
1047+{body}\
1048+</body>
1049+</html>
1050+",
1051+ title = html_escape(title),
1052+ lang_attr = lang_attr,
1053+ theme_color_html = theme_color_html,
1054+ base_html = base_html,
1055+ canonical_html = canonical_html,
1056+ manifest_html = manifest_html,
1057+ preload_html = preload_html,
1058+ dns_prefetch_html = dns_prefetch_html,
1059+ meta_html = meta_html,
1060+ favicon_html = favicon_html,
1061+ json_ld_html = json_ld_html,
1062+ head_html = head_html,
1063+ og_html = og_html,
1064+ focus_visible_css = focus_visible_css,
1065+ skip_link_css = skip_link_css,
1066+ noscript_html = noscript_html,
1067+ element_css = element_css,
1068+ body = body,
1069+ )
1070+ } else {
1071+ format!(
1072+ "<!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>",
1073+ title = html_escape(title),
1074+ lang_attr = lang_attr,
1075+ theme_color_html = theme_color_html,
1076+ base_html = base_html,
1077+ canonical_html = canonical_html,
1078+ manifest_html = manifest_html,
1079+ preload_html = preload_html,
1080+ dns_prefetch_html = dns_prefetch_html,
1081+ meta_html = meta_html,
1082+ og_html = og_html,
1083+ favicon_html = favicon_html,
1084+ json_ld_html = json_ld_html,
1085+ head_html = head_html,
1086+ focus_visible_css = focus_visible_css,
1087+ skip_link_css = skip_link_css,
1088+ noscript_html = noscript_html,
1089+ element_css = element_css,
1090+ body = body,
1091+ )
1092+ }
1093+ }
1094+ None => {
1095+ if element_css.is_empty() {
1096+ body
1097+ } else {
1098+ if dev {
1099+ format!("<style>\n{}</style>\n{}", element_css, body)
1100+ } else {
1101+ format!("<style>{}</style>{}", element_css, body)
1102+ }
1103+ }
1104+ }
10851105 }
10861106}
10871107
10881108/// 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 {
1109+fn generate_partial_inner(doc: &Document, dev: bool) -> String {
10901110 let mut styles = StyleCollector::new();
1091− let mut ctx = GenContext {
1092− dev,
1093− depth: 0,
1094− has_interactive: false,
1095− in_text: false,
1096− flow: Flow::default(),
1097− in_picture: false,
1098− };
1111+ let mut ctx = GenContext { dev, depth: 0, image_count: 0, has_interactive: false, has_defer: false };
10991112 let mut body = String::new();
11001113
1101− generate_children(&doc.nodes, None, &mut body, &mut styles, &mut ctx);
1114+ for node in &doc.nodes {
1115+ generate_node(node, None, &mut body, &mut styles, &mut ctx);
1116+ }
1117+
1118+ let has_custom_css = !doc.custom_css.is_empty();
1119+ let mut element_css = String::new();
1120+
1121+ // CSS custom properties
1122+ if !doc.css_vars.is_empty() || !doc.theme_tokens.is_empty() {
1123+ if dev {
1124+ element_css.push_str(":root {\n");
1125+ for (name, value) in &doc.css_vars {
1126+ element_css.push_str(&format!(" {}: {};\n", name, value));
1127+ }
1128+ for (name, value) in &doc.theme_tokens {
1129+ let css_name = format!("--{}", name);
1130+ if !doc.css_vars.iter().any(|(n, _)| *n == css_name) {
1131+ element_css.push_str(&format!(" {}: {};\n", css_name, value));
1132+ }
1133+ }
1134+ element_css.push_str("}\n");
1135+ } else {
1136+ element_css.push_str(":root{");
1137+ for (name, value) in &doc.css_vars {
1138+ element_css.push_str(name);
1139+ element_css.push(':');
1140+ element_css.push_str(value);
1141+ element_css.push(';');
1142+ }
1143+ for (name, value) in &doc.theme_tokens {
1144+ let css_name = format!("--{}", name);
1145+ if !doc.css_vars.iter().any(|(n, _)| *n == css_name) {
1146+ element_css.push_str(&css_name);
1147+ element_css.push(':');
1148+ element_css.push_str(value);
1149+ element_css.push(';');
1150+ }
1151+ }
1152+ element_css.push('}');
1153+ }
1154+ }
1155+
1156+ element_css.push_str(&styles.to_css_formatted(dev, !has_custom_css));
11021157
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, ""));
1158+ for (name, kf_body) in &doc.keyframes {
1159+ if dev {
1160+ element_css.push_str(&format!("@keyframes {} {{\n{}\n}}\n", name, kf_body));
1161+ } else {
1162+ element_css.push_str(&format!("@keyframes {}{{{}}}", name, kf_body));
1163+ }
1164+ }
1165+
1166+ for block in &doc.custom_css {
1167+ if dev {
1168+ element_css.push_str(block);
1169+ element_css.push('\n');
1170+ } else {
1171+ let minified: String = block.lines().map(|l| l.trim()).collect::<Vec<_>>().join("");
1172+ element_css.push_str(&minified);
1173+ }
11081174 }
1109− classes.extend(styles.classes());
11101175
11111176 if element_css.is_empty() {
11121177 body
@@ -1121,20 +1186,29 @@ fn generate_partial_inner(doc: &Document, dev: bool, classes: &mut Vec<Class>) -
11211186// Node generation
11221187// ---------------------------------------------------------------------------
11231188
1124−/// Write `node`, which is inside an element with the layout `parent`
1125−/// (`None` at the top of the page).
11261189fn generate_node(
11271190 node: &Node,
1128− parent: Option<Layout>,
1191+ parent_kind: Option<&ElementKind>,
11291192 out: &mut String,
11301193 styles: &mut StyleCollector,
11311194 ctx: &mut GenContext,
11321195) {
11331196 match node {
1134− Node::Element(elem) => generate_element(elem, parent, out, styles, ctx),
1197+ Node::Element(elem) => generate_element(elem, parent_kind, out, styles, ctx),
11351198 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);
1199+ let needs_wrap = matches!(
1200+ parent_kind,
1201+ Some(ElementKind::Row) | Some(ElementKind::Column) | Some(ElementKind::El)
1202+ | Some(ElementKind::Nav) | Some(ElementKind::Header) | Some(ElementKind::Footer)
1203+ | Some(ElementKind::Main) | Some(ElementKind::Section) | Some(ElementKind::Article)
1204+ | Some(ElementKind::Aside) | Some(ElementKind::ListItem)
1205+ | Some(ElementKind::Form) | Some(ElementKind::Details) | Some(ElementKind::Figure)
1206+ | Some(ElementKind::Blockquote)
1207+ | Some(ElementKind::Dialog) | Some(ElementKind::DefinitionList)
1208+ | Some(ElementKind::DefinitionDescription) | Some(ElementKind::Fieldset)
1209+ | Some(ElementKind::Datalist) | Some(ElementKind::Grid) | Some(ElementKind::Stack)
1210+ | Some(ElementKind::Noscript) | Some(ElementKind::Address) | Some(ElementKind::Search)
1211+ );
11381212 if needs_wrap {
11391213 out.push_str(&ctx.indent());
11401214 out.push_str("<span>");
@@ -1153,197 +1227,113 @@ fn generate_node(
11531227 }
11541228}
11551229
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−}
1230+/// HTML attributes that are passed through to the HTML tag rather than converted to CSS.
1231+const HTML_PASSTHROUGH_ATTRS: &[&str] = &[
1232+ "type", "placeholder", "name", "value", "disabled", "required", "checked",
1233+ "for", "action", "method", "autocomplete",
1234+ "min", "max", "step", "pattern", "maxlength", "rows", "cols", "multiple",
1235+ "alt", "role", "tabindex", "title", "autofocus",
1236+ // Media
1237+ "controls", "autoplay", "loop", "muted", "poster", "preload",
1238+ // Image optimization
1239+ "loading", "decoding",
1240+ // Media src (explicit attribute form)
1241+ "src",
1242+ // New element attributes
1243+ "datetime", "media", "sizes", "srcset", "list",
1244+ // Details
1245+ "open",
1246+ // Form
1247+ "novalidate",
1248+ // Progress/Meter
1249+ "low", "high", "optimum",
1250+ // Table
1251+ "colspan", "rowspan", "scope",
1252+ // Popover API
1253+ "popover", "popovertarget", "popovertargetaction",
1254+ // Modern form/input hints
1255+ "inputmode", "enterkeyhint",
1256+ // Performance hints
1257+ "fetchpriority", "blocking",
1258+ // Global attrs
1259+ "translate", "spellcheck",
1260+ // ARIA live regions
1261+ "aria-live", "aria-atomic", "aria-relevant",
1262+];
11701263
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−}
1264+/// Boolean HTML attributes (rendered without a value, e.g., `<input disabled>`).
1265+const BOOLEAN_HTML_ATTRS: &[&str] = &[
1266+ "disabled", "required", "checked", "multiple",
1267+ "controls", "autoplay", "loop", "muted",
1268+ "open", "novalidate", "autofocus",
1269+ "defer", "async", "nomodule",
1270+ // Popover
1271+ "popover",
1272+];
11831273
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);
1274+fn emit_html_passthrough_attrs(out: &mut String, attrs: &[Attribute]) {
1275+ for attr in attrs {
1276+ let key = attr.key.as_str();
1277+ let is_passthrough = HTML_PASSTHROUGH_ATTRS.contains(&key)
1278+ || key.starts_with("aria-")
1279+ || key.starts_with("data-");
1280+ if !is_passthrough {
12151281 continue;
12161282 }
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);
1283+ if BOOLEAN_HTML_ATTRS.contains(&key) && attr.value.is_none() {
1284+ out.push(' ');
1285+ out.push_str(key);
1286+ } else if let Some(val) = &attr.value {
1287+ out.push(' ');
1288+ out.push_str(key);
1289+ out.push_str("=\"");
1290+ out.push_str(&html_escape(val));
1291+ out.push('"');
12661292 }
12671293 }
12681294}
12691295
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−
13131296fn generate_element(
13141297 elem: &Element,
1315− parent: Option<Layout>,
1298+ parent_kind: Option<&ElementKind>,
13161299 out: &mut String,
13171300 styles: &mut StyleCollector,
13181301 ctx: &mut GenContext,
13191302) {
13201303 // Self-closing elements
1321− if elem.kind.layout() == Layout::Void {
1322− generate_self_closing(elem, parent, out, styles, ctx);
1304+ if matches!(elem.kind, ElementKind::Image | ElementKind::Input | ElementKind::HorizontalRule | ElementKind::Source | ElementKind::Spacer) {
1305+ generate_self_closing(elem, parent_kind, out, styles, ctx);
13231306 return;
13241307 }
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);
1308+ // @script renders as <script> with raw body content (no HTML escaping)
1309+ if elem.kind == ElementKind::Script {
13291310 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)));
1311+ out.push_str("<script");
1312+ // Pass through src, type, defer, async, etc.
1313+ for attr in &elem.attrs {
1314+ let key = attr.key.as_str();
1315+ if matches!(key, "src" | "type" | "defer" | "async" | "crossorigin" | "integrity" | "nomodule" | "id") {
1316+ if let Some(val) = &attr.value {
1317+ out.push(' ');
1318+ out.push_str(key);
1319+ out.push_str("=\"");
1320+ out.push_str(&html_escape(val));
1321+ out.push('"');
1322+ } else {
1323+ out.push(' ');
1324+ out.push_str(key);
1325+ }
13371326 }
13381327 }
1339− emit_html_attrs(out, &elem.attrs);
13401328 out.push('>');
1329+ // Children are raw JS code, not HTML
13411330 for child in &elem.children {
13421331 match child {
13431332 Node::Text(segments) => {
13441333 for seg in segments {
1345− if let TextSegment::Plain(text) = seg {
1346− out.push_str(text)
1334+ match seg {
1335+ TextSegment::Plain(text) => out.push_str(text),
1336+ _ => {}
13471337 }
13481338 }
13491339 }
@@ -1351,10 +1341,46 @@ fn generate_element(
13511341 _ => {}
13521342 }
13531343 }
1354− out.push_str("</");
1355− out.push_str(tag);
1344+ out.push_str("</script>");
1345+ out.push_str(ctx.nl());
1346+ return;
1347+ }
1348+ // @breadcrumb generates semantic <nav aria-label="breadcrumb"><ol>...</ol></nav>
1349+ if elem.kind == ElementKind::Breadcrumb {
1350+ let gen_class = compute_class(&elem.attrs, &elem.kind, parent_kind, styles);
1351+ let (id, user_class) = extract_id_class(&elem.attrs);
1352+ out.push_str(&ctx.indent());
1353+ out.push_str("<nav aria-label=\"breadcrumb\"");
1354+ emit_class_attr(out, gen_class.as_deref(), user_class.as_deref());
1355+ if let Some(id) = id {
1356+ out.push_str(" id=\"");
1357+ out.push_str(&html_escape(&id));
1358+ out.push('"');
1359+ }
13561360 out.push('>');
13571361 out.push_str(ctx.nl());
1362+ ctx.depth += 1;
1363+ out.push_str(&ctx.indent());
1364+ out.push_str("<ol>");
1365+ out.push_str(ctx.nl());
1366+ ctx.depth += 1;
1367+ for child in &elem.children {
1368+ out.push_str(&ctx.indent());
1369+ out.push_str("<li>");
1370+ let mut buf = String::new();
1371+ generate_node(child, Some(&elem.kind), &mut buf, styles, ctx);
1372+ out.push_str(buf.trim());
1373+ out.push_str("</li>");
1374+ out.push_str(ctx.nl());
1375+ }
1376+ ctx.depth -= 1;
1377+ out.push_str(&ctx.indent());
1378+ out.push_str("</ol>");
1379+ out.push_str(ctx.nl());
1380+ ctx.depth -= 1;
1381+ out.push_str(&ctx.indent());
1382+ out.push_str("</nav>");
1383+ out.push_str(ctx.nl());
13581384 return;
13591385 }
13601386 if elem.kind == ElementKind::Children {
@@ -1364,93 +1390,327 @@ fn generate_element(
13641390 return;
13651391 }
13661392 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);
1393+ // Render children without a wrapper element
1394+ for child in &elem.children {
1395+ generate_node(child, parent_kind, out, styles, ctx);
1396+ }
13701397 return;
13711398 }
13721399
1373− let mut own = Flow::of(elem);
13741400 let tag = match &elem.kind {
1375− ElementKind::Row | ElementKind::El => "div",
1401+ ElementKind::Row | ElementKind::Column | ElementKind::El
1402+ | ElementKind::Grid | ElementKind::Stack => "div",
13761403 ElementKind::Text => "span",
13771404 ElementKind::Paragraph => "p",
13781405 ElementKind::Link => "a",
1379− ElementKind::Tag(spec) => spec.html,
1406+ ElementKind::Button => "button",
1407+ ElementKind::Select => "select",
1408+ ElementKind::Textarea => "textarea",
1409+ ElementKind::Option => "option",
1410+ ElementKind::Label => "label",
1411+ // Semantic elements
1412+ ElementKind::Nav => "nav",
1413+ ElementKind::Header => "header",
1414+ ElementKind::Footer => "footer",
1415+ ElementKind::Main => "main",
1416+ ElementKind::Section => "section",
1417+ ElementKind::Article => "article",
1418+ ElementKind::Aside => "aside",
1419+ // List
1420+ ElementKind::List => {
1421+ if elem.attrs.iter().any(|a| a.key == "ordered") { "ol" } else { "ul" }
1422+ }
1423+ ElementKind::ListItem => "li",
1424+ // Table
1425+ ElementKind::Table => "table",
1426+ ElementKind::TableHead => "thead",
1427+ ElementKind::TableBody => "tbody",
1428+ ElementKind::TableRow => "tr",
1429+ ElementKind::TableCell => "td",
1430+ ElementKind::TableHeaderCell => "th",
1431+ // Media
1432+ ElementKind::Video => "video",
1433+ ElementKind::Audio => "audio",
1434+ // Additional semantic elements
1435+ ElementKind::Form => "form",
1436+ ElementKind::Details => "details",
1437+ ElementKind::Summary => "summary",
1438+ ElementKind::Blockquote => "blockquote",
1439+ ElementKind::Cite => "cite",
1440+ ElementKind::Code => "code",
1441+ ElementKind::Pre => "pre",
1442+ ElementKind::Figure => "figure",
1443+ ElementKind::FigCaption => "figcaption",
1444+ ElementKind::Progress => "progress",
1445+ ElementKind::Meter => "meter",
1446+ // New elements
1447+ ElementKind::Dialog => "dialog",
1448+ ElementKind::DefinitionList => "dl",
1449+ ElementKind::DefinitionTerm => "dt",
1450+ ElementKind::DefinitionDescription => "dd",
1451+ ElementKind::Fieldset => "fieldset",
1452+ ElementKind::Legend => "legend",
1453+ ElementKind::Picture => "picture",
1454+ ElementKind::Time => "time",
1455+ ElementKind::Mark => "mark",
1456+ ElementKind::Kbd => "kbd",
1457+ ElementKind::Abbr => "abbr",
1458+ ElementKind::Datalist => "datalist",
1459+ ElementKind::Iframe => "iframe",
1460+ ElementKind::Output => "output",
1461+ ElementKind::Canvas => "canvas",
1462+ ElementKind::Badge => "span",
1463+ ElementKind::Tooltip => "span",
1464+ ElementKind::Avatar => "div",
1465+ ElementKind::Carousel => "div",
1466+ ElementKind::Chip => "span",
1467+ ElementKind::Tag => "span",
1468+ ElementKind::Noscript => "noscript",
1469+ ElementKind::Address => "address",
1470+ ElementKind::Search => "search",
1471+ ElementKind::Image | ElementKind::Input | ElementKind::HorizontalRule
1472+ | ElementKind::Children | ElementKind::Slot(_) | ElementKind::Fragment
1473+ | ElementKind::Source | ElementKind::Spacer
1474+ | ElementKind::Script | ElementKind::Breadcrumb => unreachable!(),
1475+ };
1476+
1477+ let kind_label = match elem.kind {
1478+ ElementKind::Row => "row",
1479+ ElementKind::Column => "column",
1480+ ElementKind::El => "el",
1481+ ElementKind::Text => "text",
1482+ ElementKind::Paragraph => "paragraph",
1483+ ElementKind::Link => "link",
1484+ ElementKind::Button => "button",
1485+ ElementKind::Select => "select",
1486+ ElementKind::Textarea => "textarea",
1487+ ElementKind::Option => "option",
1488+ ElementKind::Label => "label",
1489+ ElementKind::Nav => "nav",
1490+ ElementKind::Header => "header",
1491+ ElementKind::Footer => "footer",
1492+ ElementKind::Main => "main",
1493+ ElementKind::Section => "section",
1494+ ElementKind::Article => "article",
1495+ ElementKind::Aside => "aside",
1496+ ElementKind::List => "list",
1497+ ElementKind::ListItem => "item",
1498+ ElementKind::Table => "table",
1499+ ElementKind::TableHead => "thead",
1500+ ElementKind::TableBody => "tbody",
1501+ ElementKind::TableRow => "tr",
1502+ ElementKind::TableCell => "td",
1503+ ElementKind::TableHeaderCell => "th",
1504+ ElementKind::Video => "video",
1505+ ElementKind::Audio => "audio",
1506+ ElementKind::Form => "form",
1507+ ElementKind::Details => "details",
1508+ ElementKind::Summary => "summary",
1509+ ElementKind::Blockquote => "blockquote",
1510+ ElementKind::Cite => "cite",
1511+ ElementKind::Code => "code",
1512+ ElementKind::Pre => "pre",
1513+ ElementKind::Figure => "figure",
1514+ ElementKind::FigCaption => "figcaption",
1515+ ElementKind::Fragment => "fragment",
1516+ ElementKind::Dialog => "dialog",
1517+ ElementKind::DefinitionList => "dl",
1518+ ElementKind::DefinitionTerm => "dt",
1519+ ElementKind::DefinitionDescription => "dd",
1520+ ElementKind::Fieldset => "fieldset",
1521+ ElementKind::Legend => "legend",
1522+ ElementKind::Picture => "picture",
1523+ ElementKind::Time => "time",
1524+ ElementKind::Mark => "mark",
1525+ ElementKind::Kbd => "kbd",
1526+ ElementKind::Abbr => "abbr",
1527+ ElementKind::Datalist => "datalist",
1528+ ElementKind::Iframe => "iframe",
1529+ ElementKind::Output => "output",
1530+ ElementKind::Canvas => "canvas",
1531+ ElementKind::Grid => "grid",
1532+ ElementKind::Stack => "stack",
1533+ ElementKind::Badge => "badge",
1534+ ElementKind::Tooltip => "tooltip",
1535+ ElementKind::Avatar => "avatar",
1536+ ElementKind::Carousel => "carousel",
1537+ ElementKind::Chip => "chip",
1538+ ElementKind::Tag => "tag",
1539+ ElementKind::Noscript => "noscript",
1540+ ElementKind::Address => "address",
1541+ ElementKind::Search => "search",
13801542 _ => "",
13811543 };
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();
13881544
13891545 // Track interactive elements for focus-visible CSS
1390− if elem.kind == ElementKind::Link
1391− || matches!(kind_label, "button" | "input" | "select" | "textarea")
1392− {
1546+ if matches!(elem.kind, ElementKind::Link | ElementKind::Button | ElementKind::Input
1547+ | ElementKind::Select | ElementKind::Textarea) {
13931548 ctx.has_interactive = true;
13941549 }
13951550
13961551 // 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();
1552+ let gen_class = compute_class(&elem.attrs, &elem.kind, parent_kind, styles);
13991553 let (id, user_class) = extract_id_class(&elem.attrs);
14001554
14011555 if ctx.dev && elem.line_num > 0 {
14021556 out.push_str(&ctx.indent());
1403− out.push_str(&format!(
1404− "<!-- @{} line {} -->\n",
1405− kind_label, elem.line_num
1406− ));
1557+ out.push_str(&format!("<!-- @{} line {} -->\n", kind_label, elem.line_num));
14071558 }
14081559 out.push_str(&ctx.indent());
14091560 out.push('<');
14101561 out.push_str(tag);
14111562
1412− emit_argument_attr(out, elem, ctx.in_picture);
1563+ // @main gets id="hl-main" for skip-to-content link (unless user set an id)
1564+ if elem.kind == ElementKind::Main && id.is_none() {
1565+ out.push_str(" id=\"hl-main\"");
1566+ }
14131567
1414− emit_class_attr(out, gen_class.as_deref(), user_class.as_deref());
1568+ if elem.kind == ElementKind::Link {
1569+ if let Some(url) = &elem.argument {
1570+ out.push_str(" href=\"");
1571+ out.push_str(&html_escape(url));
1572+ out.push('"');
1573+ // Auto rel="noopener noreferrer" and target="_blank" for external links
1574+ let is_external = url.starts_with("http://") || url.starts_with("https://");
1575+ if is_external {
1576+ let has_rel = elem.attrs.iter().any(|a| a.key == "rel");
1577+ let has_target = elem.attrs.iter().any(|a| a.key == "target");
1578+ if !has_rel {
1579+ out.push_str(" rel=\"noopener noreferrer\"");
1580+ }
1581+ if !has_target {
1582+ out.push_str(" target=\"_blank\"");
1583+ }
1584+ }
1585+ }
1586+ }
14151587
1416− if let Some(id) = id {
1417− out.push_str(" id=\"");
1418− out.push_str(&html_escape(&id));
1419− out.push('"');
1588+ // Video/Audio src
1589+ if matches!(elem.kind, ElementKind::Video | ElementKind::Audio) {
1590+ if let Some(src) = &elem.argument {
1591+ out.push_str(" src=\"");
1592+ out.push_str(&html_escape(src));
1593+ out.push('"');
1594+ }
14201595 }
14211596
1422− emit_html_attrs(out, &elem.attrs);
1597+ // Form action
1598+ if elem.kind == ElementKind::Form {
1599+ if let Some(action) = &elem.argument {
1600+ out.push_str(" action=\"");
1601+ out.push_str(&html_escape(action));
1602+ out.push('"');
1603+ }
1604+ }
14231605
1424− // Source map attributes in dev mode
1425− if ctx.dev && elem.line_num > 0 {
1426− out.push_str(&format!(
1427− " data-hl-line=\"{}\" data-hl-el=\"{}\"",
1428− elem.line_num, kind_label
1429− ));
1606+ // Iframe src
1607+ if elem.kind == ElementKind::Iframe {
1608+ if let Some(src) = &elem.argument {
1609+ out.push_str(" src=\"");
1610+ out.push_str(&html_escape(src));
1611+ out.push('"');
1612+ }
14301613 }
14311614
1432− 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");
1438− out.push_str(ctx.nl());
1615+ // Tooltip title
1616+ if elem.kind == ElementKind::Tooltip {
1617+ if let Some(text) = &elem.argument {
1618+ out.push_str(" title=\"");
1619+ out.push_str(&html_escape(text));
1620+ out.push('"');
1621+ }
1622+ }
14391623
1440− let layout = elem.kind.layout();
1441− 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;
1624+ // Time datetime
1625+ if elem.kind == ElementKind::Time {
1626+ if let Some(dt) = elem.attrs.iter().find(|a| a.key == "datetime") {
1627+ if let Some(val) = &dt.value {
1628+ out.push_str(" datetime=\"");
1629+ out.push_str(&html_escape(val));
1630+ out.push('"');
1631+ }
1632+ }
1633+ }
1634+
1635+ // Critical CSS: inline styles directly instead of using a class
1636+ let is_critical = elem.attrs.iter().any(|a| a.key == "critical");
1637+ if is_critical {
1638+ let inline_css = attrs_to_css(&elem.attrs, "", &elem.kind, parent_kind);
1639+ if !inline_css.is_empty() {
1640+ out.push_str(" style=\"");
1641+ out.push_str(&html_escape(&inline_css));
1642+ out.push('"');
1643+ }
1644+ // Still use class for non-base styles (pseudo, responsive, etc.)
1645+ if gen_class.as_deref().map_or(false, |c| !c.is_empty()) {
1646+ emit_class_attr(out, gen_class.as_deref(), user_class.as_deref());
1647+ } else if let Some(ref uc) = user_class {
1648+ emit_class_attr(out, None, Some(uc));
1649+ }
1650+ } else {
1651+ emit_class_attr(out, gen_class.as_deref(), user_class.as_deref());
1652+ }
1653+
1654+ if let Some(id) = id {
1655+ out.push_str(" id=\"");
1656+ out.push_str(&html_escape(&id));
1657+ out.push('"');
1658+ }
1659+
1660+ emit_html_passthrough_attrs(out, &elem.attrs);
1661+
1662+ // Source map attributes in dev mode
1663+ if ctx.dev && elem.line_num > 0 {
1664+ out.push_str(&format!(" data-hl-line=\"{}\" data-hl-el=\"{}\"", elem.line_num, kind_label));
1665+ }
1666+
1667+ out.push('>');
1668+ out.push_str(ctx.nl());
1669+
1670+ // Inline text argument
1671+ if matches!(
1672+ elem.kind,
1673+ ElementKind::Text
1674+ | ElementKind::Button
1675+ | ElementKind::Label
1676+ | ElementKind::Option
1677+ | ElementKind::Textarea
1678+ | ElementKind::ListItem
1679+ | ElementKind::TableCell
1680+ | ElementKind::TableHeaderCell
1681+ | ElementKind::Summary
1682+ | ElementKind::Cite
1683+ | ElementKind::Code
1684+ | ElementKind::FigCaption
1685+ | ElementKind::Legend
1686+ | ElementKind::DefinitionTerm
1687+ | ElementKind::Mark
1688+ | ElementKind::Kbd
1689+ | ElementKind::Abbr
1690+ | ElementKind::Time
1691+ | ElementKind::DefinitionDescription
1692+ | ElementKind::Badge
1693+ | ElementKind::Tooltip
1694+ | ElementKind::Chip
1695+ | ElementKind::Tag
1696+ ) {
1697+ if let Some(text) = &elem.argument {
1698+ out.push_str(&html_escape(text));
1699+ }
1700+ }
1701+
1702+ // Children
1703+ ctx.depth += 1;
1704+ let is_paragraph = elem.kind == ElementKind::Paragraph;
1705+ for (i, child) in elem.children.iter().enumerate() {
1706+ generate_node(child, Some(&elem.kind), out, styles, ctx);
1707+ if is_paragraph && i < elem.children.len() - 1 {
1708+ out.push(' ');
1709+ }
1710+ }
14501711 ctx.depth -= 1;
14511712
14521713 out.push_str(&ctx.indent());
1453− ctx.dev = outer_dev;
14541714 out.push_str("</");
14551715 out.push_str(tag);
14561716 out.push('>');
@@ -1459,31 +1719,60 @@ fn generate_element(
14591719
14601720fn generate_self_closing(
14611721 elem: &Element,
1462− parent: Option<Layout>,
1722+ parent_kind: Option<&ElementKind>,
14631723 out: &mut String,
14641724 styles: &mut StyleCollector,
14651725 ctx: &mut GenContext,
14661726) {
1467− let gen_class = element_class(elem, &Site::new(elem, parent, &ctx.flow), styles);
1727+ let gen_class = compute_class(&elem.attrs, &elem.kind, parent_kind, styles);
14681728 let (id, user_class) = extract_id_class(&elem.attrs);
14691729
1470− let (tag, kind_label) = match &elem.kind {
1730+ let (tag, kind_label) = match elem.kind {
14711731 ElementKind::Image => ("img", "image"),
1472− ElementKind::Tag(spec) => (spec.html, spec.name),
1473− _ => unreachable!("not a void element: {:?}", elem.kind),
1732+ ElementKind::Input => ("input", "input"),
1733+ ElementKind::HorizontalRule => ("hr", "hr"),
1734+ ElementKind::Source => ("source", "source"),
1735+ ElementKind::Spacer => ("div", "spacer"),
1736+ _ => unreachable!(),
14741737 };
14751738
14761739 if ctx.dev && elem.line_num > 0 {
14771740 out.push_str(&ctx.indent());
1478− out.push_str(&format!(
1479− "<!-- @{} line {} -->\n",
1480− kind_label, elem.line_num
1481− ));
1741+ out.push_str(&format!("<!-- @{} line {} -->\n", kind_label, elem.line_num));
14821742 }
14831743 out.push_str(&ctx.indent());
14841744 out.push('<');
14851745 out.push_str(tag);
1486− emit_argument_attr(out, elem, ctx.in_picture);
1746+
1747+ // Image src (with optional non-SVG base64 inlining)
1748+ if elem.kind == ElementKind::Image {
1749+ let src = elem.argument.as_deref().unwrap_or("");
1750+ let is_inline = elem.attrs.iter().any(|a| a.key == "inline");
1751+ if is_inline && !src.is_empty() && !src.ends_with(".svg") {
1752+ let mime = if src.ends_with(".png") { "image/png" }
1753+ else if src.ends_with(".jpg") || src.ends_with(".jpeg") { "image/jpeg" }
1754+ else if src.ends_with(".gif") { "image/gif" }
1755+ else if src.ends_with(".webp") { "image/webp" }
1756+ else if src.ends_with(".avif") { "image/avif" }
1757+ else { "application/octet-stream" };
1758+ if let Ok(data) = std::fs::read(src) {
1759+ let b64 = base64_encode(&data);
1760+ out.push_str(" src=\"data:");
1761+ out.push_str(mime);
1762+ out.push_str(";base64,");
1763+ out.push_str(&b64);
1764+ out.push('"');
1765+ } else {
1766+ out.push_str(" src=\"");
1767+ out.push_str(&html_escape(src));
1768+ out.push('"');
1769+ }
1770+ } else {
1771+ out.push_str(" src=\"");
1772+ out.push_str(&html_escape(src));
1773+ out.push('"');
1774+ }
1775+ }
14871776
14881777 emit_class_attr(out, gen_class.as_deref(), user_class.as_deref());
14891778
@@ -1493,14 +1782,97 @@ fn generate_self_closing(
14931782 out.push('"');
14941783 }
14951784
1496− emit_html_attrs(out, &elem.attrs);
1785+ emit_html_passthrough_attrs(out, &elem.attrs);
14971786
14981787 // Source map attributes in dev mode (self-closing)
14991788 if ctx.dev && elem.line_num > 0 {
1500− out.push_str(&format!(
1501− " data-hl-line=\"{}\" data-hl-el=\"{}\"",
1502− elem.line_num, kind_label
1503− ));
1789+ out.push_str(&format!(" data-hl-line=\"{}\" data-hl-el=\"{}\"", elem.line_num, kind_label));
1790+ }
1791+
1792+ // Image optimization: auto-add loading="lazy" and decoding="async"
1793+ if elem.kind == ElementKind::Image {
1794+ // SVG inlining: @image [inline] logo.svg
1795+ if elem.attrs.iter().any(|a| a.key == "inline") {
1796+ if let Some(src) = &elem.argument {
1797+ if src.ends_with(".svg") {
1798+ if let Ok(svg_content) = std::fs::read_to_string(src) {
1799+ // Close the tag we opened, then emit inline SVG instead
1800+ out.truncate(out.rfind('<').unwrap_or(0));
1801+ out.push_str(&ctx.indent());
1802+ out.push_str(svg_content.trim());
1803+ out.push_str(ctx.nl());
1804+ return;
1805+ }
1806+ }
1807+ }
1808+ }
1809+ // Responsive srcset: @image photo.jpg [responsive 400 800 1200]
1810+ let responsive_attr = elem.attrs.iter().find(|a| a.key == "responsive");
1811+ if let Some(resp) = responsive_attr {
1812+ if let Some(ref sizes_str) = resp.value {
1813+ let widths: Vec<&str> = sizes_str.split_whitespace().collect();
1814+ if !widths.is_empty() {
1815+ let src = elem.argument.as_deref().unwrap_or("");
1816+ if !src.is_empty() {
1817+ // Generate srcset with width descriptors
1818+ // Convention: file-{width}.ext (e.g., photo-400.jpg)
1819+ let dot_pos = src.rfind('.').unwrap_or(src.len());
1820+ let base = &src[..dot_pos];
1821+ let ext = &src[dot_pos..];
1822+ let mut srcset_parts = Vec::new();
1823+ for w in &widths {
1824+ srcset_parts.push(format!("{}-{}{} {}w", base, w, ext, w));
1825+ }
1826+ out.push_str(" srcset=\"");
1827+ out.push_str(&srcset_parts.join(", "));
1828+ out.push('"');
1829+ // Generate sizes attribute
1830+ let max_width = widths.last().unwrap_or(&"100vw");
1831+ out.push_str(&format!(" sizes=\"(max-width: {}px) 100vw, {}px\"", max_width, max_width));
1832+ }
1833+ }
1834+ }
1835+ }
1836+
1837+ // Auto image dimensions: read local image file to inject width/height + aspect-ratio
1838+ let has_width = elem.attrs.iter().any(|a| a.key == "width");
1839+ let has_height = elem.attrs.iter().any(|a| a.key == "height");
1840+ if !has_width || !has_height {
1841+ if let Some(ref src) = elem.argument {
1842+ if !src.starts_with("http://") && !src.starts_with("https://") && !src.starts_with("data:") {
1843+ if let Some((w, h)) = read_image_dimensions(src) {
1844+ if !has_width {
1845+ out.push_str(&format!(" width=\"{}\"", w));
1846+ }
1847+ if !has_height {
1848+ out.push_str(&format!(" height=\"{}\"", h));
1849+ }
1850+ // Auto aspect-ratio to prevent CLS
1851+ if !elem.attrs.iter().any(|a| a.key == "aspect-ratio") {
1852+ out.push_str(&format!(" style=\"aspect-ratio:{}/{}\"", w, h));
1853+ }
1854+ }
1855+ }
1856+ }
1857+ }
1858+
1859+ // Smart image loading: first 3 images get fetchpriority="high" (above the fold),
1860+ // subsequent images get loading="lazy" + decoding="async"
1861+ ctx.image_count += 1;
1862+ if ctx.image_count <= 3 {
1863+ // Above-the-fold: eager loading with high priority
1864+ if !elem.attrs.iter().any(|a| a.key == "fetchpriority") {
1865+ out.push_str(" fetchpriority=\"high\"");
1866+ }
1867+ } else {
1868+ // Below-the-fold: lazy loading
1869+ if !elem.attrs.iter().any(|a| a.key == "loading") {
1870+ out.push_str(" loading=\"lazy\"");
1871+ }
1872+ if !elem.attrs.iter().any(|a| a.key == "decoding") {
1873+ out.push_str(" decoding=\"async\"");
1874+ }
1875+ }
15041876 }
15051877
15061878 out.push('>');
@@ -1518,10 +1890,7 @@ fn generate_text_segments(
15181890 TextSegment::Plain(text) => out.push_str(&html_escape(text)),
15191891 TextSegment::Inline(elem) => {
15201892 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;
1893+ generate_element(elem, None, &mut buf, styles, ctx);
15251894 out.push_str(buf.trim_end());
15261895 }
15271896 }
@@ -1534,183 +1903,97 @@ fn generate_text_segments(
15341903
15351904fn compute_class(
15361905 attrs: &[Attribute],
1537− site: &Site,
1906+ kind: &ElementKind,
1907+ parent_kind: Option<&ElementKind>,
15381908 styles: &mut StyleCollector,
1539− distinct: String,
15401909) -> 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−}
1910+ let base = attrs_to_css(attrs, "", kind, parent_kind);
15721911
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;");
1912+ // Collect pseudo-state overrides
1913+ let mut pseudo = Vec::new();
1914+ for &(prefix, selector) in PSEUDO_PREFIXES {
1915+ let css = attrs_to_css(attrs, prefix, kind, parent_kind);
1916+ if !css.is_empty() {
1917+ pseudo.push((selector.to_string(), css));
1918+ }
15811919 }
1582− if !site.root {
1583− css.push_str(layout_css(site.kind.layout(), site.inline));
1920+
1921+ // Auto-add ::-webkit-scrollbar pseudo for no-scrollbar attribute
1922+ if attrs.iter().any(|a| a.key == "no-scrollbar") {
1923+ pseudo.push(("::-webkit-scrollbar".to_string(), "display:none;".to_string()));
15841924 }
1585− css.push_str(site.kind.css());
1586− css
1587−}
15881925
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;
1926+ // Collect nth:EXPR: dynamic pseudo selectors
1927+ let mut nth_prefixes: Vec<String> = Vec::new();
1928+ for attr in attrs {
1929+ if attr.key.starts_with("nth:") {
1930+ let rest = &attr.key[4..];
1931+ if let Some(colon_pos) = rest.find(':') {
1932+ let prefix = format!("nth:{}:", &rest[..colon_pos]);
1933+ if !nth_prefixes.contains(&prefix) {
1934+ nth_prefixes.push(prefix);
16121935 }
1613− _ => {}
16141936 }
16151937 }
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−}
1938+ }
1939+ for prefix in &nth_prefixes {
1940+ let expr = &prefix[4..prefix.len() - 1];
1941+ let selector = format!(":nth-child({})", expr);
1942+ let css = attrs_to_css(attrs, prefix, kind, parent_kind);
1943+ if !css.is_empty() {
1944+ pseudo.push((selector, css));
1945+ }
1946+ }
16221947
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();
1948+ // Collect has(...): dynamic pseudo selectors
1949+ let mut has_prefixes: Vec<String> = Vec::new();
1950+ for attr in attrs {
1951+ if attr.key.starts_with("has(") {
1952+ if let Some(close) = attr.key.find("):") {
1953+ let prefix = format!("{}:", &attr.key[..close + 1]);
1954+ if !has_prefixes.contains(&prefix) {
1955+ has_prefixes.push(prefix);
1956+ }
16781957 }
1679− } else {
1680− current.push(ch);
16811958 }
16821959 }
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();
1960+ for prefix in &has_prefixes {
1961+ let inner = &prefix[4..prefix.len() - 2]; // extract selector from has(selector):
1962+ let selector = format!(":has({})", inner);
1963+ let css = attrs_to_css(attrs, &prefix, kind, parent_kind);
1964+ if !css.is_empty() {
1965+ pseudo.push((selector, css));
1966+ }
16921967 }
16931968
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);
1969+ // Collect responsive overrides
1970+ let mut responsive = Vec::new();
1971+ for &(bp_name, _) in BREAKPOINTS {
1972+ let prefix = format!("{}:", bp_name);
1973+ let css = attrs_to_css(attrs, &prefix, kind, parent_kind);
1974+ if !css.is_empty() {
1975+ responsive.push((bp_name.to_string(), css));
17001976 }
17011977 }
17021978
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);
1979+ // Collect container query overrides
1980+ let mut container = Vec::new();
1981+ for &(bp_name, _) in BREAKPOINTS {
1982+ let prefix = format!("cq-{}:", bp_name);
1983+ let css = attrs_to_css(attrs, &prefix, kind, parent_kind);
1984+ if !css.is_empty() {
1985+ container.push((bp_name.to_string(), css));
17111986 }
17121987 }
1713− out
1988+
1989+ let dark = attrs_to_css(attrs, "dark:", kind, parent_kind);
1990+ let print = attrs_to_css(attrs, "print:", kind, parent_kind);
1991+ let motion_safe = attrs_to_css(attrs, "motion-safe:", kind, parent_kind);
1992+ let motion_reduce = attrs_to_css(attrs, "motion-reduce:", kind, parent_kind);
1993+ let landscape = attrs_to_css(attrs, "landscape:", kind, parent_kind);
1994+ let portrait = attrs_to_css(attrs, "portrait:", kind, parent_kind);
1995+
1996+ styles.get_class(base, pseudo, responsive, dark, print, motion_safe, motion_reduce, landscape, portrait, container)
17141997}
17151998
17161999fn emit_class_attr(out: &mut String, gen_class: Option<&str>, user_class: Option<&str>) {
@@ -1740,553 +2023,943 @@ fn emit_class_attr(out: &mut String, gen_class: Option<&str>, user_class: Option
17402023// Attribute → CSS mapping
17412024// ---------------------------------------------------------------------------
17422025
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,
2026+/// (htmlang prefix, CSS selector suffix)
2027+const PSEUDO_PREFIXES: &[(&str, &str)] = &[
2028+ ("hover:", ":hover"),
2029+ ("active:", ":active"),
2030+ ("focus:", ":focus"),
2031+ ("focus-visible:", ":focus-visible"),
2032+ ("focus-within:", ":focus-within"),
2033+ ("disabled:", ":disabled"),
2034+ ("checked:", ":checked"),
2035+ ("placeholder:", "::placeholder"),
2036+ ("first:", ":first-child"),
2037+ ("last:", ":last-child"),
2038+ ("odd:", ":nth-child(odd)"),
2039+ ("even:", ":nth-child(even)"),
2040+ ("before:", "::before"),
2041+ ("after:", "::after"),
2042+ ("selection:", "::selection"),
2043+ ("visited:", ":visited"),
2044+ ("empty:", ":empty"),
2045+ ("target:", ":target"),
2046+ ("valid:", ":valid"),
2047+ ("invalid:", ":invalid"),
2048+];
2049+const RESPONSIVE_PREFIXES: &[&str] = &["sm:", "md:", "lg:", "xl:", "2xl:"];
2050+const MEDIA_PREFIXES: &[&str] = &["dark:", "print:", "motion-safe:", "motion-reduce:", "landscape:", "portrait:"];
2051+const CONTAINER_QUERY_PREFIXES: &[&str] = &["cq-sm:", "cq-md:", "cq-lg:", "cq-xl:", "cq-2xl:"];
2052+
2053+fn is_prefixed_attr(key: &str) -> bool {
2054+ PSEUDO_PREFIXES.iter().any(|&(p, _)| key.starts_with(p))
2055+ || RESPONSIVE_PREFIXES.iter().any(|p| key.starts_with(p))
2056+ || MEDIA_PREFIXES.iter().any(|p| key.starts_with(p))
2057+ || CONTAINER_QUERY_PREFIXES.iter().any(|p| key.starts_with(p))
2058+ || key.starts_with("nth:")
2059+ || key.starts_with("has(")
17552060}
17562061
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,
2062+fn attrs_to_css(
2063+ attrs: &[Attribute],
2064+ state_prefix: &str,
2065+ kind: &ElementKind,
2066+ parent_kind: Option<&ElementKind>,
2067+) -> String {
2068+ let mut css = String::new();
2069+
2070+ // Base element styles only for the default (non-state) pass
2071+ if state_prefix.is_empty() {
2072+ match kind {
2073+ ElementKind::Row => css.push_str("display:flex;flex-direction:row;"),
2074+ ElementKind::Column => css.push_str("display:flex;flex-direction:column;"),
2075+ ElementKind::El => css.push_str("display:flex;flex-direction:column;"),
2076+ ElementKind::Paragraph => css.push_str("margin:0;"),
2077+ // Semantic elements get flex column layout like @el
2078+ ElementKind::Nav | ElementKind::Header | ElementKind::Footer
2079+ | ElementKind::Main | ElementKind::Section | ElementKind::Article
2080+ | ElementKind::Aside => css.push_str("display:flex;flex-direction:column;"),
2081+ // Lists: reset browser defaults
2082+ ElementKind::List => css.push_str("margin:0;padding-left:0;list-style:none;"),
2083+ ElementKind::ListItem => css.push_str("display:flex;flex-direction:column;"),
2084+ // Form: flex column like @el
2085+ ElementKind::Form => css.push_str("display:flex;flex-direction:column;"),
2086+ // Details: flex column
2087+ ElementKind::Details => css.push_str("display:flex;flex-direction:column;"),
2088+ // Figure: flex column
2089+ ElementKind::Figure => css.push_str("display:flex;flex-direction:column;margin:0;"),
2090+ // Blockquote: flex column, reset browser margin
2091+ ElementKind::Blockquote => css.push_str("display:flex;flex-direction:column;margin:0;"),
2092+ // Pre: preserve whitespace
2093+ ElementKind::Pre => css.push_str("margin:0;white-space:pre;font-family:ui-monospace,monospace;"),
2094+ // Code: monospace font
2095+ ElementKind::Code => css.push_str("font-family:ui-monospace,monospace;"),
2096+ // New elements
2097+ ElementKind::Dialog => css.push_str("display:flex;flex-direction:column;"),
2098+ ElementKind::DefinitionList => css.push_str("margin:0;"),
2099+ ElementKind::DefinitionDescription => css.push_str("margin:0;display:flex;flex-direction:column;"),
2100+ ElementKind::Fieldset => css.push_str("display:flex;flex-direction:column;border:1px solid currentColor;padding:0.5em;margin:0;"),
2101+ ElementKind::Kbd => css.push_str("font-family:ui-monospace,monospace;"),
2102+ ElementKind::Grid => css.push_str("display:grid;"),
2103+ ElementKind::Stack => css.push_str("position:relative;"),
2104+ 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;"),
2105+ ElementKind::Tooltip => css.push_str("position:relative;cursor:help;"),
2106+ ElementKind::Spacer => css.push_str("flex:1;"),
2107+ ElementKind::Avatar => css.push_str("display:inline-flex;align-items:center;justify-content:center;border-radius:9999px;overflow:hidden;flex-shrink:0;"),
2108+ 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;"),
2109+ 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;"),
2110+ ElementKind::Tag => css.push_str("display:inline-flex;align-items:center;padding:2px 8px;border-radius:4px;font-size:0.75rem;font-weight:600;"),
2111+ _ => {}
2112+ }
2113+ // Children of @carousel get scroll-snap-align and flex-shrink
2114+ if matches!(parent_kind, Some(ElementKind::Carousel)) {
2115+ css.push_str("scroll-snap-align:start;flex-shrink:0;");
17672116 }
17682117 }
1769−}
17702118
1771−// ---------------------------------------------------------------------------
1772−// Direction: what a child's `fill` and `shrink` compile against
1773−// ---------------------------------------------------------------------------
2119+ for attr in attrs {
2120+ // Determine the effective key for this pass
2121+ let effective_key = if state_prefix.is_empty() {
2122+ if is_prefixed_attr(&attr.key) {
2123+ continue;
2124+ }
2125+ attr.key.as_str()
2126+ } else {
2127+ match attr.key.strip_prefix(state_prefix) {
2128+ Some(k) => k,
2129+ None => continue,
2130+ }
2131+ };
17742132
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−}
2133+ let val = attr.value.as_deref();
17812134
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−}
2135+ match effective_key {
2136+ // Layout
2137+ "spacing" | "gap" => {
2138+ if let Some(v) = val {
2139+ push_css(&mut css, "gap", &css_px(v));
2140+ }
2141+ }
2142+ "padding" => {
2143+ if let Some(v) = val {
2144+ push_css(&mut css, "padding", &css_px_multi(v));
2145+ }
2146+ }
2147+ "padding-x" => {
2148+ if let Some(v) = val {
2149+ push_css(&mut css, "padding-left", &css_px(v));
2150+ push_css(&mut css, "padding-right", &css_px(v));
2151+ }
2152+ }
2153+ "padding-y" => {
2154+ if let Some(v) = val {
2155+ push_css(&mut css, "padding-top", &css_px(v));
2156+ push_css(&mut css, "padding-bottom", &css_px(v));
2157+ }
2158+ }
17932159
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−}
2160+ // Sizing
2161+ "width" => {
2162+ if let Some(v) = val {
2163+ match v {
2164+ "fill" => match parent_kind {
2165+ Some(ElementKind::Row) => {
2166+ push_css(&mut css, "flex", "1");
2167+ push_css(&mut css, "min-width", "0");
2168+ }
2169+ _ => push_css(&mut css, "width", "100%"),
2170+ },
2171+ "shrink" => push_css(&mut css, "flex-shrink", "0"),
2172+ _ => push_css(&mut css, "width", &css_px(v)),
2173+ }
2174+ }
2175+ }
2176+ "height" => {
2177+ if let Some(v) = val {
2178+ match v {
2179+ "fill" => match parent_kind {
2180+ Some(ElementKind::Column) => {
2181+ push_css(&mut css, "flex", "1");
2182+ push_css(&mut css, "min-height", "0");
2183+ }
2184+ _ => push_css(&mut css, "height", "100%"),
2185+ },
2186+ "shrink" => push_css(&mut css, "flex-shrink", "0"),
2187+ _ => push_css(&mut css, "height", &css_px(v)),
2188+ }
2189+ }
2190+ }
2191+ "min-width" => {
2192+ if let Some(v) = val {
2193+ push_css(&mut css, "min-width", &css_px(v));
2194+ }
2195+ }
2196+ "max-width" => {
2197+ if let Some(v) = val {
2198+ push_css(&mut css, "max-width", &css_px(v));
2199+ }
2200+ }
2201+ "min-height" => {
2202+ if let Some(v) = val {
2203+ push_css(&mut css, "min-height", &css_px(v));
2204+ }
2205+ }
2206+ "max-height" => {
2207+ if let Some(v) = val {
2208+ push_css(&mut css, "max-height", &css_px(v));
2209+ }
2210+ }
18132211
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;
2212+ // Alignment
2213+ "center-x" => match parent_kind {
2214+ Some(ElementKind::Column) | Some(ElementKind::El) => {
2215+ push_css(&mut css, "align-self", "center");
2216+ }
2217+ _ => {
2218+ push_css(&mut css, "margin-left", "auto");
2219+ push_css(&mut css, "margin-right", "auto");
2220+ }
2221+ },
2222+ "center-y" => match parent_kind {
2223+ Some(ElementKind::Row) => push_css(&mut css, "align-self", "center"),
2224+ _ => {
2225+ push_css(&mut css, "margin-top", "auto");
2226+ push_css(&mut css, "margin-bottom", "auto");
2227+ }
2228+ },
2229+ "align-left" => match parent_kind {
2230+ Some(ElementKind::Column) | Some(ElementKind::El) => {
2231+ push_css(&mut css, "align-self", "flex-start");
2232+ }
2233+ _ => push_css(&mut css, "margin-right", "auto"),
2234+ },
2235+ "align-right" => match parent_kind {
2236+ Some(ElementKind::Column) | Some(ElementKind::El) => {
2237+ push_css(&mut css, "align-self", "flex-end");
2238+ }
2239+ _ => push_css(&mut css, "margin-left", "auto"),
2240+ },
2241+ "align-top" => match parent_kind {
2242+ Some(ElementKind::Row) => push_css(&mut css, "align-self", "flex-start"),
2243+ _ => push_css(&mut css, "margin-bottom", "auto"),
2244+ },
2245+ "align-bottom" => match parent_kind {
2246+ Some(ElementKind::Row) => push_css(&mut css, "align-self", "flex-end"),
2247+ _ => push_css(&mut css, "margin-top", "auto"),
2248+ },
2249+
2250+ // Style
2251+ "background" => {
2252+ if let Some(v) = val {
2253+ push_css(&mut css, "background", v);
2254+ }
18262255 }
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));
2256+ "color" => {
2257+ if let Some(v) = val {
2258+ push_css(&mut css, "color", v);
2259+ }
2260+ }
2261+ "border" => {
2262+ if let Some(v) = val {
2263+ let parts: Vec<&str> = v.splitn(2, ' ').collect();
2264+ if parts.len() == 2 {
2265+ push_css(
2266+ &mut css,
2267+ "border",
2268+ &format!("{} solid {}", css_px(parts[0]), parts[1]),
2269+ );
2270+ } else {
2271+ push_css(
2272+ &mut css,
2273+ "border",
2274+ &format!("{} solid currentColor", css_px(parts[0])),
2275+ );
2276+ }
2277+ }
2278+ }
2279+ "border-top" | "border-bottom" | "border-left" | "border-right" => {
2280+ if let Some(v) = val {
2281+ let parts: Vec<&str> = v.splitn(2, ' ').collect();
2282+ if parts.len() == 2 {
2283+ push_css(
2284+ &mut css,
2285+ effective_key,
2286+ &format!("{} solid {}", css_px(parts[0]), parts[1]),
2287+ );
2288+ } else {
2289+ push_css(
2290+ &mut css,
2291+ effective_key,
2292+ &format!("{} solid currentColor", css_px(parts[0])),
2293+ );
2294+ }
2295+ }
2296+ }
2297+ "rounded" => {
2298+ if let Some(v) = val {
2299+ push_css(&mut css, "border-radius", &css_px(v));
2300+ }
2301+ }
2302+ "bold" => push_css(&mut css, "font-weight", "bold"),
2303+ "italic" => push_css(&mut css, "font-style", "italic"),
2304+ "underline" => push_css(&mut css, "text-decoration", "underline"),
2305+ "size" => {
2306+ if let Some(v) = val {
2307+ push_css(&mut css, "font-size", &css_px(v));
2308+ }
2309+ }
2310+ "font" => {
2311+ if let Some(v) = val {
2312+ push_css(&mut css, "font-family", v);
2313+ }
2314+ }
2315+ "transition" => {
2316+ if let Some(v) = val {
2317+ push_css(&mut css, "transition", v);
2318+ }
2319+ }
2320+ "cursor" => {
2321+ if let Some(v) = val {
2322+ push_css(&mut css, "cursor", v);
2323+ }
2324+ }
2325+ "opacity" => {
2326+ if let Some(v) = val {
2327+ push_css(&mut css, "opacity", v);
2328+ }
18362329 }
1837− }
1838− changes.sort_by_key(|(at, _)| at_order(at));
1839− Flow {
1840− base: Some(base),
1841− changes,
1842− class: None,
1843− }
1844− }
18452330
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−}
2331+ // Typography
2332+ "text-align" => {
2333+ if let Some(v) = val {
2334+ push_css(&mut css, "text-align", v);
2335+ }
2336+ }
2337+ "line-height" => {
2338+ if let Some(v) = val {
2339+ push_css(&mut css, "line-height", v);
2340+ }
2341+ }
2342+ "letter-spacing" => {
2343+ if let Some(v) = val {
2344+ push_css(&mut css, "letter-spacing", &css_px(v));
2345+ }
2346+ }
2347+ "text-transform" => {
2348+ if let Some(v) = val {
2349+ push_css(&mut css, "text-transform", v);
2350+ }
2351+ }
2352+ "white-space" => {
2353+ if let Some(v) = val {
2354+ push_css(&mut css, "white-space", v);
2355+ }
2356+ }
18612357
1862−/// `width` or `height`.
1863−#[derive(Clone, Copy, PartialEq, Eq)]
1864−enum Dim {
1865− Width,
1866− Height,
1867−}
2358+ // Overflow & positioning
2359+ "overflow" => {
2360+ if let Some(v) = val {
2361+ push_css(&mut css, "overflow", v);
2362+ }
2363+ }
2364+ "position" => {
2365+ if let Some(v) = val {
2366+ push_css(&mut css, "position", v);
2367+ }
2368+ }
2369+ "top" => {
2370+ if let Some(v) = val {
2371+ push_css(&mut css, "top", &css_px(v));
2372+ }
2373+ }
2374+ "right" => {
2375+ if let Some(v) = val {
2376+ push_css(&mut css, "right", &css_px(v));
2377+ }
2378+ }
2379+ "bottom" => {
2380+ if let Some(v) = val {
2381+ push_css(&mut css, "bottom", &css_px(v));
2382+ }
2383+ }
2384+ "left" => {
2385+ if let Some(v) = val {
2386+ push_css(&mut css, "left", &css_px(v));
2387+ }
2388+ }
2389+ "z-index" => {
2390+ if let Some(v) = val {
2391+ push_css(&mut css, "z-index", v);
2392+ }
2393+ }
18682394
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−}
2395+ // Display & visibility
2396+ "display" => {
2397+ if let Some(v) = val {
2398+ push_css(&mut css, "display", v);
2399+ }
2400+ }
2401+ "visibility" => {
2402+ if let Some(v) = val {
2403+ push_css(&mut css, "visibility", v);
2404+ }
2405+ }
2406+ "hidden" => push_css(&mut css, "display", "none"),
18772407
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−}
2408+ // Transform & filters
2409+ "transform" => {
2410+ if let Some(v) = val {
2411+ push_css(&mut css, "transform", v);
2412+ }
2413+ }
2414+ "backdrop-filter" => {
2415+ if let Some(v) = val {
2416+ push_css(&mut css, "backdrop-filter", v);
2417+ }
2418+ }
18872419
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−}
2420+ // Effects
2421+ "shadow" => {
2422+ if let Some(v) = val {
2423+ push_css(&mut css, "box-shadow", v);
2424+ }
2425+ }
19062426
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−}
2427+ // Flow
2428+ "wrap" => push_css(&mut css, "flex-wrap", "wrap"),
2429+ "gap-x" => {
2430+ if let Some(v) = val {
2431+ push_css(&mut css, "column-gap", &css_px(v));
2432+ }
2433+ }
2434+ "gap-y" => {
2435+ if let Some(v) = val {
2436+ push_css(&mut css, "row-gap", &css_px(v));
2437+ }
2438+ }
19232439
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−}
2440+ // Grid
2441+ "grid" => {
2442+ push_css(&mut css, "display", "grid");
2443+ }
2444+ "grid-cols" => {
2445+ if let Some(v) = val {
2446+ if let Ok(n) = v.parse::<u32>() {
2447+ push_css(&mut css, "grid-template-columns", &format!("repeat({},1fr)", n));
2448+ } else {
2449+ push_css(&mut css, "grid-template-columns", v);
2450+ }
2451+ }
2452+ }
2453+ "grid-rows" => {
2454+ if let Some(v) = val {
2455+ if let Ok(n) = v.parse::<u32>() {
2456+ push_css(&mut css, "grid-template-rows", &format!("repeat({},1fr)", n));
2457+ } else {
2458+ push_css(&mut css, "grid-template-rows", v);
2459+ }
2460+ }
2461+ }
2462+ "col-span" => {
2463+ if let Some(v) = val {
2464+ push_css(&mut css, "grid-column", &format!("span {}", v));
2465+ }
2466+ }
2467+ "row-span" => {
2468+ if let Some(v) = val {
2469+ push_css(&mut css, "grid-row", &format!("span {}", v));
2470+ }
2471+ }
2472+
2473+ // Animation
2474+ "animation" => {
2475+ if let Some(v) = val {
2476+ push_css(&mut css, "animation", v);
2477+ }
2478+ }
2479+
2480+ // Aspect ratio
2481+ "aspect-ratio" => {
2482+ if let Some(v) = val {
2483+ push_css(&mut css, "aspect-ratio", v);
2484+ }
2485+ }
2486+
2487+ // CSS containment for rendering performance
2488+ "contain" => {
2489+ if let Some(v) = val {
2490+ push_css(&mut css, "contain", v);
2491+ } else {
2492+ push_css(&mut css, "contain", "layout style paint");
2493+ }
2494+ }
2495+ "content-visibility" => {
2496+ if let Some(v) = val {
2497+ push_css(&mut css, "content-visibility", v);
2498+ } else {
2499+ push_css(&mut css, "content-visibility", "auto");
2500+ }
2501+ }
2502+
2503+ // Outline (like border but doesn't affect layout)
2504+ "outline" => {
2505+ if let Some(v) = val {
2506+ let parts: Vec<&str> = v.splitn(2, ' ').collect();
2507+ if parts.len() == 2 {
2508+ push_css(
2509+ &mut css,
2510+ "outline",
2511+ &format!("{} solid {}", css_px(parts[0]), parts[1]),
2512+ );
2513+ } else {
2514+ push_css(
2515+ &mut css,
2516+ "outline",
2517+ &format!("{} solid currentColor", css_px(parts[0])),
2518+ );
2519+ }
2520+ }
2521+ }
2522+
2523+ // Logical properties (i18n-aware)
2524+ "padding-inline" => {
2525+ if let Some(v) = val {
2526+ push_css(&mut css, "padding-inline", &css_px_multi(v));
2527+ }
2528+ }
2529+ "padding-block" => {
2530+ if let Some(v) = val {
2531+ push_css(&mut css, "padding-block", &css_px_multi(v));
2532+ }
2533+ }
2534+ "margin-inline" => {
2535+ if let Some(v) = val {
2536+ push_css(&mut css, "margin-inline", &css_px_multi(v));
2537+ }
2538+ }
2539+ "margin-block" => {
2540+ if let Some(v) = val {
2541+ push_css(&mut css, "margin-block", &css_px_multi(v));
2542+ }
2543+ }
2544+
2545+ // Logical property start/end variants
2546+ "padding-inline-start" | "padding-inline-end" |
2547+ "padding-block-start" | "padding-block-end" |
2548+ "margin-inline-start" | "margin-inline-end" |
2549+ "margin-block-start" | "margin-block-end" => {
2550+ if let Some(v) = val {
2551+ push_css(&mut css, effective_key, &css_px(v));
2552+ }
2553+ }
2554+
2555+ // Logical inset
2556+ "inset-inline" | "inset-block" => {
2557+ if let Some(v) = val {
2558+ push_css(&mut css, effective_key, &css_px_multi(v));
2559+ }
2560+ }
2561+ "inset-inline-start" | "inset-inline-end" |
2562+ "inset-block-start" | "inset-block-end" => {
2563+ if let Some(v) = val {
2564+ push_css(&mut css, effective_key, &css_px(v));
2565+ }
2566+ }
2567+
2568+ // Logical border
2569+ "border-inline" | "border-block" |
2570+ "border-inline-start" | "border-inline-end" |
2571+ "border-block-start" | "border-block-end" => {
2572+ if let Some(v) = val {
2573+ push_css(&mut css, effective_key, v);
2574+ }
2575+ }
2576+
2577+ // Logical border-radius
2578+ "border-start-start-radius" | "border-start-end-radius" |
2579+ "border-end-start-radius" | "border-end-end-radius" => {
2580+ if let Some(v) = val {
2581+ push_css(&mut css, effective_key, &css_px(v));
2582+ }
2583+ }
2584+
2585+ // Logical scroll margins & padding
2586+ "scroll-margin-inline" | "scroll-margin-block" |
2587+ "scroll-padding-inline" | "scroll-padding-block" => {
2588+ if let Some(v) = val {
2589+ push_css(&mut css, effective_key, &css_px_multi(v));
2590+ }
2591+ }
2592+
2593+ // Logical sizing
2594+ "inline-size" | "block-size" |
2595+ "min-inline-size" | "max-inline-size" |
2596+ "min-block-size" | "max-block-size" => {
2597+ if let Some(v) = val {
2598+ push_css(&mut css, effective_key, &css_px(v));
2599+ }
2600+ }
2601+
2602+ // Scroll snap
2603+ "scroll-snap-type" => {
2604+ if let Some(v) = val {
2605+ push_css(&mut css, "scroll-snap-type", v);
2606+ }
2607+ }
2608+ "scroll-snap-align" => {
2609+ if let Some(v) = val {
2610+ push_css(&mut css, "scroll-snap-align", v);
2611+ }
2612+ }
2613+
2614+ // Margin
2615+ "margin" => {
2616+ if let Some(v) = val {
2617+ push_css(&mut css, "margin", &css_px_multi(v));
2618+ }
2619+ }
2620+ "margin-x" => {
2621+ if let Some(v) = val {
2622+ push_css(&mut css, "margin-left", &css_px(v));
2623+ push_css(&mut css, "margin-right", &css_px(v));
2624+ }
2625+ }
2626+ "margin-y" => {
2627+ if let Some(v) = val {
2628+ push_css(&mut css, "margin-top", &css_px(v));
2629+ push_css(&mut css, "margin-bottom", &css_px(v));
2630+ }
2631+ }
2632+
2633+ // Filter
2634+ "filter" => {
2635+ if let Some(v) = val {
2636+ push_css(&mut css, "filter", v);
2637+ }
2638+ }
2639+
2640+ // Object fit/position (for images)
2641+ "object-fit" => {
2642+ if let Some(v) = val {
2643+ push_css(&mut css, "object-fit", v);
2644+ }
2645+ }
2646+ "object-position" => {
2647+ if let Some(v) = val {
2648+ push_css(&mut css, "object-position", v);
2649+ }
2650+ }
2651+
2652+ // Text shadow
2653+ "text-shadow" => {
2654+ if let Some(v) = val {
2655+ push_css(&mut css, "text-shadow", v);
2656+ }
2657+ }
2658+
2659+ // Text overflow
2660+ "text-overflow" => {
2661+ if let Some(v) = val {
2662+ push_css(&mut css, "text-overflow", v);
2663+ }
2664+ }
2665+
2666+ // Interaction
2667+ "pointer-events" => {
2668+ if let Some(v) = val {
2669+ push_css(&mut css, "pointer-events", v);
2670+ }
2671+ }
2672+ "user-select" => {
2673+ if let Some(v) = val {
2674+ push_css(&mut css, "user-select", v);
2675+ }
2676+ }
2677+
2678+ // Flexbox/grid alignment
2679+ "justify-content" => {
2680+ if let Some(v) = val {
2681+ push_css(&mut css, "justify-content", v);
2682+ }
2683+ }
2684+ "align-items" => {
2685+ if let Some(v) = val {
2686+ push_css(&mut css, "align-items", v);
2687+ }
2688+ }
2689+
2690+ // Flex item order
2691+ "order" => {
2692+ if let Some(v) = val {
2693+ push_css(&mut css, "order", v);
2694+ }
2695+ }
2696+
2697+ // Background extras
2698+ "background-size" => {
2699+ if let Some(v) = val {
2700+ push_css(&mut css, "background-size", v);
2701+ }
2702+ }
2703+ "background-position" => {
2704+ if let Some(v) = val {
2705+ push_css(&mut css, "background-position", v);
2706+ }
2707+ }
2708+ "background-repeat" => {
2709+ if let Some(v) = val {
2710+ push_css(&mut css, "background-repeat", v);
2711+ }
2712+ }
19432713
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− _ => {}
2714+ // Text wrapping
2715+ "word-break" => {
2716+ if let Some(v) = val {
2717+ push_css(&mut css, "word-break", v);
2718+ }
19792719 }
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− }
2720+ "overflow-wrap" => {
2721+ if let Some(v) = val {
2722+ push_css(&mut css, "overflow-wrap", v);
20232723 }
2024− return;
20252724 }
2026− }
2027− if !self.writes(property) {
2028− push_css(css, property, value);
2029− }
2030− }
2031−}
20322725
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−}
2726+ // Container queries
2727+ "container" => {
2728+ push_css(&mut css, "container-type", "inline-size");
2729+ }
2730+ "container-name" => {
2731+ if let Some(v) = val {
2732+ push_css(&mut css, "container-name", v);
2733+ }
2734+ }
2735+ "container-type" => {
2736+ if let Some(v) = val {
2737+ push_css(&mut css, "container-type", v);
2738+ }
2739+ }
20682740
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−}
2741+ // Overflow axis
2742+ "overflow-x" => {
2743+ if let Some(v) = val {
2744+ push_css(&mut css, "overflow-x", v);
2745+ }
2746+ }
2747+ "overflow-y" => {
2748+ if let Some(v) = val {
2749+ push_css(&mut css, "overflow-y", v);
2750+ }
2751+ }
20792752
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−}
2753+ // Inset (shorthand for top/right/bottom/left)
2754+ "inset" => {
2755+ if let Some(v) = val {
2756+ push_css(&mut css, "inset", &css_px(v));
2757+ }
2758+ }
21032759
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−}
2760+ // Accent & caret colors
2761+ "accent-color" => {
2762+ if let Some(v) = val {
2763+ push_css(&mut css, "accent-color", v);
2764+ }
2765+ }
2766+ "caret-color" => {
2767+ if let Some(v) = val {
2768+ push_css(&mut css, "caret-color", v);
2769+ }
2770+ }
21172771
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− }
2772+ // Color scheme & appearance
2773+ "color-scheme" => {
2774+ if let Some(v) = val {
2775+ push_css(&mut css, "color-scheme", v);
2776+ }
2777+ }
2778+ "appearance" => {
2779+ if let Some(v) = val {
2780+ push_css(&mut css, "appearance", v);
2781+ }
2782+ }
21592783
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− }
2784+ // List style
2785+ "list-style" => {
2786+ if let Some(v) = val {
2787+ push_css(&mut css, "list-style", v);
2788+ }
2789+ }
21662790
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" => {
2791+ // Table
2792+ "border-collapse" => {
2793+ if let Some(v) = val {
2794+ push_css(&mut css, "border-collapse", v);
2795+ }
2796+ }
2797+ "border-spacing" => {
21722798 if let Some(v) = val {
2173− push_css(&mut css, "gap", &with_px("gap", v));
2799+ push_css(&mut css, "border-spacing", &css_px(v));
21742800 }
21752801 }
21762802
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;
2803+ // Text decoration
2804+ "text-decoration" => {
2805+ if let Some(v) = val {
2806+ push_css(&mut css, "text-decoration", v);
21882807 }
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− }
2808+ }
2809+ "text-decoration-color" => {
2810+ if let Some(v) = val {
2811+ push_css(&mut css, "text-decoration-color", v);
2812+ }
2813+ }
2814+ "text-decoration-thickness" => {
2815+ if let Some(v) = val {
2816+ push_css(&mut css, "text-decoration-thickness", &css_px(v));
2817+ }
2818+ }
2819+ "text-decoration-style" => {
2820+ if let Some(v) = val {
2821+ push_css(&mut css, "text-decoration-style", v);
2822+ }
2823+ }
2824+ "text-underline-offset" => {
2825+ if let Some(v) = val {
2826+ push_css(&mut css, "text-underline-offset", &css_px(v));
2827+ }
2828+ }
2829+
2830+ // Multi-column
2831+ "column-width" => {
2832+ if let Some(v) = val {
2833+ push_css(&mut css, "column-width", &css_px(v));
22372834 }
2835+ }
2836+ "column-rule" => {
22382837 if let Some(v) = val {
2239− push_css(&mut css, effective_key, &with_px(effective_key, v));
2838+ push_css(&mut css, "column-rule", v);
22402839 }
22412840 }
22422841
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");
2842+ // Place items/self
2843+ "place-items" => {
2844+ if let Some(v) = val {
2845+ push_css(&mut css, "place-items", v);
2846+ }
22492847 }
2250− "center-y" => {
2251− push_css(&mut aligned, "margin-top", "auto");
2252− push_css(&mut aligned, "margin-bottom", "auto");
2848+ "place-self" => {
2849+ if let Some(v) = val {
2850+ push_css(&mut css, "place-self", v);
2851+ }
22532852 }
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"),
22582853
2259− "wrap" if lays_out_children => push_css(&mut css, "flex-wrap", "wrap"),
2260− "wrap" => {}
2854+ // Scroll behavior
2855+ "scroll-behavior" => {
2856+ if let Some(v) = val {
2857+ push_css(&mut css, "scroll-behavior", v);
2858+ }
2859+ }
22612860
2262− // Grid
2263− "grid-cols" | "grid-rows" if !lays_out_children => {}
2264− "grid-cols" | "grid-rows" => {
2861+ // Resize
2862+ "resize" => {
22652863 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− }
2864+ push_css(&mut css, "resize", v);
22752865 }
22762866 }
2277− "col-span" | "row-span" => {
2867+
2868+ // New CSS properties
2869+ "clip-path" => {
2870+ if let Some(v) = val { push_css(&mut css, "clip-path", v); }
2871+ }
2872+ "mix-blend-mode" => {
2873+ if let Some(v) = val { push_css(&mut css, "mix-blend-mode", v); }
2874+ }
2875+ "background-blend-mode" => {
2876+ if let Some(v) = val { push_css(&mut css, "background-blend-mode", v); }
2877+ }
2878+ "writing-mode" => {
2879+ if let Some(v) = val { push_css(&mut css, "writing-mode", v); }
2880+ }
2881+ "column-count" => {
2882+ if let Some(v) = val { push_css(&mut css, "column-count", v); }
2883+ }
2884+ "column-gap" => {
2885+ if let Some(v) = val { push_css(&mut css, "column-gap", &css_px(v)); }
2886+ }
2887+ "text-indent" => {
2888+ if let Some(v) = val { push_css(&mut css, "text-indent", &css_px(v)); }
2889+ }
2890+ "hyphens" => {
2891+ if let Some(v) = val { push_css(&mut css, "hyphens", v); }
2892+ }
2893+ "flex-grow" => {
2894+ if let Some(v) = val { push_css(&mut css, "flex-grow", v); }
2895+ }
2896+ "flex-shrink" => {
2897+ if let Some(v) = val { push_css(&mut css, "flex-shrink", v); }
2898+ }
2899+ "flex-basis" => {
2900+ if let Some(v) = val { push_css(&mut css, "flex-basis", &css_px(v)); }
2901+ }
2902+ "isolation" => {
2903+ if let Some(v) = val { push_css(&mut css, "isolation", v); }
2904+ }
2905+ "place-content" => {
2906+ if let Some(v) = val { push_css(&mut css, "place-content", v); }
2907+ }
2908+ "background-image" => {
2909+ if let Some(v) = val { push_css(&mut css, "background-image", v); }
2910+ }
2911+ "font-weight" => {
2912+ if let Some(v) = val { push_css(&mut css, "font-weight", v); }
2913+ }
2914+ "font-style" => {
2915+ if let Some(v) = val { push_css(&mut css, "font-style", v); }
2916+ }
2917+ "text-wrap" => {
2918+ if let Some(v) = val { push_css(&mut css, "text-wrap", v); }
2919+ }
2920+ "will-change" => {
2921+ if let Some(v) = val { push_css(&mut css, "will-change", v); }
2922+ }
2923+ "touch-action" => {
2924+ if let Some(v) = val { push_css(&mut css, "touch-action", v); }
2925+ }
2926+ "vertical-align" => {
2927+ if let Some(v) = val { push_css(&mut css, "vertical-align", v); }
2928+ }
2929+ "scroll-margin" => {
2930+ if let Some(v) = val { push_css(&mut css, "scroll-margin", &css_px(v)); }
2931+ }
2932+ "scroll-margin-top" | "scroll-margin-bottom" | "scroll-margin-left" | "scroll-margin-right" => {
2933+ if let Some(v) = val { push_css(&mut css, effective_key, &css_px(v)); }
2934+ }
2935+ "scroll-padding" => {
2936+ if let Some(v) = val { push_css(&mut css, "scroll-padding", &css_px(v)); }
2937+ }
2938+ "scroll-padding-top" | "scroll-padding-bottom" | "scroll-padding-left" | "scroll-padding-right" => {
2939+ if let Some(v) = val { push_css(&mut css, effective_key, &css_px(v)); }
2940+ }
2941+ "direction" => {
2942+ if let Some(v) = val { push_css(&mut css, "direction", v); }
2943+ }
2944+
2945+ "content" => {
22782946 if let Some(v) = val {
2279− let property = if effective_key == "col-span" {
2280− "grid-column"
2947+ // Wrap in quotes if not already quoted and not a CSS keyword
2948+ if v.starts_with('"') || v.starts_with('\'') || v == "none" || v == "normal" || v.starts_with("attr(") || v.starts_with("counter(") {
2949+ push_css(&mut css, "content", v);
22812950 } else {
2282− "grid-row"
2283− };
2284− push_css(&mut css, property, &format!("span {}", v));
2951+ push_css(&mut css, "content", &format!("\"{}\"", v));
2952+ }
22852953 }
22862954 }
22872955
2288− // CSS's `line-clamp` has no support yet without its
2289− // `-webkit-` fallback, which needs a box to clamp
2956+ // --- CSS Shorthands ---
2957+
2958+ "truncate" => {
2959+ push_css(&mut css, "overflow", "hidden");
2960+ push_css(&mut css, "text-overflow", "ellipsis");
2961+ push_css(&mut css, "white-space", "nowrap");
2962+ }
22902963 "line-clamp" => {
22912964 if let Some(v) = val {
22922965 push_css(&mut css, "display", "-webkit-box");
@@ -2295,23 +2968,128 @@ fn attrs_to_css(attrs: &[Attribute], condition: &Condition, site: &Site) -> Stri
22952968 push_css(&mut css, "overflow", "hidden");
22962969 }
22972970 }
2298−
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) => {
2971+ "blur" => {
2972+ if let Some(v) = val {
2973+ push_css(&mut css, "filter", &format!("blur({})", css_px(v)));
2974+ }
2975+ }
2976+ "backdrop-blur" => {
2977+ if let Some(v) = val {
2978+ push_css(&mut css, "backdrop-filter", &format!("blur({})", css_px(v)));
2979+ }
2980+ }
2981+ "no-scrollbar" => {
2982+ push_css(&mut css, "scrollbar-width", "none");
2983+ push_css(&mut css, "-ms-overflow-style", "none");
2984+ }
2985+ "skeleton" => {
2986+ push_css(&mut css, "background", "linear-gradient(90deg,#e5e7eb 25%,#f3f4f6 50%,#e5e7eb 75%)");
2987+ push_css(&mut css, "background-size", "200% 100%");
2988+ push_css(&mut css, "animation", "hl-skeleton 1.5s ease-in-out infinite");
2989+ }
2990+ "gradient" => {
23052991 if let Some(v) = val {
2306− push_css(&mut css, key, &with_px(key, v));
2992+ // Parse: "from to [angle]" or "color1 color2 [angle]"
2993+ let parts: Vec<&str> = v.split_whitespace().collect();
2994+ let bg = if parts.len() >= 3 && (parts[2].ends_with("deg") || parts[2].ends_with("turn") || parts[2].ends_with("rad")) {
2995+ format!("linear-gradient({},{},{})", parts[2], parts[0], parts[1])
2996+ } else if parts.len() >= 2 {
2997+ format!("linear-gradient({},{})", parts[0], parts[1])
2998+ } else {
2999+ format!("linear-gradient({},transparent)", parts[0])
3000+ };
3001+ push_css(&mut css, "background", &bg);
23073002 }
23083003 }
23093004
3005+ // Grid areas
3006+ "grid-template-areas" => {
3007+ if let Some(v) = val { push_css(&mut css, "grid-template-areas", v); }
3008+ }
3009+ "grid-area" => {
3010+ if let Some(v) = val { push_css(&mut css, "grid-area", v); }
3011+ }
3012+
3013+ // View transitions
3014+ "view-transition-name" => {
3015+ if let Some(v) = val { push_css(&mut css, "view-transition-name", v); }
3016+ }
3017+
3018+ // Animate shorthand (alias for animation)
3019+ "animate" => {
3020+ if let Some(v) = val { push_css(&mut css, "animation", v); }
3021+ }
3022+
3023+ // CSS subgrid
3024+ "grid-template-columns" => {
3025+ if let Some(v) = val { push_css(&mut css, "grid-template-columns", v); }
3026+ }
3027+ "grid-template-rows" => {
3028+ if let Some(v) = val { push_css(&mut css, "grid-template-rows", v); }
3029+ }
3030+
3031+ // Scroll-driven animations
3032+ "animation-timeline" => {
3033+ if let Some(v) = val { push_css(&mut css, "animation-timeline", v); }
3034+ }
3035+ "animation-range" => {
3036+ if let Some(v) = val { push_css(&mut css, "animation-range", v); }
3037+ }
3038+ "view-timeline-name" => {
3039+ if let Some(v) = val { push_css(&mut css, "view-timeline-name", v); }
3040+ }
3041+ "view-timeline-axis" => {
3042+ if let Some(v) = val { push_css(&mut css, "view-timeline-axis", v); }
3043+ }
3044+ "scroll-timeline-name" => {
3045+ if let Some(v) = val { push_css(&mut css, "scroll-timeline-name", v); }
3046+ }
3047+ "scroll-timeline-axis" => {
3048+ if let Some(v) = val { push_css(&mut css, "scroll-timeline-axis", v); }
3049+ }
3050+
3051+ // Anchor positioning
3052+ "anchor-name" => {
3053+ if let Some(v) = val { push_css(&mut css, "anchor-name", v); }
3054+ }
3055+ "position-anchor" => {
3056+ if let Some(v) = val { push_css(&mut css, "position-anchor", v); }
3057+ }
3058+ "position-area" => {
3059+ if let Some(v) = val { push_css(&mut css, "position-area", v); }
3060+ }
3061+ "inset-area" => {
3062+ // Legacy alias for position-area
3063+ if let Some(v) = val { push_css(&mut css, "position-area", v); }
3064+ }
3065+
3066+ // initial-letter (drop caps)
3067+ "initial-letter" => {
3068+ if let Some(v) = val { push_css(&mut css, "initial-letter", v); }
3069+ }
3070+
3071+ // Critical CSS hint — not CSS, handled elsewhere
3072+ "critical" => {}
3073+
3074+ // Identity and HTML passthrough — not CSS
3075+ "id" | "class" => {}
3076+ "type" | "placeholder" | "name" | "value" | "disabled" | "required"
3077+ | "checked" | "for" | "action" | "method" | "autocomplete" | "min"
3078+ | "max" | "step" | "pattern" | "maxlength" | "rows" | "cols"
3079+ | "multiple" | "alt" | "role" | "tabindex" | "title"
3080+ | "controls" | "autoplay" | "loop" | "muted" | "poster" | "preload"
3081+ | "loading" | "decoding" | "ordered" | "src"
3082+ | "open" | "novalidate" | "low" | "high" | "optimum"
3083+ | "colspan" | "rowspan" | "scope" | "inline" | "responsive"
3084+ | "datetime" | "media" | "sizes" | "srcset" | "cite" | "list"
3085+ | "sandbox" | "allow" | "allowfullscreen" | "referrerpolicy"
3086+ | "formaction" | "formmethod" | "formtarget" | "target"
3087+ | "autofocus" => {}
3088+
23103089 _ => {}
23113090 }
23123091 }
23133092
2314− css.push_str(&aligned);
23153093 css
23163094}
23173095
@@ -2322,10 +3100,41 @@ fn push_css(css: &mut String, prop: &str, value: &str) {
23223100 css.push(';');
23233101}
23243102
3103+/// Known CSS units — if a value ends with one, skip appending `px`.
3104+const CSS_UNITS: &[&str] = &[
3105+ "%", "rem", "em", "vh", "vw", "vmin", "vmax", "dvh", "svh", "lvh",
3106+ "ch", "ex", "cm", "mm", "in", "pt", "pc", "fr",
3107+];
3108+
3109+/// Format a numeric value: if it already has a CSS unit, pass through as-is;
3110+/// otherwise append `px`.
3111+fn css_px(value: &str) -> String {
3112+ let v = value.trim();
3113+ if v == "0" {
3114+ return "0".to_string();
3115+ }
3116+ if CSS_UNITS.iter().any(|u| v.ends_with(u)) {
3117+ return v.to_string();
3118+ }
3119+ if v.starts_with("var(") || v.starts_with("calc(") || v.starts_with("clamp(") || v.starts_with("min(") || v.starts_with("max(") {
3120+ return v.to_string();
3121+ }
3122+ format!("{}px", v)
3123+}
3124+
3125+/// Format multiple space-separated values, each getting px if needed.
3126+fn css_px_multi(value: &str) -> String {
3127+ value
3128+ .split_whitespace()
3129+ .map(|p| css_px(p))
3130+ .collect::<Vec<_>>()
3131+ .join(" ")
3132+}
3133+
23253134fn extract_id_class(attrs: &[Attribute]) -> (Option<String>, Option<String>) {
23263135 let mut id = None;
23273136 let mut class = None;
2328− for attr in attrs.iter().filter(|a| a.html) {
3137+ for attr in attrs {
23293138 match attr.key.as_str() {
23303139 "id" => id = attr.value.clone(),
23313140 "class" => class = attr.value.clone(),
@@ -2335,6 +3144,149 @@ fn extract_id_class(attrs: &[Attribute]) -> (Option<String>, Option<String>) {
23353144 (id, class)
23363145}
23373146
3147+/// Read image dimensions from a local file by parsing the header bytes.
3148+/// Supports PNG, JPEG, GIF, WebP, AVIF, and SVG.
3149+fn read_image_dimensions(path: &str) -> Option<(u32, u32)> {
3150+ // SVG: parse as text for viewBox/width/height attributes
3151+ if path.ends_with(".svg") || path.ends_with(".SVG") {
3152+ let text = std::fs::read_to_string(path).ok()?;
3153+ return read_svg_dimensions(&text);
3154+ }
3155+
3156+ let data = std::fs::read(path).ok()?;
3157+ if data.len() < 12 {
3158+ return None;
3159+ }
3160+
3161+ // PNG: 8-byte signature, then IHDR chunk with width/height at bytes 16-23
3162+ if data.len() >= 24 && data.starts_with(b"\x89PNG\r\n\x1a\n") {
3163+ let w = u32::from_be_bytes([data[16], data[17], data[18], data[19]]);
3164+ let h = u32::from_be_bytes([data[20], data[21], data[22], data[23]]);
3165+ return Some((w, h));
3166+ }
3167+
3168+ // GIF: "GIF87a" or "GIF89a", width/height at bytes 6-9 (little-endian)
3169+ if data.starts_with(b"GIF87a") || data.starts_with(b"GIF89a") {
3170+ let w = u16::from_le_bytes([data[6], data[7]]) as u32;
3171+ let h = u16::from_le_bytes([data[8], data[9]]) as u32;
3172+ return Some((w, h));
3173+ }
3174+
3175+ // JPEG: scan for SOF0/SOF2 marker (0xFF 0xC0 or 0xFF 0xC2)
3176+ if data.starts_with(b"\xff\xd8") {
3177+ let mut i = 2;
3178+ while i + 9 < data.len() {
3179+ if data[i] != 0xFF {
3180+ i += 1;
3181+ continue;
3182+ }
3183+ let marker = data[i + 1];
3184+ if marker == 0xC0 || marker == 0xC2 {
3185+ let h = u16::from_be_bytes([data[i + 5], data[i + 6]]) as u32;
3186+ let w = u16::from_be_bytes([data[i + 7], data[i + 8]]) as u32;
3187+ return Some((w, h));
3188+ }
3189+ if i + 3 < data.len() {
3190+ let len = u16::from_be_bytes([data[i + 2], data[i + 3]]) as usize;
3191+ i += 2 + len;
3192+ } else {
3193+ break;
3194+ }
3195+ }
3196+ }
3197+
3198+ // WebP: "RIFF" ... "WEBP", VP8 header at byte 20
3199+ if data.len() >= 30 && &data[..4] == b"RIFF" && &data[8..12] == b"WEBP" {
3200+ if &data[12..16] == b"VP8 " && data.len() >= 30 {
3201+ let w = u16::from_le_bytes([data[26], data[27]]) as u32 & 0x3FFF;
3202+ let h = u16::from_le_bytes([data[28], data[29]]) as u32 & 0x3FFF;
3203+ return Some((w, h));
3204+ }
3205+ if &data[12..16] == b"VP8L" && data.len() >= 25 && data[21] == 0x2F {
3206+ let bits = u32::from_le_bytes([data[22], data[23], data[24], data[25]]);
3207+ let w = (bits & 0x3FFF) + 1;
3208+ let h = ((bits >> 14) & 0x3FFF) + 1;
3209+ return Some((w, h));
3210+ }
3211+ }
3212+
3213+ // AVIF: ISOBMFF container with "ftyp" box containing "avif"/"avis" brand,
3214+ // then "ispe" box with width/height
3215+ if data.len() >= 12 && &data[4..8] == b"ftyp" {
3216+ let brand = &data[8..12];
3217+ if brand == b"avif" || brand == b"avis" || brand == b"mif1" {
3218+ return read_avif_dimensions(&data);
3219+ }
3220+ }
3221+
3222+ None
3223+}
3224+
3225+/// Parse SVG viewBox or width/height attributes to get dimensions.
3226+fn read_svg_dimensions(text: &str) -> Option<(u32, u32)> {
3227+ // Try viewBox first: viewBox="minX minY width height"
3228+ if let Some(vb_start) = text.find("viewBox=\"") {
3229+ let rest = &text[vb_start + 9..];
3230+ if let Some(end) = rest.find('"') {
3231+ let parts: Vec<&str> = rest[..end].split_whitespace().collect();
3232+ if parts.len() == 4 {
3233+ if let (Ok(w), Ok(h)) = (parts[2].parse::<f64>(), parts[3].parse::<f64>()) {
3234+ if w > 0.0 && h > 0.0 {
3235+ return Some((w.round() as u32, h.round() as u32));
3236+ }
3237+ }
3238+ }
3239+ }
3240+ }
3241+ // Fall back to width/height attributes on <svg>
3242+ let svg_tag = text.find("<svg")?;
3243+ let tag_end = text[svg_tag..].find('>')? + svg_tag;
3244+ let tag = &text[svg_tag..tag_end];
3245+ let w = extract_svg_attr(tag, "width")?;
3246+ let h = extract_svg_attr(tag, "height")?;
3247+ Some((w, h))
3248+}
3249+
3250+fn extract_svg_attr(tag: &str, attr: &str) -> Option<u32> {
3251+ let needle = format!("{}=\"", attr);
3252+ let start = tag.find(&needle)? + needle.len();
3253+ let rest = &tag[start..];
3254+ let end = rest.find('"')?;
3255+ let val = rest[..end].trim_end_matches("px");
3256+ val.parse::<f64>().ok().map(|v| v.round() as u32)
3257+}
3258+
3259+/// Parse AVIF (ISOBMFF) container to find ispe box with image dimensions.
3260+fn read_avif_dimensions(data: &[u8]) -> Option<(u32, u32)> {
3261+ // Walk ISOBMFF boxes looking for "ispe" (image spatial extents)
3262+ let mut i = 0;
3263+ while i + 8 <= data.len() {
3264+ let box_size = u32::from_be_bytes([data[i], data[i + 1], data[i + 2], data[i + 3]]) as usize;
3265+ let box_type = &data[i + 4..i + 8];
3266+ if box_size < 8 {
3267+ break;
3268+ }
3269+ let box_end = (i + box_size).min(data.len());
3270+ // ispe box: 4 bytes version/flags + 4 bytes width + 4 bytes height
3271+ if box_type == b"ispe" && box_end >= i + 20 {
3272+ let w = u32::from_be_bytes([data[i + 12], data[i + 13], data[i + 14], data[i + 15]]);
3273+ let h = u32::from_be_bytes([data[i + 16], data[i + 17], data[i + 18], data[i + 19]]);
3274+ return Some((w, h));
3275+ }
3276+ // Recurse into container boxes (meta, iprp, ipco)
3277+ if matches!(box_type, b"meta" | b"iprp" | b"ipco" | b"moov" | b"trak" | b"mdia") {
3278+ let header_size = if box_type == b"meta" { 12 } else { 8 };
3279+ if i + header_size < box_end {
3280+ if let Some(dims) = read_avif_dimensions(&data[i + header_size..box_end]) {
3281+ return Some(dims);
3282+ }
3283+ }
3284+ }
3285+ i = box_end;
3286+ }
3287+ None
3288+}
3289+
23383290fn html_escape(s: &str) -> String {
23393291 s.replace('&', "&")
23403292 .replace('<', "<")
@@ -2373,24 +3325,10 @@ fn base64_encode(data: &[u8]) -> String {
23733325/// Generate a standard v3 source map with VLQ-encoded mappings.
23743326/// Compatible with browser devtools and source map tooling.
23753327pub 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 {
23823328 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− }
3329+ collect_source_lines(&doc.nodes, &mut mappings);
3330+ mappings.sort_by_key(|m| m.0);
3331+ mappings.dedup_by_key(|m| m.0);
23943332
23953333 // Build VLQ-encoded mappings string.
23963334 // Each generated line is separated by ';'. Each segment within a line is
@@ -2408,19 +3346,16 @@ pub fn source_map_for_html(html: &str, source_file: &str) -> String {
24083346 if mapping_idx < mappings.len() && mappings[mapping_idx].0 == gen_line {
24093347 let source_line = mappings[mapping_idx].1 as i64 - 1; // 0-based
24103348 // Segment: gen_col=0, source_idx=0, source_line=delta, source_col=0
2411− vlq_encode(0, &mut vlq); // generated column (always 0)
2412− vlq_encode(0, &mut vlq); // source file index (always 0)
3349+ vlq_encode(0, &mut vlq); // generated column (always 0)
3350+ vlq_encode(0, &mut vlq); // source file index (always 0)
24133351 vlq_encode(source_line - prev_source_line, &mut vlq); // source line delta
2414− vlq_encode(0, &mut vlq); // source column (always 0)
3352+ vlq_encode(0, &mut vlq); // source column (always 0)
24153353 prev_source_line = source_line;
24163354 mapping_idx += 1;
24173355 }
24183356 }
24193357
2420− let escaped_file = source_file
2421− .replace(".hl", ".html")
2422− .replace('\\', "\\\\")
2423− .replace('"', "\\\"");
3358+ let escaped_file = source_file.replace(".hl", ".html").replace('\\', "\\\\").replace('"', "\\\"");
24243359 let escaped_source = source_file.replace('\\', "\\\\").replace('"', "\\\"");
24253360
24263361 format!(
@@ -2450,30 +3385,52 @@ fn vlq_encode(value: i64, out: &mut String) {
24503385 }
24513386}
24523387
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()));
3388+fn collect_source_lines(nodes: &[Node], mappings: &mut Vec<(usize, usize)>) {
3389+ for node in nodes {
3390+ if let Node::Element(elem) = node {
3391+ if elem.line_num > 0 {
3392+ mappings.push((mappings.len() + 1, elem.line_num));
3393+ }
3394+ collect_source_lines(&elem.children, mappings);
3395+ }
3396+ }
3397+}
3398+
3399+/// Check if a specific element kind exists anywhere in the node tree.
3400+fn has_element_kind(nodes: &[Node], target: &ElementKind) -> bool {
3401+ for node in nodes {
3402+ if let Node::Element(elem) = node {
3403+ if elem.kind == *target {
3404+ return true;
3405+ }
3406+ if has_element_kind(&elem.children, target) {
3407+ return true;
3408+ }
3409+ }
3410+ }
3411+ false
3412+}
3413+
3414+/// Collect unique external domains from generated HTML for DNS prefetch hints.
3415+fn collect_dns_prefetch(html: &str, dev: bool) -> String {
3416+ let mut domains = Vec::new();
3417+ let mut rest = html;
3418+ while let Some(pos) = rest.find("https://") {
3419+ let start = pos + 8; // skip "https://"
3420+ rest = &rest[start..];
3421+ let end = rest.find(|c: char| c == '/' || c == '"' || c == '\'' || c == ' ' || c == '>' || c == ')').unwrap_or(rest.len());
3422+ let domain = &rest[..end];
3423+ if !domain.is_empty() && domain.contains('.') && !domains.contains(&domain.to_string()) {
3424+ domains.push(domain.to_string());
3425+ }
3426+ }
3427+ let mut out = String::new();
3428+ for domain in &domains {
3429+ if dev {
3430+ out.push_str(&format!("<link rel=\"dns-prefetch\" href=\"//{}\">\n", domain));
3431+ } else {
3432+ out.push_str(&format!("<link rel=\"dns-prefetch\" href=\"//{}\">", domain));
3433+ }
24783434 }
3435+ out
24793436}