git.iko.soy/typeable/pandoc
on master help sign in
Textile reader: Improved treatment of HTML spans (%).

Closes #1115.

commit060a76a38e1f3586bc92787bb2c25c2dc04e380e authorJohn MacFarlane <fiddlosopher@gmail.com> dateSat 5 Apr 2014, 20:41 (13 years ago) parent75dbe87
2 files changed+2−6
compare with master
unifiedsplit
src/Text/Pandoc/Readers/Textile.hs+1−5 tests/textile-reader.native+1−1
src/Text/Pandoc/Readers/Textile.hs+1−5
@@ -376,7 +376,6 @@ inlineParsers = [ inlineMarkup
376376 , endline
377377 , code
378378 , escapedInline
379− , htmlSpan
380379 , rawHtmlInline
381380 , rawLaTeXInline'
382381 , note
@@ -400,6 +399,7 @@ inlineMarkup = choice [ simpleInline (string "??") (B.cite [])
400399 , simpleInline (char '-' <* notFollowedBy (char '-')) B.strikeout
401400 , simpleInline (char '^') B.superscript
402401 , simpleInline (char '~') B.subscript
402+ , simpleInline (char '%') id
403403 ]
404404
405405-- | Trademark, registered, copyright
@@ -476,10 +476,6 @@ str = do
476476 updateLastStrPos
477477 return $ B.str fullStr
478478
479−-- | Textile allows HTML span infos, we discard them
480−htmlSpan :: Parser [Char] ParserState Inlines
481−htmlSpan = try $ B.str <$> ( char '%' *> attributes *> manyTill anyChar (char '%') )
482−
483479-- | Some number of space chars
484480whitespace :: Parser [Char] ParserState Inlines
485481whitespace = many1 spaceChar >> return B.space <?> "whitespace"
tests/textile-reader.native+1−1
@@ -124,7 +124,7 @@ Pandoc (Meta {unMeta = fromList []})
124124,Para [Str "Textile",Space,Str "inline",Space,Str "image",Space,Str "syntax,",Space,Str "like",LineBreak,Str "here",Space,Image [Str "this is the alt text"] ("this_is_an_image.png","this is the alt text"),LineBreak,Str "and",Space,Str "here",Space,Image [Str ""] ("this_is_an_image.png",""),Str "."]
125125,Header 1 ("attributes",[],[]) [Str "Attributes"]
126126,Header 2 ("ident",["bar","foo"],[("style","color:red"),("lang","en")]) [Str "HTML",Space,Str "and",Space,Str "CSS",Space,Str "attributes",Space,Str "are",Space,Str "parsed",Space,Str "in",Space,Str "headers."]
127−,Para [Str "as",Space,Str "well",Space,Str "as",Space,Strong [Str "inline",Space,Str "attributes"],Space,Str "of",Space,Str " all kind"]
127+,Para [Str "as",Space,Str "well",Space,Str "as",Space,Strong [Str "inline",Space,Str "attributes"],Space,Str "of",Space,Str "all",Space,Str "kind"]
128128,Para [Str "and",Space,Str "paragraph",Space,Str "attributes,",Space,Str "and",Space,Str "table",Space,Str "attributes."]
129129,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]
130130 []