Make protected family name uppercase (#166)

zepinglee · Apr 29, 2024 · e9aec44 · e9aec44
1 parent 0b1ae2c
commit e9aec44
Show file tree

Hide file tree

Showing 38 changed files with 283 additions and 61 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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}