Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

DokuWiki output: Implement blockquotes properly

Browse source 
TODO Also implement nested blockquotes.
This commit is contained in:
Clare Macrae 2014-07-02 21:26:24 +01:00
parent 92a962ba63
commit d234157d25
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Text/Pandoc/Writers/DokuWiki.hs
View file

@ -32,7 +32,7 @@ DokuWiki: <https://www.dokuwiki.org/dokuwiki>
{- {-
[ ] Correct handling of Span [ ] Correct handling of Span
[ ] Don't generate <blockquote>... [ ] Implement nested blockquotes (currently only ever does one level)
[ ] Don't generate lists using <ol> and <ul> [ ] Don't generate lists using <ol> and <ul>
[ ] Implement alignment of text in tables [ ] Implement alignment of text in tables
[ ] Implement comments [ ] Implement comments
@ -150,7 +150,7 @@ blockToDokuWiki _ (CodeBlock (_,classes,_) str) = do
blockToDokuWiki opts (BlockQuote blocks) = do blockToDokuWiki opts (BlockQuote blocks) = do
contents <- blockListToDokuWiki opts blocks contents <- blockListToDokuWiki opts blocks
return $ "<blockquote>" ++ contents ++ "</blockquote>" return $ "> " ++ contents
blockToDokuWiki opts (Table capt aligns _ headers rows') = do blockToDokuWiki opts (Table capt aligns _ headers rows') = do
let alignStrings = map alignmentToString aligns let alignStrings = map alignmentToString aligns

24
tests/writer.dokuwiki
View file

@ -45,9 +45,9 @@ There should be a hard line break\\ here.
E-mail style: E-mail style:
<blockquote>This is a block quote. It is pretty short. > This is a block quote. It is pretty short.
</blockquote>
<blockquote>Code in a block quote: > Code in a block quote:
<code>sub status { <code>sub status {
print "working"; print "working";
@ -59,10 +59,10 @@ A list:
Nested block quotes: Nested block quotes:
<blockquote>nested > nested
</blockquote>
<blockquote>nested > nested
</blockquote></blockquote>
This should not be a block quote: 2 > 1. This should not be a block quote: 2 > 1.
And a following paragraph. And a following paragraph.
@ -251,7 +251,7 @@ Multiple blocks with italics:
contains seeds, crisp, pleasant to taste contains seeds, crisp, pleasant to taste
* **//orange//** orange fruit * **//orange//** orange fruit
<code>{ orange code block }</code> <code>{ orange code block }</code>
<blockquote>orange block quote</blockquote> > orange block quote
Multiple definitions, tight: Multiple definitions, tight:
@ -568,8 +568,8 @@ With an ampersand: http://example.com/?foo=1&bar=2
An e-mail address: [[mailto:nobody@nowhere.net|nobody@nowhere.net]] An e-mail address: [[mailto:nobody@nowhere.net|nobody@nowhere.net]]
<blockquote>Blockquoted: http://example.com/ > Blockquoted: http://example.com/
</blockquote>
Auto-links should not occur here: ''%%<http://example.com/>%%'' Auto-links should not occur here: ''%%<http://example.com/>%%''
<code>or here: <http://example.com/></code> <code>or here: <http://example.com/></code>
@ -599,9 +599,9 @@ If you want, you can indent every line, but you can also be lazy and just indent
)) This should //not// be a footnote reference, because it contains a space.[^my note] Here is an inline note.((This is //easier// to type. Inline notes may contain [[http://google.com|links]] and ''%%]%%'' verbatim characters, as well as [bracketed text]. )) This should //not// be a footnote reference, because it contains a space.[^my note] Here is an inline note.((This is //easier// to type. Inline notes may contain [[http://google.com|links]] and ''%%]%%'' verbatim characters, as well as [bracketed text].
)) ))
<blockquote>Notes can go in quotes.((In quote. > Notes can go in quotes.((In quote.
)) ))
</blockquote>
- And in list items.((In list.)) - And in list items.((In list.))
This paragraph should not be part of the note, as it is not indented. This paragraph should not be part of the note, as it is not indented.