From 39ed40a659b0e72555fff665123a5c3c3b11cb3b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 23 Mar 2020 22:23:26 +0000 Subject: biblatex-gb7714-2015 (23mar20) git-svn-id: svn://tug.org/texlive/trunk@54508 c570f23f-e606-0410-a88d-b1316a301751 --- .../latex/biblatex-gb7714-2015/gb7714-2015mx.bbx | 97 ++++++++++++---------- 1 file changed, 53 insertions(+), 44 deletions(-) (limited to 'Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015mx.bbx') 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 81cf2b95b8e..0ff11167a2e 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{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后无法达成格式需求 @@ -964,10 +964,6 @@ \step[fieldsource=entrykey] \step[fieldset=keywords, origfieldval] } - \map{%文献题名的中文判断,将信息保存到userd中,避免因为标签生成原因导致title域被清除而产生问题 - \step[fieldsource=title, match=\regexp{[\x{2FF0}-\x{9FA5}]},final]% - \step[fieldset=userd, fieldvalue={chinese}] - } \map{\step[fieldsource=title,match=\regexp{[\x{0100}-\x{017F}]},final]%\x80-\xFF \step[fieldset=userd,fieldvalue={french}]%法语,0080开始到00ff的字符没法匹配有点奇怪 } @@ -983,14 +979,14 @@ \step[fieldsource=title,match=\regexp{[\x{1100}-\x{11FF}\x{3130}-\x{318F}\x{AC00}-\x{D7AF}]},final] \step[fieldset=userd,fieldvalue={korean}]%韩语 } + \map{%文献题名的中文判断,将信息保存到userd中,避免因为标签生成原因导致title域被清除而产生问题 + \step[fieldsource=title, match=\regexp{[\x{2FF0}-\x{9FA5}]},final]% + \step[fieldset=userd, fieldvalue={chinese}] + } \map{%将没有设置userd,且存在title域的默认设置为英文 \step[fieldsource=title,final] \step[fieldset=userd,fieldvalue={english}] } - \map{%作者的中文判断 - \step[fieldsource=author, match=\regexp{[\x{2FF0}-\x{9FA5}]},final] - \step[fieldset=userf, fieldvalue={chinese}] - } \map{\step[fieldsource=author,match=\regexp{[\x{0100}-\x{017F}]},final]%\x80-\xFF \step[fieldset=userf,fieldvalue={french}]%法语,0080开始到00ff的字符没法匹配有点奇怪 } @@ -1006,14 +1002,14 @@ \step[fieldsource=author,match=\regexp{[\x{1100}-\x{11FF}\x{3130}-\x{318F}\x{AC00}-\x{D7AF}]},final] \step[fieldset=userf,fieldvalue={korean}]%韩语 } + \map{%作者的中文判断 + \step[fieldsource=author, match=\regexp{[\x{2FF0}-\x{9FA5}]},final] + \step[fieldset=userf, fieldvalue={chinese}] + } \map{%将没有设置userf,且存在author域的默认设置为英文 \step[fieldsource=author,final] \step[fieldset=userf,fieldvalue={english}] } - \map{%译者的中文判断 - \step[fieldsource=translator, match=\regexp{[\x{2FF0}-\x{9FA5}]},final] - \step[fieldset=usere, fieldvalue={chinese}] - } \map{\step[fieldsource=translator,match=\regexp{[\x{0100}-\x{017F}]},final]%\x80-\xFF \step[fieldset=usere,fieldvalue={french}]%法语,0080开始到00ff的字符没法匹配有点奇怪 } @@ -1029,14 +1025,14 @@ \step[fieldsource=translator,match=\regexp{[\x{1100}-\x{11FF}\x{3130}-\x{318F}\x{AC00}-\x{D7AF}]},final] \step[fieldset=usere,fieldvalue={korean}]%韩语 } + \map{%译者的中文判断 + \step[fieldsource=translator, match=\regexp{[\x{2FF0}-\x{9FA5}]},final] + \step[fieldset=usere, fieldvalue={chinese}] + } \map{%将没有设置usere,且存在translator域的默认设置为英文 \step[fieldsource=translator,final] \step[fieldset=usere,fieldvalue={english}] } - \map{%编者的中文判断 - \step[fieldsource=editor, match=\regexp{[\x{2FF0}-\x{9FA5}]},final]%直接匹配cjk字符,unicode编码位置从2FF0到9FA5 - \step[fieldset=userc, fieldvalue={chinese}] - } \map{\step[fieldsource=editor,match=\regexp{[\x{0100}-\x{017F}]},final]%\x80-\xFF \step[fieldset=userc,fieldvalue={french}]%法语,0080开始到00ff的字符没法匹配有点奇怪 } @@ -1052,14 +1048,14 @@ \step[fieldsource=editor,match=\regexp{[\x{1100}-\x{11FF}\x{3130}-\x{318F}\x{AC00}-\x{D7AF}]},final] \step[fieldset=userc,fieldvalue={korean}]%韩语 } + \map{%编者的中文判断 + \step[fieldsource=editor, match=\regexp{[\x{2FF0}-\x{9FA5}]},final]%直接匹配cjk字符,unicode编码位置从2FF0到9FA5 + \step[fieldset=userc, fieldvalue={chinese}] + } \map{%将没有设置userc,且存在editor域的默认设置为英文 \step[fieldsource=editor,final] \step[fieldset=userc,fieldvalue={english}] } - \map{%编者的中文判断 - \step[fieldsource=bookauthor, match=\regexp{[\x{2FF0}-\x{9FA5}]},final]%直接匹配cjk字符,unicode编码位置从2FF0到9FA5 - \step[fieldset=userb, fieldvalue={chinese}] - } \map{\step[fieldsource=bookauthor,match=\regexp{[\x{0100}-\x{017F}]},final]%\x80-\xFF \step[fieldset=userb,fieldvalue={french}]%法语,0080开始到00ff的字符没法匹配有点奇怪 } @@ -1075,6 +1071,10 @@ \step[fieldsource=bookauthor,match=\regexp{[\x{1100}-\x{11FF}\x{3130}-\x{318F}\x{AC00}-\x{D7AF}]},final] \step[fieldset=userb,fieldvalue={korean}]%韩语 } + \map{%编者的中文判断 + \step[fieldsource=bookauthor, match=\regexp{[\x{2FF0}-\x{9FA5}]},final]%直接匹配cjk字符,unicode编码位置从2FF0到9FA5 + \step[fieldset=userb, fieldvalue={chinese}] + } \map{%将没有设置userc,且存在editor域的默认设置为英文 \step[fieldsource=bookauthor,final] \step[fieldset=userb,fieldvalue={english}] @@ -1346,23 +1346,24 @@ % % 排序格式,用降序,及userb域,针对biblatex3.8及以上版本 % - \DeclareSortingTemplate{gb7714-2015}{ +\DeclareSortingTemplate{gb7714-2015}{ \sort{ \field{presort} } - \sort[final]{ - \field{sortkey} - } + %\sort[final]{ + %\field{sortkey} + %} \sort{ \field{lansortorder}%language } + \sort{ + \field{sortkey} + } \sort{%[direction=descending] \field{sortname} \field{author} \field{editor} \field{translator} - \field{sorttitle} - \field{title} } \sort{ \field{sortyear} @@ -1383,19 +1384,20 @@ \sort{ \field{presort} } - \sort[final]{ - \field{sortkey} - } +% \sort[final]{ +% \field{sortkey} +% } \sort{ \field{lansortorder}%language } + \sort[direction=descending]{ + \field{sortkey} + } \sort[direction=descending]{% \field{sortname} \field{author} \field{editor} \field{translator} - \field{sorttitle} - \field{title} } \sort{ \field{sortyear} @@ -1416,9 +1418,9 @@ \sort{ \field{presort} } - \sort[final]{ - \field{sortkey} - } +% \sort[final]{ +% \field{sortkey} +% } \sort{ \field{lansortorder}%language } @@ -1426,13 +1428,14 @@ \field{sortyear} \field{year} } + \sort{ + \field{sortkey} + } \sort{% \field{sortname} \field{author} \field{editor} \field{translator} - \field{sorttitle} - \field{title} } \sort{ \field{sorttitle} @@ -1449,9 +1452,9 @@ \sort{ \field{presort} } - \sort[final]{ - \field{sortkey} - } +% \sort[final]{ +% \field{sortkey} +% } \sort{ \field{lansortorder}%language } @@ -1459,13 +1462,14 @@ \field{sortyear} \field{year} } + \sort{ + \field{sortkey} + } \sort{% \field{sortname} \field{author} \field{editor} \field{translator} - \field{sorttitle} - \field{title} } \sort{ \field{sorttitle} @@ -1485,9 +1489,12 @@ % % 增加一个\bibitemindent尺寸用于控制list环境的itemindent % v1.0l,20180615,hzz +% v1.0t,20200319,hzz,增加尺寸\biblabelextend使某些字体下标签宽度不足时可增加标签宽度 \setlength{\bibhang}{\biblabelsep}% \newlength{\bibitemindent} \setlength{\bibitemindent}{0pt} +\newlength{\biblabelextend} +\setlength{\biblabelextend}{0pt} \defbibenvironment{bibliography} @@ -1495,7 +1502,8 @@ {\printtext[labelnumberwidth]{% \printfield{labelprefix}% \printfield{labelnumber}}} - {\setlength{\labelwidth}{\labelnumberwidth}% + {\addtolength{\labelnumberwidth}{\biblabelextend}% + \setlength{\labelwidth}{\labelnumberwidth}% \setlength{\labelsep}{\biblabelsep}% \setlength{\leftmargin}{\bibhang}% \addtolength{\leftmargin}{\labelnumberwidth}% @@ -2765,7 +2773,8 @@ incollection,proceedings,inproceedings]{number}{% \usebibmacro{note+pages}% \iffieldequalstr{note}{news}{}{%当是新闻时不输出修改或更新日期 \iffieldundef{url}{}{%当没有网址时也不输出 - \usebibmacro{modifydate}}}%带括号的修改或更新日期, + \iftoggle{bbx:url}{%当url选项为false时,也不输出 + \usebibmacro{modifydate}}{}}}%带括号的修改或更新日期, \usebibmacro{doi+eprint+url}%从后面移上来,调整url和页码之间的位置 \newunit\newblock \iftoggle{bbx:isbn} -- cgit v1.2.3