Lua filters: Remove special treatment of Quoted, Math.

No more SingleQuoted, DoubleQuoted, InlineMath, DisplayMath.
This makes everything uniform and predictable, though it does
open up a difference btw lua filters and custom writers.

2 files changed, 12 insertions, 26 deletions

diff --git a/src/Text/Pandoc/Lua.hs b/src/Text/Pandoc/Lua.hs
index 3bb11b705..fd7bba0ac 100644
--- a/src/Text/Pandoc/Lua.hs
+++ b/src/Text/Pandoc/Lua.hs
@@ -101,6 +101,12 @@ data LuaFilter = LuaFilter LuaState FunctionMap
 
 newtype LuaFilterFunction = LuaFilterFunction { functionIndex :: Int }
 
+tryFilter :: StackValue a => LuaState -> FunctionMap -> String -> a -> IO a
+tryFilter lua fnMap filterFnName x =
+  case Map.lookup filterFnName fnMap of
+    Nothing -> return x
+    Just fn -> runFilterFunction lua fn x
+
 execDocLuaFilter :: LuaState
                  -> FunctionMap
                  -> Pandoc -> IO Pandoc
@@ -116,34 +122,12 @@ execMetaLuaFilter lua fnMap (Pandoc meta blks) = do
 execBlockLuaFilter :: LuaState
                    -> FunctionMap
                    -> Block -> IO Block
-execBlockLuaFilter lua fnMap x = do
-  tryFilter lua fnMap (show (toConstr x)) x
-
-tryFilter :: StackValue a => LuaState -> FunctionMap -> String -> a -> IO a
-tryFilter lua fnMap filterFnName x =
-  case Map.lookup filterFnName fnMap of
-    Nothing -> return x
-    Just fn -> runFilterFunction lua fn x
-
-tryFilterAlternatives :: StackValue a
-                      => LuaState -> FunctionMap -> [String] -> a -> IO a
-tryFilterAlternatives _ _ [] x = return x
-tryFilterAlternatives lua fnMap (fnName : alternatives) x =
-  case Map.lookup fnName fnMap of
-    Nothing -> tryFilterAlternatives lua fnMap alternatives x
-    Just fn -> runFilterFunction lua fn x
+execBlockLuaFilter lua fnMap x = tryFilter lua fnMap (show (toConstr x)) x
 
 execInlineLuaFilter :: LuaState
                     -> FunctionMap
                     -> Inline -> IO Inline
-execInlineLuaFilter lua fnMap x = do
-  let tryAlt = tryFilterAlternatives lua fnMap
-  case x of
-    Math DisplayMath _   -> tryAlt ["DisplayMath", "Math"] x
-    Math InlineMath _    -> tryAlt ["InlineMath", "Math"] x
-    Quoted DoubleQuote _ -> tryAlt ["DoubleQuoted", "Quoted"] x
-    Quoted SingleQuote _ -> tryAlt ["SingleQuoted", "Quoted"] x
-    _                    -> tryFilter lua fnMap (show (toConstr x)) x
+execInlineLuaFilter lua fnMap x = tryFilter lua fnMap (show (toConstr x)) x
 
 instance StackValue LuaFilter where
   valuetype _ = Lua.TTABLE
diff --git a/test/lua/single-to-double-quoted.lua b/test/lua/single-to-double-quoted.lua
index 45c184c95..b985b215c 100644
--- a/test/lua/single-to-double-quoted.lua
+++ b/test/lua/single-to-double-quoted.lua
@@ -1,7 +1,9 @@
 return {
   {
-    SingleQuoted = function (elem)
-      elem.quotetype = "DoubleQuote"
+    Quoted = function (elem)
+      if elem.quotetype == "SingleQuote" then
+        elem.quotetype = "DoubleQuote"
+      end
       return elem
     end,
   }