From 2fc43b1bd746c45eaf2fdc043547f2f3a1bb16ca Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 19 Oct 2018 20:34:15 +0000 Subject: biblatex-phys (19oct18) git-svn-id: svn://tug.org/texlive/trunk@48941 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/biblatex-phys/phys.bbx | 82 +++++++--------------- Master/texmf-dist/tex/latex/biblatex-phys/phys.cbx | 4 +- 2 files changed, 29 insertions(+), 57 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/biblatex-phys/phys.bbx b/Master/texmf-dist/tex/latex/biblatex-phys/phys.bbx index 9651ec35f9c..7b69506a5dc 100644 --- a/Master/texmf-dist/tex/latex/biblatex-phys/phys.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-phys/phys.bbx @@ -8,7 +8,7 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{phys.bbx}[2016/08/23 v1.0b biblatex bibliography style] +\ProvidesFile{phys.bbx}[2018/10/19 v1.1 biblatex bibliography style] % Load the standard style to avoid copy-pasting unnecessary material \RequireBibliographyStyle{numeric-comp} @@ -58,14 +58,14 @@ \DeclareFieldFormat[inproceedings]{booktitle}{#1} \DeclareFieldFormat{eprint:arxiv}{% \ifhyperref - {\href{http://arxiv.org/\abx@arxivpath/#1}{% + {\href{https://arxiv.org/\abx@arxivpath/#1}{% arXiv\addcolon \nolinkurl{#1}% \iffieldundef{eprintclass} - {} - {\addspace\UrlFont{\mkbibbrackets{\thefield{eprintclass}}}}}} + {} + {\addspace\UrlFont{\mkbibbrackets{\thefield{eprintclass}}}}}} {arXiv\addcolon - \nolinkurl{#1} + \nolinkurl{#1}% \iffieldundef{eprintclass} {} {\addspace\UrlFont{\mkbibbrackets{\thefield{eprintclass}}}}}} @@ -73,7 +73,7 @@ \DeclareFieldFormat[online]{date}{\mkbibparens{#1}\nopunct} \DeclareFieldFormat{doi}{% \ifhyperref - {\href{http://dx.doi.org/#1}{\nolinkurl{#1}}} + {\href{https://doi.org/#1}{\nolinkurl{#1}}} {\nolinkurl{#1}}% } \DeclareFieldFormat{doi/url-link}{% @@ -85,7 +85,7 @@ {\@firstofone} {\href{\thefield{url}}}% } - {\href{http://dx.doi.org/\thefield{doi}}}% + {\href{https://doi.org/\thefield{doi}}}% } {\@firstofone}% {#1}% @@ -105,12 +105,13 @@ {}% } \DeclareFieldFormat{related:translatedas}{\mkbibbrackets{#1}} -\DeclareFieldFormat{titlecase}{\MakeSentenceCase{#1}} +\DeclareFieldFormat{titlecase}{\MakeSentenceCase*{#1}} \DeclareFieldFormat{url}{\url{#1}} \DeclareFieldFormat[article]{volume}{\mkbibbold{#1}} \DeclareFieldFormat{year}{\mkbibparens{#1}} % Simple modifications to punctuation, etc. +\renewcommand*{\begrelateddelim}{\addsemicolon\space}% \renewcommand*{\intitlepunct}{\addspace} \providecommand*{\mkibid}[1]{#1} \renewcommand*{\newunitpunct}{\addcomma\space} @@ -237,19 +238,16 @@ \printfield{year}% }% \setunit{\addspace}% - \iffieldundef{pages} - {% - \printfield{doi}% - \clearfield{doi}% - }% - {}% \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{finentry}% } @@ -342,7 +340,10 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{finentry}% } @@ -380,7 +381,10 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{finentry}% } @@ -426,9 +430,11 @@ {% \setunit{\addcomma\space}% \usebibmacro{authorstrg}% - }% - }% - } + }% + }% + \iffieldundef{collaboration} + {} + {\printfield[parens]{collaboration}}} {}% } @@ -450,40 +456,6 @@ }% } -% This is the original definition from standard.bbx, but -% a relatedstring is printed only if it was explicitly defined. -\renewbibmacro*{related}{% - \ifboolexpr{ - not test {\iftoggle{bbx:related}} - or - test {\iffieldundef{related}} - } - {} - {% - \setunit{\addperiod\addspace}% - \setcounter{bbx:relatedcount}{0}% - \setcounter{bbx:relatedtotal}{0}% - \def\do##1{\stepcounter{bbx:relatedtotal}}% - \docsvfield{related}% - \def\do{% - \stepcounter{bbx:relatedcount}% - \ifnumgreater{\value{bbx:relatedcount}}{1} - {\printtext{\relateddelim}} - {}}% - \ifbibmacroundef{related:\strfield{relatedtype}} - {\appto{\do}{\usebibmacro{related:default}}} - {\appto{\do}{\usebibmacro*{related:\strfield{relatedtype}}}}% - \iffieldformatundef{related:\strfield{relatedtype}} - {\def\bbx@tempa{related}} - {\def\bbx@tempa{related:\strfield{relatedtype}}}% - \printtext[\bbx@tempa]{% - \iffieldundef{relatedstring} - {} - {\iffieldbibstring{relatedstring} - {\printtext{\bibstring{\thefield{relatedstring}}\relatedpunct}} - {\printtext{\printfield{relatedstring}\relatedpunct}}}% - \docsvfield{related}}}} - \newbibmacro*{related:translatedas}[1]{% \entrydata{#1}{% \usebibmacro{journal+issuetitle}% @@ -505,7 +477,7 @@ %% -%% Copyright (C) 2012-2014,2016 by +%% Copyright (C) 2012-2014,2016,2018 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of diff --git a/Master/texmf-dist/tex/latex/biblatex-phys/phys.cbx b/Master/texmf-dist/tex/latex/biblatex-phys/phys.cbx index 56e698892f4..dcc687d59f1 100644 --- a/Master/texmf-dist/tex/latex/biblatex-phys/phys.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-phys/phys.cbx @@ -8,7 +8,7 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{phys.cbx}[2016/08/23 v1.0b biblatex citation style] +\ProvidesFile{phys.cbx}[2018/10/19 v1.1 biblatex citation style] \RequireCitationStyle{numeric-comp} @@ -20,7 +20,7 @@ } %% -%% Copyright (C) 2012-2014,2016 by +%% Copyright (C) 2012-2014,2016,2018 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of -- cgit v1.2.3