From 88a40685b8d79dd97d16e2b3988e0e927ec24ec0 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Thu, 9 Dec 2010 08:52:09 -0800 Subject: Textile reader: better treatment of acronyms. We now parse PBS(Public Broadcasting System) as if it were "PBS (Public Broadcasting System)". --- src/Text/Pandoc/Readers/Textile.hs | 2 +- tests/textile-reader.native | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Text/Pandoc/Readers/Textile.hs b/src/Text/Pandoc/Readers/Textile.hs index d52b1fd58..d5add8f88 100644 --- a/src/Text/Pandoc/Readers/Textile.hs +++ b/src/Text/Pandoc/Readers/Textile.hs @@ -395,7 +395,7 @@ str = do optional $ try $ do lookAhead (char '(') notFollowedBy' mark - charsInBalanced '(' ')' -- drop acronym explanation + getInput >>= setInput . (' ':) -- add space before acronym explanation -- parse a following hyphen if followed by a letter -- (this prevents unwanted interpretation as starting a strikeout section) result <- option xs $ try $ do diff --git a/tests/textile-reader.native b/tests/textile-reader.native index 680b43849..683ebd39b 100644 --- a/tests/textile-reader.native +++ b/tests/textile-reader.native @@ -127,7 +127,7 @@ Pandoc (Meta {docTitle = [], docAuthors = [], docDate = []}) , [ Plain [Str "but",Space,Str "this",Space,HtmlInline "",Space,Str "will",Space,Str "produce",Space,Str "inline",Space,Str "html",Space,HtmlInline ""] ] ] , Para [Str "Can",Space,Str "you",Space,Str "prove",Space,Str "that",Space,Str "2",Space,Str "<",Space,Str "3",Space,Str "?"] , Header 1 [Str "Acronyms",Space,Str "and",Space,Str "marks"] -, Para [Str "PBS"] +, Para [Str "PBS",Space,Str "(",Str "Public",Space,Str "Broadcasting",Space,Str "System",Str ")"] , Para [Str "Hi",Str "\8482"] , Para [Str "Hi",Space,Str "\8482"] , Para [Str "\174",Space,Str "Hi",Str "\174"] -- cgit v1.2.3