git.iko.soy/typeable/pandoc
on master help sign in
RST reader: Some fixes to last change, and use "author" not "authors".
eaba340John MacFarlane
src/Text/Pandoc/Readers/RST.hs+7−6
compare with master
unifiedsplit
@@ -113,15 +113,16 @@ titleTransform (bs, meta) =
113metaFromDefList :: [([Inline], [[Block]])] -> Meta -> Meta
113metaFromDefList :: [([Inline], [[Block]])] -> Meta -> Meta
114metaFromDefList ds meta = adjustAuthors $ foldr f meta ds
114metaFromDefList ds meta = adjustAuthors $ foldr f meta ds
115 where f (k,v) = setMeta (map toLower $ stringify k) (mconcat $ map fromList v)
115 where f (k,v) = setMeta (map toLower $ stringify k) (mconcat $ map fromList v)
116− adjustAuthors (Meta metamap) = Meta $ M.adjust toPlain "author"
116+ adjustAuthors (Meta metamap) = Meta $ M.adjust splitAuthors "author"
117 $ M.adjust toPlain "date"
117 $ M.adjust toPlain "date"
118 $ M.adjust toPlain "title"
118 $ M.adjust toPlain "title"
119− $ M.adjust splitAuthors "authors"
119+ $ M.mapKeys (\k -> if k == "authors" then "author" else k)
120 $ metamap
120 $ metamap
121 toPlain (MetaBlocks [Para xs]) = MetaInlines xs
121 toPlain (MetaBlocks [Para xs]) = MetaInlines xs
122 toPlain x = x
122 toPlain x = x
123− splitAuthors (MetaBlocks [Para xs]) = MetaList $ map MetaInlines
123+ splitAuthors (MetaBlocks [Para xs])
124+ = MetaList $ map MetaInlines
124− $ splitAuthors' xs
125+ $ splitAuthors' xs
125 splitAuthors x = x
126 splitAuthors x = x
126 splitAuthors' = map normalizeSpaces .
127 splitAuthors' = map normalizeSpaces .
127 splitOnSemi . concatMap factorSemi
128 splitOnSemi . concatMap factorSemi
@@ -196,7 +197,7 @@ rawFieldListItem minIndent = try $ do
196 rest <- option "" $ try $ do lookAhead (count indent (char ' ') >> spaceChar)
197 rest <- option "" $ try $ do lookAhead (count indent (char ' ') >> spaceChar)
197 indentedBlock
198 indentedBlock
198 let raw = (if null first then "" else (first ++ "\n")) ++ rest ++ "\n"
199 let raw = (if null first then "" else (first ++ "\n")) ++ rest ++ "\n"
199− return (name, trimr raw)
200+ return (name, raw)
200
201
201fieldListItem :: Int -> RSTParser (Inlines, [Blocks])
202fieldListItem :: Int -> RSTParser (Inlines, [Blocks])
202fieldListItem minIndent = try $ do
203fieldListItem minIndent = try $ do
@@ -577,7 +578,7 @@ directive' = do
577 "code" -> codeblock (lookup "number-lines" fields) (trim top) body
578 "code" -> codeblock (lookup "number-lines" fields) (trim top) body
578 "code-block" -> codeblock (lookup "number-lines" fields) (trim top) body
579 "code-block" -> codeblock (lookup "number-lines" fields) (trim top) body
579 "aafig" -> do
580 "aafig" -> do
580− let attribs = ("", ["aafig"], fields)
581+ let attribs = ("", ["aafig"], map (\(k,v) -> (k, trimr v)) fields)
581 return $ B.codeBlockWith attribs $ stripTrailingNewlines body
582 return $ B.codeBlockWith attribs $ stripTrailingNewlines body
582 "math" -> return $ B.para $ mconcat $ map B.displayMath
583 "math" -> return $ B.para $ mconcat $ map B.displayMath
583 $ toChunks $ top ++ "\n\n" ++ body
584 $ toChunks $ top ++ "\n\n" ++ body
tests/rst-reader.native+1−1
@@ -1,4 +1,4 @@
1−Pandoc (Meta {unMeta = fromList [("authors",MetaList [MetaInlines [Str "John",Space,Str "MacFarlane"],MetaInlines [Str "Anonymous"]]),("date",MetaInlines [Str "July",Space,Str "17,",Space,Str "2006"]),("revision",MetaBlocks [Para [Str "3"]]),("subtitle",MetaInlines [Str "Subtitle"]),("title",MetaInlines [Str "Pandoc",Space,Str "Test",Space,Str "Suite"])]})
1+Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "John",Space,Str "MacFarlane"],MetaInlines [Str "Anonymous"]]),("date",MetaInlines [Str "July",Space,Str "17,",Space,Str "2006"]),("revision",MetaBlocks [Para [Str "3"]]),("subtitle",MetaInlines [Str "Subtitle"]),("title",MetaInlines [Str "Pandoc",Space,Str "Test",Space,Str "Suite"])]})
2[Header 1 ("level-one-header",[],[]) [Str "Level",Space,Str "one",Space,Str "header"]
2[Header 1 ("level-one-header",[],[]) [Str "Level",Space,Str "one",Space,Str "header"]
3,Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "set",Space,Str "of",Space,Str "tests",Space,Str "for",Space,Str "pandoc.",Space,Str "Most",Space,Str "of",Space,Str "them",Space,Str "are",Space,Str "adapted",Space,Str "from",Space,Str "John",Space,Str "Gruber\8217s",Space,Str "markdown",Space,Str "test",Space,Str "suite."]
3,Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "set",Space,Str "of",Space,Str "tests",Space,Str "for",Space,Str "pandoc.",Space,Str "Most",Space,Str "of",Space,Str "them",Space,Str "are",Space,Str "adapted",Space,Str "from",Space,Str "John",Space,Str "Gruber\8217s",Space,Str "markdown",Space,Str "test",Space,Str "suite."]
4,Header 2 ("level-two-header",[],[]) [Str "Level",Space,Str "two",Space,Str "header"]
4,Header 2 ("level-two-header",[],[]) [Str "Level",Space,Str "two",Space,Str "header"]