From f63b76e1698b0d7eba6b43ef45faaeee2b01b9ca Mon Sep 17 00:00:00 2001
From: Aner Lucero <4rgento@gmail.com>
Date: Sat, 14 Nov 2020 20:09:44 -0300
Subject: Markdown writer: default to using ATX headings.
Previously we used Setext (underlined) headings by default.
The default is now ATX (`##` style).
* Add the `--markdown-headings=atx|setext` option.
* Deprecate `--atx-headers`.
* Add constructor 'ATXHeadingInLHS` constructor to `LogMessage` [API change].
* Support `markdown-headings` in defaults files.
* Document new options in MANUAL.
Closes #6662.
---
test/command/3674.md | 2 +-
test/command/3736.md | 9 +++----
test/command/4038.md | 2 +-
test/command/4164.md | 12 +++------
test/command/5121.md | 3 +--
test/command/6723.md | 3 +--
test/command/6837.md | 29 ++++++++++++++++++++++
test/command/pandoc-citeproc-119.md | 3 +--
test/command/pandoc-citeproc-14.md | 3 +--
test/command/pandoc-citeproc-152.md | 6 ++---
test/command/pandoc-citeproc-160.md | 6 ++---
test/command/pandoc-citeproc-175.md | 6 ++---
test/command/pandoc-citeproc-213.md | 3 +--
test/command/pandoc-citeproc-25.md | 3 +--
test/command/pandoc-citeproc-27.md | 3 +--
test/command/pandoc-citeproc-371.md | 3 +--
test/command/pandoc-citeproc-416.md | 3 +--
test/command/pandoc-citeproc-47.md | 3 +--
test/command/pandoc-citeproc-57.md | 3 +--
test/command/pandoc-citeproc-58.md | 3 +--
test/command/pandoc-citeproc-61.md | 6 ++---
test/command/pandoc-citeproc-82.md | 3 +--
test/command/pandoc-citeproc-87.md | 3 +--
.../command/pandoc-citeproc-chicago-author-date.md | 6 ++---
...andoc-citeproc-chicago-fullnote-bibliography.md | 6 ++---
test/command/pandoc-citeproc-ieee.md | 6 ++---
test/command/toc.md | 27 +++++++-------------
27 files changed, 75 insertions(+), 90 deletions(-)
create mode 100644 test/command/6837.md
(limited to 'test/command')
diff --git a/test/command/3674.md b/test/command/3674.md
index 92ed4bed7..a24f6b46b 100644
--- a/test/command/3674.md
+++ b/test/command/3674.md
@@ -2,7 +2,7 @@ Make sure we don't get duplicate reference links, even with
`--reference-location=section`.
```
-% pandoc --reference-links -t markdown --reference-location=section --atx-headers
+% pandoc --reference-links -t markdown --reference-location=section
# a
diff --git a/test/command/3736.md b/test/command/3736.md
index b66e0a359..b7d75aa5d 100644
--- a/test/command/3736.md
+++ b/test/command/3736.md
@@ -3,8 +3,7 @@
hi
there
^D
-hi there
---------
+## hi there
```
```
@@ -12,14 +11,12 @@ hi there
hi there
again
^D
-hi *there again*
-----------------
+## hi *there again*
```
```
% pandoc --wrap=preserve -f html -t markdown
hi
there
^D
-hi there
---------
+## hi there
```
diff --git a/test/command/4038.md b/test/command/4038.md
index b5e6323df..121760540 100644
--- a/test/command/4038.md
+++ b/test/command/4038.md
@@ -1,5 +1,5 @@
```
-% pandoc -f gfm -t gfm --atx-headers
+% pandoc -f gfm -t gfm
# ~~Header~~
^D
# ~~Header~~
diff --git a/test/command/4164.md b/test/command/4164.md
index 50c3117ec..4e7b7e285 100644
--- a/test/command/4164.md
+++ b/test/command/4164.md
@@ -2,11 +2,9 @@
% pandoc -f opml -t markdown
test
^D
-test
-====
+# test
-try
----
+## try
Here is inline html:
@@ -22,11 +20,9 @@ Here is inline html:
% pandoc -f opml-raw_html-native_divs -t markdown
test
^D
-test
-====
+# test
-try
----
+## try
Here is inline html:
diff --git a/test/command/5121.md b/test/command/5121.md
index 419b8b9f4..1ee6bda77 100644
--- a/test/command/5121.md
+++ b/test/command/5121.md
@@ -8,6 +8,5 @@
My caption
-Header 2
---------
+## Header 2
```
diff --git a/test/command/6723.md b/test/command/6723.md
index f4455fcce..ce89c4b88 100644
--- a/test/command/6723.md
+++ b/test/command/6723.md
@@ -20,8 +20,7 @@ Blah [@doe].
^D
Blah.[^1]
-References {#references .unnumbered}
-==========
+# References {#references .unnumbered}
::: {#refs .references .csl-bib-body .hanging-indent}
::: {#ref-doe .csl-entry}
diff --git a/test/command/6837.md b/test/command/6837.md
new file mode 100644
index 000000000..cb35e19a1
--- /dev/null
+++ b/test/command/6837.md
@@ -0,0 +1,29 @@
+```
+% pandoc -t markdown --markdown-headings=setext
+## Hi
+
+### Ok
+^D
+Hi
+--
+
+### Ok
+```
+
+```
+% pandoc -t markdown+lhs
+# Hi
+^D
+[WARNING] Rendering heading 'Hi' as a paragraph.
+ ATX headings cannot be used in literate Haskell, because '#' is not
+ allowed in column 1. Consider using --markdown-headings=setext.
+Hi
+```
+
+```
+% pandoc -t markdown --markdown-headings=atx
+Hi
+--
+^D
+## Hi
+```
diff --git a/test/command/pandoc-citeproc-119.md b/test/command/pandoc-citeproc-119.md
index 8dfdfe421..34ffc93af 100644
--- a/test/command/pandoc-citeproc-119.md
+++ b/test/command/pandoc-citeproc-119.md
@@ -12,8 +12,7 @@ References {#references .unnumbered}
^D
Averroes (1982); Averroes (1892); Averroes (1869)
-References {#references .unnumbered}
-==========
+# References {#references .unnumbered}
::: {#refs .references .csl-bib-body .hanging-indent line-spacing="2"}
::: {#ref-averroes/hercz .csl-entry}
diff --git a/test/command/pandoc-citeproc-14.md b/test/command/pandoc-citeproc-14.md
index 18c3a91ee..feb944395 100644
--- a/test/command/pandoc-citeproc-14.md
+++ b/test/command/pandoc-citeproc-14.md
@@ -54,8 +54,7 @@ References {#references .unnumbered}
Foo (Pelikan 1971b, 1:12). Bar (Pelikan 1971c, 1:12). Baz (Pelikan
1971a, 12).
-References {#references .unnumbered}
-==========
+# References {#references .unnumbered}
::: {#refs .references .csl-bib-body .hanging-indent}
::: {#ref-CTv1c2 .csl-entry}
diff --git a/test/command/pandoc-citeproc-152.md b/test/command/pandoc-citeproc-152.md
index 3e7be2e93..1810de45f 100644
--- a/test/command/pandoc-citeproc-152.md
+++ b/test/command/pandoc-citeproc-152.md
@@ -43,13 +43,11 @@ I have two citations [@Feminism2013gf; @Feminism2011ces].
References
==========
^D
-Test
-====
+# Test
I have two citations ("Communities," 2011; "Geek Feminism," 2013).
-References {#references .unnumbered}
-==========
+# References {#references .unnumbered}
::: {#refs .references .csl-bib-body .hanging-indent line-spacing="2"}
::: {#ref-Feminism2011ces .csl-entry}
diff --git a/test/command/pandoc-citeproc-160.md b/test/command/pandoc-citeproc-160.md
index 9f2a29e2c..114116289 100644
--- a/test/command/pandoc-citeproc-160.md
+++ b/test/command/pandoc-citeproc-160.md
@@ -26,13 +26,11 @@ Expected
>
> \[Jane11\] Jane Doe. A book. 2011.
^D
-No citation-label
------------------
+## No citation-label
Foo \[Jane11\].
-Expected
---------
+## Expected
> Foo \[Jane11\].
>
diff --git a/test/command/pandoc-citeproc-175.md b/test/command/pandoc-citeproc-175.md
index 7fc50f2b1..b84fc2040 100644
--- a/test/command/pandoc-citeproc-175.md
+++ b/test/command/pandoc-citeproc-175.md
@@ -27,13 +27,11 @@ Expected
> Doe, Jane. 2011. "A Title." *A Magazine*, January--February.
^D
-Missing en-dash between months
-------------------------------
+## Missing en-dash between months
Foo (Doe 2011).
-Expected
---------
+## Expected
> Doe, Jane. 2011. "A Title." *A Magazine*, January--February.
diff --git a/test/command/pandoc-citeproc-213.md b/test/command/pandoc-citeproc-213.md
index 2ca2287a1..d718a442f 100644
--- a/test/command/pandoc-citeproc-213.md
+++ b/test/command/pandoc-citeproc-213.md
@@ -23,8 +23,7 @@ References {#references .unnumbered}
^D
Foo (Doe 1999).
-References {#references .unnumbered}
-==========
+# References {#references .unnumbered}
::: {#refs .references .csl-bib-body .hanging-indent}
::: {#ref-doe1 .csl-entry}
diff --git a/test/command/pandoc-citeproc-25.md b/test/command/pandoc-citeproc-25.md
index ab0b8c6f8..540745071 100644
--- a/test/command/pandoc-citeproc-25.md
+++ b/test/command/pandoc-citeproc-25.md
@@ -20,8 +20,7 @@ References {#references .unnumbered}
^D
Foo (Author 1998).
-References {#references .unnumbered}
-==========
+# References {#references .unnumbered}
::: {#refs .references .csl-bib-body .hanging-indent}
::: {#ref-item1 .csl-entry}
diff --git a/test/command/pandoc-citeproc-27.md b/test/command/pandoc-citeproc-27.md
index ce8c20eff..d9758d711 100644
--- a/test/command/pandoc-citeproc-27.md
+++ b/test/command/pandoc-citeproc-27.md
@@ -25,8 +25,7 @@ Minimal example
Here is some text that needs a citation [@AuthorOne2014].
^D
-Minimal example
-===============
+# Minimal example
Here is some text that needs a citation (*1*).
diff --git a/test/command/pandoc-citeproc-371.md b/test/command/pandoc-citeproc-371.md
index c080b25c1..572b0dbe4 100644
--- a/test/command/pandoc-citeproc-371.md
+++ b/test/command/pandoc-citeproc-371.md
@@ -26,8 +26,7 @@ References {#references .unnumbered}
^D
Foo (Doe 2018, in press).
-References {#references .unnumbered}
-==========
+# References {#references .unnumbered}
::: {#refs .references .csl-bib-body .hanging-indent}
::: {#ref-item2 .csl-entry}
diff --git a/test/command/pandoc-citeproc-416.md b/test/command/pandoc-citeproc-416.md
index e34401118..fe29ef75d 100644
--- a/test/command/pandoc-citeproc-416.md
+++ b/test/command/pandoc-citeproc-416.md
@@ -42,8 +42,7 @@ references:
^D
Blah blah (Doe 2010, 2007, 2008).
-References {#references .unnumbered}
-==========
+# References {#references .unnumbered}
::: {#refs .references .csl-bib-body .hanging-indent}
::: {#ref-item2 .csl-entry}
diff --git a/test/command/pandoc-citeproc-47.md b/test/command/pandoc-citeproc-47.md
index 478a54bf3..5936ee8c0 100644
--- a/test/command/pandoc-citeproc-47.md
+++ b/test/command/pandoc-citeproc-47.md
@@ -90,8 +90,7 @@ coauthors' last names (regardless of how many coauthors there are)." and
chronological order is maintained, regardless of the added abbreviation.
\[ed., trans., comp., or whatever\]"
-References {#references .unnumbered}
-==========
+# References {#references .unnumbered}
::: {#refs .references .csl-bib-body .hanging-indent}
::: {#ref-doe .csl-entry}
diff --git a/test/command/pandoc-citeproc-57.md b/test/command/pandoc-citeproc-57.md
index 4232e1ef8..f208feb59 100644
--- a/test/command/pandoc-citeproc-57.md
+++ b/test/command/pandoc-citeproc-57.md
@@ -25,8 +25,7 @@ References
^D
(Faraday, forthcoming)
-References {#references .unnumbered}
-==========
+# References {#references .unnumbered}
::: {#refs .references .csl-bib-body .hanging-indent}
::: {#ref-Faraday-forthcoming .csl-entry}
diff --git a/test/command/pandoc-citeproc-58.md b/test/command/pandoc-citeproc-58.md
index 764533173..b9287fe3c 100644
--- a/test/command/pandoc-citeproc-58.md
+++ b/test/command/pandoc-citeproc-58.md
@@ -22,8 +22,7 @@ References
In this item, the title replaces the (unknown) author (see 14.79)
(*Stanze in lode della donna brutta* 1547, 12).
-References {#references .unnumbered}
-==========
+# References {#references .unnumbered}
::: {#refs .references .csl-bib-body .hanging-indent}
::: {#ref-stanze .csl-entry}
diff --git a/test/command/pandoc-citeproc-61.md b/test/command/pandoc-citeproc-61.md
index e96e93be7..e99f7e5ef 100644
--- a/test/command/pandoc-citeproc-61.md
+++ b/test/command/pandoc-citeproc-61.md
@@ -41,8 +41,7 @@ Foo [@doe, CL, 89]
References
==========
^D
-Text
-====
+# Text
Foo[^1]
@@ -54,8 +53,7 @@ Foo[^4]
Foo[^5]
-References {#references .unnumbered}
-==========
+# References {#references .unnumbered}
::: {#refs .references .csl-bib-body .hanging-indent}
::: {#ref-doe .csl-entry}
diff --git a/test/command/pandoc-citeproc-82.md b/test/command/pandoc-citeproc-82.md
index 332140ed3..bdeffaeea 100644
--- a/test/command/pandoc-citeproc-82.md
+++ b/test/command/pandoc-citeproc-82.md
@@ -24,8 +24,7 @@ Some text.[^1]
[^1]: Comment regarding text, supported by citation [@OCLC_i1099].
^D
-Title
-=====
+# Title
Some text.[^1]
diff --git a/test/command/pandoc-citeproc-87.md b/test/command/pandoc-citeproc-87.md
index 1a736ca51..e0aeda0f9 100644
--- a/test/command/pandoc-citeproc-87.md
+++ b/test/command/pandoc-citeproc-87.md
@@ -120,8 +120,7 @@ Doe (2006e) -- article-newspaper
Doe (2006b) -- article-newspaper YM
-References {#references .unnumbered}
-==========
+# References {#references .unnumbered}
::: {#refs .references .csl-bib-body .hanging-indent}
::: {#ref-item2a .csl-entry}
diff --git a/test/command/pandoc-citeproc-chicago-author-date.md b/test/command/pandoc-citeproc-chicago-author-date.md
index c754387f0..ad49d2ca3 100644
--- a/test/command/pandoc-citeproc-chicago-author-date.md
+++ b/test/command/pandoc-citeproc-chicago-author-date.md
@@ -48,8 +48,7 @@ References {#references .unnumbered}
locator [-@item2 p. 44].
^D
[WARNING] Citeproc: citation nonexistent not found
-Pandoc with citeproc-hs
-=======================
+# Pandoc with citeproc-hs
([**nonexistent?**](#ref-nonexistent))
@@ -82,8 +81,7 @@ Now some modifiers.[^3]
With some markup (*see* [Doe 2005, 32](#ref-item1)).
-References {#references .unnumbered}
-==========
+# References {#references .unnumbered}
::: {#refs .references .csl-bib-body .hanging-indent}
::: {#ref-item1 .csl-entry}
diff --git a/test/command/pandoc-citeproc-chicago-fullnote-bibliography.md b/test/command/pandoc-citeproc-chicago-fullnote-bibliography.md
index 4dfa091c0..4536342c6 100644
--- a/test/command/pandoc-citeproc-chicago-fullnote-bibliography.md
+++ b/test/command/pandoc-citeproc-chicago-fullnote-bibliography.md
@@ -49,8 +49,7 @@ References {#references .unnumbered}
[-@item1], and now Doe with a locator [-@item2 p. 44].
^D
[WARNING] Citeproc: citation nonexistent not found
-Pandoc with citeproc-hs
-=======================
+# Pandoc with citeproc-hs
[^1]
@@ -80,8 +79,7 @@ Now some modifiers.[^13]
With some markup.[^14]
-References {#references .unnumbered}
-==========
+# References {#references .unnumbered}
::: {#refs .references .csl-bib-body .hanging-indent}
::: {#ref-item2 .csl-entry}
diff --git a/test/command/pandoc-citeproc-ieee.md b/test/command/pandoc-citeproc-ieee.md
index 17ade2aae..bdc7e7150 100644
--- a/test/command/pandoc-citeproc-ieee.md
+++ b/test/command/pandoc-citeproc-ieee.md
@@ -49,8 +49,7 @@ References {#references .unnumbered}
locator [-@item2 p. 44].
^D
[WARNING] Citeproc: citation nonexistent not found
-Pandoc with citeproc-hs
-=======================
+# Pandoc with citeproc-hs
[**nonexistent?**](#ref-nonexistent)
@@ -83,8 +82,7 @@ Now some modifiers.[^3]
With some markup *see* [\[1, p. 32\]](#ref-item1).
-References {#references .unnumbered}
-==========
+# References {#references .unnumbered}
::: {#refs .references .csl-bib-body}
::: {#ref-item1 .csl-entry}
diff --git a/test/command/toc.md b/test/command/toc.md
index 9185257de..794af7690 100644
--- a/test/command/toc.md
+++ b/test/command/toc.md
@@ -23,34 +23,25 @@
- [E](#e)
- [e](#e-1)
-A
-=
+# A
-b
--
+## b
-B
-=
+# B
-b
--
+## b
::: {.interior}
-C
-=
+# C
-cc
---
+## cc
-D
-=
+# D
:::
::: {.blue}
-E
-=
+# E
-e
--
+## e
:::
```
--
cgit v1.2.3