@@ -1,7 +1,8 @@
11use std::collections::HashMap;
2−use std::hash::{Hash, Hasher};
2+use std::hash::Hash;
33
44use crate::ast::*;
5+use crate::vocab::with_px;
56
67// ---------------------------------------------------------------------------
78// Style collector: deduplicates CSS and assigns class names
@@ -16,52 +17,315 @@ const BREAKPOINTS: &[(&str, &str)] = &[
1617 ("2xl", "1536px"),
1718];
1819
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);
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)
2392 }
24− let mut n = idx - 26;
25− let mut name = String::new();
26− // First char is always a letter
27− name.push((b'a' + (n % 26) as u8) as char);
28− n /= 26;
29− loop {
30− name.push((b'a' + (n % 36).min(25) as u8) as char);
31− if n < 36 {
32− break;
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+ }
217+ }
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)),
33266 }
34− n /= 36;
267+ };
268+ if dev {
269+ format!("{} ({}: {})", kind, feature, value)
270+ } else {
271+ format!("{}({}:{})", kind, feature, value)
35272 }
36− // Reverse so it reads naturally
37− name.chars().rev().collect()
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
38296}
39297
40298struct StyleEntry {
41299 class_name: String,
42− base: String,
43− /// (CSS selector suffix, css_rules) — e.g. (":hover", "color:red;")
44− pseudo: Vec<(String, String)>,
45− /// Responsive overrides: (breakpoint_prefix, css)
46− responsive: Vec<(String, String)>,
47− /// Dark mode overrides
48− dark: String,
49− /// Print overrides
50− print: String,
51− motion_safe: String,
52− motion_reduce: String,
53− landscape: String,
54− portrait: String,
55− /// Container query overrides: (breakpoint_prefix, css)
56− container: Vec<(String, String)>,
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,
57314}
58315
59316struct StyleCollector {
60317 entries: Vec<StyleEntry>,
61− /// Maps a pre-hashed style signature to an index into `entries`.
62− /// Using u64 as the key keeps lookups allocation-free; on the rare case of
63− /// a hash collision we fall back to a full equality check against the entry.
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).
64320 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)>,
65329}
66330
67331impl StyleCollector {
@@ -69,328 +333,282 @@ impl StyleCollector {
69333 StyleCollector {
70334 entries: Vec::new(),
71335 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);
72347 }
73348 }
74349
75350 /// Returns a class name for this style combination, or None if all empty.
76− #[allow(clippy::too_many_arguments)]
77351 fn get_class(
78352 &mut self,
79− base: String,
80− pseudo: Vec<(String, String)>,
81− responsive: Vec<(String, String)>,
82− dark: String,
83− print: String,
84− motion_safe: String,
85− motion_reduce: String,
86− landscape: String,
87− portrait: String,
88− container: Vec<(String, String)>,
353+ defaults: String,
354+ mut rules: Vec<(Condition, String)>,
355+ distinct: String,
89356 ) -> Option<String> {
90− if base.is_empty()
91− && pseudo.is_empty()
92− && responsive.is_empty()
93− && dark.is_empty()
94− && print.is_empty()
95− && motion_safe.is_empty()
96− && motion_reduce.is_empty()
97− && landscape.is_empty()
98− && portrait.is_empty()
99− && container.is_empty()
100− {
357+ rules.retain(|(_, body)| !body.is_empty());
358+ if defaults.is_empty() && rules.is_empty() {
101359 return None;
102360 }
103− use std::collections::hash_map::DefaultHasher;
104− let mut h = DefaultHasher::new();
105− base.hash(&mut h);
106− pseudo.hash(&mut h);
107− responsive.hash(&mut h);
108− dark.hash(&mut h);
109− print.hash(&mut h);
110− motion_safe.hash(&mut h);
111− motion_reduce.hash(&mut h);
112− landscape.hash(&mut h);
113− portrait.hash(&mut h);
114− container.hash(&mut h);
115− let sig = h.finish();
116−
117− if let Some(indices) = self.index.get(&sig) {
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) {
118365 for &idx in indices {
119366 let e = &self.entries[idx];
120− if e.base == base
121− && e.pseudo == pseudo
122− && e.responsive == responsive
123− && e.dark == dark
124− && e.print == print
125− && e.motion_safe == motion_safe
126− && e.motion_reduce == motion_reduce
127− && e.landscape == landscape
128− && e.portrait == portrait
129− && e.container == container
130− {
367+ if e.defaults == defaults && e.rules == rules && e.distinct == distinct {
131368 return Some(e.class_name.clone());
132369 }
133370 }
134371 }
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
135375 let idx = self.entries.len();
136− let name = short_class_name(idx);
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());
137381 self.entries.push(StyleEntry {
138382 class_name: name.clone(),
139− base,
140− pseudo,
141− responsive,
142− dark,
143− print,
144− motion_safe,
145− motion_reduce,
146− landscape,
147− portrait,
148− container,
383+ style,
384+ defaults,
385+ rules,
386+ distinct,
149387 });
150− self.index.entry(sig).or_default().push(idx);
388+ self.index.entry(style).or_default().push(idx);
151389 Some(name)
152390 }
153391
154− fn to_css_formatted(&self, dev: bool, use_layer: bool) -> String {
155− let mut css = String::new();
156− let inner_indent = if use_layer && dev { " " } else { "" };
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+ }
157399
158− // Wrap in @layer for specificity management
159− if use_layer {
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(","));
160423 if dev {
161− css.push_str("@layer htmlang {\n");
424+ kind.push_str(&format!(" {} {{{}}}\n", selector, body));
162425 } else {
163− css.push_str("@layer htmlang{");
426+ kind.push_str(&format!("{}{{{}}}", selector, body));
164427 }
165428 }
166429
167− // Non-responsive rules. Base and pseudo rules are merged separately by
168− // identical body so that e.g. `.a,.b{display:flex;flex-direction:column;}`
169− // replaces two identical rules. Pseudo variants are grouped per selector
170− // suffix (`:hover` with `:hover`, etc.) to keep each pseudo's cascade
171− // position independent of others.
172− let mut base_pairs: Vec<(&str, &str)> = Vec::with_capacity(self.entries.len());
173− for e in &self.entries {
174− if !e.base.is_empty() {
175− base_pairs.push((e.class_name.as_str(), e.base.as_str()));
430+ let mut inside = self.blocks(true, dev);
431+ // A function's scoped `@style`, nested under its class
432+ for block in scoped {
433+ if dev {
434+ inside.push_str(block);
435+ inside.push('\n');
436+ } else {
437+ inside.push_str(&compact_css(block));
176438 }
177439 }
178− emit_grouped_rules(&mut css, &base_pairs, "", inner_indent, dev);
179−
180− // Collect pseudo rules grouped by selector suffix, preserving the order
181− // in which suffixes first appear across entries.
182− let mut pseudo_order: Vec<&str> = Vec::new();
183− let mut pseudo_buckets: HashMap<&str, Vec<(&str, &str)>> = HashMap::new();
184− for e in &self.entries {
185− for (selector, body) in &e.pseudo {
186− if body.is_empty() {
187− continue;
188− }
189− let key = selector.as_str();
190− if !pseudo_buckets.contains_key(key) {
191− pseudo_order.push(key);
192− }
193− pseudo_buckets
194− .entry(key)
195− .or_default()
196− .push((e.class_name.as_str(), body.as_str()));
440+
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;
197449 }
198− }
199− for selector in &pseudo_order {
200− if let Some(pairs) = pseudo_buckets.get(selector) {
201− emit_grouped_rules(&mut css, pairs, selector, inner_indent, dev);
450+ if dev {
451+ css.push_str(&format!("@layer {} {{\n{}}}\n", name, rules));
452+ } else {
453+ css.push_str(&format!("@layer {}{{{}}}", name, rules));
202454 }
203455 }
456+ css
457+ }
204458
205− // Responsive rules grouped by breakpoint
206− for &(bp_name, bp_width) in BREAKPOINTS {
207− let mut bp_pairs: Vec<(&str, &str)> = Vec::new();
208− for e in &self.entries {
209− for (bp, rule_css) in &e.responsive {
210− if bp == bp_name && !rule_css.is_empty() {
211− bp_pairs.push((e.class_name.as_str(), rule_css.as_str()));
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+ }
212538 }
213539 }
214− }
215− emit_media_block(
216− &mut css,
217− &format!("@media (min-width: {})", bp_width),
218− &format!("@media(min-width:{})", bp_width),
219− &bp_pairs,
220− "",
221− dev,
222− );
223− }
224−
225− // Dark mode rules
226− let dark_pairs: Vec<(&str, &str)> = self
227− .entries
228− .iter()
229− .filter(|e| !e.dark.is_empty())
230− .map(|e| (e.class_name.as_str(), e.dark.as_str()))
231− .collect();
232− emit_media_block(
233− &mut css,
234− "@media (prefers-color-scheme: dark)",
235− "@media(prefers-color-scheme:dark)",
236− &dark_pairs,
237− "",
238− dev,
239− );
240−
241− // Print rules
242− let print_pairs: Vec<(&str, &str)> = self
243− .entries
244− .iter()
245− .filter(|e| !e.print.is_empty())
246− .map(|e| (e.class_name.as_str(), e.print.as_str()))
247− .collect();
248− emit_media_block(
249− &mut css,
250− "@media print",
251− "@media print",
252− &print_pairs,
253− "",
254− dev,
255− );
256−
257− // Motion safe rules
258− let motion_safe_pairs: Vec<(&str, &str)> = self
259− .entries
260− .iter()
261− .filter(|e| !e.motion_safe.is_empty())
262− .map(|e| (e.class_name.as_str(), e.motion_safe.as_str()))
263− .collect();
264− emit_media_block(
265− &mut css,
266− "@media (prefers-reduced-motion: no-preference)",
267− "@media(prefers-reduced-motion:no-preference)",
268− &motion_safe_pairs,
269− "",
270− dev,
271− );
272−
273− // Motion reduce rules
274− let motion_reduce_pairs: Vec<(&str, &str)> = self
275− .entries
276− .iter()
277− .filter(|e| !e.motion_reduce.is_empty())
278− .map(|e| (e.class_name.as_str(), e.motion_reduce.as_str()))
279− .collect();
280− emit_media_block(
281− &mut css,
282− "@media (prefers-reduced-motion: reduce)",
283− "@media(prefers-reduced-motion:reduce)",
284− &motion_reduce_pairs,
285− "",
286− dev,
287− );
288−
289− // Landscape rules
290− let landscape_pairs: Vec<(&str, &str)> = self
291− .entries
292− .iter()
293− .filter(|e| !e.landscape.is_empty())
294− .map(|e| (e.class_name.as_str(), e.landscape.as_str()))
295− .collect();
296− emit_media_block(
297− &mut css,
298− "@media (orientation: landscape)",
299− "@media(orientation:landscape)",
300− &landscape_pairs,
301− "",
302− dev,
303− );
304−
305− // Portrait rules
306− let portrait_pairs: Vec<(&str, &str)> = self
307− .entries
308− .iter()
309− .filter(|e| !e.portrait.is_empty())
310− .map(|e| (e.class_name.as_str(), e.portrait.as_str()))
311− .collect();
312− emit_media_block(
313− &mut css,
314− "@media (orientation: portrait)",
315− "@media(orientation:portrait)",
316− &portrait_pairs,
317− "",
318− dev,
319− );
320−
321− // Container query rules grouped by breakpoint
322− for &(bp_name, bp_width) in BREAKPOINTS {
323− let mut cq_pairs: Vec<(&str, &str)> = Vec::new();
324− for e in &self.entries {
325− for (bp, rule_css) in &e.container {
326− if bp == bp_name && !rule_css.is_empty() {
327− cq_pairs.push((e.class_name.as_str(), rule_css.as_str()));
328− }
540+ let inner_indent = if dev {
541+ format!("{} ", indent)
542+ } 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 { "}" });
329554 }
330− }
331− emit_media_block(
332− &mut css,
333− &format!("@container (min-width: {})", bp_width),
334− &format!("@container(min-width:{})", bp_width),
335− &cq_pairs,
336− "",
337− dev,
338− );
339− }
340−
341− // Close @layer
342− if use_layer {
343− if dev {
344− css.push_str("}\n");
345555 } else {
346− css.push('}');
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);
563+ }
564+ }
565+ if inner.is_empty() {
566+ continue;
567+ }
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))
577+ } else {
578+ format!("{}{{{inner}}}", at_rule(rank, false))
579+ };
347580 }
581+ css.push_str(&inner);
348582 }
349−
350583 css
351584 }
352585}
353586
354−/// Emit CSS rules from `(class_name, body)` pairs, merging identical bodies
587+/// Emit CSS rules from `(selector, body)` pairs, merging identical bodies
355588/// into a single selector-list rule (e.g. `.a,.b{body}`). The first occurrence
356589/// of each distinct body determines ordering, so output stays deterministic
357−/// across runs. `selector_suffix` is appended to each class (e.g. `":hover"`,
358−/// or `""` for plain class rules). `indent` is prepended to each rule line.
359−fn emit_grouped_rules(
360− out: &mut String,
361− pairs: &[(&str, &str)],
362− selector_suffix: &str,
363− indent: &str,
364− dev: bool,
365−) {
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) {
366592 if pairs.is_empty() {
367593 return;
368594 }
369595 // Group in first-occurrence order.
370596 let mut order: Vec<&str> = Vec::new();
371597 let mut groups: HashMap<&str, Vec<&str>> = HashMap::new();
372− for &(name, body) in pairs {
598+ for (selector, body) in pairs {
373599 if body.is_empty() {
374600 continue;
375601 }
376602 if !groups.contains_key(body) {
377603 order.push(body);
378604 }
379− groups.entry(body).or_default().push(name);
605+ groups.entry(body).or_default().push(selector);
380606 }
381607 let sp = if dev { " " } else { "" };
382608 let nl = if dev { "\n" } else { "" };
383609 for body in &order {
384− let names = &groups[body];
385610 out.push_str(indent);
386− for (i, n) in names.iter().enumerate() {
387− if i > 0 {
388− out.push(',');
389− }
390− out.push('.');
391− out.push_str(n);
392− out.push_str(selector_suffix);
393− }
611+ out.push_str(&groups[body].join(","));
394612 out.push_str(sp);
395613 out.push('{');
396614 out.push_str(body);
@@ -399,38 +617,44 @@ fn emit_grouped_rules(
399617 }
400618}
401619
402−/// Emit an `@media` / `@container` block containing grouped class rules.
403−/// Skips the block entirely if no non-empty bodies are present.
404−fn emit_media_block(
405− out: &mut String,
406− header_dev: &str,
407− header_min: &str,
408− pairs: &[(&str, &str)],
409− selector_suffix: &str,
410− dev: bool,
411−) {
412− if pairs.iter().all(|(_, body)| body.is_empty()) {
413− return;
414− }
415− let mut inner = String::new();
416− let inner_indent = if dev { " " } else { "" };
417− emit_grouped_rules(&mut inner, pairs, selector_suffix, inner_indent, dev);
418− if inner.is_empty() {
419− return;
420− }
421− if dev {
422− out.push_str(&format!("{} {{\n{}}}\n", header_dev, inner));
423− } else {
424− out.push_str(&format!("{}{{{}}}", header_min, inner));
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(' ');
634+ }
635+ out.push('{');
636+ out.push_str(body);
637+ out.push('}');
638+ if dev {
639+ out.push('\n');
640+ }
641+ }
642+ i += run;
425643 }
426644}
427645
428646struct GenContext {
429647 dev: bool,
430648 depth: usize,
431− image_count: usize,
432649 has_interactive: bool,
433− has_defer: 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,
434658}
435659
436660impl GenContext {
@@ -456,23 +680,26 @@ pub struct CodegenOptions {
456680 pub dev: bool,
457681 pub partial: bool,
458682 pub minify: bool,
459− pub compat: bool,
460683}
461684
462685/// Generate HTML from a parsed document using the given options.
463686pub 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();
464694 let mut html = if opts.partial {
465− generate_partial_inner(doc, opts.dev)
695+ generate_partial_inner(doc, opts.dev, &mut classes)
466696 } else {
467− generate_full_inner(doc, opts.dev)
697+ generate_full_inner(doc, opts.dev, &mut classes)
468698 };
469699 if opts.minify {
470700 html = minify_html(&html);
471701 }
472− if opts.compat {
473− html = add_vendor_prefixes(&html);
474− }
475− html
702+ (html, classes)
476703}
477704
478705pub fn generate(doc: &Document) -> String {
@@ -520,38 +747,6 @@ pub fn generate_minified(doc: &Document) -> String {
520747 )
521748}
522749
523−pub fn generate_compat(doc: &Document) -> String {
524− generate_with(
525− doc,
526− &CodegenOptions {
527− compat: true,
528− ..Default::default()
529− },
530− )
531−}
532−
533−pub fn generate_dev_compat(doc: &Document) -> String {
534− generate_with(
535− doc,
536− &CodegenOptions {
537− dev: true,
538− compat: true,
539− ..Default::default()
540− },
541− )
542−}
543−
544−pub fn generate_minified_compat(doc: &Document) -> String {
545− generate_with(
546− doc,
547− &CodegenOptions {
548− minify: true,
549− compat: true,
550− ..Default::default()
551− },
552− )
553−}
554−
555750fn minify_html(html: &str) -> String {
556751 let mut result = String::with_capacity(html.len());
557752 let mut in_pre = false;
@@ -566,9 +761,9 @@ fn minify_html(html: &str) -> String {
566761 if i + 4 < chars.len() && chars[i] == '<' {
567762 let rest: String = chars[i..].iter().take(10).collect();
568763 let rest_lower = rest.to_lowercase();
569− if rest_lower.starts_with("<pre") {
764+ if rest_lower.starts_with("<pre") || rest_lower.starts_with("<textarea") {
570765 in_pre = true;
571− } else if rest_lower.starts_with("</pre") {
766+ } else if rest_lower.starts_with("</pre") || rest_lower.starts_with("</textarea") {
572767 in_pre = false;
573768 } else if rest_lower.starts_with("<script") {
574769 in_script = true;
@@ -610,10 +805,11 @@ fn minify_html(html: &str) -> String {
610805 continue;
611806 }
612807
613− // Collapse whitespace between tags
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).
614811 if chars[i].is_whitespace() {
615812 if !prev_was_space {
616− // Only emit a space if we're between content (not between tags)
617813 result.push(' ');
618814 prev_was_space = true;
619815 }
@@ -621,14 +817,6 @@ fn minify_html(html: &str) -> String {
621817 continue;
622818 }
623819
624− // Trim space before closing tags
625− if chars[i] == '<' && prev_was_space {
626− // Remove trailing space before tag
627− if result.ends_with(' ') {
628− result.pop();
629− }
630− }
631−
632820 prev_was_space = false;
633821 result.push(chars[i]);
634822 i += 1;
@@ -637,177 +825,152 @@ fn minify_html(html: &str) -> String {
637825 result
638826}
639827
640−/// Add vendor prefixes to CSS within <style> tags for broader browser compatibility.
641−fn add_vendor_prefixes(html: &str) -> String {
642− // Find CSS within <style>...</style> and add vendor prefixes
643− let mut result = String::with_capacity(html.len() + 512);
644− let mut rest = html;
645− while let Some(start) = rest.find("<style>") {
646− let after_tag = start + 7;
647− result.push_str(&rest[..after_tag]);
648− rest = &rest[after_tag..];
649− if let Some(end) = rest.find("</style>") {
650− let css = &rest[..end];
651− result.push_str(&prefix_css(css));
652− result.push_str("</style>");
653− rest = &rest[end + 8..];
654− } else {
655− break;
656− }
657− }
658− result.push_str(rest);
659− result
660−}
661−
662−fn prefix_css(css: &str) -> String {
663− let mut out = String::with_capacity(css.len() + 256);
664− let mut i = 0;
665− let bytes = css.as_bytes();
666− while i < bytes.len() {
667− // Find property declarations
668− if let Some(pos) = css[i..].find('{') {
669− let brace = i + pos;
670− out.push_str(&css[i..=brace]);
671− i = brace + 1;
672− // Process declarations within this block
673− if let Some(close) = css[i..].find('}') {
674− let block = &css[i..i + close];
675− out.push_str(&prefix_declarations(block));
676− out.push('}');
677− i = i + close + 1;
678− }
679− } else {
680− out.push_str(&css[i..]);
681− break;
682− }
683− }
684− out
685−}
686−
687−fn prefix_declarations(block: &str) -> String {
688− let mut out = String::with_capacity(block.len() + 128);
689− for decl in block.split(';') {
690− let decl = decl.trim();
691− if decl.is_empty() {
692− continue;
693− }
694− if let Some((prop, val)) = decl.split_once(':') {
695− let prop = prop.trim();
696− let val = val.trim();
697− match prop {
698− "backdrop-filter" => {
699− out.push_str(&format!("-webkit-backdrop-filter:{};", val));
700− out.push_str(&format!("backdrop-filter:{};", val));
701− }
702− "user-select" => {
703− out.push_str(&format!("-webkit-user-select:{};", val));
704− out.push_str(&format!("-moz-user-select:{};", val));
705− out.push_str(&format!("user-select:{};", val));
706− }
707− "appearance" => {
708− out.push_str(&format!("-webkit-appearance:{};", val));
709− out.push_str(&format!("-moz-appearance:{};", val));
710− out.push_str(&format!("appearance:{};", val));
711− }
712− "background-clip" if val.contains("text") => {
713− out.push_str(&format!("-webkit-background-clip:{};", val));
714− out.push_str(&format!("background-clip:{};", val));
715− }
716− "hyphens" => {
717− out.push_str(&format!("-webkit-hyphens:{};", val));
718− out.push_str(&format!("-ms-hyphens:{};", val));
719− out.push_str(&format!("hyphens:{};", val));
720− }
721− "text-size-adjust" => {
722− out.push_str(&format!("-webkit-text-size-adjust:{};", val));
723− out.push_str(&format!("-ms-text-size-adjust:{};", val));
724− out.push_str(&format!("text-size-adjust:{};", val));
725− }
726− "mask-image" | "mask-size" | "mask-repeat" | "mask-position" => {
727− out.push_str(&format!("-webkit-{}:{};", prop, val));
728− out.push_str(&format!("{}:{};", prop, val));
729− }
730− _ => {
731− out.push_str(decl);
732− out.push(';');
733− }
734− }
735− } else {
736− out.push_str(decl);
737− out.push(';');
738− }
739− }
740− out
741−}
742−
743−fn generate_full_inner(doc: &Document, dev: bool) -> String {
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+ };
744833 let mut styles = StyleCollector::new();
745834 let mut ctx = GenContext {
746835 dev,
747836 depth: 0,
748− image_count: 0,
749837 has_interactive: false,
750− has_defer: false,
838+ in_text: false,
839+ flow: Flow::default(),
840+ in_picture: false,
751841 };
752842
753− // Check if document has @main for skip-to-content link
754− let has_main = has_element_kind(&doc.nodes, &ElementKind::Main);
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;
755866
756867 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+ );
757875
758− // Skip-to-content link for accessibility (only when @main exists)
759− if has_main {
760− if dev {
761− body.push_str("<a href=\"#hl-main\" class=\"hl-skip\">Skip to content</a>\n");
762− } else {
763− body.push_str("<a href=\"#hl-main\" class=\"hl-skip\">Skip to content</a>");
764− }
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);
765918 }
766919
767− for node in &doc.nodes {
768− generate_node(node, None, &mut body, &mut styles, &mut ctx);
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);
769924 }
925+ let mut body_attrs = String::new();
926+ emit_class_attr(&mut body_attrs, body_class.as_deref(), None);
927+
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";
931+ if dev {
932+ format!(
933+ "{}{} {{ outline: 2px solid currentColor; outline-offset: 2px; }}\n",
934+ OWN_ELEMENTS, focusable
935+ )
936+ } else {
937+ format!(
938+ "{}{}{{outline:2px solid currentColor;outline-offset:2px}}",
939+ OWN_ELEMENTS, focusable
940+ )
941+ }
942+ } else {
943+ String::new()
944+ };
945+ let reset_css = reset_css(dev, true, &focus_visible_css);
946+ classes.extend(styles.classes());
770947
771− // Collect external domains for DNS prefetch
772− let dns_prefetch_html = collect_dns_prefetch(&body, dev);
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+}
773954
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 {
774959 let mut element_css = String::new();
775960
776− // Collect all CSS custom properties (explicit `@let --name` / `@theme`
777− // tokens, plus any auto-extracted repeats) so they can be emitted in a
778− // single `:root` block below.
961+ // Collect the CSS custom properties declared with `@let --name` so they
962+ // can be emitted in a single `:root` block below.
779963 let mut root_vars: Vec<(String, String)> = Vec::new();
780964 for (name, value) in &doc.css_vars {
781965 root_vars.push((name.clone(), value.clone()));
782966 }
783− for (name, value) in &doc.theme_tokens {
784− let css_name = format!("--{}", name);
785− if !root_vars.iter().any(|(n, _)| *n == css_name) {
786− root_vars.push((css_name, value.clone()));
787− }
788− }
789967
790− let has_custom_css = !doc.custom_css.is_empty();
791− let styles_css = styles.to_css_formatted(dev, !has_custom_css);
792− // Fold literal values declared via `@theme` / `@let --name` back into
793− // `var(--name)` references so the generated CSS actually uses the
794− // custom properties emitted in `:root`. Saves bytes and makes runtime
795− // theming take effect.
796− let styles_css = substitute_css_vars(&styles_css, &root_vars);
797− // Further compress the CSS by auto-extracting any remaining literal
798− // values that appear often enough for `var(--hN)` references to come out
799− // shorter overall. Disabled in dev mode to keep the generated CSS
800− // readable.
801− let styles_css = if dev {
802− styles_css
803− } else {
804− let (new_css, auto_vars) = auto_extract_repeats(&styles_css, &root_vars);
805− root_vars.extend(auto_vars);
806− new_css
807− };
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);
808971
809− // Emit the (possibly extended) :root block first so the cascade picks up
810− // the custom properties before the class rules consume them.
972+ // Emit the :root block first so the cascade picks up the custom
973+ // properties before the class rules consume them.
811974 if !root_vars.is_empty() {
812975 if dev {
813976 element_css.push_str(":root {\n");
@@ -829,538 +992,121 @@ fn generate_full_inner(doc: &Document, dev: bool) -> String {
829992
830993 element_css.push_str(&styles_css);
831994
832− // @keyframes
833− for (name, kf_body) in &doc.keyframes {
834− if dev {
835− element_css.push_str(&format!("@keyframes {} {{\n{}\n}}\n", name, kf_body));
836− } else {
837− element_css.push_str(&format!("@keyframes {}{{{}}}", name, kf_body));
838− }
839− }
840−
841− // Auto-inject skeleton keyframe if skeleton attribute is used
842− let skeleton_used = element_css.contains("hl-skeleton");
843− if skeleton_used {
844− if dev {
845− element_css.push_str("@keyframes hl-skeleton {\n 0% { background-position: 200% 0; }\n 100% { background-position: -200% 0; }\n}\n");
846− } else {
847− element_css.push_str("@keyframes hl-skeleton{0%{background-position:200% 0}100%{background-position:-200% 0}}");
848− }
849− }
850−
851− // Also inject carousel webkit scrollbar hiding
852− let carousel_used = element_css.contains("scroll-snap-type:x mandatory");
853− if carousel_used && !element_css.contains("::-webkit-scrollbar") {
854− // The carousel class already has scrollbar-width:none, but webkit needs pseudo-element
855− // We add a global rule for carousel-style elements
856− }
857−
858995 // @style blocks (custom CSS)
859996 for block in &doc.custom_css {
860997 if dev {
861998 element_css.push_str(block);
862999 element_css.push('\n');
8631000 } else {
864− // Minify: collapse whitespace
865− let minified: String = block.lines().map(|l| l.trim()).collect::<Vec<_>>().join("");
866− element_css.push_str(&minified);
1001+ element_css.push_str(&compact_css(block));
8671002 }
8681003 }
8691004
870− // @scope blocks
871− for block in &doc.scope_blocks {
872− if dev {
873− element_css.push_str(block);
874− element_css.push('\n');
875− } else {
876− let minified: String = block.lines().map(|l| l.trim()).collect::<Vec<_>>().join("");
877− element_css.push_str(&minified);
878− }
879− }
1005+ element_css
1006+}
8801007
881− // @starting-style blocks
882− if !doc.starting_style_blocks.is_empty() {
883− if dev {
884− element_css.push_str("@starting-style {\n");
885− for block in &doc.starting_style_blocks {
886− element_css.push_str(block);
887− element_css.push('\n');
888− }
889− element_css.push_str("}\n");
890− } else {
891− element_css.push_str("@starting-style{");
892− for block in &doc.starting_style_blocks {
893− let minified: String = block.lines().map(|l| l.trim()).collect::<Vec<_>>().join("");
894− element_css.push_str(&minified);
895− }
896− element_css.push('}');
897− }
898− }
899−
900− // Build meta tags string
901− let meta_html = if doc.meta_tags.is_empty() {
902− String::new()
903− } else {
904− let mut m = String::new();
905− for (name, content) in &doc.meta_tags {
906− if dev {
907− m.push_str(&format!(
908− "<meta name=\"{}\" content=\"{}\">\n",
909− html_escape(name),
910− html_escape(content)
911− ));
912− } else {
913− m.push_str(&format!(
914− "<meta name=\"{}\" content=\"{}\">",
915− html_escape(name),
916− html_escape(content)
917− ));
918− }
919− }
920− m
921− };
922−
923− // Build OG meta tags
924− let og_html = if doc.og_tags.is_empty() {
925− String::new()
926− } else {
927− let mut o = String::new();
928− for (property, content) in &doc.og_tags {
929− if dev {
930− o.push_str(&format!(
931− "<meta property=\"og:{}\" content=\"{}\">\n",
932− html_escape(property),
933− html_escape(content)
934− ));
935− } else {
936− o.push_str(&format!(
937− "<meta property=\"og:{}\" content=\"{}\">",
938− html_escape(property),
939− html_escape(content)
940− ));
941− }
942− }
943− o
944− };
945−
946− // Build head blocks string
947− let head_html = if doc.head_blocks.is_empty() {
948− String::new()
949− } else {
950− let mut h = String::new();
951− for block in &doc.head_blocks {
952− h.push_str(block);
953− if dev {
954− h.push('\n');
955− }
956− }
957− h
958− };
959−
960− let lang_attr = match &doc.lang {
961− Some(lang) => format!(" lang=\"{}\"", html_escape(lang)),
962− None => String::new(),
963− };
964−
965− let favicon_html = match &doc.favicon {
966− Some(path) => {
967− // Try to read and inline the favicon
968− if let Ok(data) = std::fs::read(path) {
969− let mime = if path.ends_with(".ico") {
970− "image/x-icon"
971− } else if path.ends_with(".png") {
972− "image/png"
973− } else if path.ends_with(".svg") {
974− "image/svg+xml"
975− } else {
976− "image/x-icon"
977− };
978− let b64 = base64_encode(&data);
979− if dev {
980− format!(
981− "<link rel=\"icon\" href=\"data:{};base64,{}\">\n",
982− mime, b64
983− )
984− } else {
985− format!("<link rel=\"icon\" href=\"data:{};base64,{}\">", mime, b64)
986− }
987− } else {
988− // Fall back to href
989− if dev {
990− format!("<link rel=\"icon\" href=\"{}\">\n", html_escape(path))
991− } else {
992− format!("<link rel=\"icon\" href=\"{}\">", html_escape(path))
993− }
994− }
995− }
996− None => String::new(),
997− };
998−
999− // Canonical URL
1000− let canonical_html = match &doc.canonical {
1001− Some(url) => {
1002− if dev {
1003− format!("<link rel=\"canonical\" href=\"{}\">\n", html_escape(url))
1004− } else {
1005− format!("<link rel=\"canonical\" href=\"{}\">", html_escape(url))
1006− }
1007− }
1008− None => String::new(),
1009− };
1010−
1011− // Base URL
1012− let base_html = match &doc.base_url {
1013− Some(url) => {
1014− if dev {
1015− format!("<base href=\"{}\">\n", html_escape(url))
1016− } else {
1017− format!("<base href=\"{}\">", html_escape(url))
1018− }
1019− }
1020− None => String::new(),
1021− };
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+}
10221019
1023− // @font-face CSS
1024− for (name, url) in &doc.font_faces {
1025− let format_hint = if url.ends_with(".woff2") {
1026− " format('woff2')"
1027− } else if url.ends_with(".woff") {
1028− " format('woff')"
1029− } else if url.ends_with(".ttf") {
1030− " format('truetype')"
1031− } else if url.ends_with(".otf") {
1032− " format('opentype')"
1033− } else {
1034− ""
1035− };
1036− if dev {
1037− element_css.insert_str(0, &format!(
1038− "@font-face {{\n font-family: '{}';\n src: url('{}'){};\n font-display: swap;\n}}\n",
1039− name, url, format_hint
1040− ));
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()
10411050 } else {
1042− element_css.insert_str(
1043− 0,
1044− &format!(
1045− "@font-face{{font-family:'{}';src:url('{}'){};font-display:swap}}",
1046− name, url, format_hint
1047− ),
1048− );
1049− }
1050− }
1051−
1052− // JSON-LD blocks
1053− let json_ld_html: String = doc
1054− .json_ld_blocks
1055− .iter()
1056− .map(|block| {
1057− if dev {
1058− format!(
1059− "<script type=\"application/ld+json\">\n{}\n</script>\n",
1060− block
1061− )
1062− } else {
1063− format!("<script type=\"application/ld+json\">{}</script>", block)
1064− }
1065− })
1066− .collect();
1067−
1068− // Manifest link
1069− let manifest_html = if let Some(ref manifest) = doc.manifest {
1070− let mut json = String::from("{");
1071− json.push_str(&format!("\"name\":\"{}\",", manifest.name));
1072− if let Some(ref short) = manifest.short_name {
1073− json.push_str(&format!("\"short_name\":\"{}\",", short));
1074− }
1075− json.push_str(&format!("\"start_url\":\"{}\",", manifest.start_url));
1076− json.push_str(&format!("\"display\":\"{}\"", manifest.display));
1077− if let Some(ref bg) = manifest.background_color {
1078− json.push_str(&format!(",\"background_color\":\"{}\"", bg));
1079− }
1080− if let Some(ref tc) = manifest.theme_color {
1081− json.push_str(&format!(",\"theme_color\":\"{}\"", tc));
1082− }
1083− if let Some(ref desc) = manifest.description {
1084− json.push_str(&format!(",\"description\":\"{}\"", desc));
1085− }
1086− if !manifest.icons.is_empty() {
1087− json.push_str(",\"icons\":[");
1088− for (i, (src, sizes)) in manifest.icons.iter().enumerate() {
1089− if i > 0 {
1090− json.push(',');
1091− }
1092− json.push_str(&format!(
1093− "{{\"src\":\"{}\",\"sizes\":\"{}\",\"type\":\"image/png\"}}",
1094− src, sizes
1095− ));
1096− }
1097− json.push(']');
1098− }
1099− json.push('}');
1100−
1101− // Inline the manifest as a data URI
1102− let encoded = base64_encode(json.as_bytes());
1103− if dev {
1104− format!(
1105− "<link rel=\"manifest\" href=\"data:application/manifest+json;base64,{}\">\n",
1106− encoded
1107− )
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()
11081055 } else {
1109− format!(
1110− "<link rel=\"manifest\" href=\"data:application/manifest+json;base64,{}\">",
1111− encoded
1112− )
1113− }
1056+ "body{margin:0;font-family:system-ui,-apple-system,sans-serif;display:flex;flex-direction:column;min-height:100dvh}".to_string()
1057+ });
11141058 } else {
1115− String::new()
1116− };
1117−
1118− // Preload hints (auto-detect fonts from @font-face)
1119− let mut preload_html = String::new();
1120− for (_, url) in &doc.font_faces {
1121− if dev {
1122− preload_html.push_str(&format!(
1123− "<link rel=\"preload\" href=\"{}\" as=\"font\" type=\"font/woff2\" crossorigin>\n",
1124− url
1125− ));
1059+ rules.push(if dev {
1060+ format!("{own}, {own}::before, {own}::after {{ box-sizing: border-box; }}")
11261061 } else {
1127− preload_html.push_str(&format!(
1128− "<link rel=\"preload\" href=\"{}\" as=\"font\" type=\"font/woff2\" crossorigin>",
1129− url
1130− ));
1131− }
1132− }
1133− // Explicit preload hints from the document
1134− for hint in &doc.preload_hints {
1135− if dev {
1136− preload_html.push_str(&format!(
1137− "<link rel=\"preload\" href=\"{}\" as=\"{}\"{}>\n",
1138− html_escape(&hint.href),
1139− hint.as_type,
1140− if hint.crossorigin { " crossorigin" } else { "" }
1141− ));
1142− } else {
1143− preload_html.push_str(&format!(
1144− "<link rel=\"preload\" href=\"{}\" as=\"{}\"{}>",
1145− html_escape(&hint.href),
1146− hint.as_type,
1147− if hint.crossorigin { " crossorigin" } else { "" }
1148− ));
1149− }
1062+ format!("{own},{own}::before,{own}::after{{box-sizing:border-box}}")
1063+ });
11501064 }
1151−
1152− // Auto theme-color meta from @theme primary token
1153− let theme_color_html = doc
1154− .theme_tokens
1155− .iter()
1156− .find(|(name, _)| name == "primary" || name == "theme-color")
1157− .map(|(_, value)| {
1158− if dev {
1159− format!(
1160− "<meta name=\"theme-color\" content=\"{}\">\n",
1161− html_escape(value)
1162− )
1163− } else {
1164− format!(
1165− "<meta name=\"theme-color\" content=\"{}\">",
1166− html_escape(value)
1167− )
1168− }
1169− })
1170− .unwrap_or_default();
1171−
1172− // Focus-visible CSS for interactive elements (accessibility)
1173− let focus_visible_css = if ctx.has_interactive {
1174− if dev {
1175− "a:focus-visible, button:focus-visible, input:focus-visible, select:focus-visible, textarea:focus-visible { outline: 2px solid currentColor; outline-offset: 2px; }\n"
1176− } else {
1177− "a:focus-visible,button:focus-visible,input:focus-visible,select:focus-visible,textarea:focus-visible{outline:2px solid currentColor;outline-offset:2px}"
1178− }
1179− } else {
1180− ""
1181− };
1182−
1183− // Skip-to-content CSS (visually hidden but accessible)
1184− let skip_link_css = if has_main {
1185− if dev {
1186− ".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"
1187− } else {
1188− ".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}"
1189− }
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; }}")
11901069 } else {
1191− ""
1192− };
1193−
1194− // Noscript fallback: show deferred content if JS is disabled
1195− let noscript_html = if ctx.has_defer {
1196− if dev {
1197− "<noscript><style>.hl-defer-placeholder { display: none; }</style></noscript>\n"
1198− } else {
1199− "<noscript><style>.hl-defer-placeholder{display:none}</style></noscript>"
1200− }
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+ )
12011083 } else {
1202− ""
1203− };
1204−
1205− match &doc.page_title {
1206− Some(title) => {
1207− if dev {
1208− format!(
1209− "\
1210−<!DOCTYPE html>
1211−<html{lang_attr}>
1212−<head>
1213−<meta charset=\"utf-8\">
1214−<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">
1215−<title>{title}</title>
1216−{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}\
1217−<style>
1218−*, *::before, *::after {{ box-sizing: border-box; }}
1219−body {{ margin: 0; font-family: system-ui, -apple-system, sans-serif; }}
1220−img {{ display: block; }}
1221−a {{ text-decoration: none; color: inherit; }}
1222−{focus_visible_css}{skip_link_css}{element_css}\
1223−</style>
1224−{noscript_html}\
1225−</head>
1226−<body>
1227−{body}\
1228−</body>
1229−</html>
1230−",
1231− title = html_escape(title),
1232− lang_attr = lang_attr,
1233− theme_color_html = theme_color_html,
1234− base_html = base_html,
1235− canonical_html = canonical_html,
1236− manifest_html = manifest_html,
1237− preload_html = preload_html,
1238− dns_prefetch_html = dns_prefetch_html,
1239− meta_html = meta_html,
1240− favicon_html = favicon_html,
1241− json_ld_html = json_ld_html,
1242− head_html = head_html,
1243− og_html = og_html,
1244− focus_visible_css = focus_visible_css,
1245− skip_link_css = skip_link_css,
1246− noscript_html = noscript_html,
1247− element_css = element_css,
1248− body = body,
1249− )
1250− } else {
1251− format!(
1252− "<!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}}a{{text-decoration:none;color:inherit}}{focus_visible_css}{skip_link_css}{element_css}</style>{noscript_html}</head><body>{body}</body></html>",
1253− title = html_escape(title),
1254− lang_attr = lang_attr,
1255− theme_color_html = theme_color_html,
1256− base_html = base_html,
1257− canonical_html = canonical_html,
1258− manifest_html = manifest_html,
1259− preload_html = preload_html,
1260− dns_prefetch_html = dns_prefetch_html,
1261− meta_html = meta_html,
1262− og_html = og_html,
1263− favicon_html = favicon_html,
1264− json_ld_html = json_ld_html,
1265− head_html = head_html,
1266− focus_visible_css = focus_visible_css,
1267− skip_link_css = skip_link_css,
1268− noscript_html = noscript_html,
1269− element_css = element_css,
1270− body = body,
1271− )
1272− }
1273− }
1274− None => {
1275− if element_css.is_empty() {
1276− body
1277− } else if dev {
1278− format!("<style>\n{}</style>\n{}", element_css, body)
1279− } else {
1280− format!("<style>{}</style>{}", element_css, body)
1281− }
1282− }
1084+ format!("@layer {};@layer hl-reset{{{}}}", LAYERS.join(","), rules)
12831085 }
12841086}
12851087
12861088/// Generate an HTML fragment: body + optional <style>, no <html>/<head>/<body> wrapper.
1287−fn generate_partial_inner(doc: &Document, dev: bool) -> String {
1089+fn generate_partial_inner(doc: &Document, dev: bool, classes: &mut Vec<Class>) -> String {
12881090 let mut styles = StyleCollector::new();
12891091 let mut ctx = GenContext {
12901092 dev,
12911093 depth: 0,
1292− image_count: 0,
12931094 has_interactive: false,
1294− has_defer: false,
1095+ in_text: false,
1096+ flow: Flow::default(),
1097+ in_picture: false,
12951098 };
12961099 let mut body = String::new();
12971100
1298− for node in &doc.nodes {
1299− generate_node(node, None, &mut body, &mut styles, &mut ctx);
1300− }
1301−
1302− let has_custom_css = !doc.custom_css.is_empty();
1303− let mut element_css = String::new();
1304−
1305− let mut root_vars: Vec<(String, String)> = Vec::new();
1306− for (name, value) in &doc.css_vars {
1307− root_vars.push((name.clone(), value.clone()));
1308− }
1309− for (name, value) in &doc.theme_tokens {
1310− let css_name = format!("--{}", name);
1311− if !root_vars.iter().any(|(n, _)| *n == css_name) {
1312− root_vars.push((css_name, value.clone()));
1313− }
1314− }
1315−
1316− let styles_css = styles.to_css_formatted(dev, !has_custom_css);
1317− let styles_css = substitute_css_vars(&styles_css, &root_vars);
1318− let styles_css = if dev {
1319− styles_css
1320− } else {
1321− let (new_css, auto_vars) = auto_extract_repeats(&styles_css, &root_vars);
1322− root_vars.extend(auto_vars);
1323− new_css
1324− };
1325−
1326− if !root_vars.is_empty() {
1327− if dev {
1328− element_css.push_str(":root {\n");
1329− for (name, value) in &root_vars {
1330− element_css.push_str(&format!(" {}: {};\n", name, value));
1331− }
1332− element_css.push_str("}\n");
1333− } else {
1334− element_css.push_str(":root{");
1335− for (name, value) in &root_vars {
1336− element_css.push_str(name);
1337− element_css.push(':');
1338− element_css.push_str(value);
1339− element_css.push(';');
1340− }
1341− element_css.push('}');
1342− }
1343− }
1344−
1345− element_css.push_str(&styles_css);
1346−
1347− for (name, kf_body) in &doc.keyframes {
1348− if dev {
1349− element_css.push_str(&format!("@keyframes {} {{\n{}\n}}\n", name, kf_body));
1350− } else {
1351− element_css.push_str(&format!("@keyframes {}{{{}}}", name, kf_body));
1352− }
1353− }
1101+ generate_children(&doc.nodes, None, &mut body, &mut styles, &mut ctx);
13541102
1355− for block in &doc.custom_css {
1356− if dev {
1357− element_css.push_str(block);
1358− element_css.push('\n');
1359− } else {
1360− let minified: String = block.lines().map(|l| l.trim()).collect::<Vec<_>>().join("");
1361− element_css.push_str(&minified);
1362− }
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, ""));
13631108 }
1109+ classes.extend(styles.classes());
13641110
13651111 if element_css.is_empty() {
13661112 body
@@ -1375,44 +1121,20 @@ fn generate_partial_inner(doc: &Document, dev: bool) -> String {
13751121// Node generation
13761122// ---------------------------------------------------------------------------
13771123
1124+/// Write `node`, which is inside an element with the layout `parent`
1125+/// (`None` at the top of the page).
13781126fn generate_node(
13791127 node: &Node,
1380− parent_kind: Option<&ElementKind>,
1128+ parent: Option<Layout>,
13811129 out: &mut String,
13821130 styles: &mut StyleCollector,
13831131 ctx: &mut GenContext,
13841132) {
13851133 match node {
1386− Node::Element(elem) => generate_element(elem, parent_kind, out, styles, ctx),
1134+ Node::Element(elem) => generate_element(elem, parent, out, styles, ctx),
13871135 Node::Text(segments) => {
1388− let needs_wrap = matches!(
1389− parent_kind,
1390− Some(ElementKind::Row)
1391− | Some(ElementKind::Column)
1392− | Some(ElementKind::El)
1393− | Some(ElementKind::Nav)
1394− | Some(ElementKind::Header)
1395− | Some(ElementKind::Footer)
1396− | Some(ElementKind::Main)
1397− | Some(ElementKind::Section)
1398− | Some(ElementKind::Article)
1399− | Some(ElementKind::Aside)
1400− | Some(ElementKind::ListItem)
1401− | Some(ElementKind::Form)
1402− | Some(ElementKind::Details)
1403− | Some(ElementKind::Figure)
1404− | Some(ElementKind::Blockquote)
1405− | Some(ElementKind::Dialog)
1406− | Some(ElementKind::DefinitionList)
1407− | Some(ElementKind::DefinitionDescription)
1408− | Some(ElementKind::Fieldset)
1409− | Some(ElementKind::Datalist)
1410− | Some(ElementKind::Grid)
1411− | Some(ElementKind::Stack)
1412− | Some(ElementKind::Noscript)
1413− | Some(ElementKind::Address)
1414− | Some(ElementKind::Search)
1415− );
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);
14161138 if needs_wrap {
14171139 out.push_str(&ctx.indent());
14181140 out.push_str("<span>");
@@ -1431,209 +1153,191 @@ fn generate_node(
14311153 }
14321154}
14331155
1434−/// HTML attributes that are passed through to the HTML tag rather than converted to CSS.
1435−const HTML_PASSTHROUGH_ATTRS: &[&str] = &[
1436− "type",
1437− "placeholder",
1438− "name",
1439− "value",
1440− "disabled",
1441− "required",
1442− "checked",
1443− "for",
1444− "action",
1445− "method",
1446− "autocomplete",
1447− "min",
1448− "max",
1449− "step",
1450− "pattern",
1451− "maxlength",
1452− "rows",
1453− "cols",
1454− "multiple",
1455− "alt",
1456− "role",
1457− "tabindex",
1458− "title",
1459− "autofocus",
1460− // Media
1461− "controls",
1462− "autoplay",
1463− "loop",
1464− "muted",
1465− "playsinline",
1466− "poster",
1467− "preload",
1468− // Image optimization
1469− "loading",
1470− "decoding",
1471− // Media src (explicit attribute form)
1472− "src",
1473− // New element attributes
1474− "datetime",
1475− "media",
1476− "sizes",
1477− "srcset",
1478− "list",
1479− // Details
1480− "open",
1481− // Form
1482− "novalidate",
1483− // Progress/Meter
1484− "low",
1485− "high",
1486− "optimum",
1487− // Table
1488− "colspan",
1489− "rowspan",
1490− "scope",
1491− // Popover API
1492− "popover",
1493− "popovertarget",
1494− "popovertargetaction",
1495− // Modern form/input hints
1496− "inputmode",
1497− "enterkeyhint",
1498− // Performance hints
1499− "fetchpriority",
1500− "blocking",
1501− // Global attrs
1502− "translate",
1503− "spellcheck",
1504− // ARIA live regions
1505− "aria-live",
1506− "aria-atomic",
1507− "aria-relevant",
1508−];
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+}
15091170
1510−/// Boolean HTML attributes (rendered without a value, e.g., `<input disabled>`).
1511−const BOOLEAN_HTML_ATTRS: &[&str] = &[
1512− "disabled",
1513− "required",
1514− "checked",
1515− "multiple",
1516− "controls",
1517− "autoplay",
1518− "loop",
1519− "muted",
1520− "playsinline",
1521− "open",
1522− "novalidate",
1523− "autofocus",
1524− "defer",
1525− "async",
1526− "nomodule",
1527− // Popover
1528− "popover",
1529−];
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+}
15301183
1531−fn emit_html_passthrough_attrs(out: &mut String, attrs: &[Attribute]) {
1532− for attr in attrs {
1533− let key = attr.key.as_str();
1534− let is_passthrough = HTML_PASSTHROUGH_ATTRS.contains(&key)
1535− || key.starts_with("aria-")
1536− || key.starts_with("data-");
1537− if !is_passthrough {
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);
15381201 continue;
15391202 }
1540− if BOOLEAN_HTML_ATTRS.contains(&key) && attr.value.is_none() {
1541− out.push(' ');
1542− out.push_str(key);
1543− } else if let Some(val) = &attr.value {
1544− out.push(' ');
1545− out.push_str(key);
1546− out.push_str("=\"");
1547− out.push_str(&html_escape(strip_string_quotes(val)));
1548− out.push('"');
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);
1215+ continue;
15491216 }
1217+ *previous = Some(matches!(child, Node::Text(_)));
15501218 }
15511219}
15521220
1553−/// If the value is wrapped in a single pair of matching quotes (e.g.
1554−/// `"Avatar"`), return the inner content. Quotes act as source-level
1555−/// delimiters in the `.hl` syntax and shouldn't leak into HTML attribute
1556−/// values. Multi-quoted values like `"h h" "s m"` are left unchanged —
1557−/// those are real string tokens (used e.g. by CSS `grid-template-areas`).
1558−fn strip_string_quotes(val: &str) -> &str {
1559− let bytes = val.as_bytes();
1560− if bytes.len() < 2 {
1561− return val;
1562− }
1563− let first = bytes[0];
1564− let last = bytes[bytes.len() - 1];
1565− if (first == b'"' && last == b'"') || (first == b'\'' && last == b'\'') {
1566− let inner = &val[1..val.len() - 1];
1567− if !inner.as_bytes().contains(&first) {
1568− return inner;
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);
15691266 }
15701267 }
1571− val
1268+}
1269+
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+ }
15721295}
15731296
15741297// True if any direct child is `@in-front` or `@behind`. Such children render
15751298// as absolutely positioned overlays, so the parent automatically becomes a
15761299// positioning context (position:relative + isolation:isolate).
15771300fn has_overlay_children(elem: &Element) -> bool {
1578− elem.children.iter().any(|child| {
1301+ holds_overlays(&elem.children)
1302+}
1303+
1304+fn holds_overlays(children: &[Node]) -> bool {
1305+ children.iter().any(|child| {
15791306 matches!(
15801307 child,
1581− Node::Element(e) if matches!(e.kind, ElementKind::InFront | ElementKind::Behind)
1308+ Node::Element(e) if e.kind.is_tag("in-front") || e.kind.is_tag("behind")
15821309 )
15831310 })
15841311}
15851312
15861313fn generate_element(
15871314 elem: &Element,
1588− parent_kind: Option<&ElementKind>,
1315+ parent: Option<Layout>,
15891316 out: &mut String,
15901317 styles: &mut StyleCollector,
15911318 ctx: &mut GenContext,
15921319) {
15931320 // Self-closing elements
1594− if matches!(
1595− elem.kind,
1596− ElementKind::Image
1597− | ElementKind::Input
1598− | ElementKind::HorizontalRule
1599− | ElementKind::Source
1600− | ElementKind::Spacer
1601− ) {
1602− generate_self_closing(elem, parent_kind, out, styles, ctx);
1321+ if elem.kind.layout() == Layout::Void {
1322+ generate_self_closing(elem, parent, out, styles, ctx);
16031323 return;
16041324 }
1605− // @script renders as <script> with raw body content (no HTML escaping)
1606− if elem.kind == ElementKind::Script {
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);
16071329 out.push_str(&ctx.indent());
1608− out.push_str("<script");
1609− // Pass through src, type, defer, async, etc.
1610− for attr in &elem.attrs {
1611− let key = attr.key.as_str();
1612− if matches!(
1613− key,
1614− "src"
1615− | "type"
1616− | "defer"
1617− | "async"
1618− | "crossorigin"
1619− | "integrity"
1620− | "nomodule"
1621− | "id"
1622− ) {
1623− if let Some(val) = &attr.value {
1624− out.push(' ');
1625− out.push_str(key);
1626− out.push_str("=\"");
1627− out.push_str(&html_escape(val));
1628− out.push('"');
1629− } else {
1630− out.push(' ');
1631− out.push_str(key);
1632− }
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)));
16331337 }
16341338 }
1339+ emit_html_attrs(out, &elem.attrs);
16351340 out.push('>');
1636− // Children are raw JS code, not HTML
16371341 for child in &elem.children {
16381342 match child {
16391343 Node::Text(segments) => {
@@ -1647,46 +1351,10 @@ fn generate_element(
16471351 _ => {}
16481352 }
16491353 }
1650− out.push_str("</script>");
1651− out.push_str(ctx.nl());
1652− return;
1653− }
1654− // @breadcrumb generates semantic <nav aria-label="breadcrumb"><ol>...</ol></nav>
1655− if elem.kind == ElementKind::Breadcrumb {
1656− let gen_class = compute_class(&elem.attrs, &elem.kind, parent_kind, styles, false);
1657− let (id, user_class) = extract_id_class(&elem.attrs);
1658− out.push_str(&ctx.indent());
1659− out.push_str("<nav aria-label=\"breadcrumb\"");
1660− emit_class_attr(out, gen_class.as_deref(), user_class.as_deref());
1661− if let Some(id) = id {
1662− out.push_str(" id=\"");
1663− out.push_str(&html_escape(&id));
1664− out.push('"');
1665− }
1354+ out.push_str("</");
1355+ out.push_str(tag);
16661356 out.push('>');
16671357 out.push_str(ctx.nl());
1668− ctx.depth += 1;
1669− out.push_str(&ctx.indent());
1670− out.push_str("<ol>");
1671− out.push_str(ctx.nl());
1672− ctx.depth += 1;
1673− for child in &elem.children {
1674− out.push_str(&ctx.indent());
1675− out.push_str("<li>");
1676− let mut buf = String::new();
1677− generate_node(child, Some(&elem.kind), &mut buf, styles, ctx);
1678− out.push_str(buf.trim());
1679− out.push_str("</li>");
1680− out.push_str(ctx.nl());
1681− }
1682− ctx.depth -= 1;
1683− out.push_str(&ctx.indent());
1684− out.push_str("</ol>");
1685− out.push_str(ctx.nl());
1686− ctx.depth -= 1;
1687− out.push_str(&ctx.indent());
1688− out.push_str("</nav>");
1689− out.push_str(ctx.nl());
16901358 return;
16911359 }
16921360 if elem.kind == ElementKind::Children {
@@ -1696,209 +1364,38 @@ fn generate_element(
16961364 return;
16971365 }
16981366 if elem.kind == ElementKind::Fragment {
1699− // Render children without a wrapper element
1700− for child in &elem.children {
1701− generate_node(child, parent_kind, out, styles, ctx);
1702− }
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);
17031370 return;
17041371 }
17051372
1373+ let mut own = Flow::of(elem);
17061374 let tag = match &elem.kind {
1707− ElementKind::Row
1708− | ElementKind::Column
1709− | ElementKind::El
1710− | ElementKind::Grid
1711− | ElementKind::Stack
1712− | ElementKind::InFront
1713− | ElementKind::Behind => "div",
1375+ ElementKind::Row | ElementKind::El => "div",
17141376 ElementKind::Text => "span",
17151377 ElementKind::Paragraph => "p",
17161378 ElementKind::Link => "a",
1717− ElementKind::Button => "button",
1718− ElementKind::Select => "select",
1719− ElementKind::Textarea => "textarea",
1720− ElementKind::Option => "option",
1721− ElementKind::Label => "label",
1722− // Semantic elements
1723− ElementKind::Nav => "nav",
1724− ElementKind::Header => "header",
1725− ElementKind::Footer => "footer",
1726− ElementKind::Main => "main",
1727− ElementKind::Section => "section",
1728− ElementKind::Article => "article",
1729− ElementKind::Aside => "aside",
1730− // List
1731− ElementKind::List => {
1732− if elem.attrs.iter().any(|a| a.key == "ordered") {
1733− "ol"
1734− } else {
1735− "ul"
1736− }
1737− }
1738− ElementKind::ListItem => "li",
1739− // Table
1740− ElementKind::Table => "table",
1741− ElementKind::TableHead => "thead",
1742− ElementKind::TableBody => "tbody",
1743− ElementKind::TableRow => "tr",
1744− ElementKind::TableCell => "td",
1745− ElementKind::TableHeaderCell => "th",
1746− // Media
1747− ElementKind::Video => "video",
1748− ElementKind::Audio => "audio",
1749− // Additional semantic elements
1750− ElementKind::Form => "form",
1751− ElementKind::Details => "details",
1752− ElementKind::Summary => "summary",
1753− ElementKind::Blockquote => "blockquote",
1754− ElementKind::Cite => "cite",
1755− ElementKind::Code => "code",
1756− ElementKind::Pre => "pre",
1757− ElementKind::Figure => "figure",
1758− ElementKind::FigCaption => "figcaption",
1759− ElementKind::Progress => "progress",
1760− ElementKind::Meter => "meter",
1761− // New elements
1762− ElementKind::Dialog => "dialog",
1763− ElementKind::DefinitionList => "dl",
1764− ElementKind::DefinitionTerm => "dt",
1765− ElementKind::DefinitionDescription => "dd",
1766− ElementKind::Fieldset => "fieldset",
1767− ElementKind::Legend => "legend",
1768− ElementKind::Picture => "picture",
1769− ElementKind::Time => "time",
1770− ElementKind::Mark => "mark",
1771− ElementKind::Kbd => "kbd",
1772− ElementKind::Abbr => "abbr",
1773− ElementKind::Datalist => "datalist",
1774− ElementKind::Iframe => "iframe",
1775− ElementKind::Output => "output",
1776− ElementKind::Canvas => "canvas",
1777− ElementKind::Badge => "span",
1778− ElementKind::Tooltip => "span",
1779− ElementKind::Avatar => "div",
1780− ElementKind::Carousel => "div",
1781− ElementKind::Chip => "span",
1782− ElementKind::Tag => "span",
1783− ElementKind::Noscript => "noscript",
1784− ElementKind::Address => "address",
1785− ElementKind::Search => "search",
1786− // Heading elements
1787− ElementKind::H1 => "h1",
1788− ElementKind::H2 => "h2",
1789− ElementKind::H3 => "h3",
1790− ElementKind::H4 => "h4",
1791− ElementKind::H5 => "h5",
1792− ElementKind::H6 => "h6",
1793− ElementKind::Image
1794− | ElementKind::Input
1795− | ElementKind::HorizontalRule
1796− | ElementKind::Children
1797− | ElementKind::Slot(_)
1798− | ElementKind::Fragment
1799− | ElementKind::Source
1800− | ElementKind::Spacer
1801− | ElementKind::Script
1802− | ElementKind::Breadcrumb => unreachable!(),
1803− };
1804−
1805− let kind_label = match elem.kind {
1806− ElementKind::Row => "row",
1807− ElementKind::Column => "column",
1808− ElementKind::El => "el",
1809− ElementKind::Text => "text",
1810− ElementKind::Paragraph => "paragraph",
1811− ElementKind::Link => "link",
1812− ElementKind::Button => "button",
1813− ElementKind::Select => "select",
1814− ElementKind::Textarea => "textarea",
1815− ElementKind::Option => "option",
1816− ElementKind::Label => "label",
1817− ElementKind::Nav => "nav",
1818− ElementKind::Header => "header",
1819− ElementKind::Footer => "footer",
1820− ElementKind::Main => "main",
1821− ElementKind::Section => "section",
1822− ElementKind::Article => "article",
1823− ElementKind::Aside => "aside",
1824− ElementKind::List => "list",
1825− ElementKind::ListItem => "item",
1826− ElementKind::Table => "table",
1827− ElementKind::TableHead => "thead",
1828− ElementKind::TableBody => "tbody",
1829− ElementKind::TableRow => "tr",
1830− ElementKind::TableCell => "td",
1831− ElementKind::TableHeaderCell => "th",
1832− ElementKind::Video => "video",
1833− ElementKind::Audio => "audio",
1834− ElementKind::Form => "form",
1835− ElementKind::Details => "details",
1836− ElementKind::Summary => "summary",
1837− ElementKind::Blockquote => "blockquote",
1838− ElementKind::Cite => "cite",
1839− ElementKind::Code => "code",
1840− ElementKind::Pre => "pre",
1841− ElementKind::Figure => "figure",
1842− ElementKind::FigCaption => "figcaption",
1843− ElementKind::Fragment => "fragment",
1844− ElementKind::Dialog => "dialog",
1845− ElementKind::DefinitionList => "dl",
1846− ElementKind::DefinitionTerm => "dt",
1847− ElementKind::DefinitionDescription => "dd",
1848− ElementKind::Fieldset => "fieldset",
1849− ElementKind::Legend => "legend",
1850− ElementKind::Picture => "picture",
1851− ElementKind::Time => "time",
1852− ElementKind::Mark => "mark",
1853− ElementKind::Kbd => "kbd",
1854− ElementKind::Abbr => "abbr",
1855− ElementKind::Datalist => "datalist",
1856− ElementKind::Iframe => "iframe",
1857− ElementKind::Output => "output",
1858− ElementKind::Canvas => "canvas",
1859− ElementKind::Grid => "grid",
1860− ElementKind::Stack => "stack",
1861− ElementKind::Badge => "badge",
1862− ElementKind::Tooltip => "tooltip",
1863− ElementKind::Avatar => "avatar",
1864− ElementKind::Carousel => "carousel",
1865− ElementKind::Chip => "chip",
1866− ElementKind::Tag => "tag",
1867− ElementKind::Noscript => "noscript",
1868− ElementKind::Address => "address",
1869− ElementKind::Search => "search",
1870− ElementKind::InFront => "in-front",
1871− ElementKind::Behind => "behind",
1872− ElementKind::H1 => "h1",
1873− ElementKind::H2 => "h2",
1874− ElementKind::H3 => "h3",
1875− ElementKind::H4 => "h4",
1876− ElementKind::H5 => "h5",
1877− ElementKind::H6 => "h6",
1379+ ElementKind::Tag(spec) => spec.html,
18781380 _ => "",
18791381 };
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();
18801388
18811389 // Track interactive elements for focus-visible CSS
1882− if matches!(
1883− elem.kind,
1884− ElementKind::Link
1885− | ElementKind::Button
1886− | ElementKind::Input
1887− | ElementKind::Select
1888− | ElementKind::Textarea
1889− ) {
1390+ if elem.kind == ElementKind::Link
1391+ || matches!(kind_label, "button" | "input" | "select" | "textarea")
1392+ {
18901393 ctx.has_interactive = true;
18911394 }
18921395
18931396 // Compute CSS for each state and get a class name
1894− let overlay_children = has_overlay_children(elem);
1895− let gen_class = compute_class(
1896− &elem.attrs,
1897− &elem.kind,
1898− parent_kind,
1899− styles,
1900− overlay_children,
1901− );
1397+ let gen_class = element_class(elem, &Site::new(elem, parent, &ctx.flow), styles);
1398+ own.class = gen_class.clone();
19021399 let (id, user_class) = extract_id_class(&elem.attrs);
19031400
19041401 if ctx.dev && elem.line_num > 0 {
@@ -1912,93 +1409,17 @@ fn generate_element(
19121409 out.push('<');
19131410 out.push_str(tag);
19141411
1915− // @main gets id="hl-main" for skip-to-content link (unless user set an id)
1916− if elem.kind == ElementKind::Main && id.is_none() {
1917− out.push_str(" id=\"hl-main\"");
1918− }
1412+ emit_argument_attr(out, elem, ctx.in_picture);
19191413
1920− if elem.kind == ElementKind::Link
1921− && let Some(url) = &elem.argument
1922− {
1923− out.push_str(" href=\"");
1924− out.push_str(&html_escape(url));
1414+ emit_class_attr(out, gen_class.as_deref(), user_class.as_deref());
1415+
1416+ if let Some(id) = id {
1417+ out.push_str(" id=\"");
1418+ out.push_str(&html_escape(&id));
19251419 out.push('"');
1926− // Auto rel="noopener noreferrer" and target="_blank" for external links
1927− let is_external = url.starts_with("http://") || url.starts_with("https://");
1928− if is_external {
1929− let has_rel = elem.attrs.iter().any(|a| a.key == "rel");
1930− let has_target = elem.attrs.iter().any(|a| a.key == "target");
1931− if !has_rel {
1932− out.push_str(" rel=\"noopener noreferrer\"");
1933− }
1934− if !has_target {
1935− out.push_str(" target=\"_blank\"");
1936− }
1937− }
19381420 }
19391421
1940− // Video/Audio src
1941− if matches!(elem.kind, ElementKind::Video | ElementKind::Audio)
1942− && let Some(src) = &elem.argument
1943− {
1944− out.push_str(" src=\"");
1945− out.push_str(&html_escape(src));
1946− out.push('"');
1947− }
1948−
1949− // Form action
1950− if elem.kind == ElementKind::Form
1951− && let Some(action) = &elem.argument
1952− {
1953− out.push_str(" action=\"");
1954− out.push_str(&html_escape(action));
1955− out.push('"');
1956− }
1957−
1958− // Iframe src
1959− if elem.kind == ElementKind::Iframe
1960− && let Some(src) = &elem.argument
1961− {
1962− out.push_str(" src=\"");
1963− out.push_str(&html_escape(src));
1964− out.push('"');
1965− }
1966−
1967− // Tooltip title
1968− if elem.kind == ElementKind::Tooltip
1969− && let Some(text) = &elem.argument
1970− {
1971− out.push_str(" title=\"");
1972− out.push_str(&html_escape(text));
1973− out.push('"');
1974− }
1975−
1976− // Critical CSS: inline styles directly instead of using a class
1977− let is_critical = elem.attrs.iter().any(|a| a.key == "critical");
1978− if is_critical {
1979− let inline_css = attrs_to_css(&elem.attrs, "", &elem.kind, parent_kind, overlay_children);
1980− if !inline_css.is_empty() {
1981− out.push_str(" style=\"");
1982− out.push_str(&html_escape(&inline_css));
1983− out.push('"');
1984− }
1985− // Still use class for non-base styles (pseudo, responsive, etc.)
1986− if gen_class.as_deref().is_some_and(|c| !c.is_empty()) {
1987− emit_class_attr(out, gen_class.as_deref(), user_class.as_deref());
1988− } else if let Some(ref uc) = user_class {
1989− emit_class_attr(out, None, Some(uc));
1990− }
1991− } else {
1992− emit_class_attr(out, gen_class.as_deref(), user_class.as_deref());
1993− }
1994−
1995− if let Some(id) = id {
1996− out.push_str(" id=\"");
1997− out.push_str(&html_escape(&id));
1998− out.push('"');
1999− }
2000−
2001− emit_html_passthrough_attrs(out, &elem.attrs);
1422+ emit_html_attrs(out, &elem.attrs);
20021423
20031424 // Source map attributes in dev mode
20041425 if ctx.dev && elem.line_num > 0 {
@@ -2009,66 +1430,27 @@ fn generate_element(
20091430 }
20101431
20111432 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");
20121438 out.push_str(ctx.nl());
20131439
2014− // Inline text argument
2015− if matches!(
2016− elem.kind,
2017− ElementKind::Text
2018− | ElementKind::Button
2019− | ElementKind::Label
2020− | ElementKind::Option
2021− | ElementKind::Textarea
2022− | ElementKind::ListItem
2023− | ElementKind::TableCell
2024− | ElementKind::TableHeaderCell
2025− | ElementKind::Summary
2026− | ElementKind::Cite
2027− | ElementKind::Code
2028− | ElementKind::FigCaption
2029− | ElementKind::Legend
2030− | ElementKind::DefinitionTerm
2031− | ElementKind::Mark
2032− | ElementKind::Kbd
2033− | ElementKind::Abbr
2034− | ElementKind::Time
2035− | ElementKind::DefinitionDescription
2036− | ElementKind::Badge
2037− | ElementKind::Tooltip
2038− | ElementKind::Chip
2039− | ElementKind::Tag
2040− | ElementKind::H1
2041− | ElementKind::H2
2042− | ElementKind::H3
2043− | ElementKind::H4
2044− | ElementKind::H5
2045− | ElementKind::H6
2046− ) && let Some(text) = &elem.argument
2047− {
2048− out.push_str(&html_escape(text));
2049− }
2050−
2051− // Children
1440+ let layout = elem.kind.layout();
20521441 ctx.depth += 1;
2053− let is_paragraph = matches!(
2054− elem.kind,
2055− ElementKind::Paragraph
2056− | ElementKind::H1
2057− | ElementKind::H2
2058− | ElementKind::H3
2059− | ElementKind::H4
2060− | ElementKind::H5
2061− | ElementKind::H6
2062− );
2063− for (i, child) in elem.children.iter().enumerate() {
2064− generate_node(child, Some(&elem.kind), out, styles, ctx);
2065− if is_paragraph && i < elem.children.len() - 1 {
2066− out.push(' ');
2067− }
2068− }
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;
20691450 ctx.depth -= 1;
20701451
20711452 out.push_str(&ctx.indent());
1453+ ctx.dev = outer_dev;
20721454 out.push_str("</");
20731455 out.push_str(tag);
20741456 out.push('>');
@@ -2077,21 +1459,18 @@ fn generate_element(
20771459
20781460fn generate_self_closing(
20791461 elem: &Element,
2080− parent_kind: Option<&ElementKind>,
1462+ parent: Option<Layout>,
20811463 out: &mut String,
20821464 styles: &mut StyleCollector,
20831465 ctx: &mut GenContext,
20841466) {
2085− let gen_class = compute_class(&elem.attrs, &elem.kind, parent_kind, styles, false);
1467+ let gen_class = element_class(elem, &Site::new(elem, parent, &ctx.flow), styles);
20861468 let (id, user_class) = extract_id_class(&elem.attrs);
20871469
2088− let (tag, kind_label) = match elem.kind {
1470+ let (tag, kind_label) = match &elem.kind {
20891471 ElementKind::Image => ("img", "image"),
2090− ElementKind::Input => ("input", "input"),
2091− ElementKind::HorizontalRule => ("hr", "hr"),
2092− ElementKind::Source => ("source", "source"),
2093− ElementKind::Spacer => ("div", "spacer"),
2094− _ => unreachable!(),
1472+ ElementKind::Tag(spec) => (spec.html, spec.name),
1473+ _ => unreachable!("not a void element: {:?}", elem.kind),
20951474 };
20961475
20971476 if ctx.dev && elem.line_num > 0 {
@@ -2104,43 +1483,7 @@ fn generate_self_closing(
21041483 out.push_str(&ctx.indent());
21051484 out.push('<');
21061485 out.push_str(tag);
2107−
2108− // Image src (with optional non-SVG base64 inlining)
2109− if elem.kind == ElementKind::Image {
2110− let src = elem.argument.as_deref().unwrap_or("");
2111− let is_inline = elem.attrs.iter().any(|a| a.key == "inline");
2112− if is_inline && !src.is_empty() && !src.ends_with(".svg") {
2113− let mime = if src.ends_with(".png") {
2114− "image/png"
2115− } else if src.ends_with(".jpg") || src.ends_with(".jpeg") {
2116− "image/jpeg"
2117− } else if src.ends_with(".gif") {
2118− "image/gif"
2119− } else if src.ends_with(".webp") {
2120− "image/webp"
2121− } else if src.ends_with(".avif") {
2122− "image/avif"
2123− } else {
2124− "application/octet-stream"
2125− };
2126− if let Ok(data) = std::fs::read(src) {
2127− let b64 = base64_encode(&data);
2128− out.push_str(" src=\"data:");
2129− out.push_str(mime);
2130− out.push_str(";base64,");
2131− out.push_str(&b64);
2132− out.push('"');
2133− } else {
2134− out.push_str(" src=\"");
2135− out.push_str(&html_escape(src));
2136− out.push('"');
2137− }
2138− } else {
2139− out.push_str(" src=\"");
2140− out.push_str(&html_escape(src));
2141− out.push('"');
2142− }
2143− }
1486+ emit_argument_attr(out, elem, ctx.in_picture);
21441487
21451488 emit_class_attr(out, gen_class.as_deref(), user_class.as_deref());
21461489
@@ -2150,7 +1493,7 @@ fn generate_self_closing(
21501493 out.push('"');
21511494 }
21521495
2153− emit_html_passthrough_attrs(out, &elem.attrs);
1496+ emit_html_attrs(out, &elem.attrs);
21541497
21551498 // Source map attributes in dev mode (self-closing)
21561499 if ctx.dev && elem.line_num > 0 {
@@ -2160,93 +1503,6 @@ fn generate_self_closing(
21601503 ));
21611504 }
21621505
2163− // Image optimization: auto-add loading="lazy" and decoding="async"
2164− if elem.kind == ElementKind::Image {
2165− // SVG inlining: @image [inline] logo.svg
2166− if elem.attrs.iter().any(|a| a.key == "inline")
2167− && let Some(src) = &elem.argument
2168− && src.ends_with(".svg")
2169− && let Ok(svg_content) = std::fs::read_to_string(src)
2170− {
2171− // Close the tag we opened, then emit inline SVG instead
2172− out.truncate(out.rfind('<').unwrap_or(0));
2173− out.push_str(&ctx.indent());
2174− out.push_str(svg_content.trim());
2175− out.push_str(ctx.nl());
2176− return;
2177− }
2178− // Responsive srcset: @image photo.jpg [responsive 400 800 1200]
2179− let responsive_attr = elem.attrs.iter().find(|a| a.key == "responsive");
2180− if let Some(resp) = responsive_attr
2181− && let Some(ref sizes_str) = resp.value
2182− {
2183− let widths: Vec<&str> = sizes_str.split_whitespace().collect();
2184− if !widths.is_empty() {
2185− let src = elem.argument.as_deref().unwrap_or("");
2186− if !src.is_empty() {
2187− // Generate srcset with width descriptors
2188− // Convention: file-{width}.ext (e.g., photo-400.jpg)
2189− let dot_pos = src.rfind('.').unwrap_or(src.len());
2190− let base = &src[..dot_pos];
2191− let ext = &src[dot_pos..];
2192− let mut srcset_parts = Vec::new();
2193− for w in &widths {
2194− srcset_parts.push(format!("{}-{}{} {}w", base, w, ext, w));
2195− }
2196− out.push_str(" srcset=\"");
2197− out.push_str(&srcset_parts.join(", "));
2198− out.push('"');
2199− // Generate sizes attribute
2200− let max_width = widths.last().unwrap_or(&"100vw");
2201− out.push_str(&format!(
2202− " sizes=\"(max-width: {}px) 100vw, {}px\"",
2203− max_width, max_width
2204− ));
2205− }
2206− }
2207− }
2208−
2209− // Auto image dimensions: read local image file to inject width/height + aspect-ratio
2210− let has_width = elem.attrs.iter().any(|a| a.key == "width");
2211− let has_height = elem.attrs.iter().any(|a| a.key == "height");
2212− if (!has_width || !has_height)
2213− && let Some(ref src) = elem.argument
2214− && !src.starts_with("http://")
2215− && !src.starts_with("https://")
2216− && !src.starts_with("data:")
2217− && let Some((w, h)) = read_image_dimensions(src)
2218− {
2219− if !has_width {
2220− out.push_str(&format!(" width=\"{}\"", w));
2221− }
2222− if !has_height {
2223− out.push_str(&format!(" height=\"{}\"", h));
2224− }
2225− // Auto aspect-ratio to prevent CLS
2226− if !elem.attrs.iter().any(|a| a.key == "aspect-ratio") {
2227− out.push_str(&format!(" style=\"aspect-ratio:{}/{}\"", w, h));
2228− }
2229− }
2230−
2231− // Smart image loading: first 3 images get fetchpriority="high" (above the fold),
2232− // subsequent images get loading="lazy" + decoding="async"
2233− ctx.image_count += 1;
2234− if ctx.image_count <= 3 {
2235− // Above-the-fold: eager loading with high priority
2236− if !elem.attrs.iter().any(|a| a.key == "fetchpriority") {
2237− out.push_str(" fetchpriority=\"high\"");
2238− }
2239− } else {
2240− // Below-the-fold: lazy loading
2241− if !elem.attrs.iter().any(|a| a.key == "loading") {
2242− out.push_str(" loading=\"lazy\"");
2243− }
2244− if !elem.attrs.iter().any(|a| a.key == "decoding") {
2245− out.push_str(" decoding=\"async\"");
2246− }
2247− }
2248− }
2249−
22501506 out.push('>');
22511507 out.push_str(ctx.nl());
22521508}
@@ -2262,7 +1518,10 @@ fn generate_text_segments(
22621518 TextSegment::Plain(text) => out.push_str(&html_escape(text)),
22631519 TextSegment::Inline(elem) => {
22641520 let mut buf = String::new();
2265− generate_element(elem, None, &mut buf, styles, ctx);
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;
22661525 out.push_str(buf.trim_end());
22671526 }
22681527 }
@@ -2275,143 +1534,97 @@ fn generate_text_segments(
22751534
22761535fn compute_class(
22771536 attrs: &[Attribute],
2278− kind: &ElementKind,
2279− parent_kind: Option<&ElementKind>,
1537+ site: &Site,
22801538 styles: &mut StyleCollector,
2281− has_overlay_children: bool,
1539+ distinct: String,
22821540) -> Option<String> {
2283− let base = attrs_to_css(attrs, "", kind, parent_kind, has_overlay_children);
2284−
2285− // Collect pseudo-state overrides
2286− let mut pseudo = Vec::new();
2287− for &(prefix, selector) in PSEUDO_PREFIXES {
2288− let css = attrs_to_css(attrs, prefix, kind, parent_kind, has_overlay_children);
2289− if !css.is_empty() {
2290− pseudo.push((selector.to_string(), css));
2291− }
2292− }
2293−
2294− // Auto-add ::-webkit-scrollbar pseudo for no-scrollbar attribute
2295− if attrs.iter().any(|a| a.key == "no-scrollbar") {
2296− pseudo.push((
2297− "::-webkit-scrollbar".to_string(),
2298− "display:none;".to_string(),
2299− ));
2300− }
2301−
2302− // Collect nth:EXPR: dynamic pseudo selectors
2303− let mut nth_prefixes: Vec<String> = Vec::new();
2304− for attr in attrs {
2305− if attr.key.starts_with("nth:") {
2306− let rest = &attr.key[4..];
2307− if let Some(colon_pos) = rest.find(':') {
2308− let prefix = format!("nth:{}:", &rest[..colon_pos]);
2309− if !nth_prefixes.contains(&prefix) {
2310− nth_prefixes.push(prefix);
2311− }
2312− }
2313− }
2314− }
2315− for prefix in &nth_prefixes {
2316− let expr = &prefix[4..prefix.len() - 1];
2317− let selector = format!(":nth-child({})", expr);
2318− let css = attrs_to_css(attrs, prefix, kind, parent_kind, has_overlay_children);
2319− if !css.is_empty() {
2320− pseudo.push((selector, css));
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);
23211547 }
23221548 }
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+}
23231572
2324− // Collect has(...): dynamic pseudo selectors
2325− let mut has_prefixes: Vec<String> = Vec::new();
2326− for attr in attrs {
2327− if attr.key.starts_with("has(")
2328− && let Some(close) = attr.key.find("):")
2329− {
2330− let prefix = format!("{}:", &attr.key[..close + 1]);
2331− if !has_prefixes.contains(&prefix) {
2332− has_prefixes.push(prefix);
2333− }
2334− }
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;");
23351581 }
2336− for prefix in &has_prefixes {
2337− let inner = &prefix[4..prefix.len() - 2]; // extract selector from has(selector):
2338− let selector = format!(":has({})", inner);
2339− let css = attrs_to_css(attrs, prefix, kind, parent_kind, has_overlay_children);
2340− if !css.is_empty() {
2341− pseudo.push((selector, css));
2342− }
1582+ if !site.root {
1583+ css.push_str(layout_css(site.kind.layout(), site.inline));
23431584 }
1585+ css.push_str(site.kind.css());
1586+ css
1587+}
23441588
2345− // Collect responsive overrides
2346− let mut responsive = Vec::new();
2347− for &(bp_name, _) in BREAKPOINTS {
2348− let prefix = format!("{}:", bp_name);
2349− let css = attrs_to_css(attrs, &prefix, kind, parent_kind, has_overlay_children);
2350− if !css.is_empty() {
2351− responsive.push((bp_name.to_string(), css));
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;
23521597 }
2353− }
2354−
2355− // Collect container query overrides
2356− let mut container = Vec::new();
2357− for &(bp_name, _) in BREAKPOINTS {
2358− let prefix = format!("cq-{}:", bp_name);
2359− let css = attrs_to_css(attrs, &prefix, kind, parent_kind, has_overlay_children);
2360− if !css.is_empty() {
2361− container.push((bp_name.to_string(), css));
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;
1612+ }
1613+ _ => {}
1614+ }
23621615 }
2363− }
2364−
2365− let dark = attrs_to_css(attrs, "dark:", kind, parent_kind, has_overlay_children);
2366− let print = attrs_to_css(attrs, "print:", kind, parent_kind, has_overlay_children);
2367− let motion_safe = attrs_to_css(attrs, "motion-safe:", kind, parent_kind, has_overlay_children);
2368− let motion_reduce =
2369− attrs_to_css(attrs, "motion-reduce:", kind, parent_kind, has_overlay_children);
2370− let landscape = attrs_to_css(attrs, "landscape:", kind, parent_kind, has_overlay_children);
2371− let portrait = attrs_to_css(attrs, "portrait:", kind, parent_kind, has_overlay_children);
2372−
2373− // Dedupe: if a property is declared twice within a single rule, keep only
2374− // the last occurrence (element-kind defaults are written before
2375− // user attributes, so a user [list-style disc] correctly overrides the
2376− // default list-style:none, and we don't need to ship both).
2377− let base = dedupe_declarations(&base);
2378− let pseudo: Vec<(String, String)> = pseudo
2379− .into_iter()
2380− .map(|(sel, css)| (sel, dedupe_declarations(&css)))
2381− .collect();
2382− let responsive: Vec<(String, String)> = responsive
2383− .into_iter()
2384− .map(|(bp, css)| (bp, dedupe_declarations(&css)))
2385− .collect();
2386− let dark = dedupe_declarations(&dark);
2387− let print = dedupe_declarations(&print);
2388− let motion_safe = dedupe_declarations(&motion_safe);
2389− let motion_reduce = dedupe_declarations(&motion_reduce);
2390− let landscape = dedupe_declarations(&landscape);
2391− let portrait = dedupe_declarations(&portrait);
2392− let container: Vec<(String, String)> = container
2393− .into_iter()
2394− .map(|(bp, css)| (bp, dedupe_declarations(&css)))
2395− .collect();
2396−
2397− styles.get_class(
2398− base,
2399− pseudo,
2400− responsive,
2401− dark,
2402− print,
2403− motion_safe,
2404− motion_reduce,
2405− landscape,
2406− portrait,
2407− container,
2408− )
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+ })
24091621}
24101622
24111623/// Dedupe CSS declarations within a single rule body: for any property
24121624/// declared more than once, keep only the last occurrence. Unparseable
2413−/// segments (no `:`) are preserved as-is. Semicolons inside parentheses are
2414−/// treated as part of a value, not as declaration separators.
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.
24151628fn dedupe_declarations(css: &str) -> String {
24161629 if css.is_empty() {
24171630 return String::new();
@@ -2426,8 +1639,26 @@ fn dedupe_declarations(css: &str) -> String {
24261639 let mut decls: Vec<(Option<String>, String)> = Vec::new();
24271640 let mut current = String::new();
24281641 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;
24291646 for ch in css.chars() {
2430− if ch == '(' {
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 == '(' {
24311662 depth += 1;
24321663 current.push(ch);
24331664 } else if ch == ')' {
@@ -2460,1738 +1691,648 @@ fn dedupe_declarations(css: &str) -> String {
24601691 return css.to_string();
24611692 }
24621693
2463− // Find index of last occurrence of each property.
2464− use std::collections::HashMap;
2465− let mut last: HashMap<String, usize> = HashMap::new();
2466− for (i, (prop, _)) in decls.iter().enumerate() {
2467− if let Some(p) = prop {
2468− last.insert(p.clone(), i);
2469− }
2470− }
2471−
2472− let mut out = String::with_capacity(css.len());
2473− for (i, (prop, raw)) in decls.iter().enumerate() {
2474− let keep = match prop {
2475− Some(p) => last.get(p) == Some(&i),
2476− None => true,
2477− };
2478− if keep {
2479− out.push_str(raw);
2480− }
2481− }
2482− out
2483−}
2484−
2485−fn emit_class_attr(out: &mut String, gen_class: Option<&str>, user_class: Option<&str>) {
2486− match (gen_class, user_class) {
2487− (Some(g), Some(u)) => {
2488− out.push_str(" class=\"");
2489− out.push_str(g);
2490− out.push(' ');
2491− out.push_str(&html_escape(u));
2492− out.push('"');
2493− }
2494− (Some(g), None) => {
2495− out.push_str(" class=\"");
2496− out.push_str(g);
2497− out.push('"');
2498− }
2499− (None, Some(u)) => {
2500− out.push_str(" class=\"");
2501− out.push_str(&html_escape(u));
2502− out.push('"');
2503− }
2504− (None, None) => {}
2505− }
2506−}
2507−
2508−// ---------------------------------------------------------------------------
2509−// Attribute → CSS mapping
2510−// ---------------------------------------------------------------------------
2511−
2512−/// (htmlang prefix, CSS selector suffix)
2513−const PSEUDO_PREFIXES: &[(&str, &str)] = &[
2514− ("hover:", ":hover"),
2515− ("active:", ":active"),
2516− ("focus:", ":focus"),
2517− ("focus-visible:", ":focus-visible"),
2518− ("focus-within:", ":focus-within"),
2519− ("disabled:", ":disabled"),
2520− ("checked:", ":checked"),
2521− ("placeholder:", "::placeholder"),
2522− ("first:", ":first-child"),
2523− ("last:", ":last-child"),
2524− ("odd:", ":nth-child(odd)"),
2525− ("even:", ":nth-child(even)"),
2526− ("before:", "::before"),
2527− ("after:", "::after"),
2528− ("selection:", "::selection"),
2529− ("visited:", ":visited"),
2530− ("empty:", ":empty"),
2531− ("target:", ":target"),
2532− ("valid:", ":valid"),
2533− ("invalid:", ":invalid"),
2534−];
2535−const RESPONSIVE_PREFIXES: &[&str] = &["sm:", "md:", "lg:", "xl:", "2xl:"];
2536−const MEDIA_PREFIXES: &[&str] = &[
2537− "dark:",
2538− "print:",
2539− "motion-safe:",
2540− "motion-reduce:",
2541− "landscape:",
2542− "portrait:",
2543−];
2544−const CONTAINER_QUERY_PREFIXES: &[&str] = &["cq-sm:", "cq-md:", "cq-lg:", "cq-xl:", "cq-2xl:"];
2545−
2546−fn is_prefixed_attr(key: &str) -> bool {
2547− PSEUDO_PREFIXES.iter().any(|&(p, _)| key.starts_with(p))
2548− || RESPONSIVE_PREFIXES.iter().any(|p| key.starts_with(p))
2549− || MEDIA_PREFIXES.iter().any(|p| key.starts_with(p))
2550− || CONTAINER_QUERY_PREFIXES.iter().any(|p| key.starts_with(p))
2551− || key.starts_with("nth:")
2552− || key.starts_with("has(")
2553−}
2554−
2555−/// `display:flex;flex-direction:column;` — base layout for `@el` and every
2556−/// semantic wrapper that behaves like a column.
2557−const FLEX_COLUMN: &str = "display:flex;flex-direction:column;";
2558−
2559−/// Font stack shared by `@pre`, `@code`, `@kbd`.
2560−const MONOSPACE_STACK: &str = "font-family:ui-monospace,monospace;";
2561−
2562−/// Declarations common to `@badge` and `@tag`. They differ only in
2563−/// `border-radius` (and `@badge` additionally centers content / pins
2564−/// line-height:1), so keeping the shared base here avoids drift.
2565−const PILL_BASE: &str =
2566− "display:inline-flex;align-items:center;padding:2px 8px;font-size:0.75rem;font-weight:600;";
2567−
2568−fn attrs_to_css(
2569− attrs: &[Attribute],
2570− state_prefix: &str,
2571− kind: &ElementKind,
2572− parent_kind: Option<&ElementKind>,
2573− has_overlay_children: bool,
2574−) -> String {
2575− let mut css = String::new();
2576−
2577− // Base element styles only for the default (non-state) pass
2578− if state_prefix.is_empty() {
2579− // Elements with @in-front / @behind children become positioning
2580− // contexts. Pushed before user attrs so an explicit `position` wins
2581− // via dedupe (only the last declaration of a property is kept).
2582− if has_overlay_children {
2583− css.push_str("position:relative;isolation:isolate;");
2584− }
2585− match kind {
2586− ElementKind::Row => css.push_str("display:flex;flex-direction:row;"),
2587− ElementKind::Column
2588− | ElementKind::El
2589− // Semantic elements get flex column layout like @el
2590− | ElementKind::Nav
2591− | ElementKind::Header
2592− | ElementKind::Footer
2593− | ElementKind::Main
2594− | ElementKind::Section
2595− | ElementKind::Article
2596− | ElementKind::Aside
2597− | ElementKind::ListItem
2598− | ElementKind::Form
2599− | ElementKind::Details
2600− | ElementKind::Dialog => css.push_str(FLEX_COLUMN),
2601− ElementKind::Paragraph
2602− | ElementKind::H1
2603− | ElementKind::H2
2604− | ElementKind::H3
2605− | ElementKind::H4
2606− | ElementKind::H5
2607− | ElementKind::H6 => css.push_str("margin:0;"),
2608− // Lists: reset browser defaults
2609− ElementKind::List => css.push_str("margin:0;padding-left:0;list-style:none;"),
2610− // Figure / Blockquote: flex column with browser margin reset
2611− ElementKind::Figure | ElementKind::Blockquote => {
2612− css.push_str(FLEX_COLUMN);
2613− css.push_str("margin:0;");
2614− }
2615− // Pre: preserve whitespace
2616− ElementKind::Pre => {
2617− css.push_str("margin:0;white-space:pre;");
2618− css.push_str(MONOSPACE_STACK);
2619− }
2620− // Code / Kbd: monospace font
2621− ElementKind::Code | ElementKind::Kbd => css.push_str(MONOSPACE_STACK),
2622− ElementKind::DefinitionList => css.push_str("margin:0;"),
2623− ElementKind::DefinitionDescription => {
2624− css.push_str("margin:0;");
2625− css.push_str(FLEX_COLUMN);
2626− }
2627− ElementKind::Fieldset => {
2628− css.push_str(FLEX_COLUMN);
2629− // Align padding to the px-based scale used by Badge/Tag/Chip
2630− // rather than the old 0.5em (which depended on font-size).
2631− css.push_str("border:1px solid currentColor;padding:8px;margin:0;");
2632− }
2633− ElementKind::Grid => css.push_str("display:grid;"),
2634− ElementKind::Stack => css.push_str("position:relative;"),
2635− ElementKind::Badge => {
2636− css.push_str(PILL_BASE);
2637− css.push_str("justify-content:center;border-radius:9999px;line-height:1;");
2638− }
2639− ElementKind::Tag => {
2640− css.push_str(PILL_BASE);
2641− css.push_str("border-radius:4px;");
2642− }
2643− ElementKind::Tooltip => css.push_str("position:relative;cursor:help;"),
2644− ElementKind::Spacer => css.push_str("flex:1;"),
2645− ElementKind::Avatar => css.push_str("display:inline-flex;align-items:center;justify-content:center;border-radius:9999px;overflow:hidden;flex-shrink:0;"),
2646− 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;"),
2647− 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;"),
2648− // Overlay layers fill the parent. Parent gets position:relative
2649− // applied automatically (see has_overlay_children check below).
2650− ElementKind::InFront => {
2651− css.push_str(FLEX_COLUMN);
2652− css.push_str("position:absolute;inset:0;");
2653− }
2654− ElementKind::Behind => {
2655− css.push_str(FLEX_COLUMN);
2656− css.push_str("position:absolute;inset:0;z-index:-1;");
2657− }
2658− _ => {}
2659− }
2660− // Children of @carousel get scroll-snap-align and flex-shrink
2661− if matches!(parent_kind, Some(ElementKind::Carousel)) {
2662− css.push_str("scroll-snap-align:start;flex-shrink:0;");
2663− }
2664− }
2665−
2666− for attr in attrs {
2667− // Determine the effective key for this pass
2668− let effective_key = if state_prefix.is_empty() {
2669− if is_prefixed_attr(&attr.key) {
2670− continue;
2671− }
2672− attr.key.as_str()
2673− } else {
2674− match attr.key.strip_prefix(state_prefix) {
2675− Some(k) => k,
2676− None => continue,
2677− }
2678− };
2679−
2680− let val = attr.value.as_deref();
2681−
2682− match effective_key {
2683− // Layout
2684− "spacing" | "gap" => {
2685− if let Some(v) = val {
2686− push_css(&mut css, "gap", &css_px(v));
2687− }
2688− }
2689− "padding" => {
2690− if let Some(v) = val {
2691− push_css(&mut css, "padding", &css_px_multi(v));
2692− }
2693− }
2694− "padding-x" => {
2695− if let Some(v) = val {
2696− // Logical property covers both inline sides in one
2697− // declaration; for symmetric values this is visually
2698− // identical to padding-left/right in LTR and RTL.
2699− push_css(&mut css, "padding-inline", &css_px(v));
2700− }
2701− }
2702− "padding-y" => {
2703− if let Some(v) = val {
2704− push_css(&mut css, "padding-block", &css_px(v));
2705− }
2706− }
2707− "padding-top" => {
2708− if let Some(v) = val {
2709− push_css(&mut css, "padding-top", &css_px(v));
2710− }
2711− }
2712− "padding-bottom" => {
2713− if let Some(v) = val {
2714− push_css(&mut css, "padding-bottom", &css_px(v));
2715− }
2716− }
2717− "padding-left" => {
2718− if let Some(v) = val {
2719− push_css(&mut css, "padding-left", &css_px(v));
2720− }
2721− }
2722− "padding-right" => {
2723− if let Some(v) = val {
2724− push_css(&mut css, "padding-right", &css_px(v));
2725− }
2726− }
2727−
2728− // Sizing
2729− "width" => {
2730− if let Some(v) = val {
2731− match v {
2732− "fill" => match parent_kind {
2733− Some(ElementKind::Row) => {
2734− push_css(&mut css, "flex", "1");
2735− push_css(&mut css, "min-width", "0");
2736− }
2737− _ => push_css(&mut css, "width", "100%"),
2738− },
2739− "shrink" => push_css(&mut css, "flex-shrink", "0"),
2740− _ => push_css(&mut css, "width", &css_px(v)),
2741− }
2742− }
2743− }
2744− "height" => {
2745− if let Some(v) = val {
2746− match v {
2747− "fill" => match parent_kind {
2748− Some(ElementKind::Column) => {
2749− push_css(&mut css, "flex", "1");
2750− push_css(&mut css, "min-height", "0");
2751− }
2752− _ => push_css(&mut css, "height", "100%"),
2753− },
2754− "shrink" => push_css(&mut css, "flex-shrink", "0"),
2755− _ => push_css(&mut css, "height", &css_px(v)),
2756− }
2757− }
2758− }
2759− "min-width" => {
2760− if let Some(v) = val {
2761− push_css(&mut css, "min-width", &css_px(v));
2762− }
2763− }
2764− "max-width" => {
2765− if let Some(v) = val {
2766− push_css(&mut css, "max-width", &css_px(v));
2767− }
2768− }
2769− "min-height" => {
2770− if let Some(v) = val {
2771− push_css(&mut css, "min-height", &css_px(v));
2772− }
2773− }
2774− "max-height" => {
2775− if let Some(v) = val {
2776− push_css(&mut css, "max-height", &css_px(v));
2777− }
2778− }
2779−
2780− // Alignment
2781− "center-x" => match parent_kind {
2782− Some(ElementKind::Column) | Some(ElementKind::El) => {
2783− push_css(&mut css, "align-self", "center");
2784− }
2785− _ => {
2786− push_css(&mut css, "margin-left", "auto");
2787− push_css(&mut css, "margin-right", "auto");
2788− }
2789− },
2790− "center-y" => match parent_kind {
2791− Some(ElementKind::Row) => push_css(&mut css, "align-self", "center"),
2792− _ => {
2793− push_css(&mut css, "margin-top", "auto");
2794− push_css(&mut css, "margin-bottom", "auto");
2795− }
2796− },
2797− "align-left" => match parent_kind {
2798− Some(ElementKind::Column) | Some(ElementKind::El) => {
2799− push_css(&mut css, "align-self", "flex-start");
2800− }
2801− _ => push_css(&mut css, "margin-right", "auto"),
2802− },
2803− "align-right" => match parent_kind {
2804− Some(ElementKind::Column) | Some(ElementKind::El) => {
2805− push_css(&mut css, "align-self", "flex-end");
2806− }
2807− _ => push_css(&mut css, "margin-left", "auto"),
2808− },
2809− "align-top" => match parent_kind {
2810− Some(ElementKind::Row) => push_css(&mut css, "align-self", "flex-start"),
2811− _ => push_css(&mut css, "margin-bottom", "auto"),
2812− },
2813− "align-bottom" => match parent_kind {
2814− Some(ElementKind::Row) => push_css(&mut css, "align-self", "flex-end"),
2815− _ => push_css(&mut css, "margin-top", "auto"),
2816− },
2817−
2818− // Style
2819− "background" => {
2820− if let Some(v) = val {
2821− push_css(&mut css, "background", v);
2822− }
2823− }
2824− "color" => {
2825− if let Some(v) = val {
2826− push_css(&mut css, "color", v);
2827− }
2828− }
2829− "border" => {
2830− if let Some(v) = val {
2831− let parts: Vec<&str> = v.splitn(2, ' ').collect();
2832− if parts.len() == 2 {
2833− push_css(
2834− &mut css,
2835− "border",
2836− &format!("{} solid {}", css_px(parts[0]), parts[1]),
2837− );
2838− } else {
2839− push_css(
2840− &mut css,
2841− "border",
2842− &format!("{} solid currentColor", css_px(parts[0])),
2843− );
2844− }
2845− }
2846− }
2847− "border-top" | "border-bottom" | "border-left" | "border-right" => {
2848− if let Some(v) = val {
2849− let parts: Vec<&str> = v.splitn(2, ' ').collect();
2850− if parts.len() == 2 {
2851− push_css(
2852− &mut css,
2853− effective_key,
2854− &format!("{} solid {}", css_px(parts[0]), parts[1]),
2855− );
2856− } else {
2857− push_css(
2858− &mut css,
2859− effective_key,
2860− &format!("{} solid currentColor", css_px(parts[0])),
2861− );
2862− }
2863− }
2864− }
2865− "rounded" => {
2866− if let Some(v) = val {
2867− push_css(&mut css, "border-radius", &css_px(v));
2868− }
2869− }
2870− "bold" => push_css(&mut css, "font-weight", "bold"),
2871− "italic" => push_css(&mut css, "font-style", "italic"),
2872− "underline" => push_css(&mut css, "text-decoration", "underline"),
2873− "size" => {
2874− if let Some(v) = val {
2875− push_css(&mut css, "font-size", &css_px(v));
2876− }
2877− }
2878− "font" => {
2879− if let Some(v) = val {
2880− push_css(&mut css, "font-family", v);
2881− }
2882− }
2883− "transition" => {
2884− if let Some(v) = val {
2885− push_css(&mut css, "transition", v);
2886− }
2887− }
2888− "cursor" => {
2889− if let Some(v) = val {
2890− push_css(&mut css, "cursor", v);
2891− }
2892− }
2893− "opacity" => {
2894− if let Some(v) = val {
2895− push_css(&mut css, "opacity", v);
2896− }
2897− }
2898−
2899− // Typography
2900− "text-align" => {
2901− if let Some(v) = val {
2902− push_css(&mut css, "text-align", v);
2903− }
2904− }
2905− "line-height" => {
2906− if let Some(v) = val {
2907− push_css(&mut css, "line-height", &css_line_height(v));
2908− }
2909− }
2910− "letter-spacing" => {
2911− if let Some(v) = val {
2912− push_css(&mut css, "letter-spacing", &css_px(v));
2913− }
2914− }
2915− "text-transform" => {
2916− if let Some(v) = val {
2917− push_css(&mut css, "text-transform", v);
2918− }
2919− }
2920− "white-space" => {
2921− if let Some(v) = val {
2922− push_css(&mut css, "white-space", v);
2923− }
2924− }
2925−
2926− // Overflow & positioning
2927− "overflow" => {
2928− if let Some(v) = val {
2929− push_css(&mut css, "overflow", v);
2930− }
2931− }
2932− "position" => {
2933− if let Some(v) = val {
2934− push_css(&mut css, "position", v);
2935− }
2936− }
2937− "top" => {
2938− if let Some(v) = val {
2939− push_css(&mut css, "top", &css_px(v));
2940− }
2941− }
2942− "right" => {
2943− if let Some(v) = val {
2944− push_css(&mut css, "right", &css_px(v));
2945− }
2946− }
2947− "bottom" => {
2948− if let Some(v) = val {
2949− push_css(&mut css, "bottom", &css_px(v));
2950− }
2951− }
2952− "left" => {
2953− if let Some(v) = val {
2954− push_css(&mut css, "left", &css_px(v));
2955− }
2956− }
2957− "z-index" => {
2958− if let Some(v) = val {
2959− push_css(&mut css, "z-index", v);
2960− }
2961− }
2962−
2963− // Display & visibility
2964− "display" => {
2965− if let Some(v) = val {
2966− push_css(&mut css, "display", v);
2967− }
2968− }
2969− "visibility" => {
2970− if let Some(v) = val {
2971− push_css(&mut css, "visibility", v);
2972− }
2973− }
2974− "hidden" => push_css(&mut css, "display", "none"),
2975−
2976− // Transform & filters
2977− "transform" => {
2978− if let Some(v) = val {
2979− push_css(&mut css, "transform", v);
2980− }
2981− }
2982− "backdrop-filter" => {
2983− if let Some(v) = val {
2984− push_css(&mut css, "backdrop-filter", v);
2985− }
2986− }
2987−
2988− // Effects
2989− "shadow" => {
2990− if let Some(v) = val {
2991− push_css(&mut css, "box-shadow", v);
2992− }
2993− }
2994−
2995− // Flow
2996− "wrap" => push_css(&mut css, "flex-wrap", "wrap"),
2997− "gap-x" => {
2998− if let Some(v) = val {
2999− push_css(&mut css, "column-gap", &css_px(v));
3000− }
3001− }
3002− "gap-y" => {
3003− if let Some(v) = val {
3004− push_css(&mut css, "row-gap", &css_px(v));
3005− }
3006− }
3007−
3008− // Grid
3009− "grid" => {
3010− push_css(&mut css, "display", "grid");
3011− }
3012− "grid-cols" => {
3013− if let Some(v) = val {
3014− if let Ok(n) = v.parse::<u32>() {
3015− push_css(
3016− &mut css,
3017− "grid-template-columns",
3018− &format!("repeat({},1fr)", n),
3019− );
3020− } else {
3021− push_css(&mut css, "grid-template-columns", v);
3022− }
3023− }
3024− }
3025− "grid-rows" => {
3026− if let Some(v) = val {
3027− if let Ok(n) = v.parse::<u32>() {
3028− push_css(
3029− &mut css,
3030− "grid-template-rows",
3031− &format!("repeat({},1fr)", n),
3032− );
3033− } else {
3034− push_css(&mut css, "grid-template-rows", v);
3035− }
3036− }
3037− }
3038− "col-span" => {
3039− if let Some(v) = val {
3040− push_css(&mut css, "grid-column", &format!("span {}", v));
3041− }
3042− }
3043− "row-span" => {
3044− if let Some(v) = val {
3045− push_css(&mut css, "grid-row", &format!("span {}", v));
3046− }
3047− }
3048−
3049− // Animation
3050− "animation" => {
3051− if let Some(v) = val {
3052− push_css(&mut css, "animation", v);
3053− }
3054− }
3055−
3056− // Aspect ratio
3057− "aspect-ratio" => {
3058− if let Some(v) = val {
3059− push_css(&mut css, "aspect-ratio", v);
3060− }
3061− }
3062−
3063− // CSS containment for rendering performance
3064− "contain" => {
3065− if let Some(v) = val {
3066− push_css(&mut css, "contain", v);
3067− } else {
3068− push_css(&mut css, "contain", "layout style paint");
3069− }
3070− }
3071− "content-visibility" => {
3072− if let Some(v) = val {
3073− push_css(&mut css, "content-visibility", v);
3074− } else {
3075− push_css(&mut css, "content-visibility", "auto");
3076− }
3077− }
3078−
3079− // Outline (like border but doesn't affect layout)
3080− "outline" => {
3081− if let Some(v) = val {
3082− let parts: Vec<&str> = v.splitn(2, ' ').collect();
3083− if parts.len() == 2 {
3084− push_css(
3085− &mut css,
3086− "outline",
3087− &format!("{} solid {}", css_px(parts[0]), parts[1]),
3088− );
3089− } else {
3090− push_css(
3091− &mut css,
3092− "outline",
3093− &format!("{} solid currentColor", css_px(parts[0])),
3094− );
3095− }
3096− }
3097− }
3098−
3099− // Logical properties (i18n-aware)
3100− "padding-inline" => {
3101− if let Some(v) = val {
3102− push_css(&mut css, "padding-inline", &css_px_multi(v));
3103− }
3104− }
3105− "padding-block" => {
3106− if let Some(v) = val {
3107− push_css(&mut css, "padding-block", &css_px_multi(v));
3108− }
3109− }
3110− "margin-inline" => {
3111− if let Some(v) = val {
3112− push_css(&mut css, "margin-inline", &css_px_multi(v));
3113− }
3114− }
3115− "margin-block" => {
3116− if let Some(v) = val {
3117− push_css(&mut css, "margin-block", &css_px_multi(v));
3118− }
3119− }
3120−
3121− // Logical property start/end variants
3122− "padding-inline-start"
3123− | "padding-inline-end"
3124− | "padding-block-start"
3125− | "padding-block-end"
3126− | "margin-inline-start"
3127− | "margin-inline-end"
3128− | "margin-block-start"
3129− | "margin-block-end" => {
3130− if let Some(v) = val {
3131− push_css(&mut css, effective_key, &css_px(v));
3132− }
3133− }
3134−
3135− // Logical inset
3136− "inset-inline" | "inset-block" => {
3137− if let Some(v) = val {
3138− push_css(&mut css, effective_key, &css_px_multi(v));
3139− }
3140− }
3141− "inset-inline-start" | "inset-inline-end" | "inset-block-start" | "inset-block-end" => {
3142− if let Some(v) = val {
3143− push_css(&mut css, effective_key, &css_px(v));
3144− }
3145− }
3146−
3147− // Logical border
3148− "border-inline"
3149− | "border-block"
3150− | "border-inline-start"
3151− | "border-inline-end"
3152− | "border-block-start"
3153− | "border-block-end" => {
3154− if let Some(v) = val {
3155− push_css(&mut css, effective_key, v);
3156− }
3157− }
3158−
3159− // Logical border-radius
3160− "border-start-start-radius"
3161− | "border-start-end-radius"
3162− | "border-end-start-radius"
3163− | "border-end-end-radius" => {
3164− if let Some(v) = val {
3165− push_css(&mut css, effective_key, &css_px(v));
3166− }
3167− }
3168−
3169− // Logical scroll margins & padding
3170− "scroll-margin-inline"
3171− | "scroll-margin-block"
3172− | "scroll-padding-inline"
3173− | "scroll-padding-block" => {
3174− if let Some(v) = val {
3175− push_css(&mut css, effective_key, &css_px_multi(v));
3176− }
3177− }
3178−
3179− // Logical sizing
3180− "inline-size" | "block-size" | "min-inline-size" | "max-inline-size"
3181− | "min-block-size" | "max-block-size" => {
3182− if let Some(v) = val {
3183− push_css(&mut css, effective_key, &css_px(v));
3184− }
3185− }
3186−
3187− // Scroll snap
3188− "scroll-snap-type" => {
3189− if let Some(v) = val {
3190− push_css(&mut css, "scroll-snap-type", v);
3191− }
3192− }
3193− "scroll-snap-align" => {
3194− if let Some(v) = val {
3195− push_css(&mut css, "scroll-snap-align", v);
3196− }
3197− }
3198−
3199− // Margin
3200− "margin" => {
3201− if let Some(v) = val {
3202− push_css(&mut css, "margin", &css_px_multi(v));
3203− }
3204− }
3205− "margin-x" => {
3206− if let Some(v) = val {
3207− push_css(&mut css, "margin-inline", &css_px(v));
3208− }
3209− }
3210− "margin-y" => {
3211− if let Some(v) = val {
3212− push_css(&mut css, "margin-block", &css_px(v));
3213− }
3214− }
3215−
3216− // Filter
3217− "filter" => {
3218− if let Some(v) = val {
3219− push_css(&mut css, "filter", v);
3220− }
3221− }
3222−
3223− // Object fit/position (for images)
3224− "object-fit" => {
3225− if let Some(v) = val {
3226− push_css(&mut css, "object-fit", v);
3227− }
3228− }
3229− "object-position" => {
3230− if let Some(v) = val {
3231− push_css(&mut css, "object-position", v);
3232− }
3233− }
3234−
3235− // Text shadow
3236− "text-shadow" => {
3237− if let Some(v) = val {
3238− push_css(&mut css, "text-shadow", v);
3239− }
3240− }
3241−
3242− // Text overflow
3243− "text-overflow" => {
3244− if let Some(v) = val {
3245− push_css(&mut css, "text-overflow", v);
3246− }
3247− }
3248−
3249− // Interaction
3250− "pointer-events" => {
3251− if let Some(v) = val {
3252− push_css(&mut css, "pointer-events", v);
3253− }
3254− }
3255− "user-select" => {
3256− if let Some(v) = val {
3257− push_css(&mut css, "user-select", v);
3258− }
3259− }
3260−
3261− // Flexbox/grid alignment
3262− "justify-content" => {
3263− if let Some(v) = val {
3264− push_css(&mut css, "justify-content", v);
3265− }
3266− }
3267− "align-items" => {
3268− if let Some(v) = val {
3269− push_css(&mut css, "align-items", v);
3270− }
3271− }
3272−
3273− // Flex item order
3274− "order" => {
3275− if let Some(v) = val {
3276− push_css(&mut css, "order", v);
3277− }
3278− }
3279−
3280− // Background extras
3281− "background-size" => {
3282− if let Some(v) = val {
3283− push_css(&mut css, "background-size", v);
3284− }
3285− }
3286− "background-position" => {
3287− if let Some(v) = val {
3288− push_css(&mut css, "background-position", v);
3289− }
3290− }
3291− "background-repeat" => {
3292− if let Some(v) = val {
3293− push_css(&mut css, "background-repeat", v);
3294− }
3295− }
3296−
3297− // Text wrapping
3298− "word-break" => {
3299− if let Some(v) = val {
3300− push_css(&mut css, "word-break", v);
3301− }
3302− }
3303− "overflow-wrap" => {
3304− if let Some(v) = val {
3305− push_css(&mut css, "overflow-wrap", v);
3306− }
3307− }
3308−
3309− // Container queries
3310− "container" => {
3311− push_css(&mut css, "container-type", "inline-size");
3312− }
3313− "container-name" => {
3314− if let Some(v) = val {
3315− push_css(&mut css, "container-name", v);
3316− }
3317− }
3318− "container-type" => {
3319− if let Some(v) = val {
3320− push_css(&mut css, "container-type", v);
3321− }
3322− }
3323−
3324− // Overflow axis
3325− "overflow-x" => {
3326− if let Some(v) = val {
3327− push_css(&mut css, "overflow-x", v);
3328− }
3329− }
3330− "overflow-y" => {
3331− if let Some(v) = val {
3332− push_css(&mut css, "overflow-y", v);
3333− }
3334− }
3335−
3336− // Inset (shorthand for top/right/bottom/left)
3337− "inset" => {
3338− if let Some(v) = val {
3339− push_css(&mut css, "inset", &css_px(v));
3340− }
3341− }
3342−
3343− // Accent & caret colors
3344− "accent-color" => {
3345− if let Some(v) = val {
3346− push_css(&mut css, "accent-color", v);
3347− }
3348− }
3349− "caret-color" => {
3350− if let Some(v) = val {
3351− push_css(&mut css, "caret-color", v);
3352− }
3353− }
3354−
3355− // Color scheme & appearance
3356− "color-scheme" => {
3357− if let Some(v) = val {
3358− push_css(&mut css, "color-scheme", v);
3359− }
3360− }
3361− "appearance" => {
3362− if let Some(v) = val {
3363− push_css(&mut css, "appearance", v);
3364− }
3365− }
3366−
3367− // List style
3368− "list-style" => {
3369− if let Some(v) = val {
3370− push_css(&mut css, "list-style", v);
3371− }
3372− }
3373−
3374− // Table
3375− "border-collapse" => {
3376− if let Some(v) = val {
3377− push_css(&mut css, "border-collapse", v);
3378− }
3379− }
3380− "border-spacing" => {
3381− if let Some(v) = val {
3382− push_css(&mut css, "border-spacing", &css_px(v));
3383− }
3384− }
3385−
3386− // Text decoration
3387− "text-decoration" => {
3388− if let Some(v) = val {
3389− push_css(&mut css, "text-decoration", v);
3390− }
3391− }
3392− "text-decoration-color" => {
3393− if let Some(v) = val {
3394− push_css(&mut css, "text-decoration-color", v);
3395− }
3396− }
3397− "text-decoration-thickness" => {
3398− if let Some(v) = val {
3399− push_css(&mut css, "text-decoration-thickness", &css_px(v));
3400− }
3401− }
3402− "text-decoration-style" => {
3403− if let Some(v) = val {
3404− push_css(&mut css, "text-decoration-style", v);
3405− }
3406− }
3407− "text-underline-offset" => {
3408− if let Some(v) = val {
3409− push_css(&mut css, "text-underline-offset", &css_px(v));
3410− }
3411− }
3412−
3413− // Multi-column
3414− "column-width" => {
3415− if let Some(v) = val {
3416− push_css(&mut css, "column-width", &css_px(v));
3417− }
3418− }
3419− "column-rule" => {
3420− if let Some(v) = val {
3421− push_css(&mut css, "column-rule", v);
3422− }
3423− }
3424−
3425− // Place items/self
3426− "place-items" => {
3427− if let Some(v) = val {
3428− push_css(&mut css, "place-items", v);
3429− }
3430− }
3431− "place-self" => {
3432− if let Some(v) = val {
3433− push_css(&mut css, "place-self", v);
3434− }
3435− }
3436−
3437− // Scroll behavior
3438− "scroll-behavior" => {
3439− if let Some(v) = val {
3440− push_css(&mut css, "scroll-behavior", v);
3441− }
3442− }
3443−
3444− // Resize
3445− "resize" => {
3446− if let Some(v) = val {
3447− push_css(&mut css, "resize", v);
3448− }
3449− }
3450−
3451− // New CSS properties
3452− "clip-path" => {
3453− if let Some(v) = val {
3454− push_css(&mut css, "clip-path", v);
3455− }
3456− }
3457− "mix-blend-mode" => {
3458− if let Some(v) = val {
3459− push_css(&mut css, "mix-blend-mode", v);
3460− }
3461− }
3462− "background-blend-mode" => {
3463− if let Some(v) = val {
3464− push_css(&mut css, "background-blend-mode", v);
3465− }
3466− }
3467− "writing-mode" => {
3468− if let Some(v) = val {
3469− push_css(&mut css, "writing-mode", v);
3470− }
3471− }
3472− "column-count" => {
3473− if let Some(v) = val {
3474− push_css(&mut css, "column-count", v);
3475− }
3476− }
3477− "column-gap" => {
3478− if let Some(v) = val {
3479− push_css(&mut css, "column-gap", &css_px(v));
3480− }
3481− }
3482− "text-indent" => {
3483− if let Some(v) = val {
3484− push_css(&mut css, "text-indent", &css_px(v));
3485− }
3486− }
3487− "hyphens" => {
3488− if let Some(v) = val {
3489− push_css(&mut css, "hyphens", v);
3490− }
3491− }
3492− "flex-grow" => {
3493− if let Some(v) = val {
3494− push_css(&mut css, "flex-grow", v);
3495− }
3496− }
3497− "flex-shrink" => {
3498− if let Some(v) = val {
3499− push_css(&mut css, "flex-shrink", v);
3500− }
3501− }
3502− "flex-basis" => {
3503− if let Some(v) = val {
3504− push_css(&mut css, "flex-basis", &css_px(v));
3505− }
3506− }
3507− "isolation" => {
3508− if let Some(v) = val {
3509− push_css(&mut css, "isolation", v);
3510− }
3511− }
3512− "place-content" => {
3513− if let Some(v) = val {
3514− push_css(&mut css, "place-content", v);
3515− }
3516− }
3517− "background-image" => {
3518− if let Some(v) = val {
3519− push_css(&mut css, "background-image", v);
3520− }
3521− }
3522− "font-weight" => {
3523− if let Some(v) = val {
3524− push_css(&mut css, "font-weight", v);
3525− }
3526− }
3527− "font-style" => {
3528− if let Some(v) = val {
3529− push_css(&mut css, "font-style", v);
3530− }
3531− }
3532− "text-wrap" => {
3533− if let Some(v) = val {
3534− push_css(&mut css, "text-wrap", v);
3535− }
3536− }
3537− "will-change" => {
3538− if let Some(v) = val {
3539− push_css(&mut css, "will-change", v);
3540− }
3541− }
3542− "touch-action" => {
3543− if let Some(v) = val {
3544− push_css(&mut css, "touch-action", v);
3545− }
3546− }
3547− "vertical-align" => {
3548− if let Some(v) = val {
3549− push_css(&mut css, "vertical-align", v);
3550− }
3551− }
3552− "scroll-margin" => {
3553− if let Some(v) = val {
3554− push_css(&mut css, "scroll-margin", &css_px(v));
3555− }
3556− }
3557− "scroll-margin-top"
3558− | "scroll-margin-bottom"
3559− | "scroll-margin-left"
3560− | "scroll-margin-right" => {
3561− if let Some(v) = val {
3562− push_css(&mut css, effective_key, &css_px(v));
3563− }
3564− }
3565− "scroll-padding" => {
3566− if let Some(v) = val {
3567− push_css(&mut css, "scroll-padding", &css_px(v));
3568− }
3569− }
3570− "scroll-padding-top"
3571− | "scroll-padding-bottom"
3572− | "scroll-padding-left"
3573− | "scroll-padding-right" => {
3574− if let Some(v) = val {
3575− push_css(&mut css, effective_key, &css_px(v));
3576− }
3577− }
3578− "direction" => {
3579− if let Some(v) = val {
3580− push_css(&mut css, "direction", v);
3581− }
3582− }
3583−
3584− "content" => {
3585− if let Some(v) = val {
3586− // Wrap in quotes if not already quoted and not a CSS keyword
3587− if v.starts_with('"')
3588− || v.starts_with('\'')
3589− || v == "none"
3590− || v == "normal"
3591− || v.starts_with("attr(")
3592− || v.starts_with("counter(")
3593− {
3594− push_css(&mut css, "content", v);
3595− } else {
3596− push_css(&mut css, "content", &format!("\"{}\"", v));
3597− }
3598− }
3599− }
3600−
3601− // --- CSS Shorthands ---
3602− "truncate" => {
3603− push_css(&mut css, "overflow", "hidden");
3604− push_css(&mut css, "text-overflow", "ellipsis");
3605− push_css(&mut css, "white-space", "nowrap");
3606− }
3607− "line-clamp" => {
3608− if let Some(v) = val {
3609− push_css(&mut css, "display", "-webkit-box");
3610− push_css(&mut css, "-webkit-line-clamp", v);
3611− push_css(&mut css, "-webkit-box-orient", "vertical");
3612− push_css(&mut css, "overflow", "hidden");
3613− }
3614− }
3615− "blur" => {
3616− if let Some(v) = val {
3617− push_css(&mut css, "filter", &format!("blur({})", css_px(v)));
3618− }
3619− }
3620− "backdrop-blur" => {
3621− if let Some(v) = val {
3622− push_css(&mut css, "backdrop-filter", &format!("blur({})", css_px(v)));
3623− }
3624− }
3625− "no-scrollbar" => {
3626− push_css(&mut css, "scrollbar-width", "none");
3627− push_css(&mut css, "-ms-overflow-style", "none");
3628− }
3629− "skeleton" => {
3630− push_css(
3631− &mut css,
3632− "background",
3633− "linear-gradient(90deg,#e5e7eb 25%,#f3f4f6 50%,#e5e7eb 75%)",
3634− );
3635− push_css(&mut css, "background-size", "200% 100%");
3636− push_css(
3637− &mut css,
3638− "animation",
3639− "hl-skeleton 1.5s ease-in-out infinite",
3640− );
3641− }
3642− "gradient" => {
3643− if let Some(v) = val {
3644− // Parse: "from to [angle]" or "color1 color2 [angle]"
3645− let parts: Vec<&str> = v.split_whitespace().collect();
3646− let bg = if parts.len() >= 3
3647− && (parts[2].ends_with("deg")
3648− || parts[2].ends_with("turn")
3649− || parts[2].ends_with("rad"))
3650− {
3651− format!("linear-gradient({},{},{})", parts[2], parts[0], parts[1])
3652− } else if parts.len() >= 2 {
3653− format!("linear-gradient({},{})", parts[0], parts[1])
3654− } else {
3655− format!("linear-gradient({},transparent)", parts[0])
3656− };
3657− push_css(&mut css, "background", &bg);
3658− }
3659− }
3660−
3661− // Grid areas
3662− "grid-template-areas" => {
3663− if let Some(v) = val {
3664− push_css(&mut css, "grid-template-areas", v);
3665− }
3666− }
3667− "grid-area" => {
3668− if let Some(v) = val {
3669− push_css(&mut css, "grid-area", v);
3670− }
3671− }
3672−
3673− // View transitions
3674− "view-transition-name" => {
3675− if let Some(v) = val {
3676− push_css(&mut css, "view-transition-name", v);
3677− }
3678− }
3679−
3680− // Animate shorthand (alias for animation)
3681− "animate" => {
3682− if let Some(v) = val {
3683− push_css(&mut css, "animation", v);
3684− }
3685− }
3686−
3687− // CSS subgrid
3688− "grid-template-columns" => {
3689− if let Some(v) = val {
3690− push_css(&mut css, "grid-template-columns", v);
3691− }
3692− }
3693− "grid-template-rows" => {
3694− if let Some(v) = val {
3695− push_css(&mut css, "grid-template-rows", v);
3696− }
3697− }
3698−
3699− // Scroll-driven animations
3700− "animation-timeline" => {
3701− if let Some(v) = val {
3702− push_css(&mut css, "animation-timeline", v);
3703− }
3704− }
3705− "animation-range" => {
3706− if let Some(v) = val {
3707− push_css(&mut css, "animation-range", v);
3708− }
3709− }
3710− "view-timeline-name" => {
3711− if let Some(v) = val {
3712− push_css(&mut css, "view-timeline-name", v);
3713− }
3714− }
3715− "view-timeline-axis" => {
3716− if let Some(v) = val {
3717− push_css(&mut css, "view-timeline-axis", v);
3718− }
3719− }
3720− "scroll-timeline-name" => {
3721− if let Some(v) = val {
3722− push_css(&mut css, "scroll-timeline-name", v);
3723− }
3724− }
3725− "scroll-timeline-axis" => {
3726− if let Some(v) = val {
3727− push_css(&mut css, "scroll-timeline-axis", v);
3728− }
3729− }
3730−
3731− // Anchor positioning
3732− "anchor-name" => {
3733− if let Some(v) = val {
3734− push_css(&mut css, "anchor-name", v);
3735− }
3736− }
3737− "position-anchor" => {
3738− if let Some(v) = val {
3739− push_css(&mut css, "position-anchor", v);
3740− }
3741− }
3742− "position-area" => {
3743− if let Some(v) = val {
3744− push_css(&mut css, "position-area", v);
3745− }
3746− }
3747− "inset-area" => {
3748− // Legacy alias for position-area
3749− if let Some(v) = val {
3750− push_css(&mut css, "position-area", v);
3751− }
3752− }
3753−
3754− // initial-letter (drop caps)
3755− "initial-letter" => {
3756− if let Some(v) = val {
3757− push_css(&mut css, "initial-letter", v);
3758− }
3759− }
3760−
3761− // Critical CSS hint — not CSS, handled elsewhere
3762− "critical" => {}
3763−
3764− // Identity and HTML passthrough — not CSS
3765− "id" | "class" => {}
3766− "type" | "placeholder" | "name" | "value" | "disabled" | "required" | "checked"
3767− | "for" | "action" | "method" | "autocomplete" | "min" | "max" | "step" | "pattern"
3768− | "maxlength" | "rows" | "cols" | "multiple" | "alt" | "role" | "tabindex"
3769− | "title" | "controls" | "autoplay" | "loop" | "muted" | "playsinline" | "poster"
3770− | "preload" | "loading" | "decoding" | "ordered" | "src" | "open" | "novalidate"
3771− | "low" | "high" | "optimum" | "colspan" | "rowspan" | "scope" | "inline"
3772− | "responsive" | "datetime" | "media" | "sizes" | "srcset" | "cite" | "list"
3773− | "sandbox" | "allow" | "allowfullscreen" | "referrerpolicy" | "formaction"
3774− | "formmethod" | "formtarget" | "target" | "autofocus" => {}
3775−
3776− _ => {}
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);
37771700 }
37781701 }
37791702
3780− css
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);
1711+ }
1712+ }
1713+ out
37811714}
37821715
3783−fn push_css(css: &mut String, prop: &str, value: &str) {
3784− css.push_str(prop);
3785− css.push(':');
3786− css.push_str(value);
3787− css.push(';');
1716+fn emit_class_attr(out: &mut String, gen_class: Option<&str>, user_class: Option<&str>) {
1717+ match (gen_class, user_class) {
1718+ (Some(g), Some(u)) => {
1719+ out.push_str(" class=\"");
1720+ out.push_str(g);
1721+ out.push(' ');
1722+ out.push_str(&html_escape(u));
1723+ out.push('"');
1724+ }
1725+ (Some(g), None) => {
1726+ out.push_str(" class=\"");
1727+ out.push_str(g);
1728+ out.push('"');
1729+ }
1730+ (None, Some(u)) => {
1731+ out.push_str(" class=\"");
1732+ out.push_str(&html_escape(u));
1733+ out.push('"');
1734+ }
1735+ (None, None) => {}
1736+ }
37881737}
37891738
3790−/// Known CSS units — if a value ends with one, skip appending `px`.
3791−const CSS_UNITS: &[&str] = &[
3792− "%", "rem", "em", "vh", "vw", "vmin", "vmax", "dvh", "svh", "lvh", "ch", "ex", "cm", "mm",
3793− "in", "pt", "pc", "fr",
3794−];
1739+// ---------------------------------------------------------------------------
1740+// Attribute → CSS mapping
1741+// ---------------------------------------------------------------------------
37951742
3796−/// Format a numeric value: if it already has a CSS unit, pass through as-is;
3797−/// otherwise append `px`.
3798−fn css_px(value: &str) -> String {
3799− let v = value.trim();
3800− if v == "0" {
3801− return "0".to_string();
3802− }
3803− if CSS_UNITS.iter().any(|u| v.ends_with(u)) {
3804− return v.to_string();
3805− }
3806− if v.starts_with("var(")
3807− || v.starts_with("calc(")
3808− || v.starts_with("clamp(")
3809− || v.starts_with("min(")
3810− || v.starts_with("max(")
3811− {
3812− return v.to_string();
3813− }
3814− format!("{}px", v)
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,
38151755}
38161756
3817−/// Rewrite literal values that match a declared CSS custom property (from
3818−/// `@theme` or `@let --name value`) to `var(--name)` references. Matches are
3819−/// anchored to CSS value boundaries so e.g. `#3b82f6` inside a longer hex or
3820−/// inside an identifier is not replaced. The `:root` block is emitted before
3821−/// this call runs, so its declarations are not affected.
3822−fn substitute_css_vars(css: &str, vars: &[(String, String)]) -> String {
3823− if css.is_empty() || vars.is_empty() {
3824− return css.to_string();
3825− }
3826− // Prefer longer values first so that if two vars share a prefix, the
3827− // longer (more specific) match wins.
3828− let mut pairs: Vec<(&str, String)> = vars
3829− .iter()
3830− .filter(|(name, value)| name.starts_with("--") && !value.is_empty())
3831− .map(|(name, value)| (value.as_str(), format!("var({})", name)))
3832− .collect();
3833− pairs.sort_by_key(|(v, _)| std::cmp::Reverse(v.len()));
3834− if pairs.is_empty() {
3835− return css.to_string();
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,
1767+ }
38361768 }
1769+}
38371770
3838− let is_boundary_before = |b: Option<u8>| match b {
3839− None => true,
3840− Some(c) => matches!(c, b':' | b' ' | b',' | b'(' | b';' | b'{' | b'\n' | b'\t'),
3841− };
3842− let is_boundary_after = |b: Option<u8>| match b {
3843− None => true,
3844− Some(c) => matches!(c, b';' | b'}' | b',' | b' ' | b')' | b'\n' | b'\t'),
3845− };
1771+// ---------------------------------------------------------------------------
1772+// Direction: what a child's `fill` and `shrink` compile against
1773+// ---------------------------------------------------------------------------
38461774
3847− let bytes = css.as_bytes();
3848− let mut out = String::with_capacity(css.len());
3849− let mut i = 0;
3850− let mut prev: Option<u8> = None;
3851− while i < bytes.len() {
3852− if is_boundary_before(prev) {
3853− let mut matched = false;
3854− for (val, repl) in &pairs {
3855− let vb = val.as_bytes();
3856− if i + vb.len() <= bytes.len() && &bytes[i..i + vb.len()] == vb {
3857− let next = bytes.get(i + vb.len()).copied();
3858− if is_boundary_after(next) {
3859− out.push_str(repl);
3860− prev = repl.as_bytes().last().copied();
3861− i += vb.len();
3862− matched = true;
3863− break;
3864− }
3865− }
3866− }
3867− if matched {
3868− continue;
3869− }
3870− }
3871− // Advance by one UTF-8 code point.
3872− let start = i;
3873− i += 1;
3874− while i < bytes.len() && (bytes[i] & 0xC0) == 0x80 {
3875− i += 1;
3876− }
3877− out.push_str(&css[start..i]);
3878− prev = bytes.get(i - 1).copied();
3879− }
3880− out
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,
38811780}
38821781
3883−/// Scan generated CSS for literal property values that repeat often enough
3884−/// that substituting them with an auto-named custom property would reduce
3885−/// total byte count. Returns the rewritten CSS and any new vars that should
3886−/// be appended to `:root`.
3887−///
3888−/// The algorithm only promotes a value if it strictly saves bytes after
3889−/// accounting for the `--xN:value;` declaration overhead plus the
3890−/// `var(--xN)` reference cost at each call site. Values that are already
3891−/// `var(...)` references or contain `var(` calls are skipped so we never
3892−/// nest references. Names avoid collisions with `existing_vars`.
3893−fn auto_extract_repeats(
3894− css: &str,
3895− existing_vars: &[(String, String)],
3896−) -> (String, Vec<(String, String)>) {
3897− if css.is_empty() {
3898− return (css.to_string(), Vec::new());
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+ })
38991791 }
3900− // Count occurrences of each distinct property value (the text between
3901− // `:` and the next `;` or `}` at the top level of a declaration block,
3902− // ignoring balanced parentheses so that e.g. `rgba(...)` stays intact).
3903− let bytes = css.as_bytes();
3904− let mut counts: HashMap<String, usize> = HashMap::new();
3905− let mut depth: i32 = 0;
3906− let mut i = 0;
3907− while i < bytes.len() {
3908− match bytes[i] {
3909− b'{' => {
3910− depth += 1;
3911− i += 1;
1792+}
1793+
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+}
1813+
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() {
39121825 continue;
39131826 }
3914− b'}' => {
3915− if depth > 0 {
3916− depth -= 1;
3917− }
3918− i += 1;
1827+ let Some(axis) = attr.value.as_deref().and_then(Axis::of_value) else {
39191828 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));
39201836 }
3921− _ => {}
3922− }
3923− if depth > 0 && bytes[i] == b':' {
3924− // Skip past `:` then walk to the terminator.
3925− let start = i + 1;
3926− let mut end = start;
3927− let mut pdepth = 0i32;
3928− while end < bytes.len() {
3929− match bytes[end] {
3930− b'(' => pdepth += 1,
3931− b')' if pdepth > 0 => pdepth -= 1,
3932− b';' | b'}' if pdepth == 0 => break,
3933− b'{' if pdepth == 0 => break,
3934− _ => {}
3935− }
3936− end += 1;
3937− }
3938− let val = css[start..end].trim();
3939− if !val.is_empty() && !val.starts_with("var(") && !val.contains("var(") {
3940− *counts.entry(val.to_string()).or_default() += 1;
3941− }
3942− i = end;
3943− continue;
39441837 }
3945− i += 1;
3946− }
3947−
3948− // Decide which values are worth extracting. A value of length L appearing
3949− // N times costs N*L bytes inline; promoting it costs (L + 6) for the
3950− // `--hK:V;` declaration plus N * ref_len for the call sites. We estimate
3951− // ref_len optimistically as `var(--h0)` (9 bytes) and fall back to 10 for
3952− // two-digit indices, which only affects very large extraction counts.
3953− let existing: std::collections::HashSet<&str> =
3954− existing_vars.iter().map(|(n, _)| n.as_str()).collect();
3955− let mut candidates: Vec<(String, usize)> =
3956− counts.into_iter().filter(|(_, n)| *n >= 2).collect();
3957− // Stable, deterministic ordering — longest values first, tiebreak by text.
3958− candidates.sort_by(|a, b| b.0.len().cmp(&a.0.len()).then_with(|| a.0.cmp(&b.0)));
3959−
3960− let mut extracted: Vec<(String, String)> = Vec::new();
3961− let mut next_idx: usize = 0;
3962− for (value, n) in candidates {
3963− let l = value.len();
3964− // Allocate the next unused `--hN` name.
3965− let (name, ref_len) = loop {
3966− let candidate = format!("--h{}", next_idx);
3967− next_idx += 1;
3968− let rl = candidate.len() + 6; // `var(` + name + `)`
3969− if !existing.contains(candidate.as_str())
3970− && !extracted.iter().any(|(n, _)| *n == candidate)
3971− {
3972− break (candidate, rl);
3973− }
3974− };
3975− // Skip if promotion would not strictly reduce byte count.
3976− // Before: n * l bytes. After: (l + name.len() + 2) for the :root
3977− // declaration (`<name>:<value>;`) plus n * ref_len for the sites.
3978− let decl_overhead = l + name.len() + 2;
3979− let before = n * l;
3980− let after = decl_overhead + n * ref_len;
3981− if after < before {
3982− extracted.push((name, value));
3983− } else {
3984− // Rewind the index so the next value can reuse this slot.
3985− next_idx -= 1;
1838+ changes.sort_by_key(|(at, _)| at_order(at));
1839+ Flow {
1840+ base: Some(base),
1841+ changes,
1842+ class: None,
39861843 }
39871844 }
39881845
3989− if extracted.is_empty() {
3990− return (css.to_string(), Vec::new());
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))
39911859 }
3992− let new_css = substitute_css_vars(css, &extracted);
3993− (new_css, extracted)
39941860}
39951861
3996−/// Format a `line-height` value. CSS accepts either a unitless multiplier
3997−/// (e.g. `1.5`) or a length (e.g. `24px`). Plain integers in htmlang source
3998−/// are ambiguous: `[line-height 24]` was historically emitted as `24` (which
3999−/// CSS interprets as 24× font-size — almost never what anyone wants). Treat
4000−/// integers ≥ 2 as pixel lengths; anything with a decimal, an existing unit,
4001−/// or the value `0`/`1` passes through unchanged.
4002−fn css_line_height(value: &str) -> String {
4003− let v = value.trim();
4004− if v == "0" || v == "1" {
4005− return v.to_string();
4006− }
4007− if v.contains('.') {
4008− return v.to_string();
4009− }
4010− if CSS_UNITS.iter().any(|u| v.ends_with(u)) || v.ends_with("px") {
4011− return v.to_string();
4012− }
4013− if v.starts_with("var(")
4014− || v.starts_with("calc(")
4015− || v.starts_with("clamp(")
4016− || v.starts_with("min(")
4017− || v.starts_with("max(")
4018− {
4019− return v.to_string();
4020− }
4021− // Plain integer — treat as pixel length.
4022− if v.chars().all(|c| c.is_ascii_digit()) {
4023− return format!("{}px", v);
4024− }
4025− v.to_string()
1862+/// `width` or `height`.
1863+#[derive(Clone, Copy, PartialEq, Eq)]
1864+enum Dim {
1865+ Width,
1866+ Height,
40261867}
40271868
4028−/// Format multiple space-separated values, each getting px if needed.
4029−fn css_px_multi(value: &str) -> String {
4030− value
4031− .split_whitespace()
4032− .map(css_px)
4033− .collect::<Vec<_>>()
4034− .join(" ")
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,
40351876}
40361877
4037−fn extract_id_class(attrs: &[Attribute]) -> (Option<String>, Option<String>) {
4038− let mut id = None;
4039− let mut class = None;
4040− for attr in attrs {
4041− match attr.key.as_str() {
4042− "id" => id = attr.value.clone(),
4043− "class" => class = attr.value.clone(),
4044− _ => {}
1878+impl Size {
1879+ fn of(value: &str) -> Size {
1880+ match value.trim() {
1881+ "fill" => Size::Fill,
1882+ "shrink" => Size::Shrink,
1883+ _ => Size::Set,
40451884 }
40461885 }
4047− (id, class)
40481886}
40491887
4050−/// Read image dimensions from a local file by parsing the header bytes.
4051−/// Supports PNG, JPEG, GIF, WebP, AVIF, and SVG.
4052−fn read_image_dimensions(path: &str) -> Option<(u32, u32)> {
4053− // SVG: parse as text for viewBox/width/height attributes
4054− if path.ends_with(".svg") || path.ends_with(".SVG") {
4055− let text = std::fs::read_to_string(path).ok()?;
4056− return read_svg_dimensions(&text);
4057− }
4058−
4059− let data = std::fs::read(path).ok()?;
4060− if data.len() < 12 {
4061− return None;
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")],
40621904 }
1905+}
40631906
4064− // PNG: 8-byte signature, then IHDR chunk with width/height at bytes 16-23
4065− if data.len() >= 24 && data.starts_with(b"\x89PNG\r\n\x1a\n") {
4066− let w = u32::from_be_bytes([data[16], data[17], data[18], data[19]]);
4067− let h = u32::from_be_bytes([data[20], data[21], data[22], data[23]]);
4068− return Some((w, h));
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+ ],
40691921 }
1922+}
40701923
4071− // GIF: "GIF87a" or "GIF89a", width/height at bytes 6-9 (little-endian)
4072− if data.starts_with(b"GIF87a") || data.starts_with(b"GIF89a") {
4073− let w = u16::from_le_bytes([data[6], data[7]]) as u32;
4074− let h = u16::from_le_bytes([data[8], data[9]]) as u32;
4075− return Some((w, h));
4076− }
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+}
40771943
4078− // JPEG: scan for SOF0/SOF2 marker (0xFF 0xC0 or 0xFF 0xC2)
4079− if data.starts_with(b"\xff\xd8") {
4080− let mut i = 2;
4081− while i + 9 < data.len() {
4082− if data[i] != 0xFF {
4083− i += 1;
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 {
40841953 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+ _ => {}
40851979 }
4086− let marker = data[i + 1];
4087− if marker == 0xC0 || marker == 0xC2 {
4088− let h = u16::from_be_bytes([data[i + 5], data[i + 6]]) as u32;
4089− let w = u16::from_be_bytes([data[i + 7], data[i + 8]]) as u32;
4090− return Some((w, h));
4091− }
4092− if i + 3 < data.len() {
4093− let len = u16::from_be_bytes([data[i + 2], data[i + 3]]) as usize;
4094− i += 2 + len;
4095− } else {
4096− break;
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+ }
2023+ }
2024+ return;
40972025 }
40982026 }
2027+ if !self.writes(property) {
2028+ push_css(css, property, value);
2029+ }
40992030 }
2031+}
41002032
4101− // WebP: "RIFF" ... "WEBP", VP8 header at byte 20
4102− if data.len() >= 30 && &data[..4] == b"RIFF" && &data[8..12] == b"WEBP" {
4103− if &data[12..16] == b"VP8 " && data.len() >= 30 {
4104− let w = u16::from_le_bytes([data[26], data[27]]) as u32 & 0x3FFF;
4105− let h = u16::from_le_bytes([data[28], data[29]]) as u32 & 0x3FFF;
4106− return Some((w, h));
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;
41072048 }
4108− if &data[12..16] == b"VP8L" && data.len() >= 25 && data[21] == 0x2F {
4109− let bits = u32::from_le_bytes([data[22], data[23], data[24], data[25]]);
4110− let w = (bits & 0x3FFF) + 1;
4111− let h = ((bits >> 14) & 0x3FFF) + 1;
4112− return Some((w, h));
2049+ if let Some(size) = size {
2050+ sets.extend_from_slice(sizing(dim, size, Some(axis)));
41132051 }
2052+ resets.extend_from_slice(&sizing_properties(dim));
41142053 }
4115−
4116− // AVIF: ISOBMFF container with "ftyp" box containing "avif"/"avis" brand,
4117− // then "ispe" box with width/height
4118− if data.len() >= 12 && &data[4..8] == b"ftyp" {
4119− let brand = &data[8..12];
4120− if brand == b"avif" || brand == b"avis" || brand == b"mif1" {
4121− return read_avif_dimensions(&data);
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;
41222059 }
2060+ written.push(property);
2061+ sizes.push(&mut css, property, value);
41232062 }
2063+ for &(property, value) in &sets {
2064+ sizes.push(&mut css, property, value);
2065+ }
2066+ css
2067+}
41242068
4125− None
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()
41262078}
41272079
4128−/// Parse SVG viewBox or width/height attributes to get dimensions.
4129−fn read_svg_dimensions(text: &str) -> Option<(u32, u32)> {
4130− // Try viewBox first: viewBox="minX minY width height"
4131− if let Some(vb_start) = text.find("viewBox=\"") {
4132− let rest = &text[vb_start + 9..];
4133− if let Some(end) = rest.find('"') {
4134− let parts: Vec<&str> = rest[..end].split_whitespace().collect();
4135− if parts.len() == 4
4136− && let (Ok(w), Ok(h)) = (parts[2].parse::<f64>(), parts[3].parse::<f64>())
4137− && w > 0.0
4138− && h > 0.0
4139− {
4140− return Some((w.round() as u32, h.round() as u32));
4141− }
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);
41422099 }
41432100 }
4144− // Fall back to width/height attributes on <svg>
4145− let svg_tag = text.find("<svg")?;
4146− let tag_end = text[svg_tag..].find('>')? + svg_tag;
4147− let tag = &text[svg_tag..tag_end];
4148− let w = extract_svg_attr(tag, "width")?;
4149− let h = extract_svg_attr(tag, "height")?;
4150− Some((w, h))
2101+ Some(class)
41512102}
41522103
4153−fn extract_svg_attr(tag: &str, attr: &str) -> Option<u32> {
4154− let needle = format!("{}=\"", attr);
4155− let start = tag.find(&needle)? + needle.len();
4156− let rest = &tag[start..];
4157− let end = rest.find('"')?;
4158− let val = rest[..end].trim_end_matches("px");
4159− val.parse::<f64>().ok().map(|v| v.round() as u32)
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+ }
41602116}
41612117
4162−/// Parse AVIF (ISOBMFF) container to find ispe box with image dimensions.
4163−fn read_avif_dimensions(data: &[u8]) -> Option<(u32, u32)> {
4164− // Walk ISOBMFF boxes looking for "ispe" (image spatial extents)
4165− let mut i = 0;
4166− while i + 8 <= data.len() {
4167− let box_size =
4168− u32::from_be_bytes([data[i], data[i + 1], data[i + 2], data[i + 3]]) as usize;
4169− let box_type = &data[i + 4..i + 8];
4170− if box_size < 8 {
4171− break;
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;
41722152 }
4173− let box_end = (i + box_size).min(data.len());
4174− // ispe box: 4 bytes version/flags + 4 bytes width + 4 bytes height
4175− if box_type == b"ispe" && box_end >= i + 20 {
4176− let w = u32::from_be_bytes([data[i + 12], data[i + 13], data[i + 14], data[i + 15]]);
4177− let h = u32::from_be_bytes([data[i + 16], data[i + 17], data[i + 18], data[i + 19]]);
4178− return Some((w, h));
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+ }
2159+
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;
41792165 }
4180− // Recurse into container boxes (meta, iprp, ipco)
4181− if matches!(
4182− box_type,
4183− b"meta" | b"iprp" | b"ipco" | b"moov" | b"trak" | b"mdia"
4184− ) {
4185− let header_size = if box_type == b"meta" { 12 } else { 8 };
4186− if i + header_size < box_end
4187− && let Some(dims) = read_avif_dimensions(&data[i + header_size..box_end])
2166+
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" => {
2172+ if let Some(v) = val {
2173+ push_css(&mut css, "gap", &with_px("gap", v));
2174+ }
2175+ }
2176+
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;
2188+ }
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+ }) =>
41882226 {
4189− return Some(dims);
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+ }
2237+ }
2238+ if let Some(v) = val {
2239+ push_css(&mut css, effective_key, &with_px(effective_key, v));
2240+ }
2241+ }
2242+
2243+ // Alignment: auto margins, which work along either direction.
2244+ // They are written last, so a `margin` on the same element
2245+ // keeps its other sides (`center-x, margin 20`)
2246+ "center-x" => {
2247+ push_css(&mut aligned, "margin-left", "auto");
2248+ push_css(&mut aligned, "margin-right", "auto");
2249+ }
2250+ "center-y" => {
2251+ push_css(&mut aligned, "margin-top", "auto");
2252+ push_css(&mut aligned, "margin-bottom", "auto");
2253+ }
2254+ "align-left" => push_css(&mut aligned, "margin-right", "auto"),
2255+ "align-right" => push_css(&mut aligned, "margin-left", "auto"),
2256+ "align-top" => push_css(&mut aligned, "margin-bottom", "auto"),
2257+ "align-bottom" => push_css(&mut aligned, "margin-top", "auto"),
2258+
2259+ "wrap" if lays_out_children => push_css(&mut css, "flex-wrap", "wrap"),
2260+ "wrap" => {}
2261+
2262+ // Grid
2263+ "grid-cols" | "grid-rows" if !lays_out_children => {}
2264+ "grid-cols" | "grid-rows" => {
2265+ 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+ }
2275+ }
2276+ }
2277+ "col-span" | "row-span" => {
2278+ if let Some(v) = val {
2279+ let property = if effective_key == "col-span" {
2280+ "grid-column"
2281+ } else {
2282+ "grid-row"
2283+ };
2284+ push_css(&mut css, property, &format!("span {}", v));
2285+ }
2286+ }
2287+
2288+ // CSS's `line-clamp` has no support yet without its
2289+ // `-webkit-` fallback, which needs a box to clamp
2290+ "line-clamp" => {
2291+ if let Some(v) = val {
2292+ push_css(&mut css, "display", "-webkit-box");
2293+ push_css(&mut css, "-webkit-line-clamp", v);
2294+ push_css(&mut css, "-webkit-box-orient", "vertical");
2295+ push_css(&mut css, "overflow", "hidden");
2296+ }
2297+ }
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) => {
2305+ if let Some(v) = val {
2306+ push_css(&mut css, key, &with_px(key, v));
2307+ }
41902308 }
2309+
2310+ _ => {}
2311+ }
2312+ }
2313+
2314+ css.push_str(&aligned);
2315+ css
2316+}
2317+
2318+fn push_css(css: &mut String, prop: &str, value: &str) {
2319+ css.push_str(prop);
2320+ css.push(':');
2321+ css.push_str(value);
2322+ css.push(';');
2323+}
2324+
2325+fn extract_id_class(attrs: &[Attribute]) -> (Option<String>, Option<String>) {
2326+ let mut id = None;
2327+ let mut class = None;
2328+ for attr in attrs.iter().filter(|a| a.html) {
2329+ match attr.key.as_str() {
2330+ "id" => id = attr.value.clone(),
2331+ "class" => class = attr.value.clone(),
2332+ _ => {}
41912333 }
4192− i = box_end;
41932334 }
4194− None
2335+ (id, class)
41952336}
41962337
41972338fn html_escape(s: &str) -> String {
@@ -4232,10 +2373,24 @@ fn base64_encode(data: &[u8]) -> String {
42322373/// Generate a standard v3 source map with VLQ-encoded mappings.
42332374/// Compatible with browser devtools and source map tooling.
42342375pub 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 {
42352382 let mut mappings: Vec<(usize, usize)> = Vec::new(); // (html_line, hl_line)
4236− collect_source_lines(&doc.nodes, &mut mappings);
4237− mappings.sort_by_key(|m| m.0);
4238− mappings.dedup_by_key(|m| m.0);
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+ }
42392394
42402395 // Build VLQ-encoded mappings string.
42412396 // Each generated line is separated by ';'. Each segment within a line is
@@ -4295,60 +2450,30 @@ fn vlq_encode(value: i64, out: &mut String) {
42952450 }
42962451}
42972452
4298−fn collect_source_lines(nodes: &[Node], mappings: &mut Vec<(usize, usize)>) {
4299− for node in nodes {
4300− if let Node::Element(elem) = node {
4301− if elem.line_num > 0 {
4302− mappings.push((mappings.len() + 1, elem.line_num));
4303− }
4304− collect_source_lines(&elem.children, mappings);
4305− }
4306− }
4307−}
4308−
4309−/// Check if a specific element kind exists anywhere in the node tree.
4310−fn has_element_kind(nodes: &[Node], target: &ElementKind) -> bool {
4311− for node in nodes {
4312− if let Node::Element(elem) = node {
4313− if elem.kind == *target {
4314− return true;
4315− }
4316− if has_element_kind(&elem.children, target) {
4317− return true;
4318− }
4319− }
4320− }
4321− false
4322−}
4323−
4324−/// Collect unique external domains from generated HTML for DNS prefetch hints.
4325−fn collect_dns_prefetch(html: &str, dev: bool) -> String {
4326− let mut domains = Vec::new();
4327− let mut rest = html;
4328− while let Some(pos) = rest.find("https://") {
4329− let start = pos + 8; // skip "https://"
4330− rest = &rest[start..];
4331− let end = rest
4332− .find(['/', '"', '\'', ' ', '>', ')'])
4333− .unwrap_or(rest.len());
4334− let domain = &rest[..end];
4335− if !domain.is_empty() && domain.contains('.') && !domains.contains(&domain.to_string()) {
4336− domains.push(domain.to_string());
4337− }
4338− }
4339− let mut out = String::new();
4340− for domain in &domains {
4341− if dev {
4342− out.push_str(&format!(
4343− "<link rel=\"dns-prefetch\" href=\"//{}\">\n",
4344− domain
4345− ));
4346− } else {
4347− out.push_str(&format!(
4348− "<link rel=\"dns-prefetch\" href=\"//{}\">",
4349− domain
4350− ));
4351− }
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()));
43522478 }
4353− out
43542479}