diff --git a/changelog b/changelog
--- a/changelog
+++ b/changelog
@@ -1,3 +1,16 @@
+pandoc-citeproc (0.10.3)
+
+ * Update to work with pandoc 1.19 (including writerStandalone API change).
+ * Updated test case to use bracketed_spans. Note: this means that tests
+ will fail unless pandoc 1.19 is used.
+ * Fixed pluralization with label for issue (#267).
+ * Factored out `comb` in Text.CSL.Pandoc.
+ * Make it clearer when errors concern CSL parsing (#219).
+ Errors in CSL parsing now point to the CSL file specifically.
+ We convert any error thrown in CSL parsing into an XMLException
+ (from xml-conduit), so the file path will be shown.
+ * Handle EDTF dates in bibtex bibliographies (#240).
+
pandoc-citeproc (0.10.2.2)
* Fix overlapping instances with aeson-1.0.2.1 (#263).
diff --git a/pandoc-citeproc.cabal b/pandoc-citeproc.cabal
--- a/pandoc-citeproc.cabal
+++ b/pandoc-citeproc.cabal
@@ -1,5 +1,5 @@
name: pandoc-citeproc
-version: 0.10.2.2
+version: 0.10.3
cabal-version: >= 1.12
synopsis: Supports using pandoc with citeproc
@@ -97,7 +97,7 @@
build-depends: containers, directory, mtl,
bytestring, filepath,
pandoc-types >= 1.16 && < 1.18,
- pandoc >= 1.16 && < 1.19,
+ pandoc >= 1.16 && < 1.20,
tagsoup,
aeson >= 0.7 && < 1.1, text, vector,
xml-conduit >= 1.2 && < 1.5,
@@ -142,7 +142,7 @@
ghc-prof-options: -fprof-auto-exported -rtsopts
build-depends: base >= 4, pandoc-citeproc,
pandoc-types >= 1.16 && < 1.18,
- pandoc >= 1.16 && < 1.19,
+ pandoc >= 1.16 && < 1.20,
aeson,
aeson-pretty >= 0.8, yaml, bytestring, syb, attoparsec, text,
filepath
@@ -164,7 +164,7 @@
Buildable: False
build-depends: base >= 4, aeson, directory, text,
pandoc-types >= 1.16 && < 1.18,
- pandoc >= 1.16 && < 1.19,
+ pandoc >= 1.16 && < 1.20,
filepath,
bytestring, pandoc-citeproc, process, temporary >= 1.1,
yaml >= 0.8.8.7, containers >= 0.4, vector >= 0.10
@@ -178,7 +178,7 @@
Hs-Source-Dirs: tests, prelude
build-depends: base >= 4, aeson, directory, text,
pandoc-types >= 1.16 && < 1.18,
- pandoc >= 1.16 && < 1.19, filepath,
+ pandoc >= 1.16 && < 1.20, filepath,
bytestring, pandoc-citeproc, process, temporary >= 1.1,
yaml >= 0.8.8.7
default-language: Haskell2010
diff --git a/src/Text/CSL/Eval/Names.hs b/src/Text/CSL/Eval/Names.hs
--- a/src/Text/CSL/Eval/Names.hs
+++ b/src/Text/CSL/Eval/Names.hs
@@ -350,6 +350,7 @@
form (\fm' -> return . flip OLoc emptyFormatting . output fm') id l (isRange v)
| "page" <- s = checkPlural
| "volume" <- s = checkPlural
+ | "issue" <- s = checkPlural
| "ibid" <- s = format s p
| isRole s = do a <- getAgents' (if s == "editortranslator"
then "editor"
diff --git a/src/Text/CSL/Input/Bibtex.hs b/src/Text/CSL/Input/Bibtex.hs
--- a/src/Text/CSL/Input/Bibtex.hs
+++ b/src/Text/CSL/Input/Bibtex.hs
@@ -33,7 +33,8 @@
import System.Environment (getEnvironment)
import Text.CSL.Reference
import Text.CSL.Style (Formatted(..), Locale(..), CslTerm(..), Agent(..))
-import Text.CSL.Util (trim, onBlocks, unTitlecase, protectCase, splitStrWhen)
+import Text.CSL.Util (trim, onBlocks, unTitlecase, protectCase, splitStrWhen,
+ safeRead)
import Text.CSL.Parser (parseLocale)
import qualified Text.Pandoc.Walk as Walk
import qualified Text.Pandoc.UTF8 as UTF8
@@ -903,22 +904,53 @@
getDates f = getRawField f >>= parseDates
parseDates :: Monad m => String-> m [RefDate]
-parseDates = mapM parseDate . splitWhen (== '/')
+parseDates s
+ | '/' `elem` s = mapM parseDate . splitWhen (== '/') $ s
+ -- 199u EDTF format for a range:
+ | 'u' `elem` s = let s1 = map (\c -> if c == 'u' then '0' else c) s
+ s2 = map (\c -> if c == 'u' then '9' else c) s
+ in mapM parseDate [s1, s2]
+ | otherwise = mapM parseDate [s]
parseDate :: Monad m => String -> m RefDate
+-- EDTF format for year of more than 4 digits, starts with 'y':
+parseDate ('y':xs) = parseDate xs
+parseDate "open" = return RefDate { year = mempty,
+ month = mempty, season = mempty, day = mempty,
+ other = mempty, circa = False }
+parseDate "unknown" = return RefDate { year = mempty,
+ month = mempty, season = mempty, day = mempty,
+ other = mempty, circa = False }
parseDate s = do
+ let circa' = '~' `elem` s
let (year', month', day') =
- case splitWhen (== '-') s of
- [y] -> (y, mempty, mempty)
- [y,m] -> (y, m, mempty)
- [y,m,d] -> (y, m, d)
- _ -> (mempty, mempty, mempty)
- return RefDate { year = Literal $ dropWhile (=='0') year'
- , month = Literal $ dropWhile (=='0') month'
- , season = mempty
+ case splitWhen (== '-') $ filter (`notElem` "~?")
+ -- drop time component:
+ $ takeWhile (/='T') s of
+ -- initial - is negative year:
+ ["",y] -> ('-':y, mempty, mempty)
+ ["",y,m] -> ('-':y, m, mempty)
+ ["",y,m,d] -> ('-':y, m, d)
+ [y] -> (y, mempty, mempty)
+ [y,m] -> (y, m, mempty)
+ [y,m,d] -> (y, m, d)
+ _ -> (mempty, mempty, mempty)
+ let year'' = case safeRead year' of
+ -- EDTF 0 == CSL JSON -1 (1 BCE)
+ Just n | n <= 0 -> show (n - 1)
+ _ -> year'
+ let (season'', month'') = case month' of
+ "21" -> ("1","")
+ "22" -> ("2","")
+ "23" -> ("3","")
+ "24" -> ("4","")
+ _ -> ("", month')
+ return RefDate { year = Literal $ dropWhile (=='0') year''
+ , month = Literal $ dropWhile (=='0') month''
+ , season = Literal season''
, day = Literal $ dropWhile (=='0') day'
, other = mempty
- , circa = False
+ , circa = circa'
}
isNumber :: String -> Bool
diff --git a/src/Text/CSL/Pandoc.hs b/src/Text/CSL/Pandoc.hs
--- a/src/Text/CSL/Pandoc.hs
+++ b/src/Text/CSL/Pandoc.hs
@@ -33,6 +33,7 @@
import Text.CSL.Util (findFile, splitStrWhen, tr', parseRomanNumeral, trim)
import System.IO.Error (isDoesNotExistError)
import Data.Maybe (fromMaybe)
+import Text.XML (XMLException(..))
-- | Process a 'Pandoc' document by adding citations formatted
-- according to a CSL style. Add a bibliography (if one is called
@@ -167,7 +168,9 @@
else getDefaultCSL
Nothing -> getDefaultCSL
csl <- case cslfile of
- Just f | not (null f) -> readCSLFile mbLocale f
+ Just f | not (null f) -> E.catch
+ (readCSLFile mbLocale f) $ \e ->
+ E.throwIO (InvalidXMLFile f e)
_ -> do
-- get default CSL: look first in ~/.csl, and take
-- from distribution if not found
@@ -313,18 +316,20 @@
go' (Cite cs [Note [Para xs]] : ys) = comb (\zs -> [Cite cs zs]) xs ys
go' (Note [Para xs] : ys) = comb id xs ys
go' xs = xs
- removeLeadingPunct (Str [c] : s : xs)
- | isSpacy s && (c == ',' || c == '.' || c == ':') = xs
- removeLeadingPunct xs = xs
- comb f xs ys =
- let xs' = if startWithPunct ys && endWithPunct True xs
- then initInline $ removeLeadingPunct xs
- else removeLeadingPunct xs
- in f xs' ++ ys
sanitize :: [Block] -> [Block]
sanitize [Para xs] =
[Para $ toCapital xs ++ if endWithPunct False xs then [Space] else []]
sanitize bs = bs
+
+comb :: ([Inline] -> [Inline]) -> [Inline] -> [Inline] -> [Inline]
+comb f xs ys =
+ let xs' = if startWithPunct ys && endWithPunct True xs
+ then initInline $ removeLeadingPunct xs
+ else removeLeadingPunct xs
+ removeLeadingPunct (Str [c] : s : xs)
+ | isSpacy s && (c == ',' || c == '.' || c == ':') = xs
+ removeLeadingPunct xs = xs
+ in f xs' ++ ys
-- | Retrieve all citations from a 'Pandoc' docuument. To be used with
-- 'query'.
diff --git a/stack.yaml b/stack.yaml
--- a/stack.yaml
+++ b/stack.yaml
@@ -9,10 +9,9 @@
- '.'
- location:
git: https://github.com/jgm/pandoc.git
- commit: bd71569483e8b471bcd94203e6f7be6b47b65280
+ commit: fb8a2540bdb91eee0ecf620b4e9d7acf3d78042f
extra-deps:
-- texmath-0.8.6.6
- doctemplates-0.1.0.2
- pandoc-types-1.17.0.4
-- aeson-1.0.2.1
-resolver: lts-7.5
+- texmath-0.9
+resolver: lts-7.9
diff --git a/tests/biblio2yaml/book-averroes.biblatex b/tests/biblio2yaml/book-averroes.biblatex
--- a/tests/biblio2yaml/book-averroes.biblatex
+++ b/tests/biblio2yaml/book-averroes.biblatex
@@ -66,8 +66,7 @@
title: The epistle on the possibility of conjunction with the active intellect by
Ibn Rushd with the commentary of Moses Narboni
title-short: Possibility of conjunction
- collection-title: 'Moreshet: Studies in Jewish History, Literature
- and Thought'
+ collection-title: '[Moreshet: Studies in Jewish History, Literature and Thought]{.nocase}'
collection-number: '7'
publisher: Jewish Theological Seminary of America
publisher-place: New York
diff --git a/tests/biblio2yaml/edtf-date.biblatex b/tests/biblio2yaml/edtf-date.biblatex
new file mode 100644
--- /dev/null
+++ b/tests/biblio2yaml/edtf-date.biblatex
@@ -0,0 +1,98 @@
+@article{item3-3, date={1998/unknown}}
+@article{item3-4, date={1999/open}}
+@article{item3-10, date={2004-04-05T14:34:00}}
+@article{item5-1, date={0000}}
+@article{item5-2, date={-0876}}
+@article{item5-3, date={-0877/-0866}}
+@article{item5-5, date={-0343-02}}
+@article{item5-8, date={1723~}}
+@article{item5-9, date={1723?}}
+@article{item5-10, date={1723?~}}
+@article{item5-11, date={2004-22}}
+@article{item5-12, date={2004-24}}
+@article{item5-13, date={20uu}}
+@article{item5-14, date={y-123456789}}
+
+---
+references:
+- id: item3-3
+ type: article-journal
+ issued:
+ - year: '1998'
+ - {}
+
+- id: item3-4
+ type: article-journal
+ issued:
+ - year: '1999'
+ - {}
+
+- id: item3-10
+ type: article-journal
+ issued:
+ - year: '2004'
+ month: '4'
+ day: '5'
+
+- id: item5-1
+ type: article-journal
+ issued:
+ - year: '-1'
+
+- id: item5-2
+ type: article-journal
+ issued:
+ - year: '-877'
+
+- id: item5-3
+ type: article-journal
+ issued:
+ - year: '-878'
+ - year: '-867'
+
+- id: item5-5
+ type: article-journal
+ issued:
+ - year: '-344'
+ month: '2'
+
+- id: item5-8
+ type: article-journal
+ issued:
+ - year: '1723'
+ circa: '1'
+
+- id: item5-9
+ type: article-journal
+ issued:
+ - year: '1723'
+
+- id: item5-10
+ type: article-journal
+ issued:
+ - year: '1723'
+ circa: '1'
+
+- id: item5-11
+ type: article-journal
+ issued:
+ - year: '2004'
+ season: '2'
+
+- id: item5-12
+ type: article-journal
+ issued:
+ - year: '2004'
+ season: '4'
+
+- id: item5-13
+ type: article-journal
+ issued:
+ - year: '2000'
+ - year: '2099'
+
+- id: item5-14
+ type: article-journal
+ issued:
+ - year: '-123456790'
+...
diff --git a/tests/biblio2yaml/incollection.biblatex b/tests/biblio2yaml/incollection.biblatex
--- a/tests/biblio2yaml/incollection.biblatex
+++ b/tests/biblio2yaml/incollection.biblatex
@@ -112,8 +112,8 @@
given: Isadore
issued:
- year: '1979'
- title: The limitations of human knowledge according to Al-Farabi, ibn
- Bajja, and Maimonides
+ title: The limitations of human knowledge according to Al-Farabi, [ibn Bajja]{.nocase},
+ and Maimonides
title-short: Limitations of human knowledge
container-title: Studies in medieval Jewish history and literature
publisher: Harvard University Press
diff --git a/tests/biblio2yaml/itzhaki.biblatex b/tests/biblio2yaml/itzhaki.biblatex
--- a/tests/biblio2yaml/itzhaki.biblatex
+++ b/tests/biblio2yaml/itzhaki.biblatex
@@ -62,8 +62,7 @@
- year: '1996'
month: '3'
day: '11'
- title: Some remarks on ’t Hooft’s S-matrix for black
- holes
+ title: Some remarks on ’[t Hooft’s]{.nocase} S-matrix for black holes
version: '1'
annote: An online reference from arXiv. Note the eprint and eprinttype fields. Also
note that the arXiv reference is transformed into a clickable link if hyperref
diff --git a/tests/biblio2yaml/malinowski.biblatex b/tests/biblio2yaml/malinowski.biblatex
--- a/tests/biblio2yaml/malinowski.biblatex
+++ b/tests/biblio2yaml/malinowski.biblatex
@@ -49,7 +49,7 @@
issued:
- year: '1972'
title: 'Argonauts of the Western Pacific: An account of native enterprise and
- adventure in the Archipelagoes of Melanesian New Guinea'
+ adventure in the [Archipelagoes of Melanesian New Guinea]{.nocase}'
title-short: Argonauts
publisher: Routledge and Kegan Paul
publisher-place: London
diff --git a/tests/biblio2yaml/murray.biblatex b/tests/biblio2yaml/murray.biblatex
--- a/tests/biblio2yaml/murray.biblatex
+++ b/tests/biblio2yaml/murray.biblatex
@@ -85,8 +85,7 @@
issued:
- year: '1998'
title: 'Alkanethiolate gold cluster molecules with core diameters from 1.5 to
- 5.2 nm: Core and monolayer properties as a function
- of core size'
+ 5.2 [nm]{.nocase}: Core and monolayer properties as a function of core size'
title-short: Alkanethiolate gold cluster molecules
container-title: Langmuir
page: '17-30'
diff --git a/tests/biblio2yaml/pines.biblatex b/tests/biblio2yaml/pines.biblatex
--- a/tests/biblio2yaml/pines.biblatex
+++ b/tests/biblio2yaml/pines.biblatex
@@ -58,8 +58,8 @@
given: Isadore
issued:
- year: '1979'
- title: The limitations of human knowledge according to Al-Farabi, ibn
- Bajja, and Maimonides
+ title: The limitations of human knowledge according to Al-Farabi, [ibn Bajja]{.nocase},
+ and Maimonides
title-short: Limitations of human knowledge
container-title: Studies in medieval Jewish history and literature
publisher: Harvard University Press
diff --git a/tests/biblio2yaml/test-case-conversion.biblatex b/tests/biblio2yaml/test-case-conversion.biblatex
--- a/tests/biblio2yaml/test-case-conversion.biblatex
+++ b/tests/biblio2yaml/test-case-conversion.biblatex
@@ -59,9 +59,9 @@
given: Ann
issued:
- year: '2013'
- title: A title, in English, with a Proper Name and an ACRONYM and a camelCase
- word and some units, 400 nm, 3 cm,
- and a quote, *Alea iacta est*
+ title: A title, in English, with a Proper Name and an ACRONYM and a [camelCase]{.nocase}
+ word and some units, 400 [nm]{.nocase}, 3 [cm]{.nocase}, and a quote, *Alea [iacta
+ est]{.nocase}*
container-title: Journal
language: en-US
...
diff --git a/tests/biblio2yaml/textnormal.biblatex b/tests/biblio2yaml/textnormal.biblatex
--- a/tests/biblio2yaml/textnormal.biblatex
+++ b/tests/biblio2yaml/textnormal.biblatex
@@ -6,5 +6,5 @@
references:
- id: item1
type: book
- title: The title of this book
+ title: The title [of this book]{.nodecor}
...
diff --git a/tests/isme.csl b/tests/isme.csl
deleted file mode 100644
--- a/tests/isme.csl
+++ /dev/null
@@ -1,204 +0,0 @@
-
-
diff --git a/tests/test-pandoc-citeproc.hs b/tests/test-pandoc-citeproc.hs
--- a/tests/test-pandoc-citeproc.hs
+++ b/tests/test-pandoc-citeproc.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
module Main where
import JSON
import System.Process
@@ -82,7 +83,11 @@
showDiff (writeNative def expectedDoc) (writeNative def outDoc)
when regenerate $
UTF8.writeFile ("tests/" ++ csl ++ ".expected.native") $
- writeNative def{ writerStandalone = True } outDoc
+#if MIN_VERSION_pandoc(1,19,0)
+ writeNative def{ writerTemplate = Just "" } outDoc
+#else
+ writeNative def{ writerStandalone = True } outDoc
+#endif
return Failed
else do
err "ERROR"