Renaming: Json -> JSON in modules and functions.
This commit is contained in:
parent
f114153481
commit
4b7bc40e8b
4 changed files with 9 additions and 9 deletions
|
@ -500,7 +500,7 @@ library
|
|||
Text.Pandoc.BCP47,
|
||||
Text.Pandoc.Class
|
||||
other-modules: Text.Pandoc.Filter,
|
||||
Text.Pandoc.Filter.Json,
|
||||
Text.Pandoc.Filter.JSON,
|
||||
Text.Pandoc.Filter.Lua,
|
||||
Text.Pandoc.Filter.Path,
|
||||
Text.Pandoc.Readers.Docx.Lists,
|
||||
|
|
|
@ -39,7 +39,7 @@ import Data.Foldable (foldrM)
|
|||
import Text.Pandoc.Class (PandocIO)
|
||||
import Text.Pandoc.Definition (Pandoc)
|
||||
import Text.Pandoc.Options (ReaderOptions)
|
||||
import qualified Text.Pandoc.Filter.Json as JsonFilter
|
||||
import qualified Text.Pandoc.Filter.JSON as JSONFilter
|
||||
import qualified Text.Pandoc.Filter.Lua as LuaFilter
|
||||
|
||||
data Filter = LuaFilter FilePath
|
||||
|
@ -54,7 +54,7 @@ applyFilters :: ReaderOptions
|
|||
applyFilters ropts filters args d = do
|
||||
foldrM ($) d $ map applyFilter filters
|
||||
where
|
||||
applyFilter (JSONFilter f) = JsonFilter.apply ropts args f
|
||||
applyFilter (JSONFilter f) = JSONFilter.apply ropts args f
|
||||
applyFilter (LuaFilter f) = LuaFilter.apply ropts args f
|
||||
|
||||
$(deriveJSON defaultOptions ''Filter)
|
||||
|
|
|
@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|||
|
||||
Programmatically modifications of pandoc documents via JSON filters.
|
||||
-}
|
||||
module Text.Pandoc.Filter.Json (apply) where
|
||||
module Text.Pandoc.Filter.JSON (apply) where
|
||||
|
||||
import Control.Monad (unless, when)
|
||||
import Control.Monad.Trans (MonadIO (liftIO))
|
|
@ -40,7 +40,7 @@ import Text.Pandoc.Lua.Util (addFunction, popValue)
|
|||
import qualified Data.Digest.Pure.SHA as SHA
|
||||
import qualified Data.ByteString.Lazy as BSL
|
||||
import qualified Foreign.Lua as Lua
|
||||
import qualified Text.Pandoc.Filter.Json as JsonFilter
|
||||
import qualified Text.Pandoc.Filter.JSON as JSONFilter
|
||||
import qualified Text.Pandoc.Shared as Shared
|
||||
|
||||
-- | Push the "pandoc.utils" module to the lua stack.
|
||||
|
@ -49,7 +49,7 @@ pushModule mbDatadir = do
|
|||
Lua.newtable
|
||||
addFunction "hierarchicalize" hierarchicalize
|
||||
addFunction "normalize_date" normalizeDate
|
||||
addFunction "run_json_filter" (runJsonFilter mbDatadir)
|
||||
addFunction "run_json_filter" (runJSONFilter mbDatadir)
|
||||
addFunction "sha1" sha1
|
||||
addFunction "stringify" stringify
|
||||
addFunction "to_roman_numeral" toRomanNumeral
|
||||
|
@ -67,12 +67,12 @@ normalizeDate :: String -> Lua (Lua.Optional String)
|
|||
normalizeDate = return . Lua.Optional . Shared.normalizeDate
|
||||
|
||||
-- | Run a JSON filter on the given document.
|
||||
runJsonFilter :: Maybe FilePath
|
||||
runJSONFilter :: Maybe FilePath
|
||||
-> Pandoc
|
||||
-> FilePath
|
||||
-> Lua.Optional [String]
|
||||
-> Lua NumResults
|
||||
runJsonFilter mbDatadir doc filterFile optArgs = do
|
||||
runJSONFilter mbDatadir doc filterFile optArgs = do
|
||||
args <- case Lua.fromOptional optArgs of
|
||||
Just x -> return x
|
||||
Nothing -> do
|
||||
|
@ -80,7 +80,7 @@ runJsonFilter mbDatadir doc filterFile optArgs = do
|
|||
(:[]) <$> popValue
|
||||
filterRes <- Lua.liftIO . runIO $ do
|
||||
setUserDataDir mbDatadir
|
||||
JsonFilter.apply def args filterFile doc
|
||||
JSONFilter.apply def args filterFile doc
|
||||
case filterRes of
|
||||
Left err -> Lua.raiseError (show err)
|
||||
Right d -> (1 :: NumResults) <$ Lua.push d
|
||||
|
|
Loading…
Add table
Reference in a new issue