mirror of
https://github.com/typst/typst
synced 2025-08-15 23:48:32 +08:00
fix(html): remove non-standard meta tag date
This commit is contained in:
Chance Addis
parent
b8d1c7cf87
commit
6e20a4c47c
@ -6,11 +6,9 @@ pub use self::encode::html;
|
||||
|
||||
use comemo::{Track, Tracked, TrackedMut};
|
||||
pub use ecow::EcoVec;
|
||||
use typst_library::diag::{bail, warning, At, SourceDiagnostic, SourceResult, StrResult};
|
||||
use typst_library::diag::{bail, warning, At, SourceResult};
|
||||
use typst_library::engine::{Engine, Route, Sink, Traced};
|
||||
use typst_library::foundations::{
|
||||
Content, Datetime, Smart, StyleChain, Target, TargetElem,
|
||||
};
|
||||
use typst_library::foundations::{Content, StyleChain, Target, TargetElem};
|
||||
use typst_library::html::{
|
||||
attr, tag, FrameElem, HtmlDocument, HtmlElem, HtmlElement, HtmlNode,
|
||||
};
|
||||
@ -87,7 +85,7 @@ fn html_document_impl(
|
||||
|
||||
let output = handle_list(&mut engine, &mut locator, children.iter().copied())?;
|
||||
let introspector = Introspector::html(&output);
|
||||
let root = root_element(&mut engine, output, &info)?;
|
||||
let root = root_element(output, &info)?;
|
||||
|
||||
Ok(HtmlDocument { info, root, introspector })
|
||||
}
|
||||
@ -265,14 +263,8 @@ fn handle(
|
||||
|
||||
/// Wrap the nodes in `<html>` and `<body>` if they are not yet rooted,
|
||||
/// supplying a suitable `<head>`.
|
||||
fn root_element(
|
||||
engine: &mut Engine,
|
||||
output: Vec<HtmlNode>,
|
||||
info: &DocumentInfo,
|
||||
) -> SourceResult<HtmlElement> {
|
||||
let head = head_element(engine, info).map_err(|err| {
|
||||
EcoVec::from([SourceDiagnostic::warning(Span::detached(), err)])
|
||||
})?;
|
||||
fn root_element(output: Vec<HtmlNode>, info: &DocumentInfo) -> SourceResult<HtmlElement> {
|
||||
let head = head_element(info);
|
||||
let body = match classify_output(output)? {
|
||||
OutputKind::Html(element) => return Ok(element),
|
||||
OutputKind::Body(body) => body,
|
||||
@ -282,7 +274,7 @@ fn root_element(
|
||||
}
|
||||
|
||||
/// Generate a `<head>` element.
|
||||
fn head_element(engine: &mut Engine, info: &DocumentInfo) -> StrResult<HtmlElement> {
|
||||
fn head_element(info: &DocumentInfo) -> HtmlElement {
|
||||
let mut children = vec![];
|
||||
|
||||
children.push(HtmlElement::new(tag::meta).with_attr(attr::charset, "utf-8").into());
|
||||
@ -329,29 +321,7 @@ fn head_element(engine: &mut Engine, info: &DocumentInfo) -> StrResult<HtmlEleme
|
||||
)
|
||||
}
|
||||
|
||||
match info.date {
|
||||
Smart::Auto => children.push(
|
||||
HtmlElement::new(tag::meta)
|
||||
.with_attr(attr::name, "date")
|
||||
.with_attr(
|
||||
attr::content,
|
||||
Datetime::today(engine, Smart::Auto)?.display(Smart::Auto)?,
|
||||
)
|
||||
.into(),
|
||||
),
|
||||
Smart::Custom(optional_date) => {
|
||||
if let Some(date) = optional_date {
|
||||
children.push(
|
||||
HtmlElement::new(tag::meta)
|
||||
.with_attr(attr::name, "date")
|
||||
.with_attr(attr::content, date.display(Smart::Auto).unwrap())
|
||||
.into(),
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Ok(HtmlElement::new(tag::head).with_children(children))
|
||||
HtmlElement::new(tag::head).with_children(children)
|
||||
}
|
||||
|
||||
/// Determine which kind of output the user generated.
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta name="date" content="1970-01-01">
|
||||
</head>
|
||||
<body>
|
||||
<table>
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta name="date" content="1970-01-01">
|
||||
</head>
|
||||
<body>
|
||||
<p>Paragraph</p>
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta name="date" content="1970-01-01">
|
||||
</head>
|
||||
<body>
|
||||
<p>Text <span style="display: inline-block;">Span</span>.</p>
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta name="date" content="1970-01-01">
|
||||
</head>
|
||||
<body>
|
||||
<table>
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta name="date" content="1970-01-01">
|
||||
</head>
|
||||
<body>
|
||||
<table>
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta name="date" content="1970-01-01">
|
||||
</head>
|
||||
<body>
|
||||
<div>
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta name="date" content="1970-01-01">
|
||||
</head>
|
||||
<body>
|
||||
<ol start="3">
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta name="date" content="1970-01-01">
|
||||
</head>
|
||||
<body>
|
||||
<h2>Level 1</h2>
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta name="date" content="1970-01-01">
|
||||
</head>
|
||||
<body>
|
||||
<p><a href="https://example.com/">https://example.com/</a></p>
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta name="date" content="1970-01-01">
|
||||
</head>
|
||||
<body>
|
||||
<div>
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta name="date" content="1970-01-01">
|
||||
</head>
|
||||
<body>
|
||||
<h2>Heading is no paragraph</h2>
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta name="date" content="1970-01-01">
|
||||
</head>
|
||||
<body>
|
||||
<blockquote cite="https://typst.app/home">Compose papers faster</blockquote>
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta name="date" content="1970-01-01">
|
||||
</head>
|
||||
<body>
|
||||
<p>When you said that “he surely meant that ‘she intended to say “I'm sorry”’”, I was quite confused.</p>
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta name="date" content="1970-01-01">
|
||||
</head>
|
||||
<body>
|
||||
<blockquote>… ἔοικα γοῦν τούτου γε σμικρῷ τινι αὐτῷ τούτῳ σοφώτερος εἶναι, ὅτι ἃ μὴ οἶδα οὐδὲ οἴομαι εἰδέναι.</blockquote>
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta name="date" content="1970-01-01">
|
||||
</head>
|
||||
<body>
|
||||
<table>
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta name="date" content="1970-01-01">
|
||||
</head>
|
||||
<body>
|
||||
<div>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user