summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/bibtex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-03-06 21:29:33 +0000
committerKarl Berry <karl@freefriends.org>2020-03-06 21:29:33 +0000
commit79c7361836cfe04ef5ad28226f59da581b8484dd (patch)
tree6bd0f7c5aee1d03f726621dd921407141a378e44 /Master/texmf-dist/bibtex
parent0968f14db24f085ffca6486c656ede0c1301c888 (diff)
gbt7714 (6mar20)
git-svn-id: svn://tug.org/texlive/trunk@54128 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/bibtex')
-rw-r--r--Master/texmf-dist/bibtex/bst/gbt7714/gbt7714-author-year.bst (renamed from Master/texmf-dist/bibtex/bst/gbt7714/gbt7714-plain.bst)32
-rw-r--r--Master/texmf-dist/bibtex/bst/gbt7714/gbt7714-numerical.bst (renamed from Master/texmf-dist/bibtex/bst/gbt7714/gbt7714-unsrt.bst)32
2 files changed, 42 insertions, 22 deletions
diff --git a/Master/texmf-dist/bibtex/bst/gbt7714/gbt7714-plain.bst b/Master/texmf-dist/bibtex/bst/gbt7714/gbt7714-author-year.bst
index e0efd390dc0..40757392523 100644
--- a/Master/texmf-dist/bibtex/bst/gbt7714/gbt7714-plain.bst
+++ b/Master/texmf-dist/bibtex/bst/gbt7714/gbt7714-author-year.bst
@@ -1,5 +1,5 @@
%%
-%% This is file `gbt7714-plain.bst',
+%% This is file `gbt7714-author-year.bst',
%% generated with the docstrip utility.
%%
%% The original source files were:
@@ -8,9 +8,9 @@
%% -------------------------------------------------------------------
%% GB/T 7714-2015 BibTeX Style
%% https://github.com/CTeX-org/gbt7714-bibtex-style
-%% Version: 2019/11/20 v1.1.2
+%% Version: 2020/03/04 v2.0
%% -------------------------------------------------------------------
-%% Copyright (C) 2016-2019 by Zeping Lee <zepinglee AT gmail.com>
+%% Copyright (C) 2016-2020 by Zeping Lee <zepinglee AT gmail.com>
%% -------------------------------------------------------------------
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -27,6 +27,7 @@ INTEGERS {
sentence.case.title
link.title
show.mark
+ show.medium.type
slash.for.extraction
in.booktitle
italic.jounal
@@ -50,6 +51,7 @@ FUNCTION {load.config}
#1 'sentence.case.title :=
#0 'link.title :=
#1 'show.mark :=
+ #1 'show.medium.type :=
#1 'slash.for.extraction :=
#0 'in.booktitle :=
#0 'italic.jounal :=
@@ -882,14 +884,20 @@ FUNCTION {set.entry.mark}
FUNCTION {format.mark}
{ show.mark
- { medium empty$ not
- { entry.mark "/" * medium * 'entry.mark := }
- { entry.is.electronic
- { entry.mark "/OL" * 'entry.mark := }
- 'skip$
+ { entry.mark
+ show.medium.type
+ { medium empty$ not
+ { "/" * medium * }
+ { entry.is.electronic
+ { "/OL" * }
+ 'skip$
+ if$
+ }
if$
}
+ 'skip$
if$
+ 'entry.mark :=
"\allowbreak[" entry.mark * "]" *
}
{ "" }
@@ -1993,14 +2001,16 @@ FUNCTION {begin.bib}
write$ newline$
"\providecommand{\url}[1]{#1}"
write$ newline$
- "\expandafter\ifx\csname urlstyle\endcsname\relax\relax\else"
+ "\expandafter\ifx\csname urlstyle\endcsname\relax\else"
write$ newline$
" \urlstyle{same}\fi"
write$ newline$
show.doi
- { "\providecommand{\href}[2]{\url{#2}}"
+ { "\expandafter\ifx\csname href\endcsname\relax"
+ write$ newline$
+ " \def\doi#1{#1}\else"
write$ newline$
- "\providecommand{\doi}[1]{\href{https://doi.org/#1}{#1}}"
+ " \def\doi#1{\href{https://doi.org/#1}{#1}}\fi"
write$ newline$
}
'skip$
diff --git a/Master/texmf-dist/bibtex/bst/gbt7714/gbt7714-unsrt.bst b/Master/texmf-dist/bibtex/bst/gbt7714/gbt7714-numerical.bst
index 0fbf2e03a8e..8fdb37194dc 100644
--- a/Master/texmf-dist/bibtex/bst/gbt7714/gbt7714-unsrt.bst
+++ b/Master/texmf-dist/bibtex/bst/gbt7714/gbt7714-numerical.bst
@@ -1,5 +1,5 @@
%%
-%% This is file `gbt7714-unsrt.bst',
+%% This is file `gbt7714-numerical.bst',
%% generated with the docstrip utility.
%%
%% The original source files were:
@@ -8,9 +8,9 @@
%% -------------------------------------------------------------------
%% GB/T 7714-2015 BibTeX Style
%% https://github.com/CTeX-org/gbt7714-bibtex-style
-%% Version: 2019/11/20 v1.1.2
+%% Version: 2020/03/04 v2.0
%% -------------------------------------------------------------------
-%% Copyright (C) 2016-2019 by Zeping Lee <zepinglee AT gmail.com>
+%% Copyright (C) 2016-2020 by Zeping Lee <zepinglee AT gmail.com>
%% -------------------------------------------------------------------
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -27,6 +27,7 @@ INTEGERS {
sentence.case.title
link.title
show.mark
+ show.medium.type
slash.for.extraction
in.booktitle
italic.jounal
@@ -44,6 +45,7 @@ FUNCTION {load.config}
#1 'sentence.case.title :=
#0 'link.title :=
#1 'show.mark :=
+ #1 'show.medium.type :=
#1 'slash.for.extraction :=
#0 'in.booktitle :=
#0 'italic.jounal :=
@@ -871,14 +873,20 @@ FUNCTION {set.entry.mark}
FUNCTION {format.mark}
{ show.mark
- { medium empty$ not
- { entry.mark "/" * medium * 'entry.mark := }
- { entry.is.electronic
- { entry.mark "/OL" * 'entry.mark := }
- 'skip$
+ { entry.mark
+ show.medium.type
+ { medium empty$ not
+ { "/" * medium * }
+ { entry.is.electronic
+ { "/OL" * }
+ 'skip$
+ if$
+ }
if$
}
+ 'skip$
if$
+ 'entry.mark :=
"\allowbreak[" entry.mark * "]" *
}
{ "" }
@@ -1814,14 +1822,16 @@ FUNCTION {begin.bib}
write$ newline$
"\providecommand{\url}[1]{#1}"
write$ newline$
- "\expandafter\ifx\csname urlstyle\endcsname\relax\relax\else"
+ "\expandafter\ifx\csname urlstyle\endcsname\relax\else"
write$ newline$
" \urlstyle{same}\fi"
write$ newline$
show.doi
- { "\providecommand{\href}[2]{\url{#2}}"
+ { "\expandafter\ifx\csname href\endcsname\relax"
+ write$ newline$
+ " \def\doi#1{#1}\else"
write$ newline$
- "\providecommand{\doi}[1]{\href{https://doi.org/#1}{#1}}"
+ " \def\doi#1{\href{https://doi.org/#1}{#1}}\fi"
write$ newline$
}
'skip$