4b7bc40 · typeable/pandoc

git.iko.soy/typeable/pandoc

Renaming: Json -> JSON in modules and functions.

commit4b7bc40e8ba5a0981bd6429f48fa6acdb21d5d69 authorJohn MacFarlane <jgm@berkeley.edu> dateMon 15 Jan 2018, 10:46 (9 years ago) parentf114153

4 files changed+9−9

compare with master

unifiedsplit

pandoc.cabal+1−1 src/Text/Pandoc/Filter.hs+2−2 src/Text/Pandoc/Filter/Json.hs → src/Text/Pandoc/Filter/JSON.hs+1−1 src/Text/Pandoc/Lua/Module/Utils.hs+5−5

pandoc.cabal+1−1

@@ -500,7 +500,7 @@ library

500500 Text.Pandoc.BCP47,

501501 Text.Pandoc.Class

502502 other-modules: Text.Pandoc.Filter,

503− Text.Pandoc.Filter.Json,

503+ Text.Pandoc.Filter.JSON,

504504 Text.Pandoc.Filter.Lua,

505505 Text.Pandoc.Filter.Path,

506506 Text.Pandoc.Readers.Docx.Lists,

src/Text/Pandoc/Filter.hs+2−2

@@ -39,7 +39,7 @@ import Data.Foldable (foldrM)

3939import Text.Pandoc.Class (PandocIO)

4040import Text.Pandoc.Definition (Pandoc)

4141import Text.Pandoc.Options (ReaderOptions)

42−import qualified Text.Pandoc.Filter.Json as JsonFilter

42+import qualified Text.Pandoc.Filter.JSON as JSONFilter

4343import qualified Text.Pandoc.Filter.Lua as LuaFilter

4444

4545data Filter = LuaFilter FilePath

@@ -54,7 +54,7 @@ applyFilters :: ReaderOptions

5454applyFilters ropts filters args d = do

5555 foldrM ($) d $ map applyFilter filters

5656 where

57− applyFilter (JSONFilter f) = JsonFilter.apply ropts args f

57+ applyFilter (JSONFilter f) = JSONFilter.apply ropts args f

5858 applyFilter (LuaFilter f) = LuaFilter.apply ropts args f

5959

6060$(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

2727

2828Programmatically modifications of pandoc documents via JSON filters.

2929-}

30−module Text.Pandoc.Filter.Json (apply) where

30+module Text.Pandoc.Filter.JSON (apply) where

3131

3232import Control.Monad (unless, when)

3333import 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)

4040import qualified Data.Digest.Pure.SHA as SHA

4141import qualified Data.ByteString.Lazy as BSL

4242import qualified Foreign.Lua as Lua

43−import qualified Text.Pandoc.Filter.Json as JsonFilter

43+import qualified Text.Pandoc.Filter.JSON as JSONFilter

4444import qualified Text.Pandoc.Shared as Shared

4545

4646-- | Push the "pandoc.utils" module to the lua stack.

@@ -49,7 +49,7 @@ pushModule mbDatadir = do

4949 Lua.newtable

5050 addFunction "hierarchicalize" hierarchicalize

5151 addFunction "normalize_date" normalizeDate

52− addFunction "run_json_filter" (runJsonFilter mbDatadir)

52+ addFunction "run_json_filter" (runJSONFilter mbDatadir)

5353 addFunction "sha1" sha1

5454 addFunction "stringify" stringify

5555 addFunction "to_roman_numeral" toRomanNumeral

@@ -67,12 +67,12 @@ normalizeDate :: String -> Lua (Lua.Optional String)

6767normalizeDate = return . Lua.Optional . Shared.normalizeDate

6868

6969-- | Run a JSON filter on the given document.

70−runJsonFilter :: Maybe FilePath

70+runJSONFilter :: Maybe FilePath

7171 -> Pandoc

7272 -> FilePath

7373 -> Lua.Optional [String]

7474 -> Lua NumResults

75−runJsonFilter mbDatadir doc filterFile optArgs = do

75+runJSONFilter mbDatadir doc filterFile optArgs = do

7676 args <- case Lua.fromOptional optArgs of

7777 Just x -> return x

7878 Nothing -> do

@@ -80,7 +80,7 @@ runJsonFilter mbDatadir doc filterFile optArgs = do

8080 (:[]) <$> popValue

8181 filterRes <- Lua.liftIO . runIO $ do

8282 setUserDataDir mbDatadir

83− JsonFilter.apply def args filterFile doc

83+ JSONFilter.apply def args filterFile doc

8484 case filterRes of

8585 Left err -> Lua.raiseError (show err)

8686 Right d -> (1 :: NumResults) <$ Lua.push d