Merge pull request #495 from kaushalmodi/update-pandoc-version

Update pandoc version to 2.16.2
kaushalmodi · Jan 4, 2022 · 698b568 · 698b568
2 parents cdac464 + 2da215e
commit 698b568
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 15 deletions.
diff --git a/Makefile b/Makefile
@@ -48,7 +48,7 @@ endif
 HUGO_BIN_SOURCE ?= https://gitlab.com/kaushalmodi/unofficial-hugo-dev-builds.git
 HUGO_VERSION ?= DEV
 
-PANDOC_BIN_VERSION ?= 2.11.4
+PANDOC_BIN_VERSION ?= 2.16.2
 PANDOC_ARCHIVE_NAME ?= pandoc-$(PANDOC_BIN_VERSION)-linux-amd64.tar.gz
 PANDOC_BIN_SOURCE ?= https://github.com/jgm/pandoc/releases/download/$(PANDOC_BIN_VERSION)
 

diff --git a/doc/doc-setupfile.org b/doc/doc-setupfile.org
@@ -1,6 +1,6 @@
 #+macro: min_hugo_version [[https://github.com/gohugoio/hugo/releases/tag/v0.60.0][*0.60.0*]]
 #+macro: org_mode_version [[https://git.savannah.gnu.org/cgit/emacs/org-mode.git/log/?h=bugfix][*9.5.1*]]
-#+macro: pandoc_version [[https://github.com/jgm/pandoc/releases/tag/2.11.4][*2.11.4*]]
+#+macro: pandoc_version [[https://github.com/jgm/pandoc/releases/tag/2.16.2][*2.16.2*]]
 
 #+macro: commit commit [[https://github.com/kaushalmodi/ox-hugo/commit/$1][$1]]
 #+macro: issue #[[https://github.com/kaushalmodi/ox-hugo/issues/$1][$1]]

diff --git a/test/site/content-org/all-posts.org b/test/site/content-org/all-posts.org
@@ -5454,14 +5454,17 @@ See [[#citation-example-toml-section-2]].
 :CUSTOM_ID: citation-example-toml-section-2
 :END:
 Content in section 2.
-*** Testing random Hugo shortcode
+*** Testing random Hugo shortcodes
 #+begin_mdshortcode
 Text containing *Markdown*
 #+end_mdshortcode
 Some text.
 #+begin_myshortcode
 Text not containing *Markdown*
 #+end_myshortcode
+
+This link will generate a ~relref~ shortcode: Here's a link to an
+arbitrarily picked post: [[*Citation Linking][Citation Linking]].
 *** Testing ox-hugo inserted HTML div tags
 #+begin_foo
 *bold* /italics/

diff --git a/test/site/content/posts/citation-forms-apa-csl.md b/test/site/content/posts/citation-forms-apa-csl.md
@@ -47,19 +47,18 @@ Smith says blah ([2004](#ref-smith04)).
 @smith04 says blah.
 ```
 
-[Smith](#ref-smith04) ([2004](#ref-smith04)) says blah.
+Smith ([2004](#ref-smith04)) says blah.
 
 ``` org
 @smith04 [p. 33] says blah.
 ```
 
-[Smith](#ref-smith04) ([2004, p. 33](#ref-smith04)) says blah.
+Smith ([2004, p. 33](#ref-smith04)) says blah.
 
 ## Actual citations for this test post :)
 
-See [Xie](#ref-addCite17) ([2017](#ref-addCite17)); ["Bibliographies and
-citations / citations"](#ref-rmdCitations) ([n.d.](#ref-rmdCitations))
-for more.
+See Xie ([2017](#ref-addCite17)); "Bibliographies and citations /
+citations" ([n.d.](#ref-rmdCitations)) for more.
 
 **Compare the References section below with
 [that](/posts/citation-forms/#references) when using the default CSL.**

diff --git a/test/site/content/posts/citation-forms.md b/test/site/content/posts/citation-forms.md
@@ -47,19 +47,18 @@ Smith says blah ([2004](#ref-smith04)).
 @smith04 says blah.
 ```
 
-[Smith](#ref-smith04) ([2004](#ref-smith04)) says blah.
+Smith ([2004](#ref-smith04)) says blah.
 
 ``` org
 @smith04 [p. 33] says blah.
 ```
 
-[Smith](#ref-smith04) ([2004, 7:33](#ref-smith04)) says blah.
+Smith ([2004, 7:33](#ref-smith04)) says blah.
 
 ## Actual citations for this test post :)
 
-See [Xie](#ref-addCite17) ([2017](#ref-addCite17)); ["Bibliographies and
-Citations / Citations"](#ref-rmdCitations) ([n.d.](#ref-rmdCitations))
-for more.
+See Xie ([2017](#ref-addCite17)); "Bibliographies and Citations /
+Citations" ([n.d.](#ref-rmdCitations)) for more.
 
 ## References {#references}
 

diff --git a/test/site/content/posts/citation-linking.md b/test/site/content/posts/citation-linking.md
@@ -9,7 +9,7 @@ draft = false
 +++
 
 Here is a test example file with an in-text citation where someone
-important says something important (e.g. [Loncar](#ref-loncar2016)
+important says something important (e.g. Loncar
 ([2016](#ref-loncar2016))). And here is another bit of blah with a
 footnote citation.[^fn:1]
 

diff --git a/test/site/content/posts/citations-example-toml.md b/test/site/content/posts/citations-example-toml.md
@@ -23,14 +23,17 @@ See [Section 2](#citation-example-toml-section-2).
 
 Content in section 2.
 
-## Testing random Hugo shortcode
+## Testing random Hugo shortcodes
 
 {{% mdshortcode %}} Text containing **Markdown** {{% /mdshortcode %}}
 
 Some text.
 
 {{< myshortcode >}} Text not containing **Markdown** {{< /myshortcode >}}
 
+This link will generate a `relref` shortcode: Here's a link to an
+arbitrarily picked post: [Citation Linking]({{< relref "citation-linking" >}}).
+
 ## Testing ox-hugo inserted HTML div tags
 
 <div class="foo">