diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,11 @@ # citeproc changelog -## 0.1 +## 0.1.0.2 -* Initial release. + * Don't enclose contents of e:choose in a Formatted element (#19). + The e:choose element is "transparent" and the delimiter + controlling its formatting should be inserted between + the items it returns. ## 0.1.0.1 @@ -20,4 +23,8 @@ * Remove unneeded import * `citeproc` executable: strip BOM before parsing style (#18). + +## 0.1 + + * Initial release. diff --git a/citeproc.cabal b/citeproc.cabal --- a/citeproc.cabal +++ b/citeproc.cabal @@ -1,6 +1,6 @@ cabal-version: 2.2 name: citeproc -version: 0.1.0.1 +version: 0.1.0.2 synopsis: Generates citations and bibliography from CSL styles. description: citeproc parses CSL style files and uses them to generate a list of formatted citations and bibliography diff --git a/man/citeproc.1 b/man/citeproc.1 --- a/man/citeproc.1 +++ b/man/citeproc.1 @@ -1,6 +1,6 @@ -.\" Automatically generated by Pandoc 2.11 +.\" Automatically generated by Pandoc 2.11.0.1 .\" -.TH "citeproc" "1" "" "citeproc 0.1.0.1" "" +.TH "citeproc" "1" "" "citeproc 0.1.0.2" "" .hy .SH NAME .PP diff --git a/src/Citeproc/Eval.hs b/src/Citeproc/Eval.hs --- a/src/Citeproc/Eval.hs +++ b/src/Citeproc/Eval.hs @@ -837,7 +837,7 @@ Just ref -> do k <- normalizeSortKey . toText . renderOutput defaultCiteprocOptions . grouped - <$> withRWS newContext (mapM eElement elts) + <$> withRWS newContext (mconcat <$> mapM eElement elts) return $ SortKeyValue (sortdir, Just k) where newContext oldContext s = @@ -952,7 +952,7 @@ }, st{ stateReference = ref , stateUsedYearSuffix = False })) - $ do xs <- mapM eElement (layoutElements layout) + $ do xs <- mconcat <$> mapM eElement (layoutElements layout) let mblang = parseLang <$> (lookupVariable "language" ref >>= valToText) @@ -1081,21 +1081,23 @@ | otherwise -> (IbidWithLocator :) . (Ibid :) else id) $ [Subsequent] - -eElement :: CiteprocOutput a => Element a -> Eval a (Output a) + +eElement :: CiteprocOutput a => Element a -> Eval a [Output a] eElement (Element etype formatting) = case etype of EText textType -> - withFormatting formatting (eText textType) - ENumber var nform -> withFormatting formatting (eNumber var nform) - EGroup isMacro els -> eGroup isMacro formatting els + (:[]) <$> withFormatting formatting (eText textType) + ENumber var nform -> + (:[]) <$> withFormatting formatting (eNumber var nform) + EGroup isMacro els -> + (:[]) <$> eGroup isMacro formatting els EChoose chooseParts -> eChoose chooseParts ELabel var termform pluralize -> - eLabel var termform pluralize formatting + (:[]) <$> eLabel var termform pluralize formatting EDate var dateType mbShowDateParts dps -> - eDate var dateType mbShowDateParts dps formatting + (:[]) <$> eDate var dateType mbShowDateParts dps formatting ENames vars namesFormat subst -> - eNames vars namesFormat subst formatting + (:[]) <$> eNames vars namesFormat subst formatting withFormatting :: CiteprocOutput a => Formatting -> Eval a (Output a) -> Eval a (Output a) @@ -1715,12 +1717,12 @@ st)) $ eSubstitute els return $ case res of - Tagged TagNames{} _ -> formatted formatting [res] + (Tagged TagNames{} _:_) -> formatted formatting res -- important to have title (or whatever) tagged as -- substituting for Names, for purposes of -- disambiguation: _ -> formatted formatting - [Tagged (TagNames "" namesFormat []) res] + [Tagged (TagNames "" namesFormat []) $ grouped res] _ -> return NullOutput else do xs <- mapM (formatNames namesFormat nameFormat nameFormatting) @@ -1741,15 +1743,15 @@ eSubstitute :: CiteprocOutput a => [Element a] - -> Eval a (Output a) + -> Eval a [Output a] eSubstitute els = case els of - [] -> return NullOutput + [] -> return [] (e:es) -> do res <- eElement e - case res of - NullOutput -> eSubstitute es - _ -> return res + case filter (/= NullOutput) res of + [] -> eSubstitute es + xs -> return xs formatNames :: CiteprocOutput a => NamesFormat @@ -2161,7 +2163,7 @@ -- calls at least one variable but all of the variables -- it calls are empty. VarCount oldVars oldNonempty <- gets stateVarCount - xs <- mapM eElement els + xs <- mconcat <$> mapM eElement els VarCount newVars newNonempty <- gets stateVarCount -- see -- https://github.com/citation-style-language/documentation/blob/master/specification.rst#group @@ -2175,8 +2177,8 @@ else NullOutput eChoose :: CiteprocOutput a - => [(Match, [Condition], [Element a])] -> Eval a (Output a) -eChoose [] = return NullOutput + => [(Match, [Condition], [Element a])] -> Eval a [Output a] +eChoose [] = return [] eChoose ((match, conditions, els):rest) = do ref <- gets stateReference label <- asks contextLabel @@ -2218,7 +2220,7 @@ MatchAny -> any testCondition MatchNone -> not . any testCondition) conditions if matched - then grouped <$> mapM eElement els + then mconcat <$> mapM eElement els else eChoose rest diff --git a/test/extra/issue19.txt b/test/extra/issue19.txt new file mode 100644 --- /dev/null +++ b/test/extra/issue19.txt @@ -0,0 +1,244 @@ +>>===== MODE =====>> +bibliography +<<===== MODE =====<< + + + + +>>===== RESULT =====>> +
+
Díaz-León, E. (2013). What Is Social Construction? Eur J Philos 1–16.
+
Díaz-León, E. (2015). In Defence of Historical Constructivism about Races. Ergo, an Open Access Journal of Philosophy 2.
+
Díaz-León, E. (2016). <i>Wo> as a Politically Significant Term: A Solution to the Puzzle. Hypatia 245–258.
+
+<<===== RESULT =====<< + + +>>===== CSL =====>> + + +<<===== CSL =====<< + + + + +>>===== INPUT =====>> +[ + { + "id": "diaz2013", + "type": "article-journal", + "title": "What Is Social Construction?", + "container-title": "European Journal of Philosophy", + "page": "1-16", + "URL": "http://onlinelibrary.wiley.com/doi/10.1111/ejop.12033/abstract", + "DOI": "10.1111/ejop.12033", + "ISSN": "1468-0378", + "language": "en", + "author": [ + { + "family": "Díaz-León", + "given": "Esa" + } + ], + "issued": { + "date-parts": [ + [ + 2013, + 5, + 1 + ] + ] + }, + "accessed": { + "date-parts": [ + [ + 2015, + 11, + 14 + ] + ] + }, + "container-title-short": "Eur J Philos" + }, + { + "id": "diaz2015", + "type": "article-journal", + "title": "In Defence of Historical Constructivism about Races", + "container-title": "Ergo, an Open Access Journal of Philosophy", + "volume": "2", + "URL": "http://hdl.handle.net/2027/spo.12405314.0002.021", + "DOI": "10.3998/ergo.12405314.0002.021", + "ISSN": "2330-4014", + "author": [ + { + "family": "Díaz-León", + "given": "Esa" + } + ], + "issued": { + "date-parts": [ + [ + 2015 + ] + ] + } + }, + { + "id": "diaz2016", + "type": "article-journal", + "title": "Wo> as a Politically Significant Term: A Solution to the Puzzle", + "container-title": "Hypatia", + "page": "245-258", + "URL": "http://onlinelibrary.wiley.com.uaccess.univie.ac.at/doi/10.1111/hypa.12234/abstract", + "DOI": "10.1111/hypa.12234", + "ISSN": "1527-2001", + "title-short": "Woman as a Politically Significant Term", + "language": "en", + "author": [ + { + "family": "Díaz-León", + "given": "Esa" + } + ], + "issued": { + "date-parts": [ + [ + 2016, + 2, + 1 + ] + ] + }, + "accessed": { + "date-parts": [ + [ + 2016, + 2, + 18 + ] + ] + }, + "container-title-short": "Hypatia" + } +] +<<===== INPUT =====<< + + +>>===== VERSION =====>> +1.0 +<<===== VERSION =====<< +