From 889e817205bf90bb7e360255960acd44c780afad Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 25 Jun 2014 15:21:32 +0000 Subject: biblatex-caspervector (24may14) git-svn-id: svn://tug.org/texlive/trunk@34410 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/biblatex-caspervector/ChangeLog.txt | 18 +++ .../doc/latex/biblatex-caspervector/Makefile | 2 +- .../doc/latex/biblatex-caspervector/readme.bib | 137 ++++++++++------- .../doc/latex/biblatex-caspervector/readme.pdf | Bin 261391 -> 251503 bytes .../doc/latex/biblatex-caspervector/readme.tex | 69 +++------ .../biblatex-caspervector-gbk.def | 36 ++--- .../biblatex-caspervector-utf8.def | 36 ++--- .../latex/biblatex-caspervector/caspervector.bbx | 167 +++++++++++---------- .../latex/biblatex-caspervector/caspervector.cbx | 6 +- 9 files changed, 252 insertions(+), 219 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/biblatex-caspervector/ChangeLog.txt b/Master/texmf-dist/doc/latex/biblatex-caspervector/ChangeLog.txt index ab35738d401..1ca423858bd 100644 --- a/Master/texmf-dist/doc/latex/biblatex-caspervector/ChangeLog.txt +++ b/Master/texmf-dist/doc/latex/biblatex-caspervector/ChangeLog.txt @@ -1,4 +1,22 @@ +2014-05-24, v0.2.0 + + * Changes to API: + - Chinese references now (only) require language == {chinese}. + - `userf' becomes an internal entry field (backward compatible for now). + + * Changes to package code: + - Avoid potential name clashes, using `something@' prefixes for commands. + + * Changes to documentation: + - No longer recommend the CTeX Suite. + - Remove install hints (already included in TeX Live). + - Use `%' for comments in `.bib' files, now supported by biber. + + * Misc: + - Minor fixes and improvements. + 2013-12-27, v0.1.9 + * Misc: - Remove support for CRLF, as required by CTAN. diff --git a/Master/texmf-dist/doc/latex/biblatex-caspervector/Makefile b/Master/texmf-dist/doc/latex/biblatex-caspervector/Makefile index feba4c72645..6ee0b076d7c 100644 --- a/Master/texmf-dist/doc/latex/biblatex-caspervector/Makefile +++ b/Master/texmf-dist/doc/latex/biblatex-caspervector/Makefile @@ -1,6 +1,6 @@ # vim:ts=4:sw=4 # -# Copyright (c) 2011-2012 Casper Ti. Vector +# Copyright (c) 2011-2013 Casper Ti. Vector # Public domain. doc: diff --git a/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.bib b/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.bib index 85d29008453..a597052a564 100644 --- a/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.bib +++ b/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.bib @@ -1,27 +1,23 @@ -vim:ts=4:sw=4 - -@online{babel, - author = {Braams, Johannes}, - title = {Babel, a multilingual package for use with \LaTeX{}'s standard document classes}, - type = {M/OL}, - date = {2011-11-16}, - url = {http://www.tug.org/texlive/Contents/live/texmf-dist/doc/generic/babel/babel.pdf}, -} +% vim:ts=4:sw=4 @online{biber, author = {Kime, Philip and Charette, Fran\c{c}ois}, - title = {Biber: A backend bibliography processor for biblatex (Version 0.9.9)}, + title = {Biber: A backend bibliography processor for biblatex (Version 1.8)}, type = {M/OL}, - date = {2012-03-29}, - url = {http://biblatex-biber.sourceforge.net/}, + date = {2013-10-18}, + url = {http://mirror.ctan.org/biblio/biber/}, + urldate = {2014-05-24}, + language = {english}, } @online{biblatex, author = {Lehman, Philipp}, - title = {The biblatex Package: Programmable Bibliographies and Citations (Version 1.7)}, + title = {The biblatex Package: Programmable Bibliographies and Citations (Version 2.8a)}, type = {M/OL}, - date = {2011-11-13}, - url = {http://sourceforge.net/projects/biblatex/}, + date = {2013-11-25}, + url = {http://mirror.ctan.org/macros/latex/exptl/biblatex/}, + urldate = {2014-05-24}, + language = {english}, } @report{gbt7714-2005, @@ -30,7 +26,8 @@ vim:ts=4:sw=4 type = {S}, date = {2005-03-23}, addendum = {(可见清华大学图书馆网页上的电子版:\url{http://lib.tsinghua.edu.cn/service/paperwriting.html}。)}, - userf = {zh}, + urldate = {2014-05-24}, + language = {chinese}, } @book{1-1, @@ -41,7 +38,7 @@ vim:ts=4:sw=4 publisher = {中国书籍出版社}, year = {2001}, pages = {179-193}, - userf = {zh}, + language = {chinese}, } @book{1-2, @@ -52,7 +49,7 @@ vim:ts=4:sw=4 location = {北京}, publisher = {中国书籍出版社}, year = {1988}, - userf = {zh}, + language = {chinese}, } @report{1-3, @@ -62,7 +59,7 @@ vim:ts=4:sw=4 location = {北京}, publisher = {中国标准出版社}, year = {1986}, - userf = {zh}, + language = {chinese}, } @book{1-4, @@ -72,7 +69,7 @@ vim:ts=4:sw=4 location = {北京}, publisher = {中国社会科学出版社}, year = {1994}, - userf = {zh}, + language = {chinese}, } @thesis{1-5, @@ -82,7 +79,7 @@ vim:ts=4:sw=4 location = {北京}, publisher = {北京大学出版社}, year = {2000}, - userf = {zh}, + language = {chinese}, } @book{1-6, @@ -92,7 +89,7 @@ vim:ts=4:sw=4 location = {北京}, publisher = {北京古籍出版社}, year = {1982}, - userf = {zh}, + language = {chinese}, } @book{1-7, @@ -102,7 +99,7 @@ vim:ts=4:sw=4 location = {金陵}, publisher = {曽氏}, year = {1845\textmd{\emph{(清同治四年)}}}, - userf = {zh}, + language = {chinese}, } @book{1-8, @@ -114,7 +111,7 @@ vim:ts=4:sw=4 year = {1998}, url = {http://ie.nthu.edu.tw/info/ie.newie.htm}, urldate = {1998-09-26}, - userf = {zh}, + language = {chinese}, } @book{1-9, @@ -124,6 +121,7 @@ vim:ts=4:sw=4 location = {London}, publisher = {The Library Association}, year = {1990}, + language = {english}, } @book{1-10, @@ -133,6 +131,7 @@ vim:ts=4:sw=4 location = {New York}, publisher = {McGraw Hill}, year = {2001}, + language = {english}, } @proceedings{1-11, @@ -141,6 +140,7 @@ vim:ts=4:sw=4 type = {C}, location = {Rotterdam}, publisher = {A. A. Balkema}, + language = {english}, } @incollection{2-1, @@ -153,7 +153,7 @@ vim:ts=4:sw=4 publisher = {科学出版社}, year = {1999}, pages = {32-36}, - userf = {zh}, + language = {chinese}, } @incollection{2-2, @@ -166,7 +166,7 @@ vim:ts=4:sw=4 publisher = {天津科学技术出版社}, year = {1980}, pages = {56-114}, - userf = {zh}, + language = {chinese}, } @incollection{2-3, @@ -179,7 +179,7 @@ vim:ts=4:sw=4 publisher = {高等教育出版社}, year = {1998}, pages = {146-163}, - userf = {zh}, + language = {chinese}, } @incollection{2-4, @@ -192,7 +192,7 @@ vim:ts=4:sw=4 publisher = {人民出版社}, year = {1982}, pages = {505}, - userf = {zh}, + language = {chinese}, } @inproceedings{2-5, @@ -205,7 +205,7 @@ vim:ts=4:sw=4 publisher = {西安电子科技大学出版社}, year = {1996}, pages = {468-471}, - userf = {zh}, + language = {chinese}, } @incollection{2-6, @@ -218,6 +218,7 @@ vim:ts=4:sw=4 publisher = {Saunders}, year = {1974}, pages = {745-772}, + language = {english}, } @periodical{3-1, @@ -229,7 +230,7 @@ vim:ts=4:sw=4 number = {1}, location = {北京}, publisher = {地质出版社}, - userf = {zh}, + language = {chinese}, } @periodical{3-2, @@ -240,7 +241,7 @@ vim:ts=4:sw=4 year = {\textmd{\textbf{1957}(1) -- \textbf{1990}(4)}}, location = {北京}, publisher = {北京图书馆}, - userf = {zh}, + language = {chinese}, } @periodical{3-3, @@ -252,6 +253,7 @@ vim:ts=4:sw=4 number = {1}, location = {Washington, D. C.}, publisher = {American Association for the Advancement of Science}, + language = {english}, } @article{4-1, @@ -263,7 +265,7 @@ vim:ts=4:sw=4 volume = {35}, number = {1}, pages = {101-106}, - userf = {zh}, + language = {chinese}, } @article{4-2, @@ -275,7 +277,7 @@ vim:ts=4:sw=4 volume = {44}, number = {23}, pages = {2481-2488}, - userf = {zh}, + language = {chinese}, } @article{4-3, @@ -286,7 +288,7 @@ vim:ts=4:sw=4 date = {2000-04-12}, url = {http://www.bjyouth.com.cn/Bgb/20000412/GB/4216%5ED0412B1401.htm}, urldate = {2005-07-12}, - userf = {zh}, + language = {chinese}, } @article{4-4, @@ -300,7 +302,7 @@ vim:ts=4:sw=4 pages = {1-6}, url = {http://periodical.wanfangdata.com.cn/periodical/qbxb/qbxb99/qbxb9904/990407.htm}, urldate = {2001-07-08}, - userf = {zh}, + language = {chinese}, } @article{4-5, @@ -312,6 +314,7 @@ vim:ts=4:sw=4 volume = {279}, number = {5359}, pages = {2063-2064}, + language = {english}, } @article{4-6, @@ -323,6 +326,7 @@ vim:ts=4:sw=4 volume = {4}, number = {2}, pages = {61-66}, + language = {english}, } @patent{5-1, @@ -332,7 +336,7 @@ vim:ts=4:sw=4 location = {中国}, number = {88105607.3}, date = {1989-07-26}, - userf = {zh}, + language = {chinese}, } @patent{5-2, @@ -344,7 +348,7 @@ vim:ts=4:sw=4 date = {2002-03-06}, url = {http://211.152.9.47/sipoasp/zljs/hyjs-yx-new.asp?recid=01128777.2&Ieixin=0}, urldate = {2002-05-28}, - userf = {zh}, + language = {chinese}, } @patent{5-3, @@ -356,6 +360,7 @@ vim:ts=4:sw=4 date = {2002-04-25}, url = {http://patftuspto.gov/nemcgi/nph-Parser?Sectl=PT02&Sect2=HITOFF&p=1&u=/netahmrl/search-bool.huml&r=1&f=G&1=50&col=AND&d=ptxt&sl='Electronic+watermarking+method+systern'.TTL.&OS=TTL/}, urldate = {2002-05-28}, + language = {english}, } @online{6-1, @@ -366,6 +371,7 @@ vim:ts=4:sw=4 year = {1989}, url = {http://info.lib.uh.edu/pacsl.html}, urldate = {1995-05-17}, + language = {english}, } @online{6-2, @@ -374,6 +380,7 @@ vim:ts=4:sw=4 type = {EB/OL}, url = {http://www.oclc.org/about/history/default.htm}, urldate = {2000-01-08}, + language = {english}, } @online{6-3, @@ -382,6 +389,7 @@ vim:ts=4:sw=4 type = {EB/OL}, url = {http://www.ifla.org/IV/ifla64/138-161e.htm}, urldate = {1999-12-08}, + language = {english}, } @book{a1-1, @@ -391,7 +399,7 @@ vim:ts=4:sw=4 location = {北京}, publisher = {中国林业出版社}, year = {1993}, - userf = {zh}, + language = {chinese}, } @book{a1-2, @@ -401,7 +409,7 @@ vim:ts=4:sw=4 location = {北京}, publisher = {科学出版社}, year = {1998}, - userf = {zh}, + language = {chinese}, } @book{a1-3, @@ -412,7 +420,7 @@ vim:ts=4:sw=4 publisher = {新华出版社}, year = {1999}, pages = {117-121}, - userf = {zh}, + language = {chinese}, } @book{a1-4, @@ -422,7 +430,7 @@ vim:ts=4:sw=4 location = {北京}, publisher = {高等教育出版社}, year = {1995}, - userf = {zh}, + language = {chinese}, } @book{a1-5, @@ -432,7 +440,7 @@ vim:ts=4:sw=4 location = {上海}, publisher = {同文书局}, year = {1912}, - userf = {zh}, + language = {chinese}, } @book{a1-6, @@ -442,6 +450,7 @@ vim:ts=4:sw=4 location = {Chicago}, publisher = {American Library Association}, year = {1995}, + language = {english}, } @book{a1-7, @@ -451,6 +460,7 @@ vim:ts=4:sw=4 location = {London}, publisher = {IFLA International Office for UBC}, year = {1977}, + language = {english}, } @book{a1-8, @@ -460,6 +470,7 @@ vim:ts=4:sw=4 location = {Burr Ridge, III.}, publisher = {Irwin}, year = {1994}, + language = {english}, } @book{a1-9, @@ -468,6 +479,7 @@ vim:ts=4:sw=4 type = {M}, publisher = {Brooks/Cole-Thomson Learning}, year = {2001}, + language = {english}, } @proceedings{a2-1, @@ -476,7 +488,7 @@ vim:ts=4:sw=4 type = {C}, location = {天津}, year = {1990}, - userf = {zh}, + language = {chinese}, } @proceedings{a2-2, @@ -486,6 +498,7 @@ vim:ts=4:sw=4 location = {Toronto}, publisher = {University of Toronto Press}, year = {1963}, + language = {english}, } @proceedings{a2-3, @@ -495,6 +508,7 @@ vim:ts=4:sw=4 location = {Berlin}, publisher = {Springer}, year = {c2000}, + language = {english}, } @report{a3-1, @@ -504,6 +518,7 @@ vim:ts=4:sw=4 location = {Springfield}, publisher = {U.S. Department of Commerce National Information Service}, year = {1990}, + language = {english}, } @report{a3-2, @@ -513,6 +528,7 @@ vim:ts=4:sw=4 location = {Geneva}, publisher = {WHO}, year = {1970}, + language = {english}, } @thesis{a4-1, @@ -522,7 +538,7 @@ vim:ts=4:sw=4 location = {北京}, publisher = {北京大学数学学院}, year = {1998}, - userf = {zh}, + language = {chinese}, } @thesis{a4-2, @@ -532,6 +548,7 @@ vim:ts=4:sw=4 location = {Berkeley}, publisher = {Univ. of California}, year = {1965}, + language = {english}, } @patent{a5-1, @@ -541,7 +558,7 @@ vim:ts=4:sw=4 location = {中国}, number = {92214985.2}, date = {1993-04-14}, - userf = {zh}, + language = {chinese}, } @patent{a5-2, @@ -553,7 +570,7 @@ vim:ts=4:sw=4 date = {2001-10-24}, urldate = {2002-05-28}, url = {http://211.152.9.47/sipoasp/zlijs/hyjs-yx-new.asp?recid=01129210.5&leixin}, - userf = {zh}, + language = {chinese}, } @patent{a5-3, @@ -565,6 +582,7 @@ vim:ts=4:sw=4 date = {2002-05-25}, url = {http://FF&p=1&u=netahtml/PTO/search-bool.html&r=5&f=G&l=5&col=AND&d=PG01&sl=IBM.AS.&0S=AN/IBM&RS=AN/}, urldate = {2002-02-28}, + language = {english}, } @incollection{a6-1, @@ -577,7 +595,7 @@ vim:ts=4:sw=4 publisher = {中国标准出版社}, year = {1988}, pages = {59-92}, - userf = {zh}, + language = {chinese}, } @incollection{a6-2, @@ -590,7 +608,7 @@ vim:ts=4:sw=4 publisher = {人民教育出版社}, year = {1985}, pages = {90-99}, - userf = {zh}, + language = {chinese}, } @incollection{a6-3, @@ -603,6 +621,7 @@ vim:ts=4:sw=4 publisher = {Mineralogical Society of America}, year = {c1980}, pages = {117-211}, + language = {english}, } @inproceedings{a6-4, @@ -615,6 +634,7 @@ vim:ts=4:sw=4 publisher = {ASME}, year = {c1971}, pages = {17-38}, + language = {english}, } @incollection{a6-5, @@ -627,6 +647,7 @@ vim:ts=4:sw=4 publisher = {The Haworth Press}, year = {1966}, pages = {85-96}, + language = {english}, } @article{a7-1, @@ -637,7 +658,7 @@ vim:ts=4:sw=4 year = {2000}, number = {2}, pages = {5-8}, - userf = {zh}, + language = {chinese}, } @article{a7-2, @@ -649,7 +670,7 @@ vim:ts=4:sw=4 volume = {7}, number = {7}, pages = {527}, - userf = {zh}, + language = {chinese}, } @article{a7-3, @@ -660,7 +681,7 @@ vim:ts=4:sw=4 year = {1978}, volume = {3}, pages = {104-208}, - userf = {zh}, + language = {chinese}, } @article{a7-4, @@ -671,6 +692,7 @@ vim:ts=4:sw=4 year = {1992}, volume = {359}, pages = {605-609}, + language = {english}, } @article{a7-5, @@ -682,6 +704,7 @@ vim:ts=4:sw=4 volume = {28}, number = {3}, pages = {205-218}, + language = {english}, } @article{a8-1, @@ -690,7 +713,7 @@ vim:ts=4:sw=4 type = {N}, journal = {中国青年报}, date = {2000-11-20}, - userf = {zh}, + language = {chinese}, } @article{a8-2, @@ -699,7 +722,7 @@ vim:ts=4:sw=4 type = {N}, journal = {大众科技报}, date = {2000-11-12}, - userf = {zh}, + language = {chinese}, } @article{a9-1, @@ -713,7 +736,7 @@ vim:ts=4:sw=4 pages = {4}, url = {http://www.chinainfo.gov.cn/periodical/qbxb/qbxb99/qbxb990203}, urldate = {2000-01-18}, - userf = {zh}, + language = {chinese}, } @online{a9-2, @@ -723,7 +746,7 @@ vim:ts=4:sw=4 date = {2001-12-19}, url = {http://www.creader.com/news/20011219/200112190019.html}, urldate = {2002-04-15}, - userf = {zh}, + language = {chinese}, } @article{a9-3, @@ -736,6 +759,7 @@ vim:ts=4:sw=4 pages = {331-332}, url = {http://www.sciencemag.org/cgi/collection/anatmorp}, urldate = {1998-09-23}, + language = {english}, } @incollection{a9-4, @@ -745,6 +769,7 @@ vim:ts=4:sw=4 booktitle = {The International Congress on Hazardous Waste, Atlanta Marriott Marquis Hotel, Atlanta, Georgia, June 5--8, 1995: impact on human and ecological health}, url = {http://atsdrl.atsdr.cdc.gov:8080/cong95.html}, urldate = {1998-09-22}, + language = {english}, } @book{a9-5, @@ -756,6 +781,7 @@ vim:ts=4:sw=4 year = {1992}, url = {http://www.seg.org/reviews/mccorm30.html}, urldate = {1998-09-23}, + language = {english}, } @misc{a9-6, @@ -765,5 +791,6 @@ vim:ts=4:sw=4 location = {Sunnyvale, Calif.}, publisher = {Scitor Corporation}, year = {c1983}, + language = {english}, } diff --git a/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.pdf b/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.pdf index 7597726b4f3..47fa846e173 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 d393ec18a64..cd9383fbeca 100644 --- a/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.tex +++ b/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.tex @@ -15,13 +15,13 @@ \newcommand{\myemph}[1]{\emph{\textcolor{red}{#1}}} \begin{document} -\title{\textbf{biblatex 参考文献和引用样式:\texttt{caspervector} v0.1.9}} +\title{\textbf{biblatex 参考文献和引用样式:\texttt{caspervector} v0.2.0}} \author{% Casper Ti.\ Vector\thanks{\ % \href{mailto:CasperVector@gmail.com}{\texttt{CasperVector@gmail.com}}.% }% } -\date{2013/12/27} +\date{2014/05/24} \maketitle \section{引言} @@ -50,7 +50,7 @@ biblatex\supercite{biblatex}/biber\supercite{biber} \section{许可协议} -版权所有 \copyright\ 2012-2013 Casper Ti.\ Vector。% +版权所有 \copyright\ 2012--2014 Casper Ti.\ Vector。% \verb|caspervector| 参考文献和引用样式以 \LaTeX{} Project Public License\footnote{\ % \url{http://www.latex-project.org/lppl/}.% @@ -61,31 +61,17 @@ biblatex\supercite{biblatex}/biber\supercite{biber} \subsection{系统要求} \begin{itemize} - \item biblatex 宏包(\myemph{必需}):% + \item biblatex 宏包(2.0 或以上版本,\myemph{必需}):% \verb|caspervector| 样式基于 biblatex 宏包。 \item 中文环境(\myemph{必需}):% \verb|caspervector| 样式虽支持中文,但其本身不提供中文环境。 用户仍然需要中文环境才能排版出文档。 - \item biber 程序(\myemph{可选}): + \item biber 程序(和 biblatex 相应的版本,\myemph{可选}): 用 biber 可以方便地实现文献按字母和拼音顺序排序。 \end{itemize} 以上要求在\myemph{最新}的\myemph{完全版} -\TeX{}Live 系统和 \CTeX{} 套装中都有完善的支持。 - -\subsection{安装方式} - -使用 \TeX{}Live 的用户可以通过在终端中以管理员权限执行 -\begin{Verbatim}[frame = single] -tlmgr install biblatex-caspervector -\end{Verbatim} -来安装 \verb|caspervector| 样式。 - -使用 \CTeX{} 套装的用户可以通过在命令提示符中执行 -\begin{Verbatim}[frame = single] -mpm --install=biblatex-caspervector -\end{Verbatim} -来安装 \verb|caspervector| 样式。 +\TeX{} Live 系统中都有完善的支持。 \section{使用简介} \subsection{样式调用} @@ -93,10 +79,10 @@ mpm --install=biblatex-caspervector 用户应当通过以下命令调用 \verb|caspervector| 样式: \begin{Verbatim}[frame = single] % 如果系统上无法使用 biber,可将“biber”改为“bibtex”。 -% “gbk”可能需要改为“utf8”,根据用户使用的字符编码而定。 +% “utf8”可能需要改为“gbk”,根据用户使用的字符编码而定。 % “...” 代表其它选项。 \usepackage[ - backend = biber, style = caspervector, gbk, sorting = centy, ... + backend = biber, style = caspervector, utf8, sorting = centy, ... ]{biblatex} \end{Verbatim} 其中 \verb|sorting| 选项用于(全局)指定按哪些字段排序, @@ -105,7 +91,7 @@ mpm --install=biblatex-caspervector (\verb|caspervector| 默认设置为 \verb|none| 排序方案,即按引用顺序排序), 表示依次按文献语言 (\textbf{ce}nty 表示中文文献在前,\textbf{ec}nty 表示英文文献在前; -文献语言根据 \verb|userf| 字段进行区分,详见第 \ref{sec:fields} 部分)、 +文献语言根据 \verb|language| 字段进行区分,详见第 \ref{sec:fields} 部分)、 编著者姓名(\textbf{n}ame)、标题(\textbf{t}itle) 和出版年(\textbf{y}ear)排序。 @@ -231,15 +217,10 @@ pdflatex texfile \subsection{特殊字段} \begin{itemize} - \item \verb|userf|: - 值为 \verb|zh| 或 \verb|cn| 时,相应条目在文献列表中用中文排版; - 否则(为其他值或未定义时)用英文排版。\\ - \myemph{% - 注: - 不可用 \texttt{language} 字段区分中英文文献, - 因为 biblatex 使用 babel\supercite{babel} 宏包处理此字段, - 但后者目前不支持中文,所以可能出错。% - } + \item \verb|language|: + 值为 \verb|chinese| 时,相应条目在文献列表中用中文排版; + 否则(为其他值或未定义时)用英文排版。 + \item \verb|userf|:\verb|caspervector| 样式内部使用。 \item 其它通用特殊字段,见 biblatex 手册\supercite{biblatex}。 \end{itemize} @@ -323,13 +304,14 @@ pdflatex texfile 但用户仍可以设定它们的值。 这样虽不能自动根据这些字段排版, 但在仍可以根据它们 - (主要是 \texttt{author}、\texttt{title} 和 \texttt{year} 三个字段) + (主要是 \texttt{language}、\texttt{author}、\texttt{title} + 和 \texttt{year} 四个字段) 进行排序。 % } \section{对参考文献进行分类排序} -使用 biblatex 2.6 和 biber 1.6(或两者的更高版本)的用户可以通过 +使用 biber 的用户可以通过 对不同的 \verb|\printbibliography| 命令传递不同的 \verb|sorting| 选项来实现 对不同部分文献按不同方案排序。 例如,如需对被引用的文献按照引用顺序排序, @@ -376,18 +358,10 @@ year = {1845\textmd{\emph{(清同治四年)}}} \verb|caspervector| 样式不支持 \verb|edition| 字段, 用户可以在 \verb|title| 等字段中手动标注。 -\section{存在的问题} - -biber 1.6 之前的版本存在一个 bug\footnote{\ % - \url{https://github.com/plk/biblatex/issues/101}.% -}:在源代码中任意位置出现的 \verb|\nocite{*}| 都会覆盖整个引用顺序记录, -导致即使在 \verb|sorting = none| 的设定下, -排版出来的文献列表依然不是按照引用顺序排序的情况。 -因此,如果需要使用相关功能,\myemph{强烈建议将 biblatex 和 biber 升级到最新版本}。 +直接使用 \verb|userf| 字段是否等于 \verb|zh| 或 \verb|cn| +来区分中英文文献的功能在近期仍将被支持,但在将来可能被去掉或修改。 -如上文所述,因为 babel 宏包目前不支持中文, -故对中英文的分别处理只能通过比较麻烦的方式实现, -指定语言也只能通过一个自定义的字段(\verb|userf|)进行。 +\section{存在的问题} 因为 biblatex 现有功能的限制,一些需求无法直接实现。 例如类似于文献 \parencite{3-2} 中同时有出版起止年和起止期号的情况就无法自动排版, @@ -402,7 +376,7 @@ biber 1.6 之前的版本存在一个 bug\footnote{\ % year = {\textmd{\textbf{1957}(1) -- \textbf{1990}(4)}}, location = {北京}, publisher = {北京图书馆}, - userf = {zh}, + language = {chinese}, } \end{Verbatim} 或 @@ -414,7 +388,8 @@ biber 1.6 之前的版本存在一个 bug\footnote{\ % addendum = {中国图书馆学会。 \textit{图书馆学通讯} [J]。 \textbf{1957}(1) -- \textbf{1990}(4)。 - 北京:北京图书馆。} + 北京:北京图书馆。}, + language = {chinese}, } \end{Verbatim} 这两种方法中更加推荐使用前者,因为前者只需手动实现出版年和期号的排版。 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 9e7e6afcff0..66d62b1b975 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 @@ -22,47 +22,47 @@ % biblatex-caspervector-utf8.def \ProvidesFile{biblatex-caspervector-gbk.def}% - [2013/12/27 v0.1.9 Chinese punctuations and captions in GBK] + [2014/05/24 v0.2.0 Chinese punctuations and captions in GBK] -\providecommand\cnldquot{} -\providecommand\cnrdquot{} -\providecommand\cncomma{} -\providecommand\cnscolon{} -\providecommand\cncolon{} -\providecommand\cnperiod{} +\newcommand*\bbx@cnldquot{} +\newcommand*\bbx@cnrdquot{} +\newcommand*\bbx@cncomma{} +\newcommand*\bbx@cnscolon{} +\newcommand*\bbx@cncolon{} +\newcommand*\bbx@cnperiod{} \DefineBibliographyStrings{english}{ - andmore = {\cegen{}{\mkbibemph{et\addabbrvspace al\adddot}}}, - andothers = {\cegen{}{\mkbibemph{et\addabbrvspace al\adddot}}}, + andmore = {\bbx@cegen{}{\mkbibemph{et\addabbrvspace al\adddot}}}, + andothers = {\bbx@cegen{}{\mkbibemph{et\addabbrvspace al\adddot}}}, bibliography = {ο}, references = {ο} } -\newbibmacro{cein:}{\printtext{\cegen{}{In}\cecolon}} -\newbibmacro{cebyauthor}{% +\newbibmacro*{cein:}{\printtext{\bbx@cegen{}{In}\bbx@cecolon}} +\newbibmacro*{cebyauthor}{% \ifnameundef{author}{}{% - \cegen% + \bbx@cegen% {\printnames{author}\printtext{}}% {\usebibmacro{byauthor}}% }% } -\newbibmacro{cebyeditor}{% +\newbibmacro*{cebyeditor}{% \ifnameundef{editor}{}{% - \cegen% + \bbx@cegen% {\printnames{editor}\printtext{}}% {\usebibmacro{byeditor}}% }% } -\newbibmacro{cebytranslator}{% +\newbibmacro*{cebytranslator}{% \ifnameundef{translator}{}{% - \cegen% + \bbx@cegen% {\printnames{translator}\printtext{}}% {\usebibmacro{bytranslator}}% }% } -\newbibmacro{urldate}{% +\newbibmacro*{urldate}{% \iffieldundef{urlyear}{}{% - \printtext{\cegen{ }{retrieved on\addspace}}% + \printtext{\bbx@cegen{ }{retrieved on\addspace}}% \printurldate% }% } 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 0d94918571a..29359150385 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 @@ -22,47 +22,47 @@ % biblatex-caspervector-utf8.def \ProvidesFile{biblatex-caspervector-utf8.def}% - [2013/12/27 v0.1.9 Chinese punctuations and captions in UTF-8] + [2014/05/24 v0.2.0 Chinese punctuations and captions in UTF-8] -\providecommand\cnldquot{“} -\providecommand\cnrdquot{”} -\providecommand\cncomma{,} -\providecommand\cnscolon{;} -\providecommand\cncolon{:} -\providecommand\cnperiod{。} +\newcommand*\bbx@cnldquot{“} +\newcommand*\bbx@cnrdquot{”} +\newcommand*\bbx@cncomma{,} +\newcommand*\bbx@cnscolon{;} +\newcommand*\bbx@cncolon{:} +\newcommand*\bbx@cnperiod{。} \DefineBibliographyStrings{english}{ - andmore = {\cegen{等}{\mkbibemph{et\addabbrvspace al\adddot}}}, - andothers = {\cegen{等}{\mkbibemph{et\addabbrvspace al\adddot}}}, + andmore = {\bbx@cegen{等}{\mkbibemph{et\addabbrvspace al\adddot}}}, + andothers = {\bbx@cegen{等}{\mkbibemph{et\addabbrvspace al\adddot}}}, bibliography = {参考文献}, references = {参考文献} } -\newbibmacro{cein:}{\printtext{\cegen{出自}{In}\cecolon}} -\newbibmacro{cebyauthor}{% +\newbibmacro*{cein:}{\printtext{\bbx@cegen{出自}{In}\bbx@cecolon}} +\newbibmacro*{cebyauthor}{% \ifnameundef{author}{}{% - \cegen% + \bbx@cegen% {\printnames{author}\printtext{著}}% {\usebibmacro{byauthor}}% }% } -\newbibmacro{cebyeditor}{% +\newbibmacro*{cebyeditor}{% \ifnameundef{editor}{}{% - \cegen% + \bbx@cegen% {\printnames{editor}\printtext{编}}% {\usebibmacro{byeditor}}% }% } -\newbibmacro{cebytranslator}{% +\newbibmacro*{cebytranslator}{% \ifnameundef{translator}{}{% - \cegen% + \bbx@cegen% {\printnames{translator}\printtext{译}}% {\usebibmacro{bytranslator}}% }% } -\newbibmacro{urldate}{% +\newbibmacro*{urldate}{% \iffieldundef{urlyear}{}{% - \printtext{\cegen{检索于 }{retrieved on\addspace}}% + \printtext{\bbx@cegen{检索于 }{retrieved on\addspace}}% \printurldate% }% } diff --git a/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.bbx b/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.bbx index ec0b2946a2f..d14ba09bff5 100644 --- a/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.bbx @@ -22,7 +22,7 @@ % biblatex-caspervector-utf8.def \ProvidesFile{caspervector.bbx}% - [2013/12/27 v0.1.9 Casper Ti. Vector's biblatex bibliography style] + [2014/05/24 v0.2.0 Casper Ti. Vector's biblatex bibliography style] \RequireBibliographyStyle{numeric} @@ -42,24 +42,22 @@ }% } -\providecommand{\cegen}[2]{% - \ifthenelse% - {\iffieldequalstr{userf}{zh} \or \iffieldequalstr{userf}{cn}}% - {#1}{#2}% -} -\providecommand{\mybibquote}[1]{\cegen{\cnldquot{#1}\cnrdquot}{\mkbibquote{#1}}} -\providecommand{\cecomma}{\cegen{\cncomma}{\addcomma\addspace}} -\providecommand{\cecolon}{\cegen{\cncolon}{\addcolon\addspace}} -\providecommand{\cescolon}{\cegen{\cnscolon}{\addcolon\addspace}} -\providecommand{\ceperiod}{\cegen{\cnperiod}{\addperiod\addspace}} -\providecommand{\cespace}{\cegen{}{\addspace}} -\renewcommand{\finentrypunct}{\cegen{\cnperiod}{.}} -\renewcommand{\multinamedelim}{\cecomma} -\renewcommand{\finalnamedelim}{\cegen{\cncomma}{\addspace\bibstring{and}\space}} -\renewcommand{\andothersdelim}{\cespace} -\renewcommand{\postnotedelim}{\cecomma} -\renewcommand{\bibendnotewrapper}[1]{\bibsentence #1\cnperiod} -\renewcommand{\bibfootnotewrapper}[1]{\bibsentence #1\cnperiod} +\newcommand*{\bbx@cegen}[2]{\iffieldequalstr{userf}{zh}{#1}{#2}} +\newcommand*{\bbx@cecomma}{\bbx@cegen{\bbx@cncomma}{\addcomma\addspace}} +\newcommand*{\bbx@cecolon}{\bbx@cegen{\bbx@cncolon}{\addcolon\addspace}} +\newcommand*{\bbx@cescolon}{\bbx@cegen{\bbx@cnscolon}{\addcolon\addspace}} +\newcommand*{\bbx@ceperiod}{\bbx@cegen{\bbx@cnperiod}{\addperiod\addspace}} +\newcommand*{\bbx@cespace}{\bbx@cegen{}{\addspace}} +\newcommand*{\bbx@mybibquote}[1]% + {\bbx@cegen{\bbx@cnldquot{#1}\bbx@cnrdquot}{\mkbibquote{#1}}} +\renewcommand*{\finalnamedelim}% + {\bbx@cegen{\bbx@cncomma}{\addspace\bibstring{and}\space}} +\renewcommand*{\multinamedelim}{\bbx@cecomma} +\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} \DeclareFieldFormat*{booktitle}{\mkbibemph{#1}} \DeclareFieldFormat*{journaltitle}{\mkbibemph{#1}} @@ -71,13 +69,13 @@ \DeclareFieldFormat*{urldate}{#1} \DeclareFieldFormat[inbook, inproceedings, incollection, article]% - {title}{\mybibquote{\mkbibemph{#1}}} -\DeclareFieldFormat*{type}{\mkbibbrackets{\textsc{#1}}} + {title}{\bbx@mybibquote{\mkbibemph{#1}}} +\DeclareFieldFormat*{type}{\mkbibbrackets{#1}} \DeclareFieldFormat*{number}{\mkbibparens{#1}} \DeclareFieldFormat[patent]{number}{#1} -\renewbibmacro{title}{\iffieldundef{title}{}{\printfield{title}}} -\newbibmacro{type}{\iffieldundef{type}{}{\printfield{type}}} -\newbibmacro{number}{\iffieldundef{number}{}{\printfield{number}}} +\renewbibmacro*{title}{\iffieldundef{title}{}{\printfield{title}}} +\newbibmacro*{type}{\iffieldundef{type}{}{\printfield{type}}} +\newbibmacro*{number}{\iffieldundef{number}{}{\printfield{number}}} \DeclareNameFormat{default}{% \usebibmacro{name:first-last}{#1}{#4}{#5}{#7}% @@ -85,7 +83,7 @@ } \DeclareNameAlias{sortname}{default} -\newbibmacro{author+others}{% +\newbibmacro*{author+others}{% \ifthenelse% {\ifnameundef{author} \and \ifnameundef{editor} \and \ifnameundef{translator}}% {}% @@ -93,23 +91,23 @@ \ifthenelse{\ifnameundef{editor} \and \ifnameundef{translator}}% {\printnames{author}}% {% - \usebibmacro{cebyauthor}\setunit*{\cescolon}% - \usebibmacro{cebyeditor}\setunit*{\cescolon}% + \usebibmacro{cebyauthor}\setunit*{\bbx@cescolon}% + \usebibmacro{cebyeditor}\setunit*{\bbx@cescolon}% \usebibmacro{cebytranslator}% }% }% } -\newbibmacro{journaltitle/title}{% +\newbibmacro*{journaltitle/title}{% \iffieldundef{journaltitle}{\usebibmacro{title}}{\printfield{journaltitle}}% } -\newbibmacro{year/date}{% +\newbibmacro*{year/date}{% \ifthenelse{\iffieldundef{month} \and \iffieldundef{day}}% {\printfield{year}}{\printdate}% } -\newbibmacro{(year+volume+number)/date}{% +\newbibmacro*{(year+volume+number)/date}{% \ifthenelse{\iffieldundef{month} \and \iffieldundef{day}}% {% - \printfield{year}\setunit*{\cecomma}% + \printfield{year}\setunit*{\bbx@cecomma}% \printfield{volume}% \usebibmacro{number}% }{\printdate}% @@ -118,17 +116,17 @@ \DeclareBibliographyDriver{book}{% \usebibmacro{bibindex}% \newblock - \usebibmacro{author+others}\setunit{\ceperiod}% + \usebibmacro{author+others}\setunit{\bbx@ceperiod}% \newblock \usebibmacro{title}\setunit*{\addspace}% - \usebibmacro{type}\setunit{\ceperiod}% + \usebibmacro{type}\setunit{\bbx@ceperiod}% \newblock - \printlist{location}\setunit*{\cecolon}% - \printlist{publisher}\setunit{\cecomma}% - \usebibmacro{year/date}\setunit*{\cecolon}% - \printfield{pages}\setunit{\ceperiod}% + \printlist{location}\setunit*{\bbx@cecolon}% + \printlist{publisher}\setunit{\bbx@cecomma}% + \usebibmacro{year/date}\setunit*{\bbx@cecolon}% + \printfield{pages}\setunit{\bbx@ceperiod}% \newblock - \printfield{url}\setunit*{\cecomma}% + \printfield{url}\setunit*{\bbx@cecomma}% \usebibmacro{urldate}\usebibmacro{finentry}% \newblock \printfield{addendum}% @@ -137,23 +135,23 @@ \DeclareBibliographyDriver{incollection}{% \usebibmacro{bibindex}% \newblock - \usebibmacro{author+others}\setunit{\ceperiod}% + \usebibmacro{author+others}\setunit{\bbx@ceperiod}% \newblock - \usebibmacro{title}\setunit*{\cespace}% - \usebibmacro{type}\setunit{\ceperiod}% + \usebibmacro{title}\setunit*{\bbx@cespace}% + \usebibmacro{type}\setunit{\bbx@ceperiod}% \newblock \usebibmacro{cein:}% \newblock - \printnames{bookauthor}\setunit{\ceperiod}% + \printnames{bookauthor}\setunit{\bbx@ceperiod}% \newblock - \printfield{booktitle}\setunit{\ceperiod}% + \printfield{booktitle}\setunit{\bbx@ceperiod}% \newblock - \printlist{location}\setunit*{\cecolon}% - \printlist{publisher}\setunit{\cecomma}% - \usebibmacro{year/date}\setunit*{\cecolon}% - \printfield{pages}\setunit{\ceperiod}% + \printlist{location}\setunit*{\bbx@cecolon}% + \printlist{publisher}\setunit{\bbx@cecomma}% + \usebibmacro{year/date}\setunit*{\bbx@cecolon}% + \printfield{pages}\setunit{\bbx@ceperiod}% \newblock - \printfield{url}\setunit*{\cecomma}% + \printfield{url}\setunit*{\bbx@cecomma}% \usebibmacro{urldate}\usebibmacro{finentry}% \newblock \printfield{addendum}% @@ -162,17 +160,17 @@ \DeclareBibliographyDriver{periodical}{% \usebibmacro{bibindex}% \newblock - \usebibmacro{author+others}\setunit{\ceperiod}% + \usebibmacro{author+others}\setunit{\bbx@ceperiod}% \newblock \usebibmacro{journaltitle/title}\setunit*{\addspace}% - \usebibmacro{type}\setunit{\ceperiod}% + \usebibmacro{type}\setunit{\bbx@ceperiod}% \newblock - \usebibmacro{(year+volume+number)/date}\setunit{\ceperiod}% + \usebibmacro{(year+volume+number)/date}\setunit{\bbx@ceperiod}% \newblock - \printlist{location}\setunit*{\cecolon}% - \printlist{publisher}\setunit{\ceperiod}% + \printlist{location}\setunit*{\bbx@cecolon}% + \printlist{publisher}\setunit{\bbx@ceperiod}% \newblock - \printfield{url}\setunit*{\cecomma}% + \printfield{url}\setunit*{\bbx@cecomma}% \usebibmacro{urldate}\usebibmacro{finentry}% \newblock \printfield{addendum}% @@ -181,16 +179,16 @@ \DeclareBibliographyDriver{article}{% \usebibmacro{bibindex}% \newblock - \printnames{author}\setunit{\ceperiod}% + \printnames{author}\setunit{\bbx@ceperiod}% \newblock - \usebibmacro{title}\setunit*{\cespace}% - \usebibmacro{type}\setunit{\ceperiod}% + \usebibmacro{title}\setunit*{\bbx@cespace}% + \usebibmacro{type}\setunit{\bbx@ceperiod}% \newblock - \printfield{journaltitle}\setunit*{\cecomma}% - \usebibmacro{(year+volume+number)/date}\setunit{\cecolon}% - \printfield{pages}\setunit{\ceperiod}% + \printfield{journaltitle}\setunit*{\bbx@cecomma}% + \usebibmacro{(year+volume+number)/date}\setunit{\bbx@cecolon}% + \printfield{pages}\setunit{\bbx@ceperiod}% \newblock - \printfield{url}\setunit*{\cecomma}% + \printfield{url}\setunit*{\bbx@cecomma}% \usebibmacro{urldate}\usebibmacro{finentry}% \newblock \printfield{addendum}% @@ -199,17 +197,17 @@ \DeclareBibliographyDriver{patent}{% \usebibmacro{bibindex}% \newblock - \usebibmacro{author}\setunit{\ceperiod}% + \usebibmacro{author}\setunit{\bbx@ceperiod}% \newblock \usebibmacro{title}\setunit*{\addspace}% - \usebibmacro{type}\setunit{\ceperiod}% + \usebibmacro{type}\setunit{\bbx@ceperiod}% \newblock - \printlist{location}\setunit*{\cecolon}% - \usebibmacro{number}\setunit{\ceperiod}% + \printlist{location}\setunit*{\bbx@cecolon}% + \usebibmacro{number}\setunit{\bbx@ceperiod}% \newblock - \usebibmacro{year/date}\setunit{\ceperiod}% + \usebibmacro{year/date}\setunit{\bbx@ceperiod}% \newblock - \printfield{url}\setunit*{\cecomma}% + \printfield{url}\setunit*{\bbx@cecomma}% \usebibmacro{urldate}\usebibmacro{finentry}% \newblock \printfield{addendum}% @@ -239,13 +237,12 @@ \sort[final]{\field{sortkey}} \sort{ \field{userf} - \literal{en} } \sort{ - \name{sortname} - \name{author} - \name{editor} - \name{translator} + \field{sortname} + \field{author} + \field{editor} + \field{translator} \field{sorttitle} \field{title} } @@ -264,13 +261,12 @@ \sort[final]{\field{sortkey}} \sort[direction = descending]{ \field{userf} - \literal{en} } \sort{ - \name{sortname} - \name{author} - \name{editor} - \name{translator} + \field{sortname} + \field{author} + \field{editor} + \field{translator} \field{sorttitle} \field{title} } @@ -284,3 +280,20 @@ } } +\DeclareStyleSourcemap{ + \maps{ + \map[overwrite]{ + \step[ + fieldsource = language, match = \regexp{chinese}, + fieldset = userf, fieldvalue = {zh} + ] + } + \map[overwrite]{ + \step[fieldsource = userf, match = \regexp{^cn$}, replace = \regexp{zh}] + } + \map{ + \step[fieldset = userf, fieldvalue = {en}] + } + } +} + diff --git a/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.cbx b/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.cbx index 41d594871a6..f1e37011549 100644 --- a/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.cbx @@ -22,7 +22,7 @@ % biblatex-caspervector-utf8.def \ProvidesFile{caspervector.cbx}% - [2013/12/27 v0.1.9 Casper Ti. Vector's biblatex citation style] + [2014/05/24 v0.2.0 Casper Ti. Vector's biblatex citation style] \RequireCitationStyle{numeric-comp} \ExecuteBibliographyOptions{ @@ -30,7 +30,7 @@ autopunct = false } -\providecommand{\mksuperbrackets}[1]{\mkbibsuperscript{\mkbibbrackets{#1}}} +\newcommand*{\cbx@mksuperbrackets}[1]{\mkbibsuperscript{\mkbibbrackets{#1}}} \DeclareCiteCommand{\cite} {% @@ -47,7 +47,7 @@ \usebibmacro{postnote}% } -\DeclareCiteCommand{\supercite}[\mksuperbrackets] +\DeclareCiteCommand{\supercite}[\cbx@mksuperbrackets] {% \usebibmacro{cite:init}% \let\multicitedelim=\supercitedelim -- cgit v1.2.3