Merge pull request 'fix(quarto): repair LaTeX + Typst branded templates (#11 #12 #13 #14)' (#15) from fix/quarto-template-bugs into master

2026-07-09 16:18:29 -04:00
parent 761a72da18 b9d427eb76
commit 6ea9265236
8 changed files with 71 additions and 31 deletions
@@ -135,12 +135,12 @@ use_civilytics_theme <- function(path = ".", force = FALSE) {
    .copy_pkg_file(file.path("quarto/latex", f), file.path("latex", f), path, force)
  }

-  # Typst
-  .copy_pkg_file(
-    "quarto/typst/civilytics-typst.typ",
-    "typst/civilytics-typst.typ",
-    path, force
-  )
+  # Typst — shipped as template-partials so Quarto keeps its Skylighting
+  # definitions and syntax-highlighted code blocks render (see issue #12)
+  typst_files <- c("typst-template.typ", "typst-show.typ")
+  for (f in typst_files) {
+    .copy_pkg_file(file.path("quarto/typst", f), file.path("typst", f), path, force)
+  }

  # Logos — for _brand.yml (expects assets/logo/)
  .copy_logos("assets/logo", path, force)
@@ -158,7 +158,9 @@ use_civilytics_theme <- function(path = ".", force = FALSE) {
  message("    include-in-header: latex/civilytics.tex")
  message("    include-before-body: latex/civilytics-title.tex")
  message("  typst:")
-  message("    template: typst/civilytics-typst.typ")
+  message("    template-partials:")
+  message("      - typst/typst-template.typ")
+  message("      - typst/typst-show.typ")
  message("---")
  message("\nSee examples/report.qmd for a complete example.")
  invisible(NULL)