Skip to content

Commit f93cc13

Browse files
authored
Merge pull request #11640 from quarto-dev/regression/move-canonicalization-website
Fix regression that appeared for non website regarding h1 canonicalization
2 parents 5298175 + f658382 commit f93cc13

File tree

4 files changed

+7
-9
lines changed

4 files changed

+7
-9
lines changed

news/changelog-1.6.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22

33
## In this release
44

5-
- ([#11580](https://github.com/quarto-dev/quarto-cli/issues/11580)): Fix regression with non-string entries in the `categories` field of a listed document.
5+
- ([#11596](https://github.com/quarto-dev/quarto-cli/issues/11596)): Fix regression with h1 and title processing in non-website project, related to a fix for breadcrumbs in website projects ([#11224](https://github.com/quarto-dev/quarto-cli/issues/11596)).
66

77
## In previous releases
88

9+
- ([#11580](https://github.com/quarto-dev/quarto-cli/issues/11580)): Fix regression with non-string entries in the `categories` field of a listed document.
910
- ([#11509](https://github.com/quarto-dev/quarto-cli/issues/11509)): Fix link-decoration regression in HTML formats.
1011
- ([#11532](https://github.com/quarto-dev/quarto-cli/issues/11532)): Fix regression for [#660](https://github.com/quarto-dev/quarto-cli/issues/660), which causes files to have incorrect permissions when Quarto is installed in a location not writable by the current user.
1112
- ([#11551](https://github.com/quarto-dev/quarto-cli/issues/11551)): Change `quarto create project` templates to better support `_brand.yml`.

src/command/render/pandoc.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -439,11 +439,6 @@ export async function runPandoc(
439439
// record postprocessors
440440
postprocessors.push(...(extras.postprocessors || []));
441441

442-
// Fix H1 title inconsistency
443-
if (isHtmlFileOutput(options.format.pandoc)) {
444-
htmlPostprocessors.push(canonicalizeTitlePostprocessor);
445-
}
446-
447442
// add a keep-source post processor if we need one
448443
if (
449444
options.format?.render[kKeepSource] || formatHasCodeTools(options.format)

src/format/html/format-html-title.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import {
1818
PandocInputTraits,
1919
RenderedFormat,
2020
} from "../../command/render/types.ts";
21-
import { InternalError } from "../../core/lib/error.ts";
2221

2322
export const kTitleBlockStyle = "title-block-style";
2423
const kTitleBlockBanner = "title-block-banner";

src/project/types/website/website.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ import { projectDraftMode } from "./website-utils.ts";
8989
import { kFieldCategories } from "./listing/website-listing-shared.ts";
9090
import { pandocNativeStr } from "../../../core/pandoc/codegen.ts";
9191
import { asArray } from "../../../core/array.ts";
92-
import { InternalError } from "../../../core/lib/error.ts";
92+
import { canonicalizeTitlePostprocessor } from "../../../format/html/format-html-title.ts";
9393

9494
export const kSiteTemplateDefault = "default";
9595
export const kSiteTemplateBlog = "blog";
@@ -232,7 +232,10 @@ export const websiteProjectType: ProjectType = {
232232
),
233233
),
234234
]);
235-
extras.html[kHtmlPostprocessors].unshift(websiteDraftPostProcessor);
235+
extras.html[kHtmlPostprocessors].unshift(
236+
websiteDraftPostProcessor,
237+
canonicalizeTitlePostprocessor,
238+
);
236239

237240
// listings extras
238241
const hasBootstrap = formatHasBootstrap(format);

0 commit comments

Comments
 (0)