From dfa212dc8fdf9ef4c6dbdbba14ae2944efbb307d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 7 Mar 2022 21:55:15 +0000 Subject: biblatex-gb7714-2015 (7mar22) git-svn-id: svn://tug.org/texlive/trunk@62497 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/biblatex-gb7714-2015/README.md | 3 ++- .../biblatex-gb7714-2015/biblatex-gb7714-2015.pdf | Bin 1656072 -> 1656829 bytes .../biblatex-gb7714-2015/biblatex-gb7714-2015.tex | 4 +-- .../tex/latex/biblatex-gb7714-2015/gb7714-2015.bbx | 28 +++++++++++---------- .../tex/latex/biblatex-gb7714-2015/gb7714-2015.cbx | 4 +-- .../latex/biblatex-gb7714-2015/gb7714-2015ay.bbx | 25 ++++++++++-------- .../latex/biblatex-gb7714-2015/gb7714-2015ms.bbx | 26 ++++++++++--------- .../latex/biblatex-gb7714-2015/gb7714-2015mx.bbx | 26 ++++++++++--------- 8 files changed, 63 insertions(+), 53 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/README.md b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/README.md index ffa7def0f66..a161a34c548 100644 --- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/README.md +++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/README.md @@ -1,4 +1,4 @@ -Date of last change: 2022-02-22 to version v1.1d +Date of last change: 2022-03-07 to version v1.1e # biblatex-gb7714-2015: a biblatex style package @@ -1560,6 +1560,7 @@ please see the file 'biblatex-gb7714-2015.pdf' for further information! * 2021/12/11 v1.1b,ctan * 2022/01/24 v1.1c,ctan * 2022/02/22 v1.1d,ctan,github +* 2022/03/07 v1.1e,ctan,github --------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf index 0beb49a5584..f6e31ca8b36 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf and b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/biblatex-gb7714-2015.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/biblatex-gb7714-2015.tex index 18152dce43e..7d79d7c2d01 100644 --- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/biblatex-gb7714-2015.tex +++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/biblatex-gb7714-2015.tex @@ -684,7 +684,7 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt] \item erjpunctcn=true,使用格式要求的中文标点(即全角标点)。 \item erjpunctcn=false,则将所有的文献中的标点改为英文标点(即半角标点)。 \end{itemize} - + 需要注意的是:若只想修改英文文献的全部标点为半角标点,而中文文献的标点不变,仅需在导言区加上如下命令: \lstinline[breaklines=true]!\def\erjpunctcommalanen{\addcomma\addspace}!, \lstinline[breaklines=true]!\def\erjpunctcolonlanen{\addcolon\addspace}!。 @@ -2506,7 +2506,7 @@ author.title[usera].journaltitle或journal,year,volume(number):pages[urldate].ur \qd{由于biblatex不支持newspaper 条目类型,所以条目类型报纸析出的文献用article表示,但使用entrysubtype或note域等于news|newspaper作为一个区分,当note域数据存在且内容等于news或newspaper时,就将其作为报纸的析出文献进行处理。报纸文献类型标识用N表示,报纸的版次用number域描述。} \subsubsection{报纸析出的文献/newspaper}\label{sec:standard} -biblatex没有将报纸的析出文献(newspaper)作为一种文献条目类型,因此可以直接利用article类型加newspaper或note域等于news代替,或者也可以直接使用newspaper类型。为方便使用考虑,本样式增加了对新条目类型newspaper的支持,这种支持通过类似于standard类型的方式实现,没有对数据模型进行改动或增加,而完全利用动态数据修改将newspaper类型转换为article类型。在bib文件中直接使用newspaper类型时需要注意可能存在移植障碍,因为其它biblatex样式可能不支持newspaper类型。 +biblatex没有将报纸的析出文献(newspaper)作为一种文献条目类型,因此可以直接利用article类型加entrysubtype或note域等于news|newspaper代替,或者也可以直接使用newspaper类型。为方便使用考虑,本样式增加了对新条目类型newspaper的支持,这种支持通过类似于standard类型的方式实现,没有对数据模型进行改动或增加,而完全利用动态数据修改将newspaper类型转换为article类型。在bib文件中直接使用newspaper类型时需要注意可能存在移植障碍,因为其它biblatex样式可能不支持newspaper类型。 \begin{refentry}{}{} 报纸析出的文献对应一个新的entrytype为: newspaper。文献类型标识用N表示。 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 9de266ecdc9..46dd2633fbf 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{2022/02/22 v1.1d} +\def\versionofgbtstyle{2022/03/07 v1.1e} \def\versionofbiblatex{\abx@version} \ProvidesFile{gb7714-2015.bbx}[\versionofgbtstyle biblatex bibliography style] %\RequireBiber[3]%显式指定用biber后端,当用bibtex时会报错,但其实不会影响编译,只是采用bibtex后无法达成格式需求 @@ -1477,7 +1477,7 @@ %\step[notfield=address,final]%当address不存在则继续 \step[fieldsource=url,final]%地址不存在且存在url那么转变为online \step[typesource=report,typetarget=online] - \step[fieldset=note,fieldvalue={report}] + \step[fieldset=entrysubtype,fieldvalue={report}] } \map{% \pertype{thesis} @@ -1560,7 +1560,7 @@ \step[typesource=archive,typetarget=online] } \map[overwrite]{%这里还必须有overwrite,注意不同版本存在差异,比如texlive2015变16后biber有变化(20161207修改正确) - \step[fieldsource=note, final]%将note域信息复制给keywords,用于输出时容易区分标准和报纸 + \step[fieldsource=entrysubtype, final]%将note域信息复制给keywords,用于输出时容易区分标准和报纸 \step[fieldset=keywords, fieldvalue={,}, append] \step[fieldset=keywords, origfieldval, append] } @@ -1635,7 +1635,7 @@ %\step[notfield=address,final]%当address不存在则继续 \step[fieldsource=url,final]%地址不存在且存在url那么转变为online \step[typesource=report,typetarget=online] - \step[fieldset=note,fieldvalue={report}] + \step[fieldset=entrysubtype,fieldvalue={report}] } \map{% \pertype{thesis} @@ -1718,7 +1718,7 @@ \step[typesource=archive,typetarget=online] } \map[overwrite]{%这里还必须有overwrite,注意不同版本存在差异,比如texlive2015变16后biber有变化(20161207修改正确) - \step[fieldsource=note, final]%将note域信息复制给keywords,用于输出时容易区分标准和报纸 + \step[fieldsource=entrysubtype, final]%将note域信息复制给keywords,用于输出时容易区分标准和报纸 \step[fieldset=keywords, fieldvalue={,}, append] \step[fieldset=keywords, origfieldval, append] } @@ -3327,14 +3327,16 @@ incollection,proceedings,inproceedings]{number}{% % 对edition版本信息格式做出修改 % \DeclareFieldFormat{edition}{\bibtitlefont%源来自biblatex.DEF -\testCJKfirst{userd}% -\iftoggle{ifCJKforgbt}% -{\ifinteger{#1}% -{\printtext{#1\str@edition}}% -{#1\isdot}}% -{\ifinteger{#1}% -{\mkbibordedition{#1}~\bibstring{edition}}% -{#1\isdot}}} +\ifnumgreater{#1}{1}{% + \testCJKfirst{userd}% + \iftoggle{ifCJKforgbt}% + {\ifinteger{#1}% + {\printtext{#1\str@edition}}% + {#1\isdot}}% + {\ifinteger{#1}% + {\mkbibordedition{#1}~\bibstring{edition}}% + {#1\isdot}}}{}% +} % % 对version的版本信息做出修改 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 0f695be5d36..597820363a5 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 @@ -530,7 +530,7 @@ \DeclareMultiCiteCommand{\authornumcites}[]{\authornumcite}{\multicitedelim} %如果标注标签不进行压缩可以则重定义如下: -\iftoggle{bbx:gbcitecomp}% +\iftoggle{bbx:gbcitecomp}{}% {\newbibmacro*{cite}{% \printtext[bibhyperref]{% \printfield{labelprefix}% @@ -550,4 +550,4 @@ \usebibmacro{cite}} {\multicitedelim} {\mkbibrightborder\mkbibsuperscriptusp{\usebibmacro{postnote}}} -}{} +} 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 3685335e067..ecc1561155a 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{2022/02/22 v1.1d} +\def\versionofgbtstyle{2022/03/07 v1.1e} \def\versionofbiblatex{\abx@version} \ProvidesFile{gb7714-2015ay.bbx}[\versionofgbtstyle biblatex bibliography style] %\RequireBiber[3]%显式指定用biber后端,当用bibtex时会报错,但其实不会影响编译,只是采用bibtex后无法达成格式需求 @@ -1397,7 +1397,7 @@ %\step[notfield=address,final]%当address不存在则继续 \step[fieldsource=url,final]%地址不存在且存在url那么转变为online \step[typesource=report,typetarget=online] - \step[fieldset=note,fieldvalue={report}] + \step[fieldset=entrysubtype,fieldvalue={report}] } \map{% \pertype{thesis} @@ -1480,7 +1480,7 @@ \step[typesource=archive,typetarget=online] } \map[overwrite]{%这里还必须有overwrite,注意不同版本存在差异,比如texlive2015变16后biber有变化(20161207修改正确) - \step[fieldsource=note, final]%将note域信息复制给keywords,用于输出时容易区分标准和报纸 + \step[fieldsource=entrysubtype, final]%将note域信息复制给keywords,用于输出时容易区分标准和报纸 \step[fieldset=keywords, fieldvalue={,}, append] \step[fieldset=keywords, origfieldval, append] } @@ -3149,14 +3149,17 @@ incollection,proceedings,inproceedings]{number}{% % 对edition版本信息格式做出修改 % \DeclareFieldFormat{edition}{\bibtitlefont%源来自biblatex.DEF -\testCJKfirst{userd}% -\iftoggle{ifCJKforgbt}% -{\ifinteger{#1}% -{\printtext{#1\str@edition}}% -{#1\isdot}}% -{\ifinteger{#1}% -{\mkbibordedition{#1}~\bibstring{edition}}% -{#1\isdot}}} +\ifnumgreater{#1}{1}{% + \testCJKfirst{userd}% + \iftoggle{ifCJKforgbt}% + {\ifinteger{#1}% + {\printtext{#1\str@edition}}% + {#1\isdot}}% + {\ifinteger{#1}% + {\mkbibordedition{#1}~\bibstring{edition}}% + {#1\isdot}}}{}% +} + % % 对version的版本信息做出修改 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 c08a1207d50..adb65495b23 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{2022/02/22 v1.1d} +\def\versionofgbtstyle{2022/03/07 v1.1e} \def\versionofbiblatex{\abx@version} \ProvidesFile{gb7714-2015ms.bbx}[\versionofgbtstyle biblatex bibliography style] %\RequireBiber[3]%显式指定用biber后端,当用bibtex时会报错,但其实不会影响编译,只是采用bibtex后无法达成格式需求 @@ -1157,7 +1157,7 @@ \step[notfield=address,final]%当address不存在则继续 \step[fieldsource=url,final]%地址不存在且存在url那么转变为online \step[typesource=report,typetarget=online] - \step[fieldset=note,fieldvalue={report}] + \step[fieldset=entrysubtype,fieldvalue={report}] } \map{% \pertype{thesis} @@ -1208,7 +1208,7 @@ \step[typesource=archive,typetarget=online] } \map[overwrite]{%这里还必须有overwrite,注意不同版本存在差异,比如texlive2015变16后biber有变化(20161207修改正确) - \step[fieldsource=note, final]%将note域信息复制给keywords,用于输出时容易区分标准和报纸 + \step[fieldsource=entrysubtype, final]%将note域信息复制给keywords,用于输出时容易区分标准和报纸 \step[fieldset=keywords, fieldvalue={,}, append] \step[fieldset=keywords, origfieldval, append] } @@ -2200,15 +2200,17 @@ incollection,proceedings,inproceedings]{number}{% % % 对edition版本信息格式做出修改 % -\DeclareFieldFormat{edition}{%源来自biblatex.DEF -\testCJKfirst{userd}% -\iftoggle{ifCJKforgbt}% -{\ifinteger{##1}% -{\printtext{##1\str@edition}}% -{##1\isdot}}% -{\ifinteger{##1}% -{\mkbibordedition{##1}~\bibstring{edition}}% -{##1\isdot}}}% +\DeclareFieldFormat{edition}{\bibtitlefont%源来自biblatex.DEF +\ifnumgreater{#1}{1}{% + \testCJKfirst{userd}% + \iftoggle{ifCJKforgbt}% + {\ifinteger{#1}% + {\printtext{#1\str@edition}}% + {#1\isdot}}% + {\ifinteger{#1}% + {\mkbibordedition{#1}~\bibstring{edition}}% + {#1\isdot}}}{}% +}% % % 对version的版本信息做出修改 % 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 92c9cd22fe6..aeb0ccccdc3 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{2022/02/22 v1.1d} +\def\versionofgbtstyle{2022/03/07 v1.1e} \def\versionofbiblatex{\abx@version} \ProvidesFile{gb7714-2015mx.bbx}[\versionofgbtstyle biblatex bibliography style] %\RequireBiber[3]%显式指定用biber后端,当用bibtex时会报错,但其实不会影响编译,只是采用bibtex后无法达成格式需求 @@ -1216,7 +1216,7 @@ %\step[notfield=address,final]%当address不存在则继续 \step[fieldsource=url,final]%地址不存在且存在url那么转变为online \step[typesource=report,typetarget=online] - \step[fieldset=note,fieldvalue={report}] + \step[fieldset=entrysubtype,fieldvalue={report}] } \map{% \pertype{thesis} @@ -1299,7 +1299,7 @@ \step[typesource=archive,typetarget=online] } \map[overwrite]{%这里还必须有overwrite,注意不同版本存在差异,比如texlive2015变16后biber有变化(20161207修改正确) - \step[fieldsource=note, final]%将note域信息复制给keywords,用于输出时容易区分标准和报纸 + \step[fieldsource=entrysubtype, final]%将note域信息复制给keywords,用于输出时容易区分标准和报纸 \step[fieldset=keywords, fieldvalue={,}, append] \step[fieldset=keywords, origfieldval, append] } @@ -2482,15 +2482,17 @@ incollection,proceedings,inproceedings]{number}{% % % 对edition版本信息格式做出修改 % -\DeclareFieldFormat{edition}{%源来自biblatex.DEF -\testCJKfirst{userd}% -\iftoggle{ifCJKforgbt}% -{\ifinteger{#1}% -{\printtext{#1\str@edition}}% -{#1\isdot}}% -{\ifinteger{#1}% -{\mkbibordedition{#1}~\bibstring{edition}}% -{#1\isdot}}} +\DeclareFieldFormat{edition}{\bibtitlefont%源来自biblatex.DEF +\ifnumgreater{#1}{1}{% + \testCJKfirst{userd}% + \iftoggle{ifCJKforgbt}% + {\ifinteger{#1}% + {\printtext{#1\str@edition}}% + {#1\isdot}}% + {\ifinteger{#1}% + {\mkbibordedition{#1}~\bibstring{edition}}% + {#1\isdot}}}{}% +} % % 对version的版本信息做出修改 -- cgit v1.2.3