From 59c3f1822ab2c1dbd9d6aabdb1f2e7f23dbaa9aa Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 11 Sep 2021 20:37:42 +0000 Subject: biblatex-gb7714-2015 (11sep21) git-svn-id: svn://tug.org/texlive/trunk@60477 c570f23f-e606-0410-a88d-b1316a301751 --- .../latex/biblatex-gb7714-2015/gb7714-2015ay.bbx | 53 ++++++++++------------ 1 file changed, 25 insertions(+), 28 deletions(-) (limited to 'Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015ay.bbx') 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 fb67497c2f2..25455abe4a6 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,7 +10,7 @@ % % 版本和时间信息 % -\def\versionofgbtstyle{2021/08/19 v1.0z} +\def\versionofgbtstyle{2021/09/11 v1.1a} \def\versionofbiblatex{\abx@version} \ProvidesFile{gb7714-2015ay.bbx}[\versionofgbtstyle biblatex bibliography style] %\RequireBiber[3]%显式指定用biber后端，当用bibtex时会报错，但其实不会影响编译，只是采用bibtex后无法达成格式需求 @@ -857,7 +857,7 @@ and = {\addcomma},%将第2和3人名见的and符号改成 逗号，用\finalnamedelim命令也可以定义，参见3.9.1节 andcn = {\addcomma},%\str@andcn\ and本地化字符串的中文对应词 andincitecn = {\str@andcn},%将标注中的分开，便于与文献表中的区分 - andincite = {\addcomma}, + andincite = {\addcomma\space},%注意add开头的命令会其把前面的空格去掉 %andothers = {et al.}, %将超过3个人名的省略，et al.改成为 等 andotherscn = {\str@andotherscn},%将超过3个人名的省略，et al.改成为 等 andothersincitecn={\str@andotherscn},%将标注中的分开，便于与文献表中的区分 @@ -2297,14 +2297,14 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7 \iffieldequalstr{\userfieldabcde}{chinese}{\bibstring{andincitecn}}{}% \iffieldequalstr{\userfieldabcde}{korean}{\bibstring{andkr}}{}% \iffieldequalstr{\userfieldabcde}{japanese}{\bibstring{andjp}}{}% - \iffieldequalstr{\userfieldabcde}{english}{\space\bibstring{andincite}\space}{}% - \iffieldequalstr{\userfieldabcde}{french}{\space\bibstring{and}\space}{}% - \iffieldequalstr{\userfieldabcde}{russian}{\space\bibstring{and}\space}{}% + \iffieldequalstr{\userfieldabcde}{english}{\bibstring{andincite}}{}% + \iffieldequalstr{\userfieldabcde}{french}{\bibstring{and}}{}% + \iffieldequalstr{\userfieldabcde}{russian}{\bibstring{and}}{}% %\space% \or% \bibstring{andincitecn}%\space% \or% -\space\bibstring{andincite}\space% +\bibstring{andincite}% \fi} \DeclareDelimFormat[bib,biblist]{finalnamedelim}{% @@ -2324,9 +2324,9 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7 \iffieldequalstr{\userfieldabcde}{russian}{\bibstring{and}}{}% \space% \or% - \bibstring{andcn}\space% + \bibstring{andcn}% \or% - \bibstring{and}\space% + \bibstring{and}% \fi} @@ -2472,9 +2472,11 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7 %\DeclareDelimFormat[textcite]{andothersdelim}{\addspace}% %GB/T 7714-2015 风格，全部大写 +\def\gbcaselocalset{\renewrobustcmd*{\bibinitperiod}{}%将名字简写后的点去掉 +\renewcommand*{\revsdnamepunct}{}%%%来源biblatex.def +} \newbibmacro*{name:gbuppercase}[4]{\bibauthorfont% -\renewrobustcmd*{\bibinitperiod}{}%将名字简写后的点去掉 -\renewcommand*{\revsdnamepunct}{}% + \gbcaselocalset% \ifuseprefix% {\usebibmacro{name:delim}{#3#1}% \usebibmacro{name:hook}{#3#1}% @@ -2501,8 +2503,7 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7 %GB/T 7714-2015 风格，大小写不变，根据bib文件内输入原样输出 \newbibmacro*{name:gblowercase}[4]{\bibauthorfont% - \renewrobustcmd*{\bibinitperiod}{}%将名字简写后的点去掉 - \renewcommand*{\revsdnamepunct}{}%%来源biblatex.def + \gbcaselocalset% \ifuseprefix {\usebibmacro{name:delim}{#3#1}% \usebibmacro{name:hook}{#3#1}% @@ -2528,10 +2529,11 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7 } %中文常见风格，汉语拼音全拼模式 -\newbibmacro*{name:gbpinyin}[4]{\bibauthorfont% -\renewrobustcmd*{\bibinitperiod}{}%将名字简写后的点去掉，%来源biblatex2.STY +\def\gbpinyinlocalset{\renewrobustcmd*{\bibinitperiod}{}%将名字简写后的点去掉，%来源biblatex2.STY \renewcommand*{\revsdnamepunct}{}%%来源biblatex.def -\renewrobustcmd*{\bibnamedelima}{\mbox{-}}% +\renewrobustcmd*{\bibnamedelima}{\mbox{-}}} +\newbibmacro*{name:gbpinyin}[4]{\bibauthorfont% + \gbpinyinlocalset% \ifuseprefix {\usebibmacro{name:delim}{#3#1}% \usebibmacro{name:hook}{#3#1}% @@ -2557,10 +2559,11 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7 \ifdefvoid{#4}{}{\bibnamedelimd\mkbibnamesuffix{#4}\isdot}}% } %中文常见风格，汉语拼音全拼模式 -\newbibmacro*{name:gbquanpin}[4]{\bibauthorfont% -\renewrobustcmd*{\bibinitperiod}{}%将名字简写后的点去掉，%来源biblatex2.STY +\def\gbquanpinlocalset{\renewrobustcmd*{\bibinitperiod}{}%将名字简写后的点去掉，%来源biblatex2.STY \renewcommand*{\revsdnamepunct}{}%%来源biblatex.def -\renewrobustcmd*{\bibnamedelima}{}% +\renewrobustcmd*{\bibnamedelima}{}} +\newbibmacro*{name:gbquanpin}[4]{\bibauthorfont% +\gbquanpinlocalset% \ifuseprefix {\usebibmacro{name:delim}{#3#1}% \usebibmacro{name:hook}{#3#1}% @@ -2591,8 +2594,7 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7 {}{ %GB/T 7714-2015 风格，全部大写 \renewbibmacro*{name:gbuppercase}[4]{\bibauthorfont% - \renewrobustcmd*{\bibinitperiod}{}%将名字简写后的点去掉 - \renewcommand*{\revsdnamepunct}{}%%来源biblatex.def + \gbcaselocalset% \ifuseprefix {\usebibmacro{name:delim}{#3#1}% \usebibmacro{name:hook}{#3#1}% @@ -2625,8 +2627,7 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7 %GB/T 7714-2015 风格，大小写不变，根据bib文件内输入原样输出 \renewbibmacro*{name:gblowercase}[4]{\bibauthorfont% - \renewrobustcmd*{\bibinitperiod}{}%将名字简写后的点去掉 - \renewcommand*{\revsdnamepunct}{}%%来源biblatex.def + \gbcaselocalset% \ifuseprefix {\usebibmacro{name:delim}{#3#1}% \usebibmacro{name:hook}{#3#1}% @@ -2651,9 +2652,7 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7 %中文常见风格，汉语拼音全拼模式 \renewbibmacro*{name:gbpinyin}[4]{\bibauthorfont% - \renewrobustcmd*{\bibinitperiod}{}%将名字简写后的点去掉 - \renewcommand*{\revsdnamepunct}{}%%来源biblatex.def - \renewrobustcmd*{\bibnamedelima}{\mbox{-}}% + \gbpinyinlocalset% \ifuseprefix {\usebibmacro{name:delim}{#3#1}% \usebibmacro{name:hook}{#3#1}% @@ -2677,9 +2676,7 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7 } %中文常见风格，汉语拼音全拼模式 \renewbibmacro*{name:gbquanpin}[4]{\bibauthorfont% - \renewrobustcmd*{\bibinitperiod}{}%将名字简写后的点去掉 - \renewcommand*{\revsdnamepunct}{}%%来源biblatex.def - \renewrobustcmd*{\bibnamedelima}{}% + \gbquanpinlocalset% \ifuseprefix {\usebibmacro{name:delim}{#3#1}% \usebibmacro{name:hook}{#3#1}% -- cgit v1.2.3