From e9aec44fc9318902921d10515cefb06403161a1c Mon Sep 17 00:00:00 2001 From: Zeping Lee Date: Mon, 29 Apr 2024 16:04:14 +0800 Subject: [PATCH] Make protected family name uppercase (#166) --- gbt7714-2005-author-year.bst | 11 ++++++++--- gbt7714-2005-numerical.bst | 11 ++++++++--- gbt7714-author-year.bst | 11 ++++++++--- gbt7714-numerical.bst | 11 ++++++++--- gbt7714.dtx | 11 ++++++++--- test/testbst/2015-author-year.bbl | 8 +++++++- test/testbst/2015-numerical.bbl | 8 +++++++- test/testbst/option-2005-author-year.bbl | 8 +++++++- test/testbst/option-2005-numerical.bbl | 8 +++++++- test/testbst/option-in-collection.bbl | 8 +++++++- test/testbst/option-italic-journal.bbl | 8 +++++++- test/testbst/option-link-jounal.bbl | 8 +++++++- test/testbst/option-link-title.bbl | 8 +++++++- test/testbst/option-macro.bbl | 8 +++++++- test/testbst/option-no-doi.bbl | 8 +++++++- test/testbst/option-no-mark.bbl | 8 +++++++- test/testbst/option-no-medium-type.bbl | 8 +++++++- test/testbst/option-no-sentence-case.bbl | 8 +++++++- test/testbst/option-no-slash.bbl | 8 +++++++- test/testbst/option-no-uppercase.bbl | 8 +++++++- test/testbst/option-no-url-doi.bbl | 8 +++++++- test/testbst/option-no-url.bbl | 8 +++++++- test/testbst/option-no-urldate.bbl | 8 +++++++- test/testbst/option-only-start-page.bbl | 8 +++++++- test/testbst/option-preprint.bbl | 8 +++++++- test/testbst/option-short-journal.bbl | 8 +++++++- test/testbst/option-sl-sn.bbl | 8 +++++++- test/testbst/support/standard.bib | 12 ++++++++++++ test/testbst/ucas-author-year.bbl | 8 +++++++- test/testbst/ucas-numerical.bbl | 8 +++++++- test/testbst/year-suffix-overflow.bbl | 8 +++++++- variants/thu/thuthesis-author-year.bst | 11 ++++++++--- variants/thu/thuthesis-bachelor.bst | 11 ++++++++--- variants/thu/thuthesis-numeric.bst | 11 ++++++++--- variants/ucas/ucasthesis-author-year.bst | 11 ++++++++--- variants/ucas/ucasthesis-numerical.bst | 11 ++++++++--- variants/ustc/ustcthesis-authoryear.bst | 11 ++++++++--- variants/ustc/ustcthesis-numerical.bst | 11 ++++++++--- 38 files changed, 283 insertions(+), 61 deletions(-) diff --git a/gbt7714-2005-author-year.bst b/gbt7714-2005-author-year.bst index 222b343..cf102dc 100644 --- a/gbt7714-2005-author-year.bst +++ b/gbt7714-2005-author-year.bst @@ -602,12 +602,17 @@ FUNCTION {format.name} { bbl.et.al } { t get.str.lang 'name.lang := name.lang lang.en = - { t #1 "{vv~}{ll}{ f{~}}" format.name$ + { t #1 "{vv~}{ll}" format.name$ uppercase.name - { "u" change.case$ } + { t #1 #1 substring$ "{" = + t #1 "{ff}" format.name$ empty$ not and + { "\MakeUppercase{" swap$ * "}" * } + { "u" change.case$ } + if$ + } 'skip$ if$ - t #1 "{, jj}" format.name$ * + t #1 "{ f{~}}{, jj}" format.name$ * } { t #1 "{ll}{ff}" format.name$ } if$ diff --git a/gbt7714-2005-numerical.bst b/gbt7714-2005-numerical.bst index 51f679e..3109a28 100644 --- a/gbt7714-2005-numerical.bst +++ b/gbt7714-2005-numerical.bst @@ -592,12 +592,17 @@ FUNCTION {format.name} { bbl.et.al } { t get.str.lang 'name.lang := name.lang lang.en = - { t #1 "{vv~}{ll}{ f{~}}" format.name$ + { t #1 "{vv~}{ll}" format.name$ uppercase.name - { "u" change.case$ } + { t #1 #1 substring$ "{" = + t #1 "{ff}" format.name$ empty$ not and + { "\MakeUppercase{" swap$ * "}" * } + { "u" change.case$ } + if$ + } 'skip$ if$ - t #1 "{, jj}" format.name$ * + t #1 "{ f{~}}{, jj}" format.name$ * } { t #1 "{ll}{ff}" format.name$ } if$ diff --git a/gbt7714-author-year.bst b/gbt7714-author-year.bst index 44d09c3..a8a724a 100644 --- a/gbt7714-author-year.bst +++ b/gbt7714-author-year.bst @@ -602,12 +602,17 @@ FUNCTION {format.name} { bbl.et.al } { t get.str.lang 'name.lang := name.lang lang.en = - { t #1 "{vv~}{ll}{ f{~}}" format.name$ + { t #1 "{vv~}{ll}" format.name$ uppercase.name - { "u" change.case$ } + { t #1 #1 substring$ "{" = + t #1 "{ff}" format.name$ empty$ not and + { "\MakeUppercase{" swap$ * "}" * } + { "u" change.case$ } + if$ + } 'skip$ if$ - t #1 "{, jj}" format.name$ * + t #1 "{ f{~}}{, jj}" format.name$ * } { t #1 "{ll}{ff}" format.name$ } if$ diff --git a/gbt7714-numerical.bst b/gbt7714-numerical.bst index 268539b..601aa45 100644 --- a/gbt7714-numerical.bst +++ b/gbt7714-numerical.bst @@ -592,12 +592,17 @@ FUNCTION {format.name} { bbl.et.al } { t get.str.lang 'name.lang := name.lang lang.en = - { t #1 "{vv~}{ll}{ f{~}}" format.name$ + { t #1 "{vv~}{ll}" format.name$ uppercase.name - { "u" change.case$ } + { t #1 #1 substring$ "{" = + t #1 "{ff}" format.name$ empty$ not and + { "\MakeUppercase{" swap$ * "}" * } + { "u" change.case$ } + if$ + } 'skip$ if$ - t #1 "{, jj}" format.name$ * + t #1 "{ f{~}}{, jj}" format.name$ * } { t #1 "{ll}{ff}" format.name$ } if$ diff --git a/gbt7714.dtx b/gbt7714.dtx index 7633f61..552d21f 100644 --- a/gbt7714.dtx +++ b/gbt7714.dtx @@ -2091,12 +2091,17 @@ FUNCTION {format.name} { bbl.et.al } { t get.str.lang 'name.lang := name.lang lang.en = - { t #1 "{vv~}{ll}{ f{~}}" format.name$ + { t #1 "{vv~}{ll}" format.name$ uppercase.name - { "u" change.case$ } + { t #1 #1 substring$ "{" = + t #1 "{ff}" format.name$ empty$ not and + { "\MakeUppercase{" swap$ * "}" * } + { "u" change.case$ } + if$ + } 'skip$ if$ - t #1 "{, jj}" format.name$ * + t #1 "{ f{~}}{, jj}" format.name$ * } { t #1 "{ll}{ff}" format.name$ } if$ diff --git a/test/testbst/2015-author-year.bbl b/test/testbst/2015-author-year.bbl index 6de34e2..13dc095 100644 --- a/test/testbst/2015-author-year.bbl +++ b/test/testbst/2015-author-year.bbl @@ -1,4 +1,4 @@ -\begin{thebibliography}{130} +\begin{thebibliography}{131} \providecommand{\natexlab}[1]{#1} \providecommand{\url}[1]{#1} \expandafter\ifx\csname urlstyle\endcsname\relax\else @@ -693,6 +693,12 @@ FRESE K~S, KATUS H~A, MEDER B, 2013. \newblock \url{http://www.mdpi.com/2079-7737/2/1/378}. \newblock DOI: \doi{10.3390/biology2010378}. +\bibitem[{Hagedorn}(1970)]{1970A&A.....5..184H} +\MakeUppercase{{Hagedorn}} R, 1970. +\newblock {Thermodynamics of Strong Interactions at High Energy and its + Consequences for Astrophysics}\allowbreak[J]. +\newblock Astronomy and Astrophysics, 5: 184. + \bibitem[Hopkinson(2009)]{4.6.2:5} HOPKINSON A, 2009. \newblock {UNIMARC} and metadata: Dublin core\allowbreak[EB/OL]. diff --git a/test/testbst/2015-numerical.bbl b/test/testbst/2015-numerical.bbl index d5f92b6..6469b1b 100644 --- a/test/testbst/2015-numerical.bbl +++ b/test/testbst/2015-numerical.bbl @@ -1,4 +1,4 @@ -\begin{thebibliography}{128} +\begin{thebibliography}{129} \providecommand{\natexlab}[1]{#1} \providecommand{\url}[1]{#1} \expandafter\ifx\csname urlstyle\endcsname\relax\else @@ -853,4 +853,10 @@ Dublin core metadata element set: version 1.1\allowbreak[EB/OL]. \newblock \allowbreak(2012-06-14)\allowbreak[2014-06-11]. \newblock \url{http://dublincore.org/documents/dces/}. +\bibitem[{Hagedorn}(1970)]{1970A&A.....5..184H} +\MakeUppercase{{Hagedorn}} R. +\newblock {Thermodynamics of Strong Interactions at High Energy and its + Consequences for Astrophysics}\allowbreak[J]. +\newblock Astronomy and Astrophysics, 1970, 5: 184. + \end{thebibliography} diff --git a/test/testbst/option-2005-author-year.bbl b/test/testbst/option-2005-author-year.bbl index 4994ded..f660527 100644 --- a/test/testbst/option-2005-author-year.bbl +++ b/test/testbst/option-2005-author-year.bbl @@ -1,4 +1,4 @@ -\begin{thebibliography}{128} +\begin{thebibliography}{129} \providecommand{\natexlab}[1]{#1} \providecommand{\url}[1]{#1} \expandafter\ifx\csname urlstyle\endcsname\relax\else @@ -680,6 +680,12 @@ FRESE K~S, KATUS H~A, MEDER B. 2013. \newblock Biology, 2\allowbreak (1): 378-398\allowbreak[2013-03-19]. \newblock \url{http://www.mdpi.com/2079-7737/2/1/378}. +\bibitem[{Hagedorn}(1970)]{1970A&A.....5..184H} +\MakeUppercase{{Hagedorn}} R. 1970. +\newblock {Thermodynamics of Strong Interactions at High Energy and its + Consequences for Astrophysics}\allowbreak[J]. +\newblock Astronomy and Astrophysics, 5: 184. + \bibitem[Hopkinson(2009)]{4.6.2:5} HOPKINSON A. 2009. \newblock {UNIMARC} and metadata: Dublin core\allowbreak[EB/OL]. diff --git a/test/testbst/option-2005-numerical.bbl b/test/testbst/option-2005-numerical.bbl index 11c93f3..154f60b 100644 --- a/test/testbst/option-2005-numerical.bbl +++ b/test/testbst/option-2005-numerical.bbl @@ -1,4 +1,4 @@ -\begin{thebibliography}{129} +\begin{thebibliography}{130} \providecommand{\natexlab}[1]{#1} \providecommand{\url}[1]{#1} \expandafter\ifx\csname urlstyle\endcsname\relax\else @@ -853,4 +853,10 @@ Dublin core metadata element set: version 1.1\allowbreak[EB/OL]. \newblock \allowbreak(2012-06-14)\allowbreak[2014-06-11]. \newblock \url{http://dublincore.org/documents/dces/}. +\bibitem[{Hagedorn}(1970)]{1970A&A.....5..184H} +\MakeUppercase{{Hagedorn}} R. +\newblock {Thermodynamics of Strong Interactions at High Energy and its + Consequences for Astrophysics}\allowbreak[J]. +\newblock Astronomy and Astrophysics, 1970, 5: 184. + \end{thebibliography} diff --git a/test/testbst/option-in-collection.bbl b/test/testbst/option-in-collection.bbl index 0947a8a..8e693ff 100644 --- a/test/testbst/option-in-collection.bbl +++ b/test/testbst/option-in-collection.bbl @@ -1,4 +1,4 @@ -\begin{thebibliography}{128} +\begin{thebibliography}{129} \providecommand{\natexlab}[1]{#1} \providecommand{\url}[1]{#1} \expandafter\ifx\csname urlstyle\endcsname\relax\else @@ -847,4 +847,10 @@ Dublin core metadata element set: version 1.1\allowbreak[EB/OL]. \newblock \allowbreak(2012-06-14)\allowbreak[2014-06-11]. \newblock \url{http://dublincore.org/documents/dces/}. +\bibitem[{Hagedorn}(1970)]{1970A&A.....5..184H} +\MakeUppercase{{Hagedorn}} R. +\newblock {Thermodynamics of Strong Interactions at High Energy and its + Consequences for Astrophysics}\allowbreak[J]. +\newblock Astronomy and Astrophysics, 1970, 5: 184. + \end{thebibliography} diff --git a/test/testbst/option-italic-journal.bbl b/test/testbst/option-italic-journal.bbl index a52a7ee..2e5603a 100644 --- a/test/testbst/option-italic-journal.bbl +++ b/test/testbst/option-italic-journal.bbl @@ -1,4 +1,4 @@ -\begin{thebibliography}{128} +\begin{thebibliography}{129} \providecommand{\natexlab}[1]{#1} \providecommand{\url}[1]{#1} \expandafter\ifx\csname urlstyle\endcsname\relax\else @@ -858,4 +858,10 @@ Dublin core metadata element set: version 1.1\allowbreak[EB/OL]. \newblock \allowbreak(2012-06-14)\allowbreak[2014-06-11]. \newblock \url{http://dublincore.org/documents/dces/}. +\bibitem[{Hagedorn}(1970)]{1970A&A.....5..184H} +\MakeUppercase{{Hagedorn}} R. +\newblock {Thermodynamics of Strong Interactions at High Energy and its + Consequences for Astrophysics}\allowbreak[J]. +\newblock \emph{Astronomy and Astrophysics}, 1970, 5: 184. + \end{thebibliography} diff --git a/test/testbst/option-link-jounal.bbl b/test/testbst/option-link-jounal.bbl index 233677d..4523e98 100644 --- a/test/testbst/option-link-jounal.bbl +++ b/test/testbst/option-link-jounal.bbl @@ -1,4 +1,4 @@ -\begin{thebibliography}{128} +\begin{thebibliography}{129} \providecommand{\natexlab}[1]{#1} \providecommand{\url}[1]{#1} \expandafter\ifx\csname urlstyle\endcsname\relax\else @@ -872,4 +872,10 @@ Dublin core metadata element set: version 1.1\allowbreak[EB/OL]. \newblock \allowbreak(2012-06-14)\allowbreak[2014-06-11]. \newblock \url{http://dublincore.org/documents/dces/}. +\bibitem[{Hagedorn}(1970)]{1970A&A.....5..184H} +\MakeUppercase{{Hagedorn}} R. +\newblock {Thermodynamics of Strong Interactions at High Energy and its + Consequences for Astrophysics}\allowbreak[J]. +\newblock Astronomy and Astrophysics, 1970, 5: 184. + \end{thebibliography} diff --git a/test/testbst/option-link-title.bbl b/test/testbst/option-link-title.bbl index 81d66bb..81d9281 100644 --- a/test/testbst/option-link-title.bbl +++ b/test/testbst/option-link-title.bbl @@ -1,4 +1,4 @@ -\begin{thebibliography}{128} +\begin{thebibliography}{129} \providecommand{\natexlab}[1]{#1} \providecommand{\url}[1]{#1} \expandafter\ifx\csname urlstyle\endcsname\relax\else @@ -902,4 +902,10 @@ PARK J~R, TOSAKA Y. \newblock \allowbreak(2012-06-14)\allowbreak[2014-06-11]. \newblock \url{http://dublincore.org/documents/dces/}. +\bibitem[{Hagedorn}(1970)]{1970A&A.....5..184H} +\MakeUppercase{{Hagedorn}} R. +\newblock {Thermodynamics of Strong Interactions at High Energy and its + Consequences for Astrophysics}\allowbreak[J]. +\newblock Astronomy and Astrophysics, 1970, 5: 184. + \end{thebibliography} diff --git a/test/testbst/option-macro.bbl b/test/testbst/option-macro.bbl index b8e00fb..67896e3 100644 --- a/test/testbst/option-macro.bbl +++ b/test/testbst/option-macro.bbl @@ -1,4 +1,4 @@ -\begin{thebibliography}{128} +\begin{thebibliography}{129} \providecommand{\biband}{和} \providecommand{\bibetal}{等} \providecommand{\natexlab}[1]{#1} @@ -862,4 +862,10 @@ Dublin core metadata element set: version 1.1\allowbreak[EB/OL]. \newblock \allowbreak(2012-06-14)\allowbreak[2014-06-11]. \newblock \url{http://dublincore.org/documents/dces/}. +\bibitem[{Hagedorn}(1970)]{1970A&A.....5..184H} +\MakeUppercase{{Hagedorn}} R. +\newblock {Thermodynamics of Strong Interactions at High Energy and its + Consequences for Astrophysics}\allowbreak[J]. +\newblock Astronomy and Astrophysics, 1970, 5: 184. + \end{thebibliography} diff --git a/test/testbst/option-no-doi.bbl b/test/testbst/option-no-doi.bbl index fa0cfe7..4d13c16 100644 --- a/test/testbst/option-no-doi.bbl +++ b/test/testbst/option-no-doi.bbl @@ -1,4 +1,4 @@ -\begin{thebibliography}{128} +\begin{thebibliography}{129} \providecommand{\natexlab}[1]{#1} \providecommand{\url}[1]{#1} \expandafter\ifx\csname urlstyle\endcsname\relax\else @@ -847,4 +847,10 @@ Dublin core metadata element set: version 1.1\allowbreak[EB/OL]. \newblock \allowbreak(2012-06-14)\allowbreak[2014-06-11]. \newblock \url{http://dublincore.org/documents/dces/}. +\bibitem[{Hagedorn}(1970)]{1970A&A.....5..184H} +\MakeUppercase{{Hagedorn}} R. +\newblock {Thermodynamics of Strong Interactions at High Energy and its + Consequences for Astrophysics}\allowbreak[J]. +\newblock Astronomy and Astrophysics, 1970, 5: 184. + \end{thebibliography} diff --git a/test/testbst/option-no-mark.bbl b/test/testbst/option-no-mark.bbl index 12ec0c3..cbf5e6f 100644 --- a/test/testbst/option-no-mark.bbl +++ b/test/testbst/option-no-mark.bbl @@ -1,4 +1,4 @@ -\begin{thebibliography}{128} +\begin{thebibliography}{129} \providecommand{\natexlab}[1]{#1} \providecommand{\url}[1]{#1} \expandafter\ifx\csname urlstyle\endcsname\relax\else @@ -828,4 +828,10 @@ Dublin core metadata element set: version 1.1. \newblock \allowbreak(2012-06-14)\allowbreak[2014-06-11]. \newblock \url{http://dublincore.org/documents/dces/}. +\bibitem[{Hagedorn}(1970)]{1970A&A.....5..184H} +\MakeUppercase{{Hagedorn}} R. +\newblock {Thermodynamics of Strong Interactions at High Energy and its + Consequences for Astrophysics}. +\newblock Astronomy and Astrophysics, 1970, 5: 184. + \end{thebibliography} diff --git a/test/testbst/option-no-medium-type.bbl b/test/testbst/option-no-medium-type.bbl index 983fc95..ce3511e 100644 --- a/test/testbst/option-no-medium-type.bbl +++ b/test/testbst/option-no-medium-type.bbl @@ -1,4 +1,4 @@ -\begin{thebibliography}{128} +\begin{thebibliography}{129} \providecommand{\natexlab}[1]{#1} \providecommand{\url}[1]{#1} \expandafter\ifx\csname urlstyle\endcsname\relax\else @@ -850,4 +850,10 @@ Dublin core metadata element set: version 1.1\allowbreak[EB]. \newblock \allowbreak(2012-06-14)\allowbreak[2014-06-11]. \newblock \url{http://dublincore.org/documents/dces/}. +\bibitem[{Hagedorn}(1970)]{1970A&A.....5..184H} +\MakeUppercase{{Hagedorn}} R. +\newblock {Thermodynamics of Strong Interactions at High Energy and its + Consequences for Astrophysics}\allowbreak[J]. +\newblock Astronomy and Astrophysics, 1970, 5: 184. + \end{thebibliography} diff --git a/test/testbst/option-no-sentence-case.bbl b/test/testbst/option-no-sentence-case.bbl index 6d02270..3d28e36 100644 --- a/test/testbst/option-no-sentence-case.bbl +++ b/test/testbst/option-no-sentence-case.bbl @@ -1,4 +1,4 @@ -\begin{thebibliography}{128} +\begin{thebibliography}{129} \providecommand{\natexlab}[1]{#1} \providecommand{\url}[1]{#1} \expandafter\ifx\csname urlstyle\endcsname\relax\else @@ -853,4 +853,10 @@ Dublin Core Metadata Element Set: version 1.1\allowbreak[EB/OL]. \newblock \allowbreak(2012-06-14)\allowbreak[2014-06-11]. \newblock \url{http://dublincore.org/documents/dces/}. +\bibitem[{Hagedorn}(1970)]{1970A&A.....5..184H} +\MakeUppercase{{Hagedorn}} R. +\newblock {Thermodynamics of Strong Interactions at High Energy and its + Consequences for Astrophysics}\allowbreak[J]. +\newblock Astronomy and Astrophysics, 1970, 5: 184. + \end{thebibliography} diff --git a/test/testbst/option-no-slash.bbl b/test/testbst/option-no-slash.bbl index d929f50..298646f 100644 --- a/test/testbst/option-no-slash.bbl +++ b/test/testbst/option-no-slash.bbl @@ -1,4 +1,4 @@ -\begin{thebibliography}{128} +\begin{thebibliography}{129} \providecommand{\natexlab}[1]{#1} \providecommand{\url}[1]{#1} \expandafter\ifx\csname urlstyle\endcsname\relax\else @@ -847,4 +847,10 @@ Dublin core metadata element set: version 1.1\allowbreak[EB/OL]. \newblock \allowbreak(2012-06-14)\allowbreak[2014-06-11]. \newblock \url{http://dublincore.org/documents/dces/}. +\bibitem[{Hagedorn}(1970)]{1970A&A.....5..184H} +\MakeUppercase{{Hagedorn}} R. +\newblock {Thermodynamics of Strong Interactions at High Energy and its + Consequences for Astrophysics}\allowbreak[J]. +\newblock Astronomy and Astrophysics, 1970, 5: 184. + \end{thebibliography} diff --git a/test/testbst/option-no-uppercase.bbl b/test/testbst/option-no-uppercase.bbl index 756534b..11a9c0a 100644 --- a/test/testbst/option-no-uppercase.bbl +++ b/test/testbst/option-no-uppercase.bbl @@ -1,4 +1,4 @@ -\begin{thebibliography}{128} +\begin{thebibliography}{129} \providecommand{\natexlab}[1]{#1} \providecommand{\url}[1]{#1} \expandafter\ifx\csname urlstyle\endcsname\relax\else @@ -853,4 +853,10 @@ Dublin core metadata element set: version 1.1\allowbreak[EB/OL]. \newblock \allowbreak(2012-06-14)\allowbreak[2014-06-11]. \newblock \url{http://dublincore.org/documents/dces/}. +\bibitem[{Hagedorn}(1970)]{1970A&A.....5..184H} +{Hagedorn} R. +\newblock {Thermodynamics of Strong Interactions at High Energy and its + Consequences for Astrophysics}\allowbreak[J]. +\newblock Astronomy and Astrophysics, 1970, 5: 184. + \end{thebibliography} diff --git a/test/testbst/option-no-url-doi.bbl b/test/testbst/option-no-url-doi.bbl index b86f100..1dc2747 100644 --- a/test/testbst/option-no-url-doi.bbl +++ b/test/testbst/option-no-url-doi.bbl @@ -1,4 +1,4 @@ -\begin{thebibliography}{128} +\begin{thebibliography}{129} \providecommand{\natexlab}[1]{#1} \providecommand{\url}[1]{#1} \expandafter\ifx\csname urlstyle\endcsname\relax\else @@ -780,4 +780,10 @@ Dublin core metadata element set: version 1.1\allowbreak[EB/OL]. \newblock \allowbreak(2012-06-14)\allowbreak[2014-06-11]. \newblock \url{http://dublincore.org/documents/dces/}. +\bibitem[{Hagedorn}(1970)]{1970A&A.....5..184H} +\MakeUppercase{{Hagedorn}} R. +\newblock {Thermodynamics of Strong Interactions at High Energy and its + Consequences for Astrophysics}\allowbreak[J]. +\newblock Astronomy and Astrophysics, 1970, 5: 184. + \end{thebibliography} diff --git a/test/testbst/option-no-url.bbl b/test/testbst/option-no-url.bbl index bf359a2..801f441 100644 --- a/test/testbst/option-no-url.bbl +++ b/test/testbst/option-no-url.bbl @@ -1,4 +1,4 @@ -\begin{thebibliography}{128} +\begin{thebibliography}{129} \providecommand{\natexlab}[1]{#1} \providecommand{\url}[1]{#1} \expandafter\ifx\csname urlstyle\endcsname\relax\else @@ -787,4 +787,10 @@ Dublin core metadata element set: version 1.1\allowbreak[EB/OL]. \newblock \allowbreak(2012-06-14)\allowbreak[2014-06-11]. \newblock \url{http://dublincore.org/documents/dces/}. +\bibitem[{Hagedorn}(1970)]{1970A&A.....5..184H} +\MakeUppercase{{Hagedorn}} R. +\newblock {Thermodynamics of Strong Interactions at High Energy and its + Consequences for Astrophysics}\allowbreak[J]. +\newblock Astronomy and Astrophysics, 1970, 5: 184. + \end{thebibliography} diff --git a/test/testbst/option-no-urldate.bbl b/test/testbst/option-no-urldate.bbl index c4986be..63df0ef 100644 --- a/test/testbst/option-no-urldate.bbl +++ b/test/testbst/option-no-urldate.bbl @@ -1,4 +1,4 @@ -\begin{thebibliography}{128} +\begin{thebibliography}{129} \providecommand{\natexlab}[1]{#1} \providecommand{\url}[1]{#1} \expandafter\ifx\csname urlstyle\endcsname\relax\else @@ -849,4 +849,10 @@ Dublin core metadata element set: version 1.1\allowbreak[EB/OL]. \newblock \allowbreak(2012-06-14)\allowbreak[2014-06-11]. \newblock \url{http://dublincore.org/documents/dces/}. +\bibitem[{Hagedorn}(1970)]{1970A&A.....5..184H} +\MakeUppercase{{Hagedorn}} R. +\newblock {Thermodynamics of Strong Interactions at High Energy and its + Consequences for Astrophysics}\allowbreak[J]. +\newblock Astronomy and Astrophysics, 1970, 5: 184. + \end{thebibliography} diff --git a/test/testbst/option-only-start-page.bbl b/test/testbst/option-only-start-page.bbl index 9c9bbda..4dbc12e 100644 --- a/test/testbst/option-only-start-page.bbl +++ b/test/testbst/option-only-start-page.bbl @@ -1,4 +1,4 @@ -\begin{thebibliography}{128} +\begin{thebibliography}{129} \providecommand{\natexlab}[1]{#1} \providecommand{\url}[1]{#1} \expandafter\ifx\csname urlstyle\endcsname\relax\else @@ -852,4 +852,10 @@ Dublin core metadata element set: version 1.1\allowbreak[EB/OL]. \newblock \allowbreak(2012-06-14)\allowbreak[2014-06-11]. \newblock \url{http://dublincore.org/documents/dces/}. +\bibitem[{Hagedorn}(1970)]{1970A&A.....5..184H} +\MakeUppercase{{Hagedorn}} R. +\newblock {Thermodynamics of Strong Interactions at High Energy and its + Consequences for Astrophysics}\allowbreak[J]. +\newblock Astronomy and Astrophysics, 1970, 5: 184. + \end{thebibliography} diff --git a/test/testbst/option-preprint.bbl b/test/testbst/option-preprint.bbl index c0df27c..07efda4 100644 --- a/test/testbst/option-preprint.bbl +++ b/test/testbst/option-preprint.bbl @@ -1,4 +1,4 @@ -\begin{thebibliography}{130} +\begin{thebibliography}{131} \providecommand{\natexlab}[1]{#1} \providecommand{\url}[1]{#1} \expandafter\ifx\csname urlstyle\endcsname\relax\else @@ -868,4 +868,10 @@ Dublin core metadata element set: version 1.1\allowbreak[EB/OL]. \newblock \allowbreak(2012-06-14)\allowbreak[2014-06-11]. \newblock \url{http://dublincore.org/documents/dces/}. +\bibitem[{Hagedorn}(1970)]{1970A&A.....5..184H} +\MakeUppercase{{Hagedorn}} R. +\newblock {Thermodynamics of Strong Interactions at High Energy and its + Consequences for Astrophysics}\allowbreak[J]. +\newblock Astronomy and Astrophysics, 1970, 5: 184. + \end{thebibliography} diff --git a/test/testbst/option-short-journal.bbl b/test/testbst/option-short-journal.bbl index 23a4e38..7ab175a 100644 --- a/test/testbst/option-short-journal.bbl +++ b/test/testbst/option-short-journal.bbl @@ -1,4 +1,4 @@ -\begin{thebibliography}{129} +\begin{thebibliography}{130} \providecommand{\natexlab}[1]{#1} \providecommand{\url}[1]{#1} \expandafter\ifx\csname urlstyle\endcsname\relax\else @@ -861,4 +861,10 @@ Dublin core metadata element set: version 1.1\allowbreak[EB/OL]. \newblock \allowbreak(2012-06-14)\allowbreak[2014-06-11]. \newblock \url{http://dublincore.org/documents/dces/}. +\bibitem[{Hagedorn}(1970)]{1970A&A.....5..184H} +\MakeUppercase{{Hagedorn}} R. +\newblock {Thermodynamics of Strong Interactions at High Energy and its + Consequences for Astrophysics}\allowbreak[J]. +\newblock Astronomy and Astrophysics, 1970, 5: 184. + \end{thebibliography} diff --git a/test/testbst/option-sl-sn.bbl b/test/testbst/option-sl-sn.bbl index 8846155..0c844d8 100644 --- a/test/testbst/option-sl-sn.bbl +++ b/test/testbst/option-sl-sn.bbl @@ -1,4 +1,4 @@ -\begin{thebibliography}{128} +\begin{thebibliography}{129} \providecommand{\natexlab}[1]{#1} \providecommand{\url}[1]{#1} \expandafter\ifx\csname urlstyle\endcsname\relax\else @@ -853,4 +853,10 @@ Dublin core metadata element set: version 1.1\allowbreak[EB/OL]. \newblock \allowbreak(2012-06-14)\allowbreak[2014-06-11]. \newblock \url{http://dublincore.org/documents/dces/}. +\bibitem[{Hagedorn}(1970)]{1970A&A.....5..184H} +\MakeUppercase{{Hagedorn}} R. +\newblock {Thermodynamics of Strong Interactions at High Energy and its + Consequences for Astrophysics}\allowbreak[J]. +\newblock Astronomy and Astrophysics, 1970, 5: 184. + \end{thebibliography} diff --git a/test/testbst/support/standard.bib b/test/testbst/support/standard.bib index e8df480..d5e9afe 100644 --- a/test/testbst/support/standard.bib +++ b/test/testbst/support/standard.bib @@ -1359,3 +1359,15 @@ @online{A.10:4 urldate = {2014-06-11}, url = {http://dublincore.org/documents/dces/}, } + +@ARTICLE{1970A&A.....5..184H, + author = {{Hagedorn}, R.}, + title = "{Thermodynamics of Strong Interactions at High Energy and its Consequences for Astrophysics}", + journal = {Astronomy and Astrophysics}, + year = 1970, + month = apr, + volume = {5}, + pages = {184}, + adsurl = {https://ui.adsabs.harvard.edu/abs/1970A&A.....5..184H}, + adsnote = {Provided by the SAO/NASA Astrophysics Data System} +} diff --git a/test/testbst/ucas-author-year.bbl b/test/testbst/ucas-author-year.bbl index 19b1054..afbf902 100644 --- a/test/testbst/ucas-author-year.bbl +++ b/test/testbst/ucas-author-year.bbl @@ -1,4 +1,4 @@ -\begin{thebibliography}{128} +\begin{thebibliography}{129} \providecommand{\biband}{和} \providecommand{\bibetal}{等} \providecommand{\natexlab}[1]{#1} @@ -696,6 +696,12 @@ FRESE K~S, KATUS H~A, MEDER B. \newblock \url{http://www.mdpi.com/2079-7737/2/1/378}. \newblock DOI: \doi{10.3390/biology2010378}. +\bibitem[{Hagedorn}(1970)]{1970A&A.....5..184H} +\MakeUppercase{{Hagedorn}} R. +\newblock {Thermodynamics of Strong Interactions at High Energy and its + Consequences for Astrophysics}\allowbreak[J]. +\newblock Astronomy and Astrophysics, 1970, 5: 184. + \bibitem[Hopkinson(2009)]{4.6.2:5} HOPKINSON A. \newblock {UNIMARC} and metadata: Dublin core\allowbreak[EB/OL]. diff --git a/test/testbst/ucas-numerical.bbl b/test/testbst/ucas-numerical.bbl index ddc9473..fb928b3 100644 --- a/test/testbst/ucas-numerical.bbl +++ b/test/testbst/ucas-numerical.bbl @@ -1,4 +1,4 @@ -\begin{thebibliography}{128} +\begin{thebibliography}{129} \providecommand{\biband}{和} \providecommand{\bibetal}{等} \providecommand{\natexlab}[1]{#1} @@ -861,4 +861,10 @@ Dublin core metadata element set: version 1.1\allowbreak[EB/OL]. \newblock \allowbreak(2012-06-14)\allowbreak[2014-06-11]. \newblock \url{http://dublincore.org/documents/dces/}. +\bibitem[{Hagedorn}(1970)]{1970A&A.....5..184H} +\MakeUppercase{{Hagedorn}} R. +\newblock {Thermodynamics of Strong Interactions at High Energy and its + Consequences for Astrophysics}\allowbreak[J]. +\newblock Astronomy and Astrophysics, 1970, 5: 184. + \end{thebibliography} diff --git a/test/testbst/year-suffix-overflow.bbl b/test/testbst/year-suffix-overflow.bbl index cd9d460..c582102 100644 --- a/test/testbst/year-suffix-overflow.bbl +++ b/test/testbst/year-suffix-overflow.bbl @@ -1,4 +1,4 @@ -\begin{thebibliography}{185} +\begin{thebibliography}{186} \providecommand{\natexlab}[1]{#1} \providecommand{\url}[1]{#1} \expandafter\ifx\csname urlstyle\endcsname\relax\else @@ -913,6 +913,12 @@ FRESE K~S, KATUS H~A, MEDER B, 2013. \newblock \url{http://www.mdpi.com/2079-7737/2/1/378}. \newblock DOI: \doi{10.3390/biology2010378}. +\bibitem[{Hagedorn}(1970)]{1970A&A.....5..184H} +\MakeUppercase{{Hagedorn}} R, 1970. +\newblock {Thermodynamics of Strong Interactions at High Energy and its + Consequences for Astrophysics}\allowbreak[J]. +\newblock Astronomy and Astrophysics, 5: 184. + \bibitem[Hopkinson(2009)]{4.6.2:5} HOPKINSON A, 2009. \newblock {UNIMARC} and metadata: Dublin core\allowbreak[EB/OL]. diff --git a/variants/thu/thuthesis-author-year.bst b/variants/thu/thuthesis-author-year.bst index 904f061..fd83969 100644 --- a/variants/thu/thuthesis-author-year.bst +++ b/variants/thu/thuthesis-author-year.bst @@ -602,12 +602,17 @@ FUNCTION {format.name} { bbl.et.al } { t get.str.lang 'name.lang := name.lang lang.en = - { t #1 "{vv~}{ll}{ f{~}}" format.name$ + { t #1 "{vv~}{ll}" format.name$ uppercase.name - { "u" change.case$ } + { t #1 #1 substring$ "{" = + t #1 "{ff}" format.name$ empty$ not and + { "\MakeUppercase{" swap$ * "}" * } + { "u" change.case$ } + if$ + } 'skip$ if$ - t #1 "{, jj}" format.name$ * + t #1 "{ f{~}}{, jj}" format.name$ * } { t #1 "{ll}{ff}" format.name$ } if$ diff --git a/variants/thu/thuthesis-bachelor.bst b/variants/thu/thuthesis-bachelor.bst index 52b8184..c9da9a5 100644 --- a/variants/thu/thuthesis-bachelor.bst +++ b/variants/thu/thuthesis-bachelor.bst @@ -592,12 +592,17 @@ FUNCTION {format.name} { bbl.et.al } { t get.str.lang 'name.lang := name.lang lang.en = - { t #1 "{vv~}{ll}{ f{~}}" format.name$ + { t #1 "{vv~}{ll}" format.name$ uppercase.name - { "u" change.case$ } + { t #1 #1 substring$ "{" = + t #1 "{ff}" format.name$ empty$ not and + { "\MakeUppercase{" swap$ * "}" * } + { "u" change.case$ } + if$ + } 'skip$ if$ - t #1 "{, jj}" format.name$ * + t #1 "{ f{~}}{, jj}" format.name$ * } { t #1 "{ll}{ff}" format.name$ } if$ diff --git a/variants/thu/thuthesis-numeric.bst b/variants/thu/thuthesis-numeric.bst index 15d799c..2c68cd4 100644 --- a/variants/thu/thuthesis-numeric.bst +++ b/variants/thu/thuthesis-numeric.bst @@ -592,12 +592,17 @@ FUNCTION {format.name} { bbl.et.al } { t get.str.lang 'name.lang := name.lang lang.en = - { t #1 "{vv~}{ll}{ f{~}}" format.name$ + { t #1 "{vv~}{ll}" format.name$ uppercase.name - { "u" change.case$ } + { t #1 #1 substring$ "{" = + t #1 "{ff}" format.name$ empty$ not and + { "\MakeUppercase{" swap$ * "}" * } + { "u" change.case$ } + if$ + } 'skip$ if$ - t #1 "{, jj}" format.name$ * + t #1 "{ f{~}}{, jj}" format.name$ * } { t #1 "{ll}{ff}" format.name$ } if$ diff --git a/variants/ucas/ucasthesis-author-year.bst b/variants/ucas/ucasthesis-author-year.bst index 4b39d07..90eea66 100644 --- a/variants/ucas/ucasthesis-author-year.bst +++ b/variants/ucas/ucasthesis-author-year.bst @@ -602,12 +602,17 @@ FUNCTION {format.name} { bbl.et.al } { t get.str.lang 'name.lang := name.lang lang.en = - { t #1 "{vv~}{ll}{ f{~}}" format.name$ + { t #1 "{vv~}{ll}" format.name$ uppercase.name - { "u" change.case$ } + { t #1 #1 substring$ "{" = + t #1 "{ff}" format.name$ empty$ not and + { "\MakeUppercase{" swap$ * "}" * } + { "u" change.case$ } + if$ + } 'skip$ if$ - t #1 "{, jj}" format.name$ * + t #1 "{ f{~}}{, jj}" format.name$ * } { t #1 "{ll}{ff}" format.name$ } if$ diff --git a/variants/ucas/ucasthesis-numerical.bst b/variants/ucas/ucasthesis-numerical.bst index b6f2ff4..a1c8345 100644 --- a/variants/ucas/ucasthesis-numerical.bst +++ b/variants/ucas/ucasthesis-numerical.bst @@ -592,12 +592,17 @@ FUNCTION {format.name} { bbl.et.al } { t get.str.lang 'name.lang := name.lang lang.en = - { t #1 "{vv~}{ll}{ f{~}}" format.name$ + { t #1 "{vv~}{ll}" format.name$ uppercase.name - { "u" change.case$ } + { t #1 #1 substring$ "{" = + t #1 "{ff}" format.name$ empty$ not and + { "\MakeUppercase{" swap$ * "}" * } + { "u" change.case$ } + if$ + } 'skip$ if$ - t #1 "{, jj}" format.name$ * + t #1 "{ f{~}}{, jj}" format.name$ * } { t #1 "{ll}{ff}" format.name$ } if$ diff --git a/variants/ustc/ustcthesis-authoryear.bst b/variants/ustc/ustcthesis-authoryear.bst index bac56b4..4bdebaa 100644 --- a/variants/ustc/ustcthesis-authoryear.bst +++ b/variants/ustc/ustcthesis-authoryear.bst @@ -602,12 +602,17 @@ FUNCTION {format.name} { bbl.et.al } { t get.str.lang 'name.lang := name.lang lang.en = - { t #1 "{vv~}{ll}{ f{~}}" format.name$ + { t #1 "{vv~}{ll}" format.name$ uppercase.name - { "u" change.case$ } + { t #1 #1 substring$ "{" = + t #1 "{ff}" format.name$ empty$ not and + { "\MakeUppercase{" swap$ * "}" * } + { "u" change.case$ } + if$ + } 'skip$ if$ - t #1 "{, jj}" format.name$ * + t #1 "{ f{~}}{, jj}" format.name$ * } { t #1 "{ll}{ff}" format.name$ } if$ diff --git a/variants/ustc/ustcthesis-numerical.bst b/variants/ustc/ustcthesis-numerical.bst index 5f5ab68..7e2f81b 100644 --- a/variants/ustc/ustcthesis-numerical.bst +++ b/variants/ustc/ustcthesis-numerical.bst @@ -592,12 +592,17 @@ FUNCTION {format.name} { bbl.et.al } { t get.str.lang 'name.lang := name.lang lang.en = - { t #1 "{vv~}{ll}{ f{~}}" format.name$ + { t #1 "{vv~}{ll}" format.name$ uppercase.name - { "u" change.case$ } + { t #1 #1 substring$ "{" = + t #1 "{ff}" format.name$ empty$ not and + { "\MakeUppercase{" swap$ * "}" * } + { "u" change.case$ } + if$ + } 'skip$ if$ - t #1 "{, jj}" format.name$ * + t #1 "{ f{~}}{, jj}" format.name$ * } { t #1 "{ll}{ff}" format.name$ } if$