biblatex-gb7714-2015 (15aug18)

git-svn-id: svn://tug.org/texlive/trunk@48406 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 33 insertions, 32 deletions

diff --git a/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015.bbx b/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015.bbx
index ae4afff4c54..15a9d96596d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015.bbx
@@ -11,8 +11,8 @@
 %
 %   版本和时间信息
 %
-\ProvidesFile{gb7714-2015.bbx}[2018/06/01 v1.0l biblatex bibliography style]
-\def\versionofgbtstyle{2018/06/01 v1.0l}
+\ProvidesFile{gb7714-2015.bbx}[2018/08/14 v1.0m biblatex bibliography style]
+\def\versionofgbtstyle{2018/08/14 v1.0m}
 \def\versionofbiblatex{\abx@version}
 \RequireBiber[3]%显式指定用biber后端
 
@@ -197,6 +197,7 @@
     %为单个条目的姓名格式控制增加nameformat和namefmtid两个域
     \DeclareDatamodelFields[type=field,datatype=literal]{mark,medium,nameformat}
     \DeclareDatamodelFields[type=field,datatype=integer]{namefmtid}
+    \DeclareDatamodelFields[type=field,datatype=literal]{shortbooktitle}
 
 
 
@@ -1754,7 +1755,7 @@ test{\iftoggle{iftlnine}}
   \bibrangedash%
   \iffieldundef{endyear}{}{\printfield{endyear}}%
   \newunit}%
-{  \printlist{location}%
+{\printlist{location}%
   \iflistundef{institution}%
     {\setunit*{\addcomma\space}}
     {\setunit*{\addcolon\space}}%
@@ -1892,8 +1893,8 @@ test{\iftoggle{iftlnine}}
         {\iffieldequalstr{note}{news}{\usebibmacro{newsdate}}%判断是否为报纸
                                      {\usebibmacro{date}}%
       }}%
-      {\printfield{issue}%
-       \setunit*{\addspace}%
+      {\iftoggle{bbx:gbstrict}{}{\printfield{issue}%
+       \setunit*{\addspace}}%
        %\usebibmacro{date}
          \iffieldundef{note}{\usebibmacro{date}}%判断一下，是否是报纸
         {\iffieldequalstr{note}{news}{\usebibmacro{newsdate}}%判断是否为报纸
diff --git a/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015.cbx b/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015.cbx
index e72c3a26607..bea61d82369 100644
--- a/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015.cbx
@@ -7,7 +7,7 @@
 %% Released under the LaTeX Project Public License v1.3c or later
 %% ---------------------------------------------------------------
 %%
-\ProvidesFile{gb7714-2015.cbx}[2018/06/01 v1.0l biblatex citation style]
+\ProvidesFile{gb7714-2015.cbx}[2018/08/14 v1.0m biblatex citation style]
 
 %
 %   加载标准样式
@@ -42,7 +42,7 @@
 %
 %   方法:\DeclareCiteCommand{\cite}[\mkbibparens]{precode}{loopcode}{sepcode}{postcode}
 \DeclareCiteCommand{\cite}[\mkbibsuperbracket]%利用mkbibsuperbracket添加方括号
-  {\usebibmacro{cite:init}
+  {\usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite:comp}}
@@ -132,7 +132,8 @@
 %见numeric.CBX，\DeclareCiteCommand{\cite},
 \DeclareCiteCommand{\authornumcite}%[\mkbibsuperscript]
   {\usebibmacro{prenote}}
-  {\renewcommand*{\andothersdelim}{\addspace}%
+  {\iffieldequalstr{userf}{cn}{\renewcommand*{\andothersdelim}{\addthinspace}}%\addthinspace
+  {\renewcommand*{\andothersdelim}{\addspace}}%
   \printnames{labelname}\mkbibsuperscript{\mkbibbrackets{\usebibmacro{citeindex}%
    \usebibmacro{cite}}}}
   {\multicitedelim}
diff --git a/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015ay.bbx b/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015ay.bbx
index b9ba24c564f..016ce792e52 100644
--- a/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015ay.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015ay.bbx
@@ -10,8 +10,8 @@
 %
 %   版本和时间信息
 %
-\ProvidesFile{gb7714-2015ay.bbx}[2018/06/01 v1.0l biblatex bibliography style]
-\def\versionofgbtstyle{2018/06/01 v1.0l}
+\ProvidesFile{gb7714-2015ay.bbx}[2018/08/14 v1.0m biblatex bibliography style]
+\def\versionofgbtstyle{2018/08/14 v1.0m}
 \def\versionofbiblatex{\abx@version}
 \RequireBiber[3]%显式指定用biber后端
 
@@ -200,6 +200,7 @@
     %为单个条目的姓名格式控制增加nameformat和namefmtid两个域
     \DeclareDatamodelFields[type=field,datatype=literal]{mark,medium,nameformat}
     \DeclareDatamodelFields[type=field,datatype=integer]{namefmtid}
+    \DeclareDatamodelFields[type=field,datatype=literal]{shortbooktitle}
 
 
 
@@ -1966,7 +1967,7 @@ test{\iftoggle{iftlnine}}
   \renewbibmacro*{issue+date}{%
     \iffieldundef{issue}%
       {}%
-      {\printtext[parens]{\printfield{issue}}\newunit}}
+      {\iftoggle{bbx:gbstrict}{}{\printtext[parens]{\printfield{issue}}\newunit}}}
 
 
 
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 5cae654152b..d79c16ac524 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
@@ -7,29 +7,31 @@
 %% Released under the LaTeX Project Public License v1.3c or later
 %% ---------------------------------------------------------------
 %%
-\ProvidesFile{gb7714-2015ay.cbx}[2018/06/01 v1.0l biblatex citation style]
+\ProvidesFile{gb7714-2015ay.cbx}[2018/08/14 v1.0m biblatex citation style]
 
 %
 %   加载标准样式
 %
 \RequireCitationStyle{authoryear}
-%\RequireCitationStyle{numeric}
 
 
+
+\ExecuteBibliographyOptions{
+  %autocite  = superscript ,
+  %autopunct = true       ,
+  %sorting   = none        ,
+  maxcitenames=1,
+  mincitenames=1,
+  uniquename=init,%因为使用了名字缩写选项，所以需要设置uniquename=init而不是full避免冲突
+  uniquelist=minyear
+}
 %
 %   选项设置，针对3.7以下版本
 %
 %   原理方法:labeldate用于控制是否给引用标签提供日期的成分
 \defversion{3.4}{cbxopt}{
     \ExecuteBibliographyOptions{
-      %autocite  = superscript ,
-      %autopunct = true       ,
-      %sorting   = none        ,
-      maxcitenames=1,
-      mincitenames=1,
-      uniquename=init,%因为使用了名字缩写选项，所以需要设置uniquename=init而不是full避免冲突
-      labeldate=true,
-      uniquelist=minyear
+      labeldate=true
     }
 }
 
@@ -39,15 +41,7 @@
 %   原理方法:labeldateparts用于控制是否给引用标签提供日期的成分
 \defversion{3.7}{cbxopt}{
     \ExecuteBibliographyOptions{
-      %autocite  = superscript ,
-      %autopunct = true       ,
-      %sorting   = none        ,
-      maxcitenames=1,
-      mincitenames=1,
-      uniquename=init,%因为使用了名字缩写选项，所以需要设置uniquename=init而不是full避免冲突
-      labeldateparts=true,
-      %labeldate=true,
-      uniquelist=minyear %minyear,
+      labeldateparts=true
     }
 }
 
@@ -66,9 +60,13 @@ or
 test {\iftoggle{iftlseven}}%3.7=biblatex
 }{\newbibmacro{cite:labeldate+extradate}{\usebibmacro{cite:labelyear+extrayear}}}{}%else: biblatex>3.7
 
-%textcite标注命令中的标点设置
+%textcite标注命令中的标点设置，注意只针对textcite命令。
 \DeclareDelimFormat[textcite]{nameyeardelim}{}%\addcomma\space
-\DeclareDelimFormat[textcite]{andothersdelim}{\addspace}%
+\DeclareDelimFormat[textcite]{andothersdelim}{\iffieldequalstr{userf}{cn}{\addthinspace}{\addspace}}%
+\AtEveryCitekey{%
+\iffieldequalstr{userf}{cn}{\renewcommand*{\andothersdelim}{\addthinspace}}%\addthinspace
+  {\renewcommand*{\andothersdelim}{\addspace}}%
+}