biblatex-caspervector (30oct22)

git-svn-id: svn://tug.org/texlive/trunk@64866 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 25 insertions, 16 deletions

diff --git a/Master/texmf-dist/tex/latex/biblatex-caspervector/blx-caspervector-base.def b/Master/texmf-dist/tex/latex/biblatex-caspervector/blx-caspervector-base.def
index c23b4b1dadb..4d326af7ce4 100644
--- a/Master/texmf-dist/tex/latex/biblatex-caspervector/blx-caspervector-base.def
+++ b/Master/texmf-dist/tex/latex/biblatex-caspervector/blx-caspervector-base.def
@@ -1,6 +1,6 @@
 % Casper Ti. Vector's biblatex style
 %
-% Copyright (c) 2012-2019 Casper Ti. Vector
+% Copyright (c) 2012-2019,2022 Casper Ti. Vector
 %
 % This work may be distributed and/or modified under the conditions of the
 % LaTeX Project Public License, either version 1.3 of this license or (at
@@ -23,7 +23,7 @@
 %   blx-caspervector-utf8.def
 
 \ProvidesFile{blx-caspervector-base.def}%
-	[2020/11/02 v0.3.5 Casper Ti. Vector's biblatex library]
+	[2022/10/30 v0.3.6 Casper Ti. Vector's biblatex library]
 
 \RequireBiber[3]
 \newtoggle{bbx:gbk}
@@ -113,8 +113,9 @@
 \renewcommand*{\finalnamedelim}{\ifcitation{\bbx@citebcomma}{\finallistdelim}}
 \renewcommand*{\multinamedelim}{\ifcitation{\bbx@citebcomma}{\multilistdelim}}
 \renewcommand*{\postnotedelim}{\bbx@citecomma}
-\renewcommand*{\finentrypunct}%
-	{\iffieldundef{addendum}{\bbx@cepunct{\bbx@cnperiod}{.}}{}}
+\renewcommand*{\finentrypunct}{\ifboolexpr{
+	test {\iffieldundef{addendum}} and test {\iflistundef{pageref}}
+}{\bbx@cepunct{\bbx@cnperiod}{.}}{}}
 \DefineBibliographyExtras{english}{%
 	\renewcommand*{\finalandcomma}{}%
 }
@@ -135,6 +136,7 @@
 		{\ifinteger{#1}{{\bbx@cnnr} {#1} {\bbx@cnedition}}{#1}}%
 		{\ifinteger{#1}{\mkbibordedition{#1}~\bibstring{edition}}{#1\isdot}}%
 }
+\DeclareFieldFormat*{mypageref}{\mkbibbrackets{\^{}\,#1}}
 \newcommand*{\bbx@print}[1]{\iffieldundef{#1}{}{\printfield{#1}}}
 \newbibmacro*{cntypedelim}[1]{\ifandothers{#1}{}{\printtext{\andothersdelim}}}
 \newbibmacro*{cein:}%
@@ -243,6 +245,13 @@
 		\printurldate%
 	}%
 }
+\newbibmacro*{addendum+pageref}{%
+	\printfield{addendum}%
+	\iflistundef{pageref}{}{%
+		\bbx@cepunct{}{\setunit{\addspace}}%
+		\printtext[mypageref]{\printlist[pageref][-\value{listtotal}]{pageref}}%
+	}%
+}
 
 \DeclareBibliographyDriver{book}{%
 	\usebibmacro{bibindex}\usebibmacro{begentry}%
@@ -256,7 +265,7 @@
 	\usebibmacro{location+publisher+date+note+pages}%
 	\printunit{\bbx@ceperiod}\newblock
 	\usebibmacro{eid+url+urldate}\printunit{\bbx@ceperiod}\newblock
-	\printfield{addendum}\usebibmacro{finentry}%
+	\usebibmacro{addendum+pageref}\usebibmacro{finentry}%
 }
 
 \DeclareBibliographyDriver{incollection}{%
@@ -274,7 +283,7 @@
 	\usebibmacro{location+publisher+date+note+pages}%
 	\printunit{\bbx@ceperiod}\newblock
 	\usebibmacro{eid+url+urldate}\printunit{\bbx@ceperiod}\newblock
-	\printfield{addendum}\usebibmacro{finentry}%
+	\usebibmacro{addendum+pageref}\usebibmacro{finentry}%
 }
 
 \DeclareBibliographyDriver{periodical}{%
@@ -290,7 +299,7 @@
 	\printlist{location}\setunit*{\bbx@cecolon}%
 	\printlist{publisher}\printunit{\bbx@ceperiod}\newblock
 	\usebibmacro{eid+url+urldate}\printunit{\bbx@ceperiod}\newblock
-	\printfield{addendum}\usebibmacro{finentry}%
+	\usebibmacro{addendum+pageref}\usebibmacro{finentry}%
 }
 
 \DeclareBibliographyDriver{article}{%
@@ -304,7 +313,7 @@
 	\usebibmacro{date+volume+number+note+pages}%
 	\printunit{\bbx@ceperiod}\newblock
 	\usebibmacro{eid+url+urldate}\printunit{\bbx@ceperiod}\newblock
-	\printfield{addendum}\usebibmacro{finentry}%
+	\usebibmacro{addendum+pageref}\usebibmacro{finentry}%
 }
 
 \DeclareBibliographyDriver{patent}{%
@@ -320,12 +329,12 @@
 	\usebibmacro{date}\setunit*{\bbx@cecomma}%
 	\printfield{note}\printunit{\bbx@ceperiod}\newblock
 	\usebibmacro{eid+url+urldate}\printunit{\bbx@ceperiod}\newblock
-	\printfield{addendum}\usebibmacro{finentry}%
+	\usebibmacro{addendum+pageref}\usebibmacro{finentry}%
 }
 
 \DeclareBibliographyDriver{customf}{%
 	\usebibmacro{bibindex}\usebibmacro{begentry}%
-	\printfield{addendum}\usebibmacro{finentry}%
+	\usebibmacro{addendum+pageref}\usebibmacro{finentry}%
 }
 
 \DeclareBibliographyAlias{booklet}{book}
diff --git a/Master/texmf-dist/tex/latex/biblatex-caspervector/blx-caspervector-gbk.def b/Master/texmf-dist/tex/latex/biblatex-caspervector/blx-caspervector-gbk.def
index 429ee5db47a..83650ccb5d8 100644
--- a/Master/texmf-dist/tex/latex/biblatex-caspervector/blx-caspervector-gbk.def
+++ b/Master/texmf-dist/tex/latex/biblatex-caspervector/blx-caspervector-gbk.def
@@ -23,7 +23,7 @@
 %   blx-caspervector-utf8.def
 
 \ProvidesFile{blx-caspervector-gbk.def}%
-	[2020/11/02 v0.3.5 Chinese punctuations and captions in GBK]
+	[2022/10/30 v0.3.6 Chinese punctuations and captions in GBK]
 
 \newcommand*\bbx@cnldquot{��}
 \newcommand*\bbx@cnrdquot{��}
diff --git a/Master/texmf-dist/tex/latex/biblatex-caspervector/blx-caspervector-utf8.def b/Master/texmf-dist/tex/latex/biblatex-caspervector/blx-caspervector-utf8.def
index 872d40567fa..571291605d4 100644
--- a/Master/texmf-dist/tex/latex/biblatex-caspervector/blx-caspervector-utf8.def
+++ b/Master/texmf-dist/tex/latex/biblatex-caspervector/blx-caspervector-utf8.def
@@ -23,7 +23,7 @@
 %   blx-caspervector-utf8.def
 
 \ProvidesFile{blx-caspervector-utf8.def}%
-	[2020/11/02 v0.3.5 Chinese punctuations and captions in UTF-8]
+	[2022/10/30 v0.3.6 Chinese punctuations and captions in UTF-8]
 
 \newcommand*\bbx@cnldquot{“}
 \newcommand*\bbx@cnrdquot{”}
diff --git a/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector-ay.bbx b/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector-ay.bbx
index 139b83551f1..690d19fe9db 100644
--- a/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector-ay.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector-ay.bbx
@@ -23,7 +23,7 @@
 %   blx-caspervector-utf8.def
 
 \ProvidesFile{caspervector-ay.bbx}%
-	[2020/11/02 v0.3.5 Casper Ti. Vector's author-year biblatex bibstyle]
+	[2022/10/30 v0.3.6 Casper Ti. Vector's author-year biblatex bibstyle]
 
 \RequireBibliographyStyle{authoryear-comp}
 \input{blx-caspervector-base.def}
diff --git a/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector-ay.cbx b/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector-ay.cbx
index 12133338a93..a58fecebe36 100644
--- a/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector-ay.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector-ay.cbx
@@ -23,7 +23,7 @@
 %   blx-caspervector-utf8.def
 
 \ProvidesFile{caspervector-ay.cbx}%
-	[2020/11/02 v0.3.5 Casper Ti. Vector's author-year biblatex citestyle]
+	[2022/10/30 v0.3.6 Casper Ti. Vector's author-year biblatex citestyle]
 
 \RequireCitationStyle{authoryear-comp}
 \renewcommand*{\compcitedelim}{\bbx@citebcomma}
diff --git a/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.bbx b/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.bbx
index 80682d4e050..9647c575da5 100644
--- a/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.bbx
@@ -23,7 +23,7 @@
 %   blx-caspervector-utf8.def
 
 \ProvidesFile{caspervector.bbx}%
-	[2020/11/02 v0.3.5 Casper Ti. Vector's numeric biblatex bibstyle]
+	[2022/10/30 v0.3.6 Casper Ti. Vector's numeric biblatex bibstyle]
 
 \RequireBibliographyStyle{numeric-comp}
 \input{blx-caspervector-base.def}
diff --git a/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.cbx b/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.cbx
index 5a3ac392cf1..da4f7b5a70e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.cbx
@@ -23,7 +23,7 @@
 %   blx-caspervector-utf8.def
 
 \ProvidesFile{caspervector.cbx}%
-	[2020/11/02 v0.3.5 Casper Ti. Vector's numeric biblatex citestyle]
+	[2022/10/30 v0.3.6 Casper Ti. Vector's numeric biblatex citestyle]
 
 \RequireCitationStyle{numeric-comp}
 \ExecuteBibliographyOptions{autocite = superscript}