diff --git a/changelog b/changelog
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+pandoc-citeproc (0.14.1.5)
+
+ * Fixed 'capitalize-first' when the element begins with emphasis
+ or some other inline container. Closes #322.
+ * test-pandoc-citeproc: make --accept work with biblio2yaml tests.
+
pandoc-citeproc (0.14.1.4)
* Fixed sort order bugs (#320):
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.14.1.4
+version: 0.14.1.5
cabal-version: >= 1.12
synopsis: Supports using pandoc with citeproc
diff --git a/src/Text/CSL/Eval/Output.hs b/src/Text/CSL/Eval/Output.hs
--- a/src/Text/CSL/Eval/Output.hs
+++ b/src/Text/CSL/Eval/Output.hs
@@ -213,7 +213,7 @@
_ -> ils
text_case (Formatted []) = Formatted []
- text_case (Formatted ils@(i:is))
+ text_case (Formatted ils@(i:is'))
| noCase f = Formatted [Span ("",["nocase"],[]) ils]
| otherwise = Formatted $
case textCase f of
@@ -221,7 +221,10 @@
"uppercase" -> walk uppercaseStr ils
"capitalize-all" -> walk capitalizeStr ils
"title" -> titlecase ils
- "capitalize-first" -> walk capitalizeStr i : is
+ "capitalize-first"
+ -> case i of
+ Str cs -> Str (capitalize cs) : is'
+ _ -> unTitlecase [i] ++ is'
"sentence" -> unTitlecase ils
_ -> ils
diff --git a/src/Text/CSL/Util.hs b/src/Text/CSL/Util.hs
--- a/src/Text/CSL/Util.hs
+++ b/src/Text/CSL/Util.hs
@@ -344,8 +344,8 @@
go acc (Quoted qt xs) = (:acc) <$> (Quoted qt <$> caseTransform xform xs)
go acc (Emph xs) = (:acc) <$> (Emph <$> caseTransform xform xs)
go acc (Strong xs) = (:acc) <$> (Strong <$> caseTransform xform xs)
- go acc (Link at xs t) = (:acc) <$> (Link at <$> caseTransform xform xs <*> pure t)
- go acc (Image at xs t) = (:acc) <$> (Link at <$> caseTransform xform xs <*> pure t)
+ go acc (Link at xs t) = (:acc) <$> (Link at <$> caseTransform xform xs <*> pure t)
+ go acc (Image at xs t) = (:acc) <$> (Link at <$> caseTransform xform xs <*> pure t)
go acc (Span attr xs) = (:acc) <$> (Span attr <$> caseTransform xform xs)
go acc x = return $ x : acc
diff --git a/tests/annales.csl b/tests/annales.csl
new file mode 100644
--- /dev/null
+++ b/tests/annales.csl
@@ -0,0 +1,334 @@
+
+
diff --git a/tests/issue322.expected.native b/tests/issue322.expected.native
new file mode 100644
--- /dev/null
+++ b/tests/issue322.expected.native
@@ -0,0 +1,5 @@
+Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/annales.csl"]),("references",MetaList [MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Timmory"]),("given",MetaInlines [Str "Fran\231ois"])])]),("container-title",MetaInlines [Str "L\8217\201cran",Space,Str "fran\231ais"]),("id",MetaInlines [Str "timmory__justice_1950"]),("issue",MetaInlines [Str "272"]),("issued",MetaList [MetaMap (fromList [("day",MetaString "25"),("month",MetaString "9"),("year",MetaString "1950")])]),("language",MetaInlines [Str "fr-FR"]),("page",MetaInlines [Str "12"]),("title",MetaInlines [Emph [Str "Justice",Space,Str "est",Space,Str "faite"],Space,Str ":",Space,Str "soyons",Space,Str "justes"]),("type",MetaInlines [Str "article-journal"])])])]})
+[Para [Str "Foo",Cite [Citation {citationId = "timmory__justice_1950", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1}] [Note [Para [Str "Fran\231ois",Space,SmallCaps [Str "Timmory"],Str ",",Space,Str "\171\160",Emph [Str "Justice",Space,Str "est",Space,Str "faite"],Space,Str ":",Space,Str "soyons",Space,Str "justes\160\187,",Space,Emph [Str "L\8217\201cran",Space,Str "fran\231ais"],Str ",",Space,Str "1950,",Space,Str "n\7506\160\&272,",Space,Str "p.",Space,Str "12."]]],Str "."]
+,Div ("refs",["references"],[])
+ [Div ("ref-timmory__justice_1950",[],[])
+ [Para [Str "Fran\231ois",Space,SmallCaps [Str "Timmory"],Str ",",Space,Str "\171\160",Emph [Str "Justice",Space,Str "est",Space,Str "faite"],Space,Str ":",Space,Str "soyons",Space,Str "justes\160\187,",Space,Emph [Str "L\8217\201cran",Space,Str "fran\231ais"],Str ",",Space,Str "1950,",Space,Str "n\7506\160\&272,",Space,Str "p.",Space,Str "12."]]]]
diff --git a/tests/issue322.in.native b/tests/issue322.in.native
new file mode 100644
--- /dev/null
+++ b/tests/issue322.in.native
@@ -0,0 +1,2 @@
+Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/annales.csl"]),("references",MetaList [MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Timmory"]),("given",MetaInlines [Str "Fran\231ois"])])]),("container-title",MetaInlines [Str "L\8217\201cran",Space,Str "fran\231ais"]),("id",MetaInlines [Str "timmory__justice_1950"]),("issue",MetaInlines [Str "272"]),("issued",MetaList [MetaMap (fromList [("day",MetaString "25"),("month",MetaString "9"),("year",MetaString "1950")])]),("language",MetaInlines [Str "fr-FR"]),("page",MetaInlines [Str "12"]),("title",MetaInlines [Emph [Str "Justice",Space,Str "est",Space,Str "faite"],Space,Str ":",Space,Str "soyons",Space,Str "justes"]),("type",MetaInlines [Str "article-journal"])])])]})
+[Para [Str "Foo",Cite [Citation {citationId = "timmory__justice_1950", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [Str "[@timmory__justice_1950]"],Str "."]]
diff --git a/tests/jats.csl b/tests/jats.csl
new file mode 100644
--- /dev/null
+++ b/tests/jats.csl
@@ -0,0 +1,208 @@
+
+
+
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,7 +1,6 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE ScopedTypeVariables #-}
module Main where
-import Control.Monad (when)
import qualified Data.Aeson as Aeson
import Data.List (isSuffixOf)
import Data.Maybe (fromMaybe)
@@ -29,7 +28,7 @@
citeprocTests <- mapM (testCase regenerate) testnames
fs <- filter (\f -> takeExtension f `elem` [".bibtex",".biblatex"])
`fmap` getDirectoryContents "tests/biblio2yaml"
- biblio2yamlTests <- mapM biblio2yamlTest fs
+ biblio2yamlTests <- mapM (biblio2yamlTest regenerate) fs
let allTests = citeprocTests ++ biblio2yamlTests
let numpasses = length $ filter (== Passed) allTests
let numskipped = length $ filter (== Skipped) allTests
@@ -71,17 +70,21 @@
let outDoc = fromMaybe mempty $Aeson.decode jsonOut
if outDoc == expectedDoc
then err "PASSED" >> return Passed
- else do
- err "FAILED"
- showDiff (writeNative expectedDoc) (writeNative outDoc)
- when regenerate $
- UTF8.writeFile ("tests/" ++ csl ++ ".expected.native") $
+ else
+ if regenerate
+ then do
+ UTF8.writeFile ("tests/" ++ csl ++ ".expected.native") $
#if MIN_VERSION_pandoc(1,19,0)
- writeNative outDoc
+ writeNative outDoc
#else
- writeNative outDoc
+ writeNative outDoc
#endif
- return Failed
+ err "PASSED (accepted)"
+ return Passed
+ else do
+ err "FAILED"
+ showDiff (writeNative expectedDoc) (writeNative outDoc)
+ return Failed
else do
err "ERROR"
err $ "Error status " ++ show ec
@@ -99,8 +102,8 @@
_ <- rawSystem "diff" ["-U1","expected","actual"]
setCurrentDirectory oldDir
-biblio2yamlTest :: String -> IO TestResult
-biblio2yamlTest fp = do
+biblio2yamlTest :: Bool -> String -> IO TestResult
+biblio2yamlTest regenerate fp = do
hPutStr stderr $ "[biblio2yaml/" ++ fp ++ "] "
let yamld = "tests/biblio2yaml/"
#if MIN_VERSION_pandoc(2,0,0)
@@ -129,10 +132,24 @@
then do
if expected == result
then err "PASSED" >> return Passed
- else do
- err $ "FAILED"
- showDiff expected result
- return Failed
+ else
+ if regenerate
+ then do
+ let accepted = bib ++ result
+#if MIN_VERSION_pandoc(2,0,0)
+ p2version <- doesFileExist (yamld ++ "/pandoc-2/" ++ fp)
+ UTF8.writeFile (if p2version
+ then (yamld ++ "/pandoc-2/" ++ fp)
+ else (yamld ++ fp)) accepted
+#else
+ UTF8.writeFile (yamld ++ fp) accepted
+#endif
+ err "PASSED (accepted)"
+ return Passed
+ else do
+ err $ "FAILED"
+ showDiff expected result
+ return Failed
else do
err "ERROR"
err $ "Error status " ++ show ec