diff options
| author | John J. Camilleri <john@digitalgrammars.com> | 2018-12-10 14:25:44 +0100 |
|---|---|---|
| committer | John J. Camilleri <john@digitalgrammars.com> | 2018-12-10 14:25:44 +0100 |
| commit | 083aa96e575554518dee32d03f579ad6cac26722 (patch) | |
| tree | d89ff66de37f2d1d5c48288e106c1b6037a28314 /bin | |
| parent | d82a53ebc660cf0319cd18edb4ddf9a2256bda3f (diff) | |
TOC for Markdown should now work for both Pandoc < 2.0 and >= 2.0
The use of $toc$ and $table-of-contents$ flags changed, see:
https://pandoc.org/releases.html#pandoc-2.0-29-oct-2017
under "Behaviour changes"
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/template.html | 8 | ||||
| -rwxr-xr-x | bin/update_html | 10 |
2 files changed, 12 insertions, 6 deletions
diff --git a/bin/template.html b/bin/template.html index e3d570ee4..881f3f2e3 100644 --- a/bin/template.html +++ b/bin/template.html @@ -54,7 +54,13 @@ $endif$ $endif$ $if(toc)$ <nav id="$idprefix$TOC"> -$table-of-contents$ +$if(table-of-contents)$ + <!-- pandoc >= 2.0 --> + $table-of-contents$ +$else$ + <!-- pandoc < 2.0 --> + $toc$ +$endif$ </nav> $endif$ $body$ diff --git a/bin/update_html b/bin/update_html index 8ba13778a..587ed6179 100755 --- a/bin/update_html +++ b/bin/update_html @@ -93,18 +93,18 @@ function render_md_html { html="$2" relroot="$( dirname $md | sed -E 's/^.\///' | sed -E 's/[^/]+/../g' )" - # Look for `toc: true` in metadata (first ten lines of file) - if head -n 10 "$md" | grep --quiet 'toc: true' ; then - toc='--table-of-contents' + # Look for `show-toc: true` in metadata (first ten lines of file) + if head -n 10 "$md" | grep --quiet 'show-toc: true' ; then + tocflag='--table-of-contents' else - toc='' + tocflag='' fi pandoc \ --from=markdown \ --to=html5 \ --standalone \ - $toc \ + $tocflag \ --template="$template" \ --variable="lang:en" \ --variable="rel-root:$relroot" \ |