aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2014-06-19 00:28:23 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2014-06-19 00:28:23 -0700
commit00281559bf9c955ece6b18d48ef487fdc5f4406e (patch)
tree99be9840ce6f9bf1966bd702098874202281bcc4
parent95b6ffcef6428318dd9ca25be6ce6e113ef3c499 (diff)
downloadpandoc-00281559bf9c955ece6b18d48ef487fdc5f4406e.tar.gz
Haddock writer: Use _____ for hrule.
Avoids interpretation as list.
-rw-r--r--src/Text/Pandoc/Writers/Haddock.hs4
-rw-r--r--tests/writer.haddock26
2 files changed, 15 insertions, 15 deletions
diff --git a/src/Text/Pandoc/Writers/Haddock.hs b/src/Text/Pandoc/Writers/Haddock.hs
index 59d979ea8..1c82839d0 100644
--- a/src/Text/Pandoc/Writers/Haddock.hs
+++ b/src/Text/Pandoc/Writers/Haddock.hs
@@ -112,8 +112,8 @@ blockToHaddock _ (RawBlock f str)
| f == "haddock" = do
return $ text str <> text "\n"
| otherwise = return empty
-blockToHaddock _ HorizontalRule =
- return $ blankline <> text "--------------" <> blankline
+blockToHaddock opts HorizontalRule =
+ return $ blankline <> text (replicate (writerColumns opts) '_') <> blankline
blockToHaddock opts (Header level (ident,_,_) inlines) = do
contents <- inlineListToHaddock opts inlines
let attr' = if null ident
diff --git a/tests/writer.haddock b/tests/writer.haddock
index 129242153..0772331e3 100644
--- a/tests/writer.haddock
+++ b/tests/writer.haddock
@@ -1,7 +1,7 @@
This is a set of tests for pandoc. Most of them are adapted from John Gruber’s
markdown test suite.
---------------
+______________________________________________________________________________
= Headers
#headers#
@@ -34,7 +34,7 @@ with no blank line
with no blank line
---------------
+______________________________________________________________________________
= Paragraphs
#paragraphs#
@@ -50,7 +50,7 @@ Here’s one with a bullet. * criminey.
There should be a hard line break
here.
---------------
+______________________________________________________________________________
= Block Quotes
#block-quotes#
@@ -80,7 +80,7 @@ This should not be a block quote: 2 > 1.
And a following paragraph.
---------------
+______________________________________________________________________________
= Code Blocks
#code-blocks#
@@ -101,7 +101,7 @@ And:
>
> These should not be escaped: \$ \\ \> \[ \{
---------------
+______________________________________________________________________________
= Lists
#lists#
@@ -264,7 +264,7 @@ M.A. 2007
B. Williams
---------------
+______________________________________________________________________________
= Definition Lists
#definition-lists#
@@ -397,7 +397,7 @@ Code:
Hr’s:
---------------
+______________________________________________________________________________
= Inline Markup
#inline-markup#
@@ -427,7 +427,7 @@ Subscripts: H2O, H23O, Hmany of themO.
These should not be superscripts or subscripts, because of the unescaped
spaces: a^b c^d, a~b c~d.
---------------
+______________________________________________________________________________
= Smart quotes, ellipses, dashes
#smart-quotes-ellipses-dashes#
@@ -449,7 +449,7 @@ Dashes between numbers: 5–7, 255–66, 1987–1999.
Ellipses…and…and….
---------------
+______________________________________________________________________________
= LaTeX
#latex#
@@ -474,7 +474,7 @@ These shouldn’t be math:
Here’s a LaTeX table:
---------------
+______________________________________________________________________________
= Special Characters
#special-characters#
@@ -529,7 +529,7 @@ Plus: +
Minus: -
---------------
+______________________________________________________________________________
= Links
#links#
@@ -610,7 +610,7 @@ Auto-links should not occur here: @\<http:\/\/example.com\/>@
> or here: <http://example.com/>
---------------
+______________________________________________________________________________
= Images
#images#
@@ -621,7 +621,7 @@ From “Voyage dans la Lune” by Georges Melies (1902):
Here is a movie <<movie.jpg movie>> icon.
---------------
+______________________________________________________________________________
= Footnotes
#footnotes#