From 67eab7b4233ce72f0d22d7893db835ef0039bae3 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 15 Nov 2019 21:35:23 +0000 Subject: biblatex-caspervector (15nov19) git-svn-id: svn://tug.org/texlive/trunk@52802 c570f23f-e606-0410-a88d-b1316a301751 --- .../blx-caspervector-base.def | 110 ++++++++++++++------- .../biblatex-caspervector/blx-caspervector-gbk.def | 20 ++-- .../blx-caspervector-utf8.def | 20 ++-- .../biblatex-caspervector/caspervector-ay.bbx | 51 ++++------ .../biblatex-caspervector/caspervector-ay.cbx | 2 +- .../latex/biblatex-caspervector/caspervector.bbx | 2 +- .../latex/biblatex-caspervector/caspervector.cbx | 2 +- 7 files changed, 123 insertions(+), 84 deletions(-) (limited to 'Master/texmf-dist/tex') 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 279b7e5281f..bb46b2eb748 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-2018 Casper Ti. Vector +% Copyright (c) 2012-2019 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,17 +23,19 @@ % blx-caspervector-utf8.def \ProvidesFile{blx-caspervector-base.def}% - [2018/06/29 v0.3.3 Casper Ti. Vector's biblatex library] + [2019/11/13 v0.3.4 Casper Ti. Vector's biblatex library] \RequireBiber[3] \newtoggle{bbx:gbk} \newtoggle{bbx:ugly} +\newtoggle{bbx:cparen} \newtoggle{bbx:bfdate}\toggletrue{bbx:bfdate} \DeclareBibliographyOption{utf8}[true]{\togglefalse{bbx:gbk}} \DeclareBibliographyOption{gbk}[true]{\toggletrue{bbx:gbk}} \DeclareBibliographyOption{ugly}[true]{\settoggle{bbx:ugly}{#1}} +\DeclareBibliographyOption{cparen}[true]{\settoggle{bbx:cparen}{#1}} \ExecuteBibliographyOptions{% - gbk, ugly = false, autopunct = false, alldates = iso, + gbk, ugly = false, cparen = false, autopunct = false, alldates = iso, minnames = 3, minitems = 3, maxcitenames = 2, mincitenames = 1% } \AtEndOfPackage{% @@ -88,10 +90,17 @@ }}% } +\NewBibliographyString{cnauthor, cneditor, cntranslator} \newcommand*{\bbx@cetext}[2]{\iffieldequalstr{userf}{zh}{#1}{#2}} -\newcommand*{\bbx@cietext}[2]{\ifboolexpr{% +\newcommand*{\bbx@cietext}[2]{\ifboolexpr{ test {\ifcitation} or test {\iffieldequalstr{userf}{zh}} }{#1}{#2}} +\newcommand*{\bbx@cieparen}[2]{\ifboolexpr{ + test {\ifcitation} and test {\iftoggle{bbx:cparen}} +}{#1}{#2}} +\newcommand*{\bbx@ifstrg}[3]{\ifboolexpr{% + test {\ifstrequal{#1}{author}} and test {\iffieldundef{authortype}} +}{#3}{#2}} \newcommand*{\bbx@cecomma}{\bbx@cepunct{\bbx@cncomma}{\addcomma\addspace}} \newcommand*{\bbx@cecolon}{\bbx@cepunct{\bbx@cncolon}{\addcolon\addspace}} \newcommand*{\bbx@cescolon}{\bbx@cepunct{\bbx@cnscolon}{\addsemicolon\addspace}} @@ -109,9 +118,12 @@ \DefineBibliographyExtras{english}{% \renewcommand*{\finalandcomma}{}% } +\renewcommand*{\bibleftparen}{\bbx@cieparen{\bbx@cnlparen}{\blx@postpunct(}} +\renewcommand*{\bibrightparen}% + {\bbx@cieparen{\bbx@cnrparen}{\blx@postpunct)\midsentence}} +\DeclareDelimFormat[textcite]{nameyeardelim}{\bbx@cieparen{}{\addspace}} +\DeclareDelimFormat[textcite]{nonameyeardelim}{\bbx@cieparen{}{\addspace}} -\DefineBibliographyStrings{english}% - {bibliography = {\bbx@cnbib}, references = {\bbx@cnbib}} \DeclareFieldFormat*{pages}{#1} \DeclareFieldFormat*{url}{\url{#1}} \DeclareFieldFormat*{urldate}{#1} @@ -124,51 +136,79 @@ {\ifinteger{#1}{\mkbibordedition{#1}~\bibstring{edition}}{#1\isdot}}% } \newcommand*{\bbx@print}[1]{\iffieldundef{#1}{}{\printfield{#1}}} -\newcommand*{\bbx@byspace}[1]% - {\ifnumgreater{\value{#1}}{\value{maxnames}}{}{\addspace}} +\newbibmacro*{cntypedelim}[1]{\ifandothers{#1}{}{\printtext{\andothersdelim}}} \newbibmacro*{cein:}% {\printtext{\bbx@cetext{\bbx@cnin}{In}\bbx@cecolon}\printtext{}} -\newbibmacro*{ceedtrans}[1]{% +\newbibmacro*{cnauedstrg}[2]{% + \printtext[#1type]{\iffieldundef{#1type}{\bibstring{cn#2}}{% + \ifbibxstring{cn\thefield{#1type}}% + {\bibstring{cn\thefield{#1type}}}{\thefield{#1type}}% + }}% +} +\newbibmacro*{cnauthorstrg}{\usebibmacro{cnauedstrg}{author}{author}} +\newbibmacro*{cneditorstrg}{\usebibmacro{cnauedstrg}{editor}{editor}} +\newbibmacro*{cntranslatorstrg}{\printtext{\bibstring{cntranslator}}} + +\newbibmacro*{ceauedtrans}[1]{% \ifboolexpr{test {\iftoggle{blx@use#1}} and not test {\ifnameundef{#1}}}{% - \printnames{#1}% - \bbx@cetext% - {\printtext{\bbx@byspace{#1}\@nameuse{bbx@cn#1}}}% - {\setunit{\printdelim{#1typedelim}}\usebibmacro{#1strg}}% - \clearname{#1}% + \printnames{#1}\bbx@ifstrg{#1}{% + \bbx@cetext% + {\usebibmacro{cntypedelim}{#1}\usebibmacro{cn#1strg}}% + {\setunit{\printdelim{#1typedelim}}\usebibmacro{#1strg}}% + }{}\ifstrequal{#1}{author}{}{\clearname{#1}}% }{}% } -\renewbibmacro*{editor}{\usebibmacro{ceedtrans}{editor}} -\renewbibmacro*{translator}{\usebibmacro{ceedtrans}{translator}} +\renewbibmacro*{author}{\usebibmacro{ceauedtrans}{author}} +\renewbibmacro*{editor}{\usebibmacro{ceauedtrans}{editor}} +\renewbibmacro*{translator}{\usebibmacro{ceauedtrans}{translator}} \newbibmacro*{bookauthor/editor}{% \ifnameundef{bookauthor}% - {\usebibmacro{ceedtrans}{editor}}{\printnames{bookauthor}}% + % Differs from `\usebibmacro{editor}' in caspervector-ay. + {\usebibmacro{ceauedtrans}{editor}}{\printnames{bookauthor}}% } -\newbibmacro*{cebyauthx}[1]{% - \ifboolexpr{ - test {\ifnameundef{#1}} or - (test {\ifstrequal{#1}{author}} and test {\ifuseauthor}) - }{}{% +\newbibmacro*{cebyauedbase}[2]{% + \bbx@cetext{% + \printnames[by#1]{#1}\usebibmacro{cntypedelim}{#1}% + \usebibmacro{cnauedstrg}{#1}{#2}% + }{% + \usebibmacro{bytypestrg}{#1}{#2}% + \setunit{\addspace}\printnames[by#1]{#1}% + }% +} +\renewbibmacro*{byauthor}{% + \ifboolexpr{test {\ifuseauthor} or test {\ifnameundef{author}}}% + {}{\usebibmacro{cebyauedbase}{author}{author}}% +} +\renewbibmacro*{byeditor}{% + \ifnameundef{editor}{}% + {\usebibmacro{cebyauedbase}{editor}{editor}\setunit*{\bbx@cescolon}}% + \ifnameundef{editora}{}% + {\usebibmacro{cebyauedbase}{editora}{editor}\setunit*{\bbx@cescolon}}% + \ifnameundef{editorb}{}% + {\usebibmacro{cebyauedbase}{editorb}{editor}\setunit*{\bbx@cescolon}}% + \ifnameundef{editorc}{}% + {\usebibmacro{cebyauedbase}{editorc}{editor}\setunit*{\bbx@cescolon}}% +} +\renewbibmacro*{bytranslator}{% + \ifnameundef{translator}{}{% \bbx@cetext{% - \printnames[by#1]{#1}% - \printtext{\bbx@byspace{#1}\@nameuse{bbx@cn#1}}% + \printnames[bytranslator]{translator}% + \usebibmacro{cntypedelim}{translator}\usebibmacro{cntranslatorstrg}% }{% - \bibstring{by#1}\setunit{\addspace}% - \printnames[by#1]{#1}% + \printtext{\bibstring{bytranslator}}% + \setunit{\addspace}\printnames[bytranslator]{translator}% }% }% } -\renewbibmacro*{byauthor}{\usebibmacro{cebyauthx}{author}} -\renewbibmacro*{byeditor}{\usebibmacro{cebyauthx}{editor}} -\renewbibmacro*{bytranslator}{\usebibmacro{cebyauthx}{translator}} \newbibmacro*{byauthor+byeditor+bytranslator}{% \usebibmacro{byauthor}\setunit*{\bbx@cescolon}% \usebibmacro{byeditor}\setunit*{\bbx@cescolon}% \usebibmacro{bytranslator}% } -\providebibmacro*{bbx:ifnodate}[2]{#2} +\providebibmacro*{bbx:ifmergeddate}[2]{#2} \newbibmacro*{journaltitle/title}{% \iffieldundef{journaltitle}% {\bbx@print{title}}{\printfield[title]{journaltitle}}% @@ -178,8 +218,8 @@ \ifboolexpr{test {\iflistundef{location}} and test {\iflistundef{publisher}}}% {}{\setunit{\bbx@cecomma}}% \usebibmacro{date}\setunit*{\bbx@cecomma}\printfield{note}% - \ifboolexpr{% - (test {\usebibmacro{bbx:ifnodate}} or test {\ifdateunknown}) and + \ifboolexpr{ + (test {\usebibmacro{bbx:ifmergeddate}} or test {\ifdateunknown}) and test {\iffieldundef{note}} }{}{\setunit{\bbx@cecolon}}% \printfield{pages}% @@ -188,8 +228,8 @@ \usebibmacro{date}% \iffieldundef{volume}{}{\setunit*{\bbx@cecomma}\printfield{volume}}% \bbx@print{number}\setunit*{\bbx@cecomma}\printfield{note}% - \ifboolexpr{% - (test {\usebibmacro{bbx:ifnodate}} or test {\ifdateunknown}) and + \ifboolexpr{ + (test {\usebibmacro{bbx:ifmergeddate}} or test {\ifdateunknown}) and test {\iffieldundef{volume}} and test {\iffieldundef{number}} and test {\iffieldundef{note}} }{}{\setunit{\bbx@cecolon}}% @@ -199,7 +239,7 @@ \printfield{eid}\setunit*{\bbx@cecomma}% \printfield{url}\setunit*{\bbx@cecomma}% \iffieldundef{urlyear}{}{% - \printtext{\bbx@cetext{\bbx@cnretr}{retrieved on}\addspace}% + \printtext{\bbx@cetext{\bbx@cnretr}{accessed on}\addspace}% \printurldate% }% } 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 9d76570a3b8..7823cad2948 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 @@ -1,6 +1,6 @@ % Casper Ti. Vector's biblatex style % -% Copyright (c) 2012-2016,2018 Casper Ti. Vector +% Copyright (c) 2012-2016,2018-2019 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-gbk.def}% - [2018/06/29 v0.3.3 Chinese punctuations and captions in GBK] + [2019/11/13 v0.3.4 Chinese punctuations and captions in GBK] \newcommand*\bbx@cnldquot{“} \newcommand*\bbx@cnrdquot{”} @@ -32,14 +32,20 @@ \newcommand*\bbx@cnscolon{;} \newcommand*\bbx@cncolon{:} \newcommand*\bbx@cnperiod{。} +\newcommand*\bbx@cnlparen{(} +\newcommand*\bbx@cnrparen{)} \newcommand*\bbx@cnetal{等} -\newcommand*\bbx@cnauthor{著} -\newcommand*\bbx@cneditor{编} -\newcommand*\bbx@cntranslator{译} \newcommand*\bbx@cnnr{第} \newcommand*\bbx@cnedition{版} \newcommand*\bbx@cnin{出自} -\newcommand*\bbx@cnretr{检索于} -\newcommand*\bbx@cnbib{参考文献} +\newcommand*\bbx@cnretr{访问于} + +\DefineBibliographyStrings{english}{ + cnauthor = {著}, + cneditor = {编}, + cntranslator = {译}, + bibliography = {参考文献}, + references = {参考文献}, +} % vim:ft=tex:ts=2:sw=2 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 8853f52ac4b..0bf9e4bace6 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 @@ -1,6 +1,6 @@ % Casper Ti. Vector's biblatex style % -% Copyright (c) 2012-2016,2018 Casper Ti. Vector +% Copyright (c) 2012-2016,2018-2019 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-utf8.def}% - [2018/06/29 v0.3.3 Chinese punctuations and captions in UTF-8] + [2019/11/13 v0.3.4 Chinese punctuations and captions in UTF-8] \newcommand*\bbx@cnldquot{鈥渳 \newcommand*\bbx@cnrdquot{鈥潁 @@ -32,14 +32,20 @@ \newcommand*\bbx@cnscolon{锛泒 \newcommand*\bbx@cncolon{锛殅 \newcommand*\bbx@cnperiod{銆倉 +\newcommand*\bbx@cnlparen{锛坿 +\newcommand*\bbx@cnrparen{锛墋 \newcommand*\bbx@cnetal{绛墋 -\newcommand*\bbx@cnauthor{钁梷 -\newcommand*\bbx@cneditor{缂杴 -\newcommand*\bbx@cntranslator{璇憓 \newcommand*\bbx@cnnr{绗瑌 \newcommand*\bbx@cnedition{鐗坿 \newcommand*\bbx@cnin{鍑鸿嚜} -\newcommand*\bbx@cnretr{妫绱簬} -\newcommand*\bbx@cnbib{鍙傝冩枃鐚畗 +\newcommand*\bbx@cnretr{璁块棶浜巬 + +\DefineBibliographyStrings{english}{ + cnauthor = {钁梷, + cneditor = {缂杴, + cntranslator = {璇憓, + bibliography = {鍙傝冩枃鐚畗, + references = {鍙傝冩枃鐚畗, +} % vim:ft=tex:ts=2:sw=2 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 9e21d3d066d..e7d66d5c2f8 100644 --- a/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector-ay.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector-ay.bbx @@ -1,6 +1,6 @@ % Casper Ti. Vector's biblatex style % -% Copyright (c) 2012-2018 Casper Ti. Vector +% Copyright (c) 2012-2019 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,31 +23,15 @@ % blx-caspervector-utf8.def \ProvidesFile{caspervector-ay.bbx}% - [2018/06/29 v0.3.3 Casper Ti. Vector's author-year biblatex bibstyle] + [2019/11/13 v0.3.4 Casper Ti. Vector's author-year biblatex bibstyle] \RequireBibliographyStyle{authoryear-comp} \input{blx-caspervector-base.def} -\appto\bbx@opt@mergedate@maximum{\renewbibmacro*{bbx:ifnodate}[2]{% - \iflabeldateisdate{#1}{#2}% -}\togglefalse{bbx:bfdate}} -\appto\bbx@opt@mergedate@compact{\renewbibmacro*{bbx:ifnodate}[2]{% - \iflabeldateisdate{#1}{#2}% -}\togglefalse{bbx:bfdate}} -\appto\bbx@opt@mergedate@basic{\renewbibmacro*{bbx:ifnodate}[2]{% - \ifboolexpr{ - test {\iflabeldateisdate} and - not test {\ifdateshavedifferentprecision{label}{}} - }{#1}{#2}% -}\toggletrue{bbx:bfdate}} -\appto\bbx@opt@mergedate@minimum{\renewbibmacro*{bbx:ifnodate}[2]{% - \ifboolexpr{ - test {\iflabeldateisdate} and test {\iffieldundef{extradate}} and - not test {\ifdateshavedifferentprecision{label}{}} - }{#1}{#2}% -}\toggletrue{bbx:bfdate}} -\appto\bbx@opt@mergedate@false% - {\renewbibmacro*{bbx:ifnodate}[2]{#2}\toggletrue{bbx:bfdate}} -\renewbibmacro*{date}{\usebibmacro{bbx:ifnodate}{}{\printdate}} +\appto\bbx@opt@mergedate@maximum{\togglefalse{bbx:bfdate}} +\appto\bbx@opt@mergedate@compact{\togglefalse{bbx:bfdate}} +\appto\bbx@opt@mergedate@basic{\toggletrue{bbx:bfdate}} +\appto\bbx@opt@mergedate@minimum{\toggletrue{bbx:bfdate}} +\appto\bbx@opt@mergedate@false{\toggletrue{bbx:bfdate}} \ExecuteBibliographyOptions% {labeldate = year, mergedate = basic, dashed = false, sorting = ecnyt} @@ -55,21 +39,24 @@ \DeclareNameAlias{editor}{default} \DeclareNameAlias{translator}{default} -\newbibmacro*{ayedtrans}[1]{% +\newbibmacro*{ayauedtrans}[1]{% \ifboolexpr{test {\iftoggle{blx@use#1}} and not test {\ifnameundef{#1}}}{% \usebibmacro{bbx:dashcheck}{\bibnamedash}{% - \printnames{#1}% - \bbx@cetext% - {\printtext{\bbx@byspace{#1}}}{\setunit{\printdelim{#1typedelim}}}% - \usebibmacro{bbx:savehash}% - }\bbx@cetext{\printtext{\@nameuse{bbx@cn#1}}}{\usebibmacro{#1strg}}% - \setunit{\printdelim{nameyeardelim}}\clearname{#1}% + \usebibmacro{bbx:savehash}\printnames{#1}\bbx@ifstrg{#1}{% + \bbx@cetext% + {\usebibmacro{cntypedelim}{#1}}{\setunit{\printdelim{#1typedelim}}}% + }{\setunit{\printdelim{nameyeardelim}}}% + }\bbx@ifstrg{#1}{% + \bbx@cetext{\usebibmacro{cn#1strg}}{\usebibmacro{#1strg}}% + \setunit{\printdelim{nameyeardelim}}% + }{}\ifstrequal{#1}{author}{}{\clearname{#1}}% }{% \global\undef\bbx@lasthash \usebibmacro{labeltitle}\setunit*{\printdelim{nonameyeardelim}}% }\usebibmacro{date+extradate}% } -\renewbibmacro*{editor}{\usebibmacro{ayedtrans}{editor}} -\renewbibmacro*{translator}{\usebibmacro{ayedtrans}{translator}} +\renewbibmacro*{author}{\usebibmacro{ayauedtrans}{author}} +\renewbibmacro*{editor}{\usebibmacro{ayauedtrans}{editor}} +\renewbibmacro*{translator}{\usebibmacro{ayauedtrans}{translator}} % vim:ft=tex:ts=2:sw=2 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 50a78e9d40b..e712b44d844 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}% - [2018/06/29 v0.3.3 Casper Ti. Vector's author-year biblatex citestyle] + [2019/11/13 v0.3.4 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 e7960444992..72e893981c5 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}% - [2018/06/29 v0.3.3 Casper Ti. Vector's numeric biblatex bibstyle] + [2019/11/13 v0.3.4 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 236f4c48ecd..0b6f918f8dd 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}% - [2018/06/29 v0.3.3 Casper Ti. Vector's numeric biblatex citestyle] + [2019/11/13 v0.3.4 Casper Ti. Vector's numeric biblatex citestyle] \RequireCitationStyle{numeric-comp} \ExecuteBibliographyOptions{autocite = superscript} -- cgit v1.2.3