fix typst citations

README.md

@@ -7,7 +7,7 @@ This article template creates [APA Style 7th Edition
 documents](https://apastyle.apa.org/) in .docx, .html. and .pdf. The
 .pdf format can be rendered via Latex (i.e., apaquarto-pdf) or via Typst
 (apaquarto-typst). The Typst output for this extension is still
-experimental and requires Typst version 0.11.0 or greater.
+experimental and requires Quarto 1.5 or greater.
 
 Because the .docx format is still widely used—and often required—my main
 priority was to ensure compatibility for .docx. This is still a work in

README.qmd

@@ -6,7 +6,7 @@ engine: knitr
 ---
 <img loading="lazy" alt="any text: you like" src="https://img.shields.io/badge/lifecycle-experimental-orange">
 
-This article template creates [APA Style 7th Edition documents](https://apastyle.apa.org/) in .docx, .html. and .pdf. The .pdf format can be rendered via Latex (i.e., apaquarto-pdf) or via Typst (apaquarto-typst). The Typst output for this extension is still experimental and requires Typst version 0.11.0 or greater.
+This article template creates [APA Style 7th Edition documents](https://apastyle.apa.org/) in .docx, .html. and .pdf. The .pdf format can be rendered via Latex (i.e., apaquarto-pdf) or via Typst (apaquarto-typst). The Typst output for this extension is still experimental and requires Quarto 1.5 or greater.
 
 Because the .docx format is still widely used---and often required---my main priority was to ensure compatibility for .docx. This is still a work in progress, and I encourage filing a "New Issue" on GitHub if something does not work of if there is a feature missing.
 

_extensions/apaquarto/_extension.yml

@@ -1,6 +1,6 @@
 title: My Document in APA Style, Seventh Edition
 author: W. Joel Schneider
-version: 4.0.2
+version: 4.0.3
 quarto-required: ">=1.4.549"
 contributes:
   formats:
@@ -89,7 +89,6 @@ contributes:
     pdf:
       documentclass: apa7
       pdf-engine: xelatex
-      link-citations: false
       suppress-bibliography: false
       hyperrefoptions: 
         - linktoc=none
@@ -116,7 +115,6 @@ contributes:
       filters: 
         - at: post-quarto
           path: typst/formattypst.lua
-      citeproc: true
       template-partials:
         - typst/typst-template.typ
         - typst/typst-show.typ

_extensions/apaquarto/apaandcite.lua

@@ -11,6 +11,7 @@
 -- Schneider's (2021) primary findings were replicated in our study.
 
 local andreplacement = "and"
+local makelinks = false
 
 -- make string, if it exists, else return default
 local stringify = function(s, default)
@@ -33,6 +34,9 @@ local function get_and(m)
       m.language["citation-last-author-separator"], 
       andreplacement)
   end
+  if m["link-citations"] then 
+    makelinks = true
+  end
 end
 
 local function replace_and(ct)
@@ -68,8 +72,16 @@ local function replace_and(ct)
                   end
                 end
             end
-        end
-        return ct.content
+        end    
+        if FORMAT == "typst" then
+          return ct.content
+        else
+          return ct
+        end    
+
+    end
+    if FORMAT == "typst" then
+      return ct.content
     end
 end
 

_extensions/apaquarto/citeprocr.lua

@@ -141,7 +141,11 @@ return {
           end
         end
       end
-      return pandoc.utils.citeproc(doc) 
+      local d = pandoc.utils.citeproc(doc) 
+      if FORMAT == "typst" then
+        d.meta.citeproc = true
+      end
+      return d
     end
 
   }

_extensions/apaquarto/docxlinenumber.lua

@@ -5,6 +5,17 @@ if FORMAT ~= "docx" then
   return
 end
 
+function Math(eq)
+  if eq.mathtype == "InlineMath" then
+    if eq.text == "\\LaTeX" then
+      return pandoc.Str("LaTeX")
+    end
+    if eq.text == "\\TeX" then
+      return pandoc.Str("TeX")
+    end
+  end
+end
+
 
 function Pandoc(doc)
   if doc.meta["numbered-lines"] then