jeffemmett
/
typst
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure that whitespace is not collapsed in inline raw blocks (#6703)

This commit is contained in:
Laurenz 2025-08-05 17:13:21 +02:00 committed by GitHub
parent 6177c1b22d
commit 4a975fdb8b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crates/typst-html/src/rules.rs
View File

@ -415,16 +415,20 @@ const RAW_RULE: ShowFn<RawElem> = |elem, _, styles| {
seq.push(line.clone().pack()); seq.push(line.clone().pack());
} }
let mut inline = css::Properties::new();
let block = elem.block.get(styles);
if !block {
// Without the `<pre>` tag, whitespace would be collapsed by default.
inline.push("white-space", "pre-wrap");
}
let code = HtmlElem::new(tag::code) let code = HtmlElem::new(tag::code)
.with_styles(inline)
.with_body(Some(Content::sequence(seq))) .with_body(Some(Content::sequence(seq)))
.pack() .pack()
.spanned(elem.span()); .spanned(elem.span());
Ok(if elem.block.get(styles) { Ok(if block { HtmlElem::new(tag::pre).with_body(Some(code)).pack() } else { code })
HtmlElem::new(tag::pre).with_body(Some(code)).pack()
} else {
code
})
}; };
/// This is used by `RawElem::synthesize` through a routine. /// This is used by `RawElem::synthesize` through a routine.

10
tests/ref/html/raw-html-inline-spaces.html Normal file
View File

@ -0,0 +1,10 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
</head>
<body>
<p>This has <code style="white-space: pre-wrap">double spaces inside</code>, which should be kept.</p>
</body>
</html>

2
tests/ref/html/raw-html.html
View File

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
</head> </head>
<body> <body>
<p>This is <code><strong>*</strong><strong>inline</strong><strong>*</strong></code>.</p> <p>This is <code style="white-space: pre-wrap"><strong>*</strong><strong>inline</strong><strong>*</strong></code>.</p>
<pre><code><span style="color: #d73a49">#</span><span style="color: #d73a49">set</span> <span style="color: #4b69c6">text</span>(blue)<br><strong>*</strong><strong>Hello</strong><strong>*</strong> <em>_</em><em>world</em><em>_</em>!</code></pre> <pre><code><span style="color: #d73a49">#</span><span style="color: #d73a49">set</span> <span style="color: #4b69c6">text</span>(blue)<br><strong>*</strong><strong>Hello</strong><strong>*</strong> <em>_</em><em>world</em><em>_</em>!</code></pre>
</body> </body>
</html> </html>

3
tests/suite/text/raw.typ
View File

@ -494,6 +494,9 @@ This is ```typ *inline*```.
*Hello* _world_! *Hello* _world_!
``` ```
--- raw-html-inline-spaces html ---
This has `double spaces inside`, which should be kept.
--- raw-line --- --- raw-line ---
#set page(width: 200pt) #set page(width: 200pt)