b617cce · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

Biblio: Changed type of processBiblio.

b617cceJohn MacFarlane14 years ago

src/Text/Pandoc/Biblio.hs+19−24

compare with master

unifiedsplit

@@ -30,7 +30,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

30module Text.Pandoc.Biblio ( processBiblio ) where

32import Data.List

33−import Data.Unique

34import Data.Char ( isDigit, isPunctuation )

33import Data.Char ( isDigit, isPunctuation )

35import qualified Data.Map as M

34import qualified Data.Map as M

36import Text.CSL hiding ( Cite(..), Citation(..) )

35import Text.CSL hiding ( Cite(..), Citation(..) )

@@ -38,30 +37,24 @@ import qualified Text.CSL as CSL ( Cite(..) )

38import Text.Pandoc.Definition

37import Text.Pandoc.Definition

39import Text.Pandoc.Generic

38import Text.Pandoc.Generic

40import Text.Pandoc.Shared (stringify)

39import Text.Pandoc.Shared (stringify)

41−import Text.Parsec

40+import Text.Parsec hiding (State)

42import Control.Monad

41import Control.Monad

42+import Control.Monad.State

44-- | Process a 'Pandoc' document by adding citations formatted

45-- according to a CSL style, using 'citeproc' from citeproc-hs.

46−processBiblio :: String -> Maybe FilePath -> [Reference] -> Pandoc

46+processBiblio :: Style -> [Reference] -> Pandoc -> Pandoc

47− -> IO Pandoc

48−processBiblio cslStr abrfile r p

47+processBiblio _ [] p = p

49− = if null r then return p

48+processBiblio style r p =

50− else do

51− csl <- parseCSL cslStr

52− abbrevs <- case abrfile of

53− Just f -> readJsonAbbrevFile f

54− Nothing -> return []

55− p' <- bottomUpM setHash p

49+ let p' = evalState (bottomUpM setHash p) 1

56− let grps = queryWith getCitation p'

50+ grps = queryWith getCitation p'

57− style = csl { styleAbbrevs = abbrevs }

58− result = citeproc procOpts style r (setNearNote style $

51+ result = citeproc procOpts style r (setNearNote style $

59− map (map toCslCite) grps)

52+ map (map toCslCite) grps)

60− cits_map = M.fromList $ zip grps (citations result)

53+ cits_map = M.fromList $ zip grps (citations result)

61− biblioList = map (renderPandoc' style) (bibliography result)

54+ biblioList = map (renderPandoc' style) (bibliography result)

62− Pandoc m b = bottomUp (processCite style cits_map) p'

55+ Pandoc m b = bottomUp (processCite style cits_map) p'

63− b' = bottomUp mvPunct $ deNote b

56+ b' = bottomUp mvPunct $ deNote b

64− return $ Pandoc m $ b' ++ biblioList

57+ in Pandoc m $ b' ++ biblioList

66-- | Substitute 'Cite' elements with formatted citations.

59-- | Substitute 'Cite' elements with formatted citations.

67processCite :: Style -> M.Map [Citation] [FormattedOutput] -> Inline -> Inline

60processCite :: Style -> M.Map [Citation] [FormattedOutput] -> Inline -> Inline

@@ -116,9 +109,11 @@ getCitation :: Inline -> [[Citation]]

116getCitation i | Cite t _ <- i = [t]

109getCitation i | Cite t _ <- i = [t]

117 | otherwise = []

110 | otherwise = []

118

111

119−setHash :: Citation -> IO Citation

112+setHash :: Citation -> State Int Citation

120−setHash (Citation i p s cm nn _)

113+setHash (Citation i p s cm nn _) = do

114+ ident <- get

115+ put $ ident + 1

121− = hashUnique `fmap` newUnique >>= return . Citation i p s cm nn

116+ return $ Citation i p s cm nn ident

122

117

123toCslCite :: Citation -> CSL.Cite

118toCslCite :: Citation -> CSL.Cite

124toCslCite c

119toCslCite c

src/pandoc.hs+5−2

@@ -1007,7 +1007,8 @@ main = do

1007 doc2 <- do

1008 if citeMethod == Citeproc && not (null refs)

1009 then do

1010+ csl <- CSL.parseCSL =<<

1010− csl <- case mbCsl of

1011+ case mbCsl of

1011 Nothing -> readDataFile datadir "default.csl"

1012 Nothing -> readDataFile datadir "default.csl"

1012 Just cslfile -> do

1013 Just cslfile -> do

1013 exists <- doesFileExist cslfile

1014 exists <- doesFileExist cslfile

@@ -1018,7 +1019,9 @@ main = do

1018 print csldir

1019 print csldir

1019 readDataFile datadir (replaceDirectory

1020 readDataFile datadir (replaceDirectory

1020 (replaceExtension cslfile "csl") csldir)

1021 (replaceExtension cslfile "csl") csldir)

1022+ abbrevs <- maybe (return []) CSL.readJsonAbbrevFile cslabbrevs

1023+ let csl' = csl { CSL.styleAbbrevs = abbrevs }

1021− processBiblio csl cslabbrevs refs doc1

1024+ return $ processBiblio csl' refs doc1

1022 else return doc1

1025 else return doc1

1023

1026

1024 let writeBinary :: B.ByteString -> IO ()

1027 let writeBinary :: B.ByteString -> IO ()