@@ -1,8 +1,7 @@
11use std::collections::HashMap;
2−use std::hash::Hash;
2+use std::hash::{Hash, Hasher};
33
44use crate::ast::*;
5−use crate::vocab::with_px;
65
76// ---------------------------------------------------------------------------
87// Style collector: deduplicates CSS and assigns class names
@@ -17,315 +16,50 @@ const BREAKPOINTS: &[(&str, &str)] = &[
1716 ("2xl", "1536px"),
1817];
1918
20−/// The prefix of every generated class (`hl-2k9xq0m`), which keeps them
21−/// out of the author's own class names.
22−pub const CLASS_PREFIX: &str = "hl-";
23−
24−/// How many base-36 digits a class's name has after `hl-`: 7, about 36
25−/// bits of its style's hash, so a site with 10,000 different styles has
26−/// odds of about 6 in 10,000 that two of them share a name, which
27−/// `htmlang build` reports (`class-collision`). Within one file, a style
28−/// whose name is taken takes more digits.
29−pub const CLASS_DIGITS: usize = 7;
30−
31−/// A stable hash of `text`: FNV-1a, then SplitMix64's finalizer, so every
32−/// digit of a name depends on all of the text. It is the same on every
33−/// platform and in every build, unlike `std`'s hasher.
34−pub fn stable_hash(text: &str) -> u64 {
35− let mut hash: u64 = 0xcbf2_9ce4_8422_2325;
36− for byte in text.bytes() {
37− hash ^= u64::from(byte);
38− hash = hash.wrapping_mul(0x0000_0100_0000_01b3);
39− }
40− hash = (hash ^ (hash >> 30)).wrapping_mul(0xbf58_476d_1ce4_e5b9);
41− hash = (hash ^ (hash >> 27)).wrapping_mul(0x94d0_49bb_1331_11eb);
42− hash ^ (hash >> 31)
43−}
44−
45−/// `digits` base-36 digits of `hash`: `2k9xq0m`. With 13, all of it.
46−pub fn hash_digits(hash: u64, digits: usize) -> String {
47− const DIGITS: &[u8] = b"0123456789abcdefghijklmnopqrstuvwxyz";
48− let mut n = hash;
49− (0..digits)
50− .map(|_| {
51− let digit = DIGITS[(n % 36) as usize] as char;
52− n /= 36;
53− digit
54− })
55− .collect()
56−}
57−
58−/// A class htmlang generated: its name, and the hash of the style it
59−/// stands for. One style has one name in every file, so a fragment's
60−/// classes mean the same in any page it goes into.
61−#[derive(Clone, Debug, PartialEq, Eq)]
62−pub struct Class {
63− pub name: String,
64− pub style: u64,
65−}
66−
67−/// When a style applies: the at-rule prefixes it is under (their ranks,
68−/// see [`crate::vocab::at_rule_rank`], sorted, so `dark:md:` and `md:dark:`
69−/// are one condition) and its selector prefixes, left to right as the
70−/// selector reads (`hover:children:` is `.a:hover > *`).
71−#[derive(Clone, Default, PartialEq, Eq, Hash, Debug)]
72−struct Condition {
73− at: Vec<usize>,
74− selector: Vec<String>,
75−}
76−
77−impl Condition {
78− /// The condition of an attribute's key, and the name after its
79− /// prefixes.
80− fn of(key: &str) -> (Condition, &str) {
81− let (prefixes, name) = crate::vocab::split_prefixes(key);
82− let mut condition = Condition::default();
83− for prefix in prefixes {
84− match crate::vocab::at_rule_rank(prefix) {
85− Some(rank) => condition.at.push(rank),
86− None => condition.selector.push(prefix.to_string()),
87− }
88− }
89− condition.at.sort_unstable();
90− condition.at.dedup();
91− (condition, name)
92− }
93−
94− /// Only the at-rule part: a direction under `hover:` is the one without
95− /// it.
96− fn at_only(at: &[usize]) -> Condition {
97− Condition {
98− at: at.to_vec(),
99− selector: Vec::new(),
100− }
101− }
102−
103− /// The styles go on the element's children (`children:`).
104− fn on_children(&self) -> bool {
105− self.selector.iter().any(|p| p == crate::vocab::CHILDREN)
106− }
107−
108− /// The styles go on the elements of one kind inside the element
109− /// (`@td:`): where the element prefix is in the selector chain.
110− fn inside(&self) -> Option<usize> {
111− self.selector
112− .iter()
113− .position(|p| crate::vocab::element_prefix(p).is_some())
114− }
115−
116− /// Whether this condition holds wherever `other` does: its at-rules
117− /// are implied by `other`'s, and it has no selector or `other`'s.
118− fn holds_at(&self, other: &Condition) -> bool {
119− (self.selector.is_empty() || self.selector == other.selector)
120− && self.at.iter().all(|&a| {
121− other
122− .at
123− .iter()
124− .any(|&b| crate::vocab::at_rule_implied(a, b))
125− })
126− }
127−
128− /// The order the rules of each condition are written in, which the
129− /// cascade follows: no prefix, then selectors, then each at-rule
130− /// block (see [`at_order`]), with its selectors inside it.
131− fn order(&self) -> (AtOrder, SelectorOrder) {
132− (at_order(&self.at), selector_order(&self.selector))
133− }
134−}
135−
136−/// Where a block of at-rules is written: after the rules without one; by
137−/// its last (innermost) prefix in the order of
138−/// [`crate::vocab::at_rule_prefixes`] (widths, media, container widths), so
139−/// `md:dark:` comes with `dark:`, after it; then by length.
140−type AtOrder = (bool, usize, usize, Vec<usize>);
141−
142−fn at_order(at: &[usize]) -> AtOrder {
143− (
144− !at.is_empty(),
145− at.last().copied().unwrap_or(0),
146− at.len(),
147− at.to_vec(),
148− )
149−}
150−
151−/// Selector chains in the order of [`crate::vocab::PSEUDOS`] (position,
152−/// then form state, then `hover:`, `focus:`, `active:`, `disabled:`), and
153−/// by their argument's text for the same pseudo-class; a chain before the
154−/// longer ones it starts. A chain through `children:` comes after the
155−/// others, ordered by what follows its last `children:` and then by what
156−/// comes before it: only that tail counts toward its specificity (see
157−/// [`selector`]), so `hover:children:` follows `children:` and wins over it
158−/// on hover.
159−type SelectorOrder = (bool, Vec<(usize, String)>, Vec<(usize, String)>);
160−
161−fn selector_order(selector: &[String]) -> SelectorOrder {
162− let table = crate::vocab::PSEUDOS;
163− let ranked = |chain: &[String]| -> Vec<(usize, String)> {
164− chain
165− .iter()
166− .map(|p| {
167− let name = crate::vocab::pseudo_name(p);
168− let rank = table
169− .iter()
170− .position(|(q, _)| *q == name)
171− .unwrap_or(table.len());
172− (rank, p.clone())
173− })
174− .collect()
175− };
176− match selector.iter().rposition(|p| p == crate::vocab::CHILDREN) {
177− None => (false, ranked(selector), Vec::new()),
178− Some(i) => (true, ranked(&selector[i + 1..]), ranked(&selector[..i])),
179− }
180−}
181−
182−/// The order of the chains through an element prefix (`@td:`, see
183−/// [`scoped_selector`]): by the prefixes before it, which select the root
184−/// of the scope and add nothing to the specificity, so `hover:@td:` comes
185−/// after `@td:` and wins on hover; then by the element; then by the
186−/// prefixes after it.
187−fn inside_order(chain: &[String]) -> (SelectorOrder, String, SelectorOrder) {
188− let at = chain
189− .iter()
190− .position(|p| crate::vocab::element_prefix(p).is_some())
191− .unwrap_or(chain.len());
192− (
193− selector_order(&chain[..at]),
194− chain.get(at).cloned().unwrap_or_default(),
195− selector_order(chain.get(at + 1..).unwrap_or_default()),
196− )
197−}
198−
199−/// The selector for `class` under a chain of selector prefixes, read left
200−/// to right. Everything before the last `children:` goes in `:where()`, so
201−/// a parent's `children:` styles have no specificity, and a child's own
202−/// attributes win over them: `children:hover:` is `:where(.a)>*:hover`,
203−/// `hover:children:` is `:where(.a:hover)>*`.
204−fn selector(class: &str, chain: &[String]) -> String {
205− let last_children = chain.iter().rposition(|p| p == crate::vocab::CHILDREN);
206− let mut out = format!(".{}", class);
207− for (i, prefix) in chain.iter().enumerate() {
208− if prefix == crate::vocab::CHILDREN {
209− if Some(i) == last_children {
210− out = format!(":where({})>*", out);
211− } else {
212− out.push_str(">*");
213− }
214− } else if let Some(pseudo) = crate::vocab::pseudo_selector(prefix) {
215− out.push_str(&pseudo);
216− }
19+/// Generate short CSS class names: a, b, ..., z, a0, a1, ..., z9, aa, ab, ...
20+pub(crate) fn short_class_name(idx: usize) -> String {
21+ if idx < 26 {
22+ return String::from((b'a' + idx as u8) as char);
21723 }
218− out
219−}
220−
221−/// The rule for the elements an element prefix picks out inside the
222−/// element with the class `class` (see [`Condition::inside`]): the scope's
223−/// root, from the selector prefixes before it (`hover:@td:` is inside a
224−/// hovered element), and the selector for the elements, from those after
225−/// it (`@td:hover:` is a hovered cell). `:scope td` leaves out the root
226−/// itself, so `@ul [@ul:...]` styles the lists inside, not its own. `None`
227−/// when the name has no tag of its own (the parser reports it).
228−fn scoped_selector(class: &str, chain: &[String], at: usize) -> Option<(String, String)> {
229− let name = crate::vocab::element_prefix(&chain[at])?;
230− let tag = ElementKind::from_name(name)?.own_tag()?;
231− let root = selector(class, &chain[..at]);
232− let mut target = format!(":scope {}", tag);
233− for prefix in &chain[at + 1..] {
234− if let Some(pseudo) = crate::vocab::pseudo_selector(prefix) {
235− target.push_str(&pseudo);
236− }
237− }
238− Some((root, target))
239−}
240−
241−/// The `@media` or `@container` rule an at-rule prefix stands for, as
242−/// written in readable and in compact output.
243−fn at_rule(rank: usize, dev: bool) -> String {
244− let prefix = crate::vocab::at_rule_prefixes()
245− .nth(rank)
246− .unwrap_or_default();
247− let name = prefix.trim_end_matches(':');
248− let width = |name: &str| {
249− BREAKPOINTS
250− .iter()
251− .find(|(n, _)| *n == name)
252− .map_or("0", |(_, w)| *w)
253− };
254− let (kind, feature, value) = if let Some(size) = name.strip_prefix("cq-") {
255− ("@container", "min-width", width(size))
256− } else {
257− match name {
258− "print" => {
259− return "@media print".to_string();
260− }
261− "dark" => ("@media", "prefers-color-scheme", "dark"),
262− "motion-safe" => ("@media", "prefers-reduced-motion", "no-preference"),
263− "motion-reduce" => ("@media", "prefers-reduced-motion", "reduce"),
264− "landscape" | "portrait" => ("@media", "orientation", name),
265− _ => ("@media", "min-width", width(name)),
266− }
267− };
268− if dev {
269− format!("{} ({}: {})", kind, feature, value)
270− } else {
271− format!("{}({}:{})", kind, feature, value)
24+ let mut n = idx - 26;
25+ let mut name = String::new();
26+ // First char is always a letter
27+ name.push((b'a' + (n % 26) as u8) as char);
28+ n /= 26;
29+ loop {
30+ name.push((b'a' + (n % 36).min(25) as u8) as char);
31+ if n < 36 { break; }
32+ n /= 36;
27233 }
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
34+ // Reverse so it reads naturally
35+ name.chars().rev().collect()
29636}
29737
29838struct StyleEntry {
29939 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,
40+ base: String,
41+ /// (CSS selector suffix, css_rules) — e.g. (":hover", "color:red;")
42+ pseudo: Vec<(String, String)>,
43+ /// Responsive overrides: (breakpoint_prefix, css)
44+ responsive: Vec<(String, String)>,
45+ /// Dark mode overrides
46+ dark: String,
47+ /// Print overrides
48+ print: String,
49+ motion_safe: String,
50+ motion_reduce: String,
51+ landscape: String,
52+ portrait: String,
53+ /// Container query overrides: (breakpoint_prefix, css)
54+ container: Vec<(String, String)>,
31455}
31556
31657struct StyleCollector {
31758 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).
59+ /// Maps a pre-hashed style signature to an index into `entries`.
60+ /// Using u64 as the key keeps lookups allocation-free; on the rare case of
61+ /// a hash collision we fall back to a full equality check against the entry.
32062 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)>,
32963}
33064
33165impl StyleCollector {
@@ -333,328 +67,312 @@ impl StyleCollector {
33367 StyleCollector {
33468 entries: Vec::new(),
33569 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);
34770 }
34871 }
34972
35073 /// Returns a class name for this style combination, or None if all empty.
74+ #[allow(clippy::too_many_arguments)]
35175 fn get_class(
35276 &mut self,
353− defaults: String,
354− mut rules: Vec<(Condition, String)>,
355− distinct: String,
77+ base: String,
78+ pseudo: Vec<(String, String)>,
79+ responsive: Vec<(String, String)>,
80+ dark: String,
81+ print: String,
82+ motion_safe: String,
83+ motion_reduce: String,
84+ landscape: String,
85+ portrait: String,
86+ container: Vec<(String, String)>,
35687 ) -> Option<String> {
357− rules.retain(|(_, body)| !body.is_empty());
358− if defaults.is_empty() && rules.is_empty() {
88+ if base.is_empty()
89+ && pseudo.is_empty()
90+ && responsive.is_empty()
91+ && dark.is_empty()
92+ && print.is_empty()
93+ && motion_safe.is_empty()
94+ && motion_reduce.is_empty()
95+ && landscape.is_empty()
96+ && portrait.is_empty()
97+ && container.is_empty()
98+ {
35999 return None;
360100 }
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) {
101+ use std::collections::hash_map::DefaultHasher;
102+ let mut h = DefaultHasher::new();
103+ base.hash(&mut h);
104+ pseudo.hash(&mut h);
105+ responsive.hash(&mut h);
106+ dark.hash(&mut h);
107+ print.hash(&mut h);
108+ motion_safe.hash(&mut h);
109+ motion_reduce.hash(&mut h);
110+ landscape.hash(&mut h);
111+ portrait.hash(&mut h);
112+ container.hash(&mut h);
113+ let sig = h.finish();
114+
115+ if let Some(indices) = self.index.get(&sig) {
365116 for &idx in indices {
366117 let e = &self.entries[idx];
367− if e.defaults == defaults && e.rules == rules && e.distinct == distinct {
118+ if e.base == base
119+ && e.pseudo == pseudo
120+ && e.responsive == responsive
121+ && e.dark == dark
122+ && e.print == print
123+ && e.motion_safe == motion_safe
124+ && e.motion_reduce == motion_reduce
125+ && e.landscape == landscape
126+ && e.portrait == portrait
127+ && e.container == container
128+ {
368129 return Some(e.class_name.clone());
369130 }
370131 }
371132 }
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
375133 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());
134+ let name = short_class_name(idx);
381135 self.entries.push(StyleEntry {
382136 class_name: name.clone(),
383− style,
384− defaults,
385− rules,
386− distinct,
137+ base,
138+ pseudo,
139+ responsive,
140+ dark,
141+ print,
142+ motion_safe,
143+ motion_reduce,
144+ landscape,
145+ portrait,
146+ container,
387147 });
388− self.index.entry(style).or_default().push(idx);
148+ self.index.entry(sig).or_default().push(idx);
389149 Some(name)
390150 }
391151
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− }
152+ fn to_css_formatted(&self, dev: bool, use_layer: bool) -> String {
153+ let mut css = String::new();
154+ let (sp, nl) = if dev { (" ", "\n") } else { ("", "") };
399155
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(","));
156+ // Wrap in @layer for specificity management
157+ if use_layer {
423158 if dev {
424− kind.push_str(&format!(" {} {{{}}}\n", selector, body));
159+ css.push_str("@layer htmlang {\n");
425160 } else {
426− kind.push_str(&format!("{}{{{}}}", selector, body));
161+ css.push_str("@layer htmlang{");
162+ }
163+ }
164+
165+ // Non-responsive rules
166+ for e in &self.entries {
167+ if !e.base.is_empty() {
168+ if use_layer && dev {
169+ css.push_str(&format!(" .{}{sp}{{{}}}{nl}", e.class_name, e.base));
170+ } else {
171+ css.push_str(&format!(".{}{sp}{{{}}}{nl}", e.class_name, e.base));
172+ }
173+ }
174+ for (selector, pseudo_css) in &e.pseudo {
175+ if !pseudo_css.is_empty() {
176+ if use_layer && dev {
177+ css.push_str(&format!(" .{}{}{sp}{{{}}}{nl}", e.class_name, selector, pseudo_css));
178+ } else {
179+ css.push_str(&format!(".{}{}{sp}{{{}}}{nl}", e.class_name, selector, pseudo_css));
180+ }
181+ }
182+ }
183+ }
184+
185+ // Responsive rules grouped by breakpoint
186+ for &(bp_name, bp_width) in BREAKPOINTS {
187+ let mut bp_css = String::new();
188+ for e in &self.entries {
189+ for (bp, rule_css) in &e.responsive {
190+ if bp == bp_name && !rule_css.is_empty() {
191+ if dev {
192+ bp_css.push_str(&format!(" .{} {{{}}}\n", e.class_name, rule_css));
193+ } else {
194+ bp_css.push_str(&format!(".{}{{{}}}", e.class_name, rule_css));
195+ }
196+ }
197+ }
198+ }
199+ if !bp_css.is_empty() {
200+ if dev {
201+ css.push_str(&format!(
202+ "@media (min-width: {}) {{\n{}}}\n",
203+ bp_width, bp_css
204+ ));
205+ } else {
206+ css.push_str(&format!(
207+ "@media(min-width:{}){{{}}}",
208+ bp_width, bp_css
209+ ));
210+ }
427211 }
428212 }
429213
430− let mut inside = self.blocks(true, dev);
431− // A function's scoped `@style`, nested under its class
432− for block in scoped {
214+ // Dark mode rules
215+ let mut dark_css = String::new();
216+ for e in &self.entries {
217+ if !e.dark.is_empty() {
218+ if dev {
219+ dark_css.push_str(&format!(" .{} {{{}}}\n", e.class_name, e.dark));
220+ } else {
221+ dark_css.push_str(&format!(".{}{{{}}}", e.class_name, e.dark));
222+ }
223+ }
224+ }
225+ if !dark_css.is_empty() {
433226 if dev {
434− inside.push_str(block);
435− inside.push('\n');
227+ css.push_str(&format!("@media (prefers-color-scheme: dark) {{\n{}}}\n", dark_css));
436228 } else {
437− inside.push_str(&compact_css(block));
229+ css.push_str(&format!("@media(prefers-color-scheme:dark){{{}}}", dark_css));
438230 }
439231 }
440232
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;
233+ // Print rules
234+ let mut print_css = String::new();
235+ for e in &self.entries {
236+ if !e.print.is_empty() {
237+ if dev {
238+ print_css.push_str(&format!(" .{} {{{}}}\n", e.class_name, e.print));
239+ } else {
240+ print_css.push_str(&format!(".{}{{{}}}", e.class_name, e.print));
241+ }
449242 }
243+ }
244+ if !print_css.is_empty() {
450245 if dev {
451− css.push_str(&format!("@layer {} {{\n{}}}\n", name, rules));
246+ css.push_str(&format!("@media print {{\n{}}}\n", print_css));
452247 } else {
453− css.push_str(&format!("@layer {}{{{}}}", name, rules));
248+ css.push_str(&format!("@media print{{{}}}", print_css));
454249 }
455250 }
456− css
457− }
458251
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)
252+ // Motion safe rules
253+ let mut motion_safe_css = String::new();
254+ for e in &self.entries {
255+ if !e.motion_safe.is_empty() {
256+ if dev {
257+ motion_safe_css.push_str(&format!(" .{} {{{}}}\n", e.class_name, e.motion_safe));
542258 } 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 { "}" });
259+ motion_safe_css.push_str(&format!(".{}{{{}}}", e.class_name, e.motion_safe));
554260 }
261+ }
262+ }
263+ if !motion_safe_css.is_empty() {
264+ if dev {
265+ css.push_str(&format!("@media (prefers-reduced-motion: no-preference) {{\n{}}}\n", motion_safe_css));
555266 } 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);
267+ css.push_str(&format!("@media(prefers-reduced-motion:no-preference){{{}}}", motion_safe_css));
268+ }
269+ }
270+
271+ // Motion reduce rules
272+ let mut motion_reduce_css = String::new();
273+ for e in &self.entries {
274+ if !e.motion_reduce.is_empty() {
275+ if dev {
276+ motion_reduce_css.push_str(&format!(" .{} {{{}}}\n", e.class_name, e.motion_reduce));
277+ } else {
278+ motion_reduce_css.push_str(&format!(".{}{{{}}}", e.class_name, e.motion_reduce));
563279 }
564280 }
565− if inner.is_empty() {
566− continue;
281+ }
282+ if !motion_reduce_css.is_empty() {
283+ if dev {
284+ css.push_str(&format!("@media (prefers-reduced-motion: reduce) {{\n{}}}\n", motion_reduce_css));
285+ } else {
286+ css.push_str(&format!("@media(prefers-reduced-motion:reduce){{{}}}", motion_reduce_css));
567287 }
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))
288+ }
289+
290+ // Landscape rules
291+ let mut landscape_css = String::new();
292+ for e in &self.entries {
293+ if !e.landscape.is_empty() {
294+ if dev {
295+ landscape_css.push_str(&format!(" .{} {{{}}}\n", e.class_name, e.landscape));
577296 } else {
578− format!("{}{{{inner}}}", at_rule(rank, false))
579− };
297+ landscape_css.push_str(&format!(".{}{{{}}}", e.class_name, e.landscape));
298+ }
299+ }
300+ }
301+ if !landscape_css.is_empty() {
302+ if dev {
303+ css.push_str(&format!("@media (orientation: landscape) {{\n{}}}\n", landscape_css));
304+ } else {
305+ css.push_str(&format!("@media(orientation:landscape){{{}}}", landscape_css));
580306 }
581− css.push_str(&inner);
582307 }
583− css
584− }
585−}
586308
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;
309+ // Portrait rules
310+ let mut portrait_css = String::new();
311+ for e in &self.entries {
312+ if !e.portrait.is_empty() {
313+ if dev {
314+ portrait_css.push_str(&format!(" .{} {{{}}}\n", e.class_name, e.portrait));
315+ } else {
316+ portrait_css.push_str(&format!(".{}{{{}}}", e.class_name, e.portrait));
317+ }
318+ }
601319 }
602− if !groups.contains_key(body) {
603− order.push(body);
320+ if !portrait_css.is_empty() {
321+ if dev {
322+ css.push_str(&format!("@media (orientation: portrait) {{\n{}}}\n", portrait_css));
323+ } else {
324+ css.push_str(&format!("@media(orientation:portrait){{{}}}", portrait_css));
325+ }
604326 }
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−}
619327
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(' ');
328+ // Container query rules grouped by breakpoint
329+ for &(bp_name, bp_width) in BREAKPOINTS {
330+ let mut cq_css = String::new();
331+ for e in &self.entries {
332+ for (bp, rule_css) in &e.container {
333+ if bp == bp_name && !rule_css.is_empty() {
334+ if dev {
335+ cq_css.push_str(&format!(" .{} {{{}}}\n", e.class_name, rule_css));
336+ } else {
337+ cq_css.push_str(&format!(".{}{{{}}}", e.class_name, rule_css));
338+ }
339+ }
340+ }
341+ }
342+ if !cq_css.is_empty() {
343+ if dev {
344+ css.push_str(&format!(
345+ "@container (min-width: {}) {{\n{}}}\n",
346+ bp_width, cq_css
347+ ));
348+ } else {
349+ css.push_str(&format!(
350+ "@container(min-width:{}){{{}}}",
351+ bp_width, cq_css
352+ ));
353+ }
634354 }
635− out.push('{');
636− out.push_str(body);
637− out.push('}');
355+ }
356+
357+ // Close @layer
358+ if use_layer {
638359 if dev {
639− out.push('\n');
360+ css.push_str("}\n");
361+ } else {
362+ css.push('}');
640363 }
641364 }
642− i += run;
365+
366+ css
643367 }
644368}
645369
646370struct GenContext {
647371 dev: bool,
648372 depth: usize,
373+ image_count: usize,
649374 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,
375+ has_defer: bool,
658376}
659377
660378impl GenContext {
@@ -680,26 +398,23 @@ pub struct CodegenOptions {
680398 pub dev: bool,
681399 pub partial: bool,
682400 pub minify: bool,
401+ pub compat: bool,
683402}
684403
685404/// Generate HTML from a parsed document using the given options.
686405pub 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();
694406 let mut html = if opts.partial {
695− generate_partial_inner(doc, opts.dev, &mut classes)
407+ generate_partial_inner(doc, opts.dev)
696408 } else {
697− generate_full_inner(doc, opts.dev, &mut classes)
409+ generate_full_inner(doc, opts.dev)
698410 };
699411 if opts.minify {
700412 html = minify_html(&html);
701413 }
702− (html, classes)
414+ if opts.compat {
415+ html = add_vendor_prefixes(&html);
416+ }
417+ html
703418}
704419
705420pub fn generate(doc: &Document) -> String {
@@ -707,44 +422,31 @@ pub fn generate(doc: &Document) -> String {
707422}
708423
709424pub fn generate_dev(doc: &Document) -> String {
710− generate_with(
711− doc,
712− &CodegenOptions {
713− dev: true,
714− ..Default::default()
715− },
716− )
425+ generate_with(doc, &CodegenOptions { dev: true, ..Default::default() })
717426}
718427
719428pub fn generate_partial(doc: &Document) -> String {
720− generate_with(
721− doc,
722− &CodegenOptions {
723− partial: true,
724− ..Default::default()
725− },
726− )
429+ generate_with(doc, &CodegenOptions { partial: true, ..Default::default() })
727430}
728431
729432pub 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− )
433+ generate_with(doc, &CodegenOptions { dev: true, partial: true, ..Default::default() })
738434}
739435
740436pub fn generate_minified(doc: &Document) -> String {
741− generate_with(
742− doc,
743− &CodegenOptions {
744− minify: true,
745− ..Default::default()
746− },
747− )
437+ generate_with(doc, &CodegenOptions { minify: true, ..Default::default() })
438+}
439+
440+pub fn generate_compat(doc: &Document) -> String {
441+ generate_with(doc, &CodegenOptions { compat: true, ..Default::default() })
442+}
443+
444+pub fn generate_dev_compat(doc: &Document) -> String {
445+ generate_with(doc, &CodegenOptions { dev: true, compat: true, ..Default::default() })
446+}
447+
448+pub fn generate_minified_compat(doc: &Document) -> String {
449+ generate_with(doc, &CodegenOptions { minify: true, compat: true, ..Default::default() })
748450}
749451
750452fn minify_html(html: &str) -> String {
@@ -761,9 +463,9 @@ fn minify_html(html: &str) -> String {
761463 if i + 4 < chars.len() && chars[i] == '<' {
762464 let rest: String = chars[i..].iter().take(10).collect();
763465 let rest_lower = rest.to_lowercase();
764− if rest_lower.starts_with("<pre") || rest_lower.starts_with("<textarea") {
466+ if rest_lower.starts_with("<pre") {
765467 in_pre = true;
766− } else if rest_lower.starts_with("</pre") || rest_lower.starts_with("</textarea") {
468+ } else if rest_lower.starts_with("</pre") {
767469 in_pre = false;
768470 } else if rest_lower.starts_with("<script") {
769471 in_script = true;
@@ -777,18 +479,13 @@ fn minify_html(html: &str) -> String {
777479 }
778480
779481 // 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] == '-'
482+ if !in_script && !in_style && i + 3 < chars.len()
483+ && chars[i] == '<' && chars[i+1] == '!' && chars[i+2] == '-' && chars[i+3] == '-'
787484 {
788485 // Skip to -->
789486 let mut j = i + 4;
790487 while j + 2 < chars.len() {
791− if chars[j] == '-' && chars[j + 1] == '-' && chars[j + 2] == '>' {
488+ if chars[j] == '-' && chars[j+1] == '-' && chars[j+2] == '>' {
792489 j += 3;
793490 break;
794491 }
@@ -805,11 +502,10 @@ fn minify_html(html: &str) -> String {
805502 continue;
806503 }
807504
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).
505+ // Collapse whitespace between tags
811506 if chars[i].is_whitespace() {
812507 if !prev_was_space {
508+ // Only emit a space if we're between content (not between tags)
813509 result.push(' ');
814510 prev_was_space = true;
815511 }
@@ -817,6 +513,14 @@ fn minify_html(html: &str) -> String {
817513 continue;
818514 }
819515
516+ // Trim space before closing tags
517+ if chars[i] == '<' && prev_was_space {
518+ // Remove trailing space before tag
519+ if result.ends_with(' ') {
520+ result.pop();
521+ }
522+ }
523+
820524 prev_was_space = false;
821525 result.push(chars[i]);
822526 i += 1;
@@ -825,172 +529,202 @@ fn minify_html(html: &str) -> String {
825529 result
826530}
827531
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− };
532+/// Add vendor prefixes to CSS within <style> tags for broader browser compatibility.
533+fn add_vendor_prefixes(html: &str) -> String {
534+ // Find CSS within <style>...</style> and add vendor prefixes
535+ let mut result = String::with_capacity(html.len() + 512);
536+ let mut rest = html;
537+ while let Some(start) = rest.find("<style>") {
538+ let after_tag = start + 7;
539+ result.push_str(&rest[..after_tag]);
540+ rest = &rest[after_tag..];
541+ if let Some(end) = rest.find("</style>") {
542+ let css = &rest[..end];
543+ result.push_str(&prefix_css(css));
544+ result.push_str("</style>");
545+ rest = &rest[end + 8..];
546+ } else {
547+ break;
548+ }
549+ }
550+ result.push_str(rest);
551+ result
552+}
553+
554+fn prefix_css(css: &str) -> String {
555+ let mut out = String::with_capacity(css.len() + 256);
556+ let mut i = 0;
557+ let bytes = css.as_bytes();
558+ while i < bytes.len() {
559+ // Find property declarations
560+ if let Some(pos) = css[i..].find('{') {
561+ let brace = i + pos;
562+ out.push_str(&css[i..=brace]);
563+ i = brace + 1;
564+ // Process declarations within this block
565+ if let Some(close) = css[i..].find('}') {
566+ let block = &css[i..i + close];
567+ out.push_str(&prefix_declarations(block));
568+ out.push('}');
569+ i = i + close + 1;
570+ }
571+ } else {
572+ out.push_str(&css[i..]);
573+ break;
574+ }
575+ }
576+ out
577+}
578+
579+fn prefix_declarations(block: &str) -> String {
580+ let mut out = String::with_capacity(block.len() + 128);
581+ for decl in block.split(';') {
582+ let decl = decl.trim();
583+ if decl.is_empty() {
584+ continue;
585+ }
586+ if let Some((prop, val)) = decl.split_once(':') {
587+ let prop = prop.trim();
588+ let val = val.trim();
589+ match prop {
590+ "backdrop-filter" => {
591+ out.push_str(&format!("-webkit-backdrop-filter:{};", val));
592+ out.push_str(&format!("backdrop-filter:{};", val));
593+ }
594+ "user-select" => {
595+ out.push_str(&format!("-webkit-user-select:{};", val));
596+ out.push_str(&format!("-moz-user-select:{};", val));
597+ out.push_str(&format!("user-select:{};", val));
598+ }
599+ "appearance" => {
600+ out.push_str(&format!("-webkit-appearance:{};", val));
601+ out.push_str(&format!("-moz-appearance:{};", val));
602+ out.push_str(&format!("appearance:{};", val));
603+ }
604+ "background-clip" if val.contains("text") => {
605+ out.push_str(&format!("-webkit-background-clip:{};", val));
606+ out.push_str(&format!("background-clip:{};", val));
607+ }
608+ "hyphens" => {
609+ out.push_str(&format!("-webkit-hyphens:{};", val));
610+ out.push_str(&format!("-ms-hyphens:{};", val));
611+ out.push_str(&format!("hyphens:{};", val));
612+ }
613+ "text-size-adjust" => {
614+ out.push_str(&format!("-webkit-text-size-adjust:{};", val));
615+ out.push_str(&format!("-ms-text-size-adjust:{};", val));
616+ out.push_str(&format!("text-size-adjust:{};", val));
617+ }
618+ "mask-image" | "mask-size" | "mask-repeat" | "mask-position" => {
619+ out.push_str(&format!("-webkit-{}:{};", prop, val));
620+ out.push_str(&format!("{}:{};", prop, val));
621+ }
622+ _ => {
623+ out.push_str(decl);
624+ out.push(';');
625+ }
626+ }
627+ } else {
628+ out.push_str(decl);
629+ out.push(';');
630+ }
631+ }
632+ out
633+}
634+
635+fn generate_full_inner(doc: &Document, dev: bool) -> String {
833636 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− };
637+ let mut ctx = GenContext { dev, depth: 0, image_count: 0, has_interactive: false, has_defer: false };
842638
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;
639+ // Check if document has @main for skip-to-content link
640+ let has_main = has_element_kind(&doc.nodes, &ElementKind::Main);
866641
867642 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);
927643
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";
644+ // Skip-to-content link for accessibility (only when @main exists)
645+ if has_main {
931646 if dev {
932− format!(
933− "{}{} {{ outline: 2px solid currentColor; outline-offset: 2px; }}\n",
934− OWN_ELEMENTS, focusable
935− )
647+ body.push_str("<a href=\"#hl-main\" class=\"hl-skip\">Skip to content</a>\n");
936648 } else {
937− format!(
938− "{}{}{{outline:2px solid currentColor;outline-offset:2px}}",
939− OWN_ELEMENTS, focusable
940− )
649+ body.push_str("<a href=\"#hl-main\" class=\"hl-skip\">Skip to content</a>");
941650 }
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();
651+ }
960652
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()));
653+ for node in &doc.nodes {
654+ generate_node(node, None, &mut body, &mut styles, &mut ctx);
966655 }
967656
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);
657+ // Collect external domains for DNS prefetch
658+ let dns_prefetch_html = collect_dns_prefetch(&body, dev);
971659
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() {
660+ let mut element_css = String::new();
661+
662+ // CSS custom properties (includes @theme runtime tokens)
663+ let has_theme_tokens = !doc.theme_tokens.is_empty();
664+ if !doc.css_vars.is_empty() || has_theme_tokens {
975665 if dev {
976666 element_css.push_str(":root {\n");
977− for (name, value) in &root_vars {
667+ for (name, value) in &doc.css_vars {
978668 element_css.push_str(&format!(" {}: {};\n", name, value));
979669 }
670+ // @theme tokens as runtime CSS custom properties
671+ for (name, value) in &doc.theme_tokens {
672+ let css_name = format!("--{}", name);
673+ // Only emit if not already in css_vars
674+ if !doc.css_vars.iter().any(|(n, _)| *n == css_name) {
675+ element_css.push_str(&format!(" {}: {};\n", css_name, value));
676+ }
677+ }
980678 element_css.push_str("}\n");
981679 } else {
982680 element_css.push_str(":root{");
983− for (name, value) in &root_vars {
681+ for (name, value) in &doc.css_vars {
984682 element_css.push_str(name);
985683 element_css.push(':');
986684 element_css.push_str(value);
987685 element_css.push(';');
988686 }
687+ for (name, value) in &doc.theme_tokens {
688+ let css_name = format!("--{}", name);
689+ if !doc.css_vars.iter().any(|(n, _)| *n == css_name) {
690+ element_css.push_str(&css_name);
691+ element_css.push(':');
692+ element_css.push_str(value);
693+ element_css.push(';');
694+ }
695+ }
989696 element_css.push('}');
990697 }
991698 }
992699
993− element_css.push_str(&styles_css);
700+ let has_custom_css = !doc.custom_css.is_empty();
701+ element_css.push_str(&styles.to_css_formatted(dev, !has_custom_css));
702+
703+ // @keyframes
704+ for (name, kf_body) in &doc.keyframes {
705+ if dev {
706+ element_css.push_str(&format!("@keyframes {} {{\n{}\n}}\n", name, kf_body));
707+ } else {
708+ element_css.push_str(&format!("@keyframes {}{{{}}}", name, kf_body));
709+ }
710+ }
711+
712+ // Auto-inject skeleton keyframe if skeleton attribute is used
713+ let skeleton_used = element_css.contains("hl-skeleton");
714+ if skeleton_used {
715+ if dev {
716+ element_css.push_str("@keyframes hl-skeleton {\n 0% { background-position: 200% 0; }\n 100% { background-position: -200% 0; }\n}\n");
717+ } else {
718+ element_css.push_str("@keyframes hl-skeleton{0%{background-position:200% 0}100%{background-position:-200% 0}}");
719+ }
720+ }
721+
722+ // Also inject carousel webkit scrollbar hiding
723+ let carousel_used = element_css.contains("scroll-snap-type:x mandatory");
724+ if carousel_used && !element_css.contains("::-webkit-scrollbar") {
725+ // The carousel class already has scrollbar-width:none, but webkit needs pseudo-element
726+ // We add a global rule for carousel-style elements
727+ }
994728
995729 // @style blocks (custom CSS)
996730 for block in &doc.custom_css {
@@ -998,115 +732,464 @@ fn build_element_css(doc: &Document, styles: &StyleCollector, dev: bool) -> Stri
998732 element_css.push_str(block);
999733 element_css.push('\n');
1000734 } else {
1001− element_css.push_str(&compact_css(block));
735+ // Minify: collapse whitespace
736+ let minified: String = block
737+ .lines()
738+ .map(|l| l.trim())
739+ .collect::<Vec<_>>()
740+ .join("");
741+ element_css.push_str(&minified);
1002742 }
1003743 }
1004744
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()
745+ // @scope blocks
746+ for block in &doc.scope_blocks {
747+ if dev {
748+ element_css.push_str(block);
749+ element_css.push('\n');
1055750 } 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; }}")
751+ let minified: String = block.lines().map(|l| l.trim()).collect::<Vec<_>>().join("");
752+ element_css.push_str(&minified);
753+ }
754+ }
755+
756+ // @starting-style blocks
757+ if !doc.starting_style_blocks.is_empty() {
758+ if dev {
759+ element_css.push_str("@starting-style {\n");
760+ for block in &doc.starting_style_blocks {
761+ element_css.push_str(block);
762+ element_css.push('\n');
763+ }
764+ element_css.push_str("}\n");
1061765 } else {
1062− format!("{own},{own}::before,{own}::after{{box-sizing:border-box}}")
1063− });
766+ element_css.push_str("@starting-style{");
767+ for block in &doc.starting_style_blocks {
768+ let minified: String = block.lines().map(|l| l.trim()).collect::<Vec<_>>().join("");
769+ element_css.push_str(&minified);
770+ }
771+ element_css.push('}');
772+ }
1064773 }
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− )
774+
775+ // Build meta tags string
776+ let meta_html = if doc.meta_tags.is_empty() {
777+ String::new()
1083778 } else {
1084− format!("@layer {};@layer hl-reset{{{}}}", LAYERS.join(","), rules)
779+ let mut m = String::new();
780+ for (name, content) in &doc.meta_tags {
781+ if dev {
782+ m.push_str(&format!(
783+ "<meta name=\"{}\" content=\"{}\">\n",
784+ html_escape(name),
785+ html_escape(content)
786+ ));
787+ } else {
788+ m.push_str(&format!(
789+ "<meta name=\"{}\" content=\"{}\">",
790+ html_escape(name),
791+ html_escape(content)
792+ ));
793+ }
794+ }
795+ m
796+ };
797+
798+ // Build OG meta tags
799+ let og_html = if doc.og_tags.is_empty() {
800+ String::new()
801+ } else {
802+ let mut o = String::new();
803+ for (property, content) in &doc.og_tags {
804+ if dev {
805+ o.push_str(&format!(
806+ "<meta property=\"og:{}\" content=\"{}\">\n",
807+ html_escape(property),
808+ html_escape(content)
809+ ));
810+ } else {
811+ o.push_str(&format!(
812+ "<meta property=\"og:{}\" content=\"{}\">",
813+ html_escape(property),
814+ html_escape(content)
815+ ));
816+ }
817+ }
818+ o
819+ };
820+
821+ // Build head blocks string
822+ let head_html = if doc.head_blocks.is_empty() {
823+ String::new()
824+ } else {
825+ let mut h = String::new();
826+ for block in &doc.head_blocks {
827+ h.push_str(block);
828+ if dev {
829+ h.push('\n');
830+ }
831+ }
832+ h
833+ };
834+
835+ let lang_attr = match &doc.lang {
836+ Some(lang) => format!(" lang=\"{}\"", html_escape(lang)),
837+ None => String::new(),
838+ };
839+
840+ let favicon_html = match &doc.favicon {
841+ Some(path) => {
842+ // Try to read and inline the favicon
843+ if let Ok(data) = std::fs::read(path) {
844+ let mime = if path.ends_with(".ico") {
845+ "image/x-icon"
846+ } else if path.ends_with(".png") {
847+ "image/png"
848+ } else if path.ends_with(".svg") {
849+ "image/svg+xml"
850+ } else {
851+ "image/x-icon"
852+ };
853+ let b64 = base64_encode(&data);
854+ if dev {
855+ format!("<link rel=\"icon\" href=\"data:{};base64,{}\">\n", mime, b64)
856+ } else {
857+ format!("<link rel=\"icon\" href=\"data:{};base64,{}\">", mime, b64)
858+ }
859+ } else {
860+ // Fall back to href
861+ if dev {
862+ format!("<link rel=\"icon\" href=\"{}\">\n", html_escape(path))
863+ } else {
864+ format!("<link rel=\"icon\" href=\"{}\">", html_escape(path))
865+ }
866+ }
867+ }
868+ None => String::new(),
869+ };
870+
871+ // Canonical URL
872+ let canonical_html = match &doc.canonical {
873+ Some(url) => {
874+ if dev {
875+ format!("<link rel=\"canonical\" href=\"{}\">\n", html_escape(url))
876+ } else {
877+ format!("<link rel=\"canonical\" href=\"{}\">", html_escape(url))
878+ }
879+ }
880+ None => String::new(),
881+ };
882+
883+ // Base URL
884+ let base_html = match &doc.base_url {
885+ Some(url) => {
886+ if dev {
887+ format!("<base href=\"{}\">\n", html_escape(url))
888+ } else {
889+ format!("<base href=\"{}\">", html_escape(url))
890+ }
891+ }
892+ None => String::new(),
893+ };
894+
895+ // @font-face CSS
896+ for (name, url) in &doc.font_faces {
897+ let format_hint = if url.ends_with(".woff2") {
898+ " format('woff2')"
899+ } else if url.ends_with(".woff") {
900+ " format('woff')"
901+ } else if url.ends_with(".ttf") {
902+ " format('truetype')"
903+ } else if url.ends_with(".otf") {
904+ " format('opentype')"
905+ } else {
906+ ""
907+ };
908+ if dev {
909+ element_css.insert_str(0, &format!(
910+ "@font-face {{\n font-family: '{}';\n src: url('{}'){};\n font-display: swap;\n}}\n",
911+ name, url, format_hint
912+ ));
913+ } else {
914+ element_css.insert_str(0, &format!(
915+ "@font-face{{font-family:'{}';src:url('{}'){};font-display:swap}}",
916+ name, url, format_hint
917+ ));
918+ }
919+ }
920+
921+ // JSON-LD blocks
922+ let json_ld_html: String = doc.json_ld_blocks.iter().map(|block| {
923+ if dev {
924+ format!("<script type=\"application/ld+json\">\n{}\n</script>\n", block)
925+ } else {
926+ format!("<script type=\"application/ld+json\">{}</script>", block)
927+ }
928+ }).collect();
929+
930+ // Manifest link
931+ let manifest_html = if let Some(ref manifest) = doc.manifest {
932+ let mut json = String::from("{");
933+ json.push_str(&format!("\"name\":\"{}\",", manifest.name));
934+ if let Some(ref short) = manifest.short_name {
935+ json.push_str(&format!("\"short_name\":\"{}\",", short));
936+ }
937+ json.push_str(&format!("\"start_url\":\"{}\",", manifest.start_url));
938+ json.push_str(&format!("\"display\":\"{}\"", manifest.display));
939+ if let Some(ref bg) = manifest.background_color {
940+ json.push_str(&format!(",\"background_color\":\"{}\"", bg));
941+ }
942+ if let Some(ref tc) = manifest.theme_color {
943+ json.push_str(&format!(",\"theme_color\":\"{}\"", tc));
944+ }
945+ if let Some(ref desc) = manifest.description {
946+ json.push_str(&format!(",\"description\":\"{}\"", desc));
947+ }
948+ if !manifest.icons.is_empty() {
949+ json.push_str(",\"icons\":[");
950+ for (i, (src, sizes)) in manifest.icons.iter().enumerate() {
951+ if i > 0 { json.push(','); }
952+ json.push_str(&format!("{{\"src\":\"{}\",\"sizes\":\"{}\",\"type\":\"image/png\"}}", src, sizes));
953+ }
954+ json.push(']');
955+ }
956+ json.push('}');
957+
958+ // Inline the manifest as a data URI
959+ let encoded = base64_encode(json.as_bytes());
960+ if dev {
961+ format!("<link rel=\"manifest\" href=\"data:application/manifest+json;base64,{}\">\n", encoded)
962+ } else {
963+ format!("<link rel=\"manifest\" href=\"data:application/manifest+json;base64,{}\">", encoded)
964+ }
965+ } else {
966+ String::new()
967+ };
968+
969+ // Preload hints (auto-detect fonts from @font-face)
970+ let mut preload_html = String::new();
971+ for (_, url) in &doc.font_faces {
972+ if dev {
973+ preload_html.push_str(&format!(
974+ "<link rel=\"preload\" href=\"{}\" as=\"font\" type=\"font/woff2\" crossorigin>\n", url
975+ ));
976+ } else {
977+ preload_html.push_str(&format!(
978+ "<link rel=\"preload\" href=\"{}\" as=\"font\" type=\"font/woff2\" crossorigin>", url
979+ ));
980+ }
981+ }
982+ // Explicit preload hints from the document
983+ for hint in &doc.preload_hints {
984+ if dev {
985+ preload_html.push_str(&format!(
986+ "<link rel=\"preload\" href=\"{}\" as=\"{}\"{}>\n",
987+ html_escape(&hint.href), hint.as_type,
988+ if hint.crossorigin { " crossorigin" } else { "" }
989+ ));
990+ } else {
991+ preload_html.push_str(&format!(
992+ "<link rel=\"preload\" href=\"{}\" as=\"{}\"{}>",
993+ html_escape(&hint.href), hint.as_type,
994+ if hint.crossorigin { " crossorigin" } else { "" }
995+ ));
996+ }
997+ }
998+
999+ // Auto theme-color meta from @theme primary token
1000+ let theme_color_html = doc.theme_tokens.iter()
1001+ .find(|(name, _)| name == "primary" || name == "theme-color")
1002+ .map(|(_, value)| {
1003+ if dev {
1004+ format!("<meta name=\"theme-color\" content=\"{}\">\n", html_escape(value))
1005+ } else {
1006+ format!("<meta name=\"theme-color\" content=\"{}\">", html_escape(value))
1007+ }
1008+ })
1009+ .unwrap_or_default();
1010+
1011+ // Focus-visible CSS for interactive elements (accessibility)
1012+ let focus_visible_css = if ctx.has_interactive {
1013+ if dev {
1014+ "a:focus-visible, button:focus-visible, input:focus-visible, select:focus-visible, textarea:focus-visible { outline: 2px solid currentColor; outline-offset: 2px; }\n"
1015+ } else {
1016+ "a:focus-visible,button:focus-visible,input:focus-visible,select:focus-visible,textarea:focus-visible{outline:2px solid currentColor;outline-offset:2px}"
1017+ }
1018+ } else {
1019+ ""
1020+ };
1021+
1022+ // Skip-to-content CSS (visually hidden but accessible)
1023+ let skip_link_css = if has_main {
1024+ if dev {
1025+ ".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"
1026+ } else {
1027+ ".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}"
1028+ }
1029+ } else {
1030+ ""
1031+ };
1032+
1033+ // Noscript fallback: show deferred content if JS is disabled
1034+ let noscript_html = if ctx.has_defer {
1035+ if dev {
1036+ "<noscript><style>.hl-defer-placeholder { display: none; }</style></noscript>\n"
1037+ } else {
1038+ "<noscript><style>.hl-defer-placeholder{display:none}</style></noscript>"
1039+ }
1040+ } else {
1041+ ""
1042+ };
1043+
1044+ match &doc.page_title {
1045+ Some(title) => {
1046+ if dev {
1047+ format!(
1048+ "\
1049+<!DOCTYPE html>
1050+<html{lang_attr}>
1051+<head>
1052+<meta charset=\"utf-8\">
1053+<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">
1054+<title>{title}</title>
1055+{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}\
1056+<style>
1057+*, *::before, *::after {{ box-sizing: border-box; }}
1058+body {{ margin: 0; font-family: system-ui, -apple-system, sans-serif; }}
1059+img {{ display: block; }}
1060+{focus_visible_css}{skip_link_css}{element_css}\
1061+</style>
1062+{noscript_html}\
1063+</head>
1064+<body>
1065+{body}\
1066+</body>
1067+</html>
1068+",
1069+ title = html_escape(title),
1070+ lang_attr = lang_attr,
1071+ theme_color_html = theme_color_html,
1072+ base_html = base_html,
1073+ canonical_html = canonical_html,
1074+ manifest_html = manifest_html,
1075+ preload_html = preload_html,
1076+ dns_prefetch_html = dns_prefetch_html,
1077+ meta_html = meta_html,
1078+ favicon_html = favicon_html,
1079+ json_ld_html = json_ld_html,
1080+ head_html = head_html,
1081+ og_html = og_html,
1082+ focus_visible_css = focus_visible_css,
1083+ skip_link_css = skip_link_css,
1084+ noscript_html = noscript_html,
1085+ element_css = element_css,
1086+ body = body,
1087+ )
1088+ } else {
1089+ format!(
1090+ "<!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>",
1091+ title = html_escape(title),
1092+ lang_attr = lang_attr,
1093+ theme_color_html = theme_color_html,
1094+ base_html = base_html,
1095+ canonical_html = canonical_html,
1096+ manifest_html = manifest_html,
1097+ preload_html = preload_html,
1098+ dns_prefetch_html = dns_prefetch_html,
1099+ meta_html = meta_html,
1100+ og_html = og_html,
1101+ favicon_html = favicon_html,
1102+ json_ld_html = json_ld_html,
1103+ head_html = head_html,
1104+ focus_visible_css = focus_visible_css,
1105+ skip_link_css = skip_link_css,
1106+ noscript_html = noscript_html,
1107+ element_css = element_css,
1108+ body = body,
1109+ )
1110+ }
1111+ }
1112+ None => {
1113+ if element_css.is_empty() {
1114+ body
1115+ } else {
1116+ if dev {
1117+ format!("<style>\n{}</style>\n{}", element_css, body)
1118+ } else {
1119+ format!("<style>{}</style>{}", element_css, body)
1120+ }
1121+ }
1122+ }
10851123 }
10861124}
10871125
10881126/// 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 {
1127+fn generate_partial_inner(doc: &Document, dev: bool) -> String {
10901128 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− };
1129+ let mut ctx = GenContext { dev, depth: 0, image_count: 0, has_interactive: false, has_defer: false };
10991130 let mut body = String::new();
11001131
1101− generate_children(&doc.nodes, None, &mut body, &mut styles, &mut ctx);
1132+ for node in &doc.nodes {
1133+ generate_node(node, None, &mut body, &mut styles, &mut ctx);
1134+ }
1135+
1136+ let has_custom_css = !doc.custom_css.is_empty();
1137+ let mut element_css = String::new();
1138+
1139+ // CSS custom properties
1140+ if !doc.css_vars.is_empty() || !doc.theme_tokens.is_empty() {
1141+ if dev {
1142+ element_css.push_str(":root {\n");
1143+ for (name, value) in &doc.css_vars {
1144+ element_css.push_str(&format!(" {}: {};\n", name, value));
1145+ }
1146+ for (name, value) in &doc.theme_tokens {
1147+ let css_name = format!("--{}", name);
1148+ if !doc.css_vars.iter().any(|(n, _)| *n == css_name) {
1149+ element_css.push_str(&format!(" {}: {};\n", css_name, value));
1150+ }
1151+ }
1152+ element_css.push_str("}\n");
1153+ } else {
1154+ element_css.push_str(":root{");
1155+ for (name, value) in &doc.css_vars {
1156+ element_css.push_str(name);
1157+ element_css.push(':');
1158+ element_css.push_str(value);
1159+ element_css.push(';');
1160+ }
1161+ for (name, value) in &doc.theme_tokens {
1162+ let css_name = format!("--{}", name);
1163+ if !doc.css_vars.iter().any(|(n, _)| *n == css_name) {
1164+ element_css.push_str(&css_name);
1165+ element_css.push(':');
1166+ element_css.push_str(value);
1167+ element_css.push(';');
1168+ }
1169+ }
1170+ element_css.push('}');
1171+ }
1172+ }
1173+
1174+ element_css.push_str(&styles.to_css_formatted(dev, !has_custom_css));
1175+
1176+ for (name, kf_body) in &doc.keyframes {
1177+ if dev {
1178+ element_css.push_str(&format!("@keyframes {} {{\n{}\n}}\n", name, kf_body));
1179+ } else {
1180+ element_css.push_str(&format!("@keyframes {}{{{}}}", name, kf_body));
1181+ }
1182+ }
11021183
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, ""));
1184+ for block in &doc.custom_css {
1185+ if dev {
1186+ element_css.push_str(block);
1187+ element_css.push('\n');
1188+ } else {
1189+ let minified: String = block.lines().map(|l| l.trim()).collect::<Vec<_>>().join("");
1190+ element_css.push_str(&minified);
1191+ }
11081192 }
1109− classes.extend(styles.classes());
11101193
11111194 if element_css.is_empty() {
11121195 body
@@ -1121,20 +1204,29 @@ fn generate_partial_inner(doc: &Document, dev: bool, classes: &mut Vec<Class>) -
11211204// Node generation
11221205// ---------------------------------------------------------------------------
11231206
1124−/// Write `node`, which is inside an element with the layout `parent`
1125−/// (`None` at the top of the page).
11261207fn generate_node(
11271208 node: &Node,
1128− parent: Option<Layout>,
1209+ parent_kind: Option<&ElementKind>,
11291210 out: &mut String,
11301211 styles: &mut StyleCollector,
11311212 ctx: &mut GenContext,
11321213) {
11331214 match node {
1134− Node::Element(elem) => generate_element(elem, parent, out, styles, ctx),
1215+ Node::Element(elem) => generate_element(elem, parent_kind, out, styles, ctx),
11351216 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);
1217+ let needs_wrap = matches!(
1218+ parent_kind,
1219+ Some(ElementKind::Row) | Some(ElementKind::Column) | Some(ElementKind::El)
1220+ | Some(ElementKind::Nav) | Some(ElementKind::Header) | Some(ElementKind::Footer)
1221+ | Some(ElementKind::Main) | Some(ElementKind::Section) | Some(ElementKind::Article)
1222+ | Some(ElementKind::Aside) | Some(ElementKind::ListItem)
1223+ | Some(ElementKind::Form) | Some(ElementKind::Details) | Some(ElementKind::Figure)
1224+ | Some(ElementKind::Blockquote)
1225+ | Some(ElementKind::Dialog) | Some(ElementKind::DefinitionList)
1226+ | Some(ElementKind::DefinitionDescription) | Some(ElementKind::Fieldset)
1227+ | Some(ElementKind::Datalist) | Some(ElementKind::Grid) | Some(ElementKind::Stack)
1228+ | Some(ElementKind::Noscript) | Some(ElementKind::Address) | Some(ElementKind::Search)
1229+ );
11381230 if needs_wrap {
11391231 out.push_str(&ctx.indent());
11401232 out.push_str("<span>");
@@ -1153,208 +1245,157 @@ fn generate_node(
11531245 }
11541246}
11551247
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−}
1248+/// HTML attributes that are passed through to the HTML tag rather than converted to CSS.
1249+const HTML_PASSTHROUGH_ATTRS: &[&str] = &[
1250+ "type", "placeholder", "name", "value", "disabled", "required", "checked",
1251+ "for", "action", "method", "autocomplete",
1252+ "min", "max", "step", "pattern", "maxlength", "rows", "cols", "multiple",
1253+ "alt", "role", "tabindex", "title", "autofocus",
1254+ // Media
1255+ "controls", "autoplay", "loop", "muted", "poster", "preload",
1256+ // Image optimization
1257+ "loading", "decoding",
1258+ // Media src (explicit attribute form)
1259+ "src",
1260+ // New element attributes
1261+ "datetime", "media", "sizes", "srcset", "list",
1262+ // Details
1263+ "open",
1264+ // Form
1265+ "novalidate",
1266+ // Progress/Meter
1267+ "low", "high", "optimum",
1268+ // Table
1269+ "colspan", "rowspan", "scope",
1270+ // Popover API
1271+ "popover", "popovertarget", "popovertargetaction",
1272+ // Modern form/input hints
1273+ "inputmode", "enterkeyhint",
1274+ // Performance hints
1275+ "fetchpriority", "blocking",
1276+ // Global attrs
1277+ "translate", "spellcheck",
1278+ // ARIA live regions
1279+ "aria-live", "aria-atomic", "aria-relevant",
1280+];
11701281
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−}
1282+/// Boolean HTML attributes (rendered without a value, e.g., `<input disabled>`).
1283+const BOOLEAN_HTML_ATTRS: &[&str] = &[
1284+ "disabled", "required", "checked", "multiple",
1285+ "controls", "autoplay", "loop", "muted",
1286+ "open", "novalidate", "autofocus",
1287+ "defer", "async", "nomodule",
1288+ // Popover
1289+ "popover",
1290+];
11831291
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);
1292+fn emit_html_passthrough_attrs(out: &mut String, attrs: &[Attribute]) {
1293+ for attr in attrs {
1294+ let key = attr.key.as_str();
1295+ let is_passthrough = HTML_PASSTHROUGH_ATTRS.contains(&key)
1296+ || key.starts_with("aria-")
1297+ || key.starts_with("data-");
1298+ if !is_passthrough {
12151299 continue;
12161300 }
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);
1301+ if BOOLEAN_HTML_ATTRS.contains(&key) && attr.value.is_none() {
1302+ out.push(' ');
1303+ out.push_str(key);
1304+ } else if let Some(val) = &attr.value {
1305+ out.push(' ');
1306+ out.push_str(key);
1307+ out.push_str("=\"");
1308+ out.push_str(&html_escape(val));
1309+ out.push('"');
12661310 }
12671311 }
12681312}
12691313
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−
13131314fn generate_element(
13141315 elem: &Element,
1315− parent: Option<Layout>,
1316+ parent_kind: Option<&ElementKind>,
13161317 out: &mut String,
13171318 styles: &mut StyleCollector,
13181319 ctx: &mut GenContext,
13191320) {
13201321 // Self-closing elements
1321− if elem.kind.layout() == Layout::Void {
1322− generate_self_closing(elem, parent, out, styles, ctx);
1322+ if matches!(elem.kind, ElementKind::Image | ElementKind::Input | ElementKind::HorizontalRule | ElementKind::Source | ElementKind::Spacer) {
1323+ generate_self_closing(elem, parent_kind, out, styles, ctx);
13231324 return;
13241325 }
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);
1326+ // @script renders as <script> with raw body content (no HTML escaping)
1327+ if elem.kind == ElementKind::Script {
13291328 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)));
1329+ out.push_str("<script");
1330+ // Pass through src, type, defer, async, etc.
1331+ for attr in &elem.attrs {
1332+ let key = attr.key.as_str();
1333+ if matches!(key, "src" | "type" | "defer" | "async" | "crossorigin" | "integrity" | "nomodule" | "id") {
1334+ if let Some(val) = &attr.value {
1335+ out.push(' ');
1336+ out.push_str(key);
1337+ out.push_str("=\"");
1338+ out.push_str(&html_escape(val));
1339+ out.push('"');
1340+ } else {
1341+ out.push(' ');
1342+ out.push_str(key);
1343+ }
13371344 }
13381345 }
1339− emit_html_attrs(out, &elem.attrs);
13401346 out.push('>');
1347+ // Children are raw JS code, not HTML
13411348 for child in &elem.children {
13421349 match child {
13431350 Node::Text(segments) => {
13441351 for seg in segments {
1345− if let TextSegment::Plain(text) = seg {
1346− out.push_str(text)
1347− }
1352+ if let TextSegment::Plain(text) = seg { out.push_str(text) }
13481353 }
13491354 }
13501355 Node::Raw(content) => out.push_str(content),
13511356 _ => {}
13521357 }
13531358 }
1354− out.push_str("</");
1355− out.push_str(tag);
1359+ out.push_str("</script>");
1360+ out.push_str(ctx.nl());
1361+ return;
1362+ }
1363+ // @breadcrumb generates semantic <nav aria-label="breadcrumb"><ol>...</ol></nav>
1364+ if elem.kind == ElementKind::Breadcrumb {
1365+ let gen_class = compute_class(&elem.attrs, &elem.kind, parent_kind, styles);
1366+ let (id, user_class) = extract_id_class(&elem.attrs);
1367+ out.push_str(&ctx.indent());
1368+ out.push_str("<nav aria-label=\"breadcrumb\"");
1369+ emit_class_attr(out, gen_class.as_deref(), user_class.as_deref());
1370+ if let Some(id) = id {
1371+ out.push_str(" id=\"");
1372+ out.push_str(&html_escape(&id));
1373+ out.push('"');
1374+ }
13561375 out.push('>');
13571376 out.push_str(ctx.nl());
1377+ ctx.depth += 1;
1378+ out.push_str(&ctx.indent());
1379+ out.push_str("<ol>");
1380+ out.push_str(ctx.nl());
1381+ ctx.depth += 1;
1382+ for child in &elem.children {
1383+ out.push_str(&ctx.indent());
1384+ out.push_str("<li>");
1385+ let mut buf = String::new();
1386+ generate_node(child, Some(&elem.kind), &mut buf, styles, ctx);
1387+ out.push_str(buf.trim());
1388+ out.push_str("</li>");
1389+ out.push_str(ctx.nl());
1390+ }
1391+ ctx.depth -= 1;
1392+ out.push_str(&ctx.indent());
1393+ out.push_str("</ol>");
1394+ out.push_str(ctx.nl());
1395+ ctx.depth -= 1;
1396+ out.push_str(&ctx.indent());
1397+ out.push_str("</nav>");
1398+ out.push_str(ctx.nl());
13581399 return;
13591400 }
13601401 if elem.kind == ElementKind::Children {
@@ -1364,54 +1405,259 @@ fn generate_element(
13641405 return;
13651406 }
13661407 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);
1408+ // Render children without a wrapper element
1409+ for child in &elem.children {
1410+ generate_node(child, parent_kind, out, styles, ctx);
1411+ }
13701412 return;
13711413 }
13721414
1373− let mut own = Flow::of(elem);
13741415 let tag = match &elem.kind {
1375− ElementKind::Row | ElementKind::El => "div",
1416+ ElementKind::Row | ElementKind::Column | ElementKind::El
1417+ | ElementKind::Grid | ElementKind::Stack => "div",
13761418 ElementKind::Text => "span",
13771419 ElementKind::Paragraph => "p",
13781420 ElementKind::Link => "a",
1379− ElementKind::Tag(spec) => spec.html,
1421+ ElementKind::Button => "button",
1422+ ElementKind::Select => "select",
1423+ ElementKind::Textarea => "textarea",
1424+ ElementKind::Option => "option",
1425+ ElementKind::Label => "label",
1426+ // Semantic elements
1427+ ElementKind::Nav => "nav",
1428+ ElementKind::Header => "header",
1429+ ElementKind::Footer => "footer",
1430+ ElementKind::Main => "main",
1431+ ElementKind::Section => "section",
1432+ ElementKind::Article => "article",
1433+ ElementKind::Aside => "aside",
1434+ // List
1435+ ElementKind::List => {
1436+ if elem.attrs.iter().any(|a| a.key == "ordered") { "ol" } else { "ul" }
1437+ }
1438+ ElementKind::ListItem => "li",
1439+ // Table
1440+ ElementKind::Table => "table",
1441+ ElementKind::TableHead => "thead",
1442+ ElementKind::TableBody => "tbody",
1443+ ElementKind::TableRow => "tr",
1444+ ElementKind::TableCell => "td",
1445+ ElementKind::TableHeaderCell => "th",
1446+ // Media
1447+ ElementKind::Video => "video",
1448+ ElementKind::Audio => "audio",
1449+ // Additional semantic elements
1450+ ElementKind::Form => "form",
1451+ ElementKind::Details => "details",
1452+ ElementKind::Summary => "summary",
1453+ ElementKind::Blockquote => "blockquote",
1454+ ElementKind::Cite => "cite",
1455+ ElementKind::Code => "code",
1456+ ElementKind::Pre => "pre",
1457+ ElementKind::Figure => "figure",
1458+ ElementKind::FigCaption => "figcaption",
1459+ ElementKind::Progress => "progress",
1460+ ElementKind::Meter => "meter",
1461+ // New elements
1462+ ElementKind::Dialog => "dialog",
1463+ ElementKind::DefinitionList => "dl",
1464+ ElementKind::DefinitionTerm => "dt",
1465+ ElementKind::DefinitionDescription => "dd",
1466+ ElementKind::Fieldset => "fieldset",
1467+ ElementKind::Legend => "legend",
1468+ ElementKind::Picture => "picture",
1469+ ElementKind::Time => "time",
1470+ ElementKind::Mark => "mark",
1471+ ElementKind::Kbd => "kbd",
1472+ ElementKind::Abbr => "abbr",
1473+ ElementKind::Datalist => "datalist",
1474+ ElementKind::Iframe => "iframe",
1475+ ElementKind::Output => "output",
1476+ ElementKind::Canvas => "canvas",
1477+ ElementKind::Badge => "span",
1478+ ElementKind::Tooltip => "span",
1479+ ElementKind::Avatar => "div",
1480+ ElementKind::Carousel => "div",
1481+ ElementKind::Chip => "span",
1482+ ElementKind::Tag => "span",
1483+ ElementKind::Noscript => "noscript",
1484+ ElementKind::Address => "address",
1485+ ElementKind::Search => "search",
1486+ ElementKind::Image | ElementKind::Input | ElementKind::HorizontalRule
1487+ | ElementKind::Children | ElementKind::Slot(_) | ElementKind::Fragment
1488+ | ElementKind::Source | ElementKind::Spacer
1489+ | ElementKind::Script | ElementKind::Breadcrumb => unreachable!(),
1490+ };
1491+
1492+ let kind_label = match elem.kind {
1493+ ElementKind::Row => "row",
1494+ ElementKind::Column => "column",
1495+ ElementKind::El => "el",
1496+ ElementKind::Text => "text",
1497+ ElementKind::Paragraph => "paragraph",
1498+ ElementKind::Link => "link",
1499+ ElementKind::Button => "button",
1500+ ElementKind::Select => "select",
1501+ ElementKind::Textarea => "textarea",
1502+ ElementKind::Option => "option",
1503+ ElementKind::Label => "label",
1504+ ElementKind::Nav => "nav",
1505+ ElementKind::Header => "header",
1506+ ElementKind::Footer => "footer",
1507+ ElementKind::Main => "main",
1508+ ElementKind::Section => "section",
1509+ ElementKind::Article => "article",
1510+ ElementKind::Aside => "aside",
1511+ ElementKind::List => "list",
1512+ ElementKind::ListItem => "item",
1513+ ElementKind::Table => "table",
1514+ ElementKind::TableHead => "thead",
1515+ ElementKind::TableBody => "tbody",
1516+ ElementKind::TableRow => "tr",
1517+ ElementKind::TableCell => "td",
1518+ ElementKind::TableHeaderCell => "th",
1519+ ElementKind::Video => "video",
1520+ ElementKind::Audio => "audio",
1521+ ElementKind::Form => "form",
1522+ ElementKind::Details => "details",
1523+ ElementKind::Summary => "summary",
1524+ ElementKind::Blockquote => "blockquote",
1525+ ElementKind::Cite => "cite",
1526+ ElementKind::Code => "code",
1527+ ElementKind::Pre => "pre",
1528+ ElementKind::Figure => "figure",
1529+ ElementKind::FigCaption => "figcaption",
1530+ ElementKind::Fragment => "fragment",
1531+ ElementKind::Dialog => "dialog",
1532+ ElementKind::DefinitionList => "dl",
1533+ ElementKind::DefinitionTerm => "dt",
1534+ ElementKind::DefinitionDescription => "dd",
1535+ ElementKind::Fieldset => "fieldset",
1536+ ElementKind::Legend => "legend",
1537+ ElementKind::Picture => "picture",
1538+ ElementKind::Time => "time",
1539+ ElementKind::Mark => "mark",
1540+ ElementKind::Kbd => "kbd",
1541+ ElementKind::Abbr => "abbr",
1542+ ElementKind::Datalist => "datalist",
1543+ ElementKind::Iframe => "iframe",
1544+ ElementKind::Output => "output",
1545+ ElementKind::Canvas => "canvas",
1546+ ElementKind::Grid => "grid",
1547+ ElementKind::Stack => "stack",
1548+ ElementKind::Badge => "badge",
1549+ ElementKind::Tooltip => "tooltip",
1550+ ElementKind::Avatar => "avatar",
1551+ ElementKind::Carousel => "carousel",
1552+ ElementKind::Chip => "chip",
1553+ ElementKind::Tag => "tag",
1554+ ElementKind::Noscript => "noscript",
1555+ ElementKind::Address => "address",
1556+ ElementKind::Search => "search",
13801557 _ => "",
13811558 };
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();
13881559
13891560 // Track interactive elements for focus-visible CSS
1390− if elem.kind == ElementKind::Link
1391− || matches!(kind_label, "button" | "input" | "select" | "textarea")
1392− {
1561+ if matches!(elem.kind, ElementKind::Link | ElementKind::Button | ElementKind::Input
1562+ | ElementKind::Select | ElementKind::Textarea) {
13931563 ctx.has_interactive = true;
13941564 }
13951565
13961566 // 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();
1567+ let gen_class = compute_class(&elem.attrs, &elem.kind, parent_kind, styles);
13991568 let (id, user_class) = extract_id_class(&elem.attrs);
14001569
14011570 if ctx.dev && elem.line_num > 0 {
14021571 out.push_str(&ctx.indent());
1403− out.push_str(&format!(
1404− "<!-- @{} line {} -->\n",
1405− kind_label, elem.line_num
1406− ));
1572+ out.push_str(&format!("<!-- @{} line {} -->\n", kind_label, elem.line_num));
14071573 }
14081574 out.push_str(&ctx.indent());
14091575 out.push('<');
14101576 out.push_str(tag);
14111577
1412− emit_argument_attr(out, elem, ctx.in_picture);
1578+ // @main gets id="hl-main" for skip-to-content link (unless user set an id)
1579+ if elem.kind == ElementKind::Main && id.is_none() {
1580+ out.push_str(" id=\"hl-main\"");
1581+ }
14131582
1414− emit_class_attr(out, gen_class.as_deref(), user_class.as_deref());
1583+ if elem.kind == ElementKind::Link
1584+ && let Some(url) = &elem.argument {
1585+ out.push_str(" href=\"");
1586+ out.push_str(&html_escape(url));
1587+ out.push('"');
1588+ // Auto rel="noopener noreferrer" and target="_blank" for external links
1589+ let is_external = url.starts_with("http://") || url.starts_with("https://");
1590+ if is_external {
1591+ let has_rel = elem.attrs.iter().any(|a| a.key == "rel");
1592+ let has_target = elem.attrs.iter().any(|a| a.key == "target");
1593+ if !has_rel {
1594+ out.push_str(" rel=\"noopener noreferrer\"");
1595+ }
1596+ if !has_target {
1597+ out.push_str(" target=\"_blank\"");
1598+ }
1599+ }
1600+ }
1601+
1602+ // Video/Audio src
1603+ if matches!(elem.kind, ElementKind::Video | ElementKind::Audio)
1604+ && let Some(src) = &elem.argument {
1605+ out.push_str(" src=\"");
1606+ out.push_str(&html_escape(src));
1607+ out.push('"');
1608+ }
1609+
1610+ // Form action
1611+ if elem.kind == ElementKind::Form
1612+ && let Some(action) = &elem.argument {
1613+ out.push_str(" action=\"");
1614+ out.push_str(&html_escape(action));
1615+ out.push('"');
1616+ }
1617+
1618+ // Iframe src
1619+ if elem.kind == ElementKind::Iframe
1620+ && let Some(src) = &elem.argument {
1621+ out.push_str(" src=\"");
1622+ out.push_str(&html_escape(src));
1623+ out.push('"');
1624+ }
1625+
1626+ // Tooltip title
1627+ if elem.kind == ElementKind::Tooltip
1628+ && let Some(text) = &elem.argument {
1629+ out.push_str(" title=\"");
1630+ out.push_str(&html_escape(text));
1631+ out.push('"');
1632+ }
1633+
1634+ // Time datetime
1635+ if elem.kind == ElementKind::Time
1636+ && let Some(dt) = elem.attrs.iter().find(|a| a.key == "datetime")
1637+ && let Some(val) = &dt.value {
1638+ out.push_str(" datetime=\"");
1639+ out.push_str(&html_escape(val));
1640+ out.push('"');
1641+ }
1642+
1643+ // Critical CSS: inline styles directly instead of using a class
1644+ let is_critical = elem.attrs.iter().any(|a| a.key == "critical");
1645+ if is_critical {
1646+ let inline_css = attrs_to_css(&elem.attrs, "", &elem.kind, parent_kind);
1647+ if !inline_css.is_empty() {
1648+ out.push_str(" style=\"");
1649+ out.push_str(&html_escape(&inline_css));
1650+ out.push('"');
1651+ }
1652+ // Still use class for non-base styles (pseudo, responsive, etc.)
1653+ if gen_class.as_deref().is_some_and(|c| !c.is_empty()) {
1654+ emit_class_attr(out, gen_class.as_deref(), user_class.as_deref());
1655+ } else if let Some(ref uc) = user_class {
1656+ emit_class_attr(out, None, Some(uc));
1657+ }
1658+ } else {
1659+ emit_class_attr(out, gen_class.as_deref(), user_class.as_deref());
1660+ }
14151661
14161662 if let Some(id) = id {
14171663 out.push_str(" id=\"");
@@ -1419,38 +1665,59 @@ fn generate_element(
14191665 out.push('"');
14201666 }
14211667
1422− emit_html_attrs(out, &elem.attrs);
1668+ emit_html_passthrough_attrs(out, &elem.attrs);
14231669
14241670 // Source map attributes in dev mode
14251671 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− ));
1672+ out.push_str(&format!(" data-hl-line=\"{}\" data-hl-el=\"{}\"", elem.line_num, kind_label));
14301673 }
14311674
14321675 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");
14381676 out.push_str(ctx.nl());
14391677
1440− let layout = elem.kind.layout();
1678+ // Inline text argument
1679+ if matches!(
1680+ elem.kind,
1681+ ElementKind::Text
1682+ | ElementKind::Button
1683+ | ElementKind::Label
1684+ | ElementKind::Option
1685+ | ElementKind::Textarea
1686+ | ElementKind::ListItem
1687+ | ElementKind::TableCell
1688+ | ElementKind::TableHeaderCell
1689+ | ElementKind::Summary
1690+ | ElementKind::Cite
1691+ | ElementKind::Code
1692+ | ElementKind::FigCaption
1693+ | ElementKind::Legend
1694+ | ElementKind::DefinitionTerm
1695+ | ElementKind::Mark
1696+ | ElementKind::Kbd
1697+ | ElementKind::Abbr
1698+ | ElementKind::Time
1699+ | ElementKind::DefinitionDescription
1700+ | ElementKind::Badge
1701+ | ElementKind::Tooltip
1702+ | ElementKind::Chip
1703+ | ElementKind::Tag
1704+ )
1705+ && let Some(text) = &elem.argument {
1706+ out.push_str(&html_escape(text));
1707+ }
1708+
1709+ // Children
14411710 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;
1711+ let is_paragraph = elem.kind == ElementKind::Paragraph;
1712+ for (i, child) in elem.children.iter().enumerate() {
1713+ generate_node(child, Some(&elem.kind), out, styles, ctx);
1714+ if is_paragraph && i < elem.children.len() - 1 {
1715+ out.push(' ');
1716+ }
1717+ }
14501718 ctx.depth -= 1;
14511719
14521720 out.push_str(&ctx.indent());
1453− ctx.dev = outer_dev;
14541721 out.push_str("</");
14551722 out.push_str(tag);
14561723 out.push('>');
@@ -1459,48 +1726,153 @@ fn generate_element(
14591726
14601727fn generate_self_closing(
14611728 elem: &Element,
1462− parent: Option<Layout>,
1729+ parent_kind: Option<&ElementKind>,
14631730 out: &mut String,
14641731 styles: &mut StyleCollector,
14651732 ctx: &mut GenContext,
14661733) {
1467− let gen_class = element_class(elem, &Site::new(elem, parent, &ctx.flow), styles);
1734+ let gen_class = compute_class(&elem.attrs, &elem.kind, parent_kind, styles);
14681735 let (id, user_class) = extract_id_class(&elem.attrs);
14691736
1470− let (tag, kind_label) = match &elem.kind {
1737+ let (tag, kind_label) = match elem.kind {
14711738 ElementKind::Image => ("img", "image"),
1472− ElementKind::Tag(spec) => (spec.html, spec.name),
1473− _ => unreachable!("not a void element: {:?}", elem.kind),
1739+ ElementKind::Input => ("input", "input"),
1740+ ElementKind::HorizontalRule => ("hr", "hr"),
1741+ ElementKind::Source => ("source", "source"),
1742+ ElementKind::Spacer => ("div", "spacer"),
1743+ _ => unreachable!(),
14741744 };
14751745
14761746 if ctx.dev && elem.line_num > 0 {
14771747 out.push_str(&ctx.indent());
1478− out.push_str(&format!(
1479− "<!-- @{} line {} -->\n",
1480− kind_label, elem.line_num
1481− ));
1748+ out.push_str(&format!("<!-- @{} line {} -->\n", kind_label, elem.line_num));
14821749 }
14831750 out.push_str(&ctx.indent());
14841751 out.push('<');
14851752 out.push_str(tag);
1486− emit_argument_attr(out, elem, ctx.in_picture);
14871753
1488− emit_class_attr(out, gen_class.as_deref(), user_class.as_deref());
1489−
1490− if let Some(id) = id {
1491− out.push_str(" id=\"");
1754+ // Image src (with optional non-SVG base64 inlining)
1755+ if elem.kind == ElementKind::Image {
1756+ let src = elem.argument.as_deref().unwrap_or("");
1757+ let is_inline = elem.attrs.iter().any(|a| a.key == "inline");
1758+ if is_inline && !src.is_empty() && !src.ends_with(".svg") {
1759+ let mime = if src.ends_with(".png") { "image/png" }
1760+ else if src.ends_with(".jpg") || src.ends_with(".jpeg") { "image/jpeg" }
1761+ else if src.ends_with(".gif") { "image/gif" }
1762+ else if src.ends_with(".webp") { "image/webp" }
1763+ else if src.ends_with(".avif") { "image/avif" }
1764+ else { "application/octet-stream" };
1765+ if let Ok(data) = std::fs::read(src) {
1766+ let b64 = base64_encode(&data);
1767+ out.push_str(" src=\"data:");
1768+ out.push_str(mime);
1769+ out.push_str(";base64,");
1770+ out.push_str(&b64);
1771+ out.push('"');
1772+ } else {
1773+ out.push_str(" src=\"");
1774+ out.push_str(&html_escape(src));
1775+ out.push('"');
1776+ }
1777+ } else {
1778+ out.push_str(" src=\"");
1779+ out.push_str(&html_escape(src));
1780+ out.push('"');
1781+ }
1782+ }
1783+
1784+ emit_class_attr(out, gen_class.as_deref(), user_class.as_deref());
1785+
1786+ if let Some(id) = id {
1787+ out.push_str(" id=\"");
14921788 out.push_str(&html_escape(&id));
14931789 out.push('"');
14941790 }
14951791
1496− emit_html_attrs(out, &elem.attrs);
1792+ emit_html_passthrough_attrs(out, &elem.attrs);
14971793
14981794 // Source map attributes in dev mode (self-closing)
14991795 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− ));
1796+ out.push_str(&format!(" data-hl-line=\"{}\" data-hl-el=\"{}\"", elem.line_num, kind_label));
1797+ }
1798+
1799+ // Image optimization: auto-add loading="lazy" and decoding="async"
1800+ if elem.kind == ElementKind::Image {
1801+ // SVG inlining: @image [inline] logo.svg
1802+ if elem.attrs.iter().any(|a| a.key == "inline")
1803+ && let Some(src) = &elem.argument
1804+ && src.ends_with(".svg")
1805+ && let Ok(svg_content) = std::fs::read_to_string(src) {
1806+ // Close the tag we opened, then emit inline SVG instead
1807+ out.truncate(out.rfind('<').unwrap_or(0));
1808+ out.push_str(&ctx.indent());
1809+ out.push_str(svg_content.trim());
1810+ out.push_str(ctx.nl());
1811+ return;
1812+ }
1813+ // Responsive srcset: @image photo.jpg [responsive 400 800 1200]
1814+ let responsive_attr = elem.attrs.iter().find(|a| a.key == "responsive");
1815+ if let Some(resp) = responsive_attr
1816+ && let Some(ref sizes_str) = resp.value {
1817+ let widths: Vec<&str> = sizes_str.split_whitespace().collect();
1818+ if !widths.is_empty() {
1819+ let src = elem.argument.as_deref().unwrap_or("");
1820+ if !src.is_empty() {
1821+ // Generate srcset with width descriptors
1822+ // Convention: file-{width}.ext (e.g., photo-400.jpg)
1823+ let dot_pos = src.rfind('.').unwrap_or(src.len());
1824+ let base = &src[..dot_pos];
1825+ let ext = &src[dot_pos..];
1826+ let mut srcset_parts = Vec::new();
1827+ for w in &widths {
1828+ srcset_parts.push(format!("{}-{}{} {}w", base, w, ext, w));
1829+ }
1830+ out.push_str(" srcset=\"");
1831+ out.push_str(&srcset_parts.join(", "));
1832+ out.push('"');
1833+ // Generate sizes attribute
1834+ let max_width = widths.last().unwrap_or(&"100vw");
1835+ out.push_str(&format!(" sizes=\"(max-width: {}px) 100vw, {}px\"", max_width, max_width));
1836+ }
1837+ }
1838+ }
1839+
1840+ // Auto image dimensions: read local image file to inject width/height + aspect-ratio
1841+ let has_width = elem.attrs.iter().any(|a| a.key == "width");
1842+ let has_height = elem.attrs.iter().any(|a| a.key == "height");
1843+ if (!has_width || !has_height)
1844+ && let Some(ref src) = elem.argument
1845+ && !src.starts_with("http://") && !src.starts_with("https://") && !src.starts_with("data:")
1846+ && let Some((w, h)) = read_image_dimensions(src) {
1847+ if !has_width {
1848+ out.push_str(&format!(" width=\"{}\"", w));
1849+ }
1850+ if !has_height {
1851+ out.push_str(&format!(" height=\"{}\"", h));
1852+ }
1853+ // Auto aspect-ratio to prevent CLS
1854+ if !elem.attrs.iter().any(|a| a.key == "aspect-ratio") {
1855+ out.push_str(&format!(" style=\"aspect-ratio:{}/{}\"", w, h));
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,96 @@ 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−}
1622−
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();
1678− }
1679− } else {
1680− current.push(ch);
1681− }
16821938 }
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)));
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+ }
16881946 }
16891947
1690− if decls.len() < 2 {
1691− return css.to_string();
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+ && 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+ }
1957+ }
1958+ }
1959+ for prefix in &has_prefixes {
1960+ let inner = &prefix[4..prefix.len() - 2]; // extract selector from has(selector):
1961+ let selector = format!(":has({})", inner);
1962+ let css = attrs_to_css(attrs, prefix, kind, parent_kind);
1963+ if !css.is_empty() {
1964+ pseudo.push((selector, css));
1965+ }
16921966 }
16931967
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);
1968+ // Collect responsive overrides
1969+ let mut responsive = Vec::new();
1970+ for &(bp_name, _) in BREAKPOINTS {
1971+ let prefix = format!("{}:", bp_name);
1972+ let css = attrs_to_css(attrs, &prefix, kind, parent_kind);
1973+ if !css.is_empty() {
1974+ responsive.push((bp_name.to_string(), css));
17001975 }
17011976 }
17021977
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);
1978+ // Collect container query overrides
1979+ let mut container = Vec::new();
1980+ for &(bp_name, _) in BREAKPOINTS {
1981+ let prefix = format!("cq-{}:", bp_name);
1982+ let css = attrs_to_css(attrs, &prefix, kind, parent_kind);
1983+ if !css.is_empty() {
1984+ container.push((bp_name.to_string(), css));
17111985 }
17121986 }
1713− out
1987+
1988+ let dark = attrs_to_css(attrs, "dark:", kind, parent_kind);
1989+ let print = attrs_to_css(attrs, "print:", kind, parent_kind);
1990+ let motion_safe = attrs_to_css(attrs, "motion-safe:", kind, parent_kind);
1991+ let motion_reduce = attrs_to_css(attrs, "motion-reduce:", kind, parent_kind);
1992+ let landscape = attrs_to_css(attrs, "landscape:", kind, parent_kind);
1993+ let portrait = attrs_to_css(attrs, "portrait:", kind, parent_kind);
1994+
1995+ styles.get_class(base, pseudo, responsive, dark, print, motion_safe, motion_reduce, landscape, portrait, container)
17141996}
17151997
17161998fn emit_class_attr(out: &mut String, gen_class: Option<&str>, user_class: Option<&str>) {
@@ -1740,553 +2022,943 @@ fn emit_class_attr(out: &mut String, gen_class: Option<&str>, user_class: Option
17402022// Attribute → CSS mapping
17412023// ---------------------------------------------------------------------------
17422024
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,
2025+/// (htmlang prefix, CSS selector suffix)
2026+const PSEUDO_PREFIXES: &[(&str, &str)] = &[
2027+ ("hover:", ":hover"),
2028+ ("active:", ":active"),
2029+ ("focus:", ":focus"),
2030+ ("focus-visible:", ":focus-visible"),
2031+ ("focus-within:", ":focus-within"),
2032+ ("disabled:", ":disabled"),
2033+ ("checked:", ":checked"),
2034+ ("placeholder:", "::placeholder"),
2035+ ("first:", ":first-child"),
2036+ ("last:", ":last-child"),
2037+ ("odd:", ":nth-child(odd)"),
2038+ ("even:", ":nth-child(even)"),
2039+ ("before:", "::before"),
2040+ ("after:", "::after"),
2041+ ("selection:", "::selection"),
2042+ ("visited:", ":visited"),
2043+ ("empty:", ":empty"),
2044+ ("target:", ":target"),
2045+ ("valid:", ":valid"),
2046+ ("invalid:", ":invalid"),
2047+];
2048+const RESPONSIVE_PREFIXES: &[&str] = &["sm:", "md:", "lg:", "xl:", "2xl:"];
2049+const MEDIA_PREFIXES: &[&str] = &["dark:", "print:", "motion-safe:", "motion-reduce:", "landscape:", "portrait:"];
2050+const CONTAINER_QUERY_PREFIXES: &[&str] = &["cq-sm:", "cq-md:", "cq-lg:", "cq-xl:", "cq-2xl:"];
2051+
2052+fn is_prefixed_attr(key: &str) -> bool {
2053+ PSEUDO_PREFIXES.iter().any(|&(p, _)| key.starts_with(p))
2054+ || RESPONSIVE_PREFIXES.iter().any(|p| key.starts_with(p))
2055+ || MEDIA_PREFIXES.iter().any(|p| key.starts_with(p))
2056+ || CONTAINER_QUERY_PREFIXES.iter().any(|p| key.starts_with(p))
2057+ || key.starts_with("nth:")
2058+ || key.starts_with("has(")
17552059}
17562060
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,
2061+fn attrs_to_css(
2062+ attrs: &[Attribute],
2063+ state_prefix: &str,
2064+ kind: &ElementKind,
2065+ parent_kind: Option<&ElementKind>,
2066+) -> String {
2067+ let mut css = String::new();
2068+
2069+ // Base element styles only for the default (non-state) pass
2070+ if state_prefix.is_empty() {
2071+ match kind {
2072+ ElementKind::Row => css.push_str("display:flex;flex-direction:row;"),
2073+ ElementKind::Column => css.push_str("display:flex;flex-direction:column;"),
2074+ ElementKind::El => css.push_str("display:flex;flex-direction:column;"),
2075+ ElementKind::Paragraph => css.push_str("margin:0;"),
2076+ // Semantic elements get flex column layout like @el
2077+ ElementKind::Nav | ElementKind::Header | ElementKind::Footer
2078+ | ElementKind::Main | ElementKind::Section | ElementKind::Article
2079+ | ElementKind::Aside => css.push_str("display:flex;flex-direction:column;"),
2080+ // Lists: reset browser defaults
2081+ ElementKind::List => css.push_str("margin:0;padding-left:0;list-style:none;"),
2082+ ElementKind::ListItem => css.push_str("display:flex;flex-direction:column;"),
2083+ // Form: flex column like @el
2084+ ElementKind::Form => css.push_str("display:flex;flex-direction:column;"),
2085+ // Details: flex column
2086+ ElementKind::Details => css.push_str("display:flex;flex-direction:column;"),
2087+ // Figure: flex column
2088+ ElementKind::Figure => css.push_str("display:flex;flex-direction:column;margin:0;"),
2089+ // Blockquote: flex column, reset browser margin
2090+ ElementKind::Blockquote => css.push_str("display:flex;flex-direction:column;margin:0;"),
2091+ // Pre: preserve whitespace
2092+ ElementKind::Pre => css.push_str("margin:0;white-space:pre;font-family:ui-monospace,monospace;"),
2093+ // Code: monospace font
2094+ ElementKind::Code => css.push_str("font-family:ui-monospace,monospace;"),
2095+ // New elements
2096+ ElementKind::Dialog => css.push_str("display:flex;flex-direction:column;"),
2097+ ElementKind::DefinitionList => css.push_str("margin:0;"),
2098+ ElementKind::DefinitionDescription => css.push_str("margin:0;display:flex;flex-direction:column;"),
2099+ ElementKind::Fieldset => css.push_str("display:flex;flex-direction:column;border:1px solid currentColor;padding:0.5em;margin:0;"),
2100+ ElementKind::Kbd => css.push_str("font-family:ui-monospace,monospace;"),
2101+ ElementKind::Grid => css.push_str("display:grid;"),
2102+ ElementKind::Stack => css.push_str("position:relative;"),
2103+ 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;"),
2104+ ElementKind::Tooltip => css.push_str("position:relative;cursor:help;"),
2105+ ElementKind::Spacer => css.push_str("flex:1;"),
2106+ ElementKind::Avatar => css.push_str("display:inline-flex;align-items:center;justify-content:center;border-radius:9999px;overflow:hidden;flex-shrink:0;"),
2107+ 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;"),
2108+ 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;"),
2109+ ElementKind::Tag => css.push_str("display:inline-flex;align-items:center;padding:2px 8px;border-radius:4px;font-size:0.75rem;font-weight:600;"),
2110+ _ => {}
2111+ }
2112+ // Children of @carousel get scroll-snap-align and flex-shrink
2113+ if matches!(parent_kind, Some(ElementKind::Carousel)) {
2114+ css.push_str("scroll-snap-align:start;flex-shrink:0;");
17672115 }
17682116 }
1769−}
17702117
1771−// ---------------------------------------------------------------------------
1772−// Direction: what a child's `fill` and `shrink` compile against
1773−// ---------------------------------------------------------------------------
2118+ for attr in attrs {
2119+ // Determine the effective key for this pass
2120+ let effective_key = if state_prefix.is_empty() {
2121+ if is_prefixed_attr(&attr.key) {
2122+ continue;
2123+ }
2124+ attr.key.as_str()
2125+ } else {
2126+ match attr.key.strip_prefix(state_prefix) {
2127+ Some(k) => k,
2128+ None => continue,
2129+ }
2130+ };
17742131
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−}
2132+ let val = attr.value.as_deref();
17812133
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−}
2134+ match effective_key {
2135+ // Layout
2136+ "spacing" | "gap" => {
2137+ if let Some(v) = val {
2138+ push_css(&mut css, "gap", &css_px(v));
2139+ }
2140+ }
2141+ "padding" => {
2142+ if let Some(v) = val {
2143+ push_css(&mut css, "padding", &css_px_multi(v));
2144+ }
2145+ }
2146+ "padding-x" => {
2147+ if let Some(v) = val {
2148+ push_css(&mut css, "padding-left", &css_px(v));
2149+ push_css(&mut css, "padding-right", &css_px(v));
2150+ }
2151+ }
2152+ "padding-y" => {
2153+ if let Some(v) = val {
2154+ push_css(&mut css, "padding-top", &css_px(v));
2155+ push_css(&mut css, "padding-bottom", &css_px(v));
2156+ }
2157+ }
17932158
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−}
2159+ // Sizing
2160+ "width" => {
2161+ if let Some(v) = val {
2162+ match v {
2163+ "fill" => match parent_kind {
2164+ Some(ElementKind::Row) => {
2165+ push_css(&mut css, "flex", "1");
2166+ push_css(&mut css, "min-width", "0");
2167+ }
2168+ _ => push_css(&mut css, "width", "100%"),
2169+ },
2170+ "shrink" => push_css(&mut css, "flex-shrink", "0"),
2171+ _ => push_css(&mut css, "width", &css_px(v)),
2172+ }
2173+ }
2174+ }
2175+ "height" => {
2176+ if let Some(v) = val {
2177+ match v {
2178+ "fill" => match parent_kind {
2179+ Some(ElementKind::Column) => {
2180+ push_css(&mut css, "flex", "1");
2181+ push_css(&mut css, "min-height", "0");
2182+ }
2183+ _ => push_css(&mut css, "height", "100%"),
2184+ },
2185+ "shrink" => push_css(&mut css, "flex-shrink", "0"),
2186+ _ => push_css(&mut css, "height", &css_px(v)),
2187+ }
2188+ }
2189+ }
2190+ "min-width" => {
2191+ if let Some(v) = val {
2192+ push_css(&mut css, "min-width", &css_px(v));
2193+ }
2194+ }
2195+ "max-width" => {
2196+ if let Some(v) = val {
2197+ push_css(&mut css, "max-width", &css_px(v));
2198+ }
2199+ }
2200+ "min-height" => {
2201+ if let Some(v) = val {
2202+ push_css(&mut css, "min-height", &css_px(v));
2203+ }
2204+ }
2205+ "max-height" => {
2206+ if let Some(v) = val {
2207+ push_css(&mut css, "max-height", &css_px(v));
2208+ }
2209+ }
18132210
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;
2211+ // Alignment
2212+ "center-x" => match parent_kind {
2213+ Some(ElementKind::Column) | Some(ElementKind::El) => {
2214+ push_css(&mut css, "align-self", "center");
2215+ }
2216+ _ => {
2217+ push_css(&mut css, "margin-left", "auto");
2218+ push_css(&mut css, "margin-right", "auto");
2219+ }
2220+ },
2221+ "center-y" => match parent_kind {
2222+ Some(ElementKind::Row) => push_css(&mut css, "align-self", "center"),
2223+ _ => {
2224+ push_css(&mut css, "margin-top", "auto");
2225+ push_css(&mut css, "margin-bottom", "auto");
2226+ }
2227+ },
2228+ "align-left" => match parent_kind {
2229+ Some(ElementKind::Column) | Some(ElementKind::El) => {
2230+ push_css(&mut css, "align-self", "flex-start");
2231+ }
2232+ _ => push_css(&mut css, "margin-right", "auto"),
2233+ },
2234+ "align-right" => match parent_kind {
2235+ Some(ElementKind::Column) | Some(ElementKind::El) => {
2236+ push_css(&mut css, "align-self", "flex-end");
2237+ }
2238+ _ => push_css(&mut css, "margin-left", "auto"),
2239+ },
2240+ "align-top" => match parent_kind {
2241+ Some(ElementKind::Row) => push_css(&mut css, "align-self", "flex-start"),
2242+ _ => push_css(&mut css, "margin-bottom", "auto"),
2243+ },
2244+ "align-bottom" => match parent_kind {
2245+ Some(ElementKind::Row) => push_css(&mut css, "align-self", "flex-end"),
2246+ _ => push_css(&mut css, "margin-top", "auto"),
2247+ },
2248+
2249+ // Style
2250+ "background" => {
2251+ if let Some(v) = val {
2252+ push_css(&mut css, "background", v);
2253+ }
18262254 }
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));
2255+ "color" => {
2256+ if let Some(v) = val {
2257+ push_css(&mut css, "color", v);
2258+ }
2259+ }
2260+ "border" => {
2261+ if let Some(v) = val {
2262+ let parts: Vec<&str> = v.splitn(2, ' ').collect();
2263+ if parts.len() == 2 {
2264+ push_css(
2265+ &mut css,
2266+ "border",
2267+ &format!("{} solid {}", css_px(parts[0]), parts[1]),
2268+ );
2269+ } else {
2270+ push_css(
2271+ &mut css,
2272+ "border",
2273+ &format!("{} solid currentColor", css_px(parts[0])),
2274+ );
2275+ }
2276+ }
2277+ }
2278+ "border-top" | "border-bottom" | "border-left" | "border-right" => {
2279+ if let Some(v) = val {
2280+ let parts: Vec<&str> = v.splitn(2, ' ').collect();
2281+ if parts.len() == 2 {
2282+ push_css(
2283+ &mut css,
2284+ effective_key,
2285+ &format!("{} solid {}", css_px(parts[0]), parts[1]),
2286+ );
2287+ } else {
2288+ push_css(
2289+ &mut css,
2290+ effective_key,
2291+ &format!("{} solid currentColor", css_px(parts[0])),
2292+ );
2293+ }
2294+ }
2295+ }
2296+ "rounded" => {
2297+ if let Some(v) = val {
2298+ push_css(&mut css, "border-radius", &css_px(v));
2299+ }
2300+ }
2301+ "bold" => push_css(&mut css, "font-weight", "bold"),
2302+ "italic" => push_css(&mut css, "font-style", "italic"),
2303+ "underline" => push_css(&mut css, "text-decoration", "underline"),
2304+ "size" => {
2305+ if let Some(v) = val {
2306+ push_css(&mut css, "font-size", &css_px(v));
2307+ }
2308+ }
2309+ "font" => {
2310+ if let Some(v) = val {
2311+ push_css(&mut css, "font-family", v);
2312+ }
2313+ }
2314+ "transition" => {
2315+ if let Some(v) = val {
2316+ push_css(&mut css, "transition", v);
2317+ }
2318+ }
2319+ "cursor" => {
2320+ if let Some(v) = val {
2321+ push_css(&mut css, "cursor", v);
2322+ }
2323+ }
2324+ "opacity" => {
2325+ if let Some(v) = val {
2326+ push_css(&mut css, "opacity", v);
2327+ }
18362328 }
1837− }
1838− changes.sort_by_key(|(at, _)| at_order(at));
1839− Flow {
1840− base: Some(base),
1841− changes,
1842− class: None,
1843− }
1844− }
18452329
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−}
2330+ // Typography
2331+ "text-align" => {
2332+ if let Some(v) = val {
2333+ push_css(&mut css, "text-align", v);
2334+ }
2335+ }
2336+ "line-height" => {
2337+ if let Some(v) = val {
2338+ push_css(&mut css, "line-height", v);
2339+ }
2340+ }
2341+ "letter-spacing" => {
2342+ if let Some(v) = val {
2343+ push_css(&mut css, "letter-spacing", &css_px(v));
2344+ }
2345+ }
2346+ "text-transform" => {
2347+ if let Some(v) = val {
2348+ push_css(&mut css, "text-transform", v);
2349+ }
2350+ }
2351+ "white-space" => {
2352+ if let Some(v) = val {
2353+ push_css(&mut css, "white-space", v);
2354+ }
2355+ }
18612356
1862−/// `width` or `height`.
1863−#[derive(Clone, Copy, PartialEq, Eq)]
1864−enum Dim {
1865− Width,
1866− Height,
1867−}
2357+ // Overflow & positioning
2358+ "overflow" => {
2359+ if let Some(v) = val {
2360+ push_css(&mut css, "overflow", v);
2361+ }
2362+ }
2363+ "position" => {
2364+ if let Some(v) = val {
2365+ push_css(&mut css, "position", v);
2366+ }
2367+ }
2368+ "top" => {
2369+ if let Some(v) = val {
2370+ push_css(&mut css, "top", &css_px(v));
2371+ }
2372+ }
2373+ "right" => {
2374+ if let Some(v) = val {
2375+ push_css(&mut css, "right", &css_px(v));
2376+ }
2377+ }
2378+ "bottom" => {
2379+ if let Some(v) = val {
2380+ push_css(&mut css, "bottom", &css_px(v));
2381+ }
2382+ }
2383+ "left" => {
2384+ if let Some(v) = val {
2385+ push_css(&mut css, "left", &css_px(v));
2386+ }
2387+ }
2388+ "z-index" => {
2389+ if let Some(v) = val {
2390+ push_css(&mut css, "z-index", v);
2391+ }
2392+ }
18682393
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−}
2394+ // Display & visibility
2395+ "display" => {
2396+ if let Some(v) = val {
2397+ push_css(&mut css, "display", v);
2398+ }
2399+ }
2400+ "visibility" => {
2401+ if let Some(v) = val {
2402+ push_css(&mut css, "visibility", v);
2403+ }
2404+ }
2405+ "hidden" => push_css(&mut css, "display", "none"),
18772406
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−}
2407+ // Transform & filters
2408+ "transform" => {
2409+ if let Some(v) = val {
2410+ push_css(&mut css, "transform", v);
2411+ }
2412+ }
2413+ "backdrop-filter" => {
2414+ if let Some(v) = val {
2415+ push_css(&mut css, "backdrop-filter", v);
2416+ }
2417+ }
18872418
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−}
2419+ // Effects
2420+ "shadow" => {
2421+ if let Some(v) = val {
2422+ push_css(&mut css, "box-shadow", v);
2423+ }
2424+ }
19062425
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−}
2426+ // Flow
2427+ "wrap" => push_css(&mut css, "flex-wrap", "wrap"),
2428+ "gap-x" => {
2429+ if let Some(v) = val {
2430+ push_css(&mut css, "column-gap", &css_px(v));
2431+ }
2432+ }
2433+ "gap-y" => {
2434+ if let Some(v) = val {
2435+ push_css(&mut css, "row-gap", &css_px(v));
2436+ }
2437+ }
19232438
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−}
2439+ // Grid
2440+ "grid" => {
2441+ push_css(&mut css, "display", "grid");
2442+ }
2443+ "grid-cols" => {
2444+ if let Some(v) = val {
2445+ if let Ok(n) = v.parse::<u32>() {
2446+ push_css(&mut css, "grid-template-columns", &format!("repeat({},1fr)", n));
2447+ } else {
2448+ push_css(&mut css, "grid-template-columns", v);
2449+ }
2450+ }
2451+ }
2452+ "grid-rows" => {
2453+ if let Some(v) = val {
2454+ if let Ok(n) = v.parse::<u32>() {
2455+ push_css(&mut css, "grid-template-rows", &format!("repeat({},1fr)", n));
2456+ } else {
2457+ push_css(&mut css, "grid-template-rows", v);
2458+ }
2459+ }
2460+ }
2461+ "col-span" => {
2462+ if let Some(v) = val {
2463+ push_css(&mut css, "grid-column", &format!("span {}", v));
2464+ }
2465+ }
2466+ "row-span" => {
2467+ if let Some(v) = val {
2468+ push_css(&mut css, "grid-row", &format!("span {}", v));
2469+ }
2470+ }
2471+
2472+ // Animation
2473+ "animation" => {
2474+ if let Some(v) = val {
2475+ push_css(&mut css, "animation", v);
2476+ }
2477+ }
2478+
2479+ // Aspect ratio
2480+ "aspect-ratio" => {
2481+ if let Some(v) = val {
2482+ push_css(&mut css, "aspect-ratio", v);
2483+ }
2484+ }
2485+
2486+ // CSS containment for rendering performance
2487+ "contain" => {
2488+ if let Some(v) = val {
2489+ push_css(&mut css, "contain", v);
2490+ } else {
2491+ push_css(&mut css, "contain", "layout style paint");
2492+ }
2493+ }
2494+ "content-visibility" => {
2495+ if let Some(v) = val {
2496+ push_css(&mut css, "content-visibility", v);
2497+ } else {
2498+ push_css(&mut css, "content-visibility", "auto");
2499+ }
2500+ }
2501+
2502+ // Outline (like border but doesn't affect layout)
2503+ "outline" => {
2504+ if let Some(v) = val {
2505+ let parts: Vec<&str> = v.splitn(2, ' ').collect();
2506+ if parts.len() == 2 {
2507+ push_css(
2508+ &mut css,
2509+ "outline",
2510+ &format!("{} solid {}", css_px(parts[0]), parts[1]),
2511+ );
2512+ } else {
2513+ push_css(
2514+ &mut css,
2515+ "outline",
2516+ &format!("{} solid currentColor", css_px(parts[0])),
2517+ );
2518+ }
2519+ }
2520+ }
2521+
2522+ // Logical properties (i18n-aware)
2523+ "padding-inline" => {
2524+ if let Some(v) = val {
2525+ push_css(&mut css, "padding-inline", &css_px_multi(v));
2526+ }
2527+ }
2528+ "padding-block" => {
2529+ if let Some(v) = val {
2530+ push_css(&mut css, "padding-block", &css_px_multi(v));
2531+ }
2532+ }
2533+ "margin-inline" => {
2534+ if let Some(v) = val {
2535+ push_css(&mut css, "margin-inline", &css_px_multi(v));
2536+ }
2537+ }
2538+ "margin-block" => {
2539+ if let Some(v) = val {
2540+ push_css(&mut css, "margin-block", &css_px_multi(v));
2541+ }
2542+ }
2543+
2544+ // Logical property start/end variants
2545+ "padding-inline-start" | "padding-inline-end" |
2546+ "padding-block-start" | "padding-block-end" |
2547+ "margin-inline-start" | "margin-inline-end" |
2548+ "margin-block-start" | "margin-block-end" => {
2549+ if let Some(v) = val {
2550+ push_css(&mut css, effective_key, &css_px(v));
2551+ }
2552+ }
2553+
2554+ // Logical inset
2555+ "inset-inline" | "inset-block" => {
2556+ if let Some(v) = val {
2557+ push_css(&mut css, effective_key, &css_px_multi(v));
2558+ }
2559+ }
2560+ "inset-inline-start" | "inset-inline-end" |
2561+ "inset-block-start" | "inset-block-end" => {
2562+ if let Some(v) = val {
2563+ push_css(&mut css, effective_key, &css_px(v));
2564+ }
2565+ }
2566+
2567+ // Logical border
2568+ "border-inline" | "border-block" |
2569+ "border-inline-start" | "border-inline-end" |
2570+ "border-block-start" | "border-block-end" => {
2571+ if let Some(v) = val {
2572+ push_css(&mut css, effective_key, v);
2573+ }
2574+ }
2575+
2576+ // Logical border-radius
2577+ "border-start-start-radius" | "border-start-end-radius" |
2578+ "border-end-start-radius" | "border-end-end-radius" => {
2579+ if let Some(v) = val {
2580+ push_css(&mut css, effective_key, &css_px(v));
2581+ }
2582+ }
2583+
2584+ // Logical scroll margins & padding
2585+ "scroll-margin-inline" | "scroll-margin-block" |
2586+ "scroll-padding-inline" | "scroll-padding-block" => {
2587+ if let Some(v) = val {
2588+ push_css(&mut css, effective_key, &css_px_multi(v));
2589+ }
2590+ }
2591+
2592+ // Logical sizing
2593+ "inline-size" | "block-size" |
2594+ "min-inline-size" | "max-inline-size" |
2595+ "min-block-size" | "max-block-size" => {
2596+ if let Some(v) = val {
2597+ push_css(&mut css, effective_key, &css_px(v));
2598+ }
2599+ }
2600+
2601+ // Scroll snap
2602+ "scroll-snap-type" => {
2603+ if let Some(v) = val {
2604+ push_css(&mut css, "scroll-snap-type", v);
2605+ }
2606+ }
2607+ "scroll-snap-align" => {
2608+ if let Some(v) = val {
2609+ push_css(&mut css, "scroll-snap-align", v);
2610+ }
2611+ }
2612+
2613+ // Margin
2614+ "margin" => {
2615+ if let Some(v) = val {
2616+ push_css(&mut css, "margin", &css_px_multi(v));
2617+ }
2618+ }
2619+ "margin-x" => {
2620+ if let Some(v) = val {
2621+ push_css(&mut css, "margin-left", &css_px(v));
2622+ push_css(&mut css, "margin-right", &css_px(v));
2623+ }
2624+ }
2625+ "margin-y" => {
2626+ if let Some(v) = val {
2627+ push_css(&mut css, "margin-top", &css_px(v));
2628+ push_css(&mut css, "margin-bottom", &css_px(v));
2629+ }
2630+ }
2631+
2632+ // Filter
2633+ "filter" => {
2634+ if let Some(v) = val {
2635+ push_css(&mut css, "filter", v);
2636+ }
2637+ }
2638+
2639+ // Object fit/position (for images)
2640+ "object-fit" => {
2641+ if let Some(v) = val {
2642+ push_css(&mut css, "object-fit", v);
2643+ }
2644+ }
2645+ "object-position" => {
2646+ if let Some(v) = val {
2647+ push_css(&mut css, "object-position", v);
2648+ }
2649+ }
2650+
2651+ // Text shadow
2652+ "text-shadow" => {
2653+ if let Some(v) = val {
2654+ push_css(&mut css, "text-shadow", v);
2655+ }
2656+ }
2657+
2658+ // Text overflow
2659+ "text-overflow" => {
2660+ if let Some(v) = val {
2661+ push_css(&mut css, "text-overflow", v);
2662+ }
2663+ }
2664+
2665+ // Interaction
2666+ "pointer-events" => {
2667+ if let Some(v) = val {
2668+ push_css(&mut css, "pointer-events", v);
2669+ }
2670+ }
2671+ "user-select" => {
2672+ if let Some(v) = val {
2673+ push_css(&mut css, "user-select", v);
2674+ }
2675+ }
2676+
2677+ // Flexbox/grid alignment
2678+ "justify-content" => {
2679+ if let Some(v) = val {
2680+ push_css(&mut css, "justify-content", v);
2681+ }
2682+ }
2683+ "align-items" => {
2684+ if let Some(v) = val {
2685+ push_css(&mut css, "align-items", v);
2686+ }
2687+ }
2688+
2689+ // Flex item order
2690+ "order" => {
2691+ if let Some(v) = val {
2692+ push_css(&mut css, "order", v);
2693+ }
2694+ }
2695+
2696+ // Background extras
2697+ "background-size" => {
2698+ if let Some(v) = val {
2699+ push_css(&mut css, "background-size", v);
2700+ }
2701+ }
2702+ "background-position" => {
2703+ if let Some(v) = val {
2704+ push_css(&mut css, "background-position", v);
2705+ }
2706+ }
2707+ "background-repeat" => {
2708+ if let Some(v) = val {
2709+ push_css(&mut css, "background-repeat", v);
2710+ }
2711+ }
19432712
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− _ => {}
2713+ // Text wrapping
2714+ "word-break" => {
2715+ if let Some(v) = val {
2716+ push_css(&mut css, "word-break", v);
2717+ }
19792718 }
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− }
2719+ "overflow-wrap" => {
2720+ if let Some(v) = val {
2721+ push_css(&mut css, "overflow-wrap", v);
20232722 }
2024− return;
20252723 }
2026− }
2027− if !self.writes(property) {
2028− push_css(css, property, value);
2029− }
2030− }
2031−}
20322724
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−}
2725+ // Container queries
2726+ "container" => {
2727+ push_css(&mut css, "container-type", "inline-size");
2728+ }
2729+ "container-name" => {
2730+ if let Some(v) = val {
2731+ push_css(&mut css, "container-name", v);
2732+ }
2733+ }
2734+ "container-type" => {
2735+ if let Some(v) = val {
2736+ push_css(&mut css, "container-type", v);
2737+ }
2738+ }
20682739
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−}
2740+ // Overflow axis
2741+ "overflow-x" => {
2742+ if let Some(v) = val {
2743+ push_css(&mut css, "overflow-x", v);
2744+ }
2745+ }
2746+ "overflow-y" => {
2747+ if let Some(v) = val {
2748+ push_css(&mut css, "overflow-y", v);
2749+ }
2750+ }
20792751
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−}
2752+ // Inset (shorthand for top/right/bottom/left)
2753+ "inset" => {
2754+ if let Some(v) = val {
2755+ push_css(&mut css, "inset", &css_px(v));
2756+ }
2757+ }
21032758
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−}
2759+ // Accent & caret colors
2760+ "accent-color" => {
2761+ if let Some(v) = val {
2762+ push_css(&mut css, "accent-color", v);
2763+ }
2764+ }
2765+ "caret-color" => {
2766+ if let Some(v) = val {
2767+ push_css(&mut css, "caret-color", v);
2768+ }
2769+ }
21172770
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− }
2771+ // Color scheme & appearance
2772+ "color-scheme" => {
2773+ if let Some(v) = val {
2774+ push_css(&mut css, "color-scheme", v);
2775+ }
2776+ }
2777+ "appearance" => {
2778+ if let Some(v) = val {
2779+ push_css(&mut css, "appearance", v);
2780+ }
2781+ }
21592782
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− }
2783+ // List style
2784+ "list-style" => {
2785+ if let Some(v) = val {
2786+ push_css(&mut css, "list-style", v);
2787+ }
2788+ }
21662789
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" => {
2790+ // Table
2791+ "border-collapse" => {
21722792 if let Some(v) = val {
2173− push_css(&mut css, "gap", &with_px("gap", v));
2793+ push_css(&mut css, "border-collapse", v);
2794+ }
2795+ }
2796+ "border-spacing" => {
2797+ if let Some(v) = val {
2798+ push_css(&mut css, "border-spacing", &css_px(v));
21742799 }
21752800 }
21762801
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;
2802+ // Text decoration
2803+ "text-decoration" => {
2804+ if let Some(v) = val {
2805+ push_css(&mut css, "text-decoration", v);
21882806 }
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− }
2807+ }
2808+ "text-decoration-color" => {
2809+ if let Some(v) = val {
2810+ push_css(&mut css, "text-decoration-color", v);
2811+ }
2812+ }
2813+ "text-decoration-thickness" => {
2814+ if let Some(v) = val {
2815+ push_css(&mut css, "text-decoration-thickness", &css_px(v));
2816+ }
2817+ }
2818+ "text-decoration-style" => {
2819+ if let Some(v) = val {
2820+ push_css(&mut css, "text-decoration-style", v);
22372821 }
2822+ }
2823+ "text-underline-offset" => {
22382824 if let Some(v) = val {
2239− push_css(&mut css, effective_key, &with_px(effective_key, v));
2825+ push_css(&mut css, "text-underline-offset", &css_px(v));
22402826 }
22412827 }
22422828
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");
2829+ // Multi-column
2830+ "column-width" => {
2831+ if let Some(v) = val {
2832+ push_css(&mut css, "column-width", &css_px(v));
2833+ }
22492834 }
2250− "center-y" => {
2251− push_css(&mut aligned, "margin-top", "auto");
2252− push_css(&mut aligned, "margin-bottom", "auto");
2835+ "column-rule" => {
2836+ if let Some(v) = val {
2837+ push_css(&mut css, "column-rule", v);
2838+ }
22532839 }
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"),
22582840
2259− "wrap" if lays_out_children => push_css(&mut css, "flex-wrap", "wrap"),
2260− "wrap" => {}
2841+ // Place items/self
2842+ "place-items" => {
2843+ if let Some(v) = val {
2844+ push_css(&mut css, "place-items", v);
2845+ }
2846+ }
2847+ "place-self" => {
2848+ if let Some(v) = val {
2849+ push_css(&mut css, "place-self", v);
2850+ }
2851+ }
22612852
2262− // Grid
2263− "grid-cols" | "grid-rows" if !lays_out_children => {}
2264− "grid-cols" | "grid-rows" => {
2853+ // Scroll behavior
2854+ "scroll-behavior" => {
22652855 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− }
2856+ push_css(&mut css, "scroll-behavior", v);
22752857 }
22762858 }
2277− "col-span" | "row-span" => {
2859+
2860+ // Resize
2861+ "resize" => {
2862+ if let Some(v) = val {
2863+ push_css(&mut css, "resize", v);
2864+ }
2865+ }
2866+
2867+ // New CSS properties
2868+ "clip-path" => {
2869+ if let Some(v) = val { push_css(&mut css, "clip-path", v); }
2870+ }
2871+ "mix-blend-mode" => {
2872+ if let Some(v) = val { push_css(&mut css, "mix-blend-mode", v); }
2873+ }
2874+ "background-blend-mode" => {
2875+ if let Some(v) = val { push_css(&mut css, "background-blend-mode", v); }
2876+ }
2877+ "writing-mode" => {
2878+ if let Some(v) = val { push_css(&mut css, "writing-mode", v); }
2879+ }
2880+ "column-count" => {
2881+ if let Some(v) = val { push_css(&mut css, "column-count", v); }
2882+ }
2883+ "column-gap" => {
2884+ if let Some(v) = val { push_css(&mut css, "column-gap", &css_px(v)); }
2885+ }
2886+ "text-indent" => {
2887+ if let Some(v) = val { push_css(&mut css, "text-indent", &css_px(v)); }
2888+ }
2889+ "hyphens" => {
2890+ if let Some(v) = val { push_css(&mut css, "hyphens", v); }
2891+ }
2892+ "flex-grow" => {
2893+ if let Some(v) = val { push_css(&mut css, "flex-grow", v); }
2894+ }
2895+ "flex-shrink" => {
2896+ if let Some(v) = val { push_css(&mut css, "flex-shrink", v); }
2897+ }
2898+ "flex-basis" => {
2899+ if let Some(v) = val { push_css(&mut css, "flex-basis", &css_px(v)); }
2900+ }
2901+ "isolation" => {
2902+ if let Some(v) = val { push_css(&mut css, "isolation", v); }
2903+ }
2904+ "place-content" => {
2905+ if let Some(v) = val { push_css(&mut css, "place-content", v); }
2906+ }
2907+ "background-image" => {
2908+ if let Some(v) = val { push_css(&mut css, "background-image", v); }
2909+ }
2910+ "font-weight" => {
2911+ if let Some(v) = val { push_css(&mut css, "font-weight", v); }
2912+ }
2913+ "font-style" => {
2914+ if let Some(v) = val { push_css(&mut css, "font-style", v); }
2915+ }
2916+ "text-wrap" => {
2917+ if let Some(v) = val { push_css(&mut css, "text-wrap", v); }
2918+ }
2919+ "will-change" => {
2920+ if let Some(v) = val { push_css(&mut css, "will-change", v); }
2921+ }
2922+ "touch-action" => {
2923+ if let Some(v) = val { push_css(&mut css, "touch-action", v); }
2924+ }
2925+ "vertical-align" => {
2926+ if let Some(v) = val { push_css(&mut css, "vertical-align", v); }
2927+ }
2928+ "scroll-margin" => {
2929+ if let Some(v) = val { push_css(&mut css, "scroll-margin", &css_px(v)); }
2930+ }
2931+ "scroll-margin-top" | "scroll-margin-bottom" | "scroll-margin-left" | "scroll-margin-right" => {
2932+ if let Some(v) = val { push_css(&mut css, effective_key, &css_px(v)); }
2933+ }
2934+ "scroll-padding" => {
2935+ if let Some(v) = val { push_css(&mut css, "scroll-padding", &css_px(v)); }
2936+ }
2937+ "scroll-padding-top" | "scroll-padding-bottom" | "scroll-padding-left" | "scroll-padding-right" => {
2938+ if let Some(v) = val { push_css(&mut css, effective_key, &css_px(v)); }
2939+ }
2940+ "direction" => {
2941+ if let Some(v) = val { push_css(&mut css, "direction", v); }
2942+ }
2943+
2944+ "content" => {
22782945 if let Some(v) = val {
2279− let property = if effective_key == "col-span" {
2280− "grid-column"
2946+ // Wrap in quotes if not already quoted and not a CSS keyword
2947+ if v.starts_with('"') || v.starts_with('\'') || v == "none" || v == "normal" || v.starts_with("attr(") || v.starts_with("counter(") {
2948+ push_css(&mut css, "content", v);
22812949 } else {
2282− "grid-row"
2283− };
2284− push_css(&mut css, property, &format!("span {}", v));
2950+ push_css(&mut css, "content", &format!("\"{}\"", v));
2951+ }
22852952 }
22862953 }
22872954
2288− // CSS's `line-clamp` has no support yet without its
2289− // `-webkit-` fallback, which needs a box to clamp
2955+ // --- CSS Shorthands ---
2956+
2957+ "truncate" => {
2958+ push_css(&mut css, "overflow", "hidden");
2959+ push_css(&mut css, "text-overflow", "ellipsis");
2960+ push_css(&mut css, "white-space", "nowrap");
2961+ }
22902962 "line-clamp" => {
22912963 if let Some(v) = val {
22922964 push_css(&mut css, "display", "-webkit-box");
@@ -2295,23 +2967,128 @@ fn attrs_to_css(attrs: &[Attribute], condition: &Condition, site: &Site) -> Stri
22952967 push_css(&mut css, "overflow", "hidden");
22962968 }
22972969 }
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) => {
2970+ "blur" => {
2971+ if let Some(v) = val {
2972+ push_css(&mut css, "filter", &format!("blur({})", css_px(v)));
2973+ }
2974+ }
2975+ "backdrop-blur" => {
2976+ if let Some(v) = val {
2977+ push_css(&mut css, "backdrop-filter", &format!("blur({})", css_px(v)));
2978+ }
2979+ }
2980+ "no-scrollbar" => {
2981+ push_css(&mut css, "scrollbar-width", "none");
2982+ push_css(&mut css, "-ms-overflow-style", "none");
2983+ }
2984+ "skeleton" => {
2985+ push_css(&mut css, "background", "linear-gradient(90deg,#e5e7eb 25%,#f3f4f6 50%,#e5e7eb 75%)");
2986+ push_css(&mut css, "background-size", "200% 100%");
2987+ push_css(&mut css, "animation", "hl-skeleton 1.5s ease-in-out infinite");
2988+ }
2989+ "gradient" => {
23052990 if let Some(v) = val {
2306− push_css(&mut css, key, &with_px(key, v));
2991+ // Parse: "from to [angle]" or "color1 color2 [angle]"
2992+ let parts: Vec<&str> = v.split_whitespace().collect();
2993+ let bg = if parts.len() >= 3 && (parts[2].ends_with("deg") || parts[2].ends_with("turn") || parts[2].ends_with("rad")) {
2994+ format!("linear-gradient({},{},{})", parts[2], parts[0], parts[1])
2995+ } else if parts.len() >= 2 {
2996+ format!("linear-gradient({},{})", parts[0], parts[1])
2997+ } else {
2998+ format!("linear-gradient({},transparent)", parts[0])
2999+ };
3000+ push_css(&mut css, "background", &bg);
23073001 }
23083002 }
23093003
3004+ // Grid areas
3005+ "grid-template-areas" => {
3006+ if let Some(v) = val { push_css(&mut css, "grid-template-areas", v); }
3007+ }
3008+ "grid-area" => {
3009+ if let Some(v) = val { push_css(&mut css, "grid-area", v); }
3010+ }
3011+
3012+ // View transitions
3013+ "view-transition-name" => {
3014+ if let Some(v) = val { push_css(&mut css, "view-transition-name", v); }
3015+ }
3016+
3017+ // Animate shorthand (alias for animation)
3018+ "animate" => {
3019+ if let Some(v) = val { push_css(&mut css, "animation", v); }
3020+ }
3021+
3022+ // CSS subgrid
3023+ "grid-template-columns" => {
3024+ if let Some(v) = val { push_css(&mut css, "grid-template-columns", v); }
3025+ }
3026+ "grid-template-rows" => {
3027+ if let Some(v) = val { push_css(&mut css, "grid-template-rows", v); }
3028+ }
3029+
3030+ // Scroll-driven animations
3031+ "animation-timeline" => {
3032+ if let Some(v) = val { push_css(&mut css, "animation-timeline", v); }
3033+ }
3034+ "animation-range" => {
3035+ if let Some(v) = val { push_css(&mut css, "animation-range", v); }
3036+ }
3037+ "view-timeline-name" => {
3038+ if let Some(v) = val { push_css(&mut css, "view-timeline-name", v); }
3039+ }
3040+ "view-timeline-axis" => {
3041+ if let Some(v) = val { push_css(&mut css, "view-timeline-axis", v); }
3042+ }
3043+ "scroll-timeline-name" => {
3044+ if let Some(v) = val { push_css(&mut css, "scroll-timeline-name", v); }
3045+ }
3046+ "scroll-timeline-axis" => {
3047+ if let Some(v) = val { push_css(&mut css, "scroll-timeline-axis", v); }
3048+ }
3049+
3050+ // Anchor positioning
3051+ "anchor-name" => {
3052+ if let Some(v) = val { push_css(&mut css, "anchor-name", v); }
3053+ }
3054+ "position-anchor" => {
3055+ if let Some(v) = val { push_css(&mut css, "position-anchor", v); }
3056+ }
3057+ "position-area" => {
3058+ if let Some(v) = val { push_css(&mut css, "position-area", v); }
3059+ }
3060+ "inset-area" => {
3061+ // Legacy alias for position-area
3062+ if let Some(v) = val { push_css(&mut css, "position-area", v); }
3063+ }
3064+
3065+ // initial-letter (drop caps)
3066+ "initial-letter" => {
3067+ if let Some(v) = val { push_css(&mut css, "initial-letter", v); }
3068+ }
3069+
3070+ // Critical CSS hint — not CSS, handled elsewhere
3071+ "critical" => {}
3072+
3073+ // Identity and HTML passthrough — not CSS
3074+ "id" | "class" => {}
3075+ "type" | "placeholder" | "name" | "value" | "disabled" | "required"
3076+ | "checked" | "for" | "action" | "method" | "autocomplete" | "min"
3077+ | "max" | "step" | "pattern" | "maxlength" | "rows" | "cols"
3078+ | "multiple" | "alt" | "role" | "tabindex" | "title"
3079+ | "controls" | "autoplay" | "loop" | "muted" | "poster" | "preload"
3080+ | "loading" | "decoding" | "ordered" | "src"
3081+ | "open" | "novalidate" | "low" | "high" | "optimum"
3082+ | "colspan" | "rowspan" | "scope" | "inline" | "responsive"
3083+ | "datetime" | "media" | "sizes" | "srcset" | "cite" | "list"
3084+ | "sandbox" | "allow" | "allowfullscreen" | "referrerpolicy"
3085+ | "formaction" | "formmethod" | "formtarget" | "target"
3086+ | "autofocus" => {}
3087+
23103088 _ => {}
23113089 }
23123090 }
23133091
2314− css.push_str(&aligned);
23153092 css
23163093}
23173094
@@ -2322,10 +3099,41 @@ fn push_css(css: &mut String, prop: &str, value: &str) {
23223099 css.push(';');
23233100}
23243101
3102+/// Known CSS units — if a value ends with one, skip appending `px`.
3103+const CSS_UNITS: &[&str] = &[
3104+ "%", "rem", "em", "vh", "vw", "vmin", "vmax", "dvh", "svh", "lvh",
3105+ "ch", "ex", "cm", "mm", "in", "pt", "pc", "fr",
3106+];
3107+
3108+/// Format a numeric value: if it already has a CSS unit, pass through as-is;
3109+/// otherwise append `px`.
3110+fn css_px(value: &str) -> String {
3111+ let v = value.trim();
3112+ if v == "0" {
3113+ return "0".to_string();
3114+ }
3115+ if CSS_UNITS.iter().any(|u| v.ends_with(u)) {
3116+ return v.to_string();
3117+ }
3118+ if v.starts_with("var(") || v.starts_with("calc(") || v.starts_with("clamp(") || v.starts_with("min(") || v.starts_with("max(") {
3119+ return v.to_string();
3120+ }
3121+ format!("{}px", v)
3122+}
3123+
3124+/// Format multiple space-separated values, each getting px if needed.
3125+fn css_px_multi(value: &str) -> String {
3126+ value
3127+ .split_whitespace()
3128+ .map(css_px)
3129+ .collect::<Vec<_>>()
3130+ .join(" ")
3131+}
3132+
23253133fn extract_id_class(attrs: &[Attribute]) -> (Option<String>, Option<String>) {
23263134 let mut id = None;
23273135 let mut class = None;
2328− for attr in attrs.iter().filter(|a| a.html) {
3136+ for attr in attrs {
23293137 match attr.key.as_str() {
23303138 "id" => id = attr.value.clone(),
23313139 "class" => class = attr.value.clone(),
@@ -2335,6 +3143,146 @@ fn extract_id_class(attrs: &[Attribute]) -> (Option<String>, Option<String>) {
23353143 (id, class)
23363144}
23373145
3146+/// Read image dimensions from a local file by parsing the header bytes.
3147+/// Supports PNG, JPEG, GIF, WebP, AVIF, and SVG.
3148+fn read_image_dimensions(path: &str) -> Option<(u32, u32)> {
3149+ // SVG: parse as text for viewBox/width/height attributes
3150+ if path.ends_with(".svg") || path.ends_with(".SVG") {
3151+ let text = std::fs::read_to_string(path).ok()?;
3152+ return read_svg_dimensions(&text);
3153+ }
3154+
3155+ let data = std::fs::read(path).ok()?;
3156+ if data.len() < 12 {
3157+ return None;
3158+ }
3159+
3160+ // PNG: 8-byte signature, then IHDR chunk with width/height at bytes 16-23
3161+ if data.len() >= 24 && data.starts_with(b"\x89PNG\r\n\x1a\n") {
3162+ let w = u32::from_be_bytes([data[16], data[17], data[18], data[19]]);
3163+ let h = u32::from_be_bytes([data[20], data[21], data[22], data[23]]);
3164+ return Some((w, h));
3165+ }
3166+
3167+ // GIF: "GIF87a" or "GIF89a", width/height at bytes 6-9 (little-endian)
3168+ if data.starts_with(b"GIF87a") || data.starts_with(b"GIF89a") {
3169+ let w = u16::from_le_bytes([data[6], data[7]]) as u32;
3170+ let h = u16::from_le_bytes([data[8], data[9]]) as u32;
3171+ return Some((w, h));
3172+ }
3173+
3174+ // JPEG: scan for SOF0/SOF2 marker (0xFF 0xC0 or 0xFF 0xC2)
3175+ if data.starts_with(b"\xff\xd8") {
3176+ let mut i = 2;
3177+ while i + 9 < data.len() {
3178+ if data[i] != 0xFF {
3179+ i += 1;
3180+ continue;
3181+ }
3182+ let marker = data[i + 1];
3183+ if marker == 0xC0 || marker == 0xC2 {
3184+ let h = u16::from_be_bytes([data[i + 5], data[i + 6]]) as u32;
3185+ let w = u16::from_be_bytes([data[i + 7], data[i + 8]]) as u32;
3186+ return Some((w, h));
3187+ }
3188+ if i + 3 < data.len() {
3189+ let len = u16::from_be_bytes([data[i + 2], data[i + 3]]) as usize;
3190+ i += 2 + len;
3191+ } else {
3192+ break;
3193+ }
3194+ }
3195+ }
3196+
3197+ // WebP: "RIFF" ... "WEBP", VP8 header at byte 20
3198+ if data.len() >= 30 && &data[..4] == b"RIFF" && &data[8..12] == b"WEBP" {
3199+ if &data[12..16] == b"VP8 " && data.len() >= 30 {
3200+ let w = u16::from_le_bytes([data[26], data[27]]) as u32 & 0x3FFF;
3201+ let h = u16::from_le_bytes([data[28], data[29]]) as u32 & 0x3FFF;
3202+ return Some((w, h));
3203+ }
3204+ if &data[12..16] == b"VP8L" && data.len() >= 25 && data[21] == 0x2F {
3205+ let bits = u32::from_le_bytes([data[22], data[23], data[24], data[25]]);
3206+ let w = (bits & 0x3FFF) + 1;
3207+ let h = ((bits >> 14) & 0x3FFF) + 1;
3208+ return Some((w, h));
3209+ }
3210+ }
3211+
3212+ // AVIF: ISOBMFF container with "ftyp" box containing "avif"/"avis" brand,
3213+ // then "ispe" box with width/height
3214+ if data.len() >= 12 && &data[4..8] == b"ftyp" {
3215+ let brand = &data[8..12];
3216+ if brand == b"avif" || brand == b"avis" || brand == b"mif1" {
3217+ return read_avif_dimensions(&data);
3218+ }
3219+ }
3220+
3221+ None
3222+}
3223+
3224+/// Parse SVG viewBox or width/height attributes to get dimensions.
3225+fn read_svg_dimensions(text: &str) -> Option<(u32, u32)> {
3226+ // Try viewBox first: viewBox="minX minY width height"
3227+ if let Some(vb_start) = text.find("viewBox=\"") {
3228+ let rest = &text[vb_start + 9..];
3229+ if let Some(end) = rest.find('"') {
3230+ let parts: Vec<&str> = rest[..end].split_whitespace().collect();
3231+ if parts.len() == 4
3232+ && let (Ok(w), Ok(h)) = (parts[2].parse::<f64>(), parts[3].parse::<f64>())
3233+ && w > 0.0 && h > 0.0 {
3234+ return Some((w.round() as u32, h.round() as u32));
3235+ }
3236+ }
3237+ }
3238+ // Fall back to width/height attributes on <svg>
3239+ let svg_tag = text.find("<svg")?;
3240+ let tag_end = text[svg_tag..].find('>')? + svg_tag;
3241+ let tag = &text[svg_tag..tag_end];
3242+ let w = extract_svg_attr(tag, "width")?;
3243+ let h = extract_svg_attr(tag, "height")?;
3244+ Some((w, h))
3245+}
3246+
3247+fn extract_svg_attr(tag: &str, attr: &str) -> Option<u32> {
3248+ let needle = format!("{}=\"", attr);
3249+ let start = tag.find(&needle)? + needle.len();
3250+ let rest = &tag[start..];
3251+ let end = rest.find('"')?;
3252+ let val = rest[..end].trim_end_matches("px");
3253+ val.parse::<f64>().ok().map(|v| v.round() as u32)
3254+}
3255+
3256+/// Parse AVIF (ISOBMFF) container to find ispe box with image dimensions.
3257+fn read_avif_dimensions(data: &[u8]) -> Option<(u32, u32)> {
3258+ // Walk ISOBMFF boxes looking for "ispe" (image spatial extents)
3259+ let mut i = 0;
3260+ while i + 8 <= data.len() {
3261+ let box_size = u32::from_be_bytes([data[i], data[i + 1], data[i + 2], data[i + 3]]) as usize;
3262+ let box_type = &data[i + 4..i + 8];
3263+ if box_size < 8 {
3264+ break;
3265+ }
3266+ let box_end = (i + box_size).min(data.len());
3267+ // ispe box: 4 bytes version/flags + 4 bytes width + 4 bytes height
3268+ if box_type == b"ispe" && box_end >= i + 20 {
3269+ let w = u32::from_be_bytes([data[i + 12], data[i + 13], data[i + 14], data[i + 15]]);
3270+ let h = u32::from_be_bytes([data[i + 16], data[i + 17], data[i + 18], data[i + 19]]);
3271+ return Some((w, h));
3272+ }
3273+ // Recurse into container boxes (meta, iprp, ipco)
3274+ if matches!(box_type, b"meta" | b"iprp" | b"ipco" | b"moov" | b"trak" | b"mdia") {
3275+ let header_size = if box_type == b"meta" { 12 } else { 8 };
3276+ if i + header_size < box_end
3277+ && let Some(dims) = read_avif_dimensions(&data[i + header_size..box_end]) {
3278+ return Some(dims);
3279+ }
3280+ }
3281+ i = box_end;
3282+ }
3283+ None
3284+}
3285+
23383286fn html_escape(s: &str) -> String {
23393287 s.replace('&', "&")
23403288 .replace('<', "<")
@@ -2373,24 +3321,10 @@ fn base64_encode(data: &[u8]) -> String {
23733321/// Generate a standard v3 source map with VLQ-encoded mappings.
23743322/// Compatible with browser devtools and source map tooling.
23753323pub 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 {
23823324 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− }
3325+ collect_source_lines(&doc.nodes, &mut mappings);
3326+ mappings.sort_by_key(|m| m.0);
3327+ mappings.dedup_by_key(|m| m.0);
23943328
23953329 // Build VLQ-encoded mappings string.
23963330 // Each generated line is separated by ';'. Each segment within a line is
@@ -2408,19 +3342,16 @@ pub fn source_map_for_html(html: &str, source_file: &str) -> String {
24083342 if mapping_idx < mappings.len() && mappings[mapping_idx].0 == gen_line {
24093343 let source_line = mappings[mapping_idx].1 as i64 - 1; // 0-based
24103344 // 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)
3345+ vlq_encode(0, &mut vlq); // generated column (always 0)
3346+ vlq_encode(0, &mut vlq); // source file index (always 0)
24133347 vlq_encode(source_line - prev_source_line, &mut vlq); // source line delta
2414− vlq_encode(0, &mut vlq); // source column (always 0)
3348+ vlq_encode(0, &mut vlq); // source column (always 0)
24153349 prev_source_line = source_line;
24163350 mapping_idx += 1;
24173351 }
24183352 }
24193353
2420− let escaped_file = source_file
2421− .replace(".hl", ".html")
2422− .replace('\\', "\\\\")
2423− .replace('"', "\\\"");
3354+ let escaped_file = source_file.replace(".hl", ".html").replace('\\', "\\\\").replace('"', "\\\"");
24243355 let escaped_source = source_file.replace('\\', "\\\\").replace('"', "\\\"");
24253356
24263357 format!(
@@ -2450,30 +3381,52 @@ fn vlq_encode(value: i64, out: &mut String) {
24503381 }
24513382}
24523383
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()));
3384+fn collect_source_lines(nodes: &[Node], mappings: &mut Vec<(usize, usize)>) {
3385+ for node in nodes {
3386+ if let Node::Element(elem) = node {
3387+ if elem.line_num > 0 {
3388+ mappings.push((mappings.len() + 1, elem.line_num));
3389+ }
3390+ collect_source_lines(&elem.children, mappings);
3391+ }
3392+ }
3393+}
3394+
3395+/// Check if a specific element kind exists anywhere in the node tree.
3396+fn has_element_kind(nodes: &[Node], target: &ElementKind) -> bool {
3397+ for node in nodes {
3398+ if let Node::Element(elem) = node {
3399+ if elem.kind == *target {
3400+ return true;
3401+ }
3402+ if has_element_kind(&elem.children, target) {
3403+ return true;
3404+ }
3405+ }
3406+ }
3407+ false
3408+}
3409+
3410+/// Collect unique external domains from generated HTML for DNS prefetch hints.
3411+fn collect_dns_prefetch(html: &str, dev: bool) -> String {
3412+ let mut domains = Vec::new();
3413+ let mut rest = html;
3414+ while let Some(pos) = rest.find("https://") {
3415+ let start = pos + 8; // skip "https://"
3416+ rest = &rest[start..];
3417+ let end = rest.find(['/', '"', '\'', ' ', '>', ')']).unwrap_or(rest.len());
3418+ let domain = &rest[..end];
3419+ if !domain.is_empty() && domain.contains('.') && !domains.contains(&domain.to_string()) {
3420+ domains.push(domain.to_string());
3421+ }
3422+ }
3423+ let mut out = String::new();
3424+ for domain in &domains {
3425+ if dev {
3426+ out.push_str(&format!("<link rel=\"dns-prefetch\" href=\"//{}\">\n", domain));
3427+ } else {
3428+ out.push_str(&format!("<link rel=\"dns-prefetch\" href=\"//{}\">", domain));
3429+ }
24783430 }
3431+ out
24793432}