41db9e8 · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

MediaWiki reader: don't do curly quotes inside `<tt>` contexts.

41db9e8John MacFarlane9 years ago

src/Text/Pandoc/Readers/MediaWiki.hs+10−1

compare with master

unifiedsplit

@@ -74,6 +74,7 @@ readMediaWiki opts s = do

74 , mwHeaderMap = M.empty

75 , mwIdentifierList = Set.empty

76 , mwLogMessages = []

77+ , mwInTT = False

77 }

78 }

78 (s ++ "\n")

79 (s ++ "\n")

79 case parsed of

80 case parsed of

@@ -87,6 +88,7 @@ data MWState = MWState { mwOptions :: ReaderOptions

87 , mwHeaderMap :: M.Map Inlines String

88 , mwHeaderMap :: M.Map Inlines String

88 , mwIdentifierList :: Set.Set String

89 , mwIdentifierList :: Set.Set String

89 , mwLogMessages :: [LogMessage]

90 , mwLogMessages :: [LogMessage]

91+ , mwInTT :: Bool

90 }

92 }

92type MWParser m = ParserT [Char] MWState m

94type MWParser m = ParserT [Char] MWState m

@@ -569,7 +571,12 @@ inlineTag = do

569 TagOpen "sub" _ -> B.subscript <$> inlinesInTags "sub"

571 TagOpen "sub" _ -> B.subscript <$> inlinesInTags "sub"

570 TagOpen "sup" _ -> B.superscript <$> inlinesInTags "sup"

572 TagOpen "sup" _ -> B.superscript <$> inlinesInTags "sup"

571 TagOpen "code" _ -> encode <$> inlinesInTags "code"

573 TagOpen "code" _ -> encode <$> inlinesInTags "code"

574+ TagOpen "tt" _ -> do

575+ inTT <- mwInTT <$> getState

576+ updateState $ \st -> st{ mwInTT = True }

572− TagOpen "tt" _ -> encode <$> inlinesInTags "tt"

577+ result <- encode <$> inlinesInTags "tt"

578+ updateState $ \st -> st{ mwInTT = inTT }

579+ return result

573 TagOpen "hask" _ -> B.codeWith ("",["haskell"],[]) <$> charsInTags "hask"

580 TagOpen "hask" _ -> B.codeWith ("",["haskell"],[]) <$> charsInTags "hask"

574 _ -> B.rawInline "html" . snd <$> htmlTag (~== tag)

581 _ -> B.rawInline "html" . snd <$> htmlTag (~== tag)

575

582

@@ -690,6 +697,8 @@ strong = B.strong <$> nested (inlinesBetween start end)

690doubleQuotes :: PandocMonad m => MWParser m Inlines

697doubleQuotes :: PandocMonad m => MWParser m Inlines

691doubleQuotes = do

698doubleQuotes = do

692 guardEnabled Ext_smart

699 guardEnabled Ext_smart

700+ inTT <- mwInTT <$> getState

701+ guard (not inTT)

693 B.doubleQuoted <$> nested (inlinesBetween openDoubleQuote closeDoubleQuote)

702 B.doubleQuoted <$> nested (inlinesBetween openDoubleQuote closeDoubleQuote)

694 where openDoubleQuote = sym "\"" >> lookAhead nonspaceChar

703 where openDoubleQuote = sym "\"" >> lookAhead nonspaceChar

695 closeDoubleQuote = try $ sym "\""

704 closeDoubleQuote = try $ sym "\""

test/command/3585.mdnew file+16

@@ -0,0 +1,16 @@

1+```

2+% pandoc -f mediawiki+smart -t native

3+"Hello"

5+Same but bzip2 it and nice it <tt>zfs send tank/storage/data/svn@daily-2014-03-20_00.00.00--2w | nice -15 bzip2 | ssh user@hyper.somewhere.org "> /storage/c-3po/tank-storage-data-svn.dmp.bz2"</tt>

6+^D

7+[Para [Quoted DoubleQuote [Str "Hello"]]

8+,Para [Str "Same",Space,Str "but",Space,Str "bzip2",Space,Str "it",Space,Str "and",Space,Str "nice",Space,Str "it",Space,Code ("",[],[]) "zfs send tank/storage/data/svn@daily-2014-03-20_00.00.00--2w | nice -15 bzip2 | ssh user@hyper.somewhere.org \"> /storage/c-3po/tank-storage-data-svn.dmp.bz2\""]]

9+```

10+

11+```

12+% pandoc -f mediawiki -t native

13+"Hello"

14+^D

15+[Para [Str "\"Hello\""]]

16+```