76143de · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

Org reader: add support for sub/superscript export options

76143deAlbert Krewinkel10 years ago

src/Text/Pandoc/Readers/Org.hs+25−3

compare with master

unifiedsplit

@@ -121,6 +121,25 @@ addToNotesTable note = do

121 oldnotes <- orgStateNotes' <$> getState

122 updateState $ \s -> s{ orgStateNotes' = note:oldnotes }

123

124+--

125+-- Export Settings

126+--

127+exportSetting :: OrgParser ()

128+exportSetting = choice

129+ [ booleanSetting "^" setExportSubSuperscripts

130+ ] <?> "export setting"

131+

132+booleanSetting :: String -> ExportSettingSetter Bool -> OrgParser ()

133+booleanSetting str setter = try $ do

134+ string str

135+ char ':'

136+ value <- many nonspaceChar

137+ let boolValue = case value of

138+ "nil" -> False

139+ "{}" -> False

140+ _ -> True

141+ updateState $ modifyExportSettings setter boolValue

142+

124--

143--

125-- Parser

144-- Parser

126--

145--

@@ -590,8 +609,9 @@ optionLine :: OrgParser ()

590optionLine = try $ do

609optionLine = try $ do

591 key <- metaKey

610 key <- metaKey

592 case key of

611 case key of

593− "link" -> parseLinkFormat >>= uncurry addLinkFormat

612+ "link" -> parseLinkFormat >>= uncurry addLinkFormat

613+ "options" -> () <$ sepBy spaces exportSetting

594− _ -> mzero

614+ _ -> mzero

595

615

596parseLinkFormat :: OrgParser ((String, String -> String))

616parseLinkFormat :: OrgParser ((String, String -> String))

597parseLinkFormat = try $ do

617parseLinkFormat = try $ do

@@ -1460,7 +1480,9 @@ subOrSuperExpr = try $

1460 where enclosing (left, right) s = left : s ++ [right]

1480 where enclosing (left, right) s = left : s ++ [right]

1461

1481

1462simpleSubOrSuperString :: OrgParser String

1482simpleSubOrSuperString :: OrgParser String

1463−simpleSubOrSuperString = try $

1483+simpleSubOrSuperString = try $ do

1484+ state <- getState

1485+ guard . exportSubSuperscripts . orgStateExportSettings $ state

1464 choice [ string "*"

1486 choice [ string "*"

1465 , mappend <$> option [] ((:[]) <$> oneOf "+-")

1487 , mappend <$> option [] ((:[]) <$> oneOf "+-")

1466 <*> many1 alphaNum

1488 <*> many1 alphaNum

src/Text/Pandoc/Readers/Org/ParserState.hs+32

@@ -38,6 +38,10 @@ module Text.Pandoc.Readers.Org.ParserState

38 , trimInlinesF

39 , runF

40 , returnF

41+ , ExportSettingSetter

42+ , exportSubSuperscripts

43+ , setExportSubSuperscripts

44+ , modifyExportSettings

41 ) where

45 ) where

43import Control.Monad (liftM, liftM2)

47import Control.Monad (liftM, liftM2)

@@ -70,6 +74,12 @@ type OrgBlockAttributes = M.Map String String

70-- link-type, the corresponding function transforms the given link string.

74-- link-type, the corresponding function transforms the given link string.

71type OrgLinkFormatters = M.Map String (String -> String)

75type OrgLinkFormatters = M.Map String (String -> String)

77+-- | Export settings <http://orgmode.org/manual/Export-settings.html>

78+-- These settings can be changed via OPTIONS statements.

79+data ExportSettings = ExportSettings

80+ { exportSubSuperscripts :: Bool -- ^ TeX-like syntax for sub- and superscripts

81+ }

82+

73-- | Org-mode parser state

83-- | Org-mode parser state

74data OrgParserState = OrgParserState

84data OrgParserState = OrgParserState

75 { orgStateOptions :: ReaderOptions

85 { orgStateOptions :: ReaderOptions

@@ -77,6 +87,7 @@ data OrgParserState = OrgParserState

77 , orgStateBlockAttributes :: OrgBlockAttributes

87 , orgStateBlockAttributes :: OrgBlockAttributes

78 , orgStateEmphasisCharStack :: [Char]

88 , orgStateEmphasisCharStack :: [Char]

79 , orgStateEmphasisNewlines :: Maybe Int

89 , orgStateEmphasisNewlines :: Maybe Int

90+ , orgStateExportSettings :: ExportSettings

80 , orgStateLastForbiddenCharPos :: Maybe SourcePos

91 , orgStateLastForbiddenCharPos :: Maybe SourcePos

81 , orgStateLastPreCharPos :: Maybe SourcePos

92 , orgStateLastPreCharPos :: Maybe SourcePos

82 , orgStateLastStrPos :: Maybe SourcePos

93 , orgStateLastStrPos :: Maybe SourcePos

@@ -119,6 +130,8 @@ instance HasHeaderMap OrgParserState where

119 extractHeaderMap = orgStateHeaderMap

130 extractHeaderMap = orgStateHeaderMap

120 updateHeaderMap f s = s{ orgStateHeaderMap = f (orgStateHeaderMap s) }

131 updateHeaderMap f s = s{ orgStateHeaderMap = f (orgStateHeaderMap s) }

121

132

133+instance Default ExportSettings where

134+ def = defaultExportSettings

122

135

123instance Default OrgParserState where

136instance Default OrgParserState where

124 def = defaultOrgParserState

137 def = defaultOrgParserState

@@ -130,6 +143,7 @@ defaultOrgParserState = OrgParserState

130 , orgStateBlockAttributes = M.empty

143 , orgStateBlockAttributes = M.empty

131 , orgStateEmphasisCharStack = []

144 , orgStateEmphasisCharStack = []

132 , orgStateEmphasisNewlines = Nothing

145 , orgStateEmphasisNewlines = Nothing

146+ , orgStateExportSettings = def

133 , orgStateLastForbiddenCharPos = Nothing

147 , orgStateLastForbiddenCharPos = Nothing

134 , orgStateLastPreCharPos = Nothing

148 , orgStateLastPreCharPos = Nothing

135 , orgStateLastStrPos = Nothing

149 , orgStateLastStrPos = Nothing

@@ -142,6 +156,24 @@ defaultOrgParserState = OrgParserState

142 , orgStateHeaderMap = M.empty

156 , orgStateHeaderMap = M.empty

143 }

157 }

144

158

159+defaultExportSettings :: ExportSettings

160+defaultExportSettings = ExportSettings

161+ { exportSubSuperscripts = True

162+ }

163+

164+

165+--

166+-- Setter for exporting options

167+--

168+type ExportSettingSetter a = a -> ExportSettings -> ExportSettings

169+

170+setExportSubSuperscripts :: ExportSettingSetter Bool

171+setExportSubSuperscripts val es = es { exportSubSuperscripts = val }

172+

173+-- | Modify a parser state

174+modifyExportSettings :: ExportSettingSetter a -> a -> OrgParserState -> OrgParserState

175+modifyExportSettings setter val state =

176+ state { orgStateExportSettings = setter val . orgStateExportSettings $ state }

145

177

146--

178--

147-- Parser state reader

179-- Parser state reader

tests/Tests/Readers/Org.hs+6

@@ -469,6 +469,12 @@ tests =

469 , "[[expl:foo][bar]]"

470 ] =?>

471 (para (link "http://example.com/foo" "" "bar"))

472+

473+ , "Export option: Disable simple sub/superscript syntax" =:

474+ unlines [ "#+OPTIONS: ^:nil"

475+ , "a^b"

476+ ] =?>

477+ para "a^b"

472 ]

478 ]

473

479

474 , testGroup "Basic Blocks" $

480 , testGroup "Basic Blocks" $