Added TikiWiki reader (#3800)
Added TikiWiki reader, including tests and documentation. It's probably not *complete*, but it works pretty well, handles all the basics (and some not-so-basics).
This commit is contained in:
rlpowell
John MacFarlane
parent
335a1c7f48
commit
2ae75e23dd
10 changed files with 988 additions and 42 deletions
13
MANUAL.txt
13
MANUAL.txt
|
|
@ -15,8 +15,8 @@ another, and a command-line tool that uses this library. It can read
|
||||||
[Markdown], [CommonMark], [PHP Markdown Extra], [GitHub-Flavored
|
[Markdown], [CommonMark], [PHP Markdown Extra], [GitHub-Flavored
|
||||||
Markdown], [MultiMarkdown], and (subsets of) [Textile],
|
Markdown], [MultiMarkdown], and (subsets of) [Textile],
|
||||||
[reStructuredText], [HTML], [LaTeX], [MediaWiki markup], [TWiki markup],
|
[reStructuredText], [HTML], [LaTeX], [MediaWiki markup], [TWiki markup],
|
||||||
[Haddock markup], [OPML], [Emacs Org mode], [DocBook], [Muse], [txt2tags],
|
[TikiWiki markup], [Haddock markup], [OPML], [Emacs Org mode], [DocBook],
|
||||||
[Vimwiki], [EPUB], [ODT], and [Word docx]; and it can
|
[Muse], [txt2tags], [Vimwiki], [EPUB], [ODT], and [Word docx]; and it can
|
||||||
write plain text, [Markdown], [CommonMark], [PHP Markdown
|
write plain text, [Markdown], [CommonMark], [PHP Markdown
|
||||||
Extra], [GitHub-Flavored Markdown], [MultiMarkdown],
|
Extra], [GitHub-Flavored Markdown], [MultiMarkdown],
|
||||||
[reStructuredText], [XHTML], [HTML5], [LaTeX] \(including
|
[reStructuredText], [XHTML], [HTML5], [LaTeX] \(including
|
||||||
|
|
@ -85,6 +85,7 @@ Markdown can be expected to be lossy.
|
||||||
[DokuWiki markup]: https://www.dokuwiki.org/dokuwiki
|
[DokuWiki markup]: https://www.dokuwiki.org/dokuwiki
|
||||||
[ZimWiki markup]: http://zim-wiki.org/manual/Help/Wiki_Syntax.html
|
[ZimWiki markup]: http://zim-wiki.org/manual/Help/Wiki_Syntax.html
|
||||||
[TWiki markup]: http://twiki.org/cgi-bin/view/TWiki/TextFormattingRules
|
[TWiki markup]: http://twiki.org/cgi-bin/view/TWiki/TextFormattingRules
|
||||||
|
[TikiWiki markup]: https://doc.tiki.org/Wiki-Syntax-Text#The_Markup_Language_Wiki-Syntax
|
||||||
[Haddock markup]: https://www.haskell.org/haddock/doc/html/ch03s08.html
|
[Haddock markup]: https://www.haskell.org/haddock/doc/html/ch03s08.html
|
||||||
[groff man]: http://man7.org/linux/man-pages/man7/groff_man.7.html
|
[groff man]: http://man7.org/linux/man-pages/man7/groff_man.7.html
|
||||||
[groff ms]: http://man7.org/linux/man-pages/man7/groff_ms.7.html
|
[groff ms]: http://man7.org/linux/man-pages/man7/groff_ms.7.html
|
||||||
|
|
@ -268,10 +269,10 @@ General options
|
||||||
(reStructuredText), `html` (HTML), `docbook` (DocBook), `t2t`
|
(reStructuredText), `html` (HTML), `docbook` (DocBook), `t2t`
|
||||||
(txt2tags), `docx` (docx), `odt` (ODT), `epub` (EPUB), `opml` (OPML),
|
(txt2tags), `docx` (docx), `odt` (ODT), `epub` (EPUB), `opml` (OPML),
|
||||||
`org` (Emacs Org mode), `mediawiki` (MediaWiki markup), `twiki` (TWiki
|
`org` (Emacs Org mode), `mediawiki` (MediaWiki markup), `twiki` (TWiki
|
||||||
markup), `haddock` (Haddock markup), or `latex` (LaTeX). If
|
markup), `tikiwiki` (TikiWiki markup), `haddock` (Haddock markup), or
|
||||||
`+lhs` is appended to `markdown`, `rst`, `latex`, or `html`, the
|
`latex` (LaTeX). If `+lhs` is appended to `markdown`, `rst`, `latex`, or
|
||||||
input will be treated as literate Haskell source: see [Literate
|
`html`, the input will be treated as literate Haskell source: see
|
||||||
Haskell support], below. Markdown
|
[Literate Haskell support], below. Markdown
|
||||||
syntax extensions can be individually enabled or disabled by
|
syntax extensions can be individually enabled or disabled by
|
||||||
appending `+EXTENSION` or `-EXTENSION` to the format name. So, for
|
appending `+EXTENSION` or `-EXTENSION` to the format name. So, for
|
||||||
example, `markdown_strict+footnotes+definition_lists` is strict
|
example, `markdown_strict+footnotes+definition_lists` is strict
|
||||||
|
|
|
||||||
|
|
@ -19,8 +19,8 @@ another, and a command-line tool that uses this library. It can read
|
||||||
[Markdown], [CommonMark], [PHP Markdown Extra], [GitHub-Flavored
|
[Markdown], [CommonMark], [PHP Markdown Extra], [GitHub-Flavored
|
||||||
Markdown], [MultiMarkdown], and (subsets of) [Textile],
|
Markdown], [MultiMarkdown], and (subsets of) [Textile],
|
||||||
[reStructuredText], [HTML], [LaTeX], [MediaWiki markup], [TWiki markup],
|
[reStructuredText], [HTML], [LaTeX], [MediaWiki markup], [TWiki markup],
|
||||||
[Haddock markup], [OPML], [Emacs Org mode], [DocBook], [Muse], [txt2tags],
|
[TikiWiki markup], [Haddock markup], [OPML], [Emacs Org mode], [DocBook],
|
||||||
[Vimwiki], [EPUB], [ODT], and [Word docx]; and it can
|
[Muse], [txt2tags], [Vimwiki], [EPUB], [ODT], and [Word docx]; and it can
|
||||||
write plain text, [Markdown], [CommonMark], [PHP Markdown
|
write plain text, [Markdown], [CommonMark], [PHP Markdown
|
||||||
Extra], [GitHub-Flavored Markdown], [MultiMarkdown],
|
Extra], [GitHub-Flavored Markdown], [MultiMarkdown],
|
||||||
[reStructuredText], [XHTML], [HTML5], [LaTeX] \(including
|
[reStructuredText], [XHTML], [HTML5], [LaTeX] \(including
|
||||||
|
|
|
||||||
|
|
@ -13,13 +13,13 @@ Description: general markup converter
|
||||||
format to another, and a command-line tool that uses
|
format to another, and a command-line tool that uses
|
||||||
this library. It can read several dialects of Markdown and
|
this library. It can read several dialects of Markdown and
|
||||||
(subsets of) HTML, reStructuredText, LaTeX, DocBook,
|
(subsets of) HTML, reStructuredText, LaTeX, DocBook,
|
||||||
MediaWiki markup, TWiki markup, Haddock markup, OPML,
|
MediaWiki markup, TWiki markup, TikiWiki markup, Haddock
|
||||||
Emacs Org-Mode, txt2tags, Muse, Vimwiki, Word Docx, ODT,
|
markup, OPML, Emacs Org-Mode, txt2tags, Muse, Vimwiki,
|
||||||
and Textile, and it can write Markdown, reStructuredText,
|
Word Docx, ODT, and Textile, and it can write Markdown,
|
||||||
XHTML, HTML 5, LaTeX, ConTeXt, DocBook, JATS, OPML, TEI,
|
reStructuredText, XHTML, HTML 5, LaTeX, ConTeXt, DocBook,
|
||||||
OpenDocument, ODT, Word docx, RTF, MediaWiki, DokuWiki,
|
JATS, OPML, TEI, OpenDocument, ODT, Word docx, RTF,
|
||||||
ZimWiki, Textile, groff man, groff ms, plain text,
|
MediaWiki, DokuWiki, ZimWiki, Textile, groff man, groff
|
||||||
Emacs Org-Mode, AsciiDoc, Haddock markup, EPUB (v2 and v3),
|
ms, plain text, Emacs Org-Mode, AsciiDoc, Haddock markup,
|
||||||
FictionBook2, InDesign ICML, Muse, and several kinds of
|
EPUB (v2 and v3), FictionBook2, InDesign ICML, Muse, and
|
||||||
HTML/javascript slide shows (S5, Slidy, Slideous,
|
several kinds of HTML/javascript slide shows (S5, Slidy,
|
||||||
DZSlides, reveal.js).
|
Slideous, DZSlides, reveal.js).
|
||||||
|
|
|
||||||
33
man/pandoc.1
33
man/pandoc.1
|
|
@ -11,15 +11,16 @@ Pandoc is a Haskell library for converting from one markup format to
|
||||||
another, and a command\-line tool that uses this library.
|
another, and a command\-line tool that uses this library.
|
||||||
It can read Markdown, CommonMark, PHP Markdown Extra, GitHub\-Flavored
|
It can read Markdown, CommonMark, PHP Markdown Extra, GitHub\-Flavored
|
||||||
Markdown, MultiMarkdown, and (subsets of) Textile, reStructuredText,
|
Markdown, MultiMarkdown, and (subsets of) Textile, reStructuredText,
|
||||||
HTML, LaTeX, MediaWiki markup, TWiki markup, Haddock markup, OPML, Emacs
|
HTML, LaTeX, MediaWiki markup, TWiki markup, TikiWiki markup,
|
||||||
Org mode, DocBook, txt2tags, EPUB, ODT and Word docx; and it can write
|
Haddock markup, OPML, Emacs Org mode, DocBook, txt2tags, EPUB, ODT
|
||||||
plain text, Markdown, CommonMark, PHP Markdown Extra, GitHub\-Flavored
|
and Word docx; and it can write plain text, Markdown, CommonMark,
|
||||||
Markdown, MultiMarkdown, reStructuredText, XHTML, HTML5, LaTeX
|
PHP Markdown Extra, GitHub\-Flavored Markdown, MultiMarkdown,
|
||||||
(including \f[C]beamer\f[] slide shows), ConTeXt, RTF, OPML, DocBook,
|
reStructuredText, XHTML, HTML5, LaTeX (including \f[C]beamer\f[]
|
||||||
OpenDocument, ODT, Word docx, GNU Texinfo, MediaWiki markup, DokuWiki
|
slide shows), ConTeXt, RTF, OPML, DocBook, OpenDocument, ODT, Word
|
||||||
markup, ZimWiki markup, Haddock markup, EPUB (v2 or v3), FictionBook2,
|
docx, GNU Texinfo, MediaWiki markup, DokuWiki markup, ZimWiki
|
||||||
Textile, groff man, groff ms, Emacs Org mode, AsciiDoc, InDesign ICML,
|
markup, Haddock markup, EPUB (v2 or v3), FictionBook2, Textile,
|
||||||
TEI Simple, and Slidy, Slideous, DZSlides, reveal.js or S5 HTML slide
|
groff man, groff ms, Emacs Org mode, AsciiDoc, InDesign ICML, TEI
|
||||||
|
Simple, and Slidy, Slideous, DZSlides, reveal.js or S5 HTML slide
|
||||||
shows.
|
shows.
|
||||||
It can also produce PDF output on systems where LaTeX, ConTeXt,
|
It can also produce PDF output on systems where LaTeX, ConTeXt,
|
||||||
\f[C]pdfroff\f[], or \f[C]wkhtmltopdf\f[] is installed.
|
\f[C]pdfroff\f[], or \f[C]wkhtmltopdf\f[] is installed.
|
||||||
|
|
@ -231,13 +232,13 @@ Markdown), \f[C]textile\f[] (Textile), \f[C]rst\f[] (reStructuredText),
|
||||||
(txt2tags), \f[C]docx\f[] (docx), \f[C]odt\f[] (ODT), \f[C]epub\f[]
|
(txt2tags), \f[C]docx\f[] (docx), \f[C]odt\f[] (ODT), \f[C]epub\f[]
|
||||||
(EPUB), \f[C]opml\f[] (OPML), \f[C]org\f[] (Emacs Org mode),
|
(EPUB), \f[C]opml\f[] (OPML), \f[C]org\f[] (Emacs Org mode),
|
||||||
\f[C]mediawiki\f[] (MediaWiki markup), \f[C]twiki\f[] (TWiki markup),
|
\f[C]mediawiki\f[] (MediaWiki markup), \f[C]twiki\f[] (TWiki markup),
|
||||||
\f[C]haddock\f[] (Haddock markup), or \f[C]latex\f[] (LaTeX).
|
\f[C]tikiwiki\f[] (TikiWiki markup), \f[C]haddock\f[] (Haddock markup),
|
||||||
If \f[C]+lhs\f[] is appended to \f[C]markdown\f[], \f[C]rst\f[],
|
or \f[C]latex\f[] (LaTeX). If \f[C]+lhs\f[] is appended to
|
||||||
\f[C]latex\f[], or \f[C]html\f[], the input will be treated as literate
|
\f[C]markdown\f[], \f[C]rst\f[], \f[C]latex\f[], or \f[C]html\f[],
|
||||||
Haskell source: see Literate Haskell support, below.
|
the input will be treated as literate Haskell source: see Literate
|
||||||
Markdown syntax extensions can be individually enabled or disabled by
|
Haskell support, below. Markdown syntax extensions can be
|
||||||
appending \f[C]+EXTENSION\f[] or \f[C]\-EXTENSION\f[] to the format
|
individually enabled or disabled by appending \f[C]+EXTENSION\f[] or
|
||||||
name.
|
\f[C]\-EXTENSION\f[] to the format name.
|
||||||
So, for example, \f[C]markdown_strict+footnotes+definition_lists\f[] is
|
So, for example, \f[C]markdown_strict+footnotes+definition_lists\f[] is
|
||||||
strict Markdown with footnotes and definition lists enabled, and
|
strict Markdown with footnotes and definition lists enabled, and
|
||||||
\f[C]markdown\-pipe_tables+hard_line_breaks\f[] is pandoc's Markdown
|
\f[C]markdown\-pipe_tables+hard_line_breaks\f[] is pandoc's Markdown
|
||||||
|
|
|
||||||
18
pandoc.cabal
18
pandoc.cabal
|
|
@ -17,16 +17,16 @@ Description: Pandoc is a Haskell library for converting from one markup
|
||||||
format to another, and a command-line tool that uses
|
format to another, and a command-line tool that uses
|
||||||
this library. It can read several dialects of Markdown and
|
this library. It can read several dialects of Markdown and
|
||||||
(subsets of) HTML, reStructuredText, LaTeX, DocBook,
|
(subsets of) HTML, reStructuredText, LaTeX, DocBook,
|
||||||
MediaWiki markup, TWiki markup, Haddock markup, OPML,
|
MediaWiki markup, TWiki markup, TikiWiki markup, Haddock
|
||||||
Emacs Org-Mode, txt2tags, Muse, Vimwiki, Word Docx, ODT,
|
markup, OPML, Emacs Org-Mode, txt2tags, Muse, Vimwiki, Word
|
||||||
and Textile, and it can write Markdown, reStructuredText,
|
Docx, ODT, and Textile, and it can write Markdown,
|
||||||
XHTML, HTML 5, LaTeX, ConTeXt, DocBook, JATS, OPML, TEI,
|
reStructuredText, XHTML, HTML 5, LaTeX, ConTeXt, DocBook,
|
||||||
OpenDocument, ODT, Word docx, RTF, MediaWiki, DokuWiki,
|
JATS, OPML, TEI, OpenDocument, ODT, Word docx, RTF, MediaWiki,
|
||||||
ZimWiki, Textile, groff man, groff ms, plain text,
|
DokuWiki, ZimWiki, Textile, groff man, groff ms, plain text,
|
||||||
Emacs Org-Mode, AsciiDoc, Haddock markup, EPUB (v2 and v3),
|
Emacs Org-Mode, AsciiDoc, Haddock markup, EPUB (v2 and v3),
|
||||||
FictionBook2, InDesign ICML, Muse, and several kinds of
|
FictionBook2, InDesign ICML, Muse, and several kinds of
|
||||||
HTML/javascript slide shows (S5, Slidy, Slideous,
|
HTML/javascript slide shows (S5, Slidy, Slideous, DZSlides,
|
||||||
DZSlides, reveal.js).
|
reveal.js).
|
||||||
.
|
.
|
||||||
In contrast to most existing tools for converting Markdown
|
In contrast to most existing tools for converting Markdown
|
||||||
to HTML, pandoc has a modular design: it consists of a set of
|
to HTML, pandoc has a modular design: it consists of a set of
|
||||||
|
|
@ -252,6 +252,7 @@ Extra-Source-Files:
|
||||||
test/epub/*.native
|
test/epub/*.native
|
||||||
test/txt2tags.t2t
|
test/txt2tags.t2t
|
||||||
test/twiki-reader.twiki
|
test/twiki-reader.twiki
|
||||||
|
test/tikiwiki-reader.tikiwiki
|
||||||
test/odt/odt/*.odt
|
test/odt/odt/*.odt
|
||||||
test/odt/markdown/*.md
|
test/odt/markdown/*.md
|
||||||
test/odt/native/*.native
|
test/odt/native/*.native
|
||||||
|
|
@ -379,6 +380,7 @@ Library
|
||||||
Text.Pandoc.Readers.Native,
|
Text.Pandoc.Readers.Native,
|
||||||
Text.Pandoc.Readers.Haddock,
|
Text.Pandoc.Readers.Haddock,
|
||||||
Text.Pandoc.Readers.TWiki,
|
Text.Pandoc.Readers.TWiki,
|
||||||
|
Text.Pandoc.Readers.TikiWiki,
|
||||||
Text.Pandoc.Readers.Txt2Tags,
|
Text.Pandoc.Readers.Txt2Tags,
|
||||||
Text.Pandoc.Readers.Docx,
|
Text.Pandoc.Readers.Docx,
|
||||||
Text.Pandoc.Readers.Odt,
|
Text.Pandoc.Readers.Odt,
|
||||||
|
|
|
||||||
|
|
@ -58,6 +58,7 @@ module Text.Pandoc.Readers
|
||||||
, readNative
|
, readNative
|
||||||
, readJSON
|
, readJSON
|
||||||
, readTWiki
|
, readTWiki
|
||||||
|
, readTikiWiki
|
||||||
, readTxt2Tags
|
, readTxt2Tags
|
||||||
, readEPUB
|
, readEPUB
|
||||||
, readMuse
|
, readMuse
|
||||||
|
|
@ -92,6 +93,7 @@ import Text.Pandoc.Readers.Org
|
||||||
import Text.Pandoc.Readers.RST
|
import Text.Pandoc.Readers.RST
|
||||||
import Text.Pandoc.Readers.Textile
|
import Text.Pandoc.Readers.Textile
|
||||||
import Text.Pandoc.Readers.TWiki
|
import Text.Pandoc.Readers.TWiki
|
||||||
|
import Text.Pandoc.Readers.TikiWiki
|
||||||
import Text.Pandoc.Readers.Txt2Tags
|
import Text.Pandoc.Readers.Txt2Tags
|
||||||
import Text.Pandoc.Shared (mapLeft)
|
import Text.Pandoc.Shared (mapLeft)
|
||||||
import Text.Parsec.Error
|
import Text.Parsec.Error
|
||||||
|
|
@ -126,6 +128,7 @@ readers = [ ("native" , TextReader readNative)
|
||||||
,("latex" , TextReader readLaTeX)
|
,("latex" , TextReader readLaTeX)
|
||||||
,("haddock" , TextReader readHaddock)
|
,("haddock" , TextReader readHaddock)
|
||||||
,("twiki" , TextReader readTWiki)
|
,("twiki" , TextReader readTWiki)
|
||||||
|
,("tikiwiki" , TextReader readTikiWiki)
|
||||||
,("docx" , ByteStringReader readDocx)
|
,("docx" , ByteStringReader readDocx)
|
||||||
,("odt" , ByteStringReader readOdt)
|
,("odt" , ByteStringReader readOdt)
|
||||||
,("t2t" , TextReader readTxt2Tags)
|
,("t2t" , TextReader readTxt2Tags)
|
||||||
|
|
|
||||||
658
src/Text/Pandoc/Readers/TikiWiki.hs
Normal file
658
src/Text/Pandoc/Readers/TikiWiki.hs
Normal file
|
|
@ -0,0 +1,658 @@
|
||||||
|
{-# LANGUAGE RelaxedPolyRec, FlexibleInstances, TypeSynonymInstances #-}
|
||||||
|
{-# LANGUAGE OverloadedStrings #-}
|
||||||
|
{-# LANGUAGE FlexibleContexts #-}
|
||||||
|
|
||||||
|
{- |
|
||||||
|
Module : Text.Pandoc.Readers.TikiWiki
|
||||||
|
Copyright : Copyright (C) 2017 Robin Lee Powell
|
||||||
|
License : GPLv2
|
||||||
|
|
||||||
|
Maintainer : Robin Lee Powell <robinleepowell@gmail.com>
|
||||||
|
Stability : alpha
|
||||||
|
Portability : portable
|
||||||
|
|
||||||
|
Conversion of TikiWiki text to 'Pandoc' document.
|
||||||
|
-}
|
||||||
|
|
||||||
|
module Text.Pandoc.Readers.TikiWiki ( readTikiWiki
|
||||||
|
) where
|
||||||
|
|
||||||
|
import Control.Monad
|
||||||
|
import Control.Monad.Except (throwError)
|
||||||
|
import Text.Pandoc.Definition
|
||||||
|
import qualified Text.Pandoc.Builder as B
|
||||||
|
import Text.Pandoc.Options
|
||||||
|
import Text.Pandoc.Parsing hiding (enclosed, nested)
|
||||||
|
import Text.Printf (printf)
|
||||||
|
import Text.Pandoc.XML (fromEntities)
|
||||||
|
import Text.Pandoc.Class (PandocMonad(..), CommonState(..))
|
||||||
|
import Text.Pandoc.Shared (crFilter)
|
||||||
|
import Text.Pandoc.Logging (Verbosity(..))
|
||||||
|
import Data.Maybe (fromMaybe)
|
||||||
|
import Data.List (intercalate)
|
||||||
|
import qualified Data.Foldable as F
|
||||||
|
import Data.Text (Text)
|
||||||
|
import qualified Data.Text as T
|
||||||
|
|
||||||
|
-- | Read TikiWiki from an input string and return a Pandoc document.
|
||||||
|
readTikiWiki :: PandocMonad m
|
||||||
|
=> ReaderOptions
|
||||||
|
-> Text
|
||||||
|
-> m Pandoc
|
||||||
|
readTikiWiki opts s = do
|
||||||
|
res <- readWithM parseTikiWiki def{ stateOptions = opts }
|
||||||
|
(T.unpack (crFilter s) ++ "\n\n")
|
||||||
|
case res of
|
||||||
|
Left e -> throwError e
|
||||||
|
Right d -> return d
|
||||||
|
|
||||||
|
type TikiWikiParser = ParserT [Char] ParserState
|
||||||
|
|
||||||
|
--
|
||||||
|
-- utility functions
|
||||||
|
--
|
||||||
|
|
||||||
|
tryMsg :: PandocMonad m => String -> TikiWikiParser m a -> TikiWikiParser m a
|
||||||
|
tryMsg msg p = try p <?> msg
|
||||||
|
|
||||||
|
skip :: PandocMonad m => TikiWikiParser m a -> TikiWikiParser m ()
|
||||||
|
skip parser = parser >> return ()
|
||||||
|
|
||||||
|
nested :: PandocMonad m => TikiWikiParser m a -> TikiWikiParser m a
|
||||||
|
nested p = do
|
||||||
|
nestlevel <- stateMaxNestingLevel <$> getState
|
||||||
|
guard $ nestlevel > 0
|
||||||
|
updateState $ \st -> st{ stateMaxNestingLevel = stateMaxNestingLevel st - 1 }
|
||||||
|
res <- p
|
||||||
|
updateState $ \st -> st{ stateMaxNestingLevel = nestlevel }
|
||||||
|
return res
|
||||||
|
|
||||||
|
--
|
||||||
|
-- main parser
|
||||||
|
--
|
||||||
|
|
||||||
|
parseTikiWiki :: PandocMonad m => TikiWikiParser m Pandoc
|
||||||
|
parseTikiWiki = do
|
||||||
|
bs <- mconcat <$> many block
|
||||||
|
spaces
|
||||||
|
eof
|
||||||
|
return $ B.doc bs
|
||||||
|
|
||||||
|
block :: PandocMonad m => TikiWikiParser m B.Blocks
|
||||||
|
block = do
|
||||||
|
verbosity <- getsCommonState stVerbosity
|
||||||
|
pos <- getPosition
|
||||||
|
res <- mempty <$ skipMany1 blankline
|
||||||
|
<|> blockElements
|
||||||
|
<|> para
|
||||||
|
skipMany blankline
|
||||||
|
when (verbosity >= INFO) $ do
|
||||||
|
trace (printf "line %d: %s" (sourceLine pos) (take 60 $ show $ B.toList res))
|
||||||
|
return res
|
||||||
|
|
||||||
|
blockElements :: PandocMonad m => TikiWikiParser m B.Blocks
|
||||||
|
blockElements = choice [ table
|
||||||
|
, hr
|
||||||
|
, header
|
||||||
|
, mixedList
|
||||||
|
, definitionList
|
||||||
|
, codeMacro
|
||||||
|
]
|
||||||
|
|
||||||
|
-- top
|
||||||
|
-- ----
|
||||||
|
-- bottom
|
||||||
|
--
|
||||||
|
-- ----
|
||||||
|
--
|
||||||
|
hr :: PandocMonad m => TikiWikiParser m B.Blocks
|
||||||
|
hr = try $ do
|
||||||
|
string "----"
|
||||||
|
many (char '-')
|
||||||
|
newline
|
||||||
|
return $ B.horizontalRule
|
||||||
|
|
||||||
|
-- ! header
|
||||||
|
--
|
||||||
|
-- !! header level two
|
||||||
|
--
|
||||||
|
-- !!! header level 3
|
||||||
|
--
|
||||||
|
header :: PandocMonad m => TikiWikiParser m B.Blocks
|
||||||
|
header = tryMsg "header" $ do
|
||||||
|
level <- many1 (char '!') >>= return . length
|
||||||
|
guard $ level <= 6
|
||||||
|
skipSpaces
|
||||||
|
content <- B.trimInlines . mconcat <$> manyTill inline newline
|
||||||
|
attr <- registerHeader nullAttr content
|
||||||
|
return $ B.headerWith attr level $ content
|
||||||
|
|
||||||
|
tableRow :: PandocMonad m => TikiWikiParser m [B.Blocks]
|
||||||
|
tableRow = try $ do
|
||||||
|
-- row <- sepBy1 (many1Till inline $ oneOf "\n|") (try $ string "|" <* notFollowedBy (oneOf "|\n"))
|
||||||
|
-- return $ map (B.plain . mconcat) row
|
||||||
|
row <- sepBy1 ((many1 $ noneOf "\n|") >>= parseColumn) (try $ string "|" <* notFollowedBy (oneOf "|\n"))
|
||||||
|
return $ map B.plain row
|
||||||
|
where
|
||||||
|
parseColumn x = do
|
||||||
|
parsed <- parseFromString (many1 inline) x
|
||||||
|
return $ mconcat parsed
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
-- Tables:
|
||||||
|
--
|
||||||
|
-- ||foo||
|
||||||
|
--
|
||||||
|
-- ||row1-column1|row1-column2||row2-column1|row2-column2||
|
||||||
|
--
|
||||||
|
-- ||row1-column1|row1-column2
|
||||||
|
-- row2-column1|row2-column2||
|
||||||
|
--
|
||||||
|
-- ||row1-column1|row1-column2
|
||||||
|
-- row2-column1|row2-column2||row3-column1|row3-column2||
|
||||||
|
--
|
||||||
|
-- || Orange | Apple | more
|
||||||
|
-- Bread | Pie | more
|
||||||
|
-- Butter | Ice cream | and more ||
|
||||||
|
--
|
||||||
|
table :: PandocMonad m => TikiWikiParser m B.Blocks
|
||||||
|
table = try $ do
|
||||||
|
string "||"
|
||||||
|
rows <- sepBy1 tableRow (try $ string "\n" <|> (string "||" <* notFollowedBy (string "\n")))
|
||||||
|
string "||"
|
||||||
|
newline
|
||||||
|
-- return $ B.simpleTable (headers rows) $ trace ("rows: " ++ (show rows)) rows
|
||||||
|
return $ B.simpleTable (headers rows) $ rows
|
||||||
|
where
|
||||||
|
-- The headers are as many empty srings as the number of columns
|
||||||
|
-- in the first row
|
||||||
|
headers rows = map (B.plain . B.str) $ take (length $ rows !! 0) $ repeat ""
|
||||||
|
|
||||||
|
para :: PandocMonad m => TikiWikiParser m B.Blocks
|
||||||
|
para = many1Till inline endOfParaElement >>= return . result . mconcat
|
||||||
|
where
|
||||||
|
endOfParaElement = lookAhead $ endOfInput <|> endOfPara <|> newBlockElement
|
||||||
|
endOfInput = try $ skipMany blankline >> skipSpaces >> eof
|
||||||
|
endOfPara = try $ blankline >> skipMany1 blankline
|
||||||
|
newBlockElement = try $ blankline >> skip blockElements
|
||||||
|
result content = if F.all (==Space) content
|
||||||
|
then mempty
|
||||||
|
else B.para $ B.trimInlines content
|
||||||
|
|
||||||
|
-- ;item 1: definition 1
|
||||||
|
-- ;item 2: definition 2-1
|
||||||
|
-- + definition 2-2
|
||||||
|
-- ;item ''3'': definition ''3''
|
||||||
|
--
|
||||||
|
definitionList :: PandocMonad m => TikiWikiParser m B.Blocks
|
||||||
|
definitionList = tryMsg "definitionList" $ do
|
||||||
|
elements <- many1 $ parseDefinitionListItem
|
||||||
|
return $ B.definitionList elements
|
||||||
|
where
|
||||||
|
parseDefinitionListItem :: PandocMonad m => TikiWikiParser m (B.Inlines, [B.Blocks])
|
||||||
|
parseDefinitionListItem = do
|
||||||
|
skipSpaces >> char ';' <* skipSpaces
|
||||||
|
term <- many1Till inline $ char ':' <* skipSpaces
|
||||||
|
line <- listItemLine 1
|
||||||
|
return $ (mconcat term, [B.plain line])
|
||||||
|
|
||||||
|
data ListType = None | Numbered | Bullet deriving (Ord, Eq, Show)
|
||||||
|
|
||||||
|
data ListNesting = LN { lntype :: ListType, lnnest :: Int } deriving (Ord, Eq, Show)
|
||||||
|
|
||||||
|
-- The first argument is a stack (most recent == head) of our list
|
||||||
|
-- nesting status; the list type and the nesting level; if we're in
|
||||||
|
-- a number list in a bullet list it'd be
|
||||||
|
-- [LN Numbered 2, LN Bullet 1]
|
||||||
|
--
|
||||||
|
-- Mixed list example:
|
||||||
|
--
|
||||||
|
-- # one
|
||||||
|
-- # two
|
||||||
|
-- ** two point one
|
||||||
|
-- ** two point two
|
||||||
|
-- # three
|
||||||
|
-- # four
|
||||||
|
--
|
||||||
|
mixedList :: PandocMonad m => TikiWikiParser m B.Blocks
|
||||||
|
mixedList = try $ do
|
||||||
|
items <- try $ many1 listItem
|
||||||
|
return $ mconcat $ fixListNesting $ spanFoldUpList (LN None 0) items
|
||||||
|
|
||||||
|
-- See the "Handling Lists" section of DESIGN-CODE for why this
|
||||||
|
-- function exists. It's to post-process the lists and do some
|
||||||
|
-- mappends.
|
||||||
|
--
|
||||||
|
-- We need to walk the tree two items at a time, so we can see what
|
||||||
|
-- we're going to join *to* before we get there.
|
||||||
|
--
|
||||||
|
-- Because of that, it seemed easier to do it by hand than to try to
|
||||||
|
-- figre out a fold or something.
|
||||||
|
fixListNesting :: [B.Blocks] -> [B.Blocks]
|
||||||
|
fixListNesting [] = []
|
||||||
|
fixListNesting (first:[]) = [recurseOnList first]
|
||||||
|
-- fixListNesting nestall | trace ("\n\nfixListNesting: " ++ (show nestall)) False = undefined
|
||||||
|
-- fixListNesting nestall@(first:second:rest) =
|
||||||
|
fixListNesting (first:second:rest) =
|
||||||
|
let secondBlock = head $ B.toList second in
|
||||||
|
case secondBlock of
|
||||||
|
BulletList _ -> fixListNesting $ [(mappend (recurseOnList first) (recurseOnList second))] ++ rest
|
||||||
|
OrderedList _ _ -> fixListNesting $ [(mappend (recurseOnList first) (recurseOnList second))] ++ rest
|
||||||
|
_ -> [recurseOnList first] ++ fixListNesting (second:rest)
|
||||||
|
|
||||||
|
-- This function walks the Block structure for fixListNesting,
|
||||||
|
-- because it's a bit complicated, what with converting to and from
|
||||||
|
-- lists and so on.
|
||||||
|
recurseOnList :: B.Blocks -> B.Blocks
|
||||||
|
-- recurseOnList item | trace ("rOL: " ++ (show $ length $ B.toList item) ++ ", " ++ (show $ B.toList item)) False = undefined
|
||||||
|
recurseOnList items
|
||||||
|
| (length $ B.toList items) == 1 =
|
||||||
|
let itemBlock = head $ B.toList items in
|
||||||
|
case itemBlock of
|
||||||
|
BulletList listItems -> B.bulletList $ fixListNesting $ map B.fromList listItems
|
||||||
|
OrderedList _ listItems -> B.orderedList $ fixListNesting $ map B.fromList listItems
|
||||||
|
_ -> items
|
||||||
|
|
||||||
|
-- The otherwise works because we constructed the blocks, and we
|
||||||
|
-- know for a fact that no mappends have been run on them; each
|
||||||
|
-- Blocks consists of exactly one Block.
|
||||||
|
--
|
||||||
|
-- Anything that's not like that has already been processed by
|
||||||
|
-- fixListNesting; don't bother to process it again.
|
||||||
|
| otherwise = items
|
||||||
|
|
||||||
|
|
||||||
|
-- Turn the list if list items into a tree by breaking off the first
|
||||||
|
-- item, splitting the remainder of the list into items that are in
|
||||||
|
-- the tree of the first item and those that aren't, wrapping the
|
||||||
|
-- tree of the first item in its list time, and recursing on both
|
||||||
|
-- sections.
|
||||||
|
spanFoldUpList :: ListNesting -> [(ListNesting, B.Blocks)] -> [B.Blocks]
|
||||||
|
spanFoldUpList _ [] = []
|
||||||
|
spanFoldUpList ln (first:[]) =
|
||||||
|
listWrap ln (fst first) [snd first]
|
||||||
|
spanFoldUpList ln (first:rest) =
|
||||||
|
let (span1, span2) = span (splitListNesting (fst first)) rest
|
||||||
|
newTree1 = listWrap ln (fst first) $ [snd first] ++ spanFoldUpList (fst first) span1
|
||||||
|
newTree2 = spanFoldUpList ln span2
|
||||||
|
in
|
||||||
|
newTree1 ++ newTree2
|
||||||
|
|
||||||
|
-- Decide if the second item should be in the tree of the first
|
||||||
|
-- item, which is true if the second item is at a deeper nesting
|
||||||
|
-- level and of the same type.
|
||||||
|
splitListNesting :: ListNesting -> (ListNesting, B.Blocks) -> Bool
|
||||||
|
splitListNesting ln1 (ln2, _) =
|
||||||
|
if (lnnest ln1) < (lnnest ln2) then
|
||||||
|
True
|
||||||
|
else
|
||||||
|
if ln1 == ln2 then
|
||||||
|
True
|
||||||
|
else
|
||||||
|
False
|
||||||
|
|
||||||
|
-- If we've moved to a deeper nesting level, wrap the new level in
|
||||||
|
-- the appropriate type of list.
|
||||||
|
listWrap :: ListNesting -> ListNesting -> [B.Blocks] -> [B.Blocks]
|
||||||
|
listWrap upperLN curLN retTree =
|
||||||
|
if upperLN == curLN then
|
||||||
|
retTree
|
||||||
|
else
|
||||||
|
case lntype curLN of
|
||||||
|
None -> []
|
||||||
|
Bullet -> [B.bulletList retTree]
|
||||||
|
Numbered -> [B.orderedList retTree]
|
||||||
|
|
||||||
|
listItem :: PandocMonad m => TikiWikiParser m (ListNesting, B.Blocks)
|
||||||
|
listItem = choice [
|
||||||
|
bulletItem
|
||||||
|
, numberedItem
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
|
-- * Start each line
|
||||||
|
-- * with an asterisk (*).
|
||||||
|
-- ** More asterisks gives deeper
|
||||||
|
-- *** and deeper levels.
|
||||||
|
--
|
||||||
|
bulletItem :: PandocMonad m => TikiWikiParser m (ListNesting, B.Blocks)
|
||||||
|
bulletItem = try $ do
|
||||||
|
prefix <- many1 $ char '*'
|
||||||
|
many1 $ char ' '
|
||||||
|
content <- listItemLine (length prefix)
|
||||||
|
return $ (LN Bullet (length prefix), B.plain content)
|
||||||
|
|
||||||
|
-- # Start each line
|
||||||
|
-- # with a number (1.).
|
||||||
|
-- ## More number signs gives deeper
|
||||||
|
-- ### and deeper
|
||||||
|
--
|
||||||
|
numberedItem :: PandocMonad m => TikiWikiParser m (ListNesting, B.Blocks)
|
||||||
|
numberedItem = try $ do
|
||||||
|
prefix <- many1 $ char '#'
|
||||||
|
many1 $ char ' '
|
||||||
|
content <- listItemLine (length prefix)
|
||||||
|
return $ (LN Numbered (length prefix), B.plain content)
|
||||||
|
|
||||||
|
listItemLine :: PandocMonad m => Int -> TikiWikiParser m B.Inlines
|
||||||
|
listItemLine nest = lineContent >>= parseContent >>= return
|
||||||
|
where
|
||||||
|
lineContent = do
|
||||||
|
content <- anyLine
|
||||||
|
continuation <- optionMaybe listContinuation
|
||||||
|
return $ filterSpaces content ++ "\n" ++ (maybe "" id continuation)
|
||||||
|
filterSpaces = reverse . dropWhile (== ' ') . reverse
|
||||||
|
listContinuation = string (take nest (repeat '+')) >> lineContent
|
||||||
|
parseContent x = do
|
||||||
|
parsed <- parseFromString (many1 inline) x
|
||||||
|
return $ mconcat parsed
|
||||||
|
|
||||||
|
-- Turn the CODE macro attributes into Pandoc code block attributes.
|
||||||
|
mungeAttrs :: [(String, String)] -> (String, [String], [(String, String)])
|
||||||
|
mungeAttrs rawAttrs = ("", classes, rawAttrs)
|
||||||
|
where
|
||||||
|
-- "colors" is TikiWiki CODE macro for "name of language to do
|
||||||
|
-- highlighting for"; turn the value into a class
|
||||||
|
color = fromMaybe "" $ lookup "colors" rawAttrs
|
||||||
|
-- ln = 1 means line numbering. It's also the default. So we
|
||||||
|
-- emit numberLines as a class unless ln = 0
|
||||||
|
lnRaw = fromMaybe "1" $ lookup "ln" rawAttrs
|
||||||
|
ln = if lnRaw == "0" then
|
||||||
|
""
|
||||||
|
else
|
||||||
|
"numberLines"
|
||||||
|
classes = filter (/= "") [color, ln]
|
||||||
|
|
||||||
|
codeMacro :: PandocMonad m => TikiWikiParser m B.Blocks
|
||||||
|
codeMacro = try $ do
|
||||||
|
string "{CODE("
|
||||||
|
rawAttrs <- macroAttrs
|
||||||
|
string ")}"
|
||||||
|
body <- manyTill anyChar (try (string "{CODE}"))
|
||||||
|
newline
|
||||||
|
if length rawAttrs > 0
|
||||||
|
then
|
||||||
|
return $ B.codeBlockWith (mungeAttrs rawAttrs) body
|
||||||
|
else
|
||||||
|
return $ B.codeBlock body
|
||||||
|
|
||||||
|
|
||||||
|
--
|
||||||
|
-- inline parsers
|
||||||
|
--
|
||||||
|
|
||||||
|
inline :: PandocMonad m => TikiWikiParser m B.Inlines
|
||||||
|
inline = choice [ whitespace
|
||||||
|
, noparse
|
||||||
|
, strong
|
||||||
|
, emph
|
||||||
|
, nbsp
|
||||||
|
, image
|
||||||
|
, htmlComment
|
||||||
|
, strikeout
|
||||||
|
, code
|
||||||
|
, wikiLink
|
||||||
|
, notExternalLink
|
||||||
|
, externalLink
|
||||||
|
, superTag
|
||||||
|
, superMacro
|
||||||
|
, subTag
|
||||||
|
, subMacro
|
||||||
|
, escapedChar
|
||||||
|
, colored
|
||||||
|
, centered
|
||||||
|
, underlined
|
||||||
|
, boxed
|
||||||
|
, breakChars
|
||||||
|
, str
|
||||||
|
, symbol
|
||||||
|
] <?> "inline"
|
||||||
|
|
||||||
|
whitespace :: PandocMonad m => TikiWikiParser m B.Inlines
|
||||||
|
whitespace = (lb <|> regsp) >>= return
|
||||||
|
where lb = try $ skipMany spaceChar >> linebreak >> return B.space
|
||||||
|
regsp = try $ skipMany1 spaceChar >> return B.space
|
||||||
|
|
||||||
|
-- UNSUPPORTED, as there doesn't seem to be any facility in calibre
|
||||||
|
-- for this
|
||||||
|
nbsp :: PandocMonad m => TikiWikiParser m B.Inlines
|
||||||
|
nbsp = try $ do
|
||||||
|
string "~hs~"
|
||||||
|
return $ B.str " NOT SUPPORTED BEGIN: ~hs~ (non-breaking space) :END "
|
||||||
|
|
||||||
|
-- UNSUPPORTED, as the desired behaviour (that the data be
|
||||||
|
-- *retained* and stored as a comment) doesn't exist in calibre, and
|
||||||
|
-- silently throwing data out seemed bad.
|
||||||
|
htmlComment :: PandocMonad m => TikiWikiParser m B.Inlines
|
||||||
|
htmlComment = try $ do
|
||||||
|
string "~hc~"
|
||||||
|
inner <- many1 $ noneOf "~"
|
||||||
|
string "~/hc~"
|
||||||
|
return $ B.str $ " NOT SUPPORTED: ~hc~ (html comment opener) BEGIN: " ++ inner ++ " ~/hc~ :END "
|
||||||
|
|
||||||
|
linebreak :: PandocMonad m => TikiWikiParser m B.Inlines
|
||||||
|
linebreak = newline >> notFollowedBy newline >> (lastNewline <|> innerNewline)
|
||||||
|
where lastNewline = eof >> return mempty
|
||||||
|
innerNewline = return B.space
|
||||||
|
|
||||||
|
between :: (Monoid c, PandocMonad m, Show b) => TikiWikiParser m a -> TikiWikiParser m b -> (TikiWikiParser m b -> TikiWikiParser m c) -> TikiWikiParser m c
|
||||||
|
between start end p =
|
||||||
|
mconcat <$> try (start >> notFollowedBy whitespace >> many1Till (p end) end)
|
||||||
|
|
||||||
|
enclosed :: (Monoid b, PandocMonad m, Show a) => TikiWikiParser m a -> (TikiWikiParser m a -> TikiWikiParser m b) -> TikiWikiParser m b
|
||||||
|
enclosed sep p = between sep (try $ sep <* endMarker) p
|
||||||
|
where
|
||||||
|
endMarker = lookAhead $ skip endSpace <|> skip (oneOf ".,!?:)|'_") <|> eof
|
||||||
|
endSpace = (spaceChar <|> newline) >> return B.space
|
||||||
|
|
||||||
|
|
||||||
|
nestedInlines :: (Show a, PandocMonad m) => TikiWikiParser m a -> TikiWikiParser m B.Inlines
|
||||||
|
nestedInlines end = innerSpace <|> nestedInline
|
||||||
|
where
|
||||||
|
innerSpace = try $ whitespace <* (notFollowedBy end)
|
||||||
|
nestedInline = notFollowedBy whitespace >> nested inline
|
||||||
|
|
||||||
|
-- {img attId="39" imalign="right" link="http://info.tikiwiki.org" alt="Panama Hat"}
|
||||||
|
--
|
||||||
|
-- {img attId="37", thumb="mouseover", styleimage="border", desc="150"}
|
||||||
|
--
|
||||||
|
-- {img src="img/wiki_up/393px-Pears.jpg" thumb="y" imalign="center" stylebox="border" button="y" desc="Pretty pears" max="200" rel="box"}
|
||||||
|
--
|
||||||
|
image :: PandocMonad m => TikiWikiParser m B.Inlines
|
||||||
|
image = try $ do
|
||||||
|
string "{img "
|
||||||
|
rawAttrs <- sepEndBy1 imageAttr spaces
|
||||||
|
string "}"
|
||||||
|
let src = fromMaybe "" $ lookup "src" rawAttrs
|
||||||
|
let title = fromMaybe src $ lookup "desc" rawAttrs
|
||||||
|
let alt = fromMaybe title $ lookup "alt" rawAttrs
|
||||||
|
let classes = map fst $ filter (\(_,b) -> b == "" || b == "y") rawAttrs
|
||||||
|
if length src > 0
|
||||||
|
then
|
||||||
|
return $ B.imageWith ("", classes, rawAttrs) src title (B.str alt)
|
||||||
|
else
|
||||||
|
return $ B.str $ " NOT SUPPORTED: image without src attribute BEGIN: {img " ++ (printAttrs rawAttrs) ++ "} :END "
|
||||||
|
where
|
||||||
|
printAttrs attrs = intercalate " " $ map (\(a, b) -> a ++ "=\"" ++ b ++ "\"") attrs
|
||||||
|
|
||||||
|
imageAttr :: PandocMonad m => TikiWikiParser m (String, String)
|
||||||
|
imageAttr = try $ do
|
||||||
|
key <- many1 (noneOf "=} \t\n")
|
||||||
|
char '='
|
||||||
|
optional $ char '"'
|
||||||
|
value <- many1 (noneOf "}\"\n")
|
||||||
|
optional $ char '"'
|
||||||
|
optional $ char ','
|
||||||
|
return (key, value)
|
||||||
|
|
||||||
|
|
||||||
|
-- __strong__
|
||||||
|
strong :: PandocMonad m => TikiWikiParser m B.Inlines
|
||||||
|
strong = try $ enclosed (string "__") nestedInlines >>= return . B.strong
|
||||||
|
|
||||||
|
-- ''emph''
|
||||||
|
emph :: PandocMonad m => TikiWikiParser m B.Inlines
|
||||||
|
emph = try $ enclosed (string "''") nestedInlines >>= return . B.emph
|
||||||
|
|
||||||
|
-- ~246~
|
||||||
|
escapedChar :: PandocMonad m => TikiWikiParser m B.Inlines
|
||||||
|
escapedChar = try $ do
|
||||||
|
string "~"
|
||||||
|
inner <- many1 $ oneOf "0123456789"
|
||||||
|
string "~"
|
||||||
|
return $ B.str $ [(toEnum ((read inner) :: Int)) :: Char]
|
||||||
|
|
||||||
|
-- UNSUPPORTED, as there doesn't seem to be any facility in calibre
|
||||||
|
-- for this
|
||||||
|
centered :: PandocMonad m => TikiWikiParser m B.Inlines
|
||||||
|
centered = try $ do
|
||||||
|
string "::"
|
||||||
|
inner <- many1 $ noneOf ":\n"
|
||||||
|
string "::"
|
||||||
|
return $ B.str $ " NOT SUPPORTED: :: (centered) BEGIN: ::" ++ inner ++ ":: :END "
|
||||||
|
|
||||||
|
-- UNSUPPORTED, as there doesn't seem to be any facility in calibre
|
||||||
|
-- for this
|
||||||
|
colored :: PandocMonad m => TikiWikiParser m B.Inlines
|
||||||
|
colored = try $ do
|
||||||
|
string "~~"
|
||||||
|
inner <- many1 $ noneOf "~\n"
|
||||||
|
string "~~"
|
||||||
|
return $ B.str $ " NOT SUPPORTED: ~~ (colored) BEGIN: ~~" ++ inner ++ "~~ :END "
|
||||||
|
|
||||||
|
-- UNSUPPORTED, as there doesn't seem to be any facility in calibre
|
||||||
|
-- for this
|
||||||
|
underlined :: PandocMonad m => TikiWikiParser m B.Inlines
|
||||||
|
underlined = try $ do
|
||||||
|
string "==="
|
||||||
|
inner <- many1 $ noneOf "=\n"
|
||||||
|
string "==="
|
||||||
|
return $ B.str $ " NOT SUPPORTED: ==== (underlined) BEGIN: ===" ++ inner ++ "=== :END "
|
||||||
|
|
||||||
|
-- UNSUPPORTED, as there doesn't seem to be any facility in calibre
|
||||||
|
-- for this
|
||||||
|
boxed :: PandocMonad m => TikiWikiParser m B.Inlines
|
||||||
|
boxed = try $ do
|
||||||
|
string "^"
|
||||||
|
inner <- many1 $ noneOf "^\n"
|
||||||
|
string "^"
|
||||||
|
return $ B.str $ " NOT SUPPORTED: ^ (boxed) BEGIN: ^" ++ inner ++ "^ :END "
|
||||||
|
|
||||||
|
-- --text--
|
||||||
|
strikeout :: PandocMonad m => TikiWikiParser m B.Inlines
|
||||||
|
strikeout = try $ enclosed (string "--") nestedInlines >>= return . B.strikeout
|
||||||
|
|
||||||
|
nestedString :: (Show a, PandocMonad m) => TikiWikiParser m a -> TikiWikiParser m String
|
||||||
|
nestedString end = innerSpace <|> (count 1 nonspaceChar)
|
||||||
|
where
|
||||||
|
innerSpace = try $ many1 spaceChar <* notFollowedBy end
|
||||||
|
|
||||||
|
breakChars :: PandocMonad m => TikiWikiParser m B.Inlines
|
||||||
|
breakChars = try $ string "%%%" >> return B.linebreak
|
||||||
|
|
||||||
|
-- superscript: foo{TAG(tag=>sup)}super{TAG}foo / bar{SUP()}super2{SUP}bar
|
||||||
|
superTag :: PandocMonad m => TikiWikiParser m B.Inlines
|
||||||
|
superTag = try $ between (string "{TAG(tag=>sup)}") (string "{TAG}") nestedString >>= return . B.superscript . B.text . fromEntities
|
||||||
|
|
||||||
|
superMacro :: PandocMonad m => TikiWikiParser m B.Inlines
|
||||||
|
superMacro = try $ do
|
||||||
|
string "{SUP("
|
||||||
|
manyTill anyChar (string ")}")
|
||||||
|
body <- manyTill anyChar (string "{SUP}")
|
||||||
|
return $ B.superscript $ B.text body
|
||||||
|
|
||||||
|
-- subscript: baz{TAG(tag=>sub)}sub{TAG}qux / qux{SUB()}sub2{SUB}qux
|
||||||
|
subTag :: PandocMonad m => TikiWikiParser m B.Inlines
|
||||||
|
subTag = try $ between (string "{TAG(tag=>sub)}") (string "{TAG}") nestedString >>= return . B.subscript . B.text . fromEntities
|
||||||
|
|
||||||
|
subMacro :: PandocMonad m => TikiWikiParser m B.Inlines
|
||||||
|
subMacro = try $ do
|
||||||
|
string "{SUB("
|
||||||
|
manyTill anyChar (string ")}")
|
||||||
|
body <- manyTill anyChar (string "{SUB}")
|
||||||
|
return $ B.subscript $ B.text body
|
||||||
|
|
||||||
|
-- -+text+-
|
||||||
|
code :: PandocMonad m => TikiWikiParser m B.Inlines
|
||||||
|
code = try $ between (string "-+") (string "+-") nestedString >>= return . B.code . fromEntities
|
||||||
|
|
||||||
|
macroAttr :: PandocMonad m => TikiWikiParser m (String, String)
|
||||||
|
macroAttr = try $ do
|
||||||
|
key <- many1 (noneOf "=)")
|
||||||
|
char '='
|
||||||
|
optional $ char '"'
|
||||||
|
value <- many1 (noneOf " )\"")
|
||||||
|
optional $ char '"'
|
||||||
|
return (key, value)
|
||||||
|
|
||||||
|
macroAttrs :: PandocMonad m => TikiWikiParser m [(String, String)]
|
||||||
|
macroAttrs = try $ do
|
||||||
|
attrs <- sepEndBy macroAttr spaces
|
||||||
|
return attrs
|
||||||
|
|
||||||
|
-- ~np~ __not bold__ ~/np~
|
||||||
|
noparse :: PandocMonad m => TikiWikiParser m B.Inlines
|
||||||
|
noparse = try $ do
|
||||||
|
string "~np~"
|
||||||
|
body <- manyTill anyChar (string "~/np~")
|
||||||
|
return $ B.str body
|
||||||
|
|
||||||
|
str :: PandocMonad m => TikiWikiParser m B.Inlines
|
||||||
|
str = (many1 alphaNum <|> count 1 characterReference) >>= return . B.str
|
||||||
|
|
||||||
|
symbol :: PandocMonad m => TikiWikiParser m B.Inlines
|
||||||
|
symbol = count 1 nonspaceChar >>= return . B.str
|
||||||
|
|
||||||
|
-- [[not a link]
|
||||||
|
notExternalLink :: PandocMonad m => TikiWikiParser m B.Inlines
|
||||||
|
notExternalLink = try $ do
|
||||||
|
start <- string "[["
|
||||||
|
body <- many (noneOf "\n[]")
|
||||||
|
end <- string "]"
|
||||||
|
return $ B.text (start ++ body ++ end)
|
||||||
|
|
||||||
|
-- [http://www.somesite.org url|Some Site title]
|
||||||
|
-- ((internal link))
|
||||||
|
--
|
||||||
|
-- The ((...)) wiki links and [...] external links are handled
|
||||||
|
-- exactly the same; this abstracts that out
|
||||||
|
makeLink :: PandocMonad m => String -> String -> String -> TikiWikiParser m B.Inlines
|
||||||
|
makeLink start middle end = try $ do
|
||||||
|
st <- getState
|
||||||
|
guard $ stateAllowLinks st
|
||||||
|
setState $ st{ stateAllowLinks = False }
|
||||||
|
(url, title, anchor) <- wikiLinkText start middle end
|
||||||
|
parsedTitle <- parseFromString (many1 inline) title
|
||||||
|
setState $ st{ stateAllowLinks = True }
|
||||||
|
return $ B.link (url++anchor) "" $ mconcat $ parsedTitle
|
||||||
|
|
||||||
|
wikiLinkText :: PandocMonad m => String -> String -> String -> TikiWikiParser m (String, String, String)
|
||||||
|
wikiLinkText start middle end = do
|
||||||
|
string start
|
||||||
|
url <- many1 (noneOf $ middle ++ "\n")
|
||||||
|
seg1 <- option url linkContent
|
||||||
|
seg2 <- option "" linkContent
|
||||||
|
string end
|
||||||
|
if seg2 /= ""
|
||||||
|
then
|
||||||
|
return (url, seg2, seg1)
|
||||||
|
else
|
||||||
|
return (url, seg1, "")
|
||||||
|
where
|
||||||
|
linkContent = do
|
||||||
|
(char '|')
|
||||||
|
mystr <- many (noneOf middle)
|
||||||
|
return $ mystr
|
||||||
|
|
||||||
|
externalLink :: PandocMonad m => TikiWikiParser m B.Inlines
|
||||||
|
externalLink = makeLink "[" "]|" "]"
|
||||||
|
|
||||||
|
-- NB: this wiki linking is unlikely to work for anyone besides me
|
||||||
|
-- (rlpowell); it happens to work for me because my Hakyll code has
|
||||||
|
-- post-processing that treats pandoc .md titles as valid link
|
||||||
|
-- targets, so something like
|
||||||
|
-- [see also this other post](My Other Page) is perfectly valid.
|
||||||
|
wikiLink :: PandocMonad m => TikiWikiParser m B.Inlines
|
||||||
|
wikiLink = makeLink "((" ")|" "))"
|
||||||
|
|
||||||
|
|
@ -137,6 +137,9 @@ tests = [ testGroup "markdown"
|
||||||
, testGroup "twiki"
|
, testGroup "twiki"
|
||||||
[ test "reader" ["-r", "twiki", "-w", "native", "-s"]
|
[ test "reader" ["-r", "twiki", "-w", "native", "-s"]
|
||||||
"twiki-reader.twiki" "twiki-reader.native" ]
|
"twiki-reader.twiki" "twiki-reader.native" ]
|
||||||
|
, testGroup "tikiwiki"
|
||||||
|
[ test "reader" ["-r", "tikiwiki", "-w", "native", "-s"]
|
||||||
|
"tikiwiki-reader.tikiwiki" "tikiwiki-reader.native" ]
|
||||||
, testGroup "other writers" $ map (\f -> testGroup f $ writerTests f)
|
, testGroup "other writers" $ map (\f -> testGroup f $ writerTests f)
|
||||||
[ "opendocument" , "context" , "texinfo", "icml", "tei"
|
[ "opendocument" , "context" , "texinfo", "icml", "tei"
|
||||||
, "man" , "plain" , "rtf", "org", "asciidoc", "zimwiki"
|
, "man" , "plain" , "rtf", "org", "asciidoc", "zimwiki"
|
||||||
|
|
|
||||||
130
test/tikiwiki-reader.native
Normal file
130
test/tikiwiki-reader.native
Normal file
|
|
@ -0,0 +1,130 @@
|
||||||
|
Pandoc (Meta {unMeta = fromList []})
|
||||||
|
[Header 1 ("header",[],[]) [Str "header"]
|
||||||
|
,Header 2 ("header-level-two",[],[]) [Str "header",Space,Str "level",Space,Str "two"]
|
||||||
|
,Header 3 ("header-level-3",[],[]) [Str "header",Space,Str "level",Space,Str "3"]
|
||||||
|
,Header 4 ("header-_level_-four",[],[]) [Str "header",Space,Str "_level_",Space,Str "four"]
|
||||||
|
,Header 5 ("header-level-5",[],[]) [Str "header",Space,Str "level",Space,Str "5"]
|
||||||
|
,Header 6 ("header-level-6",[],[]) [Str "header",Space,Str "level",Space,Str "6"]
|
||||||
|
,Para [Str "!!!!!!!",Space,Str "not",Space,Str "a",Space,Str "header"]
|
||||||
|
,Para [Str "--++",Space,Str "not",Space,Str "a",Space,Str "header"]
|
||||||
|
,Header 1 ("emph-and-strong",[],[]) [Str "emph",Space,Str "and",Space,Str "strong"]
|
||||||
|
,Para [Emph [Str "emph"],Space,Strong [Str "strong"]]
|
||||||
|
,Para [Emph [Strong [Str "strong",Space,Str "and",Space,Str "emph",Space,Str "1"]]]
|
||||||
|
,Para [Strong [Emph [Str "strong",Space,Str "and",Space,Str "emph",Space,Str "2"]]]
|
||||||
|
,Para [Strong [Emph [Str "emph",Space,Str "inside"],Space,Str "strong"]]
|
||||||
|
,Para [Strong [Str "strong",Space,Str "with",Space,Emph [Str "emph"]]]
|
||||||
|
,Para [Emph [Strong [Str "strong",Space,Str "inside"],Space,Str "emph"]]
|
||||||
|
,Header 1 ("horizontal-rule",[],[]) [Str "horizontal",Space,Str "rule"]
|
||||||
|
,Para [Str "top"]
|
||||||
|
,HorizontalRule
|
||||||
|
,Para [Str "bottom"]
|
||||||
|
,HorizontalRule
|
||||||
|
,Header 1 ("nop",[],[]) [Str "nop"]
|
||||||
|
,Para [Str "__not emph__"]
|
||||||
|
,Header 1 ("entities",[],[]) [Str "entities"]
|
||||||
|
,Para [Str "hi",Space,Str "&",Space,Str "low"]
|
||||||
|
,Para [Str "hi",Space,Str "&",Space,Str "low"]
|
||||||
|
,Para [Str "G\246del"]
|
||||||
|
,Para [Str "\777\2730"]
|
||||||
|
,Header 1 ("linebreaks",[],[]) [Str "linebreaks"]
|
||||||
|
,Para [Str "hi",LineBreak,Str "there"]
|
||||||
|
,Para [Str "hi",LineBreak,Str "there"]
|
||||||
|
,Header 1 ("inline-code",[],[]) [Str "inline",Space,Str "code"]
|
||||||
|
,Para [Code ("",[],[]) "*\8594*",Space,Code ("",[],[]) "typed",Space,Code ("",[],[]) ">>="]
|
||||||
|
,Header 1 ("code-blocks",[],[]) [Str "code",Space,Str "blocks"]
|
||||||
|
,CodeBlock ("",[],[]) "\ncase xs of\n (_:_) -> reverse xs\n [] -> ['*']\n"
|
||||||
|
,CodeBlock ("",["haskell"],[("colors","haskell"),("ln","0")]) "\ncase xs of\n (_:_) -> reverse xs\n [] -> ['*']\n"
|
||||||
|
,Header 1 ("external-links",[],[]) [Str "external",Space,Str "links"]
|
||||||
|
,Para [Link ("",[],[]) [Emph [Str "Google"],Space,Str "search",Space,Str "engine"] ("http://google.com","")]
|
||||||
|
,Para [Link ("",[],[]) [Str "http://pandoc.org"] ("http://pandoc.org","")]
|
||||||
|
,Para [Link ("",[],[]) [Str "http://google.com"] ("http://google.com",""),Space,Link ("",[],[]) [Str "http://yahoo.com"] ("http://yahoo.com","")]
|
||||||
|
,Para [Link ("",[],[]) [Str "email",Space,Str "me"] ("mailto:info@example.org","")]
|
||||||
|
,Para [Str "http://google.com"]
|
||||||
|
,Para [Str "info@example.org"]
|
||||||
|
,Header 1 ("lists",[],[]) [Str "lists"]
|
||||||
|
,BulletList
|
||||||
|
[[Plain [Str "Start",Space,Str "each",Space,Str "line",Space]]
|
||||||
|
,[Plain [Str "with",Space,Str "an",Space,Str "asterisk",Space,Str "(*).",Space]
|
||||||
|
,BulletList
|
||||||
|
[[Plain [Str "More",Space,Str "asterisks",Space,Str "gives",Space,Str "deeper",Space]
|
||||||
|
,BulletList
|
||||||
|
[[Plain [Str "and",Space,Str "deeper",Space,Str "levels.",Space]]]]]]
|
||||||
|
,[Plain [Str "Line",Space,Str "breaks",LineBreak,Str "don't",Space,Str "break",Space,Str "levels.",Space]]
|
||||||
|
,[Plain [Str "Continuations",Space,Str "are",Space,Str "also",Space,Str "possible",Space]
|
||||||
|
,BulletList
|
||||||
|
[[Plain [Str "and",Space,Str "do",Space,Str "not",Space,Str "break",Space,Str "the",Space,Str "list",Space,Str "flow",Space]]]]
|
||||||
|
,[Plain [Str "Level",Space,Str "one",Space]]]
|
||||||
|
,Para [Str "Any",Space,Str "other",Space,Str "start",Space,Str "ends",Space,Str "the",Space,Str "list."]
|
||||||
|
,OrderedList (1,DefaultStyle,DefaultDelim)
|
||||||
|
[[Plain [Str "Start",Space,Str "each",Space,Str "line",Space]]
|
||||||
|
,[Plain [Str "with",Space,Str "a",Space,Str "number",Space,Str "(1.).",Space]
|
||||||
|
,OrderedList (1,DefaultStyle,DefaultDelim)
|
||||||
|
[[Plain [Str "More",Space,Str "number",Space,Str "signs",Space,Str "gives",Space,Str "deeper",Space]
|
||||||
|
,OrderedList (1,DefaultStyle,DefaultDelim)
|
||||||
|
[[Plain [Str "and",Space,Str "deeper",Space]]
|
||||||
|
,[Plain [Str "levels.",Space]]]]]]
|
||||||
|
,[Plain [Str "Line",Space,Str "breaks",LineBreak,Str "don't",Space,Str "break",Space,Str "levels.",Space]]
|
||||||
|
,[Plain [Str "Blank",Space,Str "lines",Space]]]
|
||||||
|
,OrderedList (1,DefaultStyle,DefaultDelim)
|
||||||
|
[[Plain [Str "end",Space,Str "the",Space,Str "list",Space,Str "and",Space,Str "start",Space,Str "another.",Space]]]
|
||||||
|
,Para [Str "Any",Space,Str "other",Space,Str "start",Space,Str "also",Space,Str "ends",Space,Str "the",Space,Str "list."]
|
||||||
|
,DefinitionList
|
||||||
|
[([Str "item",Space,Str "1"],
|
||||||
|
[[Plain [Str "definition",Space,Str "1",Space]]])
|
||||||
|
,([Str "item",Space,Str "2"],
|
||||||
|
[[Plain [Str "definition",Space,Str "2-1",Space,Str "definition",Space,Str "2-2",Space]]])
|
||||||
|
,([Str "item",Space,Emph [Str "3"]],
|
||||||
|
[[Plain [Str "definition",Space,Emph [Str "3"],Space]]])]
|
||||||
|
,OrderedList (1,DefaultStyle,DefaultDelim)
|
||||||
|
[[Plain [Str "one",Space]]
|
||||||
|
,[Plain [Str "two",Space]
|
||||||
|
,BulletList
|
||||||
|
[[Plain [Str "two",Space,Str "point",Space,Str "one",Space]]
|
||||||
|
,[Plain [Str "two",Space,Str "point",Space,Str "two",Space]]]]
|
||||||
|
,[Plain [Str "three",Space]]
|
||||||
|
,[Plain [Str "four",Space]]
|
||||||
|
,[Plain [Str "five",Space]
|
||||||
|
,OrderedList (1,DefaultStyle,DefaultDelim)
|
||||||
|
[[Plain [Str "five",Space,Str "sub",Space,Str "1",Space]
|
||||||
|
,OrderedList (1,DefaultStyle,DefaultDelim)
|
||||||
|
[[Plain [Str "five",Space,Str "sub",Space,Str "1",Space,Str "sub",Space,Str "1",Space]]]]
|
||||||
|
,[Plain [Str "five",Space,Str "sub",Space,Str "2",Space]]]]]
|
||||||
|
,Header 1 ("tables",[],[]) [Str "tables"]
|
||||||
|
,Table [] [AlignDefault,AlignDefault] [0.0,0.0]
|
||||||
|
[[Plain [Str ""]]
|
||||||
|
,[Plain [Str ""]]]
|
||||||
|
[[[Plain [Str "Orange"]]
|
||||||
|
,[Plain [Str "Apple"]]]
|
||||||
|
,[[Plain [Str "Bread"]]
|
||||||
|
,[Plain [Str "Pie"]]]
|
||||||
|
,[[Plain [Str "Butter"]]
|
||||||
|
,[Plain [Str "Ice",Space,Str "cream"]]]]
|
||||||
|
,Table [] [AlignDefault,AlignDefault] [0.0,0.0]
|
||||||
|
[[Plain [Str ""]]
|
||||||
|
,[Plain [Str ""]]]
|
||||||
|
[[[Plain [Str "Orange"]]
|
||||||
|
,[Plain [Str "Apple"]]]
|
||||||
|
,[[Plain [Str "Bread"]]
|
||||||
|
,[Plain [Str "Pie"]]]
|
||||||
|
,[[Plain [Strong [Str "Butter"]]]
|
||||||
|
,[Plain [Str "Ice",Space,Str "cream"]]]]
|
||||||
|
,Table [] [AlignDefault,AlignDefault] [0.0,0.0]
|
||||||
|
[[Plain [Str ""]]
|
||||||
|
,[Plain [Str ""]]]
|
||||||
|
[[[Plain [Str "Orange"]]
|
||||||
|
,[Plain [Str "Apple"]]]
|
||||||
|
,[[Plain [Str "Bread",LineBreak,LineBreak,Str "and",Space,Str "cheese"]]
|
||||||
|
,[Plain [Str "Pie",LineBreak,LineBreak,Strong [Str "apple"],Space,Str "and",Space,Emph [Str "carrot"],Space]]]]
|
||||||
|
,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]
|
||||||
|
[[Plain [Str ""]]
|
||||||
|
,[Plain [Str ""]]
|
||||||
|
,[Plain [Str ""]]]
|
||||||
|
[[[Plain [Space,Str "Orange",Space]]
|
||||||
|
,[Plain [Space,Str "Apple",Space]]
|
||||||
|
,[Plain [Space,Str "more"]]]
|
||||||
|
,[[Plain [Space,Str "Bread",Space]]
|
||||||
|
,[Plain [Space,Str "Pie",Space]]
|
||||||
|
,[Plain [Space,Str "more"]]]
|
||||||
|
,[[Plain [Space,Str "Butter",Space]]
|
||||||
|
,[Plain [Space,Str "Ice",Space,Str "cream",Space]]
|
||||||
|
,[Plain [Space,Str "and",Space,Str "more",Space]]]]]
|
||||||
148
test/tikiwiki-reader.tikiwiki
Normal file
148
test/tikiwiki-reader.tikiwiki
Normal file
|
|
@ -0,0 +1,148 @@
|
||||||
|
! header
|
||||||
|
|
||||||
|
!! header level two
|
||||||
|
|
||||||
|
!!! header level 3
|
||||||
|
|
||||||
|
!!!! header _level_ four
|
||||||
|
|
||||||
|
!!!!! header level 5
|
||||||
|
|
||||||
|
!!!!!! header level 6
|
||||||
|
|
||||||
|
!!!!!!! not a header
|
||||||
|
|
||||||
|
--++ not a header
|
||||||
|
|
||||||
|
! emph and strong
|
||||||
|
|
||||||
|
''emph'' __strong__
|
||||||
|
|
||||||
|
''__strong and emph 1__''
|
||||||
|
|
||||||
|
__''strong and emph 2''__
|
||||||
|
|
||||||
|
__''emph inside'' strong__
|
||||||
|
|
||||||
|
__strong with ''emph''__
|
||||||
|
|
||||||
|
''__strong inside__ emph''
|
||||||
|
|
||||||
|
! horizontal rule
|
||||||
|
|
||||||
|
top
|
||||||
|
----
|
||||||
|
bottom
|
||||||
|
|
||||||
|
----
|
||||||
|
|
||||||
|
! nop
|
||||||
|
|
||||||
|
~np~__not emph__~/np~
|
||||||
|
|
||||||
|
! entities
|
||||||
|
|
||||||
|
hi & low
|
||||||
|
|
||||||
|
hi & low
|
||||||
|
|
||||||
|
Gödel
|
||||||
|
|
||||||
|
̉પ
|
||||||
|
|
||||||
|
! linebreaks
|
||||||
|
|
||||||
|
hi%%%there
|
||||||
|
|
||||||
|
hi%%%
|
||||||
|
there
|
||||||
|
|
||||||
|
! inline code
|
||||||
|
|
||||||
|
-+*→*+- -+typed+- -+>>=+-
|
||||||
|
|
||||||
|
! code blocks
|
||||||
|
|
||||||
|
{CODE()}
|
||||||
|
case xs of
|
||||||
|
(_:_) -> reverse xs
|
||||||
|
[] -> ['*']
|
||||||
|
{CODE}
|
||||||
|
|
||||||
|
{CODE(colors="haskell" ln=0)}
|
||||||
|
case xs of
|
||||||
|
(_:_) -> reverse xs
|
||||||
|
[] -> ['*']
|
||||||
|
{CODE}
|
||||||
|
|
||||||
|
! external links
|
||||||
|
|
||||||
|
[http://google.com|''Google'' search engine]
|
||||||
|
|
||||||
|
[http://pandoc.org]
|
||||||
|
|
||||||
|
[http://google.com] [http://yahoo.com]
|
||||||
|
|
||||||
|
[mailto:info@example.org|email me]
|
||||||
|
|
||||||
|
http://google.com
|
||||||
|
|
||||||
|
info@example.org
|
||||||
|
|
||||||
|
! lists
|
||||||
|
|
||||||
|
* Start each line
|
||||||
|
* with an asterisk (*).
|
||||||
|
** More asterisks gives deeper
|
||||||
|
*** and deeper levels.
|
||||||
|
* Line breaks%%%don't break levels.
|
||||||
|
* Continuations
|
||||||
|
+ are also possible
|
||||||
|
** and do not break the list flow
|
||||||
|
* Level one
|
||||||
|
Any other start ends the list.
|
||||||
|
|
||||||
|
# Start each line
|
||||||
|
# with a number (1.).
|
||||||
|
## More number signs gives deeper
|
||||||
|
### and deeper
|
||||||
|
### levels.
|
||||||
|
# Line breaks%%%don't break levels.
|
||||||
|
# Blank lines
|
||||||
|
|
||||||
|
# end the list and start another.
|
||||||
|
Any other start also
|
||||||
|
ends the list.
|
||||||
|
|
||||||
|
;item 1: definition 1
|
||||||
|
;item 2: definition 2-1
|
||||||
|
+ definition 2-2
|
||||||
|
;item ''3'': definition ''3''
|
||||||
|
|
||||||
|
# one
|
||||||
|
# two
|
||||||
|
** two point one
|
||||||
|
** two point two
|
||||||
|
# three
|
||||||
|
# four
|
||||||
|
# five
|
||||||
|
## five sub 1
|
||||||
|
### five sub 1 sub 1
|
||||||
|
## five sub 2
|
||||||
|
|
||||||
|
! tables
|
||||||
|
|
||||||
|
||Orange|Apple
|
||||||
|
Bread|Pie
|
||||||
|
Butter|Ice cream||
|
||||||
|
|
||||||
|
||Orange|Apple
|
||||||
|
Bread|Pie
|
||||||
|
__Butter__|Ice cream||
|
||||||
|
|
||||||
|
||Orange|Apple
|
||||||
|
Bread%%%%%%and cheese|Pie%%%%%%__apple__ and ''carrot'' ||
|
||||||
|
|
||||||
|
|| Orange | Apple | more
|
||||||
|
Bread | Pie | more
|
||||||
|
Butter | Ice cream | and more ||
|
||||||
Loading…
Reference in a new issue