Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-citeproc for openSUSE:Factory checked in at 2022-02-11 23:08:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-citeproc (Old) and /work/SRC/openSUSE:Factory/.ghc-citeproc.new.1956 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-citeproc" Fri Feb 11 23:08:40 2022 rev:16 rq:953442 version:0.6.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-citeproc/ghc-citeproc.changes 2021-11-11 21:36:26.548889548 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-citeproc.new.1956/ghc-citeproc.changes 2022-02-11 23:10:36.199153140 +0100 @@ -1,0 +2,8 @@ +Wed Jan 12 07:51:24 UTC 2022 - Peter Simons <[email protected]> + +- Update citeproc to version 0.6.0.1. + ## 0.6.0.1 + + * Ensure that position evaluates false inside bibliography (#99). + +------------------------------------------------------------------- Old: ---- citeproc-0.6.tar.gz New: ---- citeproc-0.6.0.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-citeproc.spec ++++++ --- /var/tmp/diff_new_pack.uG37fu/_old 2022-02-11 23:10:36.583154251 +0100 +++ /var/tmp/diff_new_pack.uG37fu/_new 2022-02-11 23:10:36.591154274 +0100 @@ -1,7 +1,7 @@ # # spec file for package ghc-citeproc # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %global pkg_name citeproc %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.6 +Version: 0.6.0.1 Release: 0 Summary: Generates citations and bibliography from CSL styles License: BSD-2-Clause ++++++ citeproc-0.6.tar.gz -> citeproc-0.6.0.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/citeproc-0.6/CHANGELOG.md new/citeproc-0.6.0.1/CHANGELOG.md --- old/citeproc-0.6/CHANGELOG.md 2021-10-23 01:47:29.000000000 +0200 +++ new/citeproc-0.6.0.1/CHANGELOG.md 2022-01-12 07:55:32.000000000 +0100 @@ -1,5 +1,9 @@ # citeproc changelog +## 0.6.0.1 + + * Ensure that position evaluates false inside bibliography (#99). + ## 0.6 * Add Term parameter to TagTerm [API change]. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/citeproc-0.6/Setup.hs new/citeproc-0.6.0.1/Setup.hs --- old/citeproc-0.6/Setup.hs 2011-09-27 03:36:31.000000000 +0200 +++ new/citeproc-0.6.0.1/Setup.hs 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -import Distribution.Simple -main = defaultMain diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/citeproc-0.6/citeproc.cabal new/citeproc-0.6.0.1/citeproc.cabal --- old/citeproc-0.6/citeproc.cabal 2021-10-23 01:47:55.000000000 +0200 +++ new/citeproc-0.6.0.1/citeproc.cabal 2022-01-12 07:55:40.000000000 +0100 @@ -1,6 +1,6 @@ cabal-version: 2.2 name: citeproc -version: 0.6 +version: 0.6.0.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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/citeproc-0.6/locales/hi-IN.xml new/citeproc-0.6.0.1/locales/hi-IN.xml --- old/citeproc-0.6/locales/hi-IN.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/citeproc-0.6.0.1/locales/hi-IN.xml 2021-09-08 07:23:29.000000000 +0200 @@ -0,0 +1,361 @@ +<?xml version="1.0" encoding="utf-8"?> +<locale xmlns="http://purl.org/net/xbiblio/csl"; version="1.0" xml:lang="hi-IN"> + <info> + <translator> + <name>Neha Srivastava</name> + <email>[email protected]</email> + </translator> + <rights license="http://creativecommons.org/licenses/by-sa/3.0/";>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights> + <updated>2021-02-22T12:13:02+05:30</updated> + </info> + <style-options punctuation-in-quote="true"/> + <date form="text"> + <date-part name="day" suffix=" "/> + <date-part name="month" suffix=", "/> + <date-part name="year"/> + </date> + <date form="numeric"> + <date-part name="day" form="numeric-leading-zeros" suffix="/"/> + <date-part name="month" form="numeric-leading-zeros" suffix="/"/> + <date-part name="year"/> + </date> + <terms> + <term name="accessed">??????????????? ???????????????</term> + <term name="and">???</term> + <term name="and others">??? ????????????</term> + <term name="anonymous">??????????????????</term> + <term name="anonymous" form="short">??????????????????</term> + <term name="at">??????</term> + <term name="available at">?????? ??????????????????</term> + <term name="by">??????????????????</term> + <term name="circa">?????? </term> + <term name="circa" form="short">??????.</term> + <term name="cited">????????????????????????</term> + <term name="edition"> + <single>?????????????????????</single> + <multiple>?????????????????????</multiple> + </term> + <term name="edition" form="short">ed.</term> + <term name="et-al">?????????????????????</term> + <term name="forthcoming">???????????????</term> + <term name="from">??????</term> + <term name="ibid">????????????</term> + <term name="in">?????????</term> + <term name="in press">?????????????????? ?????????</term> + <term name="internet">????????????????????????</term> + <term name="interview">?????????????????????????????????</term> + <term name="letter">????????????</term> + <term name="no date">?????????????????? ??????????????????</term> + <term name="no date" form="short">n.d.</term> + <term name="online">??????????????????</term> + <term name="presented at">?????? ????????????????????????</term> + <term name="reference"> + <single>??????????????????</single> + <multiple>references</multiple> + </term> + <term name="reference" form="short"> + <single>ref.</single> + <multiple>refs.</multiple> + </term> + <term name="retrieved">????????????????????????????????????</term> + <term name="scale">scale</term> + <term name="version">?????????????????????</term> + + <!-- ANNO DOMINI; BEFORE CHRIST --> + <term name="ad">CE</term> + <term name="bc">BCE</term> + + <!-- PUNCTUATION --> + <term name="open-quote">???</term> + <term name="close-quote">???</term> + <term name="open-inner-quote">???</term> + <term name="close-inner-quote">???</term> + <term name="page-range-delimiter">???</term> + + <!-- ORDINALS --> + <term name="ordinal">?????????</term> + <term name="ordinal-01"></term> + <term name="ordinal-02"></term> + <term name="ordinal-03"></term> + <term name="ordinal-04"></term> + <term name="ordinal-06"></term> + + <!-- LONG ORDINALS --> + <term name="long-ordinal-01">????????????</term> + <term name="long-ordinal-01" gender-form="feminine">????????????</term> + <term name="long-ordinal-02">???????????????</term> + <term name="long-ordinal-01" gender-form="feminine">???????????????</term> + <term name="long-ordinal-03">???????????????</term> + <term name="long-ordinal-03" gender-form="feminine">???????????????</term> + <term name="long-ordinal-04">????????????</term> + <term name="long-ordinal-04" gender-form="feminine">????????????</term> + <term name="long-ordinal-05">??????????????????</term> + <term name="long-ordinal-05" gender-form="feminine">??????????????????</term> + <term name="long-ordinal-06">?????????</term> + <term name="long-ordinal-06" gender-form="feminine">?????????</term> + <term name="long-ordinal-07">??????????????????</term> + <term name="long-ordinal-07" gender-form="feminine">??????????????????</term> + <term name="long-ordinal-08">???????????????</term> + <term name="long-ordinal-08" gender-form="feminine">???????????????</term> + <term name="long-ordinal-09">????????????</term> + <term name="long-ordinal-09" gender-form="feminine">???????????????</term> + <term name="long-ordinal-10">???????????????</term> + <term name="long-ordinal-10" gender-form="feminine">???????????????</term> + + <!-- LONG LOCATOR FORMS --> + <term name="book"> + <single>??????????????????</single> + <multiple>????????????????????????</multiple> + </term> + <term name="chapter"> + <single>??????????????????</single> + <multiple>??????????????????</multiple> + </term> + <term name="column"> + <single>????????????</single> + <multiple>columns</multiple> + </term> + <term name="figure"> + <single>???????????????</single> + <multiple>?????????????????????</multiple> + </term> + <term name="folio"> + <single>????????????</single> + <multiple>folios</multiple> + </term> + <term name="issue"> + <single>??????????????????</single> + <multiple>????????????????????????</multiple> + </term> + <term name="line"> + <single>??????????????????</single> + <multiple>???????????????????????????</multiple> + </term> + <term name="note"> + <single>?????????</single> + <multiple>notes</multiple> + </term> + <term name="opus"> + <single>opus</single> + <multiple>opera</multiple> + </term> + <term name="page"> + <single>???????????????</single> + <multiple>???????????????</multiple> + </term> + <term name="number-of-pages"> + <single>??????????????? ??????????????????</single> + <multiple>????????????????????? ?????? ??????????????????</multiple> + </term> + <term name="paragraph"> + <single>????????????????????????</single> + <multiple>paragraphs</multiple> + </term> + <term name="part"> + <single>?????????</single> + <multiple>parts</multiple> + </term> + <term name="section"> + <single>??????????????????</single> + <multiple>sections</multiple> + </term> + <term name="sub verbo"> + <single>sub verbo</single> + <multiple>sub verbis</multiple> + </term> + <term name="verse"> + <single>??????</single> + <multiple>verses</multiple> + </term> + <term name="volume"> + <single>?????????????????????</single> + <multiple>??????????????????????????????</multiple> + </term> + + <!-- SHORT LOCATOR FORMS --> + <term name="book" form="short"> + <single>bk.</single> + <multiple>bks.</multiple> + </term> + <term name="chapter" form="short"> + <single>chap.</single> + <multiple>chaps.</multiple> + </term> + <term name="column" form="short"> + <single>col.</single> + <multiple>cols.</multiple> + </term> + <term name="figure" form="short"> + <single>fig.</single> + <multiple>figs.</multiple> + </term> + <term name="folio" form="short"> + <single>fol.</single> + <multiple>fols.</multiple> + </term> + <term name="issue" form="short"> + <single>no.</single> + <multiple>nos.</multiple> + </term> + <term name="line" form="short"> + <single>l.</single> + <multiple>ll.</multiple> + </term> + <term name="note" form="short"> + <single>n.</single> + <multiple>nn.</multiple> + </term> + <term name="opus" form="short"> + <single>op.</single> + <multiple>opp.</multiple> + </term> + <term name="page" form="short"> + <single>??????.</single> + <multiple>??????.</multiple> + </term> + <term name="number-of-pages" form="short"> + <single>??????. ???.</single> + <multiple>??????. ???.</multiple> + </term> + <term name="paragraph" form="short"> + <single>para.</single> + <multiple>paras.</multiple> + </term> + <term name="part" form="short"> + <single>pt.</single> + <multiple>pts.</multiple> + </term> + <term name="section" form="short"> + <single>sec.</single> + <multiple>secs.</multiple> + </term> + <term name="sub verbo" form="short"> + <single>s.v.</single> + <multiple>s.vv.</multiple> + </term> + <term name="verse" form="short"> + <single>v.</single> + <multiple>vv.</multiple> + </term> + <term name="volume" form="short"> + <single>vol.</single> + <multiple>vols.</multiple> + </term> + + <!-- SYMBOL LOCATOR FORMS --> + <term name="paragraph" form="symbol"> + <single>??</single> + <multiple>????</multiple> + </term> + <term name="section" form="symbol"> + <single>??</single> + <multiple>????</multiple> + </term> + + <!-- LONG ROLE FORMS --> + <term name="director"> + <single>????????????????????????</single> + <multiple>directors</multiple> + </term> + <term name="editor"> + <single>?????????????????????</single> + <multiple>editors</multiple> + </term> + <term name="editorial-director"> + <single>?????????????????????</single> + <multiple>editors</multiple> + </term> + <term name="illustrator"> + <single>????????????????????????</single> + <multiple>illustrators</multiple> + </term> + <term name="translator"> + <single>?????????????????????</single> + <multiple>translators</multiple> + </term> + <term name="editortranslator"> + <single>????????????????????? & ?????????????????????</single> + <multiple>editors & translators</multiple> + </term> + + <!-- SHORT ROLE FORMS --> + <term name="director" form="short"> + <single>dir.</single> + <multiple>dirs.</multiple> + </term> + <term name="editor" form="short"> + <single>ed.</single> + <multiple>eds.</multiple> + </term> + <term name="editorial-director" form="short"> + <single>ed.</single> + <multiple>eds.</multiple> + </term> + <term name="illustrator" form="short"> + <single>ill.</single> + <multiple>ills.</multiple> + </term> + <term name="translator" form="short"> + <single>tran.</single> + <multiple>trans.</multiple> + </term> + <term name="editortranslator" form="short"> + <single>ed. & tran.</single> + <multiple>eds. & trans.</multiple> + </term> + + <!-- VERB ROLE FORMS --> + <term name="container-author" form="verb">??????????????????</term> + <term name="director" form="verb">????????????????????????</term> + <term name="editor" form="verb">?????????????????????</term> + <term name="editorial-director" form="verb">????????????????????????</term> + <term name="illustrator" form="verb">???????????????????????????</term> + <term name="interviewer" form="verb">????????????????????????????????????????????????</term> + <term name="recipient" form="verb">???????????? ?????????</term> + <term name="reviewed-author" form="verb">??????????????????</term> + <term name="translator" form="verb">?????????????????? </term> + <term name="editortranslator" form="verb">????????????????????? & ??????????????????</term> + + <!-- SHORT VERB ROLE FORMS --> + <term name="director" form="verb-short">dir. by</term> + <term name="editor" form="verb-short">ed. by</term> + <term name="editorial-director" form="verb-short">ed. by</term> + <term name="illustrator" form="verb-short">illus. by</term> + <term name="translator" form="verb-short">trans. by</term> + <term name="editortranslator" form="verb-short">ed. & trans. by</term> + + <!-- LONG MONTH FORMS --> + <term name="month-01">???????????????</term> + <term name="month-02">??????????????????</term> + <term name="month-03">???????????????</term> + <term name="month-04">??????????????????</term> + <term name="month-05">??????</term> + <term name="month-06">?????????</term> + <term name="month-07">???????????????</term> + <term name="month-08">???????????????</term> + <term name="month-09">?????????????????????</term> + <term name="month-10">?????????????????????</term> + <term name="month-11">??????????????????</term> + <term name="month-12">?????????????????????</term> + + <!-- SHORT MONTH FORMS --> + <term name="month-01" form="short">??????.</term> + <term name="month-02" form="short">?????????.</term> + <term name="month-03" form="short">???????????????</term> + <term name="month-04" form="short">??????????????????</term> + <term name="month-05" form="short">??????</term> + <term name="month-06" form="short">?????????</term> + <term name="month-07" form="short">???????????????</term> + <term name="month-08" form="short">??????.</term> + <term name="month-09" form="short">?????????.</term> + <term name="month-10" form="short">????????????.</term> + <term name="month-11" form="short">??????.</term> + <term name="month-12" form="short">?????????.</term> + + <!-- SEASONS --> + <term name="season-01">???????????? ?????????</term> + <term name="season-02">????????????????????? ?????????</term> + <term name="season-03">??????????????? ?????????</term> + <term name="season-04">??????????????? ?????????</term> + </terms> +</locale> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/citeproc-0.6/src/Citeproc/Eval.hs new/citeproc-0.6.0.1/src/Citeproc/Eval.hs --- old/citeproc-0.6/src/Citeproc/Eval.hs 2021-09-23 22:00:45.000000000 +0200 +++ new/citeproc-0.6.0.1/src/Citeproc/Eval.hs 2022-01-09 20:54:32.000000000 +0100 @@ -1315,42 +1315,52 @@ getPosition :: Int -> Maybe Int -> CitationItem a -> Int -> Eval a [Position] getPosition groupNum mbNoteNum item posInGroup = do - lastCitedMap <- gets stateLastCitedMap - noteMap <- gets stateNoteMap - case M.lookup (citationItemId item) lastCitedMap of - Nothing -> return [FirstPosition] - Just (prevGroupNum, mbPrevNoteNum, - prevPosInGroup, prevAloneInGroup, prevLabel, prevLoc) -> do - isNote <- asks (styleIsNoteStyle . contextStyleOptions) - nearNoteDistance <- fromMaybe 5 <$> - asks (styleNearNoteDistance . contextStyleOptions) - let noteNum = fromMaybe groupNum mbNoteNum - let prevNoteNum = fromMaybe prevGroupNum mbPrevNoteNum - let prevAloneInNote = - case M.lookup prevNoteNum noteMap of - Nothing -> True - Just s -> Set.size s <= 1 - let prevAlone = prevAloneInGroup && prevAloneInNote - return $ - (if isNote && noteNum - prevNoteNum < nearNoteDistance - then (NearNote :) - else id) . - (if (groupNum == prevGroupNum && - posInGroup == prevPosInGroup + 1) || - (groupNum == prevGroupNum + 1 && - (((-) <$> mbNoteNum <*> mbPrevNoteNum) <= Just 1) && - posInGroup == 1 && - prevAlone) - then case (prevLoc, citationItemLocator item) of - (Nothing, Just _) -> (IbidWithLocator :) . (Ibid :) - (Nothing, Nothing) -> (Ibid :) - (Just _, Nothing) -> id - (Just l1, Just l2) - | l1 == l2 - , citationItemLabel item == prevLabel -> (Ibid :) - | otherwise -> (IbidWithLocator :) . (Ibid :) - else id) - $ [Subsequent] + inBibliography <- asks contextInBibliography + if inBibliography + then return [] + else getPosition' + where + getPosition' = do + lastCitedMap <- gets stateLastCitedMap + noteMap <- gets stateNoteMap + case M.lookup (citationItemId item) lastCitedMap of + Nothing -> return [FirstPosition] + Just (prevGroupNum, mbPrevNoteNum, + prevPosInGroup, prevAloneInGroup, + prevLabel, prevLoc) -> do + isNote <- asks (styleIsNoteStyle . contextStyleOptions) + nearNoteDistance <- fromMaybe 5 <$> + asks (styleNearNoteDistance . contextStyleOptions) + let noteNum = fromMaybe groupNum mbNoteNum + let prevNoteNum = fromMaybe prevGroupNum mbPrevNoteNum + let prevAloneInNote = + case M.lookup prevNoteNum noteMap of + Nothing -> True + Just s -> Set.size s <= 1 + let prevAlone = prevAloneInGroup && prevAloneInNote + return $ + (if isNote && noteNum - prevNoteNum < nearNoteDistance + then (NearNote :) + else id) . + (if (groupNum == prevGroupNum && + posInGroup == prevPosInGroup + 1) || + (groupNum == prevGroupNum + 1 && + (((-) <$> mbNoteNum <*> mbPrevNoteNum) <= Just 1) && + posInGroup == 1 && + prevAlone) + then case (prevLoc, citationItemLocator item) of + (Nothing, Just _) + -> (IbidWithLocator :) . (Ibid :) + (Nothing, Nothing) -> (Ibid :) + (Just _, Nothing) -> id + (Just l1, Just l2) + | l1 == l2 + , citationItemLabel item == prevLabel + -> (Ibid :) + | otherwise + -> (IbidWithLocator :) . (Ibid :) + else id) + $ [Subsequent] eElement :: CiteprocOutput a => Element a -> Eval a [Output a] eElement (Element etype formatting) = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/citeproc-0.6/stack.yaml new/citeproc-0.6.0.1/stack.yaml --- old/citeproc-0.6/stack.yaml 2021-07-22 21:25:01.000000000 +0200 +++ new/citeproc-0.6.0.1/stack.yaml 2022-01-12 08:36:44.000000000 +0100 @@ -2,9 +2,7 @@ citeproc: executable: true icu: false -resolver: lts-17.5 -extra-deps: -- unicode-collation-0.1.3 -- text-icu-0.7.1.0 +resolver: lts-18.10 +extra-deps: [] ghc-options: "$locals": -fhide-source-paths diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/citeproc-0.6/test/extra/issue_99.txt new/citeproc-0.6.0.1/test/extra/issue_99.txt --- old/citeproc-0.6/test/extra/issue_99.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/citeproc-0.6.0.1/test/extra/issue_99.txt 2022-01-09 21:02:39.000000000 +0100 @@ -0,0 +1,78 @@ +>>===== MODE =====>> +bibliography +<<===== MODE =====<< + + + + +>>===== RESULT =====>> +<div class="csl-bib-body"> + <div class="csl-entry">John Doe</div> +</div> +<<===== RESULT =====<< + + +>>===== CSL =====>> +<?xml version="1.0" encoding="utf-8"?> +<style + xmlns="http://purl.org/net/xbiblio/csl"; + class="note" + version="1.0"> + <info> + <id /> + <title /> + </info> + <citation> + <layout> + <names variable="author"> + <name form="long"/> + </names> + </layout> + </citation> + <bibliography> + <layout> + <choose> + <if position="subsequent"> + <names variable="author"> + <name form="short"/> + </names> + </if> + <else> + <names variable="author"> + <name form="long"/> + </names> + </else> + </choose> + </layout> + </bibliography> +</style> +<<===== CSL =====<< + + +>>===== CITATION-ITEMS =====>> +[ [ {"id":"Doe"} ] ] +<<===== CITATION-ITEMS =====<< + + + +>>===== INPUT =====>> +[ + { + "author": [ + { + "family": "Doe", + "given": "John" + } + ], + "id": "Doe", + "type": "book", + "title": "Title" + } +] +<<===== INPUT =====<< + + +>>===== VERSION =====>> +1.0 +<<===== VERSION =====<< +
