@@ -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,50 +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 { break; }
32− n /= 36;
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)),
266+ }
267+ };
268+ if dev {
269+ format!("{} ({}: {})", kind, feature, value)
270+ } else {
271+ format!("{}({}:{})", kind, feature, value)
33272 }
34− // Reverse so it reads naturally
35− 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
36296}
37297
38298struct StyleEntry {
39299 class_name: String,
40− base: String,
41− /// (CSS selector suffix, css_rules) — e.g. (":hover", "color:red;")
42− pseudo: Vec<(String, String)>,
43− /// Responsive overrides: (breakpoint_prefix, css)
44− responsive: Vec<(String, String)>,
45− /// Dark mode overrides
46− dark: String,
47− /// Print overrides
48− print: String,
49− motion_safe: String,
50− motion_reduce: String,
51− landscape: String,
52− portrait: String,
53− /// Container query overrides: (breakpoint_prefix, css)
54− container: Vec<(String, String)>,
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,
55314}
56315
57316struct StyleCollector {
58317 entries: Vec<StyleEntry>,
59− /// Maps a pre-hashed style signature to an index into `entries`.
60− /// Using u64 as the key keeps lookups allocation-free; on the rare case of
61− /// a hash collision we fall back to a full equality check against the entry.
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).
62320 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)>,
63329}
64330
65331impl StyleCollector {
@@ -67,311 +333,328 @@ impl StyleCollector {
67333 StyleCollector {
68334 entries: Vec::new(),
69335 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);
70347 }
71348 }
72349
73350 /// Returns a class name for this style combination, or None if all empty.
74351 fn get_class(
75352 &mut self,
76− base: String,
77− pseudo: Vec<(String, String)>,
78− responsive: Vec<(String, String)>,
79− dark: String,
80− print: String,
81− motion_safe: String,
82− motion_reduce: String,
83− landscape: String,
84− portrait: String,
85− container: Vec<(String, String)>,
353+ defaults: String,
354+ mut rules: Vec<(Condition, String)>,
355+ distinct: String,
86356 ) -> Option<String> {
87− if base.is_empty()
88− && pseudo.is_empty()
89− && responsive.is_empty()
90− && dark.is_empty()
91− && print.is_empty()
92− && motion_safe.is_empty()
93− && motion_reduce.is_empty()
94− && landscape.is_empty()
95− && portrait.is_empty()
96− && container.is_empty()
97− {
357+ rules.retain(|(_, body)| !body.is_empty());
358+ if defaults.is_empty() && rules.is_empty() {
98359 return None;
99360 }
100− use std::collections::hash_map::DefaultHasher;
101− let mut h = DefaultHasher::new();
102− base.hash(&mut h);
103− pseudo.hash(&mut h);
104− responsive.hash(&mut h);
105− dark.hash(&mut h);
106− print.hash(&mut h);
107− motion_safe.hash(&mut h);
108− motion_reduce.hash(&mut h);
109− landscape.hash(&mut h);
110− portrait.hash(&mut h);
111− container.hash(&mut h);
112− let sig = h.finish();
113−
114− 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) {
115365 for &idx in indices {
116366 let e = &self.entries[idx];
117− if e.base == base
118− && e.pseudo == pseudo
119− && e.responsive == responsive
120− && e.dark == dark
121− && e.print == print
122− && e.motion_safe == motion_safe
123− && e.motion_reduce == motion_reduce
124− && e.landscape == landscape
125− && e.portrait == portrait
126− && e.container == container
127− {
367+ if e.defaults == defaults && e.rules == rules && e.distinct == distinct {
128368 return Some(e.class_name.clone());
129369 }
130370 }
131371 }
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
132375 let idx = self.entries.len();
133− 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());
134381 self.entries.push(StyleEntry {
135382 class_name: name.clone(),
136− base,
137− pseudo,
138− responsive,
139− dark,
140− print,
141− motion_safe,
142− motion_reduce,
143− landscape,
144− portrait,
145− container,
383+ style,
384+ defaults,
385+ rules,
386+ distinct,
146387 });
147− self.index.entry(sig).or_default().push(idx);
388+ self.index.entry(style).or_default().push(idx);
148389 Some(name)
149390 }
150391
151− fn to_css_formatted(&self, dev: bool, use_layer: bool) -> String {
152− let mut css = String::new();
153− let (sp, nl) = if dev { (" ", "\n") } 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+ }
154399
155− // Wrap in @layer for specificity management
156− 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(","));
157423 if dev {
158− css.push_str("@layer htmlang {\n");
424+ kind.push_str(&format!(" {} {{{}}}\n", selector, body));
159425 } else {
160− css.push_str("@layer htmlang{");
161− }
162− }
163−
164− // Non-responsive rules
165− for e in &self.entries {
166− if !e.base.is_empty() {
167− if use_layer && dev {
168− css.push_str(&format!(" .{}{sp}{{{}}}{nl}", e.class_name, e.base));
169− } else {
170− css.push_str(&format!(".{}{sp}{{{}}}{nl}", e.class_name, e.base));
171− }
172− }
173− for (selector, pseudo_css) in &e.pseudo {
174− if !pseudo_css.is_empty() {
175− if use_layer && dev {
176− css.push_str(&format!(" .{}{}{sp}{{{}}}{nl}", e.class_name, selector, pseudo_css));
177− } else {
178− css.push_str(&format!(".{}{}{sp}{{{}}}{nl}", e.class_name, selector, pseudo_css));
179− }
180− }
181− }
182− }
183−
184− // Responsive rules grouped by breakpoint
185− for &(bp_name, bp_width) in BREAKPOINTS {
186− let mut bp_css = String::new();
187− for e in &self.entries {
188− for (bp, rule_css) in &e.responsive {
189− if bp == bp_name && !rule_css.is_empty() {
190− if dev {
191− bp_css.push_str(&format!(" .{} {{{}}}\n", e.class_name, rule_css));
192− } else {
193− bp_css.push_str(&format!(".{}{{{}}}", e.class_name, rule_css));
194− }
195− }
196− }
197− }
198− if !bp_css.is_empty() {
199− if dev {
200− css.push_str(&format!(
201− "@media (min-width: {}) {{\n{}}}\n",
202− bp_width, bp_css
203− ));
204− } else {
205− css.push_str(&format!(
206− "@media(min-width:{}){{{}}}",
207− bp_width, bp_css
208− ));
209− }
426+ kind.push_str(&format!("{}{{{}}}", selector, body));
210427 }
211428 }
212429
213− // Dark mode rules
214− let mut dark_css = String::new();
215− for e in &self.entries {
216− if !e.dark.is_empty() {
217− if dev {
218− dark_css.push_str(&format!(" .{} {{{}}}\n", e.class_name, e.dark));
219− } else {
220− dark_css.push_str(&format!(".{}{{{}}}", e.class_name, e.dark));
221− }
222− }
223− }
224− if !dark_css.is_empty() {
430+ let mut inside = self.blocks(true, dev);
431+ // A function's scoped `@style`, nested under its class
432+ for block in scoped {
225433 if dev {
226− css.push_str(&format!("@media (prefers-color-scheme: dark) {{\n{}}}\n", dark_css));
434+ inside.push_str(block);
435+ inside.push('\n');
227436 } else {
228− css.push_str(&format!("@media(prefers-color-scheme:dark){{{}}}", dark_css));
437+ inside.push_str(&compact_css(block));
229438 }
230439 }
231440
232− // Print rules
233− let mut print_css = String::new();
234− for e in &self.entries {
235− if !e.print.is_empty() {
236− if dev {
237− print_css.push_str(&format!(" .{} {{{}}}\n", e.class_name, e.print));
238− } else {
239− print_css.push_str(&format!(".{}{{{}}}", e.class_name, e.print));
240− }
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;
241449 }
242− }
243− if !print_css.is_empty() {
244450 if dev {
245− css.push_str(&format!("@media print {{\n{}}}\n", print_css));
451+ css.push_str(&format!("@layer {} {{\n{}}}\n", name, rules));
246452 } else {
247− css.push_str(&format!("@media print{{{}}}", print_css));
453+ css.push_str(&format!("@layer {}{{{}}}", name, rules));
248454 }
249455 }
456+ css
457+ }
250458
251− // Motion safe rules
252− let mut motion_safe_css = String::new();
253− for e in &self.entries {
254− if !e.motion_safe.is_empty() {
255− if dev {
256− motion_safe_css.push_str(&format!(" .{} {{{}}}\n", e.class_name, e.motion_safe));
459+ /// The rules of every block of at-rules, in order: those for the
460+ /// elements inside (`inside`: rules under an element prefix, each in
461+ /// an `@scope` on its element's class), or the elements' own.
462+ fn blocks(&self, inside: bool, dev: bool) -> String {
463+ let mut css = String::new();
464+ let rules = || {
465+ self.entries.iter().flat_map(move |e| {
466+ e.rules
467+ .iter()
468+ .filter(move |(c, _)| c.inside().is_some() == inside)
469+ .map(move |(c, body)| (e, c, body))
470+ })
471+ };
472+ let mut blocks: Vec<&[usize]> = vec![&[]];
473+ let keyed = self.keyed.iter().filter(|_| !inside);
474+ let every = rules()
475+ .map(|(_, c, _)| c.at.as_slice())
476+ .chain(keyed.map(|(at, _, _)| at.as_slice()));
477+ for at in every {
478+ if !blocks.contains(&at) {
479+ blocks.push(at);
480+ }
481+ }
482+ blocks.sort_by_key(|at| at_order(at));
483+
484+ for at in blocks {
485+ let depth = at.len();
486+ // Readable output indents a rule inside `@layer` and inside
487+ // each at-rule but the first
488+ let indent = if dev {
489+ " ".repeat(depth.max(1))
490+ } else {
491+ String::new()
492+ };
493+ let mut inner = String::new();
494+ // Rules keyed on a parent's class come first: they have the
495+ // specificity of one class, like a class rule, so the child's
496+ // own rules in the block still win
497+ if !inside {
498+ let keyed: Vec<(&str, &str)> = self
499+ .keyed
500+ .iter()
501+ .filter(|(a, _, _)| a.as_slice() == at)
502+ .map(|(_, selector, body)| (selector.as_str(), body.as_str()))
503+ .collect();
504+ emit_selector_rules(&mut inner, &keyed, &indent, dev);
505+ }
506+ // The selector chains of this block, in order
507+ let mut chains: Vec<&[String]> = Vec::new();
508+ for (_, condition, _) in rules() {
509+ if condition.at == at && !chains.contains(&condition.selector.as_slice()) {
510+ chains.push(&condition.selector);
511+ }
512+ }
513+ if inside {
514+ chains.sort_by_cached_key(|chain| inside_order(chain));
515+ // One `@scope` for each root, its rules in the order of
516+ // the chains: rules for one element under two roots (`.a`
517+ // and `.a:hover`) tie on specificity and proximity, so the
518+ // later one wins
519+ let mut scopes: Vec<(String, Vec<(String, &str)>)> = Vec::new();
520+ for chain in chains {
521+ let Some(element) = chain
522+ .iter()
523+ .position(|p| crate::vocab::element_prefix(p).is_some())
524+ else {
525+ continue;
526+ };
527+ for (e, _, body) in
528+ rules().filter(|(_, c, _)| c.at == at && c.selector == chain)
529+ {
530+ let Some((root, target)) = scoped_selector(&e.class_name, chain, element)
531+ else {
532+ continue;
533+ };
534+ match scopes.iter_mut().find(|(r, _)| *r == root) {
535+ Some((_, targets)) => targets.push((target, body)),
536+ None => scopes.push((root, vec![(target, body)])),
537+ }
538+ }
539+ }
540+ let inner_indent = if dev {
541+ format!("{} ", indent)
257542 } else {
258− motion_safe_css.push_str(&format!(".{}{{{}}}", e.class_name, e.motion_safe));
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 { "}" });
259554 }
260− }
261− }
262− if !motion_safe_css.is_empty() {
263− if dev {
264− css.push_str(&format!("@media (prefers-reduced-motion: no-preference) {{\n{}}}\n", motion_safe_css));
265555 } else {
266− css.push_str(&format!("@media(prefers-reduced-motion:no-preference){{{}}}", motion_safe_css));
267− }
268− }
269−
270− // Motion reduce rules
271− let mut motion_reduce_css = String::new();
272− for e in &self.entries {
273− if !e.motion_reduce.is_empty() {
274− if dev {
275− motion_reduce_css.push_str(&format!(" .{} {{{}}}\n", e.class_name, e.motion_reduce));
276− } else {
277− motion_reduce_css.push_str(&format!(".{}{{{}}}", e.class_name, e.motion_reduce));
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);
278563 }
279564 }
280− }
281− if !motion_reduce_css.is_empty() {
282− if dev {
283− css.push_str(&format!("@media (prefers-reduced-motion: reduce) {{\n{}}}\n", motion_reduce_css));
284− } else {
285− css.push_str(&format!("@media(prefers-reduced-motion:reduce){{{}}}", motion_reduce_css));
565+ if inner.is_empty() {
566+ continue;
286567 }
287− }
288−
289− // Landscape rules
290− let mut landscape_css = String::new();
291− for e in &self.entries {
292− if !e.landscape.is_empty() {
293− if dev {
294− landscape_css.push_str(&format!(" .{} {{{}}}\n", e.class_name, e.landscape));
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)
295572 } else {
296− landscape_css.push_str(&format!(".{}{{{}}}", e.class_name, e.landscape));
297− }
298− }
299− }
300− if !landscape_css.is_empty() {
301− if dev {
302− css.push_str(&format!("@media (orientation: landscape) {{\n{}}}\n", landscape_css));
303− } else {
304− css.push_str(&format!("@media(orientation:landscape){{{}}}", landscape_css));
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+ };
305580 }
581+ css.push_str(&inner);
306582 }
583+ css
584+ }
585+}
307586
308− // Portrait rules
309− let mut portrait_css = String::new();
310− for e in &self.entries {
311− if !e.portrait.is_empty() {
312− if dev {
313− portrait_css.push_str(&format!(" .{} {{{}}}\n", e.class_name, e.portrait));
314− } else {
315− portrait_css.push_str(&format!(".{}{{{}}}", e.class_name, e.portrait));
316− }
317− }
587+/// Emit CSS rules from `(selector, body)` pairs, merging identical bodies
588+/// into a single selector-list rule (e.g. `.a,.b{body}`). The first occurrence
589+/// of each distinct body determines ordering, so output stays deterministic
590+/// across runs. `indent` is prepended to each rule line.
591+fn emit_grouped_rules(out: &mut String, pairs: &[(String, &str)], indent: &str, dev: bool) {
592+ if pairs.is_empty() {
593+ return;
594+ }
595+ // Group in first-occurrence order.
596+ let mut order: Vec<&str> = Vec::new();
597+ let mut groups: HashMap<&str, Vec<&str>> = HashMap::new();
598+ for (selector, body) in pairs {
599+ if body.is_empty() {
600+ continue;
318601 }
319− if !portrait_css.is_empty() {
320− if dev {
321− css.push_str(&format!("@media (orientation: portrait) {{\n{}}}\n", portrait_css));
322− } else {
323− css.push_str(&format!("@media(orientation:portrait){{{}}}", portrait_css));
324− }
602+ if !groups.contains_key(body) {
603+ order.push(body);
325604 }
605+ groups.entry(body).or_default().push(selector);
606+ }
607+ let sp = if dev { " " } else { "" };
608+ let nl = if dev { "\n" } else { "" };
609+ for body in &order {
610+ out.push_str(indent);
611+ out.push_str(&groups[body].join(","));
612+ out.push_str(sp);
613+ out.push('{');
614+ out.push_str(body);
615+ out.push('}');
616+ out.push_str(nl);
617+ }
618+}
326619
327− // Container query rules grouped by breakpoint
328− for &(bp_name, bp_width) in BREAKPOINTS {
329− let mut cq_css = String::new();
330− for e in &self.entries {
331− for (bp, rule_css) in &e.container {
332− if bp == bp_name && !rule_css.is_empty() {
333− if dev {
334− cq_css.push_str(&format!(" .{} {{{}}}\n", e.class_name, rule_css));
335− } else {
336− cq_css.push_str(&format!(".{}{{{}}}", e.class_name, rule_css));
337− }
338− }
339− }
340− }
341− if !cq_css.is_empty() {
342− if dev {
343− css.push_str(&format!(
344− "@container (min-width: {}) {{\n{}}}\n",
345− bp_width, cq_css
346− ));
347− } else {
348− css.push_str(&format!(
349− "@container(min-width:{}){{{}}}",
350− bp_width, cq_css
351− ));
352− }
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(' ');
353634 }
354− }
355−
356− // Close @layer
357− if use_layer {
635+ out.push('{');
636+ out.push_str(body);
637+ out.push('}');
358638 if dev {
359− css.push_str("}\n");
360− } else {
361− css.push('}');
639+ out.push('\n');
362640 }
363641 }
364−
365− css
642+ i += run;
366643 }
367644}
368645
369646struct GenContext {
370647 dev: bool,
371648 depth: usize,
372− image_count: usize,
373649 has_interactive: bool,
374− 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,
375658}
376659
377660impl GenContext {
@@ -397,23 +680,26 @@ pub struct CodegenOptions {
397680 pub dev: bool,
398681 pub partial: bool,
399682 pub minify: bool,
400− pub compat: bool,
401683}
402684
403685/// Generate HTML from a parsed document using the given options.
404686pub 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();
405694 let mut html = if opts.partial {
406− generate_partial_inner(doc, opts.dev)
695+ generate_partial_inner(doc, opts.dev, &mut classes)
407696 } else {
408− generate_full_inner(doc, opts.dev)
697+ generate_full_inner(doc, opts.dev, &mut classes)
409698 };
410699 if opts.minify {
411700 html = minify_html(&html);
412701 }
413− if opts.compat {
414− html = add_vendor_prefixes(&html);
415− }
416− html
702+ (html, classes)
417703}
418704
419705pub fn generate(doc: &Document) -> String {
@@ -421,31 +707,44 @@ pub fn generate(doc: &Document) -> String {
421707}
422708
423709pub fn generate_dev(doc: &Document) -> String {
424− generate_with(doc, &CodegenOptions { dev: true, ..Default::default() })
710+ generate_with(
711+ doc,
712+ &CodegenOptions {
713+ dev: true,
714+ ..Default::default()
715+ },
716+ )
425717}
426718
427719pub fn generate_partial(doc: &Document) -> String {
428− generate_with(doc, &CodegenOptions { partial: true, ..Default::default() })
720+ generate_with(
721+ doc,
722+ &CodegenOptions {
723+ partial: true,
724+ ..Default::default()
725+ },
726+ )
429727}
430728
431729pub fn generate_partial_dev(doc: &Document) -> String {
432− generate_with(doc, &CodegenOptions { dev: true, partial: true, ..Default::default() })
730+ generate_with(
731+ doc,
732+ &CodegenOptions {
733+ dev: true,
734+ partial: true,
735+ ..Default::default()
736+ },
737+ )
433738}
434739
435740pub fn generate_minified(doc: &Document) -> String {
436− generate_with(doc, &CodegenOptions { minify: true, ..Default::default() })
437−}
438−
439−pub fn generate_compat(doc: &Document) -> String {
440− generate_with(doc, &CodegenOptions { compat: true, ..Default::default() })
441−}
442−
443−pub fn generate_dev_compat(doc: &Document) -> String {
444− generate_with(doc, &CodegenOptions { dev: true, compat: true, ..Default::default() })
445−}
446−
447−pub fn generate_minified_compat(doc: &Document) -> String {
448− generate_with(doc, &CodegenOptions { minify: true, compat: true, ..Default::default() })
741+ generate_with(
742+ doc,
743+ &CodegenOptions {
744+ minify: true,
745+ ..Default::default()
746+ },
747+ )
449748}
450749
451750fn minify_html(html: &str) -> String {
@@ -462,9 +761,9 @@ fn minify_html(html: &str) -> String {
462761 if i + 4 < chars.len() && chars[i] == '<' {
463762 let rest: String = chars[i..].iter().take(10).collect();
464763 let rest_lower = rest.to_lowercase();
465− if rest_lower.starts_with("<pre") {
764+ if rest_lower.starts_with("<pre") || rest_lower.starts_with("<textarea") {
466765 in_pre = true;
467− } else if rest_lower.starts_with("</pre") {
766+ } else if rest_lower.starts_with("</pre") || rest_lower.starts_with("</textarea") {
468767 in_pre = false;
469768 } else if rest_lower.starts_with("<script") {
470769 in_script = true;
@@ -478,13 +777,18 @@ fn minify_html(html: &str) -> String {
478777 }
479778
480779 // Strip HTML comments (<!-- ... -->)
481− if !in_script && !in_style && i + 3 < chars.len()
482− && chars[i] == '<' && chars[i+1] == '!' && chars[i+2] == '-' && chars[i+3] == '-'
780+ if !in_script
781+ && !in_style
782+ && i + 3 < chars.len()
783+ && chars[i] == '<'
784+ && chars[i + 1] == '!'
785+ && chars[i + 2] == '-'
786+ && chars[i + 3] == '-'
483787 {
484788 // Skip to -->
485789 let mut j = i + 4;
486790 while j + 2 < chars.len() {
487− if chars[j] == '-' && chars[j+1] == '-' && chars[j+2] == '>' {
791+ if chars[j] == '-' && chars[j + 1] == '-' && chars[j + 2] == '>' {
488792 j += 3;
489793 break;
490794 }
@@ -501,10 +805,11 @@ fn minify_html(html: &str) -> String {
501805 continue;
502806 }
503807
504− // 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).
505811 if chars[i].is_whitespace() {
506812 if !prev_was_space {
507− // Only emit a space if we're between content (not between tags)
508813 result.push(' ');
509814 prev_was_space = true;
510815 }
@@ -512,14 +817,6 @@ fn minify_html(html: &str) -> String {
512817 continue;
513818 }
514819
515− // Trim space before closing tags
516− if chars[i] == '<' && prev_was_space {
517− // Remove trailing space before tag
518− if result.ends_with(' ') {
519− result.pop();
520− }
521− }
522−
523820 prev_was_space = false;
524821 result.push(chars[i]);
525822 i += 1;
@@ -528,202 +825,172 @@ fn minify_html(html: &str) -> String {
528825 result
529826}
530827
531−/// Add vendor prefixes to CSS within <style> tags for broader browser compatibility.
532−fn add_vendor_prefixes(html: &str) -> String {
533− // Find CSS within <style>...</style> and add vendor prefixes
534− let mut result = String::with_capacity(html.len() + 512);
535− let mut rest = html;
536− while let Some(start) = rest.find("<style>") {
537− let after_tag = start + 7;
538− result.push_str(&rest[..after_tag]);
539− rest = &rest[after_tag..];
540− if let Some(end) = rest.find("</style>") {
541− let css = &rest[..end];
542− result.push_str(&prefix_css(css));
543− result.push_str("</style>");
544− rest = &rest[end + 8..];
545− } else {
546− break;
547− }
548− }
549− result.push_str(rest);
550− result
551−}
552−
553−fn prefix_css(css: &str) -> String {
554− let mut out = String::with_capacity(css.len() + 256);
555− let mut i = 0;
556− let bytes = css.as_bytes();
557− while i < bytes.len() {
558− // Find property declarations
559− if let Some(pos) = css[i..].find('{') {
560− let brace = i + pos;
561− out.push_str(&css[i..=brace]);
562− i = brace + 1;
563− // Process declarations within this block
564− if let Some(close) = css[i..].find('}') {
565− let block = &css[i..i + close];
566− out.push_str(&prefix_declarations(block));
567− out.push('}');
568− i = i + close + 1;
569− }
570− } else {
571− out.push_str(&css[i..]);
572− break;
573− }
574− }
575− out
576−}
577−
578−fn prefix_declarations(block: &str) -> String {
579− let mut out = String::with_capacity(block.len() + 128);
580− for decl in block.split(';') {
581− let decl = decl.trim();
582− if decl.is_empty() {
583− continue;
584− }
585− if let Some((prop, val)) = decl.split_once(':') {
586− let prop = prop.trim();
587− let val = val.trim();
588− match prop {
589− "backdrop-filter" => {
590− out.push_str(&format!("-webkit-backdrop-filter:{};", val));
591− out.push_str(&format!("backdrop-filter:{};", val));
592− }
593− "user-select" => {
594− out.push_str(&format!("-webkit-user-select:{};", val));
595− out.push_str(&format!("-moz-user-select:{};", val));
596− out.push_str(&format!("user-select:{};", val));
597− }
598− "appearance" => {
599− out.push_str(&format!("-webkit-appearance:{};", val));
600− out.push_str(&format!("-moz-appearance:{};", val));
601− out.push_str(&format!("appearance:{};", val));
602− }
603− "background-clip" if val.contains("text") => {
604− out.push_str(&format!("-webkit-background-clip:{};", val));
605− out.push_str(&format!("background-clip:{};", val));
606− }
607− "hyphens" => {
608− out.push_str(&format!("-webkit-hyphens:{};", val));
609− out.push_str(&format!("-ms-hyphens:{};", val));
610− out.push_str(&format!("hyphens:{};", val));
611− }
612− "text-size-adjust" => {
613− out.push_str(&format!("-webkit-text-size-adjust:{};", val));
614− out.push_str(&format!("-ms-text-size-adjust:{};", val));
615− out.push_str(&format!("text-size-adjust:{};", val));
616− }
617− "mask-image" | "mask-size" | "mask-repeat" | "mask-position" => {
618− out.push_str(&format!("-webkit-{}:{};", prop, val));
619− out.push_str(&format!("{}:{};", prop, val));
620− }
621− _ => {
622− out.push_str(decl);
623− out.push(';');
624− }
625− }
626− } else {
627− out.push_str(decl);
628− out.push(';');
629− }
630− }
631− out
632−}
633−
634−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+ };
635833 let mut styles = StyleCollector::new();
636− let mut ctx = GenContext { dev, depth: 0, image_count: 0, has_interactive: false, has_defer: false };
834+ let mut ctx = GenContext {
835+ dev,
836+ depth: 0,
837+ has_interactive: false,
838+ in_text: false,
839+ flow: Flow::default(),
840+ in_picture: false,
841+ };
637842
638− // Check if document has @main for skip-to-content link
639− 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;
640866
641867 let mut body = String::new();
868+ generate_children(
869+ &doc.nodes,
870+ Some(Layout::Column),
871+ &mut body,
872+ &mut styles,
873+ &mut ctx,
874+ );
875+
876+ let element_css = build_element_css(doc, &styles, dev);
877+ let nl = if dev { "\n" } else { "" };
878+
879+ let mut meta_html = String::new();
880+ // A `@meta viewport` of the page's own replaces the usual one
881+ if !doc.meta_tags.iter().any(|(name, _)| name == "viewport") {
882+ meta_html.push_str(&format!(
883+ "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">{}",
884+ nl
885+ ));
886+ }
887+ meta_html.push_str(&format!(
888+ "<title>{}</title>{}",
889+ html_escape(&page.title),
890+ nl
891+ ));
892+ for (name, content) in &doc.meta_tags {
893+ meta_html.push_str(&format!(
894+ "<meta name=\"{}\" content=\"{}\">{}",
895+ html_escape(name),
896+ html_escape(content),
897+ nl
898+ ));
899+ }
900+ for (property, content) in &doc.og_tags {
901+ meta_html.push_str(&format!(
902+ "<meta property=\"og:{}\" content=\"{}\">{}",
903+ html_escape(property),
904+ html_escape(content),
905+ nl
906+ ));
907+ }
908+ if let Some(path) = &page.favicon {
909+ meta_html.push_str(&format!(
910+ "<link rel=\"icon\" href=\"{}\">{}",
911+ html_escape(path),
912+ nl
913+ ));
914+ }
915+ for block in &doc.head_blocks {
916+ meta_html.push_str(block);
917+ meta_html.push_str(nl);
918+ }
919+
920+ // `@page`'s HTML attributes go on `<html>`
921+ let mut root_attrs = String::new();
922+ for attr in html_attrs(&page.html_attrs) {
923+ push_html_attr(&mut root_attrs, attr);
924+ }
925+ let mut body_attrs = String::new();
926+ emit_class_attr(&mut body_attrs, body_class.as_deref(), None);
642927
643− // Skip-to-content link for accessibility (only when @main exists)
644− if has_main {
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";
645931 if dev {
646− body.push_str("<a href=\"#hl-main\" class=\"hl-skip\">Skip to content</a>\n");
932+ format!(
933+ "{}{} {{ outline: 2px solid currentColor; outline-offset: 2px; }}\n",
934+ OWN_ELEMENTS, focusable
935+ )
647936 } else {
648− body.push_str("<a href=\"#hl-main\" class=\"hl-skip\">Skip to content</a>");
937+ format!(
938+ "{}{}{{outline:2px solid currentColor;outline-offset:2px}}",
939+ OWN_ELEMENTS, focusable
940+ )
649941 }
650− }
651−
652− for node in &doc.nodes {
653− generate_node(node, None, &mut body, &mut styles, &mut ctx);
654− }
942+ } else {
943+ String::new()
944+ };
945+ let reset_css = reset_css(dev, true, &focus_visible_css);
946+ classes.extend(styles.classes());
655947
656− // Collect external domains for DNS prefetch
657− 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+}
658954
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 {
659959 let mut element_css = String::new();
660960
661− // CSS custom properties (includes @theme runtime tokens)
662− let has_theme_tokens = !doc.theme_tokens.is_empty();
663− if !doc.css_vars.is_empty() || has_theme_tokens {
961+ // Collect the CSS custom properties declared with `@let --name` so they
962+ // can be emitted in a single `:root` block below.
963+ let mut root_vars: Vec<(String, String)> = Vec::new();
964+ for (name, value) in &doc.css_vars {
965+ root_vars.push((name.clone(), value.clone()));
966+ }
967+
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);
971+
972+ // Emit the :root block first so the cascade picks up the custom
973+ // properties before the class rules consume them.
974+ if !root_vars.is_empty() {
664975 if dev {
665976 element_css.push_str(":root {\n");
666− for (name, value) in &doc.css_vars {
977+ for (name, value) in &root_vars {
667978 element_css.push_str(&format!(" {}: {};\n", name, value));
668979 }
669− // @theme tokens as runtime CSS custom properties
670− for (name, value) in &doc.theme_tokens {
671− let css_name = format!("--{}", name);
672− // Only emit if not already in css_vars
673− if !doc.css_vars.iter().any(|(n, _)| *n == css_name) {
674− element_css.push_str(&format!(" {}: {};\n", css_name, value));
675− }
676− }
677980 element_css.push_str("}\n");
678981 } else {
679982 element_css.push_str(":root{");
680− for (name, value) in &doc.css_vars {
983+ for (name, value) in &root_vars {
681984 element_css.push_str(name);
682985 element_css.push(':');
683986 element_css.push_str(value);
684987 element_css.push(';');
685988 }
686− for (name, value) in &doc.theme_tokens {
687− let css_name = format!("--{}", name);
688− if !doc.css_vars.iter().any(|(n, _)| *n == css_name) {
689− element_css.push_str(&css_name);
690− element_css.push(':');
691− element_css.push_str(value);
692− element_css.push(';');
693− }
694− }
695989 element_css.push('}');
696990 }
697991 }
698992
699− let has_custom_css = !doc.custom_css.is_empty();
700− element_css.push_str(&styles.to_css_formatted(dev, !has_custom_css));
701−
702− // @keyframes
703− for (name, kf_body) in &doc.keyframes {
704− if dev {
705− element_css.push_str(&format!("@keyframes {} {{\n{}\n}}\n", name, kf_body));
706− } else {
707− element_css.push_str(&format!("@keyframes {}{{{}}}", name, kf_body));
708− }
709− }
710−
711− // Auto-inject skeleton keyframe if skeleton attribute is used
712− let skeleton_used = element_css.contains("hl-skeleton");
713− if skeleton_used {
714− if dev {
715− element_css.push_str("@keyframes hl-skeleton {\n 0% { background-position: 200% 0; }\n 100% { background-position: -200% 0; }\n}\n");
716− } else {
717− element_css.push_str("@keyframes hl-skeleton{0%{background-position:200% 0}100%{background-position:-200% 0}}");
718− }
719− }
720−
721− // Also inject carousel webkit scrollbar hiding
722− let carousel_used = element_css.contains("scroll-snap-type:x mandatory");
723− if carousel_used && !element_css.contains("::-webkit-scrollbar") {
724− // The carousel class already has scrollbar-width:none, but webkit needs pseudo-element
725− // We add a global rule for carousel-style elements
726− }
993+ element_css.push_str(&styles_css);
727994
728995 // @style blocks (custom CSS)
729996 for block in &doc.custom_css {
@@ -731,464 +998,115 @@ fn generate_full_inner(doc: &Document, dev: bool) -> String {
731998 element_css.push_str(block);
732999 element_css.push('\n');
7331000 } else {
734− // Minify: collapse whitespace
735− let minified: String = block
736− .lines()
737− .map(|l| l.trim())
738− .collect::<Vec<_>>()
739− .join("");
740− element_css.push_str(&minified);
1001+ element_css.push_str(&compact_css(block));
7411002 }
7421003 }
7431004
744− // @scope blocks
745− for block in &doc.scope_blocks {
746− if dev {
747− element_css.push_str(block);
748− element_css.push('\n');
749− } else {
750− let minified: String = block.lines().map(|l| l.trim()).collect::<Vec<_>>().join("");
751− element_css.push_str(&minified);
752− }
753− }
1005+ element_css
1006+}
7541007
755− // @starting-style blocks
756− if !doc.starting_style_blocks.is_empty() {
757− if dev {
758− element_css.push_str("@starting-style {\n");
759− for block in &doc.starting_style_blocks {
760− element_css.push_str(block);
761− element_css.push('\n');
762− }
763− element_css.push_str("}\n");
1008+/// An `@style` body on one line: each line trimmed, and the lines joined with
1009+/// a space, so a value that goes on over two lines (`margin: 0` then `auto;`)
1010+/// keeps its words apart.
1011+fn compact_css(block: &str) -> String {
1012+ block
1013+ .lines()
1014+ .map(str::trim)
1015+ .filter(|l| !l.is_empty())
1016+ .collect::<Vec<_>>()
1017+ .join(" ")
1018+}
1019+
1020+/// htmlang's own elements: those with a generated class, or the class of a
1021+/// function's scoped `@style`. The reset's rules for elements are kept to
1022+/// them, so `@raw` and `@markdown` content, and the page a fragment is put
1023+/// into, keep their own.
1024+const OWN_ELEMENTS: &str = ":where([class^=\"hl-\"],[class*=\" hl-\"])";
1025+
1026+/// htmlang's cascade layers, from the one that loses to the one that wins:
1027+/// the reset; the defaults of each element's kind (a heading's `margin:0`,
1028+/// a column's `display:flex`); the styles an element gets from an
1029+/// element prefix on an element around it (`@td:padding 8`) and from a
1030+/// function's scoped `@style`; and the element's own styles. So a
1031+/// scope's styles win over the defaults, and what an element says about
1032+/// itself wins over both. CSS outside any layer (`@style`, `@raw`) wins
1033+/// over all of them.
1034+const LAYERS: [&str; 4] = ["hl-reset", "hl-kind", "hl-inside", "htmlang"];
1035+
1036+/// Built-in reset rules, in a layer before `htmlang`: unlayered CSS beats
1037+/// every layer, so an unlayered rule here would override the generated
1038+/// ones. A page resets `box-sizing` everywhere and makes `<body>` a column
1039+/// that fills the window; a fragment, which goes into a page it doesn't
1040+/// own, touches only htmlang's own elements. In both, an element htmlang
1041+/// lays out stays hidden while it is `hidden`, a closed `<dialog>` or a
1042+/// popover that isn't showing: its generated `display` would otherwise
1043+/// beat the browser's `display: none`.
1044+fn reset_css(dev: bool, page: bool, focus_visible_css: &str) -> String {
1045+ let own = OWN_ELEMENTS;
1046+ let mut rules = Vec::new();
1047+ if page {
1048+ rules.push(if dev {
1049+ "*, *::before, *::after { box-sizing: border-box; }".to_string()
7641050 } else {
765− element_css.push_str("@starting-style{");
766− for block in &doc.starting_style_blocks {
767− let minified: String = block.lines().map(|l| l.trim()).collect::<Vec<_>>().join("");
768− element_css.push_str(&minified);
769− }
770− element_css.push('}');
771− }
1051+ "*,*::before,*::after{box-sizing:border-box}".to_string()
1052+ });
1053+ rules.push(if dev {
1054+ "body { margin: 0; font-family: system-ui, -apple-system, sans-serif; display: flex; flex-direction: column; min-height: 100dvh; }".to_string()
1055+ } else {
1056+ "body{margin:0;font-family:system-ui,-apple-system,sans-serif;display:flex;flex-direction:column;min-height:100dvh}".to_string()
1057+ });
1058+ } else {
1059+ rules.push(if dev {
1060+ format!("{own}, {own}::before, {own}::after {{ box-sizing: border-box; }}")
1061+ } else {
1062+ format!("{own},{own}::before,{own}::after{{box-sizing:border-box}}")
1063+ });
7721064 }
773−
774− // Build meta tags string
775− let meta_html = if doc.meta_tags.is_empty() {
776− String::new()
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; }}")
7771069 } else {
778− let mut m = String::new();
779− for (name, content) in &doc.meta_tags {
780− if dev {
781− m.push_str(&format!(
782− "<meta name=\"{}\" content=\"{}\">\n",
783− html_escape(name),
784− html_escape(content)
785− ));
786− } else {
787− m.push_str(&format!(
788− "<meta name=\"{}\" content=\"{}\">",
789− html_escape(name),
790− html_escape(content)
791− ));
792− }
793− }
794− m
795− };
796−
797− // Build OG meta tags
798− let og_html = if doc.og_tags.is_empty() {
799− String::new()
800− } else {
801− let mut o = String::new();
802− for (property, content) in &doc.og_tags {
803− if dev {
804− o.push_str(&format!(
805− "<meta property=\"og:{}\" content=\"{}\">\n",
806− html_escape(property),
807− html_escape(content)
808− ));
809− } else {
810− o.push_str(&format!(
811− "<meta property=\"og:{}\" content=\"{}\">",
812− html_escape(property),
813− html_escape(content)
814− ));
815− }
816− }
817− o
818− };
819−
820− // Build head blocks string
821− let head_html = if doc.head_blocks.is_empty() {
822− String::new()
823− } else {
824− let mut h = String::new();
825− for block in &doc.head_blocks {
826− h.push_str(block);
827− if dev {
828− h.push('\n');
829− }
830− }
831− h
832− };
833−
834− let lang_attr = match &doc.lang {
835− Some(lang) => format!(" lang=\"{}\"", html_escape(lang)),
836− None => String::new(),
837− };
838−
839− let favicon_html = match &doc.favicon {
840− Some(path) => {
841− // Try to read and inline the favicon
842− if let Ok(data) = std::fs::read(path) {
843− let mime = if path.ends_with(".ico") {
844− "image/x-icon"
845− } else if path.ends_with(".png") {
846− "image/png"
847− } else if path.ends_with(".svg") {
848− "image/svg+xml"
849− } else {
850− "image/x-icon"
851− };
852− let b64 = base64_encode(&data);
853− if dev {
854− format!("<link rel=\"icon\" href=\"data:{};base64,{}\">\n", mime, b64)
855− } else {
856− format!("<link rel=\"icon\" href=\"data:{};base64,{}\">", mime, b64)
857− }
858− } else {
859− // Fall back to href
860− if dev {
861− format!("<link rel=\"icon\" href=\"{}\">\n", html_escape(path))
862− } else {
863− format!("<link rel=\"icon\" href=\"{}\">", html_escape(path))
864− }
865− }
866− }
867− None => String::new(),
868− };
869−
870− // Canonical URL
871− let canonical_html = match &doc.canonical {
872− Some(url) => {
873− if dev {
874− format!("<link rel=\"canonical\" href=\"{}\">\n", html_escape(url))
875− } else {
876− format!("<link rel=\"canonical\" href=\"{}\">", html_escape(url))
877− }
878− }
879− None => String::new(),
880− };
881−
882− // Base URL
883− let base_html = match &doc.base_url {
884− Some(url) => {
885− if dev {
886− format!("<base href=\"{}\">\n", html_escape(url))
887− } else {
888− format!("<base href=\"{}\">", html_escape(url))
889− }
890− }
891− None => String::new(),
892− };
893−
894− // @font-face CSS
895− for (name, url) in &doc.font_faces {
896− let format_hint = if url.ends_with(".woff2") {
897− " format('woff2')"
898− } else if url.ends_with(".woff") {
899− " format('woff')"
900− } else if url.ends_with(".ttf") {
901− " format('truetype')"
902− } else if url.ends_with(".otf") {
903− " format('opentype')"
904− } else {
905− ""
906− };
907− if dev {
908− element_css.insert_str(0, &format!(
909− "@font-face {{\n font-family: '{}';\n src: url('{}'){};\n font-display: swap;\n}}\n",
910− name, url, format_hint
911− ));
912− } else {
913− element_css.insert_str(0, &format!(
914− "@font-face{{font-family:'{}';src:url('{}'){};font-display:swap}}",
915− name, url, format_hint
916− ));
917− }
918− }
919−
920− // JSON-LD blocks
921− let json_ld_html: String = doc.json_ld_blocks.iter().map(|block| {
922− if dev {
923− format!("<script type=\"application/ld+json\">\n{}\n</script>\n", block)
924− } else {
925− format!("<script type=\"application/ld+json\">{}</script>", block)
926− }
927− }).collect();
928−
929− // Manifest link
930− let manifest_html = if let Some(ref manifest) = doc.manifest {
931− let mut json = String::from("{");
932− json.push_str(&format!("\"name\":\"{}\",", manifest.name));
933− if let Some(ref short) = manifest.short_name {
934− json.push_str(&format!("\"short_name\":\"{}\",", short));
935− }
936− json.push_str(&format!("\"start_url\":\"{}\",", manifest.start_url));
937− json.push_str(&format!("\"display\":\"{}\"", manifest.display));
938− if let Some(ref bg) = manifest.background_color {
939− json.push_str(&format!(",\"background_color\":\"{}\"", bg));
940− }
941− if let Some(ref tc) = manifest.theme_color {
942− json.push_str(&format!(",\"theme_color\":\"{}\"", tc));
943− }
944− if let Some(ref desc) = manifest.description {
945− json.push_str(&format!(",\"description\":\"{}\"", desc));
946− }
947− if !manifest.icons.is_empty() {
948− json.push_str(",\"icons\":[");
949− for (i, (src, sizes)) in manifest.icons.iter().enumerate() {
950− if i > 0 { json.push(','); }
951− json.push_str(&format!("{{\"src\":\"{}\",\"sizes\":\"{}\",\"type\":\"image/png\"}}", src, sizes));
952− }
953− json.push(']');
954− }
955− json.push('}');
956−
957− // Inline the manifest as a data URI
958− let encoded = base64_encode(json.as_bytes());
959− if dev {
960− format!("<link rel=\"manifest\" href=\"data:application/manifest+json;base64,{}\">\n", encoded)
961− } else {
962− format!("<link rel=\"manifest\" href=\"data:application/manifest+json;base64,{}\">", encoded)
963− }
964− } else {
965− String::new()
966− };
967−
968− // Preload hints (auto-detect fonts from @font-face)
969− let mut preload_html = String::new();
970− for (_, url) in &doc.font_faces {
971− if dev {
972− preload_html.push_str(&format!(
973− "<link rel=\"preload\" href=\"{}\" as=\"font\" type=\"font/woff2\" crossorigin>\n", url
974− ));
975− } else {
976− preload_html.push_str(&format!(
977− "<link rel=\"preload\" href=\"{}\" as=\"font\" type=\"font/woff2\" crossorigin>", url
978− ));
979− }
980− }
981− // Explicit preload hints from the document
982− for hint in &doc.preload_hints {
983− if dev {
984− preload_html.push_str(&format!(
985− "<link rel=\"preload\" href=\"{}\" as=\"{}\"{}>\n",
986− html_escape(&hint.href), hint.as_type,
987− if hint.crossorigin { " crossorigin" } else { "" }
988− ));
989− } else {
990− preload_html.push_str(&format!(
991− "<link rel=\"preload\" href=\"{}\" as=\"{}\"{}>",
992− html_escape(&hint.href), hint.as_type,
993− if hint.crossorigin { " crossorigin" } else { "" }
994− ));
995− }
996− }
997−
998− // Auto theme-color meta from @theme primary token
999− let theme_color_html = doc.theme_tokens.iter()
1000− .find(|(name, _)| name == "primary" || name == "theme-color")
1001− .map(|(_, value)| {
1002− if dev {
1003− format!("<meta name=\"theme-color\" content=\"{}\">\n", html_escape(value))
1004− } else {
1005− format!("<meta name=\"theme-color\" content=\"{}\">", html_escape(value))
1006− }
1007− })
1008− .unwrap_or_default();
1009−
1010− // Focus-visible CSS for interactive elements (accessibility)
1011− let focus_visible_css = if ctx.has_interactive {
1012− if dev {
1013− "a:focus-visible, button:focus-visible, input:focus-visible, select:focus-visible, textarea:focus-visible { outline: 2px solid currentColor; outline-offset: 2px; }\n"
1014− } else {
1015− "a:focus-visible,button:focus-visible,input:focus-visible,select:focus-visible,textarea:focus-visible{outline:2px solid currentColor;outline-offset:2px}"
1016− }
1017− } else {
1018− ""
1019− };
1020−
1021− // Skip-to-content CSS (visually hidden but accessible)
1022− let skip_link_css = if has_main {
1023− if dev {
1024− ".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"
1025− } else {
1026− ".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}"
1027− }
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+ )
10281083 } else {
1029− ""
1030− };
1031−
1032− // Noscript fallback: show deferred content if JS is disabled
1033− let noscript_html = if ctx.has_defer {
1034− if dev {
1035− "<noscript><style>.hl-defer-placeholder { display: none; }</style></noscript>\n"
1036− } else {
1037− "<noscript><style>.hl-defer-placeholder{display:none}</style></noscript>"
1038− }
1039− } else {
1040− ""
1041− };
1042−
1043− match &doc.page_title {
1044− Some(title) => {
1045− if dev {
1046− format!(
1047− "\
1048−<!DOCTYPE html>
1049−<html{lang_attr}>
1050−<head>
1051−<meta charset=\"utf-8\">
1052−<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">
1053−<title>{title}</title>
1054−{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}\
1055−<style>
1056−*, *::before, *::after {{ box-sizing: border-box; }}
1057−body {{ margin: 0; font-family: system-ui, -apple-system, sans-serif; }}
1058−img {{ display: block; }}
1059−{focus_visible_css}{skip_link_css}{element_css}\
1060−</style>
1061−{noscript_html}\
1062−</head>
1063−<body>
1064−{body}\
1065−</body>
1066−</html>
1067−",
1068− title = html_escape(title),
1069− lang_attr = lang_attr,
1070− theme_color_html = theme_color_html,
1071− base_html = base_html,
1072− canonical_html = canonical_html,
1073− manifest_html = manifest_html,
1074− preload_html = preload_html,
1075− dns_prefetch_html = dns_prefetch_html,
1076− meta_html = meta_html,
1077− favicon_html = favicon_html,
1078− json_ld_html = json_ld_html,
1079− head_html = head_html,
1080− og_html = og_html,
1081− focus_visible_css = focus_visible_css,
1082− skip_link_css = skip_link_css,
1083− noscript_html = noscript_html,
1084− element_css = element_css,
1085− body = body,
1086− )
1087− } else {
1088− format!(
1089− "<!DOCTYPE html><html{lang_attr}><head><meta charset=\"utf-8\"><meta name=\"viewport\" content=\"width=device-width, initial-scale=1\"><title>{title}</title>{theme_color_html}{base_html}{canonical_html}{manifest_html}{preload_html}{dns_prefetch_html}{meta_html}{og_html}{favicon_html}{json_ld_html}{head_html}<style>*,*::before,*::after{{box-sizing:border-box}}body{{margin:0;font-family:system-ui,-apple-system,sans-serif}}img{{display:block}}{focus_visible_css}{skip_link_css}{element_css}</style>{noscript_html}</head><body>{body}</body></html>",
1090− title = html_escape(title),
1091− lang_attr = lang_attr,
1092− theme_color_html = theme_color_html,
1093− base_html = base_html,
1094− canonical_html = canonical_html,
1095− manifest_html = manifest_html,
1096− preload_html = preload_html,
1097− dns_prefetch_html = dns_prefetch_html,
1098− meta_html = meta_html,
1099− og_html = og_html,
1100− favicon_html = favicon_html,
1101− json_ld_html = json_ld_html,
1102− head_html = head_html,
1103− focus_visible_css = focus_visible_css,
1104− skip_link_css = skip_link_css,
1105− noscript_html = noscript_html,
1106− element_css = element_css,
1107− body = body,
1108− )
1109− }
1110− }
1111− None => {
1112− if element_css.is_empty() {
1113− body
1114− } else {
1115− if dev {
1116− format!("<style>\n{}</style>\n{}", element_css, body)
1117− } else {
1118− format!("<style>{}</style>{}", element_css, body)
1119− }
1120− }
1121− }
1084+ format!("@layer {};@layer hl-reset{{{}}}", LAYERS.join(","), rules)
11221085 }
11231086}
11241087
11251088/// Generate an HTML fragment: body + optional <style>, no <html>/<head>/<body> wrapper.
1126−fn generate_partial_inner(doc: &Document, dev: bool) -> String {
1089+fn generate_partial_inner(doc: &Document, dev: bool, classes: &mut Vec<Class>) -> String {
11271090 let mut styles = StyleCollector::new();
1128− let mut ctx = GenContext { dev, depth: 0, image_count: 0, has_interactive: false, has_defer: false };
1091+ let mut ctx = GenContext {
1092+ dev,
1093+ depth: 0,
1094+ has_interactive: false,
1095+ in_text: false,
1096+ flow: Flow::default(),
1097+ in_picture: false,
1098+ };
11291099 let mut body = String::new();
11301100
1131− for node in &doc.nodes {
1132− generate_node(node, None, &mut body, &mut styles, &mut ctx);
1133− }
1134−
1135− let has_custom_css = !doc.custom_css.is_empty();
1136− let mut element_css = String::new();
1137−
1138− // CSS custom properties
1139− if !doc.css_vars.is_empty() || !doc.theme_tokens.is_empty() {
1140− if dev {
1141− element_css.push_str(":root {\n");
1142− for (name, value) in &doc.css_vars {
1143− element_css.push_str(&format!(" {}: {};\n", name, value));
1144− }
1145− for (name, value) in &doc.theme_tokens {
1146− let css_name = format!("--{}", name);
1147− if !doc.css_vars.iter().any(|(n, _)| *n == css_name) {
1148− element_css.push_str(&format!(" {}: {};\n", css_name, value));
1149− }
1150− }
1151− element_css.push_str("}\n");
1152− } else {
1153− element_css.push_str(":root{");
1154− for (name, value) in &doc.css_vars {
1155− element_css.push_str(name);
1156− element_css.push(':');
1157− element_css.push_str(value);
1158− element_css.push(';');
1159− }
1160− for (name, value) in &doc.theme_tokens {
1161− let css_name = format!("--{}", name);
1162− if !doc.css_vars.iter().any(|(n, _)| *n == css_name) {
1163− element_css.push_str(&css_name);
1164− element_css.push(':');
1165− element_css.push_str(value);
1166− element_css.push(';');
1167− }
1168− }
1169− element_css.push('}');
1170− }
1171− }
1172−
1173− element_css.push_str(&styles.to_css_formatted(dev, !has_custom_css));
1174−
1175− for (name, kf_body) in &doc.keyframes {
1176− if dev {
1177− element_css.push_str(&format!("@keyframes {} {{\n{}\n}}\n", name, kf_body));
1178− } else {
1179− element_css.push_str(&format!("@keyframes {}{{{}}}", name, kf_body));
1180− }
1181− }
1101+ generate_children(&doc.nodes, None, &mut body, &mut styles, &mut ctx);
11821102
1183− for block in &doc.custom_css {
1184− if dev {
1185− element_css.push_str(block);
1186− element_css.push('\n');
1187− } else {
1188− let minified: String = block.lines().map(|l| l.trim()).collect::<Vec<_>>().join("");
1189− element_css.push_str(&minified);
1190− }
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, ""));
11911108 }
1109+ classes.extend(styles.classes());
11921110
11931111 if element_css.is_empty() {
11941112 body
@@ -1203,29 +1121,20 @@ fn generate_partial_inner(doc: &Document, dev: bool) -> String {
12031121// Node generation
12041122// ---------------------------------------------------------------------------
12051123
1124+/// Write `node`, which is inside an element with the layout `parent`
1125+/// (`None` at the top of the page).
12061126fn generate_node(
12071127 node: &Node,
1208− parent_kind: Option<&ElementKind>,
1128+ parent: Option<Layout>,
12091129 out: &mut String,
12101130 styles: &mut StyleCollector,
12111131 ctx: &mut GenContext,
12121132) {
12131133 match node {
1214− Node::Element(elem) => generate_element(elem, parent_kind, out, styles, ctx),
1134+ Node::Element(elem) => generate_element(elem, parent, out, styles, ctx),
12151135 Node::Text(segments) => {
1216− let needs_wrap = matches!(
1217− parent_kind,
1218− Some(ElementKind::Row) | Some(ElementKind::Column) | Some(ElementKind::El)
1219− | Some(ElementKind::Nav) | Some(ElementKind::Header) | Some(ElementKind::Footer)
1220− | Some(ElementKind::Main) | Some(ElementKind::Section) | Some(ElementKind::Article)
1221− | Some(ElementKind::Aside) | Some(ElementKind::ListItem)
1222− | Some(ElementKind::Form) | Some(ElementKind::Details) | Some(ElementKind::Figure)
1223− | Some(ElementKind::Blockquote)
1224− | Some(ElementKind::Dialog) | Some(ElementKind::DefinitionList)
1225− | Some(ElementKind::DefinitionDescription) | Some(ElementKind::Fieldset)
1226− | Some(ElementKind::Datalist) | Some(ElementKind::Grid) | Some(ElementKind::Stack)
1227− | Some(ElementKind::Noscript) | Some(ElementKind::Address) | Some(ElementKind::Search)
1228− );
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);
12291138 if needs_wrap {
12301139 out.push_str(&ctx.indent());
12311140 out.push_str("<span>");
@@ -1244,113 +1153,197 @@ fn generate_node(
12441153 }
12451154}
12461155
1247−/// HTML attributes that are passed through to the HTML tag rather than converted to CSS.
1248−const HTML_PASSTHROUGH_ATTRS: &[&str] = &[
1249− "type", "placeholder", "name", "value", "disabled", "required", "checked",
1250− "for", "action", "method", "autocomplete",
1251− "min", "max", "step", "pattern", "maxlength", "rows", "cols", "multiple",
1252− "alt", "role", "tabindex", "title", "autofocus",
1253− // Media
1254− "controls", "autoplay", "loop", "muted", "poster", "preload",
1255− // Image optimization
1256− "loading", "decoding",
1257− // Media src (explicit attribute form)
1258− "src",
1259− // New element attributes
1260− "datetime", "media", "sizes", "srcset", "list",
1261− // Details
1262− "open",
1263− // Form
1264− "novalidate",
1265− // Progress/Meter
1266− "low", "high", "optimum",
1267− // Table
1268− "colspan", "rowspan", "scope",
1269− // Popover API
1270− "popover", "popovertarget", "popovertargetaction",
1271− // Modern form/input hints
1272− "inputmode", "enterkeyhint",
1273− // Performance hints
1274− "fetchpriority", "blocking",
1275− // Global attrs
1276− "translate", "spellcheck",
1277− // ARIA live regions
1278− "aria-live", "aria-atomic", "aria-relevant",
1279−];
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+}
12801170
1281−/// Boolean HTML attributes (rendered without a value, e.g., `<input disabled>`).
1282−const BOOLEAN_HTML_ATTRS: &[&str] = &[
1283− "disabled", "required", "checked", "multiple",
1284− "controls", "autoplay", "loop", "muted",
1285− "open", "novalidate", "autofocus",
1286− "defer", "async", "nomodule",
1287− // Popover
1288− "popover",
1289−];
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+}
12901183
1291−fn emit_html_passthrough_attrs(out: &mut String, attrs: &[Attribute]) {
1292− for attr in attrs {
1293− let key = attr.key.as_str();
1294− let is_passthrough = HTML_PASSTHROUGH_ATTRS.contains(&key)
1295− || key.starts_with("aria-")
1296− || key.starts_with("data-");
1297− 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);
12981201 continue;
12991202 }
1300− if BOOLEAN_HTML_ATTRS.contains(&key) && attr.value.is_none() {
1301− out.push(' ');
1302− out.push_str(key);
1303− } else if let Some(val) = &attr.value {
1304− out.push(' ');
1305− out.push_str(key);
1306− out.push_str("=\"");
1307− out.push_str(&html_escape(val));
1308− 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;
1216+ }
1217+ *previous = Some(matches!(child, Node::Text(_)));
1218+ }
1219+}
1220+
1221+/// Emit the element's leading argument as its attribute (`@iframe URL` →
1222+/// `src="URL"`, `@form /submit` → `action="/submit"`, `@link /a` →
1223+/// `href="/a"`), first, before the class. `@image [inline] photo.png` puts
1224+/// the file itself into the page.
1225+fn emit_argument_attr(out: &mut String, elem: &Element, in_picture: bool) {
1226+ let (Some(attr), Some(value)) = (elem.kind.leading_attribute(in_picture), &elem.argument)
1227+ else {
1228+ return;
1229+ };
1230+ // `@image [inline]`'s file is already a `data:` URI (see the parser)
1231+ let value = html_escape(value);
1232+ out.push(' ');
1233+ out.push_str(attr);
1234+ out.push_str("=\"");
1235+ out.push_str(&value);
1236+ out.push('"');
1237+}
1238+
1239+/// A file's bytes as a `data:` URI, its type from its extension.
1240+pub(crate) fn data_uri(path: &str, data: &[u8]) -> String {
1241+ let mime = match path
1242+ .rsplit('.')
1243+ .next()
1244+ .map(str::to_ascii_lowercase)
1245+ .as_deref()
1246+ {
1247+ Some("png") => "image/png",
1248+ Some("jpg" | "jpeg") => "image/jpeg",
1249+ Some("gif") => "image/gif",
1250+ Some("webp") => "image/webp",
1251+ Some("avif") => "image/avif",
1252+ Some("svg") => "image/svg+xml",
1253+ Some("ico") => "image/x-icon",
1254+ _ => "application/octet-stream",
1255+ };
1256+ format!("data:{};base64,{}", mime, base64_encode(data))
1257+}
1258+
1259+/// Emit HTML attributes: `key=value` ones (except `id` / `class`, which
1260+/// are emitted with the generated class) and flags like `required`.
1261+fn emit_html_attrs(out: &mut String, attrs: &[Attribute]) {
1262+ for attr in html_attrs(attrs) {
1263+ let key = attr.key.as_str();
1264+ if key != "id" && key != "class" {
1265+ push_html_attr(out, attr);
13091266 }
13101267 }
13111268}
13121269
1270+/// The HTML attributes of `attrs`, `key=value` ones and flags, each name
1271+/// once: the later one wins, as a style does. (Of two attributes with one
1272+/// name, the browser keeps the first, so a bundle's attribute or a
1273+/// function's own would win over one written after it.)
1274+fn html_attrs(attrs: &[Attribute]) -> impl Iterator<Item = &Attribute> {
1275+ let is_html =
1276+ |a: &Attribute| a.html || (a.value.is_none() && crate::vocab::is_html_flag(&a.key));
1277+ attrs.iter().enumerate().filter_map(move |(i, attr)| {
1278+ let later = attrs[i + 1..]
1279+ .iter()
1280+ .any(|other| is_html(other) && other.key == attr.key);
1281+ (is_html(attr) && !later).then_some(attr)
1282+ })
1283+}
1284+
1285+/// ` key="value"`, or ` key` for a flag.
1286+fn push_html_attr(out: &mut String, attr: &Attribute) {
1287+ out.push(' ');
1288+ out.push_str(&attr.key);
1289+ if attr.html {
1290+ out.push_str("=\"");
1291+ // Quoted text has already lost its quotes (see parser.rs)
1292+ out.push_str(&html_escape(attr.value.as_deref().unwrap_or("")));
1293+ out.push('"');
1294+ }
1295+}
1296+
1297+// True if any direct child is `@in-front` or `@behind`. Such children render
1298+// as absolutely positioned overlays, so the parent automatically becomes a
1299+// positioning context (position:relative + isolation:isolate).
1300+fn has_overlay_children(elem: &Element) -> bool {
1301+ holds_overlays(&elem.children)
1302+}
1303+
1304+fn holds_overlays(children: &[Node]) -> bool {
1305+ children.iter().any(|child| {
1306+ matches!(
1307+ child,
1308+ Node::Element(e) if e.kind.is_tag("in-front") || e.kind.is_tag("behind")
1309+ )
1310+ })
1311+}
1312+
13131313fn generate_element(
13141314 elem: &Element,
1315− parent_kind: Option<&ElementKind>,
1315+ parent: Option<Layout>,
13161316 out: &mut String,
13171317 styles: &mut StyleCollector,
13181318 ctx: &mut GenContext,
13191319) {
13201320 // Self-closing elements
1321− if matches!(elem.kind, ElementKind::Image | ElementKind::Input | ElementKind::HorizontalRule | ElementKind::Source | ElementKind::Spacer) {
1322− 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);
13231323 return;
13241324 }
1325− // @script renders as <script> with raw body content (no HTML escaping)
1326− 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);
13271329 out.push_str(&ctx.indent());
1328− out.push_str("<script");
1329− // Pass through src, type, defer, async, etc.
1330− for attr in &elem.attrs {
1331− let key = attr.key.as_str();
1332− if matches!(key, "src" | "type" | "defer" | "async" | "crossorigin" | "integrity" | "nomodule" | "id") {
1333− if let Some(val) = &attr.value {
1334− out.push(' ');
1335− out.push_str(key);
1336− out.push_str("=\"");
1337− out.push_str(&html_escape(val));
1338− out.push('"');
1339− } else {
1340− out.push(' ');
1341− out.push_str(key);
1342− }
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)));
13431337 }
13441338 }
1339+ emit_html_attrs(out, &elem.attrs);
13451340 out.push('>');
1346− // Children are raw JS code, not HTML
13471341 for child in &elem.children {
13481342 match child {
13491343 Node::Text(segments) => {
13501344 for seg in segments {
1351− match seg {
1352− TextSegment::Plain(text) => out.push_str(text),
1353− _ => {}
1345+ if let TextSegment::Plain(text) = seg {
1346+ out.push_str(text)
13541347 }
13551348 }
13561349 }
@@ -1358,46 +1351,10 @@ fn generate_element(
13581351 _ => {}
13591352 }
13601353 }
1361− out.push_str("</script>");
1362− out.push_str(ctx.nl());
1363− return;
1364− }
1365− // @breadcrumb generates semantic <nav aria-label="breadcrumb"><ol>...</ol></nav>
1366− if elem.kind == ElementKind::Breadcrumb {
1367− let gen_class = compute_class(&elem.attrs, &elem.kind, parent_kind, styles);
1368− let (id, user_class) = extract_id_class(&elem.attrs);
1369− out.push_str(&ctx.indent());
1370− out.push_str("<nav aria-label=\"breadcrumb\"");
1371− emit_class_attr(out, gen_class.as_deref(), user_class.as_deref());
1372− if let Some(id) = id {
1373− out.push_str(" id=\"");
1374− out.push_str(&html_escape(&id));
1375− out.push('"');
1376− }
1354+ out.push_str("</");
1355+ out.push_str(tag);
13771356 out.push('>');
13781357 out.push_str(ctx.nl());
1379− ctx.depth += 1;
1380− out.push_str(&ctx.indent());
1381− out.push_str("<ol>");
1382− out.push_str(ctx.nl());
1383− ctx.depth += 1;
1384− for child in &elem.children {
1385− out.push_str(&ctx.indent());
1386− out.push_str("<li>");
1387− let mut buf = String::new();
1388− generate_node(child, Some(&elem.kind), &mut buf, styles, ctx);
1389− out.push_str(buf.trim());
1390− out.push_str("</li>");
1391− out.push_str(ctx.nl());
1392− }
1393− ctx.depth -= 1;
1394− out.push_str(&ctx.indent());
1395− out.push_str("</ol>");
1396− out.push_str(ctx.nl());
1397− ctx.depth -= 1;
1398− out.push_str(&ctx.indent());
1399− out.push_str("</nav>");
1400− out.push_str(ctx.nl());
14011358 return;
14021359 }
14031360 if elem.kind == ElementKind::Children {
@@ -1407,266 +1364,54 @@ fn generate_element(
14071364 return;
14081365 }
14091366 if elem.kind == ElementKind::Fragment {
1410− // Render children without a wrapper element
1411− for child in &elem.children {
1412− generate_node(child, parent_kind, out, styles, ctx);
1413− }
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);
14141370 return;
14151371 }
14161372
1373+ let mut own = Flow::of(elem);
14171374 let tag = match &elem.kind {
1418− ElementKind::Row | ElementKind::Column | ElementKind::El
1419− | ElementKind::Grid | ElementKind::Stack => "div",
1375+ ElementKind::Row | ElementKind::El => "div",
14201376 ElementKind::Text => "span",
14211377 ElementKind::Paragraph => "p",
14221378 ElementKind::Link => "a",
1423− ElementKind::Button => "button",
1424− ElementKind::Select => "select",
1425− ElementKind::Textarea => "textarea",
1426− ElementKind::Option => "option",
1427− ElementKind::Label => "label",
1428− // Semantic elements
1429− ElementKind::Nav => "nav",
1430− ElementKind::Header => "header",
1431− ElementKind::Footer => "footer",
1432− ElementKind::Main => "main",
1433− ElementKind::Section => "section",
1434− ElementKind::Article => "article",
1435− ElementKind::Aside => "aside",
1436− // List
1437− ElementKind::List => {
1438− if elem.attrs.iter().any(|a| a.key == "ordered") { "ol" } else { "ul" }
1439− }
1440− ElementKind::ListItem => "li",
1441− // Table
1442− ElementKind::Table => "table",
1443− ElementKind::TableHead => "thead",
1444− ElementKind::TableBody => "tbody",
1445− ElementKind::TableRow => "tr",
1446− ElementKind::TableCell => "td",
1447− ElementKind::TableHeaderCell => "th",
1448− // Media
1449− ElementKind::Video => "video",
1450− ElementKind::Audio => "audio",
1451− // Additional semantic elements
1452− ElementKind::Form => "form",
1453− ElementKind::Details => "details",
1454− ElementKind::Summary => "summary",
1455− ElementKind::Blockquote => "blockquote",
1456− ElementKind::Cite => "cite",
1457− ElementKind::Code => "code",
1458− ElementKind::Pre => "pre",
1459− ElementKind::Figure => "figure",
1460− ElementKind::FigCaption => "figcaption",
1461− ElementKind::Progress => "progress",
1462− ElementKind::Meter => "meter",
1463− // New elements
1464− ElementKind::Dialog => "dialog",
1465− ElementKind::DefinitionList => "dl",
1466− ElementKind::DefinitionTerm => "dt",
1467− ElementKind::DefinitionDescription => "dd",
1468− ElementKind::Fieldset => "fieldset",
1469− ElementKind::Legend => "legend",
1470− ElementKind::Picture => "picture",
1471− ElementKind::Time => "time",
1472− ElementKind::Mark => "mark",
1473− ElementKind::Kbd => "kbd",
1474− ElementKind::Abbr => "abbr",
1475− ElementKind::Datalist => "datalist",
1476− ElementKind::Iframe => "iframe",
1477− ElementKind::Output => "output",
1478− ElementKind::Canvas => "canvas",
1479− ElementKind::Badge => "span",
1480− ElementKind::Tooltip => "span",
1481− ElementKind::Avatar => "div",
1482− ElementKind::Carousel => "div",
1483− ElementKind::Chip => "span",
1484− ElementKind::Tag => "span",
1485− ElementKind::Noscript => "noscript",
1486− ElementKind::Address => "address",
1487− ElementKind::Search => "search",
1488− ElementKind::Image | ElementKind::Input | ElementKind::HorizontalRule
1489− | ElementKind::Children | ElementKind::Slot(_) | ElementKind::Fragment
1490− | ElementKind::Source | ElementKind::Spacer
1491− | ElementKind::Script | ElementKind::Breadcrumb => unreachable!(),
1492− };
1493−
1494− let kind_label = match elem.kind {
1495− ElementKind::Row => "row",
1496− ElementKind::Column => "column",
1497− ElementKind::El => "el",
1498− ElementKind::Text => "text",
1499− ElementKind::Paragraph => "paragraph",
1500− ElementKind::Link => "link",
1501− ElementKind::Button => "button",
1502− ElementKind::Select => "select",
1503− ElementKind::Textarea => "textarea",
1504− ElementKind::Option => "option",
1505− ElementKind::Label => "label",
1506− ElementKind::Nav => "nav",
1507− ElementKind::Header => "header",
1508− ElementKind::Footer => "footer",
1509− ElementKind::Main => "main",
1510− ElementKind::Section => "section",
1511− ElementKind::Article => "article",
1512− ElementKind::Aside => "aside",
1513− ElementKind::List => "list",
1514− ElementKind::ListItem => "item",
1515− ElementKind::Table => "table",
1516− ElementKind::TableHead => "thead",
1517− ElementKind::TableBody => "tbody",
1518− ElementKind::TableRow => "tr",
1519− ElementKind::TableCell => "td",
1520− ElementKind::TableHeaderCell => "th",
1521− ElementKind::Video => "video",
1522− ElementKind::Audio => "audio",
1523− ElementKind::Form => "form",
1524− ElementKind::Details => "details",
1525− ElementKind::Summary => "summary",
1526− ElementKind::Blockquote => "blockquote",
1527− ElementKind::Cite => "cite",
1528− ElementKind::Code => "code",
1529− ElementKind::Pre => "pre",
1530− ElementKind::Figure => "figure",
1531− ElementKind::FigCaption => "figcaption",
1532− ElementKind::Fragment => "fragment",
1533− ElementKind::Dialog => "dialog",
1534− ElementKind::DefinitionList => "dl",
1535− ElementKind::DefinitionTerm => "dt",
1536− ElementKind::DefinitionDescription => "dd",
1537− ElementKind::Fieldset => "fieldset",
1538− ElementKind::Legend => "legend",
1539− ElementKind::Picture => "picture",
1540− ElementKind::Time => "time",
1541− ElementKind::Mark => "mark",
1542− ElementKind::Kbd => "kbd",
1543− ElementKind::Abbr => "abbr",
1544− ElementKind::Datalist => "datalist",
1545− ElementKind::Iframe => "iframe",
1546− ElementKind::Output => "output",
1547− ElementKind::Canvas => "canvas",
1548− ElementKind::Grid => "grid",
1549− ElementKind::Stack => "stack",
1550− ElementKind::Badge => "badge",
1551− ElementKind::Tooltip => "tooltip",
1552− ElementKind::Avatar => "avatar",
1553− ElementKind::Carousel => "carousel",
1554− ElementKind::Chip => "chip",
1555− ElementKind::Tag => "tag",
1556− ElementKind::Noscript => "noscript",
1557− ElementKind::Address => "address",
1558− ElementKind::Search => "search",
1379+ ElementKind::Tag(spec) => spec.html,
15591380 _ => "",
15601381 };
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();
15611388
15621389 // Track interactive elements for focus-visible CSS
1563− if matches!(elem.kind, ElementKind::Link | ElementKind::Button | ElementKind::Input
1564− | ElementKind::Select | ElementKind::Textarea) {
1390+ if elem.kind == ElementKind::Link
1391+ || matches!(kind_label, "button" | "input" | "select" | "textarea")
1392+ {
15651393 ctx.has_interactive = true;
15661394 }
15671395
15681396 // Compute CSS for each state and get a class name
1569− let gen_class = compute_class(&elem.attrs, &elem.kind, parent_kind, styles);
1397+ let gen_class = element_class(elem, &Site::new(elem, parent, &ctx.flow), styles);
1398+ own.class = gen_class.clone();
15701399 let (id, user_class) = extract_id_class(&elem.attrs);
15711400
15721401 if ctx.dev && elem.line_num > 0 {
15731402 out.push_str(&ctx.indent());
1574− out.push_str(&format!("<!-- @{} line {} -->\n", kind_label, elem.line_num));
1403+ out.push_str(&format!(
1404+ "<!-- @{} line {} -->\n",
1405+ kind_label, elem.line_num
1406+ ));
15751407 }
15761408 out.push_str(&ctx.indent());
15771409 out.push('<');
15781410 out.push_str(tag);
15791411
1580− // @main gets id="hl-main" for skip-to-content link (unless user set an id)
1581− if elem.kind == ElementKind::Main && id.is_none() {
1582− out.push_str(" id=\"hl-main\"");
1583− }
1584−
1585− if elem.kind == ElementKind::Link {
1586− if let Some(url) = &elem.argument {
1587− out.push_str(" href=\"");
1588− out.push_str(&html_escape(url));
1589− out.push('"');
1590− // Auto rel="noopener noreferrer" and target="_blank" for external links
1591− let is_external = url.starts_with("http://") || url.starts_with("https://");
1592− if is_external {
1593− let has_rel = elem.attrs.iter().any(|a| a.key == "rel");
1594− let has_target = elem.attrs.iter().any(|a| a.key == "target");
1595− if !has_rel {
1596− out.push_str(" rel=\"noopener noreferrer\"");
1597− }
1598− if !has_target {
1599− out.push_str(" target=\"_blank\"");
1600− }
1601− }
1602− }
1603− }
1604−
1605− // Video/Audio src
1606− if matches!(elem.kind, ElementKind::Video | ElementKind::Audio) {
1607− if let Some(src) = &elem.argument {
1608− out.push_str(" src=\"");
1609− out.push_str(&html_escape(src));
1610− out.push('"');
1611− }
1612− }
1613−
1614− // Form action
1615− if elem.kind == ElementKind::Form {
1616− if let Some(action) = &elem.argument {
1617− out.push_str(" action=\"");
1618− out.push_str(&html_escape(action));
1619− out.push('"');
1620− }
1621− }
1622−
1623− // Iframe src
1624− if elem.kind == ElementKind::Iframe {
1625− if let Some(src) = &elem.argument {
1626− out.push_str(" src=\"");
1627− out.push_str(&html_escape(src));
1628− out.push('"');
1629− }
1630− }
1631−
1632− // Tooltip title
1633− if elem.kind == ElementKind::Tooltip {
1634− if let Some(text) = &elem.argument {
1635− out.push_str(" title=\"");
1636− out.push_str(&html_escape(text));
1637− out.push('"');
1638− }
1639− }
1640−
1641− // Time datetime
1642− if elem.kind == ElementKind::Time {
1643− if let Some(dt) = elem.attrs.iter().find(|a| a.key == "datetime") {
1644− if let Some(val) = &dt.value {
1645− out.push_str(" datetime=\"");
1646− out.push_str(&html_escape(val));
1647− out.push('"');
1648− }
1649− }
1650− }
1412+ emit_argument_attr(out, elem, ctx.in_picture);
16511413
1652− // Critical CSS: inline styles directly instead of using a class
1653− let is_critical = elem.attrs.iter().any(|a| a.key == "critical");
1654− if is_critical {
1655− let inline_css = attrs_to_css(&elem.attrs, "", &elem.kind, parent_kind);
1656− if !inline_css.is_empty() {
1657− out.push_str(" style=\"");
1658− out.push_str(&html_escape(&inline_css));
1659− out.push('"');
1660− }
1661− // Still use class for non-base styles (pseudo, responsive, etc.)
1662− if gen_class.as_deref().map_or(false, |c| !c.is_empty()) {
1663− emit_class_attr(out, gen_class.as_deref(), user_class.as_deref());
1664− } else if let Some(ref uc) = user_class {
1665− emit_class_attr(out, None, Some(uc));
1666− }
1667− } else {
1668− emit_class_attr(out, gen_class.as_deref(), user_class.as_deref());
1669− }
1414+ emit_class_attr(out, gen_class.as_deref(), user_class.as_deref());
16701415
16711416 if let Some(id) = id {
16721417 out.push_str(" id=\"");
@@ -1674,60 +1419,38 @@ fn generate_element(
16741419 out.push('"');
16751420 }
16761421
1677− emit_html_passthrough_attrs(out, &elem.attrs);
1422+ emit_html_attrs(out, &elem.attrs);
16781423
16791424 // Source map attributes in dev mode
16801425 if ctx.dev && elem.line_num > 0 {
1681− out.push_str(&format!(" data-hl-line=\"{}\" data-hl-el=\"{}\"", elem.line_num, kind_label));
1426+ out.push_str(&format!(
1427+ " data-hl-line=\"{}\" data-hl-el=\"{}\"",
1428+ elem.line_num, kind_label
1429+ ));
16821430 }
16831431
16841432 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");
16851438 out.push_str(ctx.nl());
16861439
1687− // Inline text argument
1688− if matches!(
1689− elem.kind,
1690− ElementKind::Text
1691− | ElementKind::Button
1692− | ElementKind::Label
1693− | ElementKind::Option
1694− | ElementKind::Textarea
1695− | ElementKind::ListItem
1696− | ElementKind::TableCell
1697− | ElementKind::TableHeaderCell
1698− | ElementKind::Summary
1699− | ElementKind::Cite
1700− | ElementKind::Code
1701− | ElementKind::FigCaption
1702− | ElementKind::Legend
1703− | ElementKind::DefinitionTerm
1704− | ElementKind::Mark
1705− | ElementKind::Kbd
1706− | ElementKind::Abbr
1707− | ElementKind::Time
1708− | ElementKind::DefinitionDescription
1709− | ElementKind::Badge
1710− | ElementKind::Tooltip
1711− | ElementKind::Chip
1712− | ElementKind::Tag
1713− ) {
1714− if let Some(text) = &elem.argument {
1715− out.push_str(&html_escape(text));
1716− }
1717− }
1718−
1719− // Children
1440+ let layout = elem.kind.layout();
17201441 ctx.depth += 1;
1721− let is_paragraph = elem.kind == ElementKind::Paragraph;
1722− for (i, child) in elem.children.iter().enumerate() {
1723− generate_node(child, Some(&elem.kind), out, styles, ctx);
1724− if is_paragraph && i < elem.children.len() - 1 {
1725− out.push(' ');
1726− }
1727− }
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;
17281450 ctx.depth -= 1;
17291451
17301452 out.push_str(&ctx.indent());
1453+ ctx.dev = outer_dev;
17311454 out.push_str("</");
17321455 out.push_str(tag);
17331456 out.push('>');
@@ -1736,60 +1459,31 @@ fn generate_element(
17361459
17371460fn generate_self_closing(
17381461 elem: &Element,
1739− parent_kind: Option<&ElementKind>,
1462+ parent: Option<Layout>,
17401463 out: &mut String,
17411464 styles: &mut StyleCollector,
17421465 ctx: &mut GenContext,
17431466) {
1744− let gen_class = compute_class(&elem.attrs, &elem.kind, parent_kind, styles);
1467+ let gen_class = element_class(elem, &Site::new(elem, parent, &ctx.flow), styles);
17451468 let (id, user_class) = extract_id_class(&elem.attrs);
17461469
1747− let (tag, kind_label) = match elem.kind {
1470+ let (tag, kind_label) = match &elem.kind {
17481471 ElementKind::Image => ("img", "image"),
1749− ElementKind::Input => ("input", "input"),
1750− ElementKind::HorizontalRule => ("hr", "hr"),
1751− ElementKind::Source => ("source", "source"),
1752− ElementKind::Spacer => ("div", "spacer"),
1753− _ => unreachable!(),
1472+ ElementKind::Tag(spec) => (spec.html, spec.name),
1473+ _ => unreachable!("not a void element: {:?}", elem.kind),
17541474 };
17551475
17561476 if ctx.dev && elem.line_num > 0 {
17571477 out.push_str(&ctx.indent());
1758− out.push_str(&format!("<!-- @{} line {} -->\n", kind_label, elem.line_num));
1478+ out.push_str(&format!(
1479+ "<!-- @{} line {} -->\n",
1480+ kind_label, elem.line_num
1481+ ));
17591482 }
17601483 out.push_str(&ctx.indent());
17611484 out.push('<');
17621485 out.push_str(tag);
1763−
1764− // Image src (with optional non-SVG base64 inlining)
1765− if elem.kind == ElementKind::Image {
1766− let src = elem.argument.as_deref().unwrap_or("");
1767− let is_inline = elem.attrs.iter().any(|a| a.key == "inline");
1768− if is_inline && !src.is_empty() && !src.ends_with(".svg") {
1769− let mime = if src.ends_with(".png") { "image/png" }
1770− else if src.ends_with(".jpg") || src.ends_with(".jpeg") { "image/jpeg" }
1771− else if src.ends_with(".gif") { "image/gif" }
1772− else if src.ends_with(".webp") { "image/webp" }
1773− else if src.ends_with(".avif") { "image/avif" }
1774− else { "application/octet-stream" };
1775− if let Ok(data) = std::fs::read(src) {
1776− let b64 = base64_encode(&data);
1777− out.push_str(" src=\"data:");
1778− out.push_str(mime);
1779− out.push_str(";base64,");
1780− out.push_str(&b64);
1781− out.push('"');
1782− } else {
1783− out.push_str(" src=\"");
1784− out.push_str(&html_escape(src));
1785− out.push('"');
1786− }
1787− } else {
1788− out.push_str(" src=\"");
1789− out.push_str(&html_escape(src));
1790− out.push('"');
1791− }
1792− }
1486+ emit_argument_attr(out, elem, ctx.in_picture);
17931487
17941488 emit_class_attr(out, gen_class.as_deref(), user_class.as_deref());
17951489
@@ -1799,97 +1493,14 @@ fn generate_self_closing(
17991493 out.push('"');
18001494 }
18011495
1802− emit_html_passthrough_attrs(out, &elem.attrs);
1496+ emit_html_attrs(out, &elem.attrs);
18031497
18041498 // Source map attributes in dev mode (self-closing)
18051499 if ctx.dev && elem.line_num > 0 {
1806− out.push_str(&format!(" data-hl-line=\"{}\" data-hl-el=\"{}\"", elem.line_num, kind_label));
1807− }
1808−
1809− // Image optimization: auto-add loading="lazy" and decoding="async"
1810− if elem.kind == ElementKind::Image {
1811− // SVG inlining: @image [inline] logo.svg
1812− if elem.attrs.iter().any(|a| a.key == "inline") {
1813− if let Some(src) = &elem.argument {
1814− if src.ends_with(".svg") {
1815− if let Ok(svg_content) = std::fs::read_to_string(src) {
1816− // Close the tag we opened, then emit inline SVG instead
1817− out.truncate(out.rfind('<').unwrap_or(0));
1818− out.push_str(&ctx.indent());
1819− out.push_str(svg_content.trim());
1820− out.push_str(ctx.nl());
1821− return;
1822− }
1823− }
1824− }
1825− }
1826− // Responsive srcset: @image photo.jpg [responsive 400 800 1200]
1827− let responsive_attr = elem.attrs.iter().find(|a| a.key == "responsive");
1828− if let Some(resp) = responsive_attr {
1829− if let Some(ref sizes_str) = resp.value {
1830− let widths: Vec<&str> = sizes_str.split_whitespace().collect();
1831− if !widths.is_empty() {
1832− let src = elem.argument.as_deref().unwrap_or("");
1833− if !src.is_empty() {
1834− // Generate srcset with width descriptors
1835− // Convention: file-{width}.ext (e.g., photo-400.jpg)
1836− let dot_pos = src.rfind('.').unwrap_or(src.len());
1837− let base = &src[..dot_pos];
1838− let ext = &src[dot_pos..];
1839− let mut srcset_parts = Vec::new();
1840− for w in &widths {
1841− srcset_parts.push(format!("{}-{}{} {}w", base, w, ext, w));
1842− }
1843− out.push_str(" srcset=\"");
1844− out.push_str(&srcset_parts.join(", "));
1845− out.push('"');
1846− // Generate sizes attribute
1847− let max_width = widths.last().unwrap_or(&"100vw");
1848− out.push_str(&format!(" sizes=\"(max-width: {}px) 100vw, {}px\"", max_width, max_width));
1849− }
1850− }
1851− }
1852− }
1853−
1854− // Auto image dimensions: read local image file to inject width/height + aspect-ratio
1855− let has_width = elem.attrs.iter().any(|a| a.key == "width");
1856− let has_height = elem.attrs.iter().any(|a| a.key == "height");
1857− if !has_width || !has_height {
1858− if let Some(ref src) = elem.argument {
1859− if !src.starts_with("http://") && !src.starts_with("https://") && !src.starts_with("data:") {
1860− if let Some((w, h)) = read_image_dimensions(src) {
1861− if !has_width {
1862− out.push_str(&format!(" width=\"{}\"", w));
1863− }
1864− if !has_height {
1865− out.push_str(&format!(" height=\"{}\"", h));
1866− }
1867− // Auto aspect-ratio to prevent CLS
1868− if !elem.attrs.iter().any(|a| a.key == "aspect-ratio") {
1869− out.push_str(&format!(" style=\"aspect-ratio:{}/{}\"", w, h));
1870− }
1871− }
1872− }
1873− }
1874− }
1875−
1876− // Smart image loading: first 3 images get fetchpriority="high" (above the fold),
1877− // subsequent images get loading="lazy" + decoding="async"
1878− ctx.image_count += 1;
1879− if ctx.image_count <= 3 {
1880− // Above-the-fold: eager loading with high priority
1881− if !elem.attrs.iter().any(|a| a.key == "fetchpriority") {
1882− out.push_str(" fetchpriority=\"high\"");
1883− }
1884− } else {
1885− // Below-the-fold: lazy loading
1886− if !elem.attrs.iter().any(|a| a.key == "loading") {
1887− out.push_str(" loading=\"lazy\"");
1888− }
1889− if !elem.attrs.iter().any(|a| a.key == "decoding") {
1890− out.push_str(" decoding=\"async\"");
1891− }
1892− }
1500+ out.push_str(&format!(
1501+ " data-hl-line=\"{}\" data-hl-el=\"{}\"",
1502+ elem.line_num, kind_label
1503+ ));
18931504 }
18941505
18951506 out.push('>');
@@ -1907,7 +1518,10 @@ fn generate_text_segments(
19071518 TextSegment::Plain(text) => out.push_str(&html_escape(text)),
19081519 TextSegment::Inline(elem) => {
19091520 let mut buf = String::new();
1910− 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;
19111525 out.push_str(buf.trim_end());
19121526 }
19131527 }
@@ -1920,97 +1534,183 @@ fn generate_text_segments(
19201534
19211535fn compute_class(
19221536 attrs: &[Attribute],
1923− kind: &ElementKind,
1924− parent_kind: Option<&ElementKind>,
1537+ site: &Site,
19251538 styles: &mut StyleCollector,
1539+ distinct: String,
19261540) -> Option<String> {
1927− let base = attrs_to_css(attrs, "", kind, parent_kind);
1541+ // Every condition an attribute is under, and none
1542+ let mut conditions = vec![Condition::default()];
1543+ for attr in attrs.iter().filter(|a| !a.html) {
1544+ let (condition, _) = Condition::of(&attr.key);
1545+ if !conditions.contains(&condition) {
1546+ conditions.push(condition);
1547+ }
1548+ }
1549+ // Dedupe: if a property is declared twice within a single rule, keep only
1550+ // the last occurrence.
1551+ let rules: Vec<(Condition, String)> = conditions
1552+ .into_iter()
1553+ .map(|condition| {
1554+ let css = dedupe_declarations(&attrs_to_css(attrs, &condition, site));
1555+ (condition, css)
1556+ })
1557+ .collect();
1558+ // The kind's defaults, less what the element sets itself (a user
1559+ // `[list-style disc]` wins over the default `list-style:none` anyway,
1560+ // so there is no need to ship both)
1561+ let own = rules
1562+ .iter()
1563+ .find(|(condition, _)| *condition == Condition::default())
1564+ .map_or("", |(_, css)| css.as_str());
1565+ let own: Vec<&str> = declarations(own).map(|(name, _)| name).collect();
1566+ let defaults: String = declarations(&dedupe_declarations(&default_css(site)))
1567+ .filter(|(name, _)| !own.contains(name))
1568+ .map(|(_, declaration)| declaration)
1569+ .collect();
1570+ styles.get_class(defaults, rules, distinct)
1571+}
19281572
1929− // Collect pseudo-state overrides
1930− let mut pseudo = Vec::new();
1931− for &(prefix, selector) in PSEUDO_PREFIXES {
1932− let css = attrs_to_css(attrs, prefix, kind, parent_kind);
1933− if !css.is_empty() {
1934− pseudo.push((selector.to_string(), css));
1935− }
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;");
19361581 }
1937−
1938− // Auto-add ::-webkit-scrollbar pseudo for no-scrollbar attribute
1939− if attrs.iter().any(|a| a.key == "no-scrollbar") {
1940− pseudo.push(("::-webkit-scrollbar".to_string(), "display:none;".to_string()));
1582+ if !site.root {
1583+ css.push_str(layout_css(site.kind.layout(), site.inline));
19411584 }
1585+ css.push_str(site.kind.css());
1586+ css
1587+}
19421588
1943− // Collect nth:EXPR: dynamic pseudo selectors
1944− let mut nth_prefixes: Vec<String> = Vec::new();
1945− for attr in attrs {
1946− if attr.key.starts_with("nth:") {
1947− let rest = &attr.key[4..];
1948− if let Some(colon_pos) = rest.find(':') {
1949− let prefix = format!("nth:{}:", &rest[..colon_pos]);
1950− if !nth_prefixes.contains(&prefix) {
1951− nth_prefixes.push(prefix);
1589+/// The declarations of a rule body, as (property, `property:value;`), for
1590+/// bodies htmlang wrote: every declaration ends in `;`, and a `;` inside
1591+/// quotes or parentheses doesn't end one.
1592+fn declarations(css: &str) -> impl Iterator<Item = (&str, &str)> {
1593+ let mut rest = css;
1594+ std::iter::from_fn(move || {
1595+ if rest.is_empty() {
1596+ return None;
1597+ }
1598+ let (mut depth, mut quote, mut escaped) = (0i32, None, false);
1599+ let mut end = rest.len();
1600+ for (i, c) in rest.char_indices() {
1601+ match c {
1602+ _ if escaped => escaped = false,
1603+ '\\' => escaped = true,
1604+ c if Some(c) == quote => quote = None,
1605+ _ if quote.is_some() => {}
1606+ '"' | '\'' => quote = Some(c),
1607+ '(' => depth += 1,
1608+ ')' => depth -= 1,
1609+ ';' if depth == 0 => {
1610+ end = i + 1;
1611+ break;
19521612 }
1613+ _ => {}
19531614 }
19541615 }
1955− }
1956− for prefix in &nth_prefixes {
1957− let expr = &prefix[4..prefix.len() - 1];
1958− let selector = format!(":nth-child({})", expr);
1959− let css = attrs_to_css(attrs, prefix, kind, parent_kind);
1960− if !css.is_empty() {
1961− pseudo.push((selector, css));
1962− }
1963− }
1616+ let (declaration, after) = rest.split_at(end);
1617+ rest = after;
1618+ let name = declaration.split(':').next().unwrap_or("").trim();
1619+ Some((name, declaration))
1620+ })
1621+}
19641622
1965− // Collect has(...): dynamic pseudo selectors
1966− let mut has_prefixes: Vec<String> = Vec::new();
1967− for attr in attrs {
1968− if attr.key.starts_with("has(") {
1969− if let Some(close) = attr.key.find("):") {
1970− let prefix = format!("{}:", &attr.key[..close + 1]);
1971− if !has_prefixes.contains(&prefix) {
1972− has_prefixes.push(prefix);
1973− }
1623+/// Dedupe CSS declarations within a single rule body: for any property
1624+/// declared more than once, keep only the last occurrence. Unparseable
1625+/// segments (no `:`) are preserved as-is. Semicolons inside parentheses or
1626+/// quoted strings are treated as part of a value, not as declaration
1627+/// separators.
1628+fn dedupe_declarations(css: &str) -> String {
1629+ if css.is_empty() {
1630+ return String::new();
1631+ }
1632+ // Quick path: no chance of duplicates if there's fewer than 2 declarations.
1633+ if css.matches(';').count() < 2 {
1634+ return css.to_string();
1635+ }
1636+
1637+ // Split into (property_name_opt, full_decl_with_semi) preserving whatever
1638+ // terminator the input used. We split on `;` at depth 0 (ignoring parens).
1639+ let mut decls: Vec<(Option<String>, String)> = Vec::new();
1640+ let mut current = String::new();
1641+ let mut depth: i32 = 0;
1642+ // A quoted string's `;` (`content "a;b"`) is text; a backslash escapes
1643+ // the character after it
1644+ let mut quote: Option<char> = None;
1645+ let mut escaped = false;
1646+ for ch in css.chars() {
1647+ if escaped {
1648+ escaped = false;
1649+ current.push(ch);
1650+ } else if ch == '\\' {
1651+ escaped = true;
1652+ current.push(ch);
1653+ } else if let Some(q) = quote {
1654+ if ch == q {
1655+ quote = None;
1656+ }
1657+ current.push(ch);
1658+ } else if ch == '"' || ch == '\'' {
1659+ quote = Some(ch);
1660+ current.push(ch);
1661+ } else if ch == '(' {
1662+ depth += 1;
1663+ current.push(ch);
1664+ } else if ch == ')' {
1665+ depth -= 1;
1666+ current.push(ch);
1667+ } else if ch == ';' && depth == 0 {
1668+ current.push(';');
1669+ let trimmed = current.trim();
1670+ if !trimmed.is_empty() && trimmed != ";" {
1671+ let prop = trimmed
1672+ .trim_end_matches(';')
1673+ .split_once(':')
1674+ .map(|(p, _)| p.trim().to_ascii_lowercase());
1675+ decls.push((prop, std::mem::take(&mut current)));
1676+ } else {
1677+ current.clear();
19741678 }
1679+ } else {
1680+ current.push(ch);
19751681 }
19761682 }
1977− for prefix in &has_prefixes {
1978− let inner = &prefix[4..prefix.len() - 2]; // extract selector from has(selector):
1979− let selector = format!(":has({})", inner);
1980− let css = attrs_to_css(attrs, &prefix, kind, parent_kind);
1981− if !css.is_empty() {
1982− pseudo.push((selector, css));
1983− }
1683+ if !current.trim().is_empty() {
1684+ let prop = current
1685+ .split_once(':')
1686+ .map(|(p, _)| p.trim().to_ascii_lowercase());
1687+ decls.push((prop, std::mem::take(&mut current)));
19841688 }
19851689
1986− // Collect responsive overrides
1987− let mut responsive = Vec::new();
1988− for &(bp_name, _) in BREAKPOINTS {
1989− let prefix = format!("{}:", bp_name);
1990− let css = attrs_to_css(attrs, &prefix, kind, parent_kind);
1991− if !css.is_empty() {
1992− responsive.push((bp_name.to_string(), css));
1993− }
1690+ if decls.len() < 2 {
1691+ return css.to_string();
19941692 }
19951693
1996− // Collect container query overrides
1997− let mut container = Vec::new();
1998− for &(bp_name, _) in BREAKPOINTS {
1999− let prefix = format!("cq-{}:", bp_name);
2000− let css = attrs_to_css(attrs, &prefix, kind, parent_kind);
2001− if !css.is_empty() {
2002− container.push((bp_name.to_string(), css));
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);
20031700 }
20041701 }
20051702
2006− let dark = attrs_to_css(attrs, "dark:", kind, parent_kind);
2007− let print = attrs_to_css(attrs, "print:", kind, parent_kind);
2008− let motion_safe = attrs_to_css(attrs, "motion-safe:", kind, parent_kind);
2009− let motion_reduce = attrs_to_css(attrs, "motion-reduce:", kind, parent_kind);
2010− let landscape = attrs_to_css(attrs, "landscape:", kind, parent_kind);
2011− let portrait = attrs_to_css(attrs, "portrait:", kind, parent_kind);
2012−
2013− styles.get_class(base, pseudo, responsive, dark, print, motion_safe, motion_reduce, landscape, portrait, container)
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
20141714}
20151715
20161716fn emit_class_attr(out: &mut String, gen_class: Option<&str>, user_class: Option<&str>) {
@@ -2040,943 +1740,553 @@ fn emit_class_attr(out: &mut String, gen_class: Option<&str>, user_class: Option
20401740// Attribute → CSS mapping
20411741// ---------------------------------------------------------------------------
20421742
2043−/// (htmlang prefix, CSS selector suffix)
2044−const PSEUDO_PREFIXES: &[(&str, &str)] = &[
2045− ("hover:", ":hover"),
2046− ("active:", ":active"),
2047− ("focus:", ":focus"),
2048− ("focus-visible:", ":focus-visible"),
2049− ("focus-within:", ":focus-within"),
2050− ("disabled:", ":disabled"),
2051− ("checked:", ":checked"),
2052− ("placeholder:", "::placeholder"),
2053− ("first:", ":first-child"),
2054− ("last:", ":last-child"),
2055− ("odd:", ":nth-child(odd)"),
2056− ("even:", ":nth-child(even)"),
2057− ("before:", "::before"),
2058− ("after:", "::after"),
2059− ("selection:", "::selection"),
2060− ("visited:", ":visited"),
2061− ("empty:", ":empty"),
2062− ("target:", ":target"),
2063− ("valid:", ":valid"),
2064− ("invalid:", ":invalid"),
2065−];
2066−const RESPONSIVE_PREFIXES: &[&str] = &["sm:", "md:", "lg:", "xl:", "2xl:"];
2067−const MEDIA_PREFIXES: &[&str] = &["dark:", "print:", "motion-safe:", "motion-reduce:", "landscape:", "portrait:"];
2068−const CONTAINER_QUERY_PREFIXES: &[&str] = &["cq-sm:", "cq-md:", "cq-lg:", "cq-xl:", "cq-2xl:"];
2069−
2070−fn is_prefixed_attr(key: &str) -> bool {
2071− PSEUDO_PREFIXES.iter().any(|&(p, _)| key.starts_with(p))
2072− || RESPONSIVE_PREFIXES.iter().any(|p| key.starts_with(p))
2073− || MEDIA_PREFIXES.iter().any(|p| key.starts_with(p))
2074− || CONTAINER_QUERY_PREFIXES.iter().any(|p| key.starts_with(p))
2075− || key.starts_with("nth:")
2076− || key.starts_with("has(")
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,
20771755}
20781756
2079−fn attrs_to_css(
2080− attrs: &[Attribute],
2081− state_prefix: &str,
2082− kind: &ElementKind,
2083− parent_kind: Option<&ElementKind>,
2084−) -> String {
2085− let mut css = String::new();
2086−
2087− // Base element styles only for the default (non-state) pass
2088− if state_prefix.is_empty() {
2089− match kind {
2090− ElementKind::Row => css.push_str("display:flex;flex-direction:row;"),
2091− ElementKind::Column => css.push_str("display:flex;flex-direction:column;"),
2092− ElementKind::El => css.push_str("display:flex;flex-direction:column;"),
2093− ElementKind::Paragraph => css.push_str("margin:0;"),
2094− // Semantic elements get flex column layout like @el
2095− ElementKind::Nav | ElementKind::Header | ElementKind::Footer
2096− | ElementKind::Main | ElementKind::Section | ElementKind::Article
2097− | ElementKind::Aside => css.push_str("display:flex;flex-direction:column;"),
2098− // Lists: reset browser defaults
2099− ElementKind::List => css.push_str("margin:0;padding-left:0;list-style:none;"),
2100− ElementKind::ListItem => css.push_str("display:flex;flex-direction:column;"),
2101− // Form: flex column like @el
2102− ElementKind::Form => css.push_str("display:flex;flex-direction:column;"),
2103− // Details: flex column
2104− ElementKind::Details => css.push_str("display:flex;flex-direction:column;"),
2105− // Figure: flex column
2106− ElementKind::Figure => css.push_str("display:flex;flex-direction:column;margin:0;"),
2107− // Blockquote: flex column, reset browser margin
2108− ElementKind::Blockquote => css.push_str("display:flex;flex-direction:column;margin:0;"),
2109− // Pre: preserve whitespace
2110− ElementKind::Pre => css.push_str("margin:0;white-space:pre;font-family:ui-monospace,monospace;"),
2111− // Code: monospace font
2112− ElementKind::Code => css.push_str("font-family:ui-monospace,monospace;"),
2113− // New elements
2114− ElementKind::Dialog => css.push_str("display:flex;flex-direction:column;"),
2115− ElementKind::DefinitionList => css.push_str("margin:0;"),
2116− ElementKind::DefinitionDescription => css.push_str("margin:0;display:flex;flex-direction:column;"),
2117− ElementKind::Fieldset => css.push_str("display:flex;flex-direction:column;border:1px solid currentColor;padding:0.5em;margin:0;"),
2118− ElementKind::Kbd => css.push_str("font-family:ui-monospace,monospace;"),
2119− ElementKind::Grid => css.push_str("display:grid;"),
2120− ElementKind::Stack => css.push_str("position:relative;"),
2121− ElementKind::Badge => css.push_str("display:inline-flex;align-items:center;justify-content:center;padding:2px 8px;border-radius:9999px;font-size:0.75rem;font-weight:600;line-height:1;"),
2122− ElementKind::Tooltip => css.push_str("position:relative;cursor:help;"),
2123− ElementKind::Spacer => css.push_str("flex:1;"),
2124− ElementKind::Avatar => css.push_str("display:inline-flex;align-items:center;justify-content:center;border-radius:9999px;overflow:hidden;flex-shrink:0;"),
2125− 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;"),
2126− 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;"),
2127− ElementKind::Tag => css.push_str("display:inline-flex;align-items:center;padding:2px 8px;border-radius:4px;font-size:0.75rem;font-weight:600;"),
2128− _ => {}
2129− }
2130− // Children of @carousel get scroll-snap-align and flex-shrink
2131− if matches!(parent_kind, Some(ElementKind::Carousel)) {
2132− css.push_str("scroll-snap-align:start;flex-shrink:0;");
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,
21331767 }
21341768 }
1769+}
21351770
2136− for attr in attrs {
2137− // Determine the effective key for this pass
2138− let effective_key = if state_prefix.is_empty() {
2139− if is_prefixed_attr(&attr.key) {
2140− continue;
2141− }
2142− attr.key.as_str()
2143− } else {
2144− match attr.key.strip_prefix(state_prefix) {
2145− Some(k) => k,
2146− None => continue,
2147− }
2148− };
2149−
2150− let val = attr.value.as_deref();
2151−
2152− match effective_key {
2153− // Layout
2154− "spacing" | "gap" => {
2155− if let Some(v) = val {
2156− push_css(&mut css, "gap", &css_px(v));
2157− }
2158− }
2159− "padding" => {
2160− if let Some(v) = val {
2161− push_css(&mut css, "padding", &css_px_multi(v));
2162− }
2163− }
2164− "padding-x" => {
2165− if let Some(v) = val {
2166− push_css(&mut css, "padding-left", &css_px(v));
2167− push_css(&mut css, "padding-right", &css_px(v));
2168− }
2169− }
2170− "padding-y" => {
2171− if let Some(v) = val {
2172− push_css(&mut css, "padding-top", &css_px(v));
2173− push_css(&mut css, "padding-bottom", &css_px(v));
2174− }
2175− }
2176−
2177− // Sizing
2178− "width" => {
2179− if let Some(v) = val {
2180− match v {
2181− "fill" => match parent_kind {
2182− Some(ElementKind::Row) => {
2183− push_css(&mut css, "flex", "1");
2184− push_css(&mut css, "min-width", "0");
2185− }
2186− _ => push_css(&mut css, "width", "100%"),
2187− },
2188− "shrink" => push_css(&mut css, "flex-shrink", "0"),
2189− _ => push_css(&mut css, "width", &css_px(v)),
2190− }
2191− }
2192− }
2193− "height" => {
2194− if let Some(v) = val {
2195− match v {
2196− "fill" => match parent_kind {
2197− Some(ElementKind::Column) => {
2198− push_css(&mut css, "flex", "1");
2199− push_css(&mut css, "min-height", "0");
2200− }
2201− _ => push_css(&mut css, "height", "100%"),
2202− },
2203− "shrink" => push_css(&mut css, "flex-shrink", "0"),
2204− _ => push_css(&mut css, "height", &css_px(v)),
2205− }
2206− }
2207− }
2208− "min-width" => {
2209− if let Some(v) = val {
2210− push_css(&mut css, "min-width", &css_px(v));
2211− }
2212− }
2213− "max-width" => {
2214− if let Some(v) = val {
2215− push_css(&mut css, "max-width", &css_px(v));
2216− }
2217− }
2218− "min-height" => {
2219− if let Some(v) = val {
2220− push_css(&mut css, "min-height", &css_px(v));
2221− }
2222− }
2223− "max-height" => {
2224− if let Some(v) = val {
2225− push_css(&mut css, "max-height", &css_px(v));
2226− }
2227− }
2228−
2229− // Alignment
2230− "center-x" => match parent_kind {
2231− Some(ElementKind::Column) | Some(ElementKind::El) => {
2232− push_css(&mut css, "align-self", "center");
2233− }
2234− _ => {
2235− push_css(&mut css, "margin-left", "auto");
2236− push_css(&mut css, "margin-right", "auto");
2237− }
2238− },
2239− "center-y" => match parent_kind {
2240− Some(ElementKind::Row) => push_css(&mut css, "align-self", "center"),
2241− _ => {
2242− push_css(&mut css, "margin-top", "auto");
2243− push_css(&mut css, "margin-bottom", "auto");
2244− }
2245− },
2246− "align-left" => match parent_kind {
2247− Some(ElementKind::Column) | Some(ElementKind::El) => {
2248− push_css(&mut css, "align-self", "flex-start");
2249− }
2250− _ => push_css(&mut css, "margin-right", "auto"),
2251− },
2252− "align-right" => match parent_kind {
2253− Some(ElementKind::Column) | Some(ElementKind::El) => {
2254− push_css(&mut css, "align-self", "flex-end");
2255− }
2256− _ => push_css(&mut css, "margin-left", "auto"),
2257− },
2258− "align-top" => match parent_kind {
2259− Some(ElementKind::Row) => push_css(&mut css, "align-self", "flex-start"),
2260− _ => push_css(&mut css, "margin-bottom", "auto"),
2261− },
2262− "align-bottom" => match parent_kind {
2263− Some(ElementKind::Row) => push_css(&mut css, "align-self", "flex-end"),
2264− _ => push_css(&mut css, "margin-top", "auto"),
2265− },
2266−
2267− // Style
2268− "background" => {
2269− if let Some(v) = val {
2270− push_css(&mut css, "background", v);
2271− }
2272− }
2273− "color" => {
2274− if let Some(v) = val {
2275− push_css(&mut css, "color", v);
2276− }
2277− }
2278− "border" => {
2279− if let Some(v) = val {
2280− let parts: Vec<&str> = v.splitn(2, ' ').collect();
2281− if parts.len() == 2 {
2282− push_css(
2283− &mut css,
2284− "border",
2285− &format!("{} solid {}", css_px(parts[0]), parts[1]),
2286− );
2287− } else {
2288− push_css(
2289− &mut css,
2290− "border",
2291− &format!("{} solid currentColor", css_px(parts[0])),
2292− );
2293− }
2294− }
2295− }
2296− "border-top" | "border-bottom" | "border-left" | "border-right" => {
2297− if let Some(v) = val {
2298− let parts: Vec<&str> = v.splitn(2, ' ').collect();
2299− if parts.len() == 2 {
2300− push_css(
2301− &mut css,
2302− effective_key,
2303− &format!("{} solid {}", css_px(parts[0]), parts[1]),
2304− );
2305− } else {
2306− push_css(
2307− &mut css,
2308− effective_key,
2309− &format!("{} solid currentColor", css_px(parts[0])),
2310− );
2311− }
2312− }
2313− }
2314− "rounded" => {
2315− if let Some(v) = val {
2316− push_css(&mut css, "border-radius", &css_px(v));
2317− }
2318− }
2319− "bold" => push_css(&mut css, "font-weight", "bold"),
2320− "italic" => push_css(&mut css, "font-style", "italic"),
2321− "underline" => push_css(&mut css, "text-decoration", "underline"),
2322− "size" => {
2323− if let Some(v) = val {
2324− push_css(&mut css, "font-size", &css_px(v));
2325− }
2326− }
2327− "font" => {
2328− if let Some(v) = val {
2329− push_css(&mut css, "font-family", v);
2330− }
2331− }
2332− "transition" => {
2333− if let Some(v) = val {
2334− push_css(&mut css, "transition", v);
2335− }
2336− }
2337− "cursor" => {
2338− if let Some(v) = val {
2339− push_css(&mut css, "cursor", v);
2340− }
2341− }
2342− "opacity" => {
2343− if let Some(v) = val {
2344− push_css(&mut css, "opacity", v);
2345− }
2346− }
2347−
2348− // Typography
2349− "text-align" => {
2350− if let Some(v) = val {
2351− push_css(&mut css, "text-align", v);
2352− }
2353− }
2354− "line-height" => {
2355− if let Some(v) = val {
2356− push_css(&mut css, "line-height", v);
2357− }
2358− }
2359− "letter-spacing" => {
2360− if let Some(v) = val {
2361− push_css(&mut css, "letter-spacing", &css_px(v));
2362− }
2363− }
2364− "text-transform" => {
2365− if let Some(v) = val {
2366− push_css(&mut css, "text-transform", v);
2367− }
2368− }
2369− "white-space" => {
2370− if let Some(v) = val {
2371− push_css(&mut css, "white-space", v);
2372− }
2373− }
2374−
2375− // Overflow & positioning
2376− "overflow" => {
2377− if let Some(v) = val {
2378− push_css(&mut css, "overflow", v);
2379− }
2380− }
2381− "position" => {
2382− if let Some(v) = val {
2383− push_css(&mut css, "position", v);
2384− }
2385− }
2386− "top" => {
2387− if let Some(v) = val {
2388− push_css(&mut css, "top", &css_px(v));
2389− }
2390− }
2391− "right" => {
2392− if let Some(v) = val {
2393− push_css(&mut css, "right", &css_px(v));
2394− }
2395− }
2396− "bottom" => {
2397− if let Some(v) = val {
2398− push_css(&mut css, "bottom", &css_px(v));
2399− }
2400− }
2401− "left" => {
2402− if let Some(v) = val {
2403− push_css(&mut css, "left", &css_px(v));
2404− }
2405− }
2406− "z-index" => {
2407− if let Some(v) = val {
2408− push_css(&mut css, "z-index", v);
2409− }
2410− }
2411−
2412− // Display & visibility
2413− "display" => {
2414− if let Some(v) = val {
2415− push_css(&mut css, "display", v);
2416− }
2417− }
2418− "visibility" => {
2419− if let Some(v) = val {
2420− push_css(&mut css, "visibility", v);
2421− }
2422− }
2423− "hidden" => push_css(&mut css, "display", "none"),
2424−
2425− // Transform & filters
2426− "transform" => {
2427− if let Some(v) = val {
2428− push_css(&mut css, "transform", v);
2429− }
2430− }
2431− "backdrop-filter" => {
2432− if let Some(v) = val {
2433− push_css(&mut css, "backdrop-filter", v);
2434− }
2435− }
2436−
2437− // Effects
2438− "shadow" => {
2439− if let Some(v) = val {
2440− push_css(&mut css, "box-shadow", v);
2441− }
2442− }
2443−
2444− // Flow
2445− "wrap" => push_css(&mut css, "flex-wrap", "wrap"),
2446− "gap-x" => {
2447− if let Some(v) = val {
2448− push_css(&mut css, "column-gap", &css_px(v));
2449− }
2450− }
2451− "gap-y" => {
2452− if let Some(v) = val {
2453− push_css(&mut css, "row-gap", &css_px(v));
2454− }
2455− }
2456−
2457− // Grid
2458− "grid" => {
2459− push_css(&mut css, "display", "grid");
2460− }
2461− "grid-cols" => {
2462− if let Some(v) = val {
2463− if let Ok(n) = v.parse::<u32>() {
2464− push_css(&mut css, "grid-template-columns", &format!("repeat({},1fr)", n));
2465− } else {
2466− push_css(&mut css, "grid-template-columns", v);
2467− }
2468− }
2469− }
2470− "grid-rows" => {
2471− if let Some(v) = val {
2472− if let Ok(n) = v.parse::<u32>() {
2473− push_css(&mut css, "grid-template-rows", &format!("repeat({},1fr)", n));
2474− } else {
2475− push_css(&mut css, "grid-template-rows", v);
2476− }
2477− }
2478− }
2479− "col-span" => {
2480− if let Some(v) = val {
2481− push_css(&mut css, "grid-column", &format!("span {}", v));
2482− }
2483− }
2484− "row-span" => {
2485− if let Some(v) = val {
2486− push_css(&mut css, "grid-row", &format!("span {}", v));
2487− }
2488− }
2489−
2490− // Animation
2491− "animation" => {
2492− if let Some(v) = val {
2493− push_css(&mut css, "animation", v);
2494− }
2495− }
2496−
2497− // Aspect ratio
2498− "aspect-ratio" => {
2499− if let Some(v) = val {
2500− push_css(&mut css, "aspect-ratio", v);
2501− }
2502− }
2503−
2504− // CSS containment for rendering performance
2505− "contain" => {
2506− if let Some(v) = val {
2507− push_css(&mut css, "contain", v);
2508− } else {
2509− push_css(&mut css, "contain", "layout style paint");
2510− }
2511− }
2512− "content-visibility" => {
2513− if let Some(v) = val {
2514− push_css(&mut css, "content-visibility", v);
2515− } else {
2516− push_css(&mut css, "content-visibility", "auto");
2517− }
2518− }
2519−
2520− // Outline (like border but doesn't affect layout)
2521− "outline" => {
2522− if let Some(v) = val {
2523− let parts: Vec<&str> = v.splitn(2, ' ').collect();
2524− if parts.len() == 2 {
2525− push_css(
2526− &mut css,
2527− "outline",
2528− &format!("{} solid {}", css_px(parts[0]), parts[1]),
2529− );
2530− } else {
2531− push_css(
2532− &mut css,
2533− "outline",
2534− &format!("{} solid currentColor", css_px(parts[0])),
2535− );
2536− }
2537− }
2538− }
2539−
2540− // Logical properties (i18n-aware)
2541− "padding-inline" => {
2542− if let Some(v) = val {
2543− push_css(&mut css, "padding-inline", &css_px_multi(v));
2544− }
2545− }
2546− "padding-block" => {
2547− if let Some(v) = val {
2548− push_css(&mut css, "padding-block", &css_px_multi(v));
2549− }
2550− }
2551− "margin-inline" => {
2552− if let Some(v) = val {
2553− push_css(&mut css, "margin-inline", &css_px_multi(v));
2554− }
2555− }
2556− "margin-block" => {
2557− if let Some(v) = val {
2558− push_css(&mut css, "margin-block", &css_px_multi(v));
2559− }
2560− }
2561−
2562− // Logical property start/end variants
2563− "padding-inline-start" | "padding-inline-end" |
2564− "padding-block-start" | "padding-block-end" |
2565− "margin-inline-start" | "margin-inline-end" |
2566− "margin-block-start" | "margin-block-end" => {
2567− if let Some(v) = val {
2568− push_css(&mut css, effective_key, &css_px(v));
2569− }
2570− }
2571−
2572− // Logical inset
2573− "inset-inline" | "inset-block" => {
2574− if let Some(v) = val {
2575− push_css(&mut css, effective_key, &css_px_multi(v));
2576− }
2577− }
2578− "inset-inline-start" | "inset-inline-end" |
2579− "inset-block-start" | "inset-block-end" => {
2580− if let Some(v) = val {
2581− push_css(&mut css, effective_key, &css_px(v));
2582− }
2583− }
2584−
2585− // Logical border
2586− "border-inline" | "border-block" |
2587− "border-inline-start" | "border-inline-end" |
2588− "border-block-start" | "border-block-end" => {
2589− if let Some(v) = val {
2590− push_css(&mut css, effective_key, v);
2591− }
2592− }
2593−
2594− // Logical border-radius
2595− "border-start-start-radius" | "border-start-end-radius" |
2596− "border-end-start-radius" | "border-end-end-radius" => {
2597− if let Some(v) = val {
2598− push_css(&mut css, effective_key, &css_px(v));
2599− }
2600− }
1771+// ---------------------------------------------------------------------------
1772+// Direction: what a child's `fill` and `shrink` compile against
1773+// ---------------------------------------------------------------------------
26011774
2602− // Logical scroll margins & padding
2603− "scroll-margin-inline" | "scroll-margin-block" |
2604− "scroll-padding-inline" | "scroll-padding-block" => {
2605− if let Some(v) = val {
2606− push_css(&mut css, effective_key, &css_px_multi(v));
2607− }
2608− }
1775+/// The way a flex row or column lays out its children.
1776+#[derive(Clone, Copy, PartialEq, Eq, Debug)]
1777+enum Axis {
1778+ Row,
1779+ Column,
1780+}
26091781
2610− // Logical sizing
2611− "inline-size" | "block-size" |
2612− "min-inline-size" | "max-inline-size" |
2613− "min-block-size" | "max-block-size" => {
2614− if let Some(v) = val {
2615− push_css(&mut css, effective_key, &css_px(v));
2616− }
2617− }
1782+impl Axis {
1783+ /// The direction a `flex-direction` or `flex-flow` value sets, if it
1784+ /// names one (not `var(--dir)`, which only the browser knows).
1785+ fn of_value(value: &str) -> Option<Axis> {
1786+ value.split_whitespace().find_map(|word| match word {
1787+ "row" | "row-reverse" => Some(Axis::Row),
1788+ "column" | "column-reverse" => Some(Axis::Column),
1789+ _ => None,
1790+ })
1791+ }
1792+}
26181793
2619− // Scroll snap
2620− "scroll-snap-type" => {
2621− if let Some(v) = val {
2622− push_css(&mut css, "scroll-snap-type", v);
2623− }
2624− }
2625− "scroll-snap-align" => {
2626− if let Some(v) = val {
2627− push_css(&mut css, "scroll-snap-align", v);
2628− }
2629− }
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+}
26301813
2631− // Margin
2632− "margin" => {
2633− if let Some(v) = val {
2634− push_css(&mut css, "margin", &css_px_multi(v));
2635− }
2636− }
2637− "margin-x" => {
2638− if let Some(v) = val {
2639− push_css(&mut css, "margin-left", &css_px(v));
2640− push_css(&mut css, "margin-right", &css_px(v));
2641− }
2642− }
2643− "margin-y" => {
2644− if let Some(v) = val {
2645− push_css(&mut css, "margin-top", &css_px(v));
2646− push_css(&mut css, "margin-bottom", &css_px(v));
2647− }
1814+impl Flow {
1815+ fn of(elem: &Element) -> Flow {
1816+ let mut base = match elem.kind.layout() {
1817+ Layout::Row => Axis::Row,
1818+ Layout::Column => Axis::Column,
1819+ _ => return Flow::default(),
1820+ };
1821+ let mut changes: Vec<(Vec<usize>, Axis)> = Vec::new();
1822+ for attr in elem.attrs.iter().filter(|a| !a.html) {
1823+ let (condition, name) = Condition::of(&attr.key);
1824+ if !matches!(name, "flex-direction" | "flex-flow") || !condition.selector.is_empty() {
1825+ continue;
26481826 }
2649−
2650− // Filter
2651− "filter" => {
2652− if let Some(v) = val {
2653− push_css(&mut css, "filter", v);
2654− }
1827+ let Some(axis) = attr.value.as_deref().and_then(Axis::of_value) else {
1828+ continue;
1829+ };
1830+ if condition.at.is_empty() {
1831+ base = axis;
1832+ } else {
1833+ // The later one wins, as in the CSS
1834+ changes.retain(|(at, _)| *at != condition.at);
1835+ changes.push((condition.at, axis));
26551836 }
1837+ }
1838+ changes.sort_by_key(|(at, _)| at_order(at));
1839+ Flow {
1840+ base: Some(base),
1841+ changes,
1842+ class: None,
1843+ }
1844+ }
26561845
2657− // Object fit/position (for images)
2658− "object-fit" => {
2659− if let Some(v) = val {
2660− push_css(&mut css, "object-fit", v);
2661− }
2662− }
2663− "object-position" => {
2664− if let Some(v) = val {
2665− push_css(&mut css, "object-position", v);
2666− }
2667− }
1846+ /// The direction under the at-rules `at`: the latest one set among
1847+ /// the conditions that hold there (`md:` holds at `lg:`), else the one
1848+ /// without a prefix.
1849+ fn at(&self, at: &[usize]) -> Option<Axis> {
1850+ let base = self.base?;
1851+ let here = Condition::at_only(at);
1852+ let changed = self
1853+ .changes
1854+ .iter()
1855+ .rev()
1856+ .find(|(chain, _)| Condition::at_only(chain).holds_at(&here))
1857+ .map(|&(_, axis)| axis);
1858+ Some(changed.unwrap_or(base))
1859+ }
1860+}
26681861
2669− // Text shadow
2670− "text-shadow" => {
2671− if let Some(v) = val {
2672− push_css(&mut css, "text-shadow", v);
2673− }
2674− }
1862+/// `width` or `height`.
1863+#[derive(Clone, Copy, PartialEq, Eq)]
1864+enum Dim {
1865+ Width,
1866+ Height,
1867+}
26751868
2676− // Text overflow
2677− "text-overflow" => {
2678− if let Some(v) = val {
2679− push_css(&mut css, "text-overflow", v);
2680− }
2681− }
1869+/// What a `width` or `height` says.
1870+#[derive(Clone, Copy, PartialEq, Eq)]
1871+enum Size {
1872+ Fill,
1873+ Shrink,
1874+ /// A size of its own (`width 300`)
1875+ Set,
1876+}
26821877
2683− // Interaction
2684− "pointer-events" => {
2685− if let Some(v) = val {
2686− push_css(&mut css, "pointer-events", v);
2687− }
2688− }
2689− "user-select" => {
2690− if let Some(v) = val {
2691− push_css(&mut css, "user-select", v);
2692− }
2693− }
1878+impl Size {
1879+ fn of(value: &str) -> Size {
1880+ match value.trim() {
1881+ "fill" => Size::Fill,
1882+ "shrink" => Size::Shrink,
1883+ _ => Size::Set,
1884+ }
1885+ }
1886+}
26941887
2695− // Flexbox/grid alignment
2696− "justify-content" => {
2697− if let Some(v) = val {
2698− push_css(&mut css, "justify-content", v);
2699− }
2700− }
2701− "align-items" => {
2702− if let Some(v) = val {
2703− push_css(&mut css, "align-items", v);
2704− }
2705− }
1888+/// The declarations `fill` and `shrink` make in a parent laid out along
1889+/// `axis` (`None`: not a flex row or column). Along the parent's direction,
1890+/// `fill` takes the remaining space and `shrink` keeps the content's size;
1891+/// across it (or outside flex), `fill` is the full size and `shrink` fits
1892+/// the content.
1893+fn sizing(dim: Dim, size: Size, axis: Option<Axis>) -> &'static [(&'static str, &'static str)] {
1894+ match (dim, size, axis) {
1895+ (_, Size::Set, _) => &[],
1896+ (Dim::Width, Size::Fill, Some(Axis::Row)) => &[("flex", "1"), ("min-width", "0")],
1897+ (Dim::Width, Size::Fill, _) => &[("width", "100%")],
1898+ (Dim::Width, Size::Shrink, Some(Axis::Row)) => &[("flex-shrink", "0")],
1899+ (Dim::Width, Size::Shrink, _) => &[("width", "fit-content")],
1900+ (Dim::Height, Size::Fill, Some(Axis::Column)) => &[("flex", "1"), ("min-height", "0")],
1901+ (Dim::Height, Size::Fill, _) => &[("height", "100%")],
1902+ (Dim::Height, Size::Shrink, Some(Axis::Column)) => &[("flex-shrink", "0")],
1903+ (Dim::Height, Size::Shrink, _) => &[("height", "fit-content")],
1904+ }
1905+}
27061906
2707− // Flex item order
2708− "order" => {
2709− if let Some(v) = val {
2710− push_css(&mut css, "order", v);
2711− }
2712− }
1907+/// Every property `fill` and `shrink` of `dim` can set, with its initial
1908+/// value (`flex` covers `flex-shrink`).
1909+fn sizing_properties(dim: Dim) -> [(&'static str, &'static str); 3] {
1910+ match dim {
1911+ Dim::Width => [
1912+ ("flex", "0 1 auto"),
1913+ ("min-width", "auto"),
1914+ ("width", "auto"),
1915+ ],
1916+ Dim::Height => [
1917+ ("flex", "0 1 auto"),
1918+ ("min-height", "auto"),
1919+ ("height", "auto"),
1920+ ],
1921+ }
1922+}
27131923
2714− // Background extras
2715− "background-size" => {
2716− if let Some(v) = val {
2717− push_css(&mut css, "background-size", v);
2718− }
2719− }
2720− "background-position" => {
2721− if let Some(v) = val {
2722− push_css(&mut css, "background-position", v);
2723− }
2724− }
2725− "background-repeat" => {
2726− if let Some(v) = val {
2727− push_css(&mut css, "background-repeat", v);
2728− }
2729− }
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+}
27301943
2731− // Text wrapping
2732− "word-break" => {
2733− if let Some(v) = val {
2734− push_css(&mut css, "word-break", v);
2735− }
1944+impl Sizes {
1945+ /// Read the attributes under the conditions that hold wherever `at`
1946+ /// does, a later condition over an earlier one.
1947+ fn of(attrs: &[Attribute], at: &Condition) -> Sizes {
1948+ let mut sizes = Sizes::default();
1949+ let mut read: Vec<(Condition, &str, &str)> = Vec::new();
1950+ for attr in attrs.iter().filter(|a| !a.html) {
1951+ let (condition, name) = Condition::of(&attr.key);
1952+ let Some(value) = attr.value.as_deref().filter(|v| !v.trim().is_empty()) else {
1953+ continue;
1954+ };
1955+ if condition.holds_at(at) {
1956+ read.push((condition, name, value));
1957+ }
1958+ }
1959+ read.sort_by_cached_key(|(condition, _, _)| condition.order());
1960+ for (_, name, value) in read {
1961+ match name {
1962+ "width" => {
1963+ let size = Size::of(value);
1964+ sizes.width = Some(size);
1965+ sizes.width_word |= size != Size::Set;
1966+ }
1967+ "height" => {
1968+ let size = Size::of(value);
1969+ sizes.height = Some(size);
1970+ sizes.height_word |= size != Size::Set;
1971+ }
1972+ "flex" => sizes.flex = true,
1973+ "flex-grow" => sizes.flex_grow = true,
1974+ "flex-shrink" => sizes.flex_shrink = true,
1975+ "flex-basis" => sizes.flex_basis = true,
1976+ "min-width" => sizes.min_width = true,
1977+ "min-height" => sizes.min_height = true,
1978+ _ => {}
27361979 }
2737− "overflow-wrap" => {
2738− if let Some(v) = val {
2739− push_css(&mut css, "overflow-wrap", v);
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+ }
27402023 }
2024+ return;
27412025 }
2026+ }
2027+ if !self.writes(property) {
2028+ push_css(css, property, value);
2029+ }
2030+ }
2031+}
27422032
2743− // Container queries
2744− "container" => {
2745− push_css(&mut css, "container-type", "inline-size");
2746− }
2747− "container-name" => {
2748− if let Some(v) = val {
2749− push_css(&mut css, "container-name", v);
2750− }
2751− }
2752− "container-type" => {
2753− if let Some(v) = val {
2754− push_css(&mut css, "container-type", v);
2755− }
2756− }
2033+/// The rule that gives an element's `fill` and `shrink`, as its attributes
2034+/// under the at-rules `at` set them, their meaning in a parent laid out
2035+/// along `axis`. Every other property a layout word could have set is put
2036+/// back to its initial value, so the rule is right whichever earlier rule
2037+/// it overrides. Properties the element writes itself are left alone.
2038+fn sizing_rule(attrs: &[Attribute], at: &[usize], axis: Axis) -> String {
2039+ let sizes = Sizes::of(attrs, &Condition::at_only(at));
2040+ let mut sets: Vec<(&str, &str)> = Vec::new();
2041+ let mut resets: Vec<(&str, &str)> = Vec::new();
2042+ for (dim, size, word) in [
2043+ (Dim::Width, sizes.width, sizes.width_word),
2044+ (Dim::Height, sizes.height, sizes.height_word),
2045+ ] {
2046+ if !word {
2047+ continue;
2048+ }
2049+ if let Some(size) = size {
2050+ sets.extend_from_slice(sizing(dim, size, Some(axis)));
2051+ }
2052+ resets.extend_from_slice(&sizing_properties(dim));
2053+ }
2054+ let mut css = String::new();
2055+ let mut written: Vec<&str> = Vec::new();
2056+ for &(property, value) in &resets {
2057+ if sets.iter().any(|&(p, _)| p == property) || written.contains(&property) {
2058+ continue;
2059+ }
2060+ written.push(property);
2061+ sizes.push(&mut css, property, value);
2062+ }
2063+ for &(property, value) in &sets {
2064+ sizes.push(&mut css, property, value);
2065+ }
2066+ css
2067+}
27572068
2758− // Overflow axis
2759− "overflow-x" => {
2760− if let Some(v) = val {
2761− push_css(&mut css, "overflow-x", v);
2762− }
2763− }
2764− "overflow-y" => {
2765− if let Some(v) = val {
2766− push_css(&mut css, "overflow-y", v);
2767− }
2768− }
2069+/// The rules an element's `fill` and `shrink` need under each chain of
2070+/// at-rules where the direction of `flow` (its parent's) changes: `(at,
2071+/// body)`.
2072+fn sizing_changes(attrs: &[Attribute], flow: &Flow) -> Vec<(Vec<usize>, String)> {
2073+ flow.changes
2074+ .iter()
2075+ .map(|(at, axis)| (at.clone(), sizing_rule(attrs, at, *axis)))
2076+ .filter(|(_, body)| !body.is_empty())
2077+ .collect()
2078+}
27692079
2770− // Inset (shorthand for top/right/bottom/left)
2771− "inset" => {
2772− if let Some(v) = val {
2773− push_css(&mut css, "inset", &css_px(v));
2774− }
2775− }
2080+/// An element's generated class, with the rules keyed on its parent's
2081+/// class that its `fill` and `shrink` need where the parent's direction
2082+/// changes under a prefix (see [`Flow`]): `:where(.a)>.b`, one class of
2083+/// specificity like any class rule.
2084+fn element_class(elem: &Element, site: &Site, styles: &mut StyleCollector) -> Option<String> {
2085+ let as_child = match site.parent.class {
2086+ Some(_) => sizing_changes(&elem.attrs, site.parent),
2087+ None => Vec::new(),
2088+ };
2089+ // Two elements with the same CSS but different rules keyed on them
2090+ // need two classes
2091+ let mut distinct = String::new();
2092+ for (at, body) in &as_child {
2093+ distinct.push_str(&format!("<{:?}{}", at, body));
2094+ }
2095+ let class = compute_class(&elem.attrs, site, styles, distinct)?;
2096+ if let Some(parent) = &site.parent.class {
2097+ for (at, body) in as_child {
2098+ styles.add_keyed(at, format!(":where(.{})>.{}", parent, class), body);
2099+ }
2100+ }
2101+ Some(class)
2102+}
27762103
2777− // Accent & caret colors
2778− "accent-color" => {
2779− if let Some(v) = val {
2780− push_css(&mut css, "accent-color", v);
2781− }
2782− }
2783− "caret-color" => {
2784− if let Some(v) = val {
2785− push_css(&mut css, "caret-color", v);
2786− }
2787− }
2104+/// The `display` of a layout (nothing for text, native and void elements,
2105+/// which keep HTML's own).
2106+fn layout_css(layout: Layout, inline: bool) -> &'static str {
2107+ match (layout, inline) {
2108+ (Layout::Column, false) => "display:flex;flex-direction:column;",
2109+ (Layout::Column, true) => "display:inline-flex;flex-direction:column;",
2110+ (Layout::Row, false) => "display:flex;flex-direction:row;",
2111+ (Layout::Row, true) => "display:inline-flex;flex-direction:row;",
2112+ (Layout::Grid, false) => "display:grid;",
2113+ (Layout::Grid, true) => "display:inline-grid;",
2114+ _ => "",
2115+ }
2116+}
27882117
2789− // Color scheme & appearance
2790− "color-scheme" => {
2791− if let Some(v) = val {
2792− push_css(&mut css, "color-scheme", v);
2793− }
2794− }
2795− "appearance" => {
2796− if let Some(v) = val {
2797− push_css(&mut css, "appearance", v);
2798− }
2799− }
2118+/// The declarations of the attributes under `condition` (the defaults of
2119+/// the element's kind are [`default_css`]'s).
2120+fn attrs_to_css(attrs: &[Attribute], condition: &Condition, site: &Site) -> String {
2121+ let mut css = String::new();
2122+ // The auto margins of `center-x`, `align-left`, ..., written at the end
2123+ let mut aligned = String::new();
2124+ let kind = site.kind;
2125+ // Under `children:` the styles go on the children, whose parent is this
2126+ // element: htmlang's words that place an element in its parent are an
2127+ // error there (the parser reports them), and left out
2128+ let on_children = condition.on_children();
2129+ let inside = condition.inside().is_some();
2130+ // The direction `fill` and `shrink` compile against
2131+ let axis = site.parent.at(&condition.at);
2132+
2133+ // htmlang's words for laying out children (`spacing`, `wrap`,
2134+ // `grid-cols`) mean nothing on an element that doesn't lay out its
2135+ // children, which the parser reports; they are left out. Under
2136+ // `children:` they go on the children, whose layout isn't known here.
2137+ let lays_out_children = kind.layout().is_container() || on_children;
2138+ fn under<'k>(key: &'k str, condition: &Condition) -> Option<&'k str> {
2139+ let (c, name) = Condition::of(key);
2140+ (c == *condition).then_some(name)
2141+ }
2142+
2143+ for (index, attr) in attrs.iter().enumerate() {
2144+ if attr.html {
2145+ continue;
2146+ }
2147+ let Some(effective_key) = under(&attr.key, condition) else {
2148+ continue;
2149+ };
2150+ if on_children && crate::vocab::places_in_parent(effective_key, attr.value.as_deref()) {
2151+ continue;
2152+ }
2153+ // Under an element prefix (`@td:`) the styles go on elements whose
2154+ // layout and parent aren't known here: htmlang's own words are an
2155+ // error there (the parser reports them), and left out
2156+ if inside && crate::vocab::is_htmlang_word(effective_key, attr.value.as_deref()) {
2157+ continue;
2158+ }
28002159
2801− // List style
2802− "list-style" => {
2803− if let Some(v) = val {
2804− push_css(&mut css, "list-style", v);
2805− }
2806− }
2160+ let val = attr.value.as_deref();
2161+ // A style whose value came out empty (a field a record doesn't
2162+ // have, `${if()}` without its other branch) is left out
2163+ if val.is_some_and(|v| v.trim().is_empty()) {
2164+ continue;
2165+ }
28072166
2808− // Table
2809− "border-collapse" => {
2810− if let Some(v) = val {
2811− push_css(&mut css, "border-collapse", v);
2812− }
2813− }
2814− "border-spacing" => {
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" => {
28152172 if let Some(v) = val {
2816− push_css(&mut css, "border-spacing", &css_px(v));
2173+ push_css(&mut css, "gap", &with_px("gap", v));
28172174 }
28182175 }
28192176
2820− // Text decoration
2821− "text-decoration" => {
2822− if let Some(v) = val {
2823− push_css(&mut css, "text-decoration", v);
2824− }
2825− }
2826− "text-decoration-color" => {
2827− if let Some(v) = val {
2828− push_css(&mut css, "text-decoration-color", v);
2829− }
2830− }
2831− "text-decoration-thickness" => {
2832− if let Some(v) = val {
2833− push_css(&mut css, "text-decoration-thickness", &css_px(v));
2834− }
2835− }
2836− "text-decoration-style" => {
2837− if let Some(v) = val {
2838− push_css(&mut css, "text-decoration-style", v);
2839− }
2840− }
2841− "text-underline-offset" => {
2842− if let Some(v) = val {
2843− push_css(&mut css, "text-underline-offset", &css_px(v));
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;
28442188 }
2845− }
2846−
2847− // Multi-column
2848− "column-width" => {
2849− if let Some(v) = val {
2850− push_css(&mut css, "column-width", &css_px(v));
2189+ let dim = if effective_key == "width" {
2190+ Dim::Width
2191+ } else {
2192+ Dim::Height
2193+ };
2194+ let size = Size::of(val.unwrap_or_default());
2195+ // What the element writes itself, which a layout word
2196+ // leaves alone
2197+ let sizes = Sizes::of(attrs, condition);
2198+ for &(property, value) in sizing(dim, size, axis) {
2199+ sizes.push(&mut css, property, value);
2200+ }
2201+ }
2202+
2203+ // A size of its own under a prefix, where a `fill` or
2204+ // `shrink` that sets `flex` (along a flex parent's direction)
2205+ // holds too: the word's `flex` and minimum are put back, so the
2206+ // size is the one the element gets (`width fill, lg:width 200`
2207+ // in a row)
2208+ "width" | "height"
2209+ if *condition != Condition::default()
2210+ && attrs.iter().any(|a| {
2211+ let (c, name) = Condition::of(&a.key);
2212+ let along = match site.parent.at(&c.at) {
2213+ Some(Axis::Row) => name == "width",
2214+ Some(Axis::Column) => name == "height",
2215+ None => false,
2216+ };
2217+ !a.html
2218+ && name == effective_key
2219+ && along
2220+ && c != *condition
2221+ && c.holds_at(condition)
2222+ && a.value
2223+ .as_deref()
2224+ .is_some_and(|v| !v.trim().is_empty() && Size::of(v) != Size::Set)
2225+ }) =>
2226+ {
2227+ let dim = if effective_key == "width" {
2228+ Dim::Width
2229+ } else {
2230+ Dim::Height
2231+ };
2232+ let sizes = Sizes::of(attrs, condition);
2233+ for (property, value) in sizing_properties(dim) {
2234+ if property != effective_key {
2235+ sizes.push(&mut css, property, value);
2236+ }
28512237 }
2852− }
2853− "column-rule" => {
28542238 if let Some(v) = val {
2855− push_css(&mut css, "column-rule", v);
2239+ push_css(&mut css, effective_key, &with_px(effective_key, v));
28562240 }
28572241 }
28582242
2859− // Place items/self
2860− "place-items" => {
2861− if let Some(v) = val {
2862− push_css(&mut css, "place-items", v);
2863− }
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");
28642249 }
2865− "place-self" => {
2866− if let Some(v) = val {
2867− push_css(&mut css, "place-self", v);
2868− }
2250+ "center-y" => {
2251+ push_css(&mut aligned, "margin-top", "auto");
2252+ push_css(&mut aligned, "margin-bottom", "auto");
28692253 }
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"),
28702258
2871− // Scroll behavior
2872− "scroll-behavior" => {
2873− if let Some(v) = val {
2874− push_css(&mut css, "scroll-behavior", v);
2875− }
2876− }
2259+ "wrap" if lays_out_children => push_css(&mut css, "flex-wrap", "wrap"),
2260+ "wrap" => {}
28772261
2878− // Resize
2879− "resize" => {
2262+ // Grid
2263+ "grid-cols" | "grid-rows" if !lays_out_children => {}
2264+ "grid-cols" | "grid-rows" => {
28802265 if let Some(v) = val {
2881− push_css(&mut css, "resize", v);
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+ }
28822275 }
28832276 }
2884−
2885− // New CSS properties
2886− "clip-path" => {
2887− if let Some(v) = val { push_css(&mut css, "clip-path", v); }
2888− }
2889− "mix-blend-mode" => {
2890− if let Some(v) = val { push_css(&mut css, "mix-blend-mode", v); }
2891− }
2892− "background-blend-mode" => {
2893− if let Some(v) = val { push_css(&mut css, "background-blend-mode", v); }
2894− }
2895− "writing-mode" => {
2896− if let Some(v) = val { push_css(&mut css, "writing-mode", v); }
2897− }
2898− "column-count" => {
2899− if let Some(v) = val { push_css(&mut css, "column-count", v); }
2900− }
2901− "column-gap" => {
2902− if let Some(v) = val { push_css(&mut css, "column-gap", &css_px(v)); }
2903− }
2904− "text-indent" => {
2905− if let Some(v) = val { push_css(&mut css, "text-indent", &css_px(v)); }
2906− }
2907− "hyphens" => {
2908− if let Some(v) = val { push_css(&mut css, "hyphens", v); }
2909− }
2910− "flex-grow" => {
2911− if let Some(v) = val { push_css(&mut css, "flex-grow", v); }
2912− }
2913− "flex-shrink" => {
2914− if let Some(v) = val { push_css(&mut css, "flex-shrink", v); }
2915− }
2916− "flex-basis" => {
2917− if let Some(v) = val { push_css(&mut css, "flex-basis", &css_px(v)); }
2918− }
2919− "isolation" => {
2920− if let Some(v) = val { push_css(&mut css, "isolation", v); }
2921− }
2922− "place-content" => {
2923− if let Some(v) = val { push_css(&mut css, "place-content", v); }
2924− }
2925− "background-image" => {
2926− if let Some(v) = val { push_css(&mut css, "background-image", v); }
2927− }
2928− "font-weight" => {
2929− if let Some(v) = val { push_css(&mut css, "font-weight", v); }
2930− }
2931− "font-style" => {
2932− if let Some(v) = val { push_css(&mut css, "font-style", v); }
2933− }
2934− "text-wrap" => {
2935− if let Some(v) = val { push_css(&mut css, "text-wrap", v); }
2936− }
2937− "will-change" => {
2938− if let Some(v) = val { push_css(&mut css, "will-change", v); }
2939− }
2940− "touch-action" => {
2941− if let Some(v) = val { push_css(&mut css, "touch-action", v); }
2942− }
2943− "vertical-align" => {
2944− if let Some(v) = val { push_css(&mut css, "vertical-align", v); }
2945− }
2946− "scroll-margin" => {
2947− if let Some(v) = val { push_css(&mut css, "scroll-margin", &css_px(v)); }
2948− }
2949− "scroll-margin-top" | "scroll-margin-bottom" | "scroll-margin-left" | "scroll-margin-right" => {
2950− if let Some(v) = val { push_css(&mut css, effective_key, &css_px(v)); }
2951− }
2952− "scroll-padding" => {
2953− if let Some(v) = val { push_css(&mut css, "scroll-padding", &css_px(v)); }
2954− }
2955− "scroll-padding-top" | "scroll-padding-bottom" | "scroll-padding-left" | "scroll-padding-right" => {
2956− if let Some(v) = val { push_css(&mut css, effective_key, &css_px(v)); }
2957− }
2958− "direction" => {
2959− if let Some(v) = val { push_css(&mut css, "direction", v); }
2960− }
2961−
2962− "content" => {
2277+ "col-span" | "row-span" => {
29632278 if let Some(v) = val {
2964− // Wrap in quotes if not already quoted and not a CSS keyword
2965− if v.starts_with('"') || v.starts_with('\'') || v == "none" || v == "normal" || v.starts_with("attr(") || v.starts_with("counter(") {
2966− push_css(&mut css, "content", v);
2279+ let property = if effective_key == "col-span" {
2280+ "grid-column"
29672281 } else {
2968− push_css(&mut css, "content", &format!("\"{}\"", v));
2969− }
2282+ "grid-row"
2283+ };
2284+ push_css(&mut css, property, &format!("span {}", v));
29702285 }
29712286 }
29722287
2973− // --- CSS Shorthands ---
2974−
2975− "truncate" => {
2976− push_css(&mut css, "overflow", "hidden");
2977− push_css(&mut css, "text-overflow", "ellipsis");
2978− push_css(&mut css, "white-space", "nowrap");
2979− }
2288+ // CSS's `line-clamp` has no support yet without its
2289+ // `-webkit-` fallback, which needs a box to clamp
29802290 "line-clamp" => {
29812291 if let Some(v) = val {
29822292 push_css(&mut css, "display", "-webkit-box");
@@ -2985,128 +2295,23 @@ fn attrs_to_css(
29852295 push_css(&mut css, "overflow", "hidden");
29862296 }
29872297 }
2988− "blur" => {
2989− if let Some(v) = val {
2990− push_css(&mut css, "filter", &format!("blur({})", css_px(v)));
2991− }
2992− }
2993− "backdrop-blur" => {
2994− if let Some(v) = val {
2995− push_css(&mut css, "backdrop-filter", &format!("blur({})", css_px(v)));
2996− }
2997− }
2998− "no-scrollbar" => {
2999− push_css(&mut css, "scrollbar-width", "none");
3000− push_css(&mut css, "-ms-overflow-style", "none");
3001− }
3002− "skeleton" => {
3003− push_css(&mut css, "background", "linear-gradient(90deg,#e5e7eb 25%,#f3f4f6 50%,#e5e7eb 75%)");
3004− push_css(&mut css, "background-size", "200% 100%");
3005− push_css(&mut css, "animation", "hl-skeleton 1.5s ease-in-out infinite");
3006− }
3007− "gradient" => {
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) => {
30082305 if let Some(v) = val {
3009− // Parse: "from to [angle]" or "color1 color2 [angle]"
3010− let parts: Vec<&str> = v.split_whitespace().collect();
3011− let bg = if parts.len() >= 3 && (parts[2].ends_with("deg") || parts[2].ends_with("turn") || parts[2].ends_with("rad")) {
3012− format!("linear-gradient({},{},{})", parts[2], parts[0], parts[1])
3013− } else if parts.len() >= 2 {
3014− format!("linear-gradient({},{})", parts[0], parts[1])
3015− } else {
3016− format!("linear-gradient({},transparent)", parts[0])
3017− };
3018− push_css(&mut css, "background", &bg);
2306+ push_css(&mut css, key, &with_px(key, v));
30192307 }
30202308 }
30212309
3022− // Grid areas
3023− "grid-template-areas" => {
3024− if let Some(v) = val { push_css(&mut css, "grid-template-areas", v); }
3025− }
3026− "grid-area" => {
3027− if let Some(v) = val { push_css(&mut css, "grid-area", v); }
3028− }
3029−
3030− // View transitions
3031− "view-transition-name" => {
3032− if let Some(v) = val { push_css(&mut css, "view-transition-name", v); }
3033− }
3034−
3035− // Animate shorthand (alias for animation)
3036− "animate" => {
3037− if let Some(v) = val { push_css(&mut css, "animation", v); }
3038− }
3039−
3040− // CSS subgrid
3041− "grid-template-columns" => {
3042− if let Some(v) = val { push_css(&mut css, "grid-template-columns", v); }
3043− }
3044− "grid-template-rows" => {
3045− if let Some(v) = val { push_css(&mut css, "grid-template-rows", v); }
3046− }
3047−
3048− // Scroll-driven animations
3049− "animation-timeline" => {
3050− if let Some(v) = val { push_css(&mut css, "animation-timeline", v); }
3051− }
3052− "animation-range" => {
3053− if let Some(v) = val { push_css(&mut css, "animation-range", v); }
3054− }
3055− "view-timeline-name" => {
3056− if let Some(v) = val { push_css(&mut css, "view-timeline-name", v); }
3057− }
3058− "view-timeline-axis" => {
3059− if let Some(v) = val { push_css(&mut css, "view-timeline-axis", v); }
3060− }
3061− "scroll-timeline-name" => {
3062− if let Some(v) = val { push_css(&mut css, "scroll-timeline-name", v); }
3063− }
3064− "scroll-timeline-axis" => {
3065− if let Some(v) = val { push_css(&mut css, "scroll-timeline-axis", v); }
3066− }
3067−
3068− // Anchor positioning
3069− "anchor-name" => {
3070− if let Some(v) = val { push_css(&mut css, "anchor-name", v); }
3071− }
3072− "position-anchor" => {
3073− if let Some(v) = val { push_css(&mut css, "position-anchor", v); }
3074− }
3075− "position-area" => {
3076− if let Some(v) = val { push_css(&mut css, "position-area", v); }
3077− }
3078− "inset-area" => {
3079− // Legacy alias for position-area
3080− if let Some(v) = val { push_css(&mut css, "position-area", v); }
3081− }
3082−
3083− // initial-letter (drop caps)
3084− "initial-letter" => {
3085− if let Some(v) = val { push_css(&mut css, "initial-letter", v); }
3086− }
3087−
3088− // Critical CSS hint — not CSS, handled elsewhere
3089− "critical" => {}
3090−
3091− // Identity and HTML passthrough — not CSS
3092− "id" | "class" => {}
3093− "type" | "placeholder" | "name" | "value" | "disabled" | "required"
3094− | "checked" | "for" | "action" | "method" | "autocomplete" | "min"
3095− | "max" | "step" | "pattern" | "maxlength" | "rows" | "cols"
3096− | "multiple" | "alt" | "role" | "tabindex" | "title"
3097− | "controls" | "autoplay" | "loop" | "muted" | "poster" | "preload"
3098− | "loading" | "decoding" | "ordered" | "src"
3099− | "open" | "novalidate" | "low" | "high" | "optimum"
3100− | "colspan" | "rowspan" | "scope" | "inline" | "responsive"
3101− | "datetime" | "media" | "sizes" | "srcset" | "cite" | "list"
3102− | "sandbox" | "allow" | "allowfullscreen" | "referrerpolicy"
3103− | "formaction" | "formmethod" | "formtarget" | "target"
3104− | "autofocus" => {}
3105−
31062310 _ => {}
31072311 }
31082312 }
31092313
2314+ css.push_str(&aligned);
31102315 css
31112316}
31122317
@@ -3117,41 +2322,10 @@ fn push_css(css: &mut String, prop: &str, value: &str) {
31172322 css.push(';');
31182323}
31192324
3120−/// Known CSS units — if a value ends with one, skip appending `px`.
3121−const CSS_UNITS: &[&str] = &[
3122− "%", "rem", "em", "vh", "vw", "vmin", "vmax", "dvh", "svh", "lvh",
3123− "ch", "ex", "cm", "mm", "in", "pt", "pc", "fr",
3124−];
3125−
3126−/// Format a numeric value: if it already has a CSS unit, pass through as-is;
3127−/// otherwise append `px`.
3128−fn css_px(value: &str) -> String {
3129− let v = value.trim();
3130− if v == "0" {
3131− return "0".to_string();
3132− }
3133− if CSS_UNITS.iter().any(|u| v.ends_with(u)) {
3134− return v.to_string();
3135− }
3136− if v.starts_with("var(") || v.starts_with("calc(") || v.starts_with("clamp(") || v.starts_with("min(") || v.starts_with("max(") {
3137− return v.to_string();
3138− }
3139− format!("{}px", v)
3140−}
3141−
3142−/// Format multiple space-separated values, each getting px if needed.
3143−fn css_px_multi(value: &str) -> String {
3144− value
3145− .split_whitespace()
3146− .map(|p| css_px(p))
3147− .collect::<Vec<_>>()
3148− .join(" ")
3149−}
3150−
31512325fn extract_id_class(attrs: &[Attribute]) -> (Option<String>, Option<String>) {
31522326 let mut id = None;
31532327 let mut class = None;
3154− for attr in attrs {
2328+ for attr in attrs.iter().filter(|a| a.html) {
31552329 match attr.key.as_str() {
31562330 "id" => id = attr.value.clone(),
31572331 "class" => class = attr.value.clone(),
@@ -3161,149 +2335,6 @@ fn extract_id_class(attrs: &[Attribute]) -> (Option<String>, Option<String>) {
31612335 (id, class)
31622336}
31632337
3164−/// Read image dimensions from a local file by parsing the header bytes.
3165−/// Supports PNG, JPEG, GIF, WebP, AVIF, and SVG.
3166−fn read_image_dimensions(path: &str) -> Option<(u32, u32)> {
3167− // SVG: parse as text for viewBox/width/height attributes
3168− if path.ends_with(".svg") || path.ends_with(".SVG") {
3169− let text = std::fs::read_to_string(path).ok()?;
3170− return read_svg_dimensions(&text);
3171− }
3172−
3173− let data = std::fs::read(path).ok()?;
3174− if data.len() < 12 {
3175− return None;
3176− }
3177−
3178− // PNG: 8-byte signature, then IHDR chunk with width/height at bytes 16-23
3179− if data.len() >= 24 && data.starts_with(b"\x89PNG\r\n\x1a\n") {
3180− let w = u32::from_be_bytes([data[16], data[17], data[18], data[19]]);
3181− let h = u32::from_be_bytes([data[20], data[21], data[22], data[23]]);
3182− return Some((w, h));
3183− }
3184−
3185− // GIF: "GIF87a" or "GIF89a", width/height at bytes 6-9 (little-endian)
3186− if data.starts_with(b"GIF87a") || data.starts_with(b"GIF89a") {
3187− let w = u16::from_le_bytes([data[6], data[7]]) as u32;
3188− let h = u16::from_le_bytes([data[8], data[9]]) as u32;
3189− return Some((w, h));
3190− }
3191−
3192− // JPEG: scan for SOF0/SOF2 marker (0xFF 0xC0 or 0xFF 0xC2)
3193− if data.starts_with(b"\xff\xd8") {
3194− let mut i = 2;
3195− while i + 9 < data.len() {
3196− if data[i] != 0xFF {
3197− i += 1;
3198− continue;
3199− }
3200− let marker = data[i + 1];
3201− if marker == 0xC0 || marker == 0xC2 {
3202− let h = u16::from_be_bytes([data[i + 5], data[i + 6]]) as u32;
3203− let w = u16::from_be_bytes([data[i + 7], data[i + 8]]) as u32;
3204− return Some((w, h));
3205− }
3206− if i + 3 < data.len() {
3207− let len = u16::from_be_bytes([data[i + 2], data[i + 3]]) as usize;
3208− i += 2 + len;
3209− } else {
3210− break;
3211− }
3212− }
3213− }
3214−
3215− // WebP: "RIFF" ... "WEBP", VP8 header at byte 20
3216− if data.len() >= 30 && &data[..4] == b"RIFF" && &data[8..12] == b"WEBP" {
3217− if &data[12..16] == b"VP8 " && data.len() >= 30 {
3218− let w = u16::from_le_bytes([data[26], data[27]]) as u32 & 0x3FFF;
3219− let h = u16::from_le_bytes([data[28], data[29]]) as u32 & 0x3FFF;
3220− return Some((w, h));
3221− }
3222− if &data[12..16] == b"VP8L" && data.len() >= 25 && data[21] == 0x2F {
3223− let bits = u32::from_le_bytes([data[22], data[23], data[24], data[25]]);
3224− let w = (bits & 0x3FFF) + 1;
3225− let h = ((bits >> 14) & 0x3FFF) + 1;
3226− return Some((w, h));
3227− }
3228− }
3229−
3230− // AVIF: ISOBMFF container with "ftyp" box containing "avif"/"avis" brand,
3231− // then "ispe" box with width/height
3232− if data.len() >= 12 && &data[4..8] == b"ftyp" {
3233− let brand = &data[8..12];
3234− if brand == b"avif" || brand == b"avis" || brand == b"mif1" {
3235− return read_avif_dimensions(&data);
3236− }
3237− }
3238−
3239− None
3240−}
3241−
3242−/// Parse SVG viewBox or width/height attributes to get dimensions.
3243−fn read_svg_dimensions(text: &str) -> Option<(u32, u32)> {
3244− // Try viewBox first: viewBox="minX minY width height"
3245− if let Some(vb_start) = text.find("viewBox=\"") {
3246− let rest = &text[vb_start + 9..];
3247− if let Some(end) = rest.find('"') {
3248− let parts: Vec<&str> = rest[..end].split_whitespace().collect();
3249− if parts.len() == 4 {
3250− if let (Ok(w), Ok(h)) = (parts[2].parse::<f64>(), parts[3].parse::<f64>()) {
3251− if w > 0.0 && h > 0.0 {
3252− return Some((w.round() as u32, h.round() as u32));
3253− }
3254− }
3255− }
3256− }
3257− }
3258− // Fall back to width/height attributes on <svg>
3259− let svg_tag = text.find("<svg")?;
3260− let tag_end = text[svg_tag..].find('>')? + svg_tag;
3261− let tag = &text[svg_tag..tag_end];
3262− let w = extract_svg_attr(tag, "width")?;
3263− let h = extract_svg_attr(tag, "height")?;
3264− Some((w, h))
3265−}
3266−
3267−fn extract_svg_attr(tag: &str, attr: &str) -> Option<u32> {
3268− let needle = format!("{}=\"", attr);
3269− let start = tag.find(&needle)? + needle.len();
3270− let rest = &tag[start..];
3271− let end = rest.find('"')?;
3272− let val = rest[..end].trim_end_matches("px");
3273− val.parse::<f64>().ok().map(|v| v.round() as u32)
3274−}
3275−
3276−/// Parse AVIF (ISOBMFF) container to find ispe box with image dimensions.
3277−fn read_avif_dimensions(data: &[u8]) -> Option<(u32, u32)> {
3278− // Walk ISOBMFF boxes looking for "ispe" (image spatial extents)
3279− let mut i = 0;
3280− while i + 8 <= data.len() {
3281− let box_size = u32::from_be_bytes([data[i], data[i + 1], data[i + 2], data[i + 3]]) as usize;
3282− let box_type = &data[i + 4..i + 8];
3283− if box_size < 8 {
3284− break;
3285− }
3286− let box_end = (i + box_size).min(data.len());
3287− // ispe box: 4 bytes version/flags + 4 bytes width + 4 bytes height
3288− if box_type == b"ispe" && box_end >= i + 20 {
3289− let w = u32::from_be_bytes([data[i + 12], data[i + 13], data[i + 14], data[i + 15]]);
3290− let h = u32::from_be_bytes([data[i + 16], data[i + 17], data[i + 18], data[i + 19]]);
3291− return Some((w, h));
3292− }
3293− // Recurse into container boxes (meta, iprp, ipco)
3294− if matches!(box_type, b"meta" | b"iprp" | b"ipco" | b"moov" | b"trak" | b"mdia") {
3295− let header_size = if box_type == b"meta" { 12 } else { 8 };
3296− if i + header_size < box_end {
3297− if let Some(dims) = read_avif_dimensions(&data[i + header_size..box_end]) {
3298− return Some(dims);
3299− }
3300− }
3301− }
3302− i = box_end;
3303− }
3304− None
3305−}
3306−
33072338fn html_escape(s: &str) -> String {
33082339 s.replace('&', "&")
33092340 .replace('<', "<")
@@ -3342,10 +2373,24 @@ fn base64_encode(data: &[u8]) -> String {
33422373/// Generate a standard v3 source map with VLQ-encoded mappings.
33432374/// Compatible with browser devtools and source map tooling.
33442375pub 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 {
33452382 let mut mappings: Vec<(usize, usize)> = Vec::new(); // (html_line, hl_line)
3346− collect_source_lines(&doc.nodes, &mut mappings);
3347− mappings.sort_by_key(|m| m.0);
3348− 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+ }
33492394
33502395 // Build VLQ-encoded mappings string.
33512396 // Each generated line is separated by ';'. Each segment within a line is
@@ -3363,16 +2408,19 @@ pub fn generate_source_map(doc: &Document, source_file: &str) -> String {
33632408 if mapping_idx < mappings.len() && mappings[mapping_idx].0 == gen_line {
33642409 let source_line = mappings[mapping_idx].1 as i64 - 1; // 0-based
33652410 // Segment: gen_col=0, source_idx=0, source_line=delta, source_col=0
3366− vlq_encode(0, &mut vlq); // generated column (always 0)
3367− vlq_encode(0, &mut vlq); // source file index (always 0)
2411+ vlq_encode(0, &mut vlq); // generated column (always 0)
2412+ vlq_encode(0, &mut vlq); // source file index (always 0)
33682413 vlq_encode(source_line - prev_source_line, &mut vlq); // source line delta
3369− vlq_encode(0, &mut vlq); // source column (always 0)
2414+ vlq_encode(0, &mut vlq); // source column (always 0)
33702415 prev_source_line = source_line;
33712416 mapping_idx += 1;
33722417 }
33732418 }
33742419
3375− let escaped_file = source_file.replace(".hl", ".html").replace('\\', "\\\\").replace('"', "\\\"");
2420+ let escaped_file = source_file
2421+ .replace(".hl", ".html")
2422+ .replace('\\', "\\\\")
2423+ .replace('"', "\\\"");
33762424 let escaped_source = source_file.replace('\\', "\\\\").replace('"', "\\\"");
33772425
33782426 format!(
@@ -3402,52 +2450,30 @@ fn vlq_encode(value: i64, out: &mut String) {
34022450 }
34032451}
34042452
3405−fn collect_source_lines(nodes: &[Node], mappings: &mut Vec<(usize, usize)>) {
3406− for node in nodes {
3407− if let Node::Element(elem) = node {
3408− if elem.line_num > 0 {
3409− mappings.push((mappings.len() + 1, elem.line_num));
3410− }
3411− collect_source_lines(&elem.children, mappings);
3412− }
3413− }
3414−}
3415−
3416−/// Check if a specific element kind exists anywhere in the node tree.
3417−fn has_element_kind(nodes: &[Node], target: &ElementKind) -> bool {
3418− for node in nodes {
3419− if let Node::Element(elem) = node {
3420− if elem.kind == *target {
3421− return true;
3422− }
3423− if has_element_kind(&elem.children, target) {
3424− return true;
3425− }
3426− }
3427− }
3428− false
3429−}
3430−
3431−/// Collect unique external domains from generated HTML for DNS prefetch hints.
3432−fn collect_dns_prefetch(html: &str, dev: bool) -> String {
3433− let mut domains = Vec::new();
3434− let mut rest = html;
3435− while let Some(pos) = rest.find("https://") {
3436− let start = pos + 8; // skip "https://"
3437− rest = &rest[start..];
3438− let end = rest.find(|c: char| c == '/' || c == '"' || c == '\'' || c == ' ' || c == '>' || c == ')').unwrap_or(rest.len());
3439− let domain = &rest[..end];
3440− if !domain.is_empty() && domain.contains('.') && !domains.contains(&domain.to_string()) {
3441− domains.push(domain.to_string());
3442− }
3443− }
3444− let mut out = String::new();
3445− for domain in &domains {
3446− if dev {
3447− out.push_str(&format!("<link rel=\"dns-prefetch\" href=\"//{}\">\n", domain));
3448− } else {
3449− out.push_str(&format!("<link rel=\"dns-prefetch\" href=\"//{}\">", domain));
3450− }
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()));
34512478 }
3452− out
34532479}