git.iko.soy/typeable/pandoc
on master help sign in
Lua filters: Remove special treatment of Quoted, Math.
780a65fJohn MacFarlane
src/Text/Pandoc/Lua.hs+8−24
compare with master
unifiedsplit
@@ -101,6 +101,12 @@ data LuaFilter = LuaFilter LuaState FunctionMap
101
101
102newtype LuaFilterFunction = LuaFilterFunction { functionIndex :: Int }
102newtype LuaFilterFunction = LuaFilterFunction { functionIndex :: Int }
103
103
104+tryFilter :: StackValue a => LuaState -> FunctionMap -> String -> a -> IO a
105+tryFilter lua fnMap filterFnName x =
106+ case Map.lookup filterFnName fnMap of
107+ Nothing -> return x
108+ Just fn -> runFilterFunction lua fn x
109+
104execDocLuaFilter :: LuaState
110execDocLuaFilter :: LuaState
105 -> FunctionMap
111 -> FunctionMap
106 -> Pandoc -> IO Pandoc
112 -> Pandoc -> IO Pandoc
@@ -116,34 +122,12 @@ execMetaLuaFilter lua fnMap (Pandoc meta blks) = do
116execBlockLuaFilter :: LuaState
122execBlockLuaFilter :: LuaState
117 -> FunctionMap
123 -> FunctionMap
118 -> Block -> IO Block
124 -> Block -> IO Block
119−execBlockLuaFilter lua fnMap x = do
120− tryFilter lua fnMap (show (toConstr x)) x
125+execBlockLuaFilter lua fnMap x = tryFilter lua fnMap (show (toConstr x)) x
121−
122−tryFilter :: StackValue a => LuaState -> FunctionMap -> String -> a -> IO a
123−tryFilter lua fnMap filterFnName x =
124− case Map.lookup filterFnName fnMap of
125− Nothing -> return x
126− Just fn -> runFilterFunction lua fn x
127−
128−tryFilterAlternatives :: StackValue a
129− => LuaState -> FunctionMap -> [String] -> a -> IO a
130−tryFilterAlternatives _ _ [] x = return x
131−tryFilterAlternatives lua fnMap (fnName : alternatives) x =
132− case Map.lookup fnName fnMap of
133− Nothing -> tryFilterAlternatives lua fnMap alternatives x
134− Just fn -> runFilterFunction lua fn x
135
126
136execInlineLuaFilter :: LuaState
127execInlineLuaFilter :: LuaState
137 -> FunctionMap
128 -> FunctionMap
138 -> Inline -> IO Inline
129 -> Inline -> IO Inline
139−execInlineLuaFilter lua fnMap x = do
140− let tryAlt = tryFilterAlternatives lua fnMap
141− case x of
142− Math DisplayMath _ -> tryAlt ["DisplayMath", "Math"] x
143− Math InlineMath _ -> tryAlt ["InlineMath", "Math"] x
144− Quoted DoubleQuote _ -> tryAlt ["DoubleQuoted", "Quoted"] x
145− Quoted SingleQuote _ -> tryAlt ["SingleQuoted", "Quoted"] x
146− _ -> tryFilter lua fnMap (show (toConstr x)) x
130+execInlineLuaFilter lua fnMap x = tryFilter lua fnMap (show (toConstr x)) x
147
131
148instance StackValue LuaFilter where
132instance StackValue LuaFilter where
149 valuetype _ = Lua.TTABLE
133 valuetype _ = Lua.TTABLE
test/lua/single-to-double-quoted.lua+4−2
@@ -1,7 +1,9 @@
1return {
1return {
2 {
2 {
3− SingleQuoted = function (elem)
3+ Quoted = function (elem)
4+ if elem.quotetype == "SingleQuote" then
4− elem.quotetype = "DoubleQuote"
5+ elem.quotetype = "DoubleQuote"
6+ end
5 return elem
7 return elem
6 end,
8 end,
7 }
9 }