order highlight stylesheets light, dark or light, dark, light

this fixes the light syntax highlighting being applied in dark mdoe

since we are no longer disabling the light stylesheet
use the same light, dark, light pattern as the main stylesheet

Author: gordonwoodhull

src/command/render/pandoc-html.ts

@@ -295,19 +295,9 @@ export async function resolveSassBundles(
     }
   }
 
-  // Resolve generated quarto css variables
-  if (hasDarkStyles && defaultStyle !== "dark") {
-    // Put dark stylesheet first if light is default (for NoJS)
-    extras = await resolveQuartoSyntaxHighlighting(
-      inputDir,
-      extras,
-      format,
-      project,
-      "dark",
-      defaultStyle,
-    );
-  }
-
+  // light only: light
+  // author prefers dark: light, dark
+  // author prefers light: light, dark, light
   extras = await resolveQuartoSyntaxHighlighting(
     inputDir,
     extras,
@@ -317,8 +307,15 @@ export async function resolveSassBundles(
     defaultStyle,
   );
 
-  if (hasDarkStyles && defaultStyle === "dark") {
-    // Put dark stylesheet second if dark is default (for NoJS)
+  if (hasDarkStyles) {
+    // find the last entry, for the light highlight stylesheet
+    // so we can duplicate it below.
+    // (note we must do this before adding the dark highlight stylesheet)
+    const lightDep = extras.html?.[kDependencies]?.find((extraDep) =>
+      extraDep.name === kQuartoHtmlDependency
+    );
+    const lightEntry = lightDep?.stylesheets &&
+      lightDep.stylesheets[lightDep.stylesheets.length - 1];
     extras = await resolveQuartoSyntaxHighlighting(
       inputDir,
       extras,
@@ -327,6 +324,19 @@ export async function resolveSassBundles(
       "dark",
       defaultStyle,
     );
+    if (defaultStyle === "light") {
+      const dep2 = extras.html?.[kDependencies]?.find((extraDep) =>
+        extraDep.name === kQuartoHtmlDependency
+      );
+      assert(dep2?.stylesheets && lightEntry);
+      dep2.stylesheets.push({
+        ...lightEntry,
+        attribs: {
+          ...lightEntry.attribs,
+          class: "quarto-color-scheme-extra",
+        },
+      });
+    }
   }
 
   if (isHtmlOutput(format.pandoc, true)) {

src/resources/formats/html/templates/quarto-html-before-body.ejs

@@ -172,7 +172,8 @@
     <% } %>
 
     <% if (!darkModeDefault) { %>
-    document.querySelector('link.quarto-color-scheme-extra').rel = 'disabled-stylesheet';
+      document.querySelector('link#quarto-text-highlighting-styles.quarto-color-scheme-extra').rel = 'disabled-stylesheet';
+      document.querySelector('link#quarto-bootstrap.quarto-color-scheme-extra').rel = 'disabled-stylesheet';
     <% } %>
       
     let localAlternateSentinel = darkModeDefault ? 'alternate' : 'default';