fix(brand): use real company name "Civilytics Consulting" in templates

The title-page kicker in the Typst and LaTeX templates was hardcoded to
"Civilytics Research", which is not a real entity — the company is
Civilytics Consulting. Fix the kicker in both templates, and update the
example report/slides that echoed the same non-real name. Bump to 0.3.1.

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: civilytics
 Type: Package
 Title: Brand Themes, Color Palettes, and Utility Functions for Civilytics
-Version: 0.2.0
+Version: 0.3.1
 Authors@R:
     person("Jared", "E. Knowles", email = "jared@civilytics.com",
            role = c("aut", "cre"))

R/quarto.R

@@ -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)

inst/quarto/examples/report.qmd

@@ -2,7 +2,7 @@
 title: "Who pays when rent outpaces wages?"
 subtitle: "A 12-county analysis of cost-burdened renter households, 2019–2024."
 author:
-  - name: "Civilytics Research"
+  - name: "Jared Knowles"
     affiliation: "Civilytics Consulting"
 date: "2026-04-15"
 abstract: |
@@ -19,7 +19,9 @@ format:
     toc: true
     toc-location: right
   typst:
-    template: ../typst/civilytics-typst.typ
+    template-partials:
+      - ../typst/typst-template.typ
+      - ../typst/typst-show.typ
   pdf:
     include-in-header: ../latex/civilytics.tex
     include-before-body: ../latex/civilytics-title.tex

inst/quarto/examples/slides.qmd

@@ -55,11 +55,11 @@ Big idea goes here.
 
 > Rent has outpaced wages in every county we studied.
 
-Civilytics Research, 2026
+Civilytics Consulting, 2026
 
 ## Thank you {.thank-you}
 
 Questions?
 
 - jared@civilytics.com
-- civilytics.consulting
+- civilytics.com

inst/quarto/latex/civilytics-title.tex

@@ -2,11 +2,16 @@
 % Replaces Quarto's default \maketitle. Uses values from YAML
 % (\thetitle, \theauthor, \thedate) plus an \ifabstract block.
 
+% Guard: \thesubtitle is normally defined by civilytics.tex's subtitle
+% capture; provide a fallback so this partial degrades gracefully if used
+% without that preamble. See civilyticsR issue #13.
+\providecommand{\thesubtitle}{}
+
 \begin{titlepage}
   \pagecolor{paper}
   \color{ink}
   \vspace*{0.5in}
-  {\sffamily\bfseries\scriptsize\color{ember}\MakeUppercase{— Civilytics Research}\par}
+  {\sffamily\bfseries\scriptsize\color{ember}\MakeUppercase{— Civilytics Consulting}\par}
   \vspace{12pt}
   {\displayfont\fontsize{32pt}{34pt}\selectfont\bfseries\color{ink}\thetitle\par}
   \vspace{8pt}
@@ -33,8 +38,6 @@
 
   % Pulse mark, in ember
   \begin{center}
-    \begin{tikzpicture}[overlay, remember picture]
-    \end{tikzpicture}
     {\color{ember}\rule{40pt}{2pt}}
   \end{center}
 \end{titlepage}

inst/quarto/latex/civilytics.tex

@@ -40,17 +40,40 @@
 \color{ink}
 
 % --- Fonts (require local install or fontspec lookup) ---
+% Bold uses the family's native Bold weight (present in every Source Serif 4
+% install). Do NOT hard-require a "SemiBold" face: the package installs no
+% system fonts for the PDF path, and standard Source Serif 4 ships only
+% Regular/Bold/Italic/BoldItalic. See civilyticsR issue #14.
 \setmainfont{Source Serif 4}[
   UprightFont = *,
   ItalicFont = * Italic,
-  BoldFont = * SemiBold,
-  BoldItalicFont = * SemiBold Italic,
   Ligatures = TeX,
 ]
 \setsansfont{Inter}[Ligatures = TeX]
 \setmonofont{JetBrains Mono}[Scale = 0.92]
 \newfontfamily\displayfont{Libre Franklin}[Ligatures = TeX]
 
+% --- Subtitle capture ---
+% Quarto/pandoc defines \subtitle (which appends to \@title) but never
+% \thesubtitle, which the title page uses. This preamble is emitted before
+% pandoc's \providecommand{\subtitle}, so our definition wins: capture the
+% subtitle into \thesubtitle instead. See civilyticsR issue #13.
+\makeatletter
+\providecommand{\thesubtitle}{}
+\def\subtitle#1{\renewcommand{\thesubtitle}{#1}}
+\makeatother
+
+% --- Use the Civilytics title page, not pandoc's default ---
+% civilytics-title.tex (include-before-body) IS the title page. Quarto emits
+% its default \maketitle + abstract *before* include-before-body, which would
+% print a second, unstyled title. Neutralise both here, in the preamble
+% (runs at \begin{document}, before the default title). The branded title page
+% does not display the abstract. See civilyticsR issue #13.
+\AtBeginDocument{%
+  \renewcommand{\maketitle}{}%
+  \renewenvironment{abstract}{\setbox0=\vbox\bgroup}{\egroup}%
+}
+
 % --- Hyperlinks ---
 \hypersetup{
   colorlinks = true,
@@ -77,7 +100,7 @@
 \renewcommand{\footrulewidth}{0pt}
 \fancyhead[L]{\sffamily\scriptsize\color{ink3}\MakeUppercase{Civilytics Consulting}}
 \fancyhead[R]{\sffamily\scriptsize\color{ink3}\thetitle}
-\fancyfoot[L]{\sffamily\scriptsize\color{ink3}civilytics.consulting}
+\fancyfoot[L]{\sffamily\scriptsize\color{ink3}civilytics.com}
 \fancyfoot[C]{\sffamily\scriptsize\color{ink3}\thepage}
 \fancyfoot[R]{\sffamily\scriptsize\color{ink3}\textcopyright\ 2026}
 

inst/quarto/typst/typst-show.typ

@@ -0,0 +1,17 @@
+// Civilytics — Typst show/entry partial for Quarto (typst-show.typ).
+// Pairs with typst-template.typ. Quarto appends the rendered document body
+// after this partial, so this file intentionally ends with the show rule and
+// no trailing body token. (Do not write that token in a comment here: Quarto
+// interpolates its template variables even inside comments.)
+// Title/subtitle/date are wrapped in [ ] so arbitrary text (including words
+// that are Typst keywords like "for"/"in") is treated as content, not code.
+// See civilyticsR issue #12.
+#show: doc => civilytics(
+  title: [$title$],
+  $if(subtitle)$subtitle: [$subtitle$],$endif$
+  $if(by-author)$authors: ($for(by-author)$"$it.name.literal$",$endfor$),$endif$
+  $if(date)$date: [$date$],$endif$
+  $if(abstract)$abstract: [$abstract$],$endif$
+  toc: $if(toc)$true$else$false$endif$,
+  doc
+)

inst/quarto/typst/typst-template.typ

@@ -1,9 +1,15 @@
 // =============================================================
-// Civilytics — Typst template for Quarto PDF
+// Civilytics — Typst template partial for Quarto PDF (typst-template.typ).
+// Shipped as a Quarto template-partial (paired with typst-show.typ) rather
+// than a full `template:` so Quarto keeps its own `definitions` partial —
+// which defines Skylighting/token functions needed for syntax-highlighted
+// code blocks. See civilyticsR issue #12.
 // Usage in YAML:
 //   format:
 //     typst:
-//       template: quarto/typst/civilytics-typst.typ
+//       template-partials:
+//         - quarto/typst/typst-template.typ
+//         - quarto/typst/typst-show.typ
 // =============================================================
 
 #let paper-bg   = rgb("#FAF7F2")
@@ -54,7 +60,7 @@
       grid(
         columns: (1fr, auto, 1fr),
         align: (left, center, right),
-        [civilytics.consulting],
+        [civilytics.com],
         counter(page).display("1 / 1", both: true),
         [© 2026]
       )
@@ -158,7 +164,7 @@
   if title != none {
     block[
       #set text(font: sans-stack, size: 8pt, weight: 600, fill: ember, tracking: 0.1em)
-      #upper[— Civilytics Research]
+      #upper[— Civilytics Consulting]
     ]
     v(8pt)
     block[
@@ -229,16 +235,3 @@
 
   doc
 }
-
-// Quarto entry point
-#show: doc => civilytics(
-  title: $title$,
-  $if(subtitle)$subtitle: $subtitle$,$endif$
-  $if(by-author)$authors: ($for(by-author)$"$it.name.literal$",$endfor$),$endif$
-  $if(date)$date: $date$,$endif$
-  $if(abstract)$abstract: [$abstract$],$endif$
-  toc: $if(toc)$true$else$false$endif$,
-  doc
-)
-
-$body$