From 75f4e41d7d292e011a83d06efebc356060ea812b Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Mon, 26 Jun 2017 16:07:59 +0200
Subject: Use `table-of-contents` for contents of toc, make `toc` a boolean.

Changed markdown, rtf, and HTML-based templates accordingly.

This allows you to set `toc: true` in the metadata; this
previously produced strange results in some output formats.

Closes #2872.

For backwards compatibility, `toc` is still set to the
toc contents.  But it is recommended that you update templates
to use `table-of-contents` for the toc contents and `toc`
for a boolean flag.
---
 data/templates/default.commonmark | 2 +-
 data/templates/default.dzslides   | 2 +-
 data/templates/default.html4      | 2 +-
 data/templates/default.html5      | 2 +-
 data/templates/default.markdown   | 2 +-
 data/templates/default.plain      | 2 +-
 data/templates/default.revealjs   | 2 +-
 data/templates/default.rtf        | 2 +-
 data/templates/default.s5         | 2 +-
 data/templates/default.slideous   | 2 +-
 data/templates/default.slidy      | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'data')

diff --git a/data/templates/default.commonmark b/data/templates/default.commonmark
index 95d7e52cc..9f6ca96de 100644
--- a/data/templates/default.commonmark
+++ b/data/templates/default.commonmark
@@ -11,7 +11,7 @@ $include-before$
 
 $endfor$
 $if(toc)$
-$toc$
+$table-of-contents$
 
 $endif$
 $body$
diff --git a/data/templates/default.dzslides b/data/templates/default.dzslides
index ef4f03c8d..479d2f06e 100644
--- a/data/templates/default.dzslides
+++ b/data/templates/default.dzslides
@@ -186,7 +186,7 @@ $endif$
 $endif$
 $if(toc)$
 <section id="$idprefix$TOC">
-$toc$
+$table-of-contents$
 </section>
 $endif$
 $for(include-before)$
diff --git a/data/templates/default.html4 b/data/templates/default.html4
index 9745f3ba8..837b20080 100644
--- a/data/templates/default.html4
+++ b/data/templates/default.html4
@@ -57,7 +57,7 @@ $endif$
 $endif$
 $if(toc)$
 <div id="$idprefix$TOC">
-$toc$
+$table-of-contents$
 </div>
 $endif$
 $body$
diff --git a/data/templates/default.html5 b/data/templates/default.html5
index dfc66cf4e..203001f21 100644
--- a/data/templates/default.html5
+++ b/data/templates/default.html5
@@ -60,7 +60,7 @@ $endif$
 $endif$
 $if(toc)$
 <nav id="$idprefix$TOC">
-$toc$
+$table-of-contents$
 </nav>
 $endif$
 $body$
diff --git a/data/templates/default.markdown b/data/templates/default.markdown
index 95d7e52cc..9f6ca96de 100644
--- a/data/templates/default.markdown
+++ b/data/templates/default.markdown
@@ -11,7 +11,7 @@ $include-before$
 
 $endfor$
 $if(toc)$
-$toc$
+$table-of-contents$
 
 $endif$
 $body$
diff --git a/data/templates/default.plain b/data/templates/default.plain
index 95d7e52cc..9f6ca96de 100644
--- a/data/templates/default.plain
+++ b/data/templates/default.plain
@@ -11,7 +11,7 @@ $include-before$
 
 $endfor$
 $if(toc)$
-$toc$
+$table-of-contents$
 
 $endif$
 $body$
diff --git a/data/templates/default.revealjs b/data/templates/default.revealjs
index a3f39885e..4350c80e8 100644
--- a/data/templates/default.revealjs
+++ b/data/templates/default.revealjs
@@ -79,7 +79,7 @@ $endif$
 $endif$
 $if(toc)$
 <section id="$idprefix$TOC">
-$toc$
+$table-of-contents$
 </section>
 $endif$
 
diff --git a/data/templates/default.rtf b/data/templates/default.rtf
index 59e132b3f..a7f79376d 100644
--- a/data/templates/default.rtf
+++ b/data/templates/default.rtf
@@ -18,7 +18,7 @@ $if(spacer)$
 {\pard \ql \f0 \sa180 \li0 \fi0 \par}
 $endif$
 $if(toc)$
-$toc$
+$table-of-contents$
 $endif$
 $for(include-before)$
 $include-before$
diff --git a/data/templates/default.s5 b/data/templates/default.s5
index e4fa970d3..1ba3998c3 100644
--- a/data/templates/default.s5
+++ b/data/templates/default.s5
@@ -78,7 +78,7 @@ $endif$
 $endif$
 $if(toc)$
 <div class="slide" id="$idprefix$TOC">
-$toc$
+$table-of-contents$
 </div>
 $endif$
 $body$
diff --git a/data/templates/default.slideous b/data/templates/default.slideous
index c7dbb5969..7f6364cfc 100644
--- a/data/templates/default.slideous
+++ b/data/templates/default.slideous
@@ -83,7 +83,7 @@ $endif$
 $endif$
 $if(toc)$
 <div class="slide" id="$idprefix$TOC">
-$toc$
+$table-of-contents$
 </div>
 $endif$
 $body$
diff --git a/data/templates/default.slidy b/data/templates/default.slidy
index e7b3278ff..48bb254ae 100644
--- a/data/templates/default.slidy
+++ b/data/templates/default.slidy
@@ -69,7 +69,7 @@ $endif$
 $endif$
 $if(toc)$
 <div class="slide" id="$idprefix$TOC">
-$toc$
+$table-of-contents$
 </div>
 $endif$
 $body$
-- 
cgit v1.2.3