From 04599a378adc76d2b1e54df49c17ba45aee22672 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 31 Mar 2016 21:15:21 +0000 Subject: biblatex-caspervector (31mar16) git-svn-id: svn://tug.org/texlive/trunk@40195 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/biblatex-caspervector/ChangeLog.txt | 12 +++++ .../doc/latex/biblatex-caspervector/Makefile | 8 ---- .../doc/latex/biblatex-caspervector/readme.bib | 2 +- .../doc/latex/biblatex-caspervector/readme.pdf | Bin 343274 -> 345072 bytes .../doc/latex/biblatex-caspervector/readme.tex | 12 ++--- .../biblatex-caspervector-gbk.def | 46 ++++--------------- .../biblatex-caspervector-utf8.def | 46 ++++--------------- .../latex/biblatex-caspervector/caspervector.bbx | 50 +++++++++++++++++++-- .../latex/biblatex-caspervector/caspervector.cbx | 2 +- 9 files changed, 83 insertions(+), 95 deletions(-) diff --git a/Master/texmf-dist/doc/latex/biblatex-caspervector/ChangeLog.txt b/Master/texmf-dist/doc/latex/biblatex-caspervector/ChangeLog.txt index e981e32b834..aa5780bc4bb 100644 --- a/Master/texmf-dist/doc/latex/biblatex-caspervector/ChangeLog.txt +++ b/Master/texmf-dist/doc/latex/biblatex-caspervector/ChangeLog.txt @@ -1,3 +1,15 @@ +2016-03-22. v0.2.5 + + * Changes to package code: + - caspervector.bbx: add overlooked `minnames = 3' and `minitems = 3'. + - caspervector.bbx: refine name spacing to reduce ambiguity. + - caspervector.bbx: adjust list format (like names). + - Refactor common code from *.def into caspervector.bbx. + + * Misc: + - Makefile: remove re-encoding code. + - Minor fixes and cosmetics. + 2016-03-22. v0.2.4 * Misc: diff --git a/Master/texmf-dist/doc/latex/biblatex-caspervector/Makefile b/Master/texmf-dist/doc/latex/biblatex-caspervector/Makefile index 67e753881ab..e610bfce1c8 100644 --- a/Master/texmf-dist/doc/latex/biblatex-caspervector/Makefile +++ b/Master/texmf-dist/doc/latex/biblatex-caspervector/Makefile @@ -7,14 +7,6 @@ doc: xelatex readme xelatex readme -toutf8: - sed -i '1,10 s/GBK/UTF8/; 1,10 s/gbk/utf8/' readme.tex - enca -L zh -x UTF-8 readme.* - -togbk: - sed -i '1,10 s/UTF8/GBK/; 1,10 s/utf8/gbk/' readme.tex - enca -L zh -x GBK readme.* - clean: rm -f readme.{aux,bbl,bcf,blg,dvi,log,run.xml,out} {missfont,texput}.log diff --git a/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.bib b/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.bib index ac9e7d56ad8..4c044ae97ca 100644 --- a/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.bib +++ b/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.bib @@ -573,7 +573,7 @@ } @patent{a5-3, - author = {Koseki, A. and Momose, H. and Kawahito. M. and Other Authors}, + author = {Koseki, A. and Momose, H. and Kawahito, M. and Other Authors}, title = {Compiler}, type = {P/OL}, location = {US}, diff --git a/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.pdf b/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.pdf index eb9906bbd73..d7ba27bcdcc 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.pdf and b/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.tex b/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.tex index dd7cfc89481..35755473f15 100644 --- a/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.tex +++ b/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.tex @@ -40,13 +40,13 @@ \newcommand{\myemph}[1]{\emph{\textcolor{red}{#1}}} \begin{document} -\title{\textbf{biblatex 参考文献和引用样式:\texttt{caspervector} v0.2.4}} +\title{\textbf{biblatex 参考文献和引用样式:\texttt{caspervector} v0.2.5}} \author{% Casper Ti.\ Vector\thanks{\ % \href{mailto:CasperVector@gmail.com}{\texttt{CasperVector@gmail.com}}.% }% } -\date{2016/03/22} +\date{2016/03/31} \maketitle \section{引言} @@ -324,7 +324,7 @@ pdflatex texfile \texttt{@customf} 类型虽不支持 \texttt{author} 等字段, 但用户仍可以设定它们的值。 这样虽不能自动根据这些字段排版, - 但在仍可以根据它们 + 但仍可以根据它们 (主要是 \texttt{language}、\texttt{author}、\texttt{title} 和 \texttt{year} 四个字段) 进行排序。 % @@ -348,11 +348,11 @@ pdflatex texfile \begin{Verbatim}[frame = single] % 按引用顺序排版“cited”分类,即被引用的文献条目。 \begin{refcontext}[sorting = none] -\printbibliography[category = cited, title = {References}] +\printbibliography[category = cited, ..., title = {References}] \end{refcontext} % 按英文文献在前、中文文献在后排版“cited”分类之外,即未被引用的文献条目。 \begin{refcontext}[sorting = ecnty] -\printbibliography[notcategory = cited, title = {Works Not Cited}] +\printbibliography[notcategory = cited, ..., title = {Works Not Cited}] \end{refcontext} \end{Verbatim} 并在最后一个除 \verb|\nocite| 之外的 \verb|\cite| 类命令之后、% @@ -369,7 +369,7 @@ pdflatex texfile \end{Verbatim} 使用 biblatex 2.x 或更旧版本的用户需要 -将在正文中准备排版文献列表的位置使用的代码改为 +将在正文中准备排版文献列表的位置使用的代码改为: \begin{Verbatim}[frame = single] % 按引用顺序排版“cited”分类,即被引用的文献条目。 \printbibliography[category = cited, ..., sorting = none, title = {References}] diff --git a/Master/texmf-dist/tex/latex/biblatex-caspervector/biblatex-caspervector-gbk.def b/Master/texmf-dist/tex/latex/biblatex-caspervector/biblatex-caspervector-gbk.def index d6088870b88..359ef67313b 100644 --- a/Master/texmf-dist/tex/latex/biblatex-caspervector/biblatex-caspervector-gbk.def +++ b/Master/texmf-dist/tex/latex/biblatex-caspervector/biblatex-caspervector-gbk.def @@ -20,7 +20,7 @@ % biblatex-caspervector-utf8.def \ProvidesFile{biblatex-caspervector-gbk.def}% - [2016/03/22 v0.2.4 Chinese punctuations and captions in GBK] + [2016/03/31 v0.2.5 Chinese punctuations and captions in GBK] \newcommand*\bbx@cnldquot{} \newcommand*\bbx@cnrdquot{} @@ -28,42 +28,12 @@ \newcommand*\bbx@cnscolon{} \newcommand*\bbx@cncolon{} \newcommand*\bbx@cnperiod{} - -\DefineBibliographyStrings{english}{ - andmore = {\bbx@cegen{}{\mkbibemph{et\addabbrvspace al\adddot}}}, - andothers = {\bbx@cegen{}{\mkbibemph{et\addabbrvspace al\adddot}}}, - bibliography = {ο}, - references = {ο} -} - -\newbibmacro*{cein:}{\printtext{\bbx@cegen{}{In}\bbx@cecolon}} -\newbibmacro*{cebyauthor}{% - \ifnameundef{author}{}{% - \bbx@cegen% - {\printnames{author}\printtext{}}% - % `\usebibmacro{byauthor}' does not print with `useauthor' enabled. - {\printnames[byauthor]{author}}% - }% -} -\newbibmacro*{cebyeditor}{% - \ifnameundef{editor}{}{% - \bbx@cegen% - {\printnames{editor}\printtext{}}% - {\usebibmacro{byeditor}}% - }% -} -\newbibmacro*{cebytranslator}{% - \ifnameundef{translator}{}{% - \bbx@cegen% - {\printnames{translator}\printtext{}}% - {\usebibmacro{bytranslator}}% - }% -} -\renewbibmacro*{urldate}{% - \iffieldundef{urlyear}{}{% - \printtext{\bbx@cegen{ }{retrieved on\addspace}}% - \printurldate% - }% -} +\newcommand*\bbx@cnetal{} +\newcommand*\bbx@cnauth{} +\newcommand*\bbx@cnedit{} +\newcommand*\bbx@cntrans{} +\newcommand*\bbx@cnin{} +\newcommand*\bbx@cnretr{} +\newcommand*\bbx@cnbib{ο} % vim:ft=tex:ts=2:sw=2 diff --git a/Master/texmf-dist/tex/latex/biblatex-caspervector/biblatex-caspervector-utf8.def b/Master/texmf-dist/tex/latex/biblatex-caspervector/biblatex-caspervector-utf8.def index a07abf60a40..61d3c91c0b2 100644 --- a/Master/texmf-dist/tex/latex/biblatex-caspervector/biblatex-caspervector-utf8.def +++ b/Master/texmf-dist/tex/latex/biblatex-caspervector/biblatex-caspervector-utf8.def @@ -20,7 +20,7 @@ % biblatex-caspervector-utf8.def \ProvidesFile{biblatex-caspervector-utf8.def}% - [2016/03/22 v0.2.4 Chinese punctuations and captions in UTF-8] + [2016/03/31 v0.2.5 Chinese punctuations and captions in UTF-8] \newcommand*\bbx@cnldquot{“} \newcommand*\bbx@cnrdquot{”} @@ -28,42 +28,12 @@ \newcommand*\bbx@cnscolon{;} \newcommand*\bbx@cncolon{:} \newcommand*\bbx@cnperiod{。} - -\DefineBibliographyStrings{english}{ - andmore = {\bbx@cegen{等}{\mkbibemph{et\addabbrvspace al\adddot}}}, - andothers = {\bbx@cegen{等}{\mkbibemph{et\addabbrvspace al\adddot}}}, - bibliography = {参考文献}, - references = {参考文献} -} - -\newbibmacro*{cein:}{\printtext{\bbx@cegen{出自}{In}\bbx@cecolon}} -\newbibmacro*{cebyauthor}{% - \ifnameundef{author}{}{% - \bbx@cegen% - {\printnames{author}\printtext{著}}% - % `\usebibmacro{byauthor}' does not print with `useauthor' enabled. - {\printnames[byauthor]{author}}% - }% -} -\newbibmacro*{cebyeditor}{% - \ifnameundef{editor}{}{% - \bbx@cegen% - {\printnames{editor}\printtext{编}}% - {\usebibmacro{byeditor}}% - }% -} -\newbibmacro*{cebytranslator}{% - \ifnameundef{translator}{}{% - \bbx@cegen% - {\printnames{translator}\printtext{译}}% - {\usebibmacro{bytranslator}}% - }% -} -\renewbibmacro*{urldate}{% - \iffieldundef{urlyear}{}{% - \printtext{\bbx@cegen{检索于 }{retrieved on\addspace}}% - \printurldate% - }% -} +\newcommand*\bbx@cnetal{等} +\newcommand*\bbx@cnauth{著} +\newcommand*\bbx@cnedit{编} +\newcommand*\bbx@cntrans{译} +\newcommand*\bbx@cnin{出自} +\newcommand*\bbx@cnretr{检索于} +\newcommand*\bbx@cnbib{参考文献} % vim:ft=tex:ts=2:sw=2 diff --git a/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.bbx b/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.bbx index ebcd8239f15..a4a624d86d2 100644 --- a/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.bbx @@ -20,7 +20,7 @@ % biblatex-caspervector-utf8.def \ProvidesFile{caspervector.bbx}% - [2016/03/22 v0.2.4 Casper Ti. Vector's biblatex bibliography style] + [2016/03/31 v0.2.5 Casper Ti. Vector's biblatex bibliography style] \RequireBiber[3] \RequireBibliographyStyle{numeric} @@ -29,7 +29,8 @@ \DeclareBibliographyOption{utf8}[true]{\togglefalse{bbx:gbk}} \DeclareBibliographyOption{gbk}[true]{\toggletrue{bbx:gbk}} \ExecuteBibliographyOptions{ - alldates = iso8601, gbk, defernumbers = true, sorting = none + alldates = iso8601, gbk, defernumbers = true, + sorting = none, minnames = 3, minitems = 3 } \AtEndOfPackage{% \iftoggle{bbx:gbk}{ @@ -49,14 +50,26 @@ \newcommand*{\bbx@cespace}{\bbx@cegen{}{\addspace}} \newcommand*{\bbx@mybibquote}[1]% {\bbx@cegen{\bbx@cnldquot{#1}\bbx@cnrdquot}{\mkbibquote{#1}}} +\renewcommand*{\finallistdelim}% + {\bbx@cegen{\bbx@cncomma}{\addspace\bibstring{and}\space}} \renewcommand*{\finalnamedelim}% {\bbx@cegen{\bbx@cncomma}{\addspace\bibstring{and}\space}} +\renewcommand*{\multilistdelim}{\bbx@cecomma} \renewcommand*{\multinamedelim}{\bbx@cecomma} +\renewcommand*{\andmoredelim}{\bbx@cespace} \renewcommand*{\andothersdelim}{\bbx@cespace} \renewcommand*{\postnotedelim}{\bbx@cecomma} \renewcommand*{\finentrypunct}{\bbx@cegen{\bbx@cnperiod}{.}} \renewcommand{\bibendnotewrapper}[1]{\bibsentence #1\bbx@cnperiod} \renewcommand{\bibfootnotewrapper}[1]{\bibsentence #1\bbx@cnperiod} +\DefineBibliographyExtras{english}{% + \renewcommand*{\finalandcomma}{\bbx@cegen{\addspace}{}}% +} +\DefineBibliographyStrings{english}{ + andmore = {\bbx@cegen{\bbx@cnetal}{\mkbibemph{et\addabbrvspace al\adddot}}}, + andothers = {\bbx@cegen{\bbx@cnetal}{\mkbibemph{et\addabbrvspace al\adddot}}}, + bibliography = {\bbx@cnbib}, references = {\bbx@cnbib} +} \DeclareFieldFormat*{booktitle}{\mkbibemph{#1}} \DeclareFieldFormat*{journaltitle}{\mkbibemph{#1}} @@ -66,7 +79,6 @@ \DeclareFieldFormat*{pages}{#1} \DeclareFieldFormat*{url}{\url{#1}} \DeclareFieldFormat*{urldate}{#1} - \DeclareFieldFormat[inbook, inproceedings, incollection, article]% {title}{\bbx@mybibquote{\mkbibemph{#1}}} \DeclareFieldFormat*{type}{\mkbibbrackets{#1}} @@ -75,7 +87,33 @@ \renewbibmacro*{title}{\iffieldundef{title}{}{\printfield{title}}} \newbibmacro*{type}{\iffieldundef{type}{}{\printfield{type}}} \newbibmacro*{number}{\iffieldundef{number}{}{\printfield{number}}} +\newbibmacro*{cein:}{\printtext{\bbx@cegen{\bbx@cnin}{In}\bbx@cecolon}} +\newcommand*{\bbx@byspace}[1]{% + \ifnumgreater{\value{#1}}{\value{maxnames}}{}{\addspace}% +} +\newbibmacro*{cebyauthor}{% + \ifnameundef{author}{}{% + \bbx@cegen% + {\printnames{author}\printtext{\bbx@byspace{author}\bbx@cnauth}}% + % `\usebibmacro{byauthor}' does not print with `useauthor' enabled. + {\printnames[byauthor]{author}}% + }% +} +\newbibmacro*{cebyeditor}{% + \ifnameundef{editor}{}{% + \bbx@cegen% + {\printnames{editor}\printtext{\bbx@byspace{editor}\bbx@cnedit}}% + {\usebibmacro{byeditor}}% + }% +} +\newbibmacro*{cebytranslator}{% + \ifnameundef{translator}{}{% + \bbx@cegen% + {\printnames{translator}\printtext{\bbx@byspace{translator}\bbx@cntrans}}% + {\usebibmacro{bytranslator}}% + }% +} \newbibmacro*{author+others}{% \ifthenelse% {\ifnameundef{author} \and \ifnameundef{editor} \and \ifnameundef{translator}}% @@ -105,6 +143,12 @@ \usebibmacro{number}% }{\printdate}% } +\renewbibmacro*{urldate}{% + \iffieldundef{urlyear}{}{% + \printtext{\bbx@cegen{\bbx@cnretr}{retrieved on}\addspace}% + \printurldate% + }% +} \DeclareBibliographyDriver{book}{% \usebibmacro{bibindex}% diff --git a/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.cbx b/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.cbx index 4cfe479b9e1..fe6a73b011e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.cbx @@ -20,7 +20,7 @@ % biblatex-caspervector-utf8.def \ProvidesFile{caspervector.cbx}% - [2016/03/22 v0.2.4 Casper Ti. Vector's biblatex citation style] + [2016/03/31 v0.2.5 Casper Ti. Vector's biblatex citation style] \RequireCitationStyle{numeric-comp} \ExecuteBibliographyOptions{ -- cgit v1.2.3