From da490175a4a1d4dff237dd8c9f9e2b4d8aeccff7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 24 Jul 2020 21:54:06 +0000 Subject: biblatex-gb7714-2015 (24jul20) git-svn-id: svn://tug.org/texlive/trunk@55931 c570f23f-e606-0410-a88d-b1316a301751 --- .../latex/biblatex-gb7714-2015/gb7714-2015-gbk.def | 1 + .../tex/latex/biblatex-gb7714-2015/gb7714-2015.bbx | 61 +++++++++-- .../tex/latex/biblatex-gb7714-2015/gb7714-2015.cbx | 115 +++++++++++++++++++-- .../latex/biblatex-gb7714-2015/gb7714-2015ay.bbx | 29 +++--- .../latex/biblatex-gb7714-2015/gb7714-2015ay.cbx | 95 ++++++++++++++--- .../latex/biblatex-gb7714-2015/gb7714-2015ms.bbx | 2 +- .../latex/biblatex-gb7714-2015/gb7714-2015ms.cbx | 2 +- .../latex/biblatex-gb7714-2015/gb7714-2015mx.bbx | 2 +- .../latex/biblatex-gb7714-2015/gb7714-2015mx.cbx | 2 +- 9 files changed, 262 insertions(+), 47 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015-gbk.def b/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015-gbk.def index 50b9a5c39c6..b2dc830eb60 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015-gbk.def +++ b/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015-gbk.def @@ -12,6 +12,7 @@ \def\str@references{参考文献} \def\str@bytranslator{译} \def\str@andotherscn{等} + \def\str@andcn{和} \def\str@backrefpage{引用页} \def\str@backrefpages{引用页} \def\str@noaddress{出版地不详} 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 f7aee9c42c0..ea6357c25e1 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{2020/03/20 v1.0u} +\def\versionofgbtstyle{2020/07/21 v1.0v} \def\versionofbiblatex{\abx@version} \ProvidesFile{gb7714-2015.bbx}[\versionofgbtstyle biblatex bibliography style] %\RequireBiber[3]%鏄惧紡鎸囧畾鐢╞iber鍚庣锛屽綋鐢╞ibtex鏃朵細鎶ラ敊锛屼絾鍏跺疄涓嶄細褰卞搷缂栬瘧锛屽彧鏄噰鐢╞ibtex鍚庢棤娉曡揪鎴愭牸寮忛渶姹 @@ -454,6 +454,7 @@ \def\str@references{鍙傝冩枃鐚畗 \def\str@bytranslator{璇憓 \def\str@andotherscn{绛墋 + \def\str@andcn{鍜寎 \def\str@backrefpage{寮曠敤椤祡 \def\str@backrefpages{寮曠敤椤祡 \def\str@noaddress{鍑虹増鍦颁笉璇 @@ -522,6 +523,11 @@ } }{}} + % + % 澧炲姞涓涓鐞嗕綒鍚嶆垨noauthor鐨勬帶鍒堕夐」 + % + % 鍘熺悊鏂规硶:鍦ㄩ『搴忕紪鐮佸埗涓笉闇瑕佷娇鐢,涓轰笌浣滆呭勾鍒剁殑鍏煎鎬ц冭檻,杩欓噷涔熷鍔犻伩鍏嶆姤閿 + \DeclareBibliographyOption{gbnoauthor}[true]{}% % @@ -556,11 +562,7 @@ \ExecuteBibliographyOptions{gbpunctin} - % - % 澧炲姞涓涓鐞嗕綒鍚嶆垨noauthor鐨勬帶鍒堕夐」 - % - % 鍘熺悊鏂规硶:鍦ㄩ『搴忕紪鐮佸埗涓笉闇瑕佷娇鐢,涓轰笌浣滆呭勾鍒剁殑鍏煎鎬ц冭檻,杩欓噷涔熷鍔犻伩鍏嶆姤閿 - \DeclareBibliographyOption{gbnoauthor}[true]{}% + % @@ -850,7 +852,7 @@ bytranslator= {\str@bytranslator},%\addperiod锛%灏唗rans. by 鏀规垚 璇慭addcomma\ and = {\addcomma},%灏嗙2鍜3浜哄悕闂寸殑and绗﹀彿鏀规垚閫楀彿锛岀敤\finalnamedelim鍛戒护涔熷彲浠ュ畾涔夛紝鍙傝3.9.1鑺 andcn = {\addcomma},%and鏈湴鍖栧瓧绗︿覆鐨勪腑鏂囧搴旇瘝 - andincitecn = {\addcomma},%灏嗘爣娉ㄤ腑鐨勫垎寮锛屼究浜庝笌鏂囩尞琛ㄤ腑鐨勫尯鍒 + andincitecn = {\str@andcn},%灏嗘爣娉ㄤ腑鐨勫垎寮锛屼究浜庝笌鏂囩尞琛ㄤ腑鐨勫尯鍒 andincite = {\addcomma}, %andothers = {et al.},%灏嗚秴杩3涓汉鍚嶇殑鐪佺暐锛宔t al.鏀规垚涓 绛 andotherscn = {\str@andotherscn},%灏嗚秴杩3涓汉鍚嶇殑鐪佺暐锛宔t al.鏀规垚涓 绛 @@ -1283,6 +1285,8 @@ \step[fieldset=userd,origfieldval] } \map{%褰撴枃鐚粰鍑簂anguage鍩熸椂锛岃缃枃鐚浣跨敤鐨勬湰鍦板寲瀛楃涓茬殑璇█ + %biblatex 3.11鍙婁互涓嬬増鏈粎鏈塵atch鏄尯鍒嗗ぇ灏忓啓鐨勶紝鑰3.12鐗堝紑濮嬬敤matchi鏉ュ尯鍒嗗ぇ灏忥紝鑰宮atch涓嶅尯鍒 + %杩欓噷涓哄吋瀹3.11鍙婁互涓嬬増鏈紝鎵浠ョ敤涓涓鏉備竴鐐圭殑姝e垯琛ㄨ揪寮 \step[fieldsource=language,match=\regexp{(e|E)(n|N)(g|G)(l|L)(i|I)(s|S)(h|H)},final] \step[fieldset=langid,fieldvalue={english}] \step[fieldset=lansortorder,fieldvalue=\lanenorder] @@ -2257,7 +2261,6 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7 }} -% % 淇敼鐪佺暐浣滆呭悗鐨勬湰鍦板寲瀛楃涓诧紝姣斿et al. % v1.0o,20190103,hzz % @@ -2266,6 +2269,26 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7 % 棣栧厛璁剧疆鍏ㄥ眬鐨勶紝鐒跺悗璁剧疆鏂囩尞琛ㄤ腑鐨勶紝杩欎竴绛変环浜庡皢鎵鏈夌殑cite鍛戒护鐜閮借缃繃浜 % 鑰屼笉鐢ㄥ姣忎竴涓紩鐢ㄥ懡浠ゅ崟鐙缃紝姣斿cite锛宲arancite锛宼extcite閮借缃 \DeclareDelimFormat{strandothersdelim}{% + \edef\userfieldabcde{userd}%杩欓噷浣跨敤\iffieldequalstr{labelnamesource}鏇夸唬ifcurrentname鍥犱负鏍囨敞涓娇鐢╥fcurrentname鏃犳晥 + \iffieldequalstr{labelnamesource}{translator}{\edef\userfieldabcde{usere}}{}% + \iffieldequalstr{labelnamesource}{editor}{\edef\userfieldabcde{userc}}{}% + \iffieldequalstr{labelnamesource}{author}{\edef\userfieldabcde{userf}}{}% + \iffieldequalstr{labelnamesource}{bookauthor}{\edef\userfieldabcde{userb}}{}% + \ifcase\value{gbcitelocalcase}% + \iffieldequalstr{\userfieldabcde}{chinese}{\ifbibstring{andothersincitecn}{\bibstring{andothersincitecn}}{\bibstring{andothers}}}{}%涓枃宸茬粡閫氳繃english鏈湴鍖栧瓧绗︿覆瀹氫箟 + \iffieldequalstr{\userfieldabcde}{korean}{\ifbibstring{andotherskr}{\bibstring{andotherskr}}{\bibstring{andothers}}}{}%闊╄鏈畾涔夛紝鎵浠ヤ笌bib涓竴鑷 + \iffieldequalstr{\userfieldabcde}{japanese}{\ifbibstring{andothersjp}{\bibstring{andothersjp}}{\bibstring{andothers}}}{}%鏃ヤ笌鍚岄煩璇 + \iffieldequalstr{\userfieldabcde}{english}{\ifbibstring{andothersincite}{\bibstring{andothersincite}}{\bibstring{andothers}}}{}%鑻辫宸插畾涔 + \iffieldequalstr{\userfieldabcde}{french}{\bibstring{andothers}}{}%娉曡鏈畾涔夛紝鑻ヨ瀹氫箟闇瑕侀拡瀵筬rench鏈湴鍖栧瓧绗︿覆瀹氫箟 + \iffieldequalstr{\userfieldabcde}{russian}{\bibstring{andothers}}{}%淇勮鏈畾涔夛紝鑻ヨ瀹氫箟闇瑕侀拡瀵箁ussian鏈湴鍖栧瓧绗︿覆瀹氫箟 + \or% + \bibstring{andothersincitecn}% + \or% + \bibstring{andothersincite}% + \fi} + + +\DeclareDelimFormat[bib,biblist]{strandothersdelim}{% \edef\userfieldabcde{userd}% \ifcurrentname{translator}{\edef\userfieldabcde{usere}}{}% \ifcurrentname{editor}{\edef\userfieldabcde{userc}}{}% @@ -2294,6 +2317,28 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7 % 鑰屼笉鐢ㄥ姣忎竴涓紩鐢ㄥ懡浠ゅ崟鐙缃紝姣斿cite锛宲arancite锛宼extcite閮借缃 \DeclareDelimFormat{finalnamedelim}{% \ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}% +% \addspace% + \edef\userfieldabcde{userd}% + \ifcurrentname{translator}{\edef\userfieldabcde{usere}}{}% + \ifcurrentname{editor}{\edef\userfieldabcde{userc}}{}% + \ifcurrentname{author}{\edef\userfieldabcde{userf}}{}% + \ifcurrentname{bookauthor}{\edef\userfieldabcde{userb}}{}% + \ifcase\value{gbcitelocalcase}% + \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}{}% +%\space% + \or% + \bibstring{andincitecn}%\space% + \or% +\space\bibstring{andincite}\space% + \fi} + +\DeclareDelimFormat[bib,biblist]{finalnamedelim}{% + \ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}% \addspace% \edef\userfieldabcde{userd}% \ifcurrentname{translator}{\edef\userfieldabcde{usere}}{}% 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 740b23d9a14..43705f28cc2 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 @@ -7,7 +7,7 @@ %% Released under the LaTeX Project Public License v1.3c or later %% --------------------------------------------------------------- %% -\def\versionofgbtstyle{2020/03/20 v1.0u} +\def\versionofgbtstyle{2020/07/21 v1.0v} \ProvidesFile{gb7714-2015.cbx}[\versionofgbtstyle biblatex citation style] % @@ -30,6 +30,27 @@ %textcite鏍囨敞鍛戒护涓殑鏍囩偣璁剧疆 %\DeclareDelimFormat[textcite]{andothersdelim}{\addspace}% +% +%灏嗚繛缁3绡囨枃鐚帇缂╂敼涓鸿繛缁2绡囨枃鐚帇缂 +% +%璇ュ畯鐨勭洰鐨勬槸鎶涘純鍘嬬缉鍐呴儴鐨勭紪鍙凤紝鑰屼粎杈撳嚭鏈鍚庝竴涓紪鍙凤紝涓昏閫氳繃cbx@tempcnta鏉ユ帶鍒 +%涓鑸儏鍐典笅cbx@tempcnta涓0锛屾墍浠ヨ瀹忎笉杈撳嚭浠讳綍鍐呭銆傚綋cbx@tempcnta鍦╟ite:comp:comp瀹忎腑鏇存敼鍙樺ぇ鍚 +%璇存槑寮濮嬭繘鍏ラ渶瑕佸帇缂╃殑鑼冨洿锛屽綋鍒板帇缂╃粓鐐规椂锛宑bx@tempcnta蹇呯劧澶т簬1锛屽垯杈撳嚭鍐呭銆 +%淇敼绗簩琛岀殑鏁板瓧1涓0鍗冲彲灏嗛粯璁ょ殑3涓紑濮嬪帇缂╁彉涓2涓紑濮嬪帇缂┿ +\renewbibmacro*{cite:dump}{% + \ifnumgreater{\value{cbx@tempcnta}}{0}% + {\ifnumgreater{\value{cbx@tempcnta}}{0}%1鏀逛负0锛屽彲浠ュ皢鍘嬬缉璧峰3涓紪鍙锋敼涓2涓紪鍙 + {\bibrangedash}% + {\multicitedelim}% + \bibhyperref[\cbx@lastkey]{% + \ifdef\cbx@lastprefix% + {\printtext[labelprefix]{\cbx@lastprefix}}% + {}% + \printtext[labelnumber]{\cbx@lastnumber}}}% + {}% + \setcounter{cbx@tempcnta}{0}% + \global\undef\cbx@lastprefix} + % % 瀹氫箟涓涓笂鏍囨柟鎷彿wrapper % @@ -159,14 +180,90 @@ % 20190409锛寁1.0r锛宧zz % 鏂规硶:鍒╃敤newcommand鎴杗ewrobustcmd鍛戒护杩涜瀹氫箟 % 娉ㄦ剰\citet鍜孿citep鍛戒护涔嬫墍浠ヤ笉鐢╪ewrobustcmd锛屾槸涓洪伩鍏嶅姞杞絥atbib妯″潡鍚庝骇鐢熷啿绐 -\DeclareCiteCommand{\citet}% - {\usebibmacro{prenote}} - {\iffieldequalstr{userf}{cn}{\renewcommand*{\andothersdelim}{\addthinspace}}%\addthinspace - {\renewcommand*{\andothersdelim}{\addspace}}% - \printnames{labelname}\mkbibsuperscript{\mkbibbrackets{\usebibmacro{citeindex}% - \usebibmacro{cite}}}} - {\multicitedelim} - {\mkbibsuperscript{\printfield{postnote}}} +%\DeclareCiteCommand{\citet}% +% {\usebibmacro{prenote}} +% {\iffieldequalstr{userf}{cn}{\renewcommand*{\andothersdelim}{\addthinspace}}%\addthinspace +% {\renewcommand*{\andothersdelim}{\addspace}}% +% \printnames{labelname}\mkbibsuperscript{\mkbibbrackets{\usebibmacro{citeindex}% +% \usebibmacro{cite}}}} +% {\multicitedelim} +% {\mkbibsuperscript{\printfield{postnote}}} + +% +% 閲嶅畾涔塩itet锛屽洜涓哄墠闈笌\authornumcite鍚屽畾涔夌殑鍛戒护鏃犳硶姝g‘澶勭悊澶氫釜bibtexkey鍚屾椂缁欏嚭鐨勫帇缂╂儏鍐 +% 20200721锛寁1.0v锛宧zz +% 鏂规硶:鍒╃敤textcite鍛戒护杩涜瀹氫箟 +% 鍩烘湰鍒╃敤textcite鍛戒护鏉ュ啓citet锛屼粎鍒╃敤bool{cbx:incitet}鍋氬垽鏂紝杩涜屽鐞嗕笉鍚岀殑涓婃爣鍜岄〉鐮佸舰寮 +\newbool{cbx:incitet} +\global\booltrue{cbx:incitet} + +\newbibmacro*{citet}{% + \iffieldequals{namehash}{\cbx@lasthash}% + {\usebibmacro{cite:comp}}% + {\usebibmacro{cite:dump}% + \ifbool{cbx:parens}% + {\mkbibsuperscript{\printtext{\bibclosebracket}}\global\boolfalse{cbx:parens}}% + {}% + \iffirstcitekey + {} + {\textcitedelim}% + \usebibmacro{cite:init}% + \ifnameundef{labelname} + {\printfield[citetitle]{labeltitle}} + {\printnames{labelname}}% + \setunit*{\printdelim{namelabeldelim}}% + \mkbibsuperscript{\printtext{\bibopenbracket}\global\booltrue{cbx:parens}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}}% + {}% + \usebibmacro{cite:comp}% + \stepcounter{textcitecount}% + \savefield{namehash}{\cbx@lasthash}}}} + +\DeclareCiteCommand{\cbx@textcite}% + {\usebibmacro{cite:init}}% + {\usebibmacro{citeindex}% + \ifbool{cbx:incitet}{\usebibmacro{citet}}{\usebibmacro{textcite}}% + }% + {}% + {\ifbool{cbx:incitet}{\mkbibsuperscript{\usebibmacro{cite:dump}\usebibmacro{postnote}}}% + {\usebibmacro{cite:dump}\usebibmacro{postnote}}% + \ifbool{cbx:parens}% + {\ifbool{cbx:incitet}{\mkbibsuperscript{\bibclosebracket}}{\bibclosebracket}% + \global\boolfalse{cbx:parens}}% + {}} + + \newrobustcmd{\cbx@citet@init}[2]{% + \global\booltrue{cbx:incitet}% + \setcounter{textcitetotal}{0}% + \setcounter{textcitecount}{0}% + \def\cbx@savedcites{#1}#2\cbx@savedcites\empty} + + \renewrobustcmd{\cbx@textcite@init}[2]{% + \global\boolfalse{cbx:incitet}% + \setcounter{textcitetotal}{0}% + \setcounter{textcitecount}{0}% + \def\cbx@savedcites{#1}#2\cbx@savedcites\empty} + +\DeclareCiteCommand{\citet}[\cbx@citet@init\cbx@textcite] + {\gdef\cbx@savedkeys{}% + \citetrackerfalse% + \pagetrackerfalse% + \DeferNextCitekeyHook% + \usebibmacro{cite:init}} + {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0} + {\protected@xappto\cbx@savedcites{()(\thefield{multipostnote})}% + \global\clearfield{multipostnote}} + {}% + \xappto\cbx@savedkeys{\thefield{entrykey},}% + \iffieldequals{namehash}{\cbx@lasthash} + {} + {\stepcounter{textcitetotal}% + \savefield{namehash}{\cbx@lasthash}}} + {} + {\protected@xappto\cbx@savedcites{% + [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}} + \DeclareCiteCommand{\citep}[\mkbibsuperscript]%鍒╃敤mkbibsuperbracket娣诲姞鏂规嫭鍙 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 2e54a40149a..a6009971046 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{2020/03/20 v1.0u} +\def\versionofgbtstyle{2020/07/21 v1.0v} \def\versionofbiblatex{\abx@version} \ProvidesFile{gb7714-2015ay.bbx}[\versionofgbtstyle biblatex bibliography style] %\RequireBiber[3]%鏄惧紡鎸囧畾鐢╞iber鍚庣锛屽綋鐢╞ibtex鏃朵細鎶ラ敊锛屼絾鍏跺疄涓嶄細褰卞搷缂栬瘧锛屽彧鏄噰鐢╞ibtex鍚庢棤娉曡揪鎴愭牸寮忛渶姹 @@ -448,6 +448,7 @@ \def\str@references{鍙傝冩枃鐚畗 \def\str@bytranslator{璇憓 \def\str@andotherscn{绛墋 + \def\str@andcn{鍜寎 \def\str@backrefpage{寮曠敤椤祡 \def\str@backrefpages{寮曠敤椤祡 \def\str@noaddress{鍑虹増鍦颁笉璇 @@ -823,7 +824,7 @@ bytranslator= {\str@bytranslator\adddot}, %灏唗rans. by 鏀规垚 璇 and = {\addcomma},%灏嗙2鍜3浜哄悕瑙佺殑and绗﹀彿鏀规垚 閫楀彿锛岀敤\finalnamedelim鍛戒护涔熷彲浠ュ畾涔夛紝鍙傝3.9.1鑺 andcn = {\addcomma},%\str@andcn\ and鏈湴鍖栧瓧绗︿覆鐨勪腑鏂囧搴旇瘝 - andincitecn = {\addcomma},%灏嗘爣娉ㄤ腑鐨勫垎寮锛屼究浜庝笌鏂囩尞琛ㄤ腑鐨勫尯鍒 + andincitecn = {\str@andcn},%灏嗘爣娉ㄤ腑鐨勫垎寮锛屼究浜庝笌鏂囩尞琛ㄤ腑鐨勫尯鍒 andincite = {\addcomma}, %andothers = {et al.}, %灏嗚秴杩3涓汉鍚嶇殑鐪佺暐锛宔t al.鏀规垚涓 绛 andotherscn = {\str@andotherscn},%灏嗚秴杩3涓汉鍚嶇殑鐪佺暐锛宔t al.鏀规垚涓 绛 @@ -896,7 +897,7 @@ % incollection鍜宨nproceedings鍩烘湰涓巌nbook绫讳技锛屽洜姝ゅ仛inbook椹卞姩鍒悕澶勭悊 % 3. 涓撳埄绫诲瀷鏈夊叾鐗规畩鎬э紝鑰冭檻patent绫诲瀷 % 4. 鐢靛瓙璧勬簮绫诲瀷鏈夊叾鐗规畩鎬э紝鑰冭檻online绫诲瀷 -% 5. 鎶ュ憡绫诲瀷涓巄ook鏈夌偣绫讳技锛屽嚭鐗堥」澶勭悊涓巄ook涓鏍凤紝浣嗘湁鏃跺張瑕佹湁淇敼鍜屾洿缁嗘棩鏈 +% 5. 鎶ュ憡绫诲瀷涓巄ook鏈夌偣绫讳技锛屽嚭鐗堥」澶勭悊涓巄ook涓鏍凤紝浣嗘湁鏃跺張瑕佹湁淇敼鍜屾洿鏂版棩鏈 % 鍥犳鑰冭檻鐢ㄤ竴绉嶇被鍨嬫潵杈撳嚭锛屼娇鐢╮eport绫诲瀷 % 6. 鎵嬪唽/瀛︿綅璁烘枃绛夌被鍨嬩笌book鏈夌偣绫讳技锛屼絾瀵逛簬鍑虹増椤瑰鐞嗘椂锛屾湁缂虹渷鏃讹紝鐩存帴鐪佺暐锛 % 鍚屾椂鏈塿ersion鍜宔dition鐨勫尯鍒紝鍥犳鑰冭檻鐢ㄤ竴绉嶇被鍨嬫潵杈撳嚭锛屼娇鐢╩anual绫诲瀷 @@ -917,7 +918,7 @@ % modifydate 鐢ㄤ簬鏇存柊鎴栦慨鏀规棩鏈燂紝杈撳嚭鍒版棩锛屼笖鐢()鍖呭洿锛屾暟鎹簮涓篸ate鎴杄nddate鎴杄ventdate \DeclareSourcemap{ -\maps[datatype=bibtex]{ +\maps[datatype=bibtex]{% \map{%褰撴病鏈変綔鑰呮椂灏唀ditor杞垚author \pernottype{inbook}%鍥犱负in绯诲垪涓璭ditor鍙兘鐢ㄦ潵琛ㄧずbookauthor锛屾墍浠ユ帓闄 \pernottype{inproceedings} @@ -1042,7 +1043,7 @@ \pertype{inproceedings} \pertype{conference}%鍏煎鑰佺殑conference绫诲瀷 \step[fieldset=usera, fieldvalue={C}] - \step[fieldsource=institution]%鏈夋椂浼氭妸publisher鍜宨nstitution娣锋穯锛屽鐞嗗悗浣跨敤institution + \step[fieldsource=institution]%鏈夋椂浼氭妸publisher鍜宨nstitution娣锋穯锛屽鐞嗗悗浣跨敤publisher \step[fieldset=publisher, origfieldval] } \map{ @@ -1054,7 +1055,7 @@ \map{ \pertype{incollection} \step[fieldset=usera, fieldvalue={G}] - \step[fieldsource=institution]%鏈夋椂浼氭妸publisher鍜宨nstitution娣锋穯锛屽鐞嗗悗浣跨敤institution + \step[fieldsource=institution]%鏈夋椂浼氭妸publisher鍜宨nstitution娣锋穯锛屽鐞嗗悗浣跨敤publisher \step[fieldset=publisher, origfieldval] } \map{ @@ -1516,7 +1517,8 @@ \DeclareBibliographyAlias{database}{manual} \DeclareBibliographyAlias{dataset}{manual} \DeclareBibliographyAlias{software}{manual} - +\DeclareBibliographyAlias{map}{manual} +\DeclareBibliographyAlias{archive}{manual} %===================================================================== % 璁剧疆鎺掑簭鏍煎紡 @@ -1866,8 +1868,8 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7 % % 鍘熺悊鏂规硶:set鏂规硶鍙互鍙傝3.11.5 Entry Sets锛4.11.1 Entry Sets % 杩欓噷璋冩暣涓涓嬩袱绉嶈瑷鍙傝冩枃鐚殑闂撮殧锛屾簮鏉ヨ嚜biblatex.def -\renewcommand*{\entrysetpunct}{\adddot\par\nobreak} -\renewcommand*{\bibpagespunct}{\addcolon\addthinspace}%椤电爜寮曠敤鏍煎紡鐨勪慨鏀%淇敼涓虹敤鍐掑彿 +\renewcommand*{\entrysetpunct}{\adddot\par\nobreak}%ay鏍峰紡鐢╬ar涔熷彲浠ワ紝鍥犱负娌℃湁鎮寕瀵归綈闂 +\renewcommand*{\bibpagespunct}{\addcolon\addthinspace}%%椤电爜寮曠敤鏍煎紡鐨勪慨鏀癸紝淇敼涓虹敤鍐掑彿 %\renewcommand{\relateddelim}{}%\par %===================================================================== @@ -1941,6 +1943,7 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7 {title}{#1}%\nopunct\unspace \DeclareFieldFormat{url}{\url{#1}} %url鍩熶慨鏀瑰鏈%url鐩稿叧杈撳嚭锛屾簮鏉ヨ嚜biblatex.def \def\UrlFont{\rmfamily}%璁剧疆url瀛椾綋涓簉oman瀛椾綋%\ttfamily +%\urlstyle{rm} %浣跨敤杩欏彞涔熶竴鏍 \setcounter{biburlnumpenalty}{100} %璁﹗rl鍙互鍦ㄦ暟瀛楀悗鏂 \setcounter{biburlucpenalty}{100} %璁﹗rl鍙互鍦ㄥぇ鍐欏瓧姣嶅悗鏂 \setcounter{biburllcpenalty}{100} %璁﹗rl鍙互鍦ㄥ皬鍐欏瓧姣嶅悗鏂 @@ -2004,7 +2007,7 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7 % 淇敼璇戣呬綅缃牸寮 % % 鍘熺悊鏂规硶:淇敼鏉ヨ嚜biblatex.def鏂囦欢鐨刡ytranslator+others瀹忕殑鏍煎紡 -\renewbibmacro*{bytranslator+others}{% +\renewbibmacro*{bytranslator+others}{\bibauthorfont% \ifnameundef{translator} {} {%\usebibmacro{bytranslator+othersstrg} @@ -2027,7 +2030,7 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7 % % 鍘熺悊鏂规硶:鍒ゆ柇浣滆呮垨璇戣呮槸鍚︿腑鏂囷紝鑻ヤ腑鏂囩敤瀛楃绛夛紝鍚﹀垯鐢╡t al. 銆 % \printnames鐢眘tart-stop鎺у埗椤规暟锛岄粯璁ゆ槸1鍜宮axnames/minnames -\renewbibmacro*{name:andothers}{% +\renewbibmacro*{name:andothers}{\bibauthorfont% \ifboolexpr{ test {\ifnumequal{\value{listcount}}{\value{liststop}}} and @@ -2853,7 +2856,7 @@ incollection,proceedings,inproceedings]{number}{% % % 瀵筫dition鐗堟湰淇℃伅鏍煎紡鍋氬嚭淇敼 % -\DeclareFieldFormat{edition}{%婧愭潵鑷猙iblatex.DEF +\DeclareFieldFormat{edition}{\bibtitlefont%婧愭潵鑷猙iblatex.DEF \testCJKfirst{userd}% \iftoggle{ifCJKforgbt}% {\ifinteger{#1}% @@ -2866,7 +2869,7 @@ incollection,proceedings,inproceedings]{number}{% % % 瀵箆ersion鐨勭増鏈俊鎭仛鍑轰慨鏀 % -\DeclareFieldFormat{version}{%婧愭潵鑷猙iblatex.DEF +\DeclareFieldFormat{version}{\bibtitlefont%婧愭潵鑷猙iblatex.DEF \testCJKfirst{userd}% \ifinteger{#1}% {\iftoggle{ifCJKforgbt}{\printtext{#1\str@edition}}% diff --git a/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015ay.cbx b/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015ay.cbx index 11fa65d16ef..868af8c8638 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015ay.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015ay.cbx @@ -7,7 +7,7 @@ %% Released under the LaTeX Project Public License v1.3c or later %% --------------------------------------------------------------- %% -\def\versionofgbtstyle{2020/03/20 v1.0u} +\def\versionofgbtstyle{2020/07/21 v1.0v} \ProvidesFile{gb7714-2015ay.cbx}[\versionofgbtstyle biblatex citation style] % @@ -181,7 +181,7 @@ test {\iftoggle{iftlseven}}%3.7=biblatex % 20180427锛寁1.0k锛屽鍔狅紝hzz % 20190409锛寁1.0r锛宧zz % 涓轰笌椤哄簭缂栫爜鍒跺吋瀹癸紝澧炲姞浜嗗懡浠わ紝瀹氫箟涓巆itet鐩稿悓 -\newbibmacro*{citet}{% +\newbibmacro*{citeta}{% \iffieldundef{shorthand} {\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}} {\usebibmacro{cite:label}% @@ -213,7 +213,7 @@ test {\iftoggle{iftlseven}}%3.7=biblatex {\thefield{postnote}}}% \usebibmacro{prenote}}% {\usebibmacro{citeindex}% - \usebibmacro{citet}} + \usebibmacro{citeta}} {} {\mkbibsuperscript{\usebibmacro{postnote}}%\usebibmacro{postnote} } @@ -225,18 +225,87 @@ test {\iftoggle{iftlseven}}%3.7=biblatex % 娉ㄦ剰\citet鍜孿citep鍛戒护涔嬫墍浠ヤ笉鐢╪ewrobustcmd锛屾槸涓洪伩鍏嶅姞杞絥atbib妯″潡鍚庝骇鐢熷啿绐 %鍚孿authornumcite -\DeclareCiteCommand{\citet}% - {\usebibmacro{cite:init}% - \renewbibmacro*{postnote}{% - \iffieldundef{postnote}% - {}% - {\thefield{postnote}}}% - \usebibmacro{prenote}}% +%\DeclareCiteCommand{\citet}% +% {\usebibmacro{cite:init}% +% \renewbibmacro*{postnote}{% +% \iffieldundef{postnote}% +% {}% +% {\thefield{postnote}}}% +% \usebibmacro{prenote}}% +% {\usebibmacro{citeindex}% +% \usebibmacro{citet}} +% {} +% {%( +% )\mkbibsuperscript{\usebibmacro{postnote}}%\usebibmacro{postnote} +% } + + +% +% 閲嶅畾涔塩itet锛屽洜涓哄墠闈笌\authornumcite鍚屽畾涔夌殑鍛戒护鏃犳硶姝g‘澶勭悊澶氫釜bibtexkey鍚屾椂缁欏嚭鐨勫帇缂╂儏鍐 +% 20200721锛寁1.0v锛宧zz +% 鏂规硶:鍒╃敤textcite鍛戒护杩涜瀹氫箟 +% 鍩烘湰鍒╃敤textcite鍛戒护鏉ュ啓citet锛屼粎鍒╃敤bool{cbx:incitet}鍋氬垽鏂紝杩涜屽鐞嗕笉鍚岀殑椤电爜褰㈠紡 +\newbool{cbx:incitet} +\newbibmacro*{citet:postnote}{% + \ifthenelse{\value{multicitecount}=\value{multicitetotal}} + {\setunit{}% + \printtext{% + \ifbool{cbx:parens} + {\bibcloseparen\global\boolfalse{cbx:parens}} + {}}} + {\setunit{% + \ifbool{cbx:parens} + {\bibcloseparen\global\boolfalse{cbx:parens}} + {}% + \textcitedelim}}% + \renewbibmacro*{postnote}{% + \iffieldundef{postnote}% + {}% + {\thefield{postnote}}}% + \mkbibsuperscript{\usebibmacro{postnote}}% + } + +\DeclareCiteCommand{\cbx@textcite} + {\usebibmacro{cite:init}} {\usebibmacro{citeindex}% - \usebibmacro{citet}} + \usebibmacro{textcite}} {} - {\mkbibsuperscript{\usebibmacro{postnote}}%\usebibmacro{postnote} - } + {\ifbool{cbx:incitet}{\usebibmacro{citet:postnote}}{\usebibmacro{textcite:postnote}}} + + \newrobustcmd{\cbx@citet@init}[2]{% + \global\booltrue{cbx:incitet}% + \setcounter{textcitetotal}{0}% + \setcounter{textcitecount}{0}% + \def\cbx@savedcites{#1}#2\cbx@savedcites\empty} + + \renewrobustcmd{\cbx@textcite@init}[2]{% + \global\boolfalse{cbx:incitet}% + \setcounter{textcitetotal}{0}% + \setcounter{textcitecount}{0}% + \def\cbx@savedcites{#1}#2\cbx@savedcites\empty} + +\DeclareCiteCommand{\citet}[\cbx@citet@init\cbx@textcite] + {\gdef\cbx@savedkeys{}% + \citetrackerfalse% + \pagetrackerfalse% + \DeferNextCitekeyHook% + \usebibmacro{cite:init}} + {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0} + {\protected@xappto\cbx@savedcites{()(\thefield{multipostnote})}% + \global\clearfield{multipostnote}} + {}% + \xappto\cbx@savedkeys{\thefield{entrykey},}% + \iffieldequals{namehash}{\cbx@lasthash} + {} + {\stepcounter{textcitetotal}% + \savefield{namehash}{\cbx@lasthash}}} + {} + {\protected@xappto\cbx@savedcites{% + [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}} + +\let\cbx@citets@init\cbx@citet@init +\pretocmd{\cbx@citets@init}{\UseNextMultiCiteHook}{}{} +\DeclareMultiCiteCommand{\citets}[\cbx@citets@init\cbx@textcites]{\citet}{} %鍚宑ite \DeclareCiteCommand{\citep} 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 012a468c0b3..3747757004e 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{2020/03/20 v1.0u} +\def\versionofgbtstyle{2020/07/21 v1.0v} \def\versionofbiblatex{\abx@version} \ProvidesFile{gb7714-2015ms.bbx}[\versionofgbtstyle biblatex bibliography style] %\RequireBiber[3]%鏄惧紡鎸囧畾鐢╞iber鍚庣锛屽綋鐢╞ibtex鏃朵細鎶ラ敊锛屼絾鍏跺疄涓嶄細褰卞搷缂栬瘧锛屽彧鏄噰鐢╞ibtex鍚庢棤娉曡揪鎴愭牸寮忛渶姹 diff --git a/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015ms.cbx b/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015ms.cbx index cb2f092213e..e339e22c5c4 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015ms.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015ms.cbx @@ -7,7 +7,7 @@ %% Released under the LaTeX Project Public License v1.3c or later %% --------------------------------------------------------------- %% -\def\versionofgbtstyle{2020/03/20 v1.0u} +\def\versionofgbtstyle{2020/07/21 v1.0v} \ProvidesFile{gb7714-2015ms.cbx}[\versionofgbtstyle biblatex citation style] % 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 0ff11167a2e..2efd24b091a 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{2020/03/20 v1.0u} +\def\versionofgbtstyle{2020/07/21 v1.0v} \def\versionofbiblatex{\abx@version} \ProvidesFile{gb7714-2015mx.bbx}[\versionofgbtstyle biblatex bibliography style] %\RequireBiber[3]%鏄惧紡鎸囧畾鐢╞iber鍚庣锛屽綋鐢╞ibtex鏃朵細鎶ラ敊锛屼絾鍏跺疄涓嶄細褰卞搷缂栬瘧锛屽彧鏄噰鐢╞ibtex鍚庢棤娉曡揪鎴愭牸寮忛渶姹 diff --git a/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015mx.cbx b/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015mx.cbx index ab1dfcb1b90..d1d882e4df5 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015mx.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015mx.cbx @@ -7,7 +7,7 @@ %% Released under the LaTeX Project Public License v1.3c or later %% --------------------------------------------------------------- %% -\def\versionofgbtstyle{2020/03/20 v1.0u} +\def\versionofgbtstyle{2020/07/21 v1.0v} \ProvidesFile{gb7714-2015mx.cbx}[\versionofgbtstyle biblatex citation style] % -- cgit v1.2.3