diff options
author | Karl Berry <karl@freefriends.org> | 2023-06-08 19:49:38 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-06-08 19:49:38 +0000 |
commit | 92cec824af2c643ec0cb870e5243eee8923ae13e (patch) | |
tree | 88bf6e8029f1fea2318413e11d05a3d856b762c2 /Master/texmf-dist/tex | |
parent | d3de8298ad8de471a2450f16570e4cfa3a1f1617 (diff) |
biblatex-publist (8jun23)
git-svn-id: svn://tug.org/texlive/trunk@67302 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
3 files changed, 65 insertions, 44 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/publist.bbx b/Master/texmf-dist/tex/latex/biblatex-publist/publist.bbx index 4d9a50efa2b..b7d1a97c5eb 100644 --- a/Master/texmf-dist/tex/latex/biblatex-publist/publist.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-publist/publist.bbx @@ -25,8 +25,8 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\bpl@version{2.4} -\def\bpl@rdate{forthcoming} +\def\bpl@version{2.5} +\def\bpl@rdate{2023/06/08} \ProvidesFile{publist.bbx}[\bpl@rdate\space v.\bpl@version\space biblatex bibliography style (JSP)] @@ -553,6 +553,20 @@ {}{\PackageWarning{biblatex-publist}{Patching refsection failed!}} }{} +\newcommand*\GetSectionCount[1][\empty]{% + \edef\bpl@secno{#1}% + \ifx\bpl@secno\empty% + \csnumdef{bpltmprefsection}{\c@refsection}% + \csuse{bpl@secitems:\bpltmprefsection}% + \else% + \csuse{bpl@secitems:#1}% + \fi% +} + +\newcommand*\GetTotalCount{% + \csuse{bpl@items}% +} + % % Removing braces from names (courtesy of egreg at % http://tex.stackexchange.com/a/79583/19291) @@ -838,30 +852,33 @@ \fi \csnumgdef{bpl@saverefsection}{\c@refsection}% \if@bpl@reversenum% - % Write item count to the bpx file + % Check if we have a changed value \global\boolfalse{needbpxrerun}% + \ifcsdef{bpl@items:\therefsection}{% + \ifnumequal{\value{bplitems}}{\numexpr\csuse{bpl@items:\therefsection}\relax}{}{% + \global\booltrue{needbpxrerun} + } + }{\global\booltrue{needbpxrerun}} + % Write item count to the bpx file \if@filesw% - % Check if we have a changed value - \ifcsdef{bpl@items:\therefsection}{% - \ifnumequal{\value{bplitems}}{\numexpr\csuse{bpl@items:\therefsection}\relax}{}{% - \global\booltrue{needbpxrerun} - } - }{\global\booltrue{needbpxrerun}} \protected@write\bpl@bpxfile{}{% \protect\csdef{bpl@items:\therefsection}{\thebplitems}% - \protect\csdef{bpl@items}{\thebplitems}% - \protect\csdef{bpl@secitems:\therefsection}{\thebplsecitems}% \protect\csdef{bpl@savesecitems:\theplnumgroup}{\thebplbgitems}% }% \fi \fi + % Write item count to the bpx file + \if@filesw% + \protected@write\bpl@bpxfile{}{% + \protect\csdef{bpl@items}{\thebplitems}% + \protect\csdef{bpl@secitems:\therefsection}{\thebplsecitems}% + }% + \fi } {% - \if@bpl@reversenum% - % We count all really output items for proper reverse numbering - % (global and per section) - \stepcounter{bplitems}% - \fi% + % We count all really output items for proper reverse numbering + % (global and per section) and \GetTotalCount + \stepcounter{bplitems}% \stepcounter{bplsecitems}% \ifbool{plnumgroup}{% \stepcounter{bplbgitems}% @@ -916,30 +933,28 @@ % Reverse numbering % \AtBeginDocument{% - \if@bpl@reversenum - \newread\bpl@read@bpxfile - \immediate\openin\bpl@read@bpxfile=\jobname.bpx - \loop\unless\ifeof\bpl@read@bpxfile - \read\bpl@read@bpxfile to\bpx@data - \ifeof\bpl@read@bpxfile% - \else - \bpx@data - \fi - \repeat - \immediate\closein\bpl@read@bpxfile - \newwrite\bpl@bpxfile - \immediate\openout\bpl@bpxfile=\jobname.bpx - \if@filesw% - \protected@write\bpl@bpxfile{}{\@percentchar\space biblatex-publist auxiliary file: - count of items for reverse numbering}% - \fi - \AtEndDocument{% - \ifbool{needbpxrerun}{% - \PackageWarning{biblatex-publist}{Please rerun LaTeX!\MessageBreak - Still counting items}% - }{} - } + \newread\bpl@read@bpxfile + \immediate\openin\bpl@read@bpxfile=\jobname.bpx + \loop\unless\ifeof\bpl@read@bpxfile + \read\bpl@read@bpxfile to\bpx@data + \ifeof\bpl@read@bpxfile% + \else + \bpx@data + \fi + \repeat + \immediate\closein\bpl@read@bpxfile + \newwrite\bpl@bpxfile + \immediate\openout\bpl@bpxfile=\jobname.bpx + \if@filesw% + \protected@write\bpl@bpxfile{}{\@percentchar\space biblatex-publist auxiliary file: + count of items for reverse numbering and stats}% \fi + \AtEndDocument{% + \ifbool{needbpxrerun}{% + \PackageWarning{biblatex-publist}{Please rerun LaTeX!\MessageBreak + Still counting items}% + }{} + } } \AtEndOfPackage{% @@ -1387,8 +1402,10 @@ \usebibmacro{bpl:year+labelyear}% \addspace% \fi% - \printnames[][-\value{listtotal}]{author}% - \setunit{\addspace}% + \ifthenelse{\value{nonplauthors}>0\AND{\value{plauthors}}>0} + {\printnames[][-\value{listtotal}]{author}% + \setunit{\addspace}}% + {}% \iffieldundef{nameaddon} {} {% @@ -1490,6 +1507,10 @@ \printtext[parens]{% \printfield{issue}% \setunit*{\addspace}% + \if@fixyear\else% + % turn of mergedate, as this doesn't play well with us. + \renewbibmacro*{bbx:ifmergeddate}{\@secondoftwo}% + \fi% \usebibmacro{date}}% }% \newunit% diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/publist.cbx b/Master/texmf-dist/tex/latex/biblatex-publist/publist.cbx index 5587789cc40..f9f0395685b 100644 --- a/Master/texmf-dist/tex/latex/biblatex-publist/publist.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-publist/publist.cbx @@ -26,8 +26,8 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\bpl@version{2.4} -\def\bpl@rdate{forthcoming} +\def\bpl@version{2.5} +\def\bpl@rdate{2023/06/08} \ProvidesFile{publist.cbx}[\bpl@rdate\space v.\bpl@version\space biblatex citation style (JSP)] diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/publist.dbx b/Master/texmf-dist/tex/latex/biblatex-publist/publist.dbx index ccc929ac45c..5305ff52416 100644 --- a/Master/texmf-dist/tex/latex/biblatex-publist/publist.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-publist/publist.dbx @@ -1,5 +1,5 @@ % publist.dbx, biblatex data model specification for the biblatex-publist -% package, version 2.4 (2023/05/18). +% package, version 2.5 (2023/06/08). % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 |