@@ -30,7 +30,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
3030module Text.Pandoc.Biblio ( processBiblio ) where
3131
3232import Data.List
33−import Data.Unique
3433import Data.Char ( isDigit, isPunctuation )
3534import qualified Data.Map as M
3635import Text.CSL hiding ( Cite(..), Citation(..) )
@@ -38,30 +37,24 @@ import qualified Text.CSL as CSL ( Cite(..) )
3837import Text.Pandoc.Definition
3938import Text.Pandoc.Generic
4039import Text.Pandoc.Shared (stringify)
41−import Text.Parsec
40+import Text.Parsec hiding (State)
4241import Control.Monad
42+import Control.Monad.State
4343
4444-- | Process a 'Pandoc' document by adding citations formatted
4545-- according to a CSL style, using 'citeproc' from citeproc-hs.
46−processBiblio :: String -> Maybe FilePath -> [Reference] -> Pandoc
47− -> IO Pandoc
48−processBiblio cslStr abrfile r p
49− = if null r then return 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
56− let grps = queryWith getCitation p'
57− style = csl { styleAbbrevs = abbrevs }
58− result = citeproc procOpts style r (setNearNote style $
59− map (map toCslCite) grps)
60− cits_map = M.fromList $ zip grps (citations result)
61− biblioList = map (renderPandoc' style) (bibliography result)
62− Pandoc m b = bottomUp (processCite style cits_map) p'
63− b' = bottomUp mvPunct $ deNote b
64− return $ Pandoc m $ b' ++ biblioList
46+processBiblio :: Style -> [Reference] -> Pandoc -> Pandoc
47+processBiblio _ [] p = p
48+processBiblio style r p =
49+ let p' = evalState (bottomUpM setHash p) 1
50+ grps = queryWith getCitation p'
51+ result = citeproc procOpts style r (setNearNote style $
52+ map (map toCslCite) grps)
53+ cits_map = M.fromList $ zip grps (citations result)
54+ biblioList = map (renderPandoc' style) (bibliography result)
55+ Pandoc m b = bottomUp (processCite style cits_map) p'
56+ b' = bottomUp mvPunct $ deNote b
57+ in Pandoc m $ b' ++ biblioList
6558
6659-- | Substitute 'Cite' elements with formatted citations.
6760processCite :: Style -> M.Map [Citation] [FormattedOutput] -> Inline -> Inline
@@ -116,9 +109,11 @@ getCitation :: Inline -> [[Citation]]
116109getCitation i | Cite t _ <- i = [t]
117110 | otherwise = []
118111
119−setHash :: Citation -> IO Citation
120−setHash (Citation i p s cm nn _)
121− = hashUnique `fmap` newUnique >>= return . Citation i p s cm nn
112+setHash :: Citation -> State Int Citation
113+setHash (Citation i p s cm nn _) = do
114+ ident <- get
115+ put $ ident + 1
116+ return $ Citation i p s cm nn ident
122117
123118toCslCite :: Citation -> CSL.Cite
124119toCslCite c