Merge branch 'main' into gha/cache-update

Author: cderv

CONTRIBUTING.md

@@ -3,7 +3,7 @@
 You can contribute to Quarto in many ways:
 
 - By opening issues to provide feedback and share ideas.
-- By submitting Pull Request (PR) to fix opened issues
+- By submitting Pull Request (PR) to fix open issues
 - By submitting Pull Request (PR) to suggest new features (it is considered good practice to open an issue for discussion before working on a pull request for a new feature).
 
 Please be mindful of our [code of conduct](https://github.com/quarto-dev/quarto-cli/blob/main/.github/CODE_OF_CONDUCT.md) as you interact with other community members.
@@ -26,8 +26,8 @@ Pull requests are very welcome! Here's how to contribute via PR:
     $ git checkout -b feature/newthing
     ```
 
-2.  For significant changes (e.g more than small bug fixes), ensure that you have signed the [individual](https://posit.co/wp-content/uploads/2023/04/2023-03-13_TC_Indiv_contrib_agreement.pdf) or [corporate](https://posit.co/wp-content/uploads/2023/04/2023-03-13_TC_Corp_contrib_agreement.pdf) contributor agreement as appropriate. You can send the signed copy to [jj\@rstudio.com](mailto:[email protected]){.email}.
+2.  For significant changes (e.g., more than small bug fixes), ensure that you have signed the [individual](https://posit.co/wp-content/uploads/2023/04/2023-03-13_TC_Indiv_contrib_agreement.pdf) or [corporate](https://posit.co/wp-content/uploads/2023/04/2023-03-13_TC_Corp_contrib_agreement.pdf) contributor agreement as appropriate. You can send the signed copy to [jj\@rstudio.com](mailto:[email protected]){.email}.
 
-3.  Submit the [pull request](https://help.github.com/articles/using-pull-requests). It is ok to submit as draft in your are still working on it but would like some feedback from us. It always good to share in the open that you are working on it.
+3.  Submit the [pull request](https://help.github.com/articles/using-pull-requests). It is ok to submit as draft if your are still working on it but would like some feedback from us. It is always good to share in the open that you are working on it.
 
 We'll try to be as responsive as possible in reviewing and accepting pull requests.

src/core/markdown-pipeline.ts

@@ -3,10 +3,8 @@
  *
  * Copyright (C) 2020-2022 Posit Software, PBC
  */
-import { base } from "acorn/walk";
 import { decodeBase64, encodeBase64 } from "encoding/base64";
 import { Document, Element, Node } from "./deno-dom.ts";
-import { decode } from "https://deno.land/[email protected]/encoding/base64.ts";
 
 export interface PipelineMarkdown {
   blocks?: Record<string, string>;

src/resources/filters/main.lua

@@ -296,6 +296,12 @@ local quarto_pre_filters = {
     traverser = 'jog',
   },
 
+  { name = "strip-notes-from-hidden",
+    filter = strip_notes_from_hidden(),
+    flags = { "has_notes" },
+    traverser = 'jog',
+  },
+
   { name = "pre-combined-hidden",
     filter = combineFilters({
       hidden(),

src/resources/filters/normalize/flags.lua

@@ -178,7 +178,10 @@ function compute_flags()
     end,
     Figure = function(node)
       flags.has_pandoc3_figure = true
-    end
+    end,
+    Note = function(node)
+      flags.has_notes = true
+    end,
   }, {
     Meta = function(el)
       local lightbox_auto = lightbox_module.automatic(el)

src/resources/filters/normalize/normalize.lua

@@ -20,15 +20,6 @@ local authors = require 'modules/authors'
 local license = require 'modules/license'
 local shortcode_ast = require 'modules/astshortcode'
 
-local function stripNotes(el) 
-  local result = _quarto.ast.walk(el, {
-    Note = function(_el)
-      return pandoc.Null()
-    end
-  })
-  return result
-end
-
 function normalize_filter() 
   return {
     Meta = function(meta)
@@ -59,22 +50,6 @@ function normalize_filter()
       normalized = shortcode_ast.parse(normalized)
 
       return normalized
-    end,
-    Div = function(div)
-      -- Don't allow footnotes in the hidden element (markdown pipeline)
-      -- since that will result in duplicate footnotes
-      -- in the rendered output
-      if div.classes:includes('hidden') then
-        return stripNotes(div)
-      end
-    end,
-    Span = function(span)
-      -- Don't allow footnotes in the hidden element (markdown pipeline)
-      -- since that will result in duplicate footnotes
-      -- in the rendered output      
-      if span.classes:includes('hidden') then
-        return stripNotes(span)
-      end
     end
   }
 end

src/resources/filters/quarto-pre/hidden.lua

@@ -81,8 +81,32 @@ function hidden()
   end
 end
 
-
-
-
-
-
+function strip_notes_from_hidden()
+  local function stripNotes(el) 
+    local result = _quarto.ast.walk(el, {
+      Note = function(_el)
+        return pandoc.Null()
+      end
+    })
+    return result
+  end
+  
+  return {
+    Div = function(div)
+      -- Don't allow footnotes in the hidden element (markdown pipeline)
+      -- since that will result in duplicate footnotes
+      -- in the rendered output
+      if div.classes:includes('hidden') then
+        return stripNotes(div)
+      end
+    end,
+    Span = function(span)
+      -- Don't allow footnotes in the hidden element (markdown pipeline)
+      -- since that will result in duplicate footnotes
+      -- in the rendered output      
+      if span.classes:includes('hidden') then
+        return stripNotes(span)
+      end
+    end
+  }
+end