summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015ay.cbx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-07-02 20:40:02 +0000
committerKarl Berry <karl@freefriends.org>2018-07-02 20:40:02 +0000
commit6bcb7fafe11bbc913072dca4f243b91c57f087b9 (patch)
tree9eb1a151fa88082aca86c3282cf4e100b5d83064 /Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015ay.cbx
parent963531ca70238da0247961325e8275a3e837c26c (diff)
biblatex-gb7714-2015 (2jul18)
git-svn-id: svn://tug.org/texlive/trunk@48123 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015ay.cbx')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015ay.cbx48
1 files changed, 39 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015ay.cbx b/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015ay.cbx
index fd660fed3ee..5cae654152b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015ay.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015ay.cbx
@@ -3,16 +3,11 @@
%% biblatex-gb7714-2015 --- A biblatex implementation of the
%% GBT7714-2015 citation style,author year sequence
%% Maintained by huzhenzhen
-%% history:
-%% 2016/05/20 v1.0 2016/10/23 v1.0a 2016/11/11 v1.0b
-%% 2016/11/14 v1.0c 2016/11/24 v1.0d 2016/12/07 v1.0e
-%% 2017/02/26 v1.0g 2017/04/11 v1.0h 2017/11/21 v1.0i
-%% 2018/01/20 v1.0j 2018/04/03 v1.0k
%% E-mail: hzzmail@163.com
%% Released under the LaTeX Project Public License v1.3c or later
%% ---------------------------------------------------------------
%%
-\ProvidesFile{gb7714-2015ay.cbx}[2018/04/03 v1.0k biblatex citation style]
+\ProvidesFile{gb7714-2015ay.cbx}[2018/06/01 v1.0l biblatex citation style]
%
% 加载标准样式
@@ -63,6 +58,20 @@ test {\iftoggle{iftlsix}}%3.3<=biblatex<=3.6
}{\switchversion{3.4}{cbxopt}}{\switchversion{3.7}{cbxopt}}%else: biblatex>=3.7
+\ifboolexpr{%兼容cite:labelyear+extrayear
+test {\iftoggle{iftlfive}}%biblatex<=3.2
+or
+test {\iftoggle{iftlsix}}%3.3<=biblatex<=3.6
+or
+test {\iftoggle{iftlseven}}%3.7=biblatex
+}{\newbibmacro{cite:labeldate+extradate}{\usebibmacro{cite:labelyear+extrayear}}}{}%else: biblatex>3.7
+
+%textcite标注命令中的标点设置
+\DeclareDelimFormat[textcite]{nameyeardelim}{}%\addcomma\space
+\DeclareDelimFormat[textcite]{andothersdelim}{\addspace}%
+
+
+
%
% 重定义cite:label,针对biblatex3.8以上版本set条目集的标注(引用)标签
%
@@ -77,7 +86,7 @@ test {\iftoggle{iftlsix}}%3.3<=biblatex<=3.6
%
% 重定义cite命令
%
-% 方法:\DeclareCiteCommand{\cite}[\mkbibparens]{⟨precode⟩}{⟨loopcode⟩}{⟨sepcode⟩}{⟨postcode⟩}
+% 方法:\DeclareCiteCommand{\cite}[\mkbibparens]{precode}{loopcode}{sepcode}{postcode}
\DeclareCiteCommand{\cite}[\mkbibparens]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
@@ -86,6 +95,16 @@ test {\iftoggle{iftlsix}}%3.3<=biblatex<=3.6
{\usebibmacro{postnote}}
%
+% 定义upcite命令
+% 20180604,v1.0l,hzz
+% 方法:与yearcite命令相同
+\DeclareCiteCommand{\upcite}
+ {\printtext{(}\usebibmacro{prenote}}
+ {\usebibmacro{cite:labeldate+extradate}}%
+ {\multicitedelim}
+ {\printtext{)}}
+
+%
% 重定义parencite命令
%
\DeclareCiteCommand{\parencite}[\mkbibparens]
@@ -122,7 +141,7 @@ test {\iftoggle{iftlsix}}%3.3<=biblatex<=3.6
% 参考biblatex.DEF中的\DeclareCiteCommand*{\citeyear}命令
\DeclareCiteCommand{\yearpagescite}
{\printtext{(}\usebibmacro{prenote}}
- {\printfield{year}\printfield{extrayear}}
+ {\usebibmacro{cite:labeldate+extradate}}%\printfield{year}\printfield{extrayear}
{\multicitedelim}
{\printtext{)}\textsuperscript{\usebibmacro{postpages}}}
@@ -132,6 +151,17 @@ test {\iftoggle{iftlsix}}%3.3<=biblatex<=3.6
% 原理:增加一个命令yearcite
\DeclareCiteCommand{\yearcite}%仅输出年份,不要页码
{\printtext{(}\usebibmacro{prenote}}
- {\printfield{year}\printfield{extrayear}}
+ {\usebibmacro{cite:labeldate+extradate}}%\printfield{year}\printfield{extrayear}
{\multicitedelim}
{\printtext{)}}
+
+%
+% 定义\authornumcite命令,输出作者信息,然后在后面带上顺序编码
+% 20180427,v1.0k,增加,hzz
+% 为与顺序编码制兼容,增加了命令,定义与cite相同
+\DeclareCiteCommand{\authornumcite}[\mkbibparens]
+ {\usebibmacro{prenote}}
+ {\usebibmacro{citeindex}%
+ \usebibmacro{cite}}
+ {\multicitedelim}
+ {\usebibmacro{postnote}}