diff options
Diffstat (limited to 'Master/texmf-dist/tex')
5 files changed, 262 insertions, 102 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/chinese-erj.bbx b/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/chinese-erj.bbx index dbb03b854a6..f478d4ce14d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/chinese-erj.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/chinese-erj.bbx @@ -218,9 +218,9 @@ \iffieldundef{titleaddon}{}%判断一下titleaddon,否则直接加可能多一个空格 {\setunit{\subtitlepunct}\printfield{titleaddon}}% \iftoggle{bbx:gbtype}{% - \iffieldundef{note}{\printfield[gbtypeflag]{usera}}%在标题后直接给出文献标识字母,判断一下,是否是报纸和标准 - {\iffieldequalstr{note}{standard}{\printfield[gbtypeflags]{usera}}%判断是否为标准 - {\iffieldequalstr{note}{news}{\printfield[gbtypeflagn]{usera}}% 判断是否为报纸 + \iffieldundef{entrysubtype}{\printfield[gbtypeflag]{usera}}%在标题后直接给出文献标识字母,判断一下,是否是报纸和标准 + {\iffieldequalstr{entrysubtype}{standard}{\printfield[gbtypeflags]{usera}}%判断是否为标准 + {\iffieldequalstr{entrysubtype}{news}{\printfield[gbtypeflagn]{usera}}% 判断是否为报纸 {\printfield[gbtypeflag]{usera}}}% 其它 }}{}% %\iffieldundef{booktitle}{\newunit}{}%当title是析出时,不要标点 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 a61fde5bd62..b840a8260a3 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,7 +11,7 @@ % % 版本和时间信息 % -\def\versionofgbtstyle{2021/12/11 v1.1b} +\def\versionofgbtstyle{2022/01/24 v1.1c} \def\versionofbiblatex{\abx@version} \ProvidesFile{gb7714-2015.bbx}[\versionofgbtstyle biblatex bibliography style] %\RequireBiber[3]%显式指定用biber后端,当用bibtex时会报错,但其实不会影响编译,只是采用bibtex后无法达成格式需求 @@ -561,6 +561,8 @@ \DeclareBibliographyOption{gbctexset}[true]{% \settoggle{bbx:ctexset}{#1}} \ExecuteBibliographyOptions{gbctexset} + \providecommand{\bibname}{参考文献} + \providecommand{\refname}{参考文献} \AtEndOfPackage{% \iftoggle{bbx:ctexset}{% @@ -599,7 +601,7 @@ % 增加一个出版项自动处理控制选项,当true时使用出版者不详等信息补充缺失的出版信息。 % \newtoggle{bbx:gbpub} - \DeclareBibliographyOption{gbpub}[true]{% + \DeclareBibliographyOption{gbpub}[false]{% %\settoggle{bbx:gbpub}{#1} %或采用下面这一句 \ifstrequal{#1}{false}{\togglefalse{bbx:gbpub}}{\toggletrue{bbx:gbpub}}} \ExecuteBibliographyOptions{gbpub} @@ -1063,10 +1065,34 @@ \step[fieldsource=publisher] %有时会把publisher和institution混淆,处理后使用institution \step[fieldset=institution, origfieldval] } - \map{%根据增加一个新闻报纸的类型newspaper确定文献类型标识符 + \map[overwrite]{%根据增加一个新闻报纸的类型newspaper确定文献类型标识符 \pertype{newspaper} \step[fieldset=usera, fieldvalue={N}] - \step[fieldset=note, fieldvalue=news]%因为没有专门的驱动,记录note方便映射为article后判断 + \step[fieldset=entrysubtype, fieldvalue=news]%因为没有专门的驱动,记录note方便映射为article后判断 + } + \map[overwrite]{% + \pertype{article} + \step[fieldsource=note,match=\regexp{(n|N)(e|E)(w|W)(s|S)},final]% + \step[fieldset=usera, fieldvalue={N}] + \step[fieldset=entrysubtype, fieldvalue=news]% + } + \map[overwrite]{% + \pertype{article} + \step[fieldsource=note,match=\regexp{(n|N)(e|E)(w|W)(s|S)(p|P)(a|A)(p|P)(e|E)(r|R)},final]% + \step[fieldset=usera, fieldvalue={N}] + \step[fieldset=entrysubtype, fieldvalue=news]% + } + \map[overwrite]{% + \pertype{article} + \step[fieldsource=entrysubtype,match=\regexp{(n|N)(e|E)(w|W)(s|S)(p|P)(a|A)(p|P)(e|E)(r|R)},final]% + \step[fieldset=usera, fieldvalue={N}] + \step[fieldset=entrysubtype, fieldvalue=news]% + } + \map[overwrite]{% + \pertype{article} + \step[fieldsource=entrysubtype,match=\regexp{(n|N)(e|E)(w|W)(s|S)},final]% + \step[fieldset=usera, fieldvalue={N}] + \step[fieldset=entrysubtype, fieldvalue=news]% } \map{%对应增加的一个数据库类型database确定文献类型标识符 \pertype{database} @@ -1115,10 +1141,24 @@ \step[fieldsource=version] %有时会把version和edition混淆,处理后直接用edition \step[fieldset=edition, origfieldval] } - \map{%兼容老的standard类型,确定文献类型标识符 + \map[overwrite]{%兼容老的standard类型,确定文献类型标识符 \pertype{standard} \step[fieldset=usera, fieldvalue={S}] - \step[fieldset=note, fieldvalue=standard]%因为没有专门的驱动,记录note方便映射为book和inbook后判断 + \step[fieldset=entrysubtype, fieldvalue=standard]%因为没有专门的驱动,记录note方便映射为book和inbook后判断 + } + \map[overwrite]{%根据standard + \pertype{inbook} + \pertype{book} + \step[fieldsource=entrysubtype,match=\regexp{(s|S)(t|T)(a|A)(n|N)(d|D)(a|A)(r|R)(d|D)},final]%\x80-\xFF + \step[fieldset=usera, fieldvalue={S}] + \step[fieldset=entrysubtype, fieldvalue=standard]% + } + \map[overwrite]{%根据standard + \pertype{inbook} + \pertype{book} + \step[fieldsource=note,match=\regexp{(s|S)(t|T)(a|A)(n|N)(d|D)(a|A)(r|R)(d|D)},final]%\x80-\xFF + \step[fieldset=usera, fieldvalue={S}] + \step[fieldset=entrysubtype, fieldvalue=standard]% } \map{ \pertype{patent} @@ -2507,9 +2547,9 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7 \iffieldundef{titleaddon}{}%判断一下titleaddon,否则直接加可能多一个空格 {\setunit{\subtitlepunct}\printfield{titleaddon}}% \iftoggle{bbx:gbtype}{% - \iffieldundef{note}{\printfield[gbtypeflag]{usera}}%在标题后直接给出文献标识字母,判断一下,是否是报纸和标准 - {\iffieldequalstr{note}{standard}{\printfield[gbtypeflags]{usera}}%判断是否为标准 - {\iffieldequalstr{note}{news}{\printfield[gbtypeflagn]{usera}}%判断是否为报纸 + \iffieldundef{entrysubtype}{\printfield[gbtypeflag]{usera}}%在标题后直接给出文献标识字母,判断一下,是否是报纸和标准 + {\iffieldequalstr{entrysubtype}{standard}{\printfield[gbtypeflags]{usera}}%判断是否为标准 + {\iffieldequalstr{entrysubtype}{news}{\printfield[gbtypeflagn]{usera}}%判断是否为报纸 {\printfield[gbtypeflag]{usera}}}%其它 }}{}% %\iffieldundef{booktitle}{\newunit}{}%当title是析出时,不要标点 @@ -3219,13 +3259,13 @@ test {\iflistundef{location}} and test {\iflistundef{institution}}% \iftoggle{bbx:gbpub}% {\testCJKfirst{userd}% \ifboolexpr{ test {\iflistundef{location}} and test {\iflistundef{publisher}} }% - {\iffieldequalstr{note}{standard}{}{\iftoggle{ifCJKforgbt}{\printtext{[\str@noaddress}\space :\space\str@nopublisher]}{\printtext{[S.l.\space :\space s.n.\adddot]}}}}% + {\iffieldequalstr{entrysubtype}{standard}{}{\iftoggle{ifCJKforgbt}{\printtext{[\str@noaddress}\space :\space\str@nopublisher]}{\printtext{[S.l.\space :\space s.n.\adddot]}}}}% {\iflistundef{location}{%\adddot - \iffieldequalstr{note}{standard}{}%%从gbt7714-2015标准第19页看到,标准存在出版项时输出,没有时完全省略。 + \iffieldequalstr{entrysubtype}{standard}{}%%从gbt7714-2015标准第19页看到,标准存在出版项时输出,没有时完全省略。 {\iftoggle{ifCJKforgbt}{\printtext{[\str@noaddress]}\addcolon\addspace}{\printtext{[S.l.\adddot]}\publocpunct}}}% \bibstring{noaddress} {\printlist{location}\publocpunct}%%\addcolon\addspace% \iflistundef{publisher}{% - \iffieldequalstr{note}{standard}{}% + \iffieldequalstr{entrysubtype}{standard}{}% {\iftoggle{ifCJKforgbt}{\printtext{[\str@nopublisher]}\setunit{\adddot\addspace}\setunit*{\addcomma\addspace}}% {\printtext{\mkbibbrackets{s.n.}}\setunit{\adddot\addspace}\setunit*{\addcomma\addspace}}}}% {\printlist{publisher}}}% @@ -3376,15 +3416,15 @@ incollection,proceedings,inproceedings]{number}{% \printtext{%去掉了[parens] \iffieldundef{issue} {%\usebibmacro{date} - \iffieldundef{note}{\usebibmacro{date}}%判断一下,是否是报纸 - {\iffieldequalstr{note}{news}{\usebibmacro{newsdate}}%判断是否为报纸 + \iffieldundef{entrysubtype}{\usebibmacro{date}}%判断一下,是否是报纸 + {\iffieldequalstr{entrysubtype}{news}{\usebibmacro{newsdate}}%判断是否为报纸 {\usebibmacro{date}}% }}% {\iftoggle{bbx:gbstrict}{}{\printfield{issue}% \setunit*{\addspace}}% %\usebibmacro{date} - \iffieldundef{note}{\usebibmacro{date}}%判断一下,是否是报纸 - {\iffieldequalstr{note}{news}{\usebibmacro{newsdate}}%判断是否为报纸 + \iffieldundef{entrysubtype}{\usebibmacro{date}}%判断一下,是否是报纸 + {\iffieldequalstr{entrysubtype}{news}{\usebibmacro{newsdate}}%判断是否为报纸 {\usebibmacro{date}}% }}}% %\newunit @@ -3394,7 +3434,7 @@ incollection,proceedings,inproceedings]{number}{% % 调整页码前的标点和去掉期刊文章等页码后面的标点 % \renewbibmacro*{note+pages}{%源来自standard.bbx - %\printfield{note}%不要note,note用来判断是否是报纸newspaper + %\printfield{note}% \iffieldundef{pages}{}{ \setunit{\bibpagespunct}% \printfield{pages}}% @@ -3728,7 +3768,7 @@ incollection,proceedings,inproceedings]{number}{% {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{finentry}\usebibmacro{annotation}} + \usebibmacro{annotation}\usebibmacro{finentry}} % @@ -3756,7 +3796,7 @@ incollection,proceedings,inproceedings]{number}{% % \usebibmacro{byeditor+others}% % \newunit \usebibmacro{note+pages}% - \iffieldequalstr{note}{news}{}{%当是新闻时不输出修改或更新日期 + \iffieldequalstr{entrysubtype}{news}{}{%当是新闻时不输出修改或更新日期 \iffieldundef{url}{}{%当没有网址时也不输出 \iftoggle{bbx:url}{%当url选项为false时,也不输出 \usebibmacro{modifydate}}{}}}%带括号的修改或更新日期, @@ -3776,7 +3816,7 @@ incollection,proceedings,inproceedings]{number}{% {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{finentry}\usebibmacro{annotation}} + \usebibmacro{annotation}\usebibmacro{finentry}} @@ -3814,7 +3854,7 @@ incollection,proceedings,inproceedings]{number}{% {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{finentry}\usebibmacro{annotation}} + \usebibmacro{annotation}\usebibmacro{finentry}} % % 专利文献驱动 @@ -3857,7 +3897,7 @@ incollection,proceedings,inproceedings]{number}{% {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{finentry}\usebibmacro{annotation}} + \usebibmacro{annotation}\usebibmacro{finentry}} % @@ -3904,7 +3944,7 @@ test{\iffieldundef{day}} and test{\iffieldundef{endday}} and test{\iffieldundef{ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{finentry}\usebibmacro{annotation}} + \usebibmacro{annotation}\usebibmacro{finentry}} % @@ -3954,7 +3994,7 @@ test{\iffieldundef{day}} and test{\iffieldundef{endday}} and test{\iffieldundef{ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{finentry}\usebibmacro{annotation}} + \usebibmacro{annotation}\usebibmacro{finentry}} % % 论文、手册类型驱动 @@ -4006,7 +4046,7 @@ test{\iffieldundef{day}} and test{\iffieldundef{endday}} and test{\iffieldundef{ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{finentry}\usebibmacro{annotation}} + \usebibmacro{annotation}\usebibmacro{finentry}} % % 备选类型驱动 @@ -4047,7 +4087,7 @@ test{\iffieldundef{day}} and test{\iffieldundef{endday}} and test{\iffieldundef{ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{finentry}\usebibmacro{annotation}} + \usebibmacro{annotation}\usebibmacro{finentry}} % % 增加inbook:parent用于辅助crossref传统功能的实现 @@ -4118,4 +4158,4 @@ test{\iffieldundef{day}} and test{\iffieldundef{endday}} and test{\iffieldundef{ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{finentry}\usebibmacro{annotation}} + \usebibmacro{annotation}\usebibmacro{finentry}} 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 2e38ec22c49..51f6ee79f04 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/12/11 v1.1b} +\def\versionofgbtstyle{2022/01/24 v1.1c} \def\versionofbiblatex{\abx@version} \ProvidesFile{gb7714-2015ay.bbx}[\versionofgbtstyle biblatex bibliography style] %\RequireBiber[3]%显式指定用biber后端,当用bibtex时会报错,但其实不会影响编译,只是采用bibtex后无法达成格式需求 @@ -506,6 +506,8 @@ \DeclareBibliographyOption{gbctexset}[true]{% \settoggle{bbx:ctexset}{#1}} \ExecuteBibliographyOptions{gbctexset} + \providecommand{\bibname}{参考文献} + \providecommand{\refname}{参考文献} \AtEndOfPackage{% \iftoggle{bbx:ctexset}{% @@ -544,7 +546,7 @@ % 增加一个出版项自动处理控制选项,当true时使用出版者不详等信息补充缺失的出版信息。 % \newtoggle{bbx:gbpub} - \DeclareBibliographyOption{gbpub}[true]{% + \DeclareBibliographyOption{gbpub}[false]{% %\settoggle{bbx:gbpub}{#1} %或采用下面这一句 \ifstrequal{#1}{false}{\togglefalse{bbx:gbpub}}{\toggletrue{bbx:gbpub}}} \ExecuteBibliographyOptions{gbpub} @@ -1012,10 +1014,34 @@ \step[fieldsource=publisher] %有时会把publisher和institution混淆,处理后使用institution \step[fieldset=institution, origfieldval] } - \map{%根据增加一个新闻报纸的类型newspaper确定文献类型标识符 + \map[overwrite]{%根据增加一个新闻报纸的类型newspaper确定文献类型标识符 \pertype{newspaper} \step[fieldset=usera, fieldvalue={N}] - \step[fieldset=note, fieldvalue=news]%因为没有专门的驱动,记录note方便映射为article后判断 + \step[fieldset=entrysubtype, fieldvalue=news]%因为没有专门的驱动,记录note方便映射为article后判断 + } + \map[overwrite]{% + \pertype{article} + \step[fieldsource=note,match=\regexp{(n|N)(e|E)(w|W)(s|S)},final]% + \step[fieldset=usera, fieldvalue={N}] + \step[fieldset=entrysubtype, fieldvalue=news]% + } + \map[overwrite]{% + \pertype{article} + \step[fieldsource=note,match=\regexp{(n|N)(e|E)(w|W)(s|S)(p|P)(a|A)(p|P)(e|E)(r|R)},final]% + \step[fieldset=usera, fieldvalue={N}] + \step[fieldset=entrysubtype, fieldvalue=news]% + } + \map[overwrite]{% + \pertype{article} + \step[fieldsource=entrysubtype,match=\regexp{(n|N)(e|E)(w|W)(s|S)(p|P)(a|A)(p|P)(e|E)(r|R)},final]% + \step[fieldset=usera, fieldvalue={N}] + \step[fieldset=entrysubtype, fieldvalue=news]% + } + \map[overwrite]{% + \pertype{article} + \step[fieldsource=entrysubtype,match=\regexp{(n|N)(e|E)(w|W)(s|S)},final]% + \step[fieldset=usera, fieldvalue={N}] + \step[fieldset=entrysubtype, fieldvalue=news]% } \map{%对应增加的一个数据库类型database确定文献类型标识符 \pertype{database} @@ -1064,10 +1090,24 @@ \step[fieldsource=version] %有时会把version和edition混淆,处理后直接用edition \step[fieldset=edition, origfieldval] } - \map{%兼容老的standard类型,确定文献类型标识符 + \map[overwrite]{%兼容老的standard类型,确定文献类型标识符 \pertype{standard} \step[fieldset=usera, fieldvalue={S}] - \step[fieldset=note, fieldvalue=standard]%因为没有专门的驱动,记录note方便映射为book和inbook后判断 + \step[fieldset=entrysubtype, fieldvalue=standard]%因为没有专门的驱动,记录note方便映射为book和inbook后判断 + } + \map[overwrite]{%根据standard + \pertype{inbook} + \pertype{book} + \step[fieldsource=entrysubtype,match=\regexp{(s|S)(t|T)(a|A)(n|N)(d|D)(a|A)(r|R)(d|D)},final]%\x80-\xFF + \step[fieldset=usera, fieldvalue={S}] + \step[fieldset=entrysubtype, fieldvalue=standard]% + } + \map[overwrite]{%根据standard + \pertype{inbook} + \pertype{book} + \step[fieldsource=note,match=\regexp{(s|S)(t|T)(a|A)(n|N)(d|D)(a|A)(r|R)(d|D)},final]%\x80-\xFF + \step[fieldset=usera, fieldvalue={S}] + \step[fieldset=entrysubtype, fieldvalue=standard]% } \map{ \pertype{patent} @@ -2360,9 +2400,9 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7 \iffieldundef{titleaddon}{}%判断一下titleaddon,否则直接加可能多一个空格 {\setunit{\subtitlepunct}\printfield{titleaddon}}% \iftoggle{bbx:gbtype}{% - \iffieldundef{note}{\printfield[gbtypeflag]{usera}}%在标题后直接给出文献标识字母,判断一下,是否是报纸和标准 - {\iffieldequalstr{note}{standard}{\printfield[gbtypeflags]{usera}}%判断是否为标准 - {\iffieldequalstr{note}{news}{\printfield[gbtypeflagn]{usera}}%判断是否为报纸 + \iffieldundef{entrysubtype}{\printfield[gbtypeflag]{usera}}%在标题后直接给出文献标识字母,判断一下,是否是报纸和标准 + {\iffieldequalstr{entrysubtype}{standard}{\printfield[gbtypeflags]{usera}}%判断是否为标准 + {\iffieldequalstr{entrysubtype}{news}{\printfield[gbtypeflagn]{usera}}%判断是否为报纸 {\printfield[gbtypeflag]{usera}}}%其它 }}{}% %\iffieldundef{booktitle}{\newunit}{}%当title是析出时,不要标点 @@ -3041,13 +3081,13 @@ test {\iflistundef{location}} and test {\iflistundef{institution}}% \iftoggle{bbx:gbpub}% {\testCJKfirst{userd}% \ifboolexpr{ test {\iflistundef{location}} and test {\iflistundef{publisher}} }% - {\iffieldequalstr{note}{standard}{}{\iftoggle{ifCJKforgbt}{\printtext{[\str@noaddress}\space :\space\str@nopublisher]}{\printtext{[S.l.\space :\space s.n.\adddot]}}}}% + {\iffieldequalstr{entrysubtype}{standard}{}{\iftoggle{ifCJKforgbt}{\printtext{[\str@noaddress}\space :\space\str@nopublisher]}{\printtext{[S.l.\space :\space s.n.\adddot]}}}}% {\iflistundef{location}{%\adddot - \iffieldequalstr{note}{standard}{}%%从gbt7714-2015标准第19页看到,标准存在出版项时输出,没有时完全省略。 + \iffieldequalstr{entrysubtype}{standard}{}%%从gbt7714-2015标准第19页看到,标准存在出版项时输出,没有时完全省略。 {\iftoggle{ifCJKforgbt}{\printtext{[\str@noaddress]}\addcolon\addspace}{\printtext{[S.l.\adddot]}\publocpunct}}}% \bibstring{noaddress} {\printlist{location}\publocpunct}%%\addcolon\addspace% \iflistundef{publisher}{% - \iffieldequalstr{note}{standard}{}% + \iffieldequalstr{entrysubtype}{standard}{}% {\iftoggle{ifCJKforgbt}{\printtext{[\str@nopublisher]}\setunit{\adddot\addspace}\setunit*{\addcomma\addspace}}% {\printtext{\mkbibbrackets{s.n.}}\setunit{\adddot\addspace}\setunit*{\addcomma\addspace}}}}% {\printlist{publisher}}}% @@ -3260,15 +3300,15 @@ incollection,proceedings,inproceedings]{number}{% \printtext{%去掉了[parens] \iffieldundef{issue} {%\usebibmacro{date} - \iffieldundef{note}{\usebibmacro{date}}%判断一下,是否是报纸 - {\iffieldequalstr{note}{news}{\usebibmacro{newsdate}}%判断是否为报纸 + \iffieldundef{entrysubtype}{\usebibmacro{date}}%判断一下,是否是报纸 + {\iffieldequalstr{entrysubtype}{news}{\usebibmacro{newsdate}}%判断是否为报纸 {\usebibmacro{date}}% }}% {\iftoggle{bbx:gbstrict}{}{\printfield{issue}% \setunit*{\addspace}}% %\usebibmacro{date} - \iffieldundef{note}{\usebibmacro{date}}%判断一下,是否是报纸 - {\iffieldequalstr{note}{news}{\usebibmacro{newsdate}}%判断是否为报纸 + \iffieldundef{entrysubtype}{\usebibmacro{date}}%判断一下,是否是报纸 + {\iffieldequalstr{entrysubtype}{news}{\usebibmacro{newsdate}}%判断是否为报纸 {\usebibmacro{date}}% }}}% %\newunit @@ -3380,7 +3420,7 @@ incollection,proceedings,inproceedings]{number}{% % 调整页码前的标点和去掉期刊文章等页码后面的标点 % \renewbibmacro*{note+pages}{%源来自standard.bbx - %\printfield{note}%不要note,note用来判断是否是报纸newspaper + %\printfield{note}% \iffieldundef{pages}{}{ \setunit{\bibpagespunct}% \printfield{pages}}% @@ -3774,7 +3814,7 @@ test {\ifentrytype{conference}} % \usebibmacro{byeditor+others}% % \newunit \usebibmacro{note+pages}% - \iffieldequalstr{note}{news}{}{%当是新闻时不输出修改或更新日期 + \iffieldequalstr{entrysubtype}{news}{}{%当是新闻时不输出修改或更新日期 \iffieldundef{url}{}{%当没有网址时也不输出 \iftoggle{bbx:url}{%当url选项为false时,也不输出 \usebibmacro{modifydate}}{}}}%带括号的修改或更新日期, diff --git a/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015ms.bbx b/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015ms.bbx index 218823ac907..ede9d2549e3 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015ms.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015ms.bbx @@ -11,7 +11,7 @@ % % 版本和时间信息 % -\def\versionofgbtstyle{2021/12/11 v1.1b} +\def\versionofgbtstyle{2022/01/24 v1.1c} \def\versionofbiblatex{\abx@version} \ProvidesFile{gb7714-2015ms.bbx}[\versionofgbtstyle biblatex bibliography style] %\RequireBiber[3]%显式指定用biber后端,当用bibtex时会报错,但其实不会影响编译,只是采用bibtex后无法达成格式需求 @@ -396,6 +396,8 @@ \newtoggle{bbx:ctexset} \DeclareBibliographyOption{gbctexset}[true]{% \settoggle{bbx:ctexset}{#1}} + \providecommand{\bibname}{参考文献} + \providecommand{\refname}{参考文献} \AtEndOfPackage{% \iftoggle{bbx:ctexset}{% @@ -425,7 +427,7 @@ % 增加一个出版项自动处理控制选项,当true时使用出版者不详等信息补充缺失的出版信息。 % \newtoggle{bbx:gbpub} - \DeclareBibliographyOption{gbpub}[true]{% + \DeclareBibliographyOption{gbpub}[false]{% %\settoggle{bbx:gbpub}{#1} %或采用下面这一句 \ifstrequal{#1}{false}{\togglefalse{bbx:gbpub}}{\toggletrue{bbx:gbpub}}} @@ -774,10 +776,34 @@ \step[fieldsource=publisher] %有时会把publisher和institution混淆,处理后使用institution \step[fieldset=institution, origfieldval] } - \map{%根据增加一个新闻报纸的类型newspaper确定文献类型标识符 + \map[overwrite]{%根据增加一个新闻报纸的类型newspaper确定文献类型标识符 \pertype{newspaper} \step[fieldset=usera, fieldvalue={N}] - \step[fieldset=note, fieldvalue=news]%因为没有专门的驱动,记录note方便映射为article后判断 + \step[fieldset=entrysubtype, fieldvalue=news]%因为没有专门的驱动,记录note方便映射为article后判断 + } + \map[overwrite]{% + \pertype{article} + \step[fieldsource=note,match=\regexp{(n|N)(e|E)(w|W)(s|S)},final]% + \step[fieldset=usera, fieldvalue={N}] + \step[fieldset=entrysubtype, fieldvalue=news]% + } + \map[overwrite]{% + \pertype{article} + \step[fieldsource=note,match=\regexp{(n|N)(e|E)(w|W)(s|S)(p|P)(a|A)(p|P)(e|E)(r|R)},final]% + \step[fieldset=usera, fieldvalue={N}] + \step[fieldset=entrysubtype, fieldvalue=news]% + } + \map[overwrite]{% + \pertype{article} + \step[fieldsource=entrysubtype,match=\regexp{(n|N)(e|E)(w|W)(s|S)(p|P)(a|A)(p|P)(e|E)(r|R)},final]% + \step[fieldset=usera, fieldvalue={N}] + \step[fieldset=entrysubtype, fieldvalue=news]% + } + \map[overwrite]{% + \pertype{article} + \step[fieldsource=entrysubtype,match=\regexp{(n|N)(e|E)(w|W)(s|S)},final]% + \step[fieldset=usera, fieldvalue={N}] + \step[fieldset=entrysubtype, fieldvalue=news]% } \map{%对应增加的一个数据库类型database确定文献类型标识符 \pertype{database} @@ -826,10 +852,24 @@ \step[fieldsource=version] %有时会把version和edition混淆,处理后直接用edition \step[fieldset=edition, origfieldval] } - \map{%兼容老的standard类型,确定文献类型标识符 + \map[overwrite]{%兼容老的standard类型,确定文献类型标识符 \pertype{standard} \step[fieldset=usera, fieldvalue={S}] - \step[fieldset=note, fieldvalue=standard]%因为没有专门的驱动,记录note方便映射为book和inbook后判断 + \step[fieldset=entrysubtype, fieldvalue=standard]%因为没有专门的驱动,记录note方便映射为book和inbook后判断 + } + \map[overwrite]{%根据standard + \pertype{inbook} + \pertype{book} + \step[fieldsource=entrysubtype,match=\regexp{(s|S)(t|T)(a|A)(n|N)(d|D)(a|A)(r|R)(d|D)},final]%\x80-\xFF + \step[fieldset=usera, fieldvalue={S}] + \step[fieldset=entrysubtype, fieldvalue=standard]% + } + \map[overwrite]{%根据standard + \pertype{inbook} + \pertype{book} + \step[fieldsource=note,match=\regexp{(s|S)(t|T)(a|A)(n|N)(d|D)(a|A)(r|R)(d|D)},final]%\x80-\xFF + \step[fieldset=usera, fieldvalue={S}] + \step[fieldset=entrysubtype, fieldvalue=standard]% } \map{ \pertype{patent} @@ -1999,9 +2039,9 @@ togl{bbx:gbstyle} or test {\iffieldequalstr{userd}{chinese}}% \iffieldundef{titleaddon}{}%判断一下titleaddon,否则直接加可能多一个空格 {\setunit{\subtitlepunct}\printfield{titleaddon}}% \iftoggle{bbx:gbtype}{% - \iffieldundef{note}{\printfield[gbtypeflag]{usera}}%在标题后直接给出文献标识字母,判断一下,是否是报纸和标准 - {\iffieldequalstr{note}{standard}{\printfield[gbtypeflags]{usera}}%判断是否为标准 - {\iffieldequalstr{note}{news}{\printfield[gbtypeflagn]{usera}}%判断是否为报纸 + \iffieldundef{entrysubtype}{\printfield[gbtypeflag]{usera}}%在标题后直接给出文献标识字母,判断一下,是否是报纸和标准 + {\iffieldequalstr{entrysubtype}{standard}{\printfield[gbtypeflags]{usera}}%判断是否为标准 + {\iffieldequalstr{entrysubtype}{news}{\printfield[gbtypeflagn]{usera}}%判断是否为报纸 {\printfield[gbtypeflag]{usera}}}%其它 }}{}% %\iffieldundef{booktitle}{\newunit}{}%当title是析出时,不要标点 @@ -2097,13 +2137,13 @@ test {\iflistundef{location}} and test {\iflistundef{institution}}% \iftoggle{bbx:gbpub}% {\testCJKfirst{userd}% \ifboolexpr{ test {\iflistundef{location}} and test {\iflistundef{publisher}} }% - {\iffieldequalstr{note}{standard}{}{\iftoggle{ifCJKforgbt}{\printtext{[\str@noaddress}\space :\space\str@nopublisher]}{\printtext{[S.l.\space :\space s.n.\adddot]}}}}% + {\iffieldequalstr{entrysubtype}{standard}{}{\iftoggle{ifCJKforgbt}{\printtext{[\str@noaddress}\space :\space\str@nopublisher]}{\printtext{[S.l.\space :\space s.n.\adddot]}}}}% {\iflistundef{location}{%\adddot - \iffieldequalstr{note}{standard}{}%%从gbt7714-2015标准第19页看到,标准存在出版项时输出,没有时完全省略。 + \iffieldequalstr{entrysubtype}{standard}{}%%从gbt7714-2015标准第19页看到,标准存在出版项时输出,没有时完全省略。 {\iftoggle{ifCJKforgbt}{\printtext{[\str@noaddress]}\addcolon\addspace}{\printtext{[S.l.\adddot]}\publocpunct}}}% \bibstring{noaddress} {\printlist{location}\publocpunct}%%\addcolon\addspace% \iflistundef{publisher}{% - \iffieldequalstr{note}{standard}{}% + \iffieldequalstr{entrysubtype}{standard}{}% {\iftoggle{ifCJKforgbt}{\printtext{[\str@nopublisher]}\setunit{\adddot\addspace}\setunit*{\addcomma\addspace}}% {\printtext{\mkbibbrackets{s.n.}}\setunit{\adddot\addspace}\setunit*{\addcomma\addspace}}}}% {\printlist{publisher}}}% @@ -2242,15 +2282,15 @@ incollection,proceedings,inproceedings]{number}{% \printtext{%去掉了[parens] \iffieldundef{issue} {%\usebibmacro{date} - \iffieldundef{note}{\usebibmacro{date}}%判断一下,是否是报纸 - {\iffieldequalstr{note}{news}{\usebibmacro{newsdate}}%判断是否为报纸 + \iffieldundef{entrysubtype}{\usebibmacro{date}}%判断一下,是否是报纸 + {\iffieldequalstr{entrysubtype}{news}{\usebibmacro{newsdate}}%判断是否为报纸 {\usebibmacro{date}}% }}% {\iftoggle{bbx:gbstrict}{}{\printfield{issue}% \setunit*{\addspace}}% %\usebibmacro{date} - \iffieldundef{note}{\usebibmacro{date}}%判断一下,是否是报纸 - {\iffieldequalstr{note}{news}{\usebibmacro{newsdate}}%判断是否为报纸 + \iffieldundef{entrysubtype}{\usebibmacro{date}}%判断一下,是否是报纸 + {\iffieldequalstr{entrysubtype}{news}{\usebibmacro{newsdate}}%判断是否为报纸 {\usebibmacro{date}}% }}}% %\newunit @@ -2259,7 +2299,7 @@ incollection,proceedings,inproceedings]{number}{% % 调整页码前的标点和去掉期刊文章等页码后面的标点 % \renewbibmacro*{note+pages}{%源来自standard.bbx - %\printfield{note}%不要note,note用来判断是否是报纸newspaper + %\printfield{note}% \iffieldundef{pages}{}{% \setunit{\bibpagespunct}% \printfield{pages}}% @@ -2484,7 +2524,7 @@ incollection,proceedings,inproceedings]{number}{% {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{finentry}\usebibmacro{annotation}}% + \usebibmacro{annotation}\usebibmacro{finentry}}% % % 期刊文章,连续出版物中的析出文献的格式 % @@ -2510,7 +2550,7 @@ incollection,proceedings,inproceedings]{number}{% % \usebibmacro{byeditor+others}% % \newunit \usebibmacro{note+pages}% - \iffieldequalstr{note}{news}{}{%当是新闻时不输出修改或更新日期 + \iffieldequalstr{entrysubtype}{news}{}{%当是新闻时不输出修改或更新日期 \iffieldundef{url}{}{%当没有网址时也不输出 \iftoggle{bbx:url}{%当url选项为false时,也不输出 \usebibmacro{modifydate}}{}}}%带括号的修改或更新日期, @@ -2530,7 +2570,7 @@ incollection,proceedings,inproceedings]{number}{% {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{finentry}\usebibmacro{annotation}}% + \usebibmacro{annotation}\usebibmacro{finentry}}% % % 连续出版物的驱动 % @@ -2565,7 +2605,7 @@ incollection,proceedings,inproceedings]{number}{% {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{finentry}\usebibmacro{annotation}}% + \usebibmacro{annotation}\usebibmacro{finentry}}% % % 专利文献驱动 % @@ -2607,7 +2647,7 @@ incollection,proceedings,inproceedings]{number}{% {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{finentry}\usebibmacro{annotation}}% + \usebibmacro{annotation}\usebibmacro{finentry}}% % % 在线文献驱动 % @@ -2652,7 +2692,7 @@ test{\iffieldundef{day}} and test{\iffieldundef{endday}} and test{\iffieldundef{ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{finentry}\usebibmacro{annotation}}% + \usebibmacro{annotation}\usebibmacro{finentry}}% % % 报告类型驱动 % 2016-11-11,增加了译者信息 @@ -2700,7 +2740,7 @@ test{\iffieldundef{day}} and test{\iffieldundef{endday}} and test{\iffieldundef{ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{finentry}\usebibmacro{annotation}}% + \usebibmacro{annotation}\usebibmacro{finentry}}% % % 手册类型驱动 % 2016-11-11,增加了译者信息 @@ -2752,7 +2792,7 @@ test{\iffieldundef{day}} and test{\iffieldundef{endday}} and test{\iffieldundef{ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{finentry}\usebibmacro{annotation}}% + \usebibmacro{annotation}\usebibmacro{finentry}}% % % 备选类型驱动 % @@ -2792,7 +2832,7 @@ test{\iffieldundef{day}} and test{\iffieldundef{endday}} and test{\iffieldundef{ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{finentry}\usebibmacro{annotation}}% + \usebibmacro{annotation}\usebibmacro{finentry}}% % % 专著中的析出文献的格式修改 % @@ -2851,7 +2891,7 @@ test{\iffieldundef{day}} and test{\iffieldundef{endday}} and test{\iffieldundef{ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{finentry}\usebibmacro{annotation}}% + \usebibmacro{annotation}\usebibmacro{finentry}}% }{}% } diff --git a/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015mx.bbx b/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015mx.bbx index 9266b481a56..0da9cde4363 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015mx.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015mx.bbx @@ -11,7 +11,7 @@ % % 版本和时间信息 % -\def\versionofgbtstyle{2021/12/11 v1.1b} +\def\versionofgbtstyle{2022/01/24 v1.1c} \def\versionofbiblatex{\abx@version} \ProvidesFile{gb7714-2015mx.bbx}[\versionofgbtstyle biblatex bibliography style] %\RequireBiber[3]%显式指定用biber后端,当用bibtex时会报错,但其实不会影响编译,只是采用bibtex后无法达成格式需求 @@ -399,6 +399,8 @@ \DeclareBibliographyOption{gbctexset}[true]{% \settoggle{bbx:ctexset}{#1}} \ExecuteBibliographyOptions{gbctexset} + \providecommand{\bibname}{参考文献} + \providecommand{\refname}{参考文献} \AtEndOfPackage{% \iftoggle{bbx:ctexset}{% @@ -432,7 +434,7 @@ % 增加一个出版项自动处理控制选项,当true时使用出版者不详等信息补充缺失的出版信息。 % \newtoggle{bbx:gbpub} - \DeclareBibliographyOption{gbpub}[true]{% + \DeclareBibliographyOption{gbpub}[false]{% %\settoggle{bbx:gbpub}{#1} %或采用下面这一句 \ifstrequal{#1}{false}{\togglefalse{bbx:gbpub}}{\toggletrue{bbx:gbpub}}} \ExecuteBibliographyOptions{gbpub} @@ -822,10 +824,34 @@ \step[fieldsource=publisher] %有时会把publisher和institution混淆,处理后使用institution \step[fieldset=institution, origfieldval] } - \map{%根据增加一个新闻报纸的类型newspaper确定文献类型标识符 + \map[overwrite]{%根据增加一个新闻报纸的类型newspaper确定文献类型标识符 \pertype{newspaper} \step[fieldset=usera, fieldvalue={N}] - \step[fieldset=note, fieldvalue=news]%因为没有专门的驱动,记录note方便映射为article后判断 + \step[fieldset=entrysubtype, fieldvalue=news]%因为没有专门的驱动,记录note方便映射为article后判断 + } + \map[overwrite]{% + \pertype{article} + \step[fieldsource=note,match=\regexp{(n|N)(e|E)(w|W)(s|S)},final]% + \step[fieldset=usera, fieldvalue={N}] + \step[fieldset=entrysubtype, fieldvalue=news]% + } + \map[overwrite]{% + \pertype{article} + \step[fieldsource=note,match=\regexp{(n|N)(e|E)(w|W)(s|S)(p|P)(a|A)(p|P)(e|E)(r|R)},final]% + \step[fieldset=usera, fieldvalue={N}] + \step[fieldset=entrysubtype, fieldvalue=news]% + } + \map[overwrite]{% + \pertype{article} + \step[fieldsource=entrysubtype,match=\regexp{(n|N)(e|E)(w|W)(s|S)(p|P)(a|A)(p|P)(e|E)(r|R)},final]% + \step[fieldset=usera, fieldvalue={N}] + \step[fieldset=entrysubtype, fieldvalue=news]% + } + \map[overwrite]{% + \pertype{article} + \step[fieldsource=entrysubtype,match=\regexp{(n|N)(e|E)(w|W)(s|S)},final]% + \step[fieldset=usera, fieldvalue={N}] + \step[fieldset=entrysubtype, fieldvalue=news]% } \map{%对应增加的一个数据库类型database确定文献类型标识符 \pertype{database} @@ -874,10 +900,24 @@ \step[fieldsource=version] %有时会把version和edition混淆,处理后直接用edition \step[fieldset=edition, origfieldval] } - \map{%兼容老的standard类型,确定文献类型标识符 + \map[overwrite]{%兼容老的standard类型,确定文献类型标识符 \pertype{standard} \step[fieldset=usera, fieldvalue={S}] - \step[fieldset=note, fieldvalue=standard]%因为没有专门的驱动,记录note方便映射为book和inbook后判断 + \step[fieldset=entrysubtype, fieldvalue=standard]%因为没有专门的驱动,记录note方便映射为book和inbook后判断 + } + \map[overwrite]{%根据standard + \pertype{inbook} + \pertype{book} + \step[fieldsource=entrysubtype,match=\regexp{(s|S)(t|T)(a|A)(n|N)(d|D)(a|A)(r|R)(d|D)},final]%\x80-\xFF + \step[fieldset=usera, fieldvalue={S}] + \step[fieldset=entrysubtype, fieldvalue=standard]% + } + \map[overwrite]{%根据standard + \pertype{inbook} + \pertype{book} + \step[fieldsource=note,match=\regexp{(s|S)(t|T)(a|A)(n|N)(d|D)(a|A)(r|R)(d|D)},final]%\x80-\xFF + \step[fieldset=usera, fieldvalue={S}] + \step[fieldset=entrysubtype, fieldvalue=standard]% } \map{ \pertype{patent} @@ -1971,9 +2011,9 @@ \iffieldundef{titleaddon}{}%判断一下titleaddon,否则直接加可能多一个空格 {\setunit{\subtitlepunct}\printfield{titleaddon}}% \iftoggle{bbx:gbtype}{% - \iffieldundef{note}{\printfield[gbtypeflag]{usera}}%在标题后直接给出文献标识字母,判断一下,是否是报纸和标准 - {\iffieldequalstr{note}{standard}{\printfield[gbtypeflags]{usera}}%判断是否为标准 - {\iffieldequalstr{note}{news}{\printfield[gbtypeflagn]{usera}}%判断是否为报纸 + \iffieldundef{entrysubtype}{\printfield[gbtypeflag]{usera}}%在标题后直接给出文献标识字母,判断一下,是否是报纸和标准 + {\iffieldequalstr{entrysubtype}{standard}{\printfield[gbtypeflags]{usera}}%判断是否为标准 + {\iffieldequalstr{entrysubtype}{news}{\printfield[gbtypeflagn]{usera}}%判断是否为报纸 {\printfield[gbtypeflag]{usera}}}%其它 }}{}% %\iffieldundef{booktitle}{\newunit}{}%当title是析出时,不要标点 @@ -2375,13 +2415,13 @@ test {\iflistundef{location}} and test {\iflistundef{institution}}% \iftoggle{bbx:gbpub}% {\testCJKfirst{userd}% \ifboolexpr{ test {\iflistundef{location}} and test {\iflistundef{publisher}} }% - {\iffieldequalstr{note}{standard}{}{\iftoggle{ifCJKforgbt}{\printtext{[\str@noaddress}\space :\space\str@nopublisher]}{\printtext{[S.l.\space :\space s.n.\adddot]}}}}% + {\iffieldequalstr{entrysubtype}{standard}{}{\iftoggle{ifCJKforgbt}{\printtext{[\str@noaddress}\space :\space\str@nopublisher]}{\printtext{[S.l.\space :\space s.n.\adddot]}}}}% {\iflistundef{location}{%\adddot - \iffieldequalstr{note}{standard}{}%%从gbt7714-2015标准第19页看到,标准存在出版项时输出,没有时完全省略。 + \iffieldequalstr{entrysubtype}{standard}{}%%从gbt7714-2015标准第19页看到,标准存在出版项时输出,没有时完全省略。 {\iftoggle{ifCJKforgbt}{\printtext{[\str@noaddress]}\addcolon\addspace}{\printtext{[S.l.\adddot]}\publocpunct}}}% \bibstring{noaddress} {\printlist{location}\publocpunct}%%\addcolon\addspace% \iflistundef{publisher}{% - \iffieldequalstr{note}{standard}{}% + \iffieldequalstr{entrysubtype}{standard}{}% {\iftoggle{ifCJKforgbt}{\printtext{[\str@nopublisher]}\setunit{\adddot\addspace}\setunit*{\addcomma\addspace}}% {\printtext{\mkbibbrackets{s.n.}}\setunit{\adddot\addspace}\setunit*{\addcomma\addspace}}}}% {\printlist{publisher}}}% @@ -2532,15 +2572,15 @@ incollection,proceedings,inproceedings]{number}{% \printtext{%去掉了[parens] \iffieldundef{issue} {%\usebibmacro{date} - \iffieldundef{note}{\usebibmacro{date}}%判断一下,是否是报纸 - {\iffieldequalstr{note}{news}{\usebibmacro{newsdate}}%判断是否为报纸 + \iffieldundef{entrysubtype}{\usebibmacro{date}}%判断一下,是否是报纸 + {\iffieldequalstr{entrysubtype}{news}{\usebibmacro{newsdate}}%判断是否为报纸 {\usebibmacro{date}}% }}% {\iftoggle{bbx:gbstrict}{}{\printfield{issue}% \setunit*{\addspace}}% %\usebibmacro{date} - \iffieldundef{note}{\usebibmacro{date}}%判断一下,是否是报纸 - {\iffieldequalstr{note}{news}{\usebibmacro{newsdate}}%判断是否为报纸 + \iffieldundef{entrysubtype}{\usebibmacro{date}}%判断一下,是否是报纸 + {\iffieldequalstr{entrysubtype}{news}{\usebibmacro{newsdate}}%判断是否为报纸 {\usebibmacro{date}}% }}}% %\newunit @@ -2550,7 +2590,7 @@ incollection,proceedings,inproceedings]{number}{% % 调整页码前的标点和去掉期刊文章等页码后面的标点 % \renewbibmacro*{note+pages}{%源来自standard.bbx - %\printfield{note}%不要note,note用来判断是否是报纸newspaper + %\printfield{note}% \iffieldundef{pages}{}{ \setunit{\bibpagespunct}% \printfield{pages}}% @@ -2886,7 +2926,7 @@ incollection,proceedings,inproceedings]{number}{% {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{finentry}\usebibmacro{annotation}} + \usebibmacro{annotation}\usebibmacro{finentry}} % @@ -2914,7 +2954,7 @@ incollection,proceedings,inproceedings]{number}{% % \usebibmacro{byeditor+others}% % \newunit \usebibmacro{note+pages}% - \iffieldequalstr{note}{news}{}{%当是新闻时不输出修改或更新日期 + \iffieldequalstr{entrysubtype}{news}{}{%当是新闻时不输出修改或更新日期 \iffieldundef{url}{}{%当没有网址时也不输出 \iftoggle{bbx:url}{%当url选项为false时,也不输出 \usebibmacro{modifydate}}{}}}%带括号的修改或更新日期, @@ -2934,7 +2974,7 @@ incollection,proceedings,inproceedings]{number}{% {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{finentry}\usebibmacro{annotation}} + \usebibmacro{annotation}\usebibmacro{finentry}} @@ -2972,7 +3012,7 @@ incollection,proceedings,inproceedings]{number}{% {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{finentry}\usebibmacro{annotation}} + \usebibmacro{annotation}\usebibmacro{finentry}} % % 专利文献驱动 @@ -3015,7 +3055,7 @@ incollection,proceedings,inproceedings]{number}{% {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{finentry}\usebibmacro{annotation}} + \usebibmacro{annotation}\usebibmacro{finentry}} % @@ -3062,7 +3102,7 @@ test{\iffieldundef{day}} and test{\iffieldundef{endday}} and test{\iffieldundef{ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{finentry}\usebibmacro{annotation}} + \usebibmacro{annotation}\usebibmacro{finentry}} % @@ -3112,7 +3152,7 @@ test{\iffieldundef{day}} and test{\iffieldundef{endday}} and test{\iffieldundef{ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{finentry}\usebibmacro{annotation}} + \usebibmacro{annotation}\usebibmacro{finentry}} % % 论文、手册类型驱动 @@ -3164,7 +3204,7 @@ test{\iffieldundef{day}} and test{\iffieldundef{endday}} and test{\iffieldundef{ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{finentry}\usebibmacro{annotation}} + \usebibmacro{annotation}\usebibmacro{finentry}} % % 备选类型驱动 @@ -3205,7 +3245,7 @@ test{\iffieldundef{day}} and test{\iffieldundef{endday}} and test{\iffieldundef{ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{finentry}\usebibmacro{annotation}} + \usebibmacro{annotation}\usebibmacro{finentry}} % @@ -3266,7 +3306,7 @@ test{\iffieldundef{day}} and test{\iffieldundef{endday}} and test{\iffieldundef{ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{finentry}\usebibmacro{annotation}} + \usebibmacro{annotation}\usebibmacro{finentry}} % |