From 81ccdf4899b67502d2a5ad912bd16bb44bff6caf Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 18 Jun 2015 23:15:51 +0000 Subject: biblatex-caspervector (18jun15) git-svn-id: svn://tug.org/texlive/trunk@37600 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/biblatex-caspervector/ChangeLog.txt | 14 ++++++ .../doc/latex/biblatex-caspervector/Makefile | 5 +- .../doc/latex/biblatex-caspervector/readme.bib | 5 +- .../doc/latex/biblatex-caspervector/readme.pdf | Bin 252279 -> 347325 bytes .../doc/latex/biblatex-caspervector/readme.tex | 54 +++++++++++++-------- .../biblatex-caspervector-gbk.def | 2 +- .../biblatex-caspervector-utf8.def | 2 +- .../latex/biblatex-caspervector/caspervector.bbx | 5 +- .../latex/biblatex-caspervector/caspervector.cbx | 2 +- 9 files changed, 59 insertions(+), 30 deletions(-) diff --git a/Master/texmf-dist/doc/latex/biblatex-caspervector/ChangeLog.txt b/Master/texmf-dist/doc/latex/biblatex-caspervector/ChangeLog.txt index 342433af7ac..95d07910d33 100644 --- a/Master/texmf-dist/doc/latex/biblatex-caspervector/ChangeLog.txt +++ b/Master/texmf-dist/doc/latex/biblatex-caspervector/ChangeLog.txt @@ -1,3 +1,17 @@ +2015-05-30, v0.2.2 + + * Changes to package code: + - Remove bibtex support because of `\DeclareStyleSourcemap' usage. + + * Changes to documentation: + - readme.tex: mention the issue with sorting in biblatex 3.0. + - readme.tex: remove description of usage with bibtex. + - readme.{tex,bib}: refine the short example for custom formatting. + - Adapt to ctex 2.x, and use the latex/biber/xelatex/xelatex prodedure. + + * Misc: + - Cosmetics. + 2015-04-28, v0.2.1 * Changes to package code: diff --git a/Master/texmf-dist/doc/latex/biblatex-caspervector/Makefile b/Master/texmf-dist/doc/latex/biblatex-caspervector/Makefile index 6ee0b076d7c..30dd7cc2b13 100644 --- a/Master/texmf-dist/doc/latex/biblatex-caspervector/Makefile +++ b/Master/texmf-dist/doc/latex/biblatex-caspervector/Makefile @@ -6,9 +6,8 @@ doc: latex readme biber -l zh__pinyin readme - latex readme - latex readme - dvipdfmx readme + xelatex readme + xelatex readme toutf8: sed -i '1,10 s/GBK/UTF8/; 1,10 s/gbk/utf8/' readme.tex diff --git a/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.bib b/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.bib index 9326e66e0e0..503359b257b 100644 --- a/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.bib +++ b/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.bib @@ -97,8 +97,9 @@ title = {宋论(刻本)}, type = {M}, location = {金陵}, - publisher = {曽氏}, - year = {1845\textmd{\emph{(清同治四年)}}}, + publisher = {曾氏}, + sortyear = {1845}, + year = {1845\textmd{(\emph{清同治四年})}}, language = {chinese}, } diff --git a/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.pdf b/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.pdf index 31c502edf08..a85e3556d5b 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 1795fea37d5..8dfad5d7cf9 100644 --- a/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.tex +++ b/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.tex @@ -2,7 +2,7 @@ % % Documentation for biblatex-caspervector % -% Copyright (c) 2012-2014 Casper Ti. Vector +% Copyright (c) 2012-2015 Casper Ti. Vector % % This work may be distributed and/or modified under the conditions of the % LaTeX Project Public License, either version 1.3 of this license or (at @@ -18,10 +18,11 @@ % This work consists of the following files: % readme.tex -\documentclass[UTF8, fancyhdr, hyperref]{ctexart} +\documentclass[UTF8]{ctexart} \usepackage[margin = 2cm, centering, includefoot]{geometry} \usepackage[backend = biber, style = caspervector, utf8]{biblatex} -\usepackage{CJKspace, enumitem, fancyvrb, hologo} +\usepackage{fancyhdr, hyperref, enumitem, fancyvrb, hologo} +\unless\ifxetex\usepackage{CJKspace}\fi \pagestyle{fancy}\fancyhf{}\cfoot{\thepage} \renewcommand{\headrulewidth}{0pt} @@ -32,16 +33,19 @@ \AtEveryCitekey{\addtocategory{cited}{\thefield{entrykey}}} \addbibresource{readme.bib} +\setlength{\hfuzz}{3pt} +\ctexset{linestretch = {\maxdimen}} +\renewcommand{\bibfont}{\small} \newcommand{\myemph}[1]{\emph{\textcolor{red}{#1}}} \begin{document} -\title{\textbf{biblatex 参考文献和引用样式:\texttt{caspervector} v0.2.1}} +\title{\textbf{biblatex 参考文献和引用样式:\texttt{caspervector} v0.2.2}} \author{% Casper Ti.\ Vector\thanks{\ % \href{mailto:CasperVector@gmail.com}{\texttt{CasperVector@gmail.com}}.% }% } -\date{2015/04/28} +\date{2015/06/18} \maketitle \section{引言} @@ -70,7 +74,7 @@ biblatex\supercite{biblatex}/biber\supercite{biber} \section{许可协议} -版权所有 \copyright\ 2012--2014 Casper Ti.\ Vector。% +版权所有 \copyright\ 2012--2015 Casper Ti.\ Vector。% \verb|caspervector| 参考文献和引用样式以 \hologo{LaTeX} Project Public License\footnote{\ % \url{http://www.latex-project.org/lppl/}.% @@ -98,7 +102,6 @@ biblatex\supercite{biblatex}/biber\supercite{biber} 用户应当通过以下命令调用 \verb|caspervector| 样式: \begin{Verbatim}[frame = single] -% 如果系统上无法使用 biber,可将“biber”改为“bibtex”。 % “utf8”可能需要改为“gbk”,根据用户使用的字符编码而定。 % “...” 代表其它选项。 \usepackage[ @@ -186,9 +189,6 @@ biblatex\supercite{biblatex}/biber\supercite{biber} \begin{Verbatim}[frame = single] # “texfile”是被 TeX 编译的文件名中除去“.tex”的部分。 # “pdflatex”可改为其它 TeX 程序,使用纯 latex 编译时可能还需要运行 dvipdfmx。 -# 如果系统上无法使用 biber,可将执行 biber 的一行改为 -# bibtex texfile -# 但将无法按拼音排序或进行分类排序。 pdflatex texfile biber -l zh__pinyin texfile pdflatex texfile @@ -223,7 +223,7 @@ pdflatex texfile \item \verb|title|:文献题名。 \item \verb|type|:文献类型和电子文献载体标志代码\supercite{gbt7714-2005}。 \item \verb|location|:出版地,或(在 \verb|@patent| 类条目中)专利申请地。 - \item \verb|publisher|:出版者。 + \item \verb|publisher|:出版者,或学位论文作者申请学位的单位。 \item \verb|journal|/\verb|journaltitle|:连续出版物题名,这两个字段是等价的。 \item \verb|year|/\verb|date|:出版年、日期,这两个字段只需填写一个即可。 \item \verb|volume|:期刊中文献所处的卷号。 @@ -329,7 +329,14 @@ pdflatex texfile 进行排序。 % } -\section{对参考文献进行分类排序} +\section{对参考文献进行分类排序}\label{sec:catsort} + +\myemph{% + 注:因为 biblatex 3.0 中功能的调整,此方法已经失效, + 而且目前没有已知较好的替代办法\footnote{\ % + 可以关注 \url{https://tex.stackexchange.com/questions/250548/}。% + }。% +} 使用 biber 的用户可以通过 对不同的 \verb|\printbibliography| 命令传递不同的 \verb|sorting| 选项来实现 @@ -369,11 +376,12 @@ pdflatex texfile 例如,省略 \verb|type| 字段便可使相应条目不排版文献类型和电子文献载体标志代码。 用户可以通过手动调用格式化命令来临时覆盖预设的格式设定, -例如文献 \parencite{1-7} 中的出版年便是通过设定 +例如文献 \parencite{1-7} 中的出版年便是通过以下设定得到的 +(\verb|sortyear| 字段的用法请参考 biblatex 手册\supercite{biblatex}): \begin{Verbatim}[frame = single] -year = {1845\textmd{\emph{(清同治四年)}}} +sortyear = {1845}, +year = {1845\textmd{(\emph{清同治四年})}}, \end{Verbatim} -得到的。 \verb|caspervector| 样式不支持 \verb|edition| 字段, 用户可以在 \verb|title| 等字段中手动标注。 @@ -383,9 +391,14 @@ year = {1845\textmd{\emph{(清同治四年)}}} \section{存在的问题} +如第 \ref{sec:catsort} 部分所述, +biblatex 3.0 的功能调整导致分类排序失效,且目前无解。 +\verb|caspervector| 样式的作者对此表示遗憾,希望用户能谅解。 + 因为 biblatex 现有功能的限制,一些需求无法直接实现。 例如类似于文献 \parencite{3-2} 中同时有出版起止年和起止期号的情况就无法自动排版, -只能通过用户手动实现。下面两种方式均可实现上述需求: +只能通过用户手动实现。 +下面两种方式均可实现上述需求 (\verb|sortyear| 字段的用法请参考 biblatex 手册\supercite{biblatex}): \begin{Verbatim}[frame = single] @periodical{3-2, @@ -414,12 +427,8 @@ year = {1845\textmd{\emph{(清同治四年)}}} \end{Verbatim} 这两种方法中更加推荐使用前者,因为前者只需手动实现出版年和期号的排版。 -\section{更新记录} -\VerbatimInput[tabsize = 4, baselinestretch = 1]{ChangeLog.txt} - \printbibliography% [category = cited, heading = bibnumbered, sorting = none, title = {本文参考文献}] -\nocite{*} \printbibliography[ notcategory = cited, heading = bibnumbered, sorting = ecnty, title = {% @@ -427,5 +436,10 @@ year = {1845\textmd{\emph{(清同治四年)}}} (引自\texorpdfstring{文献 \parencite{gbt7714-2005}}{ GB/T 7714-2005}) } ] + +\section{更新记录} +\VerbatimInput[tabsize = 4, fontsize = {\small}, baselinestretch = 1]{ChangeLog.txt} + +\nocite{*} \end{document} 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 5e3b0c73db1..157838291a2 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,7 +22,7 @@ % biblatex-caspervector-utf8.def \ProvidesFile{biblatex-caspervector-gbk.def}% - [2015/04/28 v0.2.1 Chinese punctuations and captions in GBK] + [2015/06/18 v0.2.2 Chinese punctuations and captions in GBK] \newcommand*\bbx@cnldquot{} \newcommand*\bbx@cnrdquot{} 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 7cf4f26986c..8ed0089469b 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,7 +22,7 @@ % biblatex-caspervector-utf8.def \ProvidesFile{biblatex-caspervector-utf8.def}% - [2015/04/28 v0.2.1 Chinese punctuations and captions in UTF-8] + [2015/06/18 v0.2.2 Chinese punctuations and captions in UTF-8] \newcommand*\bbx@cnldquot{“} \newcommand*\bbx@cnrdquot{”} diff --git a/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.bbx b/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.bbx index 5307b4236fa..995b8874161 100644 --- a/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.bbx @@ -2,7 +2,7 @@ % % Casper Ti. Vector's biblatex style % -% Copyright (c) 2012-2014 Casper Ti. Vector +% Copyright (c) 2012-2015 Casper Ti. Vector % % This work may be distributed and/or modified under the conditions of the % LaTeX Project Public License, either version 1.3 of this license or (at @@ -22,8 +22,9 @@ % biblatex-caspervector-utf8.def \ProvidesFile{caspervector.bbx}% - [2015/04/28 v0.2.1 Casper Ti. Vector's biblatex bibliography style] + [2015/06/18 v0.2.2 Casper Ti. Vector's biblatex bibliography style] +\RequireBiber[3] \RequireBibliographyStyle{numeric} \newtoggle{bbx:gbk} diff --git a/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.cbx b/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.cbx index 57b0622f3c6..6f87aa044e5 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}% - [2015/04/28 v0.2.1 Casper Ti. Vector's biblatex citation style] + [2015/06/18 v0.2.2 Casper Ti. Vector's biblatex citation style] \RequireCitationStyle{numeric-comp} \ExecuteBibliographyOptions{ -- cgit v1.2.3