texlive[63041] Master/texmf-dist: biblatex-gb7714-2015 (16apr22)
commits+karl at tug.org
commits+karl at tug.org
Sat Apr 16 22:23:50 CEST 2022
Revision: 63041
http://tug.org/svn/texlive?view=revision&revision=63041
Author: karl
Date: 2022-04-16 22:23:50 +0200 (Sat, 16 Apr 2022)
Log Message:
-----------
biblatex-gb7714-2015 (16apr22)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/README.md
trunk/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/biblatex-gb7714-2015-preamble.tex
trunk/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf
trunk/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/biblatex-gb7714-2015.tex
trunk/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example.bib
trunk/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015ay.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015ms.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015mx.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-NWAFU.bbx
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/README.md 2022-04-16 20:23:32 UTC (rev 63040)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/README.md 2022-04-16 20:23:50 UTC (rev 63041)
@@ -1,4 +1,4 @@
-<b>Date of last change: 2022-04-03 to version v1.1g</b>
+<b>Date of last change: 2022-04-16 to version v1.1h</b>
# biblatex-gb7714-2015: a biblatex style package
@@ -1588,6 +1588,7 @@
* 2022/03/07 v1.1e,ctan,github
* 2022/03/13 v1.1f,ctan,github
* 2022/04/03 v1.1g,ctan,github
+* 2022/04/16 v1.1h,ctan,github
---------------------------------------------------------
## Update history:
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/biblatex-gb7714-2015-preamble.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/biblatex-gb7714-2015-preamble.tex 2022-04-16 20:23:32 UTC (rev 63040)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/biblatex-gb7714-2015-preamble.tex 2022-04-16 20:23:50 UTC (rev 63041)
@@ -276,7 +276,7 @@
\newcommand{\bibliofmt}[1]{\medskip\textcolor{gbforestgreen}{\heiti#1}}
%序号如果带章节的话可以改为比如:\thesection.\arabic{myprop}
-\tcbmaketheorem{property}{方法}
+\newtcbtheorem{property}{方法}
{enhanced jigsaw,breakable,pad at break*=1mm,left=2em,boxsep=0pt,
%colback=gray!5,colframe=gbforestgreen,
colback=gray!5,boxrule=0pt,frame hidden,coltitle=gborange,
@@ -283,11 +283,11 @@
borderline west={1.5mm}{-2mm}{gbforestgreen},
theorem style=plain,fonttitle=\bfseries\heiti,arc=0mm,
%separator sign={\ $\blacktriangleright$},breakable,
-%theorem style=plain,fonttitle=\bfseries\upshape, fontupper=\slshape,boxrule=0mm,arc=0mm, %
+%theorem style=plain,fonttitle=\bfseries\upshape, fontupper=\slshape,boxrule=0mm,arc=0mm,
%coltitle=black,colback=green!50!yellow!15!white,colframe=blue!50,%
%description delimiters={}{},
%terminator sign={\ }
-}{myprop}{pp}
+}{pp}
%最后一个必须参数是prefix用来做label比如这里是pp:加上给出的标签名
\newtcbtheorem[]{refentry}{条目类型}
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/biblatex-gb7714-2015.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/biblatex-gb7714-2015.tex 2022-04-16 20:23:32 UTC (rev 63040)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/biblatex-gb7714-2015.tex 2022-04-16 20:23:50 UTC (rev 63041)
@@ -250,8 +250,8 @@
\addbibresource[location=local]{example.bib}
\begin{document}%正文区开始:
%正文内容，引用参考文献
-详见文献\cite{Peebles2001-100-100}\parencite{Babu2014--}
-另见文献\cite[49]{于潇2012-1518-1523}\parencite[106]{Babu2014--}
+详见文献\cite{Peebles2001-100-100}\parencite{Babu2014a}
+另见文献\cite[49]{于潇2012-1518-1523}\parencite[106]{Babu2014a}
%打印参考文献表
\printbibliography[heading=bibliography,title=参考文献]
\end{document}
@@ -289,8 +289,8 @@
%\deflength{\textparwd}{\linewidth-1.5cm}
%\begin{minipage}{\textparwd}
%\fbox{\parbox{\textparwd}{%\raggedright
-%详见文献\cite{Peebles2001-100-100}\parencite{Babu2014--}
-%另见文献\cite[49]{于潇2012-1518-1523}\parencite[106]{Babu2014--}
+%详见文献\cite{Peebles2001-100-100}\parencite{Babu2014a}
+%另见文献\cite[49]{于潇2012-1518-1523}\parencite[106]{Babu2014a}
%\renewcommand{\bibfont}{\zihao{-5}}
%{
%\hyphenation{conference}
@@ -739,6 +739,17 @@
\item gblocal=chinese，强制设置所有的本地化字符串使用中文。
\item gblocal=english，强制设置所有的本地化字符串使用英文。
\end{itemize}
+ 当使用gb7714-2015时，本质上是使用如下的本地化字符串，如果有更多的修改需求，可以直接修改它们：
+ \begin{texlist}
+ \DefineBibliographyStrings{english}{
+ andincite = {和},
+ andincitecn = {和},
+ andothersincitecn = {等},
+ andothersincite = {等{\adddot}},%adddot才能避开标点追踪
+ }
+ \end{texlist}
+
+
测试文件见：
\href{run:egfigure/egcontentfmtc.tex}{egcontentfmtc.tex}。
效果示例如图\ref{fig:eg:optgblocal}所示。
@@ -1380,25 +1391,28 @@
\end{texlist}
\end{example}
-文献表的水平缩进控制，两种编制方式下是不同的。对于著者-出版年制文献表，bibitemindent表示
+文献表的水平缩进控制，两种编制方式下是不同的。对于\emph{著者-出版年}制文献表，bibitemindent表示
\emph{一条文献中第一行相对后面各行的缩进}，bibhang 表示\emph{页边到文献各行起始位置的距离}。因此要调整缩进就是要设置这两尺寸。
-对于顺序编码制文献表，由于存在数字标签，且其宽度与参考文献数量相关，所以这个宽度是动态变的，无能提前设定的，而是在文献表生成时给出，所以调整缩进需要在文献表输出环境中调整。由于顺序编码样式使用了两类输出环境，所以需要根据设定的选项区分处理：
+对于\emph{顺序编码}制文献表，由于存在数字标签，且其宽度与参考文献数量相关，所以这个宽度是动态变的，无能提前设定的，而是在文献表生成时给出，所以调整缩进需要在文献表输出环境中调整。由于顺序编码样式使用了两类输出环境，所以需要根据设定的选项区分处理：
-一是采用list环境的文献表，即设置gbalign=left、right、center时（即顺序编码标签是左对齐、右对齐和居中对齐的情况），在重定义的文献表环境中，调整bibitemindent和bibhang两个尺寸，默认情况下bibhang+labelnumberwidth的长度是页边到各行起始位置的距离。当采用某些字体导致计算计算的标签宽度不足时，可以设置biblabelextend尺寸，来增加labelnumberwidth的宽度，避免缩进格式产生问题，默认情况下biblabelextend尺寸为0pt。
+一是采用list环境的文献表，即设置gbalign=left、right、center时（即顺序编码标签是左对齐、右对齐和居中对齐的情况），在重定义的文献表环境中，调整bibitemindent和biblabelsep两个尺寸，默认情况下bibhang=biblabelsep+labelnumberwidth的长度是页边到各行起始位置的距离。当采用某些字体导致计算计算的标签宽度不足时，可以设置biblabelextend尺寸，来增加labelnumberwidth的宽度，避免缩进格式产生问题，默认情况下biblabelextend尺寸为0pt。
二是采用正常段落环境的文献表，即设置gbalign=gb7714-2015时（即项对齐情况，就是各条文献是自身对齐的情况），在重定义的命令中通过调整lengthid尺寸来设置\emph{每条参考文献第二行开始的缩进距离}。
调整方法见例\ref{eg:biblist:hspace}。
-除了使用这种段落形式的文献表外，也有需求是要把文献表放到一个表格里面这样的需求，要求每一条文献占据表格的一行，这也是能实现的，但本宏包就不去实现了，具体有需求的用户可以在github 的biblatex下搜索tabular或者在tex.stackexchange上搜索biblatex tabular，已经有具体的实现了，这里不再赘述。
+除了使用这种段落形式的文献表外，也有生成\emph{表格文献表}的需求，即把文献表放到一个表格里面，要求每一条文献占据表格的一行。这也是能实现的，具体参考我的博客文章
+\href{https://blog.csdn.net/xenonhu/article/details/121696116}{latex中生成表格形式的参考文献表}。
\begin{example}{文献表水平缩进控制}{eg:biblist:hspace}
\begin{texlist}
-% 著者-出版年制文献表缩进控制
+%
+% 【著者-出版年制】文献表缩进控制
\setlength{\bibitemindent}{0em} % bibitemindent表示一条文献中第一行相对后面各行的缩进
\setlength{\bibhang}{0pt} % 著者-出版年制中 bibhang 表示的各行起始位置到页边的距离
-% 顺序编码制文献表缩进控制
+%
+% 【顺序编码制】文献表缩进控制
% 调整顺序标签与文献内容的间距
\setlength{\biblabelsep}{2mm}
@@ -1409,7 +1423,10 @@
{\printtext[labelnumberwidth]{%
\printfield{labelprefix}%
\printfield{labelnumber}}}
-{%
+{%默认设置
+ \setlength{\bibhang}{\biblabelsep}%
+ \addtolength{\bibhang}{\labelnumberwidth}%
+ %
%这里是所做的调整，通过设置\bibitemindent，\bibhang调整缩进
\addtolength{\bibitemindent}{\labelnumberwidth}%
\addtolength{\bibitemindent}{\biblabelsep}%
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example.bib 2022-04-16 20:23:32 UTC (rev 63040)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example.bib 2022-04-16 20:23:50 UTC (rev 63041)
@@ -2729,9 +2729,9 @@
}
@Article{Saito2006-169-176,
- Title = {jadeite-bearing metagabbro in serpentinite m\'elange of the ``kurosegawa belt" in Izumi Town,Yatsushiro city, kumamoto prefecture, central kyushu},
+ Title = {Jadeite-bearing metagabbro in serpentinite m\'elange of the ``kurosegawa belt" in Izumi Town,Yatsushiro city, kumamoto prefecture, central kyushu},
Author = {Saito, M. and Miyazaki, k.},
- Journal = {bulletin of geological survey of japan},
+ Journal = {Bulletin of geological survey of japan},
Number = {5/6},
Pages = {169-176},
Volume = {57},
@@ -2949,7 +2949,7 @@
}
@Article{Park2010-696-715,
- Title = {metadata quality Control in Digital repositories and collections: criteria, semantics, and mechanisms},
+ Title = {Metadata quality Control in Digital repositories and collections: criteria, semantics, and mechanisms},
Author = {Park, J R and tosaka, Y.},
Journal = {Cataloging \& classification quarterly},
Number = {8},
@@ -3097,7 +3097,7 @@
}
@Report{Calkin2011-8-9,
- Title = {a comparative risk assessment framework for wildland fire management: the 2010 cohesive strategy Science report: RMRS-GTR-262},
+ Title = {A comparative risk assessment framework for wildland fire management: the 2010 cohesive strategy Science report: RMRS-GTR-262},
Author = {Calkin, D and Ager, a. and Thompson, m.},
Pages = {8-9},
Year = {2011}
@@ -3104,7 +3104,7 @@
}
@Book{Praetzellis2011-13-13,
- Title = {death by theory : a tale of mystery and archaeological theory},
+ Title = {Death by theory : a tale of mystery and archaeological theory},
Author = {Praetzellis, A.},
Edition = {Rev. ed.},
Pages = {13},
@@ -3352,7 +3352,7 @@
}
@Article{Walls2013-399-418,
- Title = {drought, deluge and declines: the impact of precipition extremes on amphibians in a changing climate},
+ Title = {Drought, deluge and declines: the impact of precipition extremes on amphibians in a changing climate},
Author = {Walls, S C and barichivich, W. J. and BROWN, m. e.},
Journal = {Biology},
Number = {1},
@@ -3550,6 +3550,14 @@
Editor = {Babu, B. V. and NAGAR, A. K. AND DEEP, K. and others}
}
+ at Proceedings{Babu2014a,
+ Title = {$P_a$ Proceedings of the second international conference on soft computing for problem solving, December 28-30, 2012},
+ Address = {New Delhi},
+ Publisher = {Springer},
+ Year = {2014},
+ Editor = {Babu, B. V. and NAGAR, A. K. AND DEEP, K. and others}
+}
+
@Book{同济大学数学系2014--,
Title = {高等数学},
Address = {北京},
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015.bbx 2022-04-16 20:23:32 UTC (rev 63040)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015.bbx 2022-04-16 20:23:50 UTC (rev 63041)
@@ -11,7 +11,7 @@
%
% 版本和时间信息
%
-\def\versionofgbtstyle{2022/04/03 v1.1g}
+\def\versionofgbtstyle{2022/04/16 v1.1h}
\def\versionofbiblatex{\abx at version}
\ProvidesFile{gb7714-2015.bbx}[\versionofgbtstyle biblatex bibliography style]
%\RequireBiber[3]%显式指定用biber后端，当用bibtex时会报错，但其实不会影响编译，只是采用bibtex后无法达成格式需求
@@ -2090,6 +2090,14 @@
%=====================================================================
% 参考文献表环境
%=====================================================================
+\AtBeginBibliography{%
+\hyphenpenalty=100 %断词阈值，值越大越不容易出现断词
+\tolerance=8000 %丑度， 10000为最大无溢出盒子，参考the texbook 第6章
+\hbadness=5000 %如果丑度超过hbadness这一阀值，那么就会发出警告
+\interlinepenalty=100\relax%
+\widowpenalty=100\relax%
+\clubpenalty=100\relax%
+} %设置断行阈值，避免行溢出
%
% 列表格式
%
@@ -2096,13 +2104,11 @@
% 增加一个\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}
{\list
{\printtext[labelnumberwidth]{%
@@ -2109,10 +2115,11 @@
\printfield{labelprefix}%
\printfield{labelnumber}}}
{\addtolength{\labelnumberwidth}{\biblabelextend}%
- \setlength{\labelwidth}{\labelnumberwidth}%
+ \setlength{\labelwidth}{\labelnumberwidth}%
\setlength{\labelsep}{\biblabelsep}%
+ \setlength{\bibhang}{\biblabelsep}%
+ \addtolength{\bibhang}{\labelnumberwidth}%
\setlength{\leftmargin}{\bibhang}%
- \addtolength{\leftmargin}{\labelnumberwidth}%
\setlength{\itemindent}{\bibitemindent}%
\setlength{\itemsep}{\bibitemsep}%
\setlength{\parsep}{\bibparsep}}%
@@ -2240,14 +2247,14 @@
\iftoggle{bbx:gbmedium}%
{\iftoggle{bbx:url}%
{\iffieldundef{url}%当存在url时，增加一个OL标识符
- {\nobreak\printtext{[}\nobreak#1\nobreak\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}}%
- {\nobreak\printtext{[}\nobreak#1\nobreak\printtext{\texttt{/}OL]}}%
+ {\allowbreak\printtext{[}\nobreak#1\nobreak\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}}%
+ {\allowbreak\printtext{[}\nobreak#1\nobreak\printtext{\texttt{/}OL]}}%
}%
{\ifentrytype{online}%
- {\nobreak\printtext{[}\nobreak#1\nobreak\printtext{\texttt{/}OL]}}%
- {\nobreak\printtext{[}\nobreak#1\nobreak\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}}%
+ {\allowbreak\printtext{[}\nobreak#1\nobreak\printtext{\texttt{/}OL]}}%
+ {\allowbreak\printtext{[}\nobreak#1\nobreak\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}}%
}}%
- {\nobreak\printtext{[}\nobreak#1\nobreak\printtext{]}}%
+ {\allowbreak\printtext{[}\nobreak#1\nobreak\printtext{]}}%
}
%
@@ -2257,11 +2264,11 @@
\iftoggle{bbx:gbmedium}%
{\iftoggle{bbx:url}%
{\iffieldundef{url}%当存在url时，增加一个OL标识符
- {\nobreak\printtext{[}\nobreak N\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}\nobreak}%
- {\nobreak\printtext{[}\nobreak N\printtext{\texttt{/}OL]}\nobreak}%
+ {\allowbreak\printtext{[}\nobreak N\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}\nobreak}%
+ {\allowbreak\printtext{[}\nobreak N\printtext{\texttt{/}OL]}\nobreak}%
}%
- {\nobreak\printtext{[}\nobreak N\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}\nobreak}%
-}{\nobreak\printtext{[}\nobreak N\printtext{]}\nobreak}%
+ {\allowbreak\printtext{[}\nobreak N\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}\nobreak}%
+}{\allowbreak\printtext{[}\nobreak N\printtext{]}\nobreak}%
}
%
@@ -2271,11 +2278,11 @@
\iftoggle{bbx:gbmedium}%
{\iftoggle{bbx:url}%
{\iffieldundef{url}%当存在url时，增加一个OL标识符
- {\nobreak\printtext{[}\nobreak S\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}\nobreak}%
- {\nobreak\printtext{[}\nobreak S\printtext{\texttt{/}OL]}\nobreak}%
+ {\allowbreak\printtext{[}\nobreak S\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}\nobreak}%
+ {\allowbreak\printtext{[}\nobreak S\printtext{\texttt{/}OL]}\nobreak}%
}%
- {\nobreak\printtext{[}\nobreak S\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}\nobreak}%
-}{\nobreak\printtext{[}\nobreak S\printtext{]}\nobreak}%
+ {\allowbreak\printtext{[}\nobreak S\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}\nobreak}%
+}{\allowbreak\printtext{[}\nobreak S\printtext{]}\nobreak}%
}
%
@@ -2531,32 +2538,30 @@
% 重设title的输出
%
% 20180425，v1.0k，为标题增加字体控制命令，Hu Zhenzhen
+% 20220416，v1.1g，增加book类卷的输出
% 原理方法:将文献类型标识符输出出去，原输出来自biblatex.def文件
% 利用toggle做标识符是否输出的判断
\renewbibmacro*{title}{%
- \ifboolexpr{%
+\ifboolexpr{%
test{\iffieldundef{title}}%
and
- test{\iffieldundef{subtitle}}%
- }%
+ test{\iffieldundef{subtitle}}}%
{}%
{\printtext[title]{\bibtitlefont%增加字体控制命令
\printfield[titlecase]{title}%
- \ifboolexpr{test {\iffieldundef{subtitle}}}%这里增加了对子标题的判断，解决不判断多一个点的问题
- {}{\setunit{\subtitlepunct}%
- \printfield[titlecase]{subtitle}}%
- \iffieldundef{titleaddon}{}%判断一下titleaddon，否则直接加可能多一个空格
- {\setunit{\subtitlepunct}\printfield{titleaddon}}%
- \iftoggle{bbx:gbtype}{%
- \iffieldundef{entrysubtype}{\printfield[gbtypeflag]{usera}}%在标题后直接给出文献标识字母，判断一下，是否是报纸和标准
- {\iffieldequalstr{entrysubtype}{standard}{\printfield[gbtypeflags]{usera}}%判断是否为标准
- {\iffieldequalstr{entrysubtype}{news}{\printfield[gbtypeflagn]{usera}}%判断是否为报纸
- {\printfield[gbtypeflag]{usera}}}%其它
- }}{}%
- %\iffieldundef{booktitle}{\newunit}{}%当title是析出时，不要标点
- %\newunit
-}%
-}}
+ \ifboolexpr{test {\iffieldundef{subtitle}}}%增加了对子标题的判断
+ {}{\setunit{\subtitlepunct}\printfield[titlecase]{subtitle}}%
+ \iffieldundef{titleaddon}{}{\setunit{\subtitlepunct}\printfield{titleaddon}}%判断一下titleaddon
+ \ifboolexpr{test{\ifentrytype{book}} and (not test{\iffieldundef{volume}})}%判断一下book类有没有volume
+ {\setunit{\subtitlepunct}\printfield{volume}}{}%
+ \iftoggle{bbx:gbtype}%
+ {\iffieldundef{entrysubtype}{\printfield[gbtypeflag]{usera}}%在标题后直接给出文献标识字母，判断一下，是否是报纸和标准
+ {\iffieldequalstr{entrysubtype}{standard}{\printfield[gbtypeflags]{usera}}%判断是否为标准
+ {\iffieldequalstr{entrysubtype}{news}{\printfield[gbtypeflagn]{usera}}%判断是否为报纸
+ {\printfield[gbtypeflag]{usera}}}}}{}%%其它
+ }%
+ }%
+}
%
% 作者信息的输出格式
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015ay.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015ay.bbx 2022-04-16 20:23:32 UTC (rev 63040)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015ay.bbx 2022-04-16 20:23:50 UTC (rev 63041)
@@ -10,7 +10,7 @@
%
% 版本和时间信息
%
-\def\versionofgbtstyle{2022/04/03 v1.1g}
+\def\versionofgbtstyle{2022/04/16 v1.1h}
\def\versionofbiblatex{\abx at version}
\ProvidesFile{gb7714-2015ay.bbx}[\versionofgbtstyle biblatex bibliography style]
%\RequireBiber[3]%显式指定用biber后端，当用bibtex时会报错，但其实不会影响编译，只是采用bibtex后无法达成格式需求
@@ -1935,7 +1935,14 @@
%=====================================================================
%参考文献表环境
%=====================================================================
-
+\AtBeginBibliography{%
+\hyphenpenalty=100 %断词阈值，值越大越不容易出现断词
+\tolerance=8000 %丑度， 10000为最大无溢出盒子，参考the texbook 第6章
+\hbadness=5000 %如果丑度超过hbadness这一阀值，那么就会发出警告
+\interlinepenalty=100\relax%
+\widowpenalty=100\relax%
+\clubpenalty=100\relax%
+} %设置断行阈值，避免行溢出
%
% 列表格式
%
@@ -1962,8 +1969,7 @@
\newlength{\biblabelextend}
\def\setaligngbnumeric{%
\defbibenvironment{bibliography}
- {\setlength{\bibhang}{\biblabelsep}%
- \setlength{\labelnumberwidth}{2em}%
+ {\setlength{\labelnumberwidth}{2em}%
\setlength{\bibitemindent}{0pt}%
\setlength{\biblabelextend}{0pt}%
\setlength{\biblabelextend}{0pt}%
@@ -1973,8 +1979,9 @@
\addtolength{\labelnumberwidth}{\biblabelextend}%
\setlength{\labelwidth}{\labelnumberwidth}%
\setlength{\labelsep}{\biblabelsep}%
+ \setlength{\bibhang}{\biblabelsep}%
+ \addtolength{\bibhang}{\labelnumberwidth}%
\setlength{\leftmargin}{\bibhang}%
- \addtolength{\leftmargin}{\labelnumberwidth}%
\setlength{\itemindent}{\bibitemindent}%
\setlength{\itemsep}{\bibitemsep}%
\setlength{\parsep}{\bibparsep}}%
@@ -1984,8 +1991,7 @@
}
\defbibenvironment{numerical}%作者年制中数字标签的文献表环境
- {\setlength{\bibhang}{\biblabelsep}%
- \setlength{\labelnumberwidth}{2em}%
+ {\setlength{\labelnumberwidth}{2em}%
\setlength{\bibitemindent}{0pt}%
\setlength{\biblabelextend}{0pt}%
\setlength{\biblabelextend}{0pt}%
@@ -1995,8 +2001,9 @@
\addtolength{\labelnumberwidth}{\biblabelextend}%
\setlength{\labelwidth}{\labelnumberwidth}%
\setlength{\labelsep}{\biblabelsep}%
+ \setlength{\bibhang}{\biblabelsep}%
+ \addtolength{\bibhang}{\labelnumberwidth}%
\setlength{\leftmargin}{\bibhang}%
- \addtolength{\leftmargin}{\labelnumberwidth}%
\setlength{\itemindent}{\bibitemindent}%
\setlength{\itemsep}{\bibitemsep}%
\setlength{\parsep}{\bibparsep}}%
@@ -2095,14 +2102,14 @@
\iftoggle{bbx:gbmedium}%
{\iftoggle{bbx:url}%
{\iffieldundef{url}%当存在url时，增加一个OL标识符
- {\nobreak\printtext{[}\nobreak#1\nobreak\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}}%
- {\nobreak\printtext{[}\nobreak#1\nobreak\printtext{\texttt{/}OL]}}%
+ {\allowbreak\printtext{[}\nobreak#1\nobreak\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}}%
+ {\allowbreak\printtext{[}\nobreak#1\nobreak\printtext{\texttt{/}OL]}}%
}%
{\ifentrytype{online}%
- {\nobreak\printtext{[}\nobreak#1\nobreak\printtext{\texttt{/}OL]}}%
- {\nobreak\printtext{[}\nobreak#1\nobreak\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}}%
+ {\allowbreak\printtext{[}\nobreak#1\nobreak\printtext{\texttt{/}OL]}}%
+ {\allowbreak\printtext{[}\nobreak#1\nobreak\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}}%
}}%
- {\nobreak\printtext{[}\nobreak#1\nobreak\printtext{]}}%
+ {\allowbreak\printtext{[}\nobreak#1\nobreak\printtext{]}}%
}
%
@@ -2112,11 +2119,11 @@
\iftoggle{bbx:gbmedium}%
{\iftoggle{bbx:url}%
{\iffieldundef{url}%当存在url时，增加一个OL标识符
- {\nobreak\printtext{[}\nobreak N\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}\nobreak}%
- {\nobreak\printtext{[}\nobreak N\printtext{\texttt{/}OL]}\nobreak}%
+ {\allowbreak\printtext{[}\nobreak N\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}\nobreak}%
+ {\allowbreak\printtext{[}\nobreak N\printtext{\texttt{/}OL]}\nobreak}%
}%
- {\nobreak\printtext{[}\nobreak N\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}\nobreak}%
-}{\nobreak\printtext{[}\nobreak N\printtext{]}\nobreak}%
+ {\allowbreak\printtext{[}\nobreak N\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}\nobreak}%
+}{\allowbreak\printtext{[}\nobreak N\printtext{]}\nobreak}%
}
%
@@ -2126,11 +2133,11 @@
\iftoggle{bbx:gbmedium}%
{\iftoggle{bbx:url}%
{\iffieldundef{url}%当存在url时，增加一个OL标识符
- {\nobreak\printtext{[}\nobreak S\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}\nobreak}%
- {\nobreak\printtext{[}\nobreak S\printtext{\texttt{/}OL]}\nobreak}%
+ {\allowbreak\printtext{[}\nobreak S\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}\nobreak}%
+ {\allowbreak\printtext{[}\nobreak S\printtext{\texttt{/}OL]}\nobreak}%
}%
- {\nobreak\printtext{[}\nobreak S\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}\nobreak}%
-}{\nobreak\printtext{[}\nobreak S\printtext{]}\nobreak}%
+ {\allowbreak\printtext{[}\nobreak S\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}\nobreak}%
+}{\allowbreak\printtext{[}\nobreak S\printtext{]}\nobreak}%
}
%
@@ -2384,32 +2391,30 @@
% 重设title的输出
%
% 20180425，v1.0k，为标题增加字体控制命令，Hu Zhenzhen
+% 20220416，v1.1g，增加book类卷的输出
% 原理方法:将文献类型标识符输出出去，原输出来自biblatex.def文件
% 利用toggle做标识符是否输出的判断
\renewbibmacro*{title}{%
- \ifboolexpr{%
+\ifboolexpr{%
test{\iffieldundef{title}}%
and
- test{\iffieldundef{subtitle}}%
- }%
+ test{\iffieldundef{subtitle}}}%
{}%
{\printtext[title]{\bibtitlefont%增加字体控制命令
\printfield[titlecase]{title}%
- \ifboolexpr{test {\iffieldundef{subtitle}}}%这里增加了对子标题的判断，解决不判断多一个点的问题
- {}{\setunit{\subtitlepunct}%
- \printfield[titlecase]{subtitle}}%
- \iffieldundef{titleaddon}{}%判断一下titleaddon，否则直接加可能多一个空格
- {\setunit{\subtitlepunct}\printfield{titleaddon}}%
- \iftoggle{bbx:gbtype}{%
- \iffieldundef{entrysubtype}{\printfield[gbtypeflag]{usera}}%在标题后直接给出文献标识字母，判断一下，是否是报纸和标准
- {\iffieldequalstr{entrysubtype}{standard}{\printfield[gbtypeflags]{usera}}%判断是否为标准
- {\iffieldequalstr{entrysubtype}{news}{\printfield[gbtypeflagn]{usera}}%判断是否为报纸
- {\printfield[gbtypeflag]{usera}}}%其它
- }}{}%
- %\iffieldundef{booktitle}{\newunit}{}%当title是析出时，不要标点
- %\newunit
- }%
-}}
+ \ifboolexpr{test {\iffieldundef{subtitle}}}%增加了对子标题的判断
+ {}{\setunit{\subtitlepunct}\printfield[titlecase]{subtitle}}%
+ \iffieldundef{titleaddon}{}{\setunit{\subtitlepunct}\printfield{titleaddon}}%判断一下titleaddon
+ \ifboolexpr{test{\ifentrytype{book}} and (not test{\iffieldundef{volume}})}%判断一下book类有没有volume
+ {\setunit{\subtitlepunct}\printfield{volume}}{}%
+ \iftoggle{bbx:gbtype}%
+ {\iffieldundef{entrysubtype}{\printfield[gbtypeflag]{usera}}%在标题后直接给出文献标识字母，判断一下，是否是报纸和标准
+ {\iffieldequalstr{entrysubtype}{standard}{\printfield[gbtypeflags]{usera}}%判断是否为标准
+ {\iffieldequalstr{entrysubtype}{news}{\printfield[gbtypeflagn]{usera}}%判断是否为报纸
+ {\printfield[gbtypeflag]{usera}}}}}{}%%其它
+ }%
+ }%
+}
%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015ms.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015ms.bbx 2022-04-16 20:23:32 UTC (rev 63040)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015ms.bbx 2022-04-16 20:23:50 UTC (rev 63041)
@@ -11,7 +11,7 @@
%
% 版本和时间信息
%
-\def\versionofgbtstyle{2022/04/03 v1.1g}
+\def\versionofgbtstyle{2022/04/16 v1.1h}
\def\versionofbiblatex{\abx at version}
\ProvidesFile{gb7714-2015ms.bbx}[\versionofgbtstyle biblatex bibliography style]
%\RequireBiber[3]%显式指定用biber后端，当用bibtex时会报错，但其实不会影响编译，只是采用bibtex后无法达成格式需求
@@ -1249,6 +1249,14 @@
%=====================================================================
% 参考文献表环境
%=====================================================================
+\AtBeginBibliography{%
+\hyphenpenalty=100 %断词阈值，值越大越不容易出现断词
+\tolerance=8000 %丑度， 10000为最大无溢出盒子，参考the texbook 第6章
+\hbadness=5000 %如果丑度超过hbadness这一阀值，那么就会发出警告
+\interlinepenalty=100\relax%
+\widowpenalty=100\relax%
+\clubpenalty=100\relax%
+} %设置断行阈值，避免行溢出
%
% 列表格式
%
@@ -1255,7 +1263,6 @@
% 增加一个\bibitemindent尺寸用于控制list环境的itemindent
% v1.0l，20180615，hzz
% v1.0t,20200319,hzz,增加尺寸\biblabelextend使某些字体下标签宽度不足时可增加标签宽度
-\setlength{\bibhang}{\biblabelsep}%
\newlength{\bibitemindent}
\setlength{\bibitemindent}{0pt}
\newlength{\biblabelextend}
@@ -1270,8 +1277,9 @@
{\addtolength{\labelnumberwidth}{\biblabelextend}%
\setlength{\labelwidth}{\labelnumberwidth}%
\setlength{\labelsep}{\biblabelsep}%
+ \setlength{\bibhang}{\biblabelsep}%
+ \addtolength{\bibhang}{\labelnumberwidth}%
\setlength{\leftmargin}{\bibhang}%
- \addtolength{\leftmargin}{\labelnumberwidth}%
\setlength{\itemindent}{\bibitemindent}%
\setlength{\itemsep}{\bibitemsep}%
\setlength{\parsep}{\bibparsep}}%
@@ -1401,14 +1409,14 @@
\iftoggle{bbx:gbmedium}%
{\iftoggle{bbx:url}%
{\iffieldundef{url}%当存在url时，增加一个OL标识符
- {\nobreak\printtext{[}\nobreak#1\nobreak\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}}%
- {\nobreak\printtext{[}\nobreak#1\nobreak\printtext{\texttt{/}OL]}}%
+ {\allowbreak\printtext{[}\nobreak#1\nobreak\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}}%
+ {\allowbreak\printtext{[}\nobreak#1\nobreak\printtext{\texttt{/}OL]}}%
}%
{\ifentrytype{online}%
- {\nobreak\printtext{[}\nobreak#1\nobreak\printtext{\texttt{/}OL]}}%
- {\nobreak\printtext{[}\nobreak#1\nobreak\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}}%
+ {\allowbreak\printtext{[}\nobreak#1\nobreak\printtext{\texttt{/}OL]}}%
+ {\allowbreak\printtext{[}\nobreak#1\nobreak\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}}%
}}%
- {\nobreak\printtext{[}\nobreak#1\nobreak\printtext{]}}%
+ {\allowbreak\printtext{[}\nobreak#1\nobreak\printtext{]}}%
}
%
@@ -1418,11 +1426,11 @@
\iftoggle{bbx:gbmedium}%
{\iftoggle{bbx:url}%
{\iffieldundef{url}%当存在url时，增加一个OL标识符
- {\nobreak\printtext{[}\nobreak N\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}\nobreak}%
- {\nobreak\printtext{[}\nobreak N\printtext{\texttt{/}OL]}\nobreak}%
+ {\allowbreak\printtext{[}\nobreak N\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}\nobreak}%
+ {\allowbreak\printtext{[}\nobreak N\printtext{\texttt{/}OL]}\nobreak}%
}%
- {\nobreak\printtext{[}\nobreak N\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}\nobreak}%
-}{\nobreak\printtext{[}\nobreak N\printtext{]}\nobreak}%
+ {\allowbreak\printtext{[}\nobreak N\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}\nobreak}%
+}{\allowbreak\printtext{[}\nobreak N\printtext{]}\nobreak}%
}
%
@@ -1432,11 +1440,11 @@
\iftoggle{bbx:gbmedium}%
{\iftoggle{bbx:url}%
{\iffieldundef{url}%当存在url时，增加一个OL标识符
- {\nobreak\printtext{[}\nobreak S\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}\nobreak}%
- {\nobreak\printtext{[}\nobreak S\printtext{\texttt{/}OL]}\nobreak}%
+ {\allowbreak\printtext{[}\nobreak S\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}\nobreak}%
+ {\allowbreak\printtext{[}\nobreak S\printtext{\texttt{/}OL]}\nobreak}%
}%
- {\nobreak\printtext{[}\nobreak S\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}\nobreak}%
-}{\nobreak\printtext{[}\nobreak S\printtext{]}\nobreak}%
+ {\allowbreak\printtext{[}\nobreak S\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}\nobreak}%
+}{\allowbreak\printtext{[}\nobreak S\printtext{]}\nobreak}%
}
%
@@ -2023,32 +2031,30 @@
% 重设title的输出
%
% 20180425，v1.0k，为标题增加字体控制命令，Hu Zhenzhen
+% 20220416，v1.1g，增加book类卷的输出
% 原理方法:将文献类型标识符输出出去，原输出来自biblatex.def文件
% 利用toggle做标识符是否输出的判断
\renewbibmacro*{title}{%
- \ifboolexpr{%
+\ifboolexpr{%
test{\iffieldundef{title}}%
and
- test{\iffieldundef{subtitle}}%
- }%
+ test{\iffieldundef{subtitle}}}%
{}%
{\printtext[title]{\bibtitlefont%增加字体控制命令
\printfield[titlecase]{title}%
- \ifboolexpr{test {\iffieldundef{subtitle}}}%这里增加了对子标题的判断，解决不判断多一个点的问题
- {}{\setunit{\subtitlepunct}%
- \printfield[titlecase]{subtitle}}%
- \iffieldundef{titleaddon}{}%判断一下titleaddon，否则直接加可能多一个空格
- {\setunit{\subtitlepunct}\printfield{titleaddon}}%
- \iftoggle{bbx:gbtype}{%
- \iffieldundef{entrysubtype}{\printfield[gbtypeflag]{usera}}%在标题后直接给出文献标识字母，判断一下，是否是报纸和标准
- {\iffieldequalstr{entrysubtype}{standard}{\printfield[gbtypeflags]{usera}}%判断是否为标准
- {\iffieldequalstr{entrysubtype}{news}{\printfield[gbtypeflagn]{usera}}%判断是否为报纸
- {\printfield[gbtypeflag]{usera}}}%其它
- }}{}%
- %\iffieldundef{booktitle}{\newunit}{}%当title是析出时，不要标点
- %\newunit
+ \ifboolexpr{test {\iffieldundef{subtitle}}}%增加了对子标题的判断
+ {}{\setunit{\subtitlepunct}\printfield[titlecase]{subtitle}}%
+ \iffieldundef{titleaddon}{}{\setunit{\subtitlepunct}\printfield{titleaddon}}%判断一下titleaddon
+ \ifboolexpr{test{\ifentrytype{book}} and (not test{\iffieldundef{volume}})}%判断一下book类有没有volume
+ {\setunit{\subtitlepunct}\printfield{volume}}{}%
+ \iftoggle{bbx:gbtype}%
+ {\iffieldundef{entrysubtype}{\printfield[gbtypeflag]{usera}}%在标题后直接给出文献标识字母，判断一下，是否是报纸和标准
+ {\iffieldequalstr{entrysubtype}{standard}{\printfield[gbtypeflags]{usera}}%判断是否为标准
+ {\iffieldequalstr{entrysubtype}{news}{\printfield[gbtypeflagn]{usera}}%判断是否为报纸
+ {\printfield[gbtypeflag]{usera}}}}}{}%%其它
+ }%
+ }%
}%
-}}%
%
% 日期信息的输出格式，针对biblatex<3.7版本
%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015mx.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015mx.bbx 2022-04-16 20:23:32 UTC (rev 63040)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015mx.bbx 2022-04-16 20:23:50 UTC (rev 63041)
@@ -11,7 +11,7 @@
%
% 版本和时间信息
%
-\def\versionofgbtstyle{2022/04/03 v1.1g}
+\def\versionofgbtstyle{2022/04/16 v1.1h}
\def\versionofbiblatex{\abx at version}
\ProvidesFile{gb7714-2015mx.bbx}[\versionofgbtstyle biblatex bibliography style]
%\RequireBiber[3]%显式指定用biber后端，当用bibtex时会报错，但其实不会影响编译，只是采用bibtex后无法达成格式需求
@@ -1538,6 +1538,14 @@
%=====================================================================
% 参考文献表环境
%=====================================================================
+\AtBeginBibliography{%
+\hyphenpenalty=100 %断词阈值，值越大越不容易出现断词
+\tolerance=8000 %丑度， 10000为最大无溢出盒子，参考the texbook 第6章
+\hbadness=5000 %如果丑度超过hbadness这一阀值，那么就会发出警告
+\interlinepenalty=100\relax%
+\widowpenalty=100\relax%
+\clubpenalty=100\relax%
+} %设置断行阈值，避免行溢出
%
% 列表格式
%
@@ -1544,7 +1552,6 @@
% 增加一个\bibitemindent尺寸用于控制list环境的itemindent
% v1.0l，20180615，hzz
% v1.0t,20200319,hzz,增加尺寸\biblabelextend使某些字体下标签宽度不足时可增加标签宽度
-\setlength{\bibhang}{\biblabelsep}%
\newlength{\bibitemindent}
\setlength{\bibitemindent}{0pt}
\newlength{\biblabelextend}
@@ -1559,8 +1566,9 @@
{\addtolength{\labelnumberwidth}{\biblabelextend}%
\setlength{\labelwidth}{\labelnumberwidth}%
\setlength{\labelsep}{\biblabelsep}%
+ \setlength{\bibhang}{\biblabelsep}%
+ \addtolength{\bibhang}{\labelnumberwidth}%
\setlength{\leftmargin}{\bibhang}%
- \addtolength{\leftmargin}{\labelnumberwidth}%
\setlength{\itemindent}{\bibitemindent}%
\setlength{\itemsep}{\bibitemsep}%
\setlength{\parsep}{\bibparsep}}%
@@ -1659,8 +1667,7 @@
}
\defbibenvironment{numerical}%作者年制中数字标签的文献表环境
- {\setlength{\bibhang}{\biblabelsep}%
- \setlength{\labelnumberwidth}{2em}%
+ {\setlength{\labelnumberwidth}{2em}%
\setlength{\bibitemindent}{0pt}%
\setlength{\biblabelextend}{0pt}%
\setlength{\biblabelextend}{0pt}%
@@ -1670,8 +1677,9 @@
\addtolength{\labelnumberwidth}{\biblabelextend}%
\setlength{\labelwidth}{\labelnumberwidth}%
\setlength{\labelsep}{\biblabelsep}%
+ \setlength{\bibhang}{\biblabelsep}%
+ \addtolength{\bibhang}{\labelnumberwidth}%
\setlength{\leftmargin}{\bibhang}%
- \addtolength{\leftmargin}{\labelnumberwidth}%
\setlength{\itemindent}{\bibitemindent}%
\setlength{\itemsep}{\bibitemsep}%
\setlength{\parsep}{\bibparsep}}%
@@ -1709,14 +1717,14 @@
\iftoggle{bbx:gbmedium}%
{\iftoggle{bbx:url}%
{\iffieldundef{url}%当存在url时，增加一个OL标识符
- {\nobreak\printtext{[}\nobreak#1\nobreak\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}}%
- {\nobreak\printtext{[}\nobreak#1\nobreak\printtext{\texttt{/}OL]}}%
+ {\allowbreak\printtext{[}\nobreak#1\nobreak\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}}%
+ {\allowbreak\printtext{[}\nobreak#1\nobreak\printtext{\texttt{/}OL]}}%
}%
{\ifentrytype{online}%
- {\nobreak\printtext{[}\nobreak#1\nobreak\printtext{\texttt{/}OL]}}%
- {\nobreak\printtext{[}\nobreak#1\nobreak\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}}%
+ {\allowbreak\printtext{[}\nobreak#1\nobreak\printtext{\texttt{/}OL]}}%
+ {\allowbreak\printtext{[}\nobreak#1\nobreak\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}}%
}}%
- {\nobreak\printtext{[}\nobreak#1\nobreak\printtext{]}}%
+ {\allowbreak\printtext{[}\nobreak#1\nobreak\printtext{]}}%
}
%
@@ -1726,11 +1734,11 @@
\iftoggle{bbx:gbmedium}%
{\iftoggle{bbx:url}%
{\iffieldundef{url}%当存在url时，增加一个OL标识符
- {\nobreak\printtext{[}\nobreak N\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}\nobreak}%
- {\nobreak\printtext{[}\nobreak N\printtext{\texttt{/}OL]}\nobreak}%
+ {\allowbreak\printtext{[}\nobreak N\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}\nobreak}%
+ {\allowbreak\printtext{[}\nobreak N\printtext{\texttt{/}OL]}\nobreak}%
}%
- {\nobreak\printtext{[}\nobreak N\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}\nobreak}%
-}{\nobreak\printtext{[}\nobreak N\printtext{]}\nobreak}%
+ {\allowbreak\printtext{[}\nobreak N\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}\nobreak}%
+}{\allowbreak\printtext{[}\nobreak N\printtext{]}\nobreak}%
}
%
@@ -1740,11 +1748,11 @@
\iftoggle{bbx:gbmedium}%
{\iftoggle{bbx:url}%
{\iffieldundef{url}%当存在url时，增加一个OL标识符
- {\nobreak\printtext{[}\nobreak S\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}\nobreak}%
- {\nobreak\printtext{[}\nobreak S\printtext{\texttt{/}OL]}\nobreak}%
+ {\allowbreak\printtext{[}\nobreak S\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}\nobreak}%
+ {\allowbreak\printtext{[}\nobreak S\printtext{\texttt{/}OL]}\nobreak}%
}%
- {\nobreak\printtext{[}\nobreak S\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}\nobreak}%
-}{\nobreak\printtext{[}\nobreak S\printtext{]}\nobreak}%
+ {\allowbreak\printtext{[}\nobreak S\printtext{\iffieldundef{medium}{}{\texttt{/}\thefield{medium}}]}\nobreak}%
+}{\allowbreak\printtext{[}\nobreak S\printtext{]}\nobreak}%
}
%
@@ -1995,32 +2003,30 @@
% 重设title的输出
%
% 20180425，v1.0k，为标题增加字体控制命令，Hu Zhenzhen
+% 20220416，v1.1g，增加book类卷的输出
% 原理方法:将文献类型标识符输出出去，原输出来自biblatex.def文件
% 利用toggle做标识符是否输出的判断
\renewbibmacro*{title}{%
- \ifboolexpr{%
+\ifboolexpr{%
test{\iffieldundef{title}}%
and
- test{\iffieldundef{subtitle}}%
- }%
+ test{\iffieldundef{subtitle}}}%
{}%
{\printtext[title]{\bibtitlefont%增加字体控制命令
\printfield[titlecase]{title}%
- \ifboolexpr{test {\iffieldundef{subtitle}}}%这里增加了对子标题的判断，解决不判断多一个点的问题
- {}{\setunit{\subtitlepunct}%
- \printfield[titlecase]{subtitle}}%
- \iffieldundef{titleaddon}{}%判断一下titleaddon，否则直接加可能多一个空格
- {\setunit{\subtitlepunct}\printfield{titleaddon}}%
- \iftoggle{bbx:gbtype}{%
- \iffieldundef{entrysubtype}{\printfield[gbtypeflag]{usera}}%在标题后直接给出文献标识字母，判断一下，是否是报纸和标准
- {\iffieldequalstr{entrysubtype}{standard}{\printfield[gbtypeflags]{usera}}%判断是否为标准
- {\iffieldequalstr{entrysubtype}{news}{\printfield[gbtypeflagn]{usera}}%判断是否为报纸
- {\printfield[gbtypeflag]{usera}}}%其它
- }}{}%
- %\iffieldundef{booktitle}{\newunit}{}%当title是析出时，不要标点
- %\newunit
-}%
-}}
+ \ifboolexpr{test {\iffieldundef{subtitle}}}%增加了对子标题的判断
+ {}{\setunit{\subtitlepunct}\printfield[titlecase]{subtitle}}%
+ \iffieldundef{titleaddon}{}{\setunit{\subtitlepunct}\printfield{titleaddon}}%判断一下titleaddon
+ \ifboolexpr{test{\ifentrytype{book}} and (not test{\iffieldundef{volume}})}%判断一下book类有没有volume
+ {\setunit{\subtitlepunct}\printfield{volume}}{}%
+ \iftoggle{bbx:gbtype}%
+ {\iffieldundef{entrysubtype}{\printfield[gbtypeflag]{usera}}%在标题后直接给出文献标识字母，判断一下，是否是报纸和标准
+ {\iffieldequalstr{entrysubtype}{standard}{\printfield[gbtypeflags]{usera}}%判断是否为标准
+ {\iffieldequalstr{entrysubtype}{news}{\printfield[gbtypeflagn]{usera}}%判断是否为报纸
+ {\printfield[gbtypeflag]{usera}}}}}{}%%其它
+ }%
+ }%
+}
%
% 作者信息的输出格式
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-NWAFU.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-NWAFU.bbx 2022-04-16 20:23:32 UTC (rev 63040)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-NWAFU.bbx 2022-04-16 20:23:50 UTC (rev 63041)
@@ -20,6 +20,7 @@
%==================================================
\ExecuteBibliographyOptions{
sortlocale=zh__pinyin,
+ gbpub=false,
gbtype=false,
maxbibnames=99,% 著录所有作者
minbibnames=1,
@@ -41,7 +42,7 @@
%\def\bibrangedash{$\sim$}% 表示范围的波浪线符号
\DefineBibliographyExtras{english}{\renewcommand*{\bibrangedash}{$\sim$}}
%\newcommand\nwafubibfont{\linespread{1.0}\zihao{-5}}% 字体
-\newcommand\nwafubibfont{\zihao{-5}}% 字体
+\newcommand\nwafubibfont{\zihao{5}}% 字体
\renewcommand{\bibfont}{\nwafubibfont}% 全局字体设置
\setlength{\bibitemsep}{2pt}%0ex
More information about the tex-live-commits
mailing list.