diff --git a/data/templates b/data/templates
index 25f999ad5..7ac22fea6 160000
--- a/data/templates
+++ b/data/templates
@@ -1 +1 @@
-Subproject commit 25f999ad52d110575590ba900c33b48486e9ac25
+Subproject commit 7ac22fea6399ce6fdac093fa9d163d09fc28d440
diff --git a/pandoc.cabal b/pandoc.cabal
index ff142f304..7e8a87b23 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -38,22 +38,30 @@ Description: Pandoc is a Haskell library for converting from one markup
only adding a reader or writer.
Data-Files:
-- templates
- data/templates/default.html, data/templates/default.html5,
- data/templates/default.docbook, data/templates/default.beamer,
+ data/templates/default.html,
+ data/templates/default.html5,
+ data/templates/default.docbook,
+ data/templates/default.beamer,
data/templates/default.opendocument,
+ data/templates/default.opml,
data/templates/default.latex,
data/templates/default.context,
data/templates/default.texinfo,
data/templates/default.man,
data/templates/default.markdown,
- data/templates/default.rst, data/templates/default.plain,
- data/templates/default.mediawiki, data/templates/default.rtf,
- data/templates/default.s5, data/templates/default.slidy,
+ data/templates/default.rst,
+ data/templates/default.plain,
+ data/templates/default.mediawiki,
+ data/templates/default.rtf,
+ data/templates/default.s5,
+ data/templates/default.slidy,
data/templates/default.slideous,
data/templates/default.dzslides,
data/templates/default.asciidoc,
- data/templates/default.textile, data/templates/default.org,
- data/templates/default.epub, data/templates/default.epub3,
+ data/templates/default.textile,
+ data/templates/default.org,
+ data/templates/default.epub,
+ data/templates/default.epub3,
-- data for ODT writer
data/reference.odt,
-- data for docx writer
@@ -172,6 +180,7 @@ Extra-Source-Files:
tests/writer.rtf,
tests/writer.texinfo,
tests/writer.fb2,
+ tests/writer.opml,
tests/lhs-test.native,
tests/lhs-test-markdown.native,
tests/lhs-test.markdown,
diff --git a/src/Text/Pandoc/Writers/OPML.hs b/src/Text/Pandoc/Writers/OPML.hs
index d6c0aa21a..f7eb9289a 100644
--- a/src/Text/Pandoc/Writers/OPML.hs
+++ b/src/Text/Pandoc/Writers/OPML.hs
@@ -37,19 +37,20 @@ import Text.Pandoc.Writers.HTML (writeHtmlString)
import Text.Pandoc.Writers.Markdown (writeMarkdown)
import Data.List ( intercalate )
import Text.Pandoc.Pretty
+import Data.Time
+import System.Locale (defaultTimeLocale)
-- | Convert Pandoc document to string in OPML format.
writeOPML :: WriterOptions -> Pandoc -> String
writeOPML opts (Pandoc (Meta tit auths dat) blocks) =
let title = writeHtmlInlines tit
author = writeHtmlInlines $ intercalate [Space,Str ";",Space] auths
- date = trim $ writeHtmlInlines dat
+ date = convertDate dat
elements = hierarchicalize blocks
colwidth = if writerWrapText opts
then Just $ writerColumns opts
else Nothing
- render' = render colwidth
- main = render' $ vcat (map (elementToOPML opts) elements)
+ main = render colwidth $ vcat (map (elementToOPML opts) elements)
context = writerVariables opts ++
[ ("body", main)
, ("title", title)
@@ -63,6 +64,14 @@ writeHtmlInlines :: [Inline] -> String
writeHtmlInlines ils = trim $ writeHtmlString def
$ Pandoc (Meta [] [] []) [Plain ils]
+-- date format: RFC 822: Thu, 14 Jul 2005 23:41:05 GMT
+showDateTimeRFC822 :: UTCTime -> String
+showDateTimeRFC822 = formatTime defaultTimeLocale "%a, %d %b %Y %X %Z"
+
+convertDate :: [Inline] -> String
+convertDate ils = maybe "" showDateTimeRFC822
+ $ parseTime defaultTimeLocale "%F" =<< (normalizeDate $ stringify ils)
+
-- | Convert an Element to OPML.
elementToOPML :: WriterOptions -> Element -> Doc
elementToOPML _ (Blk _) = empty
@@ -73,7 +82,7 @@ elementToOPML opts (Sec _ _num _ title elements) =
fromBlk _ = error "fromBlk called on non-block"
(blocks, rest) = span isBlk elements
attrs = [("text", writeHtmlInlines title)] ++
- [("_note", writeMarkdown opts (Pandoc (Meta [] [] [])
+ [("_note", writeMarkdown def (Pandoc (Meta [] [] [])
(map fromBlk blocks)))
| not (null blocks)]
in inTags True "outline" attrs $
diff --git a/tests/Tests/Old.hs b/tests/Tests/Old.hs
index c22fa9830..45c430c33 100644
--- a/tests/Tests/Old.hs
+++ b/tests/Tests/Old.hs
@@ -125,7 +125,9 @@ tests = [ testGroup "markdown"
"mediawiki-reader.wiki" "mediawiki-reader.native"
]
, testGroup "opml"
- [ test "reader" ["-r", "opml", "-w", "native", "-s"]
+ [ test "basic" ["-r", "native", "-w", "opml", "--columns=78", "-s"]
+ "testsuite.native" "writer.opml"
+ , test "reader" ["-r", "opml", "-w", "native", "-s"]
"opml-reader.opml" "opml-reader.native"
]
, testGroup "other writers" $ map (\f -> testGroup f $ writerTests f)
diff --git a/tests/opml-reader.native b/tests/opml-reader.native
index 8a627c025..ddcb6d8d2 100644
--- a/tests/opml-reader.native
+++ b/tests/opml-reader.native
@@ -1,4 +1,4 @@
-Pandoc (Meta {docTitle = [Str "states.opml"], docAuthors = [[Str "Dave",Space,Str "Winer"]], docDate = [Str "Thu,",Space,Str "14",Space,Str "Jul",Space,Str "2005",Space,Str "23:41:05",Space,Str "GMT"]})
+Pandoc (Meta {docTitle = [Str "States"], docAuthors = [[Str "Dave",Space,Str "Winer"]], docDate = [Str "Thu,",Space,Str "14",Space,Str "Jul",Space,Str "2005",Space,Str "23:41:05",Space,Str "GMT"]})
[Header 1 ("",[],[]) [Str "United",Space,Str "States"]
,Header 2 ("",[],[]) [Str "Far",Space,Str "West"]
,Header 3 ("",[],[]) [Str "Alaska"]
diff --git a/tests/opml-reader.opml b/tests/opml-reader.opml
index 54dd592ea..18436e675 100644
--- a/tests/opml-reader.opml
+++ b/tests/opml-reader.opml
@@ -1,91 +1,83 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<opml version="2.0">
- <head>
- <title>states.opml</title>
- <dateCreated>Tue, 15 Mar 2005 16:35:45 GMT</dateCreated>
- <dateModified>Thu, 14 Jul 2005 23:41:05 GMT</dateModified>
- <ownerName>Dave Winer</ownerName>
- <ownerEmail>dave@scripting.com</ownerEmail>
- <expansionState>1, 6, 13, 16, 18, 20</expansionState>
- <vertScrollState>1</vertScrollState>
- <windowTop>106</windowTop>
- <windowLeft>106</windowLeft>
- <windowBottom>558</windowBottom>
- <windowRight>479</windowRight>
- </head>
- <body>
- <outline text="United States">
- <outline text="Far West">
- <outline text="Alaska"/>
- <outline text="California"/>
- <outline text="Hawaii"/>
- <outline text="<strong>Nevada</strong>" _note="I lived here *once*. Loved it.">
- <outline text="Reno" created="Tue, 12 Jul 2005 23:56:35 GMT" type="link" url="http://www.reno.gov"/>
- <outline text="Las Vegas" created="Tue, 12 Jul 2005 23:56:37 GMT"/>
- <outline text="Ely" created="Tue, 12 Jul 2005 23:56:39 GMT"/>
- <outline text="Gerlach" created="Tue, 12 Jul 2005 23:56:47 GMT"/>
- </outline>
- <outline text="Oregon"/>
- <outline text="Washington"/>
- </outline>
- <outline text="Great Plains">
- <outline text="Kansas"/>
- <outline text="Nebraska"/>
- <outline text="North Dakota"/>
- <outline text="Oklahoma"/>
- <outline text="South Dakota"/>
- </outline>
- <outline text="Mid-Atlantic">
- <outline text="Delaware"/>
- <outline text="Maryland"/>
- <outline text="New Jersey"/>
- <outline text="New York"/>
- <outline text="Pennsylvania"/>
- </outline>
- <outline text="Midwest">
- <outline text="Illinois"/>
- <outline text="Indiana"/>
- <outline text="Iowa"/>
- <outline text="Kentucky"/>
- <outline text="Michigan"/>
- <outline text="Minnesota"/>
- <outline text="Missouri"/>
- <outline text="Ohio"/>
- <outline text="West Virginia"/>
- <outline text="Wisconsin"/>
- </outline>
- <outline text="Mountains">
- <outline text="Colorado"/>
- <outline text="Idaho"/>
- <outline text="Montana"/>
- <outline text="Utah"/>
- <outline text="Wyoming"/>
- </outline>
- <outline text="New England">
- <outline text="Connecticut"/>
- <outline text="Maine"/>
- <outline text="Massachusetts"/>
- <outline text="New Hampshire"/>
- <outline text="Rhode Island"/>
- <outline text="Vermont"/>
- </outline>
- <outline text="South">
- <outline text="Alabama"/>
- <outline text="Arkansas"/>
- <outline text="Florida"/>
- <outline text="Georgia"/>
- <outline text="Louisiana"/>
- <outline text="Mississippi"/>
- <outline text="North Carolina"/>
- <outline text="South Carolina"/>
- <outline text="Tennessee"/>
- <outline text="Virginia"/>
- </outline>
- <outline text="Southwest">
- <outline text="Arizona"/>
- <outline text="New Mexico"/>
- <outline text="Texas"/>
- </outline>
- </outline>
- </body>
- </opml>
+ <head>
+ <title>States</title>
+ <dateModified>Thu, 14 Jul 2005 23:41:05 GMT</dateModified>
+ <ownerName>Dave Winer</ownerName>
+ </head>
+ <body>
+ <outline text="United States">
+ <outline text="Far West">
+ <outline text="Alaska"/>
+ <outline text="California"/>
+ <outline text="Hawaii"/>
+ <outline text="<strong>Nevada</strong>" _note="I lived here *once*. Loved it.">
+ <outline text="Reno" created="Tue, 12 Jul 2005 23:56:35 GMT" type="link" url="http://www.reno.gov"/>
+ <outline text="Las Vegas" created="Tue, 12 Jul 2005 23:56:37 GMT"/>
+ <outline text="Ely" created="Tue, 12 Jul 2005 23:56:39 GMT"/>
+ <outline text="Gerlach" created="Tue, 12 Jul 2005 23:56:47 GMT"/>
+ </outline>
+ <outline text="Oregon"/>
+ <outline text="Washington"/>
+ </outline>
+ <outline text="Great Plains">
+ <outline text="Kansas"/>
+ <outline text="Nebraska"/>
+ <outline text="North Dakota"/>
+ <outline text="Oklahoma"/>
+ <outline text="South Dakota"/>
+ </outline>
+ <outline text="Mid-Atlantic">
+ <outline text="Delaware"/>
+ <outline text="Maryland"/>
+ <outline text="New Jersey"/>
+ <outline text="New York"/>
+ <outline text="Pennsylvania"/>
+ </outline>
+ <outline text="Midwest">
+ <outline text="Illinois"/>
+ <outline text="Indiana"/>
+ <outline text="Iowa"/>
+ <outline text="Kentucky"/>
+ <outline text="Michigan"/>
+ <outline text="Minnesota"/>
+ <outline text="Missouri"/>
+ <outline text="Ohio"/>
+ <outline text="West Virginia"/>
+ <outline text="Wisconsin"/>
+ </outline>
+ <outline text="Mountains">
+ <outline text="Colorado"/>
+ <outline text="Idaho"/>
+ <outline text="Montana"/>
+ <outline text="Utah"/>
+ <outline text="Wyoming"/>
+ </outline>
+ <outline text="New England">
+ <outline text="Connecticut"/>
+ <outline text="Maine"/>
+ <outline text="Massachusetts"/>
+ <outline text="New Hampshire"/>
+ <outline text="Rhode Island"/>
+ <outline text="Vermont"/>
+ </outline>
+ <outline text="South">
+ <outline text="Alabama"/>
+ <outline text="Arkansas"/>
+ <outline text="Florida"/>
+ <outline text="Georgia"/>
+ <outline text="Louisiana"/>
+ <outline text="Mississippi"/>
+ <outline text="North Carolina"/>
+ <outline text="South Carolina"/>
+ <outline text="Tennessee"/>
+ <outline text="Virginia"/>
+ </outline>
+ <outline text="Southwest">
+ <outline text="Arizona"/>
+ <outline text="New Mexico"/>
+ <outline text="Texas"/>
+ </outline>
+ </outline>
+ </body>
+</opml>
diff --git a/tests/writer.opml b/tests/writer.opml
new file mode 100644
index 000000000..08d2a84ec
--- /dev/null
+++ b/tests/writer.opml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<opml version="2.0">
+ <head>
+ <title>Pandoc Test Suite</title>
+ <dateModified>Mon, 17 Jul 2006 00:00:00 UTC</dateModified>
+ <ownerName>John MacFarlane ; Anonymous</ownerName>
+ </head>
+ <body>
+<outline text="Headers">
+ <outline text="Level 2 with an <a href="/url">embedded link</a>">
+ <outline text="Level 3 with <em>emphasis</em>">
+ <outline text="Level 4">
+ <outline text="Level 5">
+ </outline>
+ </outline>
+ </outline>
+ </outline>
+</outline>
+<outline text="Level 1">
+ <outline text="Level 2 with <em>emphasis</em>">
+ <outline text="Level 3" _note="with no blank line">
+ </outline>
+ </outline>
+ <outline text="Level 2" _note="with no blank line * * * * *">
+ </outline>
+</outline>
+<outline text="Paragraphs" _note="Here’s a regular paragraph. In Markdown 1.0.0 and earlier. Version 8. This line turns into a list item. Because a hard-wrapped line in the middle of a paragraph looked like a list item. Here’s one with a bullet. \* criminey. There should be a hard line break\ here. * * * * *">
+</outline>
+<outline text="Block Quotes" _note="E-mail style: > This is a block quote. It is pretty short. > Code in a block quote: > > sub status { > print "working"; > } > > A list: > > 1. item one > 2. item two > > Nested block quotes: > > > nested > > > nested This should not be a block quote: 2 \> 1. And a following paragraph. * * * * *">
+</outline>
+<outline text="Code Blocks" _note="Code: ---- (should be four hyphens) sub status { print "working"; } this code block is indented by one tab And: this code block is indented by two tabs These should not be escaped: \$ \\ \> \[ \{ * * * * *">
+</outline>
+<outline text="Lists">
+ <outline text="Unordered" _note="Asterisks tight: - asterisk 1 - asterisk 2 - asterisk 3 Asterisks loose: - asterisk 1 - asterisk 2 - asterisk 3 Pluses tight: - Plus 1 - Plus 2 - Plus 3 Pluses loose: - Plus 1 - Plus 2 - Plus 3 Minuses tight: - Minus 1 - Minus 2 - Minus 3 Minuses loose: - Minus 1 - Minus 2 - Minus 3 ">
+ </outline>
+ <outline text="Ordered" _note="Tight: 1. First 2. Second 3. Third and: 1. One 2. Two 3. Three Loose using tabs: 1. First 2. Second 3. Third and using spaces: 1. One 2. Two 3. Three Multiple paragraphs: 1. Item 1, graf one. Item 1. graf two. The quick brown fox jumped over the lazy dog’s back. 2. Item 2. 3. Item 3. ">
+ </outline>
+ <outline text="Nested" _note="- Tab - Tab - Tab Here’s another: 1. First 2. Second: - Fee - Fie - Foe 3. Third Same thing but with paragraphs: 1. First 2. Second: - Fee - Fie - Foe 3. Third ">
+ </outline>
+ <outline text="Tabs and spaces" _note="- this is a list item indented with tabs - this is a list item indented with spaces - this is an example list item indented with tabs - this is an example list item indented with spaces ">
+ </outline>
+ <outline text="Fancy list markers" _note="(2) begins with 2 (3) and now 3 with a continuation iv. sublist with roman numerals, starting with 4 v. more items (A) a subsublist (B) a subsublist Nesting: A. Upper Alpha I. Upper Roman. (6) Decimal start with 6 c) Lower alpha with paren Autonumbering: 1. Autonumber. 2. More. 1. Nested. Should not be a list item: M.A. 2007 B. Williams * * * * *">
+ </outline>
+</outline>
+<outline text="Definition Lists" _note="Tight using spaces: apple : red fruit orange : orange fruit banana : yellow fruit Tight using tabs: apple : red fruit orange : orange fruit banana : yellow fruit Loose: apple : red fruit orange : orange fruit banana : yellow fruit Multiple blocks with italics: *apple* : red fruit contains seeds, crisp, pleasant to taste *orange* : orange fruit { orange code block } > orange block quote Multiple definitions, tight: apple : red fruit : computer orange : orange fruit : bank Multiple definitions, loose: apple : red fruit : computer orange : orange fruit : bank Blank line after term, indented marker, alternate markers: apple : red fruit : computer orange : orange fruit 1. sublist 2. sublist ">
+</outline>
+<outline text="HTML Blocks" _note="Simple block on one line: <div> foo </div> And nested without indentation: <div> <div> <div> foo </div> </div> <div> bar </div> </div> Interpreted markdown in a table: <table> <tr> <td> This is *emphasized* </td> <td> And this is **strong** </td> </tr> </table> <script type="text/javascript">document.write('This *should not* be interpreted as markdown');</script> Here’s a simple block: <div> foo </div> This should be a code block, though: <div> foo </div> As should this: <div>foo</div> Now, nested: <div> <div> <div> foo </div> </div> </div> This should just be an HTML comment: <!-- Comment --> Multiline: <!-- Blah Blah --> <!-- This is another comment. --> Code block: <!-- Comment --> Just plain comment, with trailing spaces on the line: <!-- foo --> Code: <hr /> Hr’s: <hr> <hr /> <hr /> <hr> <hr /> <hr /> <hr class="foo" id="bar" /> <hr class="foo" id="bar" /> <hr class="foo" id="bar"> * * * * *">
+</outline>
+<outline text="Inline Markup" _note="This is *emphasized*, and so *is this*. This is **strong**, and so **is this**. An *[emphasized link](/url)*. ***This is strong and em.*** So is ***this*** word. ***This is strong and em.*** So is ***this*** word. This is code: `>`, `$`, `\`, `\$`, `<html>`. ~~This is *strikeout*.~~ Superscripts: a^bc^d a^*hello*^ a^hello there^. Subscripts: H~2~O, H~23~O, H~many of them~O. These should not be superscripts or subscripts, because of the unescaped spaces: a\^b c\^d, a\~b c\~d. * * * * *">
+</outline>
+<outline text="Smart quotes, ellipses, dashes" _note="“Hello,” said the spider. “‘Shelob’ is my name.” ‘A’, ‘B’, and ‘C’ are letters. ‘Oak,’ ‘elm,’ and ‘beech’ are names of trees. So is ‘pine.’ ‘He said, “I want to go.”’ Were you alive in the 70’s? Here is some quoted ‘`code`’ and a “[quoted link](http://example.com/?foo=1&bar=2)”. Some dashes: one—two — three—four — five. Dashes between numbers: 5–7, 255–66, 1987–1999. Ellipses…and…and…. * * * * *">
+</outline>
+<outline text="LaTeX" _note="- \cite[22-23]{smith.1899} - $2+2=4$ - $x \in y$ - $\alpha \wedge \omega$ - $223$ - $p$-Tree - Here’s some display math: $$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$$ - Here’s one that has a line break in it: $\alpha + \omega \times x^2$. These shouldn’t be math: - To get the famous equation, write `$e = mc^2$`. - \$22,000 is a *lot* of money. So is \$34,000. (It worked if “lot” is emphasized.) - Shoes (\$20) and socks (\$5). - Escaped `$`: \$73 *this should be emphasized* 23\$. Here’s a LaTeX table: \begin{tabular}{|l|l|}\hline Animal & Number \\ \hline Dog & 2 \\ Cat & 1 \\ \hline \end{tabular} * * * * *">
+</outline>
+<outline text="Special Characters" _note="Here is some unicode: - I hat: Î - o umlaut: ö - section: § - set membership: ∈ - copyright: © AT&T has an ampersand in their name. AT&T is another way to write it. This & that. 4 \< 5. 6 \> 5. Backslash: \\ Backtick: \` Asterisk: \* Underscore: \_ Left brace: { Right brace: } Left bracket: [ Right bracket: ] Left paren: ( Right paren: ) Greater-than: \> Hash: \# Period: . Bang: ! Plus: + Minus: - * * * * *">
+</outline>
+<outline text="Links">
+ <outline text="Explicit" _note="Just a [URL](/url/). [URL and title](/url/ "title"). [URL and title](/url/ "title preceded by two spaces"). [URL and title](/url/ "title preceded by a tab"). [URL and title](/url/ "title with "quotes" in it") [URL and title](/url/ "title with single quotes") [with\_underscore](/url/with_underscore) [Email link](mailto:nobody@nowhere.net) [Empty]().">
+ </outline>
+ <outline text="Reference" _note="Foo [bar](/url/). Foo [bar](/url/). Foo [bar](/url/). With [embedded [brackets]](/url/). [b](/url/) by itself should be a link. Indented [once](/url). Indented [twice](/url). Indented [thrice](/url). This should [not][] be a link. [not]: /url Foo [bar](/url/ "Title with "quotes" inside"). Foo [biz](/url/ "Title with "quote" inside").">
+ </outline>
+ <outline text="With ampersands" _note="Here’s a [link with an ampersand in the URL](http://example.com/?foo=1&bar=2). Here’s a link with an amersand in the link text: [AT&T](http://att.com/ "AT&T"). Here’s an [inline link](/script?foo=1&bar=2). Here’s an [inline link in pointy braces](/script?foo=1&bar=2).">
+ </outline>
+ <outline text="Autolinks" _note="With an ampersand: <http://example.com/?foo=1&bar=2> - In a list? - <http://example.com/> - It should. An e-mail address: <nobody@nowhere.net> > Blockquoted: <http://example.com/> Auto-links should not occur here: `<http://example.com/>` or here: <http://example.com/> * * * * *">
+ </outline>
+</outline>
+<outline text="Images" _note="From “Voyage dans la Lune” by Georges Melies (1902):  Here is a movie  icon. * * * * *">
+</outline>
+<outline text="Footnotes" _note="Here is a footnote reference,[^1] and another.[^2] This should *not* be a footnote reference, because it contains a space.[\^my note] Here is an inline note.[^3] > Notes can go in quotes.[^4] 1. And in list items.[^5] This paragraph should not be part of the note, as it is not indented. [^1]: Here is the footnote. It can go anywhere after the footnote reference. It need not be placed at the end of the document. [^2]: Here’s the long note. This one contains multiple blocks. Subsequent blocks are indented to show that they belong to the footnote (as with list items). { <code> } If you want, you can indent every line, but you can also be lazy and just indent the first line of each block. [^3]: This is *easier* to type. Inline notes may contain [links](http://google.com) and `]` verbatim characters, as well as [bracketed text]. [^4]: In quote. [^5]: In list.">
+</outline>
+ </body>
+</opml>