@@ -1,6 +1,6 @@
11{-# LANGUAGE OverloadedStrings #-}
22{-# LANGUAGE GeneralizedNewtypeDeriving #-}
3−{-# LANGUAGE FlexibleContexts #-}
3+{-# LANGUAGE MultiParamTypeClasses, FlexibleContexts, FlexibleInstances #-}
44{-
55Copyright (C) 2014 Albert Krewinkel <tarleb@moltkeplatz.de>
66
@@ -49,7 +49,7 @@ import Control.Applicative ( Applicative, pure
4949 , (<$>), (<$), (<*>), (<*), (*>) )
5050import Control.Arrow (first)
5151import Control.Monad (foldM, guard, liftM, liftM2, mplus, mzero, when)
52−import Control.Monad.Reader (Reader, runReader, ask, asks)
52+import Control.Monad.Reader (Reader, runReader, ask, asks, local)
5353import Data.Char (isAlphaNum, toLower)
5454import Data.Default
5555import Data.List (intersperse, isPrefixOf, isSuffixOf)
@@ -62,9 +62,11 @@ import Network.HTTP (urlEncode)
6262readOrg :: ReaderOptions -- ^ Reader options
6363 -> String -- ^ String to parse (assuming @'\n'@ line endings)
6464 -> Pandoc
65−readOrg opts s = readWith parseOrg def{ orgStateOptions = opts } (s ++ "\n\n")
65+readOrg opts s = flip runReader def $ readWithM parseOrg def{ orgStateOptions = opts } (s ++ "\n\n")
6666
67−type OrgParser = Parser [Char] OrgParserState
67+data OrgParserLocal = OrgParserLocal { orgLocalQuoteContext :: QuoteContext }
68+
69+type OrgParser = ParserT [Char] OrgParserState (Reader OrgParserLocal)
6870
6971parseOrg :: OrgParser Pandoc
7072parseOrg = do
@@ -125,6 +127,9 @@ data OrgParserState = OrgParserState
125127 , orgStateNotes' :: OrgNoteTable
126128 }
127129
130+instance Default OrgParserLocal where
131+ def = OrgParserLocal NoQuote
132+
128133instance HasReaderOptions OrgParserState where
129134 extractReaderOptions = orgStateOptions
130135
@@ -138,6 +143,10 @@ instance HasLastStrPosition OrgParserState where
138143 getLastStrPos = orgStateLastStrPos
139144 setLastStrPos pos st = st{ orgStateLastStrPos = Just pos }
140145
146+instance HasQuoteContext st (Reader OrgParserLocal) where
147+ getQuoteContext = asks orgLocalQuoteContext
148+ withQuoteContext q = local (\s -> s{orgLocalQuoteContext = q})
149+
141150instance Default OrgParserState where
142151 def = defaultOrgParserState
143152
@@ -964,6 +973,7 @@ inline =
964973 , subscript
965974 , superscript
966975 , inlineLaTeX
976+ , smart
967977 , symbol
968978 ] <* (guard =<< newlinesCountWithinLimits)
969979 <?> "inline"
@@ -1270,12 +1280,16 @@ displayMath :: OrgParser (F Inlines)
12701280displayMath = return . B.displayMath <$> choice [ rawMathBetween "\\[" "\\]"
12711281 , rawMathBetween "$$" "$$"
12721282 ]
1283+
1284+updatePositions :: Char
1285+ -> OrgParser (Char)
1286+updatePositions c = do
1287+ when (c `elem` emphasisPreChars) updateLastPreCharPos
1288+ when (c `elem` emphasisForbiddenBorderChars) updateLastForbiddenCharPos
1289+ return c
1290+
12731291symbol :: OrgParser (F Inlines)
12741292symbol = return . B.str . (: "") <$> (oneOf specialChars >>= updatePositions)
1275− where updatePositions c = do
1276− when (c `elem` emphasisPreChars) updateLastPreCharPos
1277− when (c `elem` emphasisForbiddenBorderChars) updateLastForbiddenCharPos
1278− return c
12791293
12801294emphasisBetween :: Char
12811295 -> OrgParser (F Inlines)
@@ -1486,3 +1500,31 @@ inlineLaTeXCommand = try $ do
14861500 count len anyChar
14871501 return cs
14881502 _ -> mzero
1503+
1504+smart :: OrgParser (F Inlines)
1505+smart = do
1506+ getOption readerSmart >>= guard
1507+ doubleQuoted <|> singleQuoted <|>
1508+ choice (map (return <$>) [orgApostrophe, dash, ellipses])
1509+ where orgApostrophe =
1510+ (char '\'' <|> char '\8217') <* updateLastPreCharPos
1511+ <* updateLastForbiddenCharPos
1512+ *> return (B.str "\x2019")
1513+
1514+singleQuoted :: OrgParser (F Inlines)
1515+singleQuoted = try $ do
1516+ singleQuoteStart
1517+ withQuoteContext InSingleQuote $
1518+ fmap B.singleQuoted . trimInlinesF . mconcat <$>
1519+ many1Till inline singleQuoteEnd
1520+
1521+-- doubleQuoted will handle regular double-quoted sections, as well
1522+-- as dialogues with an open double-quote without a close double-quote
1523+-- in the same paragraph.
1524+doubleQuoted :: OrgParser (F Inlines)
1525+doubleQuoted = try $ do
1526+ doubleQuoteStart
1527+ contents <- mconcat <$> many (try $ notFollowedBy doubleQuoteEnd >> inline)
1528+ (withQuoteContext InDoubleQuote $ (doubleQuoteEnd <* updateLastForbiddenCharPos) >> return
1529+ (fmap B.doubleQuoted . trimInlinesF $ contents))
1530+ <|> (return $ return (B.str "\8220") <> contents)