Fix underscore in DOI

zepinglee · Mar 9, 2020 · ea96714 · ea96714
1 parent fe2f439
commit ea96714
Show file tree

Hide file tree

Showing 29 changed files with 59 additions and 56 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - 增加选项 `abbreviate.journal`
 - 增加选项 `show.english.translation`
 
+### Fixed
+- 修正 DOI 中含有下划线的问题
+
 ## [v2.0] - 2020-03-04
 ### Changed
 - 需要用户在主文档使用 `\bibliographystyle` 命令

diff --git a/gbt7714-author-year.bst b/gbt7714-author-year.bst
@@ -2119,9 +2119,9 @@ FUNCTION {begin.bib}
   show.doi
     { "\expandafter\ifx\csname href\endcsname\relax"
       write$ newline$
-      "  \def\doi#1{#1}\else"
+      "  \providecommand\doi[1]{\nolinkurl{#1}}\else"
       write$ newline$
-      "  \def\doi#1{\href{https://doi.org/#1}{#1}}\fi"
+      "  \providecommand\doi[1]{\href{https://doi.org/#1}{\nolinkurl{#1}}}\fi"
       write$ newline$
     }
     'skip$

diff --git a/gbt7714-numerical.bst b/gbt7714-numerical.bst
@@ -1940,9 +1940,9 @@ FUNCTION {begin.bib}
   show.doi
     { "\expandafter\ifx\csname href\endcsname\relax"
       write$ newline$
-      "  \def\doi#1{#1}\else"
+      "  \providecommand\doi[1]{\nolinkurl{#1}}\else"
       write$ newline$
-      "  \def\doi#1{\href{https://doi.org/#1}{#1}}\fi"
+      "  \providecommand\doi[1]{\href{https://doi.org/#1}{\nolinkurl{#1}}}\fi"
       write$ newline$
     }
     'skip$

diff --git a/gbt7714.dtx b/gbt7714.dtx
@@ -4130,9 +4130,9 @@ FUNCTION {begin.bib}
   show.doi
     { "\expandafter\ifx\csname href\endcsname\relax"
       write$ newline$
-      "  \def\doi#1{#1}\else"
+      "  \providecommand\doi[1]{\nolinkurl{#1}}\else"
       write$ newline$
-      "  \def\doi#1{\href{https://doi.org/#1}{#1}}\fi"
+      "  \providecommand\doi[1]{\href{https://doi.org/#1}{\nolinkurl{#1}}}\fi"
       write$ newline$
     }
     'skip$

diff --git a/test/testbst/2015-authoryear.bbl b/test/testbst/2015-authoryear.bbl
@@ -4,8 +4,8 @@
 \expandafter\ifx\csname urlstyle\endcsname\relax\else
   \urlstyle{same}\fi
 \expandafter\ifx\csname href\endcsname\relax
-  \def\doi#1{#1}\else
-  \def\doi#1{\href{https://doi.org/#1}{#1}}\fi
+  \providecommand\doi[1]{\nolinkurl{#1}}\else
+  \providecommand\doi[1]{\href{https://doi.org/#1}{\nolinkurl{#1}}}\fi
 
 \bibitem[刘彻东(1998)]{liuchedong1998zhongguo}
 刘彻东, 1998.

diff --git a/test/testbst/2015-numerical.bbl b/test/testbst/2015-numerical.bbl
@@ -4,8 +4,8 @@
 \expandafter\ifx\csname urlstyle\endcsname\relax\else
   \urlstyle{same}\fi
 \expandafter\ifx\csname href\endcsname\relax
-  \def\doi#1{#1}\else
-  \def\doi#1{\href{https://doi.org/#1}{#1}}\fi
+  \providecommand\doi[1]{\nolinkurl{#1}}\else
+  \providecommand\doi[1]{\href{https://doi.org/#1}{\nolinkurl{#1}}}\fi
 
 \bibitem[陈登原(2000)]{chendengyuan2000guoshijiuwen}
 陈登原.

diff --git a/test/testbst/npr.bbl b/test/testbst/npr.bbl
@@ -4,8 +4,8 @@
 \expandafter\ifx\csname urlstyle\endcsname\relax\else
   \urlstyle{same}\fi
 \expandafter\ifx\csname href\endcsname\relax
-  \def\doi#1{#1}\else
-  \def\doi#1{\href{https://doi.org/#1}{#1}}\fi
+  \providecommand\doi[1]{\nolinkurl{#1}}\else
+  \providecommand\doi[1]{\href{https://doi.org/#1}{\nolinkurl{#1}}}\fi
 
 \bibitem[陈登原(2000)]{chendengyuan2000guoshijiuwen}
 [English translation missing!] (in Chinese) \\

diff --git a/test/testbst/option-italicjournal.bbl b/test/testbst/option-italicjournal.bbl
@@ -4,8 +4,8 @@
 \expandafter\ifx\csname urlstyle\endcsname\relax\else
   \urlstyle{same}\fi
 \expandafter\ifx\csname href\endcsname\relax
-  \def\doi#1{#1}\else
-  \def\doi#1{\href{https://doi.org/#1}{#1}}\fi
+  \providecommand\doi[1]{\nolinkurl{#1}}\else
+  \providecommand\doi[1]{\href{https://doi.org/#1}{\nolinkurl{#1}}}\fi
 
 \bibitem[陈登原(2000)]{chendengyuan2000guoshijiuwen}
 陈登原.

diff --git a/test/testbst/option-linktitle.bbl b/test/testbst/option-linktitle.bbl
@@ -4,8 +4,8 @@
 \expandafter\ifx\csname urlstyle\endcsname\relax\else
   \urlstyle{same}\fi
 \expandafter\ifx\csname href\endcsname\relax
-  \def\doi#1{#1}\else
-  \def\doi#1{\href{https://doi.org/#1}{#1}}\fi
+  \providecommand\doi[1]{\nolinkurl{#1}}\else
+  \providecommand\doi[1]{\href{https://doi.org/#1}{\nolinkurl{#1}}}\fi
 
 \bibitem[陈登原(2000)]{chendengyuan2000guoshijiuwen}
 陈登原.

diff --git a/test/testbst/option-no-medium-type.bbl b/test/testbst/option-no-medium-type.bbl
@@ -4,8 +4,8 @@
 \expandafter\ifx\csname urlstyle\endcsname\relax\else
   \urlstyle{same}\fi
 \expandafter\ifx\csname href\endcsname\relax
-  \def\doi#1{#1}\else
-  \def\doi#1{\href{https://doi.org/#1}{#1}}\fi
+  \providecommand\doi[1]{\nolinkurl{#1}}\else
+  \providecommand\doi[1]{\href{https://doi.org/#1}{\nolinkurl{#1}}}\fi
 
 \bibitem[陈登原(2000)]{chendengyuan2000guoshijiuwen}
 陈登原.

diff --git a/test/testbst/option-nomark.bbl b/test/testbst/option-nomark.bbl
@@ -4,8 +4,8 @@
 \expandafter\ifx\csname urlstyle\endcsname\relax\else
   \urlstyle{same}\fi
 \expandafter\ifx\csname href\endcsname\relax
-  \def\doi#1{#1}\else
-  \def\doi#1{\href{https://doi.org/#1}{#1}}\fi
+  \providecommand\doi[1]{\nolinkurl{#1}}\else
+  \providecommand\doi[1]{\href{https://doi.org/#1}{\nolinkurl{#1}}}\fi
 
 \bibitem[陈登原(2000)]{chendengyuan2000guoshijiuwen}
 陈登原.

diff --git a/test/testbst/option-nosentencase.bbl b/test/testbst/option-nosentencase.bbl
@@ -4,8 +4,8 @@
 \expandafter\ifx\csname urlstyle\endcsname\relax\else
   \urlstyle{same}\fi
 \expandafter\ifx\csname href\endcsname\relax
-  \def\doi#1{#1}\else
-  \def\doi#1{\href{https://doi.org/#1}{#1}}\fi
+  \providecommand\doi[1]{\nolinkurl{#1}}\else
+  \providecommand\doi[1]{\href{https://doi.org/#1}{\nolinkurl{#1}}}\fi
 
 \bibitem[陈登原(2000)]{chendengyuan2000guoshijiuwen}
 陈登原.

diff --git a/test/testbst/option-noslash.bbl b/test/testbst/option-noslash.bbl
@@ -4,8 +4,8 @@
 \expandafter\ifx\csname urlstyle\endcsname\relax\else
   \urlstyle{same}\fi
 \expandafter\ifx\csname href\endcsname\relax
-  \def\doi#1{#1}\else
-  \def\doi#1{\href{https://doi.org/#1}{#1}}\fi
+  \providecommand\doi[1]{\nolinkurl{#1}}\else
+  \providecommand\doi[1]{\href{https://doi.org/#1}{\nolinkurl{#1}}}\fi
 
 \bibitem[陈登原(2000)]{chendengyuan2000guoshijiuwen}
 陈登原.

diff --git a/test/testbst/option-noslsn.bbl b/test/testbst/option-noslsn.bbl
@@ -4,8 +4,8 @@
 \expandafter\ifx\csname urlstyle\endcsname\relax\else
   \urlstyle{same}\fi
 \expandafter\ifx\csname href\endcsname\relax
-  \def\doi#1{#1}\else
-  \def\doi#1{\href{https://doi.org/#1}{#1}}\fi
+  \providecommand\doi[1]{\nolinkurl{#1}}\else
+  \providecommand\doi[1]{\href{https://doi.org/#1}{\nolinkurl{#1}}}\fi
 
 \bibitem[陈登原(2000)]{chendengyuan2000guoshijiuwen}
 陈登原.

diff --git a/test/testbst/option-nouppercase.bbl b/test/testbst/option-nouppercase.bbl
@@ -4,8 +4,8 @@
 \expandafter\ifx\csname urlstyle\endcsname\relax\else
   \urlstyle{same}\fi
 \expandafter\ifx\csname href\endcsname\relax
-  \def\doi#1{#1}\else
-  \def\doi#1{\href{https://doi.org/#1}{#1}}\fi
+  \providecommand\doi[1]{\nolinkurl{#1}}\else
+  \providecommand\doi[1]{\href{https://doi.org/#1}{\nolinkurl{#1}}}\fi
 
 \bibitem[陈登原(2000)]{chendengyuan2000guoshijiuwen}
 陈登原.

diff --git a/test/testbst/option-nourl.bbl b/test/testbst/option-nourl.bbl
@@ -4,8 +4,8 @@
 \expandafter\ifx\csname urlstyle\endcsname\relax\else
   \urlstyle{same}\fi
 \expandafter\ifx\csname href\endcsname\relax
-  \def\doi#1{#1}\else
-  \def\doi#1{\href{https://doi.org/#1}{#1}}\fi
+  \providecommand\doi[1]{\nolinkurl{#1}}\else
+  \providecommand\doi[1]{\href{https://doi.org/#1}{\nolinkurl{#1}}}\fi
 
 \bibitem[陈登原(2000)]{chendengyuan2000guoshijiuwen}
 陈登原.

diff --git a/test/testbst/option-only-start-page.bbl b/test/testbst/option-only-start-page.bbl
@@ -4,8 +4,8 @@
 \expandafter\ifx\csname urlstyle\endcsname\relax\else
   \urlstyle{same}\fi
 \expandafter\ifx\csname href\endcsname\relax
-  \def\doi#1{#1}\else
-  \def\doi#1{\href{https://doi.org/#1}{#1}}\fi
+  \providecommand\doi[1]{\nolinkurl{#1}}\else
+  \providecommand\doi[1]{\href{https://doi.org/#1}{\nolinkurl{#1}}}\fi
 
 \bibitem[陈登原(2000)]{chendengyuan2000guoshijiuwen}
 陈登原.

diff --git a/test/testbst/ustc-authoryear.bbl b/test/testbst/ustc-authoryear.bbl
@@ -4,8 +4,8 @@
 \expandafter\ifx\csname urlstyle\endcsname\relax\else
   \urlstyle{same}\fi
 \expandafter\ifx\csname href\endcsname\relax
-  \def\doi#1{#1}\else
-  \def\doi#1{\href{https://doi.org/#1}{#1}}\fi
+  \providecommand\doi[1]{\nolinkurl{#1}}\else
+  \providecommand\doi[1]{\href{https://doi.org/#1}{\nolinkurl{#1}}}\fi
 
 \bibitem[刘彻东(1998)]{liuchedong1998zhongguo}
 刘彻东. 1998.

diff --git a/test/testbst/ustc-bachelor.bbl b/test/testbst/ustc-bachelor.bbl
@@ -4,8 +4,8 @@
 \expandafter\ifx\csname urlstyle\endcsname\relax\else
   \urlstyle{same}\fi
 \expandafter\ifx\csname href\endcsname\relax
-  \def\doi#1{#1}\else
-  \def\doi#1{\href{https://doi.org/#1}{#1}}\fi
+  \providecommand\doi[1]{\nolinkurl{#1}}\else
+  \providecommand\doi[1]{\href{https://doi.org/#1}{\nolinkurl{#1}}}\fi
 
 \bibitem[陈登原(2000)]{chendengyuan2000guoshijiuwen}
 陈登原.

diff --git a/test/testbst/ustc-numerical.bbl b/test/testbst/ustc-numerical.bbl
@@ -4,8 +4,8 @@
 \expandafter\ifx\csname urlstyle\endcsname\relax\else
   \urlstyle{same}\fi
 \expandafter\ifx\csname href\endcsname\relax
-  \def\doi#1{#1}\else
-  \def\doi#1{\href{https://doi.org/#1}{#1}}\fi
+  \providecommand\doi[1]{\nolinkurl{#1}}\else
+  \providecommand\doi[1]{\href{https://doi.org/#1}{\nolinkurl{#1}}}\fi
 
 \bibitem[陈登原(2000)]{chendengyuan2000guoshijiuwen}
 陈登原.

diff --git a/variants/2005/gbt7714-2005-author-year.bst b/variants/2005/gbt7714-2005-author-year.bst
@@ -2119,9 +2119,9 @@ FUNCTION {begin.bib}
   show.doi
     { "\expandafter\ifx\csname href\endcsname\relax"
       write$ newline$
-      "  \def\doi#1{#1}\else"
+      "  \providecommand\doi[1]{\nolinkurl{#1}}\else"
       write$ newline$
-      "  \def\doi#1{\href{https://doi.org/#1}{#1}}\fi"
+      "  \providecommand\doi[1]{\href{https://doi.org/#1}{\nolinkurl{#1}}}\fi"
       write$ newline$
     }
     'skip$

diff --git a/variants/2005/gbt7714-2005-numerical.bst b/variants/2005/gbt7714-2005-numerical.bst
@@ -1940,9 +1940,9 @@ FUNCTION {begin.bib}
   show.doi
     { "\expandafter\ifx\csname href\endcsname\relax"
       write$ newline$
-      "  \def\doi#1{#1}\else"
+      "  \providecommand\doi[1]{\nolinkurl{#1}}\else"
       write$ newline$
-      "  \def\doi#1{\href{https://doi.org/#1}{#1}}\fi"
+      "  \providecommand\doi[1]{\href{https://doi.org/#1}{\nolinkurl{#1}}}\fi"
       write$ newline$
     }
     'skip$

diff --git a/variants/npr/npr.bst b/variants/npr/npr.bst
@@ -1980,9 +1980,9 @@ FUNCTION {begin.bib}
   show.doi
     { "\expandafter\ifx\csname href\endcsname\relax"
       write$ newline$
-      "  \def\doi#1{#1}\else"
+      "  \providecommand\doi[1]{\nolinkurl{#1}}\else"
       write$ newline$
-      "  \def\doi#1{\href{https://doi.org/#1}{#1}}\fi"
+      "  \providecommand\doi[1]{\href{https://doi.org/#1}{\nolinkurl{#1}}}\fi"
       write$ newline$
     }
     'skip$

diff --git a/variants/thu/thuthesis-author-year.bst b/variants/thu/thuthesis-author-year.bst
@@ -2133,9 +2133,9 @@ FUNCTION {begin.bib}
   show.doi
     { "\expandafter\ifx\csname href\endcsname\relax"
       write$ newline$
-      "  \def\doi#1{#1}\else"
+      "  \providecommand\doi[1]{\nolinkurl{#1}}\else"
       write$ newline$
-      "  \def\doi#1{\href{https://doi.org/#1}{#1}}\fi"
+      "  \providecommand\doi[1]{\href{https://doi.org/#1}{\nolinkurl{#1}}}\fi"
       write$ newline$
     }
     'skip$

diff --git a/variants/thu/thuthesis-bachelor.bst b/variants/thu/thuthesis-bachelor.bst
@@ -1940,9 +1940,9 @@ FUNCTION {begin.bib}
   show.doi
     { "\expandafter\ifx\csname href\endcsname\relax"
       write$ newline$
-      "  \def\doi#1{#1}\else"
+      "  \providecommand\doi[1]{\nolinkurl{#1}}\else"
       write$ newline$
-      "  \def\doi#1{\href{https://doi.org/#1}{#1}}\fi"
+      "  \providecommand\doi[1]{\href{https://doi.org/#1}{\nolinkurl{#1}}}\fi"
       write$ newline$
     }
     'skip$

diff --git a/variants/thu/thuthesis-numeric.bst b/variants/thu/thuthesis-numeric.bst
@@ -1954,9 +1954,9 @@ FUNCTION {begin.bib}
   show.doi
     { "\expandafter\ifx\csname href\endcsname\relax"
       write$ newline$
-      "  \def\doi#1{#1}\else"
+      "  \providecommand\doi[1]{\nolinkurl{#1}}\else"
       write$ newline$
-      "  \def\doi#1{\href{https://doi.org/#1}{#1}}\fi"
+      "  \providecommand\doi[1]{\href{https://doi.org/#1}{\nolinkurl{#1}}}\fi"
       write$ newline$
     }
     'skip$

diff --git a/variants/ustc/ustcthesis-authoryear.bst b/variants/ustc/ustcthesis-authoryear.bst
@@ -2119,9 +2119,9 @@ FUNCTION {begin.bib}
   show.doi
     { "\expandafter\ifx\csname href\endcsname\relax"
       write$ newline$
-      "  \def\doi#1{#1}\else"
+      "  \providecommand\doi[1]{\nolinkurl{#1}}\else"
       write$ newline$
-      "  \def\doi#1{\href{https://doi.org/#1}{#1}}\fi"
+      "  \providecommand\doi[1]{\href{https://doi.org/#1}{\nolinkurl{#1}}}\fi"
       write$ newline$
     }
     'skip$

diff --git a/variants/ustc/ustcthesis-bachelor.bst b/variants/ustc/ustcthesis-bachelor.bst
@@ -1942,9 +1942,9 @@ FUNCTION {begin.bib}
   show.doi
     { "\expandafter\ifx\csname href\endcsname\relax"
       write$ newline$
-      "  \def\doi#1{#1}\else"
+      "  \providecommand\doi[1]{\nolinkurl{#1}}\else"
       write$ newline$
-      "  \def\doi#1{\href{https://doi.org/#1}{#1}}\fi"
+      "  \providecommand\doi[1]{\href{https://doi.org/#1}{\nolinkurl{#1}}}\fi"
       write$ newline$
     }
     'skip$

diff --git a/variants/ustc/ustcthesis-numerical.bst b/variants/ustc/ustcthesis-numerical.bst
@@ -1940,9 +1940,9 @@ FUNCTION {begin.bib}
   show.doi
     { "\expandafter\ifx\csname href\endcsname\relax"
       write$ newline$
-      "  \def\doi#1{#1}\else"
+      "  \providecommand\doi[1]{\nolinkurl{#1}}\else"
       write$ newline$
-      "  \def\doi#1{\href{https://doi.org/#1}{#1}}\fi"
+      "  \providecommand\doi[1]{\href{https://doi.org/#1}{\nolinkurl{#1}}}\fi"
       write$ newline$
     }
     'skip$