From f658382433dff9b07fed300c4a360502a9dcc5fe Mon Sep 17 00:00:00 2001
From: Christophe Dervieux <christophe.dervieux@gmail.com>
Date: Mon, 9 Dec 2024 16:01:39 +0100
Subject: [PATCH] move fix to #10567 into website postprocessor

Fix regression that appeared for non website #11596

Companion commit in 1.6 branch for #11596 in main
---
 news/changelog-1.6.md                | 3 ++-
 src/command/render/pandoc.ts         | 5 -----
 src/format/html/format-html-title.ts | 1 -
 src/project/types/website/website.ts | 7 +++++--
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/news/changelog-1.6.md b/news/changelog-1.6.md
index 8be85761cd2..e628aa1fbf1 100644
--- a/news/changelog-1.6.md
+++ b/news/changelog-1.6.md
@@ -2,10 +2,11 @@
 
 ## In this release
 
-- ([#11580](https://github.com/quarto-dev/quarto-cli/issues/11580)): Fix regression with non-string entries in the `categories` field of a listed document.
+- ([#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)).
 
 ## In previous releases
 
+- ([#11580](https://github.com/quarto-dev/quarto-cli/issues/11580)): Fix regression with non-string entries in the `categories` field of a listed document.
 - ([#11509](https://github.com/quarto-dev/quarto-cli/issues/11509)): Fix link-decoration regression in HTML formats.
 - ([#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.
 - ([#11551](https://github.com/quarto-dev/quarto-cli/issues/11551)): Change `quarto create project` templates to better support `_brand.yml`.
diff --git a/src/command/render/pandoc.ts b/src/command/render/pandoc.ts
index fcb8a47f0a3..6864b8fc75a 100644
--- a/src/command/render/pandoc.ts
+++ b/src/command/render/pandoc.ts
@@ -439,11 +439,6 @@ export async function runPandoc(
     // record postprocessors
     postprocessors.push(...(extras.postprocessors || []));
 
-    // Fix H1 title inconsistency
-    if (isHtmlFileOutput(options.format.pandoc)) {
-      htmlPostprocessors.push(canonicalizeTitlePostprocessor);
-    }
-
     // add a keep-source post processor if we need one
     if (
       options.format?.render[kKeepSource] || formatHasCodeTools(options.format)
diff --git a/src/format/html/format-html-title.ts b/src/format/html/format-html-title.ts
index de6e53e2e06..d09d7ac5f05 100644
--- a/src/format/html/format-html-title.ts
+++ b/src/format/html/format-html-title.ts
@@ -18,7 +18,6 @@ import {
   PandocInputTraits,
   RenderedFormat,
 } from "../../command/render/types.ts";
-import { InternalError } from "../../core/lib/error.ts";
 
 export const kTitleBlockStyle = "title-block-style";
 const kTitleBlockBanner = "title-block-banner";
diff --git a/src/project/types/website/website.ts b/src/project/types/website/website.ts
index 1d562d619b6..ff2dcfeb08e 100644
--- a/src/project/types/website/website.ts
+++ b/src/project/types/website/website.ts
@@ -89,7 +89,7 @@ import { projectDraftMode } from "./website-utils.ts";
 import { kFieldCategories } from "./listing/website-listing-shared.ts";
 import { pandocNativeStr } from "../../../core/pandoc/codegen.ts";
 import { asArray } from "../../../core/array.ts";
-import { InternalError } from "../../../core/lib/error.ts";
+import { canonicalizeTitlePostprocessor } from "../../../format/html/format-html-title.ts";
 
 export const kSiteTemplateDefault = "default";
 export const kSiteTemplateBlog = "blog";
@@ -232,7 +232,10 @@ export const websiteProjectType: ProjectType = {
           ),
         ),
       ]);
-      extras.html[kHtmlPostprocessors].unshift(websiteDraftPostProcessor);
+      extras.html[kHtmlPostprocessors].unshift(
+        websiteDraftPostProcessor,
+        canonicalizeTitlePostprocessor,
+      );
 
       // listings extras
       const hasBootstrap = formatHasBootstrap(format);