caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-07-28 06:47:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge ccabbe5bec4ea62fb05747154b0027f70ab3c811 into b790c6d59ceaf7a809cc24b60c1f1509807470e2

Browse Source
This commit is contained in:
Malo 2025-07-18 17:19:58 +02:00 committed by GitHub
commit aaffc4212a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 56 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
crates/typst-html/src/convert.rs
View File

@ -1,3 +1,5 @@
use crate::fragment::html_fragment;
use crate::{attr, tag, FrameElem, HtmlElem, HtmlElement, HtmlFrame, HtmlNode};
use typst_library::diag::{warning, SourceResult}; use typst_library::diag::{warning, SourceResult};
use typst_library::engine::Engine; use typst_library::engine::Engine;
use typst_library::foundations::{Content, StyleChain, Target, TargetElem}; use typst_library::foundations::{Content, StyleChain, Target, TargetElem};
@ -5,10 +7,10 @@ use typst_library::introspection::{SplitLocator, TagElem};
use typst_library::layout::{Abs, Axes, BlockBody, BlockElem, BoxElem, Region, Size}; use typst_library::layout::{Abs, Axes, BlockBody, BlockElem, BoxElem, Region, Size};
use typst_library::model::ParElem; use typst_library::model::ParElem;
use typst_library::routines::Pair; use typst_library::routines::Pair;
use typst_library::text::{LinebreakElem, SmartQuoteElem, SpaceElem, TextElem}; use typst_library::text::{
is_default_ignorable, LinebreakElem, SmartQuoteElem, SmartQuoter, SmartQuotes,
use crate::fragment::html_fragment; SpaceElem, TextElem,
use crate::{attr, tag, FrameElem, HtmlElem, HtmlElement, HtmlFrame, HtmlNode}; };
/// Converts realized content into HTML nodes. /// Converts realized content into HTML nodes.
pub fn convert_to_nodes<'a>( pub fn convert_to_nodes<'a>(
@ -16,9 +18,10 @@ pub fn convert_to_nodes<'a>(
locator: &mut SplitLocator, locator: &mut SplitLocator,
children: impl IntoIterator<Item = Pair<'a>>, children: impl IntoIterator<Item = Pair<'a>>,
) -> SourceResult<Vec<HtmlNode>> { ) -> SourceResult<Vec<HtmlNode>> {
let mut quoter = SmartQuoter::new();
let mut output = Vec::new(); let mut output = Vec::new();
for (child, styles) in children { for (child, styles) in children {
handle(engine, child, locator, styles, &mut output)?; handle(engine, child, locator, styles, &mut quoter, &mut output)?;
} }
Ok(output) Ok(output)
} }
@ -29,6 +32,7 @@ fn handle(
child: &Content, child: &Content,
locator: &mut SplitLocator, locator: &mut SplitLocator,
styles: StyleChain, styles: StyleChain,
quoter: &mut SmartQuoter,
output: &mut Vec<HtmlNode>, output: &mut Vec<HtmlNode>,
) -> SourceResult<()> { ) -> SourceResult<()> {
if let Some(elem) = child.to_packed::<TagElem>() { if let Some(elem) = child.to_packed::<TagElem>() {
@ -95,10 +99,20 @@ fn handle(
} else if let Some(elem) = child.to_packed::<LinebreakElem>() { } else if let Some(elem) = child.to_packed::<LinebreakElem>() {
output.push(HtmlElement::new(tag::br).spanned(elem.span()).into()); output.push(HtmlElement::new(tag::br).spanned(elem.span()).into());
} else if let Some(elem) = child.to_packed::<SmartQuoteElem>() { } else if let Some(elem) = child.to_packed::<SmartQuoteElem>() {
output.push(HtmlNode::text( let double = elem.double.get(styles);
if elem.double.get(styles) { '"' } else { '\'' }, if elem.enabled.get(styles) {
child.span(), let before = last_char(output);
)); let quotes = SmartQuotes::get(
elem.quotes.get_ref(styles),
styles.get(TextElem::lang),
styles.get(TextElem::region),
elem.alternative.get(styles),
);
let quote = quoter.quote(before, &quotes, double);
output.push(HtmlNode::text(quote, child.span()));
} else {
output.push(HtmlNode::text(if double { '"' } else { '\'' }, child.span()));
}
} else if let Some(elem) = child.to_packed::<FrameElem>() { } else if let Some(elem) = child.to_packed::<FrameElem>() {
let locator = locator.next(&elem.span()); let locator = locator.next(&elem.span());
let style = TargetElem::target.set(Target::Paged).wrap(); let style = TargetElem::target.set(Target::Paged).wrap();
@ -120,6 +134,20 @@ fn handle(
Ok(()) Ok(())
} }
/// Returns the last non-default ignorable character from the passed nodes.
fn last_char(nodes: &[HtmlNode]) -> Option<char> {
for node in nodes.iter().rev() {
if let Some(c) = match node {
HtmlNode::Text(s, _) => s.chars().rev().find(|&c| !is_default_ignorable(c)),
HtmlNode::Element(e) => last_char(&e.children),
_ => None,
} {
return Some(c);
}
}
None
}
/// Checks whether the given element is an inline-level HTML element. /// Checks whether the given element is an inline-level HTML element.
pub fn is_inline(elem: &Content) -> bool { pub fn is_inline(elem: &Content) -> bool {
elem.to_packed::<HtmlElem>() elem.to_packed::<HtmlElem>()

4
tests/ref/html/par-semantic-html.html
View File

@ -6,8 +6,8 @@
</head> </head>
<body> <body>
<h2>Heading is no paragraph</h2> <h2>Heading is no paragraph</h2>
<p>I'm a paragraph.</p> <p>I’m a paragraph.</p>
<div>I'm not.</div> <div>I’m not.</div>
<div> <div>
<p>We are two.</p> <p>We are two.</p>
<p>So we are paragraphs.</p> <p>So we are paragraphs.</p>

2
tests/ref/html/quote-nesting-html.html
View File

@ -5,6 +5,6 @@
<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>When you said that “he surely meant that ‘she intended to say “I'm sorry”’”, I was quite confused.</p> <p>When you said that “he surely meant that ‘she intended to say “I’m sorry”’”, I was quite confused.</p>
</body> </body>
</html> </html>

11
tests/ref/html/smartquotes-html.html Normal file
View File

@ -0,0 +1,11 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
</head>
<body>
<p>When you said that “he surely meant that ‘she intended to say “I’m sorry”’”, I was quite confused.</p>
<p>‘<span style="display: inline-block;">box</span>’</p>
</body>
</html>

5
tests/suite/text/smartquote.typ
View File

@ -172,3 +172,8 @@ Some people's thought on this would be #[#set smartquote(enabled: false); "stran
--- issue-5146-smartquotes-after-equations --- --- issue-5146-smartquotes-after-equations ---
$i$'s $i$ 's $i$'s $i$ 's
--- smartquotes-html html ---
When you said that "he surely meant that 'she intended to say "I'm sorry"'", I was quite confused.
'#box[box]'