diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # citeproc changelog +## 0.8.1.1 + + * Include `10/` prefix in short DOI links (#136). + + * Properly implement `demote-non-dropping-particle="sort-only"` (#141). + We had previously gotten sorting behavior right for this, but + not display behavior. + ## 0.8.1 * In Pandoc and CslJson CaseTransform, group punctuation in clusters (#127). 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.8.1 +version: 0.8.1.1 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/src/Citeproc/Eval.hs b/src/Citeproc/Eval.hs --- a/src/Citeproc/Eval.hs +++ b/src/Citeproc/Eval.hs @@ -1616,7 +1616,7 @@ coerce (referenceId ref) return NullOutput - "DOI" -> handleIdent fixShortDOI IdentDOI + "DOI" -> handleIdent id IdentDOI "PMCID" -> handleIdent id IdentPMCID "PMID" -> handleIdent id IdentPMID "URL" -> handleIdent id IdentURL @@ -2470,19 +2470,17 @@ maybe NullOutput (familyFormatting . (:[]) . literal) $ nameFamily name let suffix = maybe NullOutput literal $ nameSuffix name - let useSortOrder = inSortKey || - case nameAsSortOrder nameFormat of - Just NameAsSortOrderAll -> True - Just NameAsSortOrderFirst -> order == 1 - _ -> False + let nameAsSort = case nameAsSortOrder nameFormat of + Just NameAsSortOrderAll -> True + Just NameAsSortOrderFirst -> order == 1 + _ -> False return $ formatted formatting . (:[]) $ if isByzantineName name then case nameForm nameFormat of LongName - | demoteNonDroppingParticle == DemoteNever || - demoteNonDroppingParticle == DemoteSortOnly - , useSortOrder-> + | demoteNonDroppingParticle == DemoteNever + , inSortKey || nameAsSort -> familyAffixes [ nonDroppingParticle <+> family ] <:> @@ -2490,8 +2488,26 @@ [ given <+> droppingParticle ] <:> suffix + | demoteNonDroppingParticle == DemoteSortOnly + , inSortKey -> + familyAffixes + [ family ] <:> + givenAffixes + [ given <+> + droppingParticle <+> + nonDroppingParticle ] <:> + suffix + | demoteNonDroppingParticle == DemoteSortOnly + , nameAsSort -> + familyAffixes + [ nonDroppingParticle <+> + family ] <:> + givenAffixes + [ given <+> + droppingParticle ] <:> + suffix | demoteNonDroppingParticle == DemoteDisplayAndSort - , useSortOrder-> + , inSortKey || nameAsSort -> familyAffixes [ family ] <:> givenAffixes diff --git a/src/Citeproc/Types.hs b/src/Citeproc/Types.hs --- a/src/Citeproc/Types.hs +++ b/src/Citeproc/Types.hs @@ -1483,7 +1483,7 @@ identifierToURL :: Identifier -> Text identifierToURL ident = case ident of - IdentDOI t -> tolink "https://doi.org/" (fixShortDOI t) + IdentDOI t -> tolink "https://doi.org/" t IdentPMCID t -> tolink "https://www.ncbi.nlm.nih.gov/pmc/articles/" t IdentPMID t -> tolink "https://www.ncbi.nlm.nih.gov/pubmed/" t IdentURL t -> tolink "https://" t @@ -1492,6 +1492,8 @@ then x else pref <> x +{-# DEPRECATED fixShortDOI + "This function is no longer used and will be removed." #-} -- see https://shortdoi.org fixShortDOI :: Text -> Text fixShortDOI x = if "10/" `T.isPrefixOf` x diff --git a/test/extra/issue_141.txt b/test/extra/issue_141.txt new file mode 100644 --- /dev/null +++ b/test/extra/issue_141.txt @@ -0,0 +1,199 @@ +>>===== MODE =====>> +bibliography +<<===== MODE =====<< + +>>===== RESULT =====>> +
+
van Inwagen, Peter. 1975.
+
Lewis, David, and Stephanie R. Lewis. 1970.
+
+<<===== RESULT =====<< + + +>>===== CSL =====>> + + +<<===== CSL =====<< + + +>>===== CITATION-ITEMS =====>> +[ [ {"id":"lewis_dk-lewis:1970", "type":"normal"} ] +, [ {"id":"vaninwagen:1975", "type":"normal"} ] ] +<<===== CITATION-ITEMS =====<< + + + +>>===== INPUT =====>> +[ + { + "DOI": "10.1080/00048407012341181", + "author": [ + { + "family": "Lewis", + "given": "David" + }, + { + "family": "Lewis", + "given": "Stephanie R." + } + ], + "container-title": "Australasian Journal of Philosophy", + "id": "lewis_dk-lewis:1970", + "issue": "2", + "issued": { + "date-parts": [ + [ + 1970 + ] + ] + }, + "note": "reprinted in ", + "page": "206-212", + "title": "Holes", + "type": "article-journal", + "volume": "48" + }, + { + "DOI": "10.1007/bf01624156", + "author": [ + { + "family": "Inwagen", + "given": "Peter", + "non-dropping-particle": "van" + } + ], + "container-title": "Philosophical Studies", + "id": "vaninwagen:1975", + "issue": "3", + "issued": { + "date-parts": [ + [ + 1975 + ] + ] + }, + "page": "185-199", + "title": "The incompatibility of Free Will and Determinism", + "type": "article-journal", + "volume": "27" + } +] +<<===== INPUT =====<< + + +>>===== VERSION =====>> +1.0 +<<===== VERSION =====<< + diff --git a/test/extra/link_bibitems.txt b/test/extra/link_bibitems.txt --- a/test/extra/link_bibitems.txt +++ b/test/extra/link_bibitems.txt @@ -18,11 +18,11 @@ >>===== RESULT =====>>
Apple. 2010
-
Blueberry. 2011
+
Blueberry. 2011
Cherry. 2012
Durian. 2013
Elderberry. 2014
-
Fig. 2015
+
Fig. 2015
Grapefruit. 2016
Honeydew. 2017
diff --git a/test/extra/link_plainurls.txt b/test/extra/link_plainurls.txt --- a/test/extra/link_plainurls.txt +++ b/test/extra/link_plainurls.txt @@ -2,8 +2,6 @@ - plain URLs appearing in bibliography items should be linkified - when a link's prefix+anchor matches its target, the prefix should be included in the anchor - - shortDOIs should be handled correctly, meaning that every shortDOI of - the form 10/abcde should be converted to the DOI abcde >>===== MODE =====>> bibliography @@ -18,7 +16,7 @@ >>===== RESULT =====>>
Apple. AAAA. 2010. https://doi.org/10.1021/ja01577a030
-
Blueberry. BBBB. 2011. https://doi.org/bbbbb
+
Blueberry. BBBB. 2011. https://doi.org/10/bbbbb
Cherry. CCCC. 2012. https://pandoc.org/
Durian. DDDD. 2013. https://www.ncbi.nlm.nih.gov/pubmed/30310042
Elderberry. EEEE. 2014. https://www.ncbi.nlm.nih.gov/pmc/articles/PMC3531190
diff --git a/test/extra/link_titles.txt b/test/extra/link_titles.txt --- a/test/extra/link_titles.txt +++ b/test/extra/link_titles.txt @@ -17,11 +17,11 @@ >>===== RESULT =====>>
Apple. AAAA. 2010
-
Blueberry. BBBB. 2011
+
Blueberry. BBBB. 2011
Cherry. CCCC. 2012
Durian. DDDD. 2013
Elderberry. EEEE. 2014
-
Fig. FFFF. 2015
+
Fig. FFFF. 2015
Grapefruit. GGGG. 2016
Honeydew. HHHH. 2017