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 2021-03-24 16:11:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-citeproc (Old)
 and      /work/SRC/openSUSE:Factory/.ghc-citeproc.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "ghc-citeproc"

Wed Mar 24 16:11:53 2021 rev:10 rq:880424 version:0.3.0.9

Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-citeproc/ghc-citeproc.changes        
2021-03-10 08:58:04.762940020 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-citeproc.new.2401/ghc-citeproc.changes      
2021-03-24 16:11:54.379873160 +0100
@@ -1,0 +2,8 @@
+Sun Mar 14 22:18:46 UTC 2021 - psim...@suse.com
+
+- Update citeproc to version 0.3.0.9.
+  ## 0.3.0.9
+
+   * Implement `et-al-subsequent-min` and `et-al-subsequent-use-first` (#60).
+
+-------------------------------------------------------------------

Old:
----
  citeproc-0.3.0.8.tar.gz

New:
----
  citeproc-0.3.0.9.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ghc-citeproc.spec ++++++
--- /var/tmp/diff_new_pack.QT7np6/_old  2021-03-24 16:11:54.951873760 +0100
+++ /var/tmp/diff_new_pack.QT7np6/_new  2021-03-24 16:11:54.955873765 +0100
@@ -19,7 +19,7 @@
 %global pkg_name citeproc
 %bcond_with tests
 Name:           ghc-%{pkg_name}
-Version:        0.3.0.8
+Version:        0.3.0.9
 Release:        0
 Summary:        Generates citations and bibliography from CSL styles
 License:        BSD-2-Clause

++++++ citeproc-0.3.0.8.tar.gz -> citeproc-0.3.0.9.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/citeproc-0.3.0.8/CHANGELOG.md 
new/citeproc-0.3.0.9/CHANGELOG.md
--- old/citeproc-0.3.0.8/CHANGELOG.md   2021-03-02 23:53:04.000000000 +0100
+++ new/citeproc-0.3.0.9/CHANGELOG.md   2021-03-13 19:43:47.000000000 +0100
@@ -1,5 +1,9 @@
 # citeproc changelog
 
+## 0.3.0.9
+
+ * Implement `et-al-subsequent-min` and `et-al-subsequent-use-first` (#60).
+
 ## 0.3.0.8
 
  * In parsing abbreviations JSON, ignore top-level fields
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/citeproc-0.3.0.8/citeproc.cabal 
new/citeproc-0.3.0.9/citeproc.cabal
--- old/citeproc-0.3.0.8/citeproc.cabal 2021-03-02 23:53:19.000000000 +0100
+++ new/citeproc-0.3.0.9/citeproc.cabal 2021-03-13 19:43:09.000000000 +0100
@@ -1,6 +1,6 @@
 cabal-version:       2.2
 name:                citeproc
-version:             0.3.0.8
+version:             0.3.0.9
 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.3.0.8/man/citeproc.1 
new/citeproc-0.3.0.9/man/citeproc.1
--- old/citeproc-0.3.0.8/man/citeproc.1 2021-02-01 20:05:40.000000000 +0100
+++ new/citeproc-0.3.0.9/man/citeproc.1 2021-03-13 19:44:15.000000000 +0100
@@ -1,6 +1,6 @@
-.\" Automatically generated by Pandoc 2.11.4
+.\" Automatically generated by Pandoc 2.12
 .\"
-.TH "citeproc" "1" "" "citeproc 0.3.0.7" ""
+.TH "citeproc" "1" "" "citeproc 0.3.0.9" ""
 .hy
 .SH NAME
 .PP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/citeproc-0.3.0.8/src/Citeproc/Eval.hs 
new/citeproc-0.3.0.9/src/Citeproc/Eval.hs
--- old/citeproc-0.3.0.8/src/Citeproc/Eval.hs   2021-01-22 18:50:16.000000000 
+0100
+++ new/citeproc-0.3.0.9/src/Citeproc/Eval.hs   2021-03-13 19:39:10.000000000 
+0100
@@ -43,6 +43,7 @@
   , contextPosition            :: [Position]
   , contextInSubstitute        :: Bool
   , contextInSortKey           :: Bool
+  , contextInBibliography      :: Bool
   , contextSubstituteNamesForm :: Maybe NamesFormat
   }
   deriving (Show)
@@ -101,6 +102,7 @@
       , contextPosition            = []
       , contextInSubstitute        = False
       , contextInSortKey           = False
+      , contextInBibliography      = False
       , contextSubstituteNamesForm = Nothing
       }
       EvalState
@@ -277,7 +279,9 @@
       -- of year suffixes added in disambiguation)
       bs <- case styleBibliography style of
                Just biblayout
-                 -> mapM (evalLayout True biblayout) (zip [1..] bibCitations)
+                 -> local (\context ->
+                             context{ contextInBibliography = True }) $
+                    mapM (evalLayout biblayout) (zip [1..] bibCitations)
                     >>= \bs ->
                       case styleSubsequentAuthorSubstitute
                             (styleOptions style) of
@@ -467,7 +471,7 @@
   withRWST (\ctx st -> (ctx,
                         st { stateLastCitedMap = mempty
                            , stateNoteMap = mempty })) $
-     mapM (evalLayout False (styleCitation style)) (zip [1..] citations)
+     mapM (evalLayout (styleCitation style)) (zip [1..] citations)
 
  where
 
@@ -981,11 +985,10 @@
 
 
 evalLayout :: CiteprocOutput a
-            => Bool
-            -> Layout a
+            => Layout a
             -> (Int, Citation a)
             -> Eval a (Output a)
-evalLayout isBibliography layout (citationGroupNumber, citation) = do
+evalLayout layout (citationGroupNumber, citation) = do
   -- this is a hack to ensure that "ibid" detection will work
   -- correctly in a citation starting with an author-only:
   -- the combination AuthorOnly [SuppressAuthor] should not
@@ -1025,6 +1028,8 @@
   secondFieldAlign [] = []
 
   evalItem' (positionInCitation :: Int, item) = do
+    isBibliography  <- asks contextInBibliography
+
     styleOpts <- asks contextStyleOptions
     let isNote = styleIsNoteStyle styleOpts
     position <- getPosition citationGroupNumber (citationNoteNumber citation)
@@ -1889,6 +1894,14 @@
             -> Eval a (Output a)
 formatNames namesFormat nameFormat formatting (var, Just (NamesVal names)) =
   do
+  isSubsequent <- (Subsequent `elem`) <$> asks contextPosition
+  isInBibliography <- asks contextInBibliography
+  let (etAlMin, etAlUseFirst) =
+        if not isInBibliography && isSubsequent
+           then (nameEtAlSubsequentMin nameFormat <|> nameEtAlMin nameFormat,
+                 nameEtAlSubsequentUseFirst nameFormat <|>
+                    nameEtAlUseFirst nameFormat)
+           else (nameEtAlMin nameFormat, nameEtAlUseFirst nameFormat)
   inSortKey <- asks contextInSortKey
   disamb <- gets (referenceDisambiguation . stateReference)
   names' <- zipWithM (formatName nameFormat formatting) [1..] names
@@ -1917,10 +1930,9 @@
                                                    , termForm = Long }
                   Nothing -> return Nothing
   let etAlUseLast = nameEtAlUseLast nameFormat
-  let etAlThreshold = case nameEtAlMin nameFormat of
+  let etAlThreshold = case etAlMin of
                         Just x | numnames >= x
-                          -> case (disamb >>= disambEtAlNames,
-                                    nameEtAlUseFirst nameFormat) of
+                          -> case (disamb >>= disambEtAlNames, etAlUseFirst) of
                                (Just n, Just m) -> Just (max m n)
                                (_, y) -> y
                         _ -> Nothing
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/citeproc-0.3.0.8/stack.yaml 
new/citeproc-0.3.0.9/stack.yaml
--- old/citeproc-0.3.0.8/stack.yaml     2020-09-30 06:04:23.000000000 +0200
+++ new/citeproc-0.3.0.9/stack.yaml     2021-03-13 20:22:21.000000000 +0100
@@ -2,7 +2,7 @@
   citeproc:
     executable: true
     icu: false
-resolver: lts-15.14
+resolver: lts-17.5
 extra-deps:
 - rfc5051-0.2
 - pandoc-types-1.22
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/citeproc-0.3.0.8/test/Spec.hs 
new/citeproc-0.3.0.9/test/Spec.hs
--- old/citeproc-0.3.0.8/test/Spec.hs   2021-01-15 19:18:13.000000000 +0100
+++ new/citeproc-0.3.0.9/test/Spec.hs   2021-03-13 19:42:02.000000000 +0100
@@ -318,7 +318,7 @@
                (length (skipped counts))
   case length (failed counts) + length (errored counts) of
     0 -> exitSuccess
-    n | n <= 67 -> do
+    n | n <= 66 -> do
          putStrLn "We have passed all the CSL tests we expect to..."
          exitSuccess
       | otherwise -> exitWith $ ExitFailure n

Reply via email to