John MacFarlane
374bb3c147
DokuWiki writer: Make tables prettier by aligning columns.
...
Also cleaned up crufty code and added tests.
2014-08-30 21:24:33 -07:00
John MacFarlane
d97aed3903
DokuWiki writer: Handle table cell alignments.
...
Closes #1566 .
2014-08-30 20:54:33 -07:00
Jesse Rosenthal
ccda2a902c
DokuWiki writer: Use backslash newlines in table cells.
...
Write out strings in table cells with backslash linebreaks in place of
newlines. We also want to remove the first two spaces of an indent in lists.
2014-08-30 07:17:55 -04:00
Matthew Pickering
404a58f456
DokuWiki Writer: Refactor to use Reader monad
2014-08-27 14:29:09 +01:00
Matthew Pickering
495f55b03e
DokuWiki Writer: Hlint cleanup
2014-08-27 13:48:19 +01:00
Matthew Pickering
3412018287
DokuWiki Writer: Qualified all imports
2014-08-27 13:29:09 +01:00
John MacFarlane
3e95fd586d
Use raw HTML for complex block quotes.
...
As far as I can see, dokuwiki markup is pretty limited in what
can go in a `>` block quote: just a single line of paragraph
text. (#1398 )
2014-07-13 16:15:45 -07:00
John MacFarlane
81088281de
DokuWiki writer: Use raw HTML for complex lists...
...
as in the mediawiki writer. The dokuwiki markup isn't able
to handle multiple block-level items within a list item, except
in a few special cases (e.g. code blocks, and these must be started
on the same line as the preceding paragraph). So we fall back to
raw HTML for these.
Perhaps there is a better solution. We can "fake" multiple
paragraphs within list items using hard line breaks (`\\`), but
we must keep everything on one line.
(#1398 )
2014-07-13 16:04:29 -07:00
John MacFarlane
0ba2f0b8f9
DokuWiki writer: Normalize to collapse adjacent raw HTML blocks.
2014-07-13 15:48:01 -07:00
John MacFarlane
71da4f8c55
DokuWiki writer: More tweaks to email links. ( #1398 )
2014-07-13 15:45:45 -07:00
John MacFarlane
80467d1b18
DokuWiki writer: Use pointy brackets for email links.
...
(#1398 )
2014-07-13 15:36:14 -07:00
John MacFarlane
fbf7cbfdc8
Dokuwiki writer: More idiomatic code for escaping.
2014-07-13 15:32:16 -07:00
John MacFarlane
798c57d9b2
DokuWiki writer: More raw HTML fixes. ( #1398 )
...
* Use uppercase HTML tags for block-level content, lowercase for
inline.
* Newline before closing HTML tag.
2014-07-13 15:28:47 -07:00
John MacFarlane
ce0960ba5a
DokuWiki writer: Fix raw inlines and blocks.
...
* mediawiki > dokuwiki
* ignore raw content other than html or dokuwiki.
(#1398 )
2014-07-13 15:25:25 -07:00
John MacFarlane
5df812f7eb
Merge branch 'claremacrae-dokuwiki'.
...
Use removeFormatting from Shared instead of the custom unfancy
function.
2014-07-13 14:44:53 -07:00
Clare Macrae
c7431283d6
DokuWiki writer: Remove broken formatting from headings ( #1398 )
2014-07-08 22:05:04 +01:00
Clare Macrae
5769f178e1
Put myself as maintainer ( #1398 )
2014-07-08 21:18:31 +01:00
Clare Macrae
0c6f06b8a4
DokuWiki writer: Span no longer swallows text
2014-07-02 22:40:34 +01:00
Clare Macrae
3faf31678e
DokuWiki writer: Remove todos that I have already done.
2014-07-02 21:44:05 +01:00
Clare Macrae
61cc983bea
DokuWiki writer: Retain unknown RawBlock and RawInline text
...
This added \cite and \begin latex to the testuite output.
2014-07-02 21:40:12 +01:00
Clare Macrae
d234157d25
DokuWiki output: Implement blockquotes properly
...
TODO Also implement nested blockquotes.
2014-07-02 21:26:24 +01:00
Clare Macrae
92a962ba63
DokuWiki writer: remove unused code
2014-07-02 21:01:33 +01:00
Clare Macrae
244c4eee74
Remove stray <div> and </div> from DokuWiki output ( #386 )
2014-07-01 21:42:21 +01:00
Clare Macrae
0727579167
Improved HTML Blocks in DokuWiki output ( #386 )
...
For example, this fixes the display of a broken table, and
it also fixes the various HTML horizontal rules.
2014-07-01 21:21:09 +01:00
Clare Macrae
a049a60129
Disable warnings about unused parameters.
2014-06-30 22:07:17 +01:00
Clare Macrae
e35738a3cc
Updated Copyright year, for consistency with MediaWiki.hs
2014-06-29 21:21:00 +01:00
Clare Macrae
fdbf52b1cc
Updated DokuWiki code and tests to work with latest code from jgm.
...
The new code was got from inspecting changes in MediaWiki.hs
This slightly changes the output of Div blocks, but I'm not
convinced the original behaviour was really correct anyway.
The code for handling Span does nothing for now, until I can
work out the desired behaviour, and add tests for it.
2014-06-29 21:15:17 +01:00
claremacrae
78ae3c2492
Implement definition lists in dokuwiki writer ( #386 ) - credit: James Smaldon
2013-08-28 08:09:42 +01:00
claremacrae
ebcd90b24a
Fix some warnings in dokuwiki writer ( #386 )
2013-08-19 21:28:17 +01:00
claremacrae
6cc284cc8e
Bullet and ordered lists now always simple in dokuwiki writer ( #386 )
2013-08-19 20:45:31 +01:00
claremacrae
883f119c87
Removed unnecessary line-break after hard break in dokuwiki writer ( #386 )
2013-08-19 08:09:52 +01:00
claremacrae
288329044a
Stop plain text ** and __ becoming formatting in dokuwiki writer ( #386 )
2013-08-18 09:15:33 +01:00
claremacrae
b5b622f5b8
Stop plain text // becoming an italic marker in dokuwiki writer ( #386 )
...
When the original document had text containing //, this was previously
included, unchanged, in the dokuwiki output, and this interacted badly
with later, intended, formating text.
2013-08-18 08:57:32 +01:00
claremacrae
6d484bc55e
Treat inline code blocks like <code> instead of <tt> in dokuwiki writer ( #386 )
...
Done because I noticed that in the Autolinks section of writer.dokuwiki, the URL in inlined code was getting auto-linked, when it wasn't supposed to.
This also meant that any inline code examples that had text that looked like dokuwiki syntax could break the formatting of later text.
2013-08-18 08:13:34 +01:00
claremacrae
2a4bbe5d4f
Nasty hack to stop C comments in inline code becoming italics in dokuwiki writer ( #386 )
2013-08-17 22:28:07 +01:00
claremacrae
0961d49912
Fixed inlined code in dokuwiki writer ( #386 )
2013-08-17 12:34:05 +01:00
claremacrae
4c48433a2a
Don't add entities in <code> blocks in dokuwiki writer ( #386 )
2013-08-17 12:20:34 +01:00
claremacrae
573bd1b61b
Implement <code> blocks in dokuwiki writer ( #386 )
2013-08-17 11:20:51 +01:00
claremacrae
eb4fe5e82c
Implement table headings in dokuwiki writer ( #386 )
2013-08-17 08:48:29 +01:00
claremacrae
48645a4755
Initial implementation of tables in dokuwiki writer ( #386 )
...
Todo: alignment, and headings
2013-08-11 22:22:07 +01:00
claremacrae
e5004bcff0
Implement strikeout in dokuwiki writer ( #386 )
2013-08-06 07:43:32 +01:00
claremacrae
b14b2d6a85
Implement footnotes in dokuwiki writer ( #386 )
2013-07-28 19:19:33 +01:00
claremacrae
b5f86a665d
Removed incorrect entity conversion in dokuwiki writer ( #386 )
2013-07-28 18:59:16 +01:00
claremacrae
51b8ce49f1
Implemented linebreaks in dokuwiki writer ( #386 )
2013-07-28 18:42:53 +01:00
claremacrae
b77d4456ea
Added another todo - dokuwiki writer ( #386 )
2013-07-26 22:49:19 +01:00
Clare Macrae
2900a9a371
Added some todos to dokuwiki writer ( #386 )
2013-07-26 22:38:13 +01:00
Clare Macrae
5b04d063a1
Convert bullet and numbered lists in dokuwiki writer ( #386 )
2013-07-26 06:19:40 +01:00
Clare Macrae
18565e149a
Implement conversion of images in dokuwiki writer ( #386 )
2013-07-15 19:29:39 +01:00
Clare Macrae
b2a8731e32
Weak implementation of hyperlinks for dokuwiki ( #386 )
...
TODO Simplify the code
2013-07-15 09:35:04 +01:00
Clare Macrae
660fb24472
Implemented horizontal rule for dokuwiki ( #386 )
2013-07-14 15:03:40 +01:00