git.iko.soy/typeable/pandoc
on master help sign in
Renaming: Json -> JSON in modules and functions.
4b7bc40John MacFarlane
pandoc.cabal+1−1
compare with master
unifiedsplit
@@ -500,7 +500,7 @@ library
500 Text.Pandoc.BCP47,
500 Text.Pandoc.BCP47,
501 Text.Pandoc.Class
501 Text.Pandoc.Class
502 other-modules: Text.Pandoc.Filter,
502 other-modules: Text.Pandoc.Filter,
503− Text.Pandoc.Filter.Json,
503+ Text.Pandoc.Filter.JSON,
504 Text.Pandoc.Filter.Lua,
504 Text.Pandoc.Filter.Lua,
505 Text.Pandoc.Filter.Path,
505 Text.Pandoc.Filter.Path,
506 Text.Pandoc.Readers.Docx.Lists,
506 Text.Pandoc.Readers.Docx.Lists,
src/Text/Pandoc/Filter.hs+2−2
@@ -39,7 +39,7 @@ import Data.Foldable (foldrM)
39import Text.Pandoc.Class (PandocIO)
39import Text.Pandoc.Class (PandocIO)
40import Text.Pandoc.Definition (Pandoc)
40import Text.Pandoc.Definition (Pandoc)
41import Text.Pandoc.Options (ReaderOptions)
41import Text.Pandoc.Options (ReaderOptions)
42−import qualified Text.Pandoc.Filter.Json as JsonFilter
42+import qualified Text.Pandoc.Filter.JSON as JSONFilter
43import qualified Text.Pandoc.Filter.Lua as LuaFilter
43import qualified Text.Pandoc.Filter.Lua as LuaFilter
44
44
45data Filter = LuaFilter FilePath
45data Filter = LuaFilter FilePath
@@ -54,7 +54,7 @@ applyFilters :: ReaderOptions
54applyFilters ropts filters args d = do
54applyFilters ropts filters args d = do
55 foldrM ($) d $ map applyFilter filters
55 foldrM ($) d $ map applyFilter filters
56 where
56 where
57− applyFilter (JSONFilter f) = JsonFilter.apply ropts args f
57+ applyFilter (JSONFilter f) = JSONFilter.apply ropts args f
58 applyFilter (LuaFilter f) = LuaFilter.apply ropts args f
58 applyFilter (LuaFilter f) = LuaFilter.apply ropts args f
59
59
60$(deriveJSON defaultOptions ''Filter)
60$(deriveJSON defaultOptions ''Filter)
src/Text/Pandoc/Filter/Json.hs → src/Text/Pandoc/Filter/JSON.hsrenamed+1−1
@@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
27
27
28Programmatically modifications of pandoc documents via JSON filters.
28Programmatically modifications of pandoc documents via JSON filters.
29-}
29-}
30−module Text.Pandoc.Filter.Json (apply) where
30+module Text.Pandoc.Filter.JSON (apply) where
31
31
32import Control.Monad (unless, when)
32import Control.Monad (unless, when)
33import Control.Monad.Trans (MonadIO (liftIO))
33import Control.Monad.Trans (MonadIO (liftIO))
src/Text/Pandoc/Lua/Module/Utils.hs+5−5
@@ -40,7 +40,7 @@ import Text.Pandoc.Lua.Util (addFunction, popValue)
40import qualified Data.Digest.Pure.SHA as SHA
40import qualified Data.Digest.Pure.SHA as SHA
41import qualified Data.ByteString.Lazy as BSL
41import qualified Data.ByteString.Lazy as BSL
42import qualified Foreign.Lua as Lua
42import qualified Foreign.Lua as Lua
43−import qualified Text.Pandoc.Filter.Json as JsonFilter
43+import qualified Text.Pandoc.Filter.JSON as JSONFilter
44import qualified Text.Pandoc.Shared as Shared
44import qualified Text.Pandoc.Shared as Shared
45
45
46-- | Push the "pandoc.utils" module to the lua stack.
46-- | Push the "pandoc.utils" module to the lua stack.
@@ -49,7 +49,7 @@ pushModule mbDatadir = do
49 Lua.newtable
49 Lua.newtable
50 addFunction "hierarchicalize" hierarchicalize
50 addFunction "hierarchicalize" hierarchicalize
51 addFunction "normalize_date" normalizeDate
51 addFunction "normalize_date" normalizeDate
52− addFunction "run_json_filter" (runJsonFilter mbDatadir)
52+ addFunction "run_json_filter" (runJSONFilter mbDatadir)
53 addFunction "sha1" sha1
53 addFunction "sha1" sha1
54 addFunction "stringify" stringify
54 addFunction "stringify" stringify
55 addFunction "to_roman_numeral" toRomanNumeral
55 addFunction "to_roman_numeral" toRomanNumeral
@@ -67,12 +67,12 @@ normalizeDate :: String -> Lua (Lua.Optional String)
67normalizeDate = return . Lua.Optional . Shared.normalizeDate
67normalizeDate = return . Lua.Optional . Shared.normalizeDate
68
68
69-- | Run a JSON filter on the given document.
69-- | Run a JSON filter on the given document.
70−runJsonFilter :: Maybe FilePath
70+runJSONFilter :: Maybe FilePath
71 -> Pandoc
71 -> Pandoc
72 -> FilePath
72 -> FilePath
73 -> Lua.Optional [String]
73 -> Lua.Optional [String]
74 -> Lua NumResults
74 -> Lua NumResults
75−runJsonFilter mbDatadir doc filterFile optArgs = do
75+runJSONFilter mbDatadir doc filterFile optArgs = do
76 args <- case Lua.fromOptional optArgs of
76 args <- case Lua.fromOptional optArgs of
77 Just x -> return x
77 Just x -> return x
78 Nothing -> do
78 Nothing -> do
@@ -80,7 +80,7 @@ runJsonFilter mbDatadir doc filterFile optArgs = do
80 (:[]) <$> popValue
80 (:[]) <$> popValue
81 filterRes <- Lua.liftIO . runIO $ do
81 filterRes <- Lua.liftIO . runIO $ do
82 setUserDataDir mbDatadir
82 setUserDataDir mbDatadir
83− JsonFilter.apply def args filterFile doc
83+ JSONFilter.apply def args filterFile doc
84 case filterRes of
84 case filterRes of
85 Left err -> Lua.raiseError (show err)
85 Left err -> Lua.raiseError (show err)
86 Right d -> (1 :: NumResults) <$ Lua.push d
86 Right d -> (1 :: NumResults) <$ Lua.push d