update-20200320-to-v1.0u

hushidong · Mar 20, 2020 · 7bfd309 · 7bfd309
1 parent dd82a37
commit 7bfd309
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 9 deletions.
diff --git a/example/updatehistory.tex b/example/updatehistory.tex
@@ -2,8 +2,15 @@
 %更新历史仅给出更新针对的问题，相应的处理代码和解释不在此给出，详见提示对应的说明文档内容
 
 
+%============================
+\updateinfo[2020-03-20]{date of update: 2020-03-20 to version v1.0u}\label{up:2020320}
+
 \begin{enumerate}
 
+\item 在gb7714-2015ay的标注样式中增加nameyeardelim定义，避免与gb7714-2015著录样式混用时出错。（20200320）
+
+add definition of nameyeardelim in gb7714-2015ay.cbx to avoid errors when using with gb7714-2015.bbx.
+
 \item 增加尺寸biblabelextend，扩展list类文献表环境的标签宽度，以解决某些字体下自动计算的标签宽度不够的问题。（20200319）
 
 add a length biblabelextend to extend the label width of list-like bibliography environment to solve the problem that the automatic computed width of bib label is not enough for some fonts.

diff --git a/gb7714-2015.bbx b/gb7714-2015.bbx
@@ -11,7 +11,7 @@
 %
 %   版本和时间信息
 %
-\def\versionofgbtstyle{2019/08/28 v1.0s}
+\def\versionofgbtstyle{2020/03/20 v1.0u}
 \def\versionofbiblatex{\abx@version}
 \ProvidesFile{gb7714-2015.bbx}[\versionofgbtstyle biblatex bibliography style]
 %\RequireBiber[3]%显式指定用biber后端，当用bibtex时会报错，但其实不会影响编译，只是采用bibtex后无法达成格式需求

diff --git a/gb7714-2015.cbx b/gb7714-2015.cbx
@@ -7,7 +7,7 @@
 %% Released under the LaTeX Project Public License v1.3c or later
 %% ---------------------------------------------------------------
 %%
-\def\versionofgbtstyle{2019/08/28 v1.0s}
+\def\versionofgbtstyle{2020/03/20 v1.0u}
 \ProvidesFile{gb7714-2015.cbx}[\versionofgbtstyle biblatex citation style]
 
 %

diff --git a/gb7714-2015ay.bbx b/gb7714-2015ay.bbx
@@ -10,7 +10,7 @@
 %
 %   版本和时间信息
 %
-\def\versionofgbtstyle{2019/08/28 v1.0s}
+\def\versionofgbtstyle{2020/03/20 v1.0u}
 \def\versionofbiblatex{\abx@version}
 \ProvidesFile{gb7714-2015ay.bbx}[\versionofgbtstyle biblatex bibliography style]
 %\RequireBiber[3]%显式指定用biber后端，当用bibtex时会报错，但其实不会影响编译，只是采用bibtex后无法达成格式需求

diff --git a/gb7714-2015ay.cbx b/gb7714-2015ay.cbx
@@ -7,7 +7,7 @@
 %% Released under the LaTeX Project Public License v1.3c or later
 %% ---------------------------------------------------------------
 %%
-\def\versionofgbtstyle{2019/08/28 v1.0s}
+\def\versionofgbtstyle{2020/03/20 v1.0u}
 \ProvidesFile{gb7714-2015ay.cbx}[\versionofgbtstyle biblatex citation style]
 
 %
@@ -61,7 +61,12 @@ test {\iftoggle{iftlseven}}%3.7=biblatex
 }{\newbibmacro{cite:labeldate+extradate}{\usebibmacro{cite:labelyear+extrayear}}}{}%else: biblatex>3.7
 
 %textcite标注命令中的标点设置，注意只针对textcite命令。
-\DeclareDelimFormat[textcite]{nameyeardelim}{}%\addcomma\space
+% v-old
+% v1.0t，20200320，hzz，修改如下
+% 在cbx中增加标注中的nameyeardelim标点定义，避免bbx使用其它样式时出现问题
+% 同时设置textcite的nameyeardelim为一个短空格，似乎原来直接连上去的不够美观
+\DeclareDelimFormat[cite,parencite,pagescite]{nameyeardelim}{\addcomma\space}%\addcomma\space
+\DeclareDelimFormat[textcite]{nameyeardelim}{\addthinspace}%\addcomma\space
 \DeclareDelimFormat[textcite]{andothersdelim}{\iffieldequalstr{userf}{chinese}{\addthinspace}{\addspace}}%
 \AtEveryCitekey{%
 \iffieldequalstr{userf}{chinese}{\renewcommand*{\andothersdelim}{\addthinspace}}%\addthinspace

diff --git a/gb7714-2015ms.bbx b/gb7714-2015ms.bbx
@@ -11,7 +11,7 @@
 %
 %   版本和时间信息
 %
-\def\versionofgbtstyle{2019/08/28 v1.0s}
+\def\versionofgbtstyle{2020/03/20 v1.0u}
 \def\versionofbiblatex{\abx@version}
 \ProvidesFile{gb7714-2015ms.bbx}[\versionofgbtstyle biblatex bibliography style]
 %\RequireBiber[3]%显式指定用biber后端，当用bibtex时会报错，但其实不会影响编译，只是采用bibtex后无法达成格式需求

diff --git a/gb7714-2015ms.cbx b/gb7714-2015ms.cbx
@@ -7,7 +7,7 @@
 %% Released under the LaTeX Project Public License v1.3c or later
 %% ---------------------------------------------------------------
 %%
-\def\versionofgbtstyle{2019/08/28 v1.0s}
+\def\versionofgbtstyle{2020/03/20 v1.0u}
 \ProvidesFile{gb7714-2015ms.cbx}[\versionofgbtstyle biblatex citation style]
 
 %

diff --git a/gb7714-2015mx.bbx b/gb7714-2015mx.bbx
@@ -11,7 +11,7 @@
 %
 %   版本和时间信息
 %
-\def\versionofgbtstyle{2019/08/28 v1.0s}
+\def\versionofgbtstyle{2020/03/20 v1.0u}
 \def\versionofbiblatex{\abx@version}
 \ProvidesFile{gb7714-2015mx.bbx}[\versionofgbtstyle biblatex bibliography style]
 %\RequireBiber[3]%显式指定用biber后端，当用bibtex时会报错，但其实不会影响编译，只是采用bibtex后无法达成格式需求

diff --git a/gb7714-2015mx.cbx b/gb7714-2015mx.cbx
@@ -7,7 +7,7 @@
 %% Released under the LaTeX Project Public License v1.3c or later
 %% ---------------------------------------------------------------
 %%
-\def\versionofgbtstyle{2019/08/28 v1.0s}
+\def\versionofgbtstyle{2020/03/20 v1.0u}
 \ProvidesFile{gb7714-2015mx.cbx}[\versionofgbtstyle biblatex citation style]
 
 %