summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-03-17 21:33:44 +0000
committerKarl Berry <karl@freefriends.org>2016-03-17 21:33:44 +0000
commit3240c1674f9e97ae7bec00c12e9b47976a8feaac (patch)
tree9edbdca1246d083fabe3f8aff71a91bd75a5eca8 /Master
parent979b65caee2926035cd0461f0c314818f6accd0f (diff)
biblatex-caspervector (17mar16)
git-svn-id: svn://tug.org/texlive/trunk@40055 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-caspervector/ChangeLog.txt16
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-caspervector/Makefile3
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-caspervector/readme.bib3
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-caspervector/readme.pdfbin347325 -> 335350 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-caspervector/readme.tex77
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-caspervector/biblatex-caspervector-gbk.def8
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-caspervector/biblatex-caspervector-utf8.def8
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.bbx17
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.cbx5
9 files changed, 77 insertions, 60 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-caspervector/ChangeLog.txt b/Master/texmf-dist/doc/latex/biblatex-caspervector/ChangeLog.txt
index 95d07910d33..0f847137488 100644
--- a/Master/texmf-dist/doc/latex/biblatex-caspervector/ChangeLog.txt
+++ b/Master/texmf-dist/doc/latex/biblatex-caspervector/ChangeLog.txt
@@ -1,3 +1,19 @@
+2016-03-17. v0.2.3
+
+ * Changes to package code:
+ - Remove copy-pasted name formatting code in bbx.
+ - caspervector.bbx: fix some defects introduced from typos.
+ - biblatex-caspervector-*.def: rectify `byauthor' usage.
+
+ * Changes to documentation:
+ - readme.tex: update information about split sorting (thank @plk).
+ - readme.tex: require `colorlinks' explicitly wrt recent change in ctex.
+
+ * Misc:
+ - dist: reduce duplication in zipballs according to CTAN recommendation.
+ - README: homepage moved to GitLab.
+ - Minor fixes and cosmetics.
+
2015-05-30, v0.2.2
* 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 30dd7cc2b13..67e753881ab 100644
--- a/Master/texmf-dist/doc/latex/biblatex-caspervector/Makefile
+++ b/Master/texmf-dist/doc/latex/biblatex-caspervector/Makefile
@@ -1,5 +1,3 @@
-# vim:ts=4:sw=4
-#
# Copyright (c) 2011-2013 Casper Ti. Vector
# Public domain.
@@ -23,3 +21,4 @@ clean:
distclean: clean
rm -f readme.pdf
+# vim:ts=4:sw=4
diff --git a/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.bib b/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.bib
index 503359b257b..ac9e7d56ad8 100644
--- a/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.bib
@@ -1,5 +1,3 @@
-% 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 1.8)},
@@ -795,3 +793,4 @@
language = {english},
}
+% vim:ts=4:sw=4
diff --git a/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.pdf b/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.pdf
index a85e3556d5b..4297076bf40 100644
--- a/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.tex b/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.tex
index 8dfad5d7cf9..22c2b176dba 100644
--- a/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.tex
@@ -1,8 +1,6 @@
-% vim:ft=tex:ts=2:sw=2
-%
% Documentation for biblatex-caspervector
%
-% Copyright (c) 2012-2015 Casper Ti. Vector
+% Copyright (c) 2012-2016 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
@@ -20,14 +18,17 @@
\documentclass[UTF8]{ctexart}
\usepackage[margin = 2cm, centering, includefoot]{geometry}
-\usepackage[backend = biber, style = caspervector, utf8]{biblatex}
+\usepackage[
+ backend = biber, style = caspervector, utf8,
+ giveninits = true, sortgiveninits = true
+]{biblatex}
\usepackage{fancyhdr, hyperref, enumitem, fancyvrb, hologo}
\unless\ifxetex\usepackage{CJKspace}\fi
\pagestyle{fancy}\fancyhf{}\cfoot{\thepage}
\renewcommand{\headrulewidth}{0pt}
\setlist{nolistsep}
-\hypersetup{allcolors = blue}
+\hypersetup{colorlinks = true, allcolors = blue}
\DeclareBibliographyCategory{cited}
\AtEveryCitekey{\addtocategory{cited}{\thefield{entrykey}}}
@@ -39,13 +40,13 @@
\newcommand{\myemph}[1]{\emph{\textcolor{red}{#1}}}
\begin{document}
-\title{\textbf{biblatex 参考文献和引用样式:\texttt{caspervector} v0.2.2}}
+\title{\textbf{biblatex 参考文献和引用样式:\texttt{caspervector} v0.2.3}}
\author{%
Casper Ti.\ Vector\thanks{\ %
\href{mailto:CasperVector@gmail.com}{\texttt{CasperVector@gmail.com}}.%
}%
}
-\date{2015/06/18}
+\date{2016/03/17}
\maketitle
\section{引言}
@@ -85,13 +86,13 @@ biblatex\supercite{biblatex}/biber\supercite{biber}
\subsection{系统要求}
\begin{itemize}
- \item biblatex 宏包(2.0 或以上版本,\myemph{必需}):%
+ \item biblatex 宏包(2.0 或以上版本):%
\verb|caspervector| 样式基于 biblatex 宏包。
- \item 中文环境(\myemph{必需}):%
+ \item biber 程序(和 biblatex 相应的版本):
+ 用 biber 可以方便地实现文献按字母和拼音顺序排序。
+ \item 中文环境:%
\verb|caspervector| 样式虽支持中文,但其本身不提供中文环境。
用户仍然需要中文环境才能排版出文档。
- \item biber 程序(和 biblatex 相应的版本,\myemph{可选}):
- 用 biber 可以方便地实现文献按字母和拼音顺序排序。
\end{itemize}
以上要求在\myemph{最新}的\myemph{完全版}
@@ -331,14 +332,7 @@ pdflatex texfile
\section{对参考文献进行分类排序}\label{sec:catsort}
-\myemph{%
- 注:因为 biblatex 3.0 中功能的调整,此方法已经失效,
- 而且目前没有已知较好的替代办法\footnote{\ %
- 可以关注 \url{https://tex.stackexchange.com/questions/250548/}。%
- }。%
-}
-
-使用 biber 的用户可以通过
+使用 biblatex 3.4 或更新版本的用户可以通过
对不同的 \verb|\printbibliography| 命令传递不同的 \verb|sorting| 选项来实现
对不同部分文献按不同方案排序。
例如,如需对被引用的文献按照引用顺序排序,
@@ -353,16 +347,20 @@ pdflatex texfile
在正文中准备排版文献列表的位置使用如下代码:
\begin{Verbatim}[frame = single]
% 按引用顺序排版“cited”分类,即被引用的文献条目。
-\printbibliography[category = cited, ..., sorting = none, title = {References}]
+\begin{refcontext}[sorting = none]
+\printbibliography[category = cited, title = {References}]
+\end{refcontext}
% 按英文文献在前、中文文献在后排版“cited”分类之外,即未被引用的文献条目。
-\printbibliography[notcategory = cited, sorting = ecnty, title = {Works Not Cited}]
+\begin{refcontext}[sorting = ecnty]
+\printbibliography[notcategory = cited, title = {Works Not Cited}]
+\end{refcontext}
\end{Verbatim}
并在最后一个除 \verb|\nocite| 之外的 \verb|\cite| 类命令之后、%
\verb|\end{document}| 之前的任意合适位置\footnote{\ %
因为 biblatex 中的引用顺序记录是按每个条目被第一次引用的顺序计算的,
所以 \texttt{\string\nocite\{*\}} 时导入文献的顺序会覆盖掉后面
\texttt{\string\cite} 类命令的引用顺序。
-}(例如,在本说明文档中,就是在两个 \verb|\printbibliography| 命令之间)
+}(例如,在本说明文档中,就是在 \verb|\end{document}| 之前一行)
加入以下代码:
\begin{Verbatim}[frame = single]
% 将 .bib 文件中所有的参考文献都加到引用列表中,但不将它们加到“cited”分类中,
@@ -370,6 +368,19 @@ pdflatex texfile
\nocite{*}
\end{Verbatim}
+使用 biblatex 2.x 或更旧版本的用户需要
+将在正文中准备排版文献列表的位置使用的代码改为
+\begin{Verbatim}[frame = single]
+% 按引用顺序排版“cited”分类,即被引用的文献条目。
+\printbibliography[category = cited, ..., sorting = none, title = {References}]
+% 按英文文献在前、中文文献在后排版“cited”分类之外,即未被引用的文献条目。
+\printbibliography%
+ [notcategory = cited, ..., sorting = ecnty, title = {Works Not Cited}]
+\end{Verbatim}
+biblatex 3.0--3.3 中有一个 bug\footnote{%
+ 可以参考 \url{https://tex.stackexchange.com/questions/250548/}。%
+} 导致分类排序失效,此问题基本无解。
+
\section{FAQ 和其它使用提示}
用户可以通过省略可选字段的方式来避免排版相应的内容。
@@ -391,8 +402,7 @@ year = {1845\textmd{(\emph{清同治四年})}},
\section{存在的问题}
-如第 \ref{sec:catsort} 部分所述,
-biblatex 3.0 的功能调整导致分类排序失效,且目前无解。
+如第 \ref{sec:catsort} 部分所述,biblatex 3.0--3.3 的功能调整导致分类排序失效。
\verb|caspervector| 样式的作者对此表示遗憾,希望用户能谅解。
因为 biblatex 现有功能的限制,一些需求无法直接实现。
@@ -427,15 +437,15 @@ biblatex 3.0 的功能调整导致分类排序失效,且目前无解。
\end{Verbatim}
这两种方法中更加推荐使用前者,因为前者只需手动实现出版年和期号的排版。
-\printbibliography%
- [category = cited, heading = bibnumbered, sorting = none, title = {本文参考文献}]
-\printbibliography[
- notcategory = cited, heading = bibnumbered, sorting = ecnty,
- title = {%
- 其它参考文献示例
- (引自\texorpdfstring{文献 \parencite{gbt7714-2005}}{ GB/T 7714-2005})
- }
-]
+\begin{refcontext}[sorting = none]
+\printbibliography[category = cited, heading = bibnumbered, title = {本文参考文献}]
+\end{refcontext}
+\begin{refcontext}[sorting = ecnty]
+\printbibliography[notcategory = cited, heading = bibnumbered, title = {%
+ 其它参考文献示例
+ (引自\texorpdfstring{文献 \parencite{gbt7714-2005}}{ GB/T 7714-2005})%
+}]
+\end{refcontext}
\section{更新记录}
\VerbatimInput[tabsize = 4, fontsize = {\small}, baselinestretch = 1]{ChangeLog.txt}
@@ -443,3 +453,4 @@ biblatex 3.0 的功能调整导致分类排序失效,且目前无解。
\nocite{*}
\end{document}
+% vim:ft=tex:ts=2:sw=2
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 157838291a2..8ea57508b1e 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
@@ -1,5 +1,3 @@
-% vim:ft=tex:ts=2:sw=2
-%
% Casper Ti. Vector's biblatex style
%
% Copyright (c) 2012-2014 Casper Ti. Vector
@@ -22,7 +20,7 @@
% biblatex-caspervector-utf8.def
\ProvidesFile{biblatex-caspervector-gbk.def}%
- [2015/06/18 v0.2.2 Chinese punctuations and captions in GBK]
+ [2016/03/17 v0.2.3 Chinese punctuations and captions in GBK]
\newcommand*\bbx@cnldquot{}
\newcommand*\bbx@cnrdquot{}
@@ -43,7 +41,8 @@
\ifnameundef{author}{}{%
\bbx@cegen%
{\printnames{author}\printtext{}}%
- {\usebibmacro{byauthor}}%
+ % `\usebibmacro{byauthor}' does not print with `useauthor' enabled.
+ {\printnames[byauthor]{author}}%
}%
}
\newbibmacro*{cebyeditor}{%
@@ -67,3 +66,4 @@
}%
}
+% 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 8ed0089469b..15642cfeeba 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
@@ -1,5 +1,3 @@
-% vim:ft=tex:ts=2:sw=2
-%
% Casper Ti. Vector's biblatex style
%
% Copyright (c) 2012-2014 Casper Ti. Vector
@@ -22,7 +20,7 @@
% biblatex-caspervector-utf8.def
\ProvidesFile{biblatex-caspervector-utf8.def}%
- [2015/06/18 v0.2.2 Chinese punctuations and captions in UTF-8]
+ [2016/03/17 v0.2.3 Chinese punctuations and captions in UTF-8]
\newcommand*\bbx@cnldquot{“}
\newcommand*\bbx@cnrdquot{”}
@@ -43,7 +41,8 @@
\ifnameundef{author}{}{%
\bbx@cegen%
{\printnames{author}\printtext{著}}%
- {\usebibmacro{byauthor}}%
+ % `\usebibmacro{byauthor}' does not print with `useauthor' enabled.
+ {\printnames[byauthor]{author}}%
}%
}
\newbibmacro*{cebyeditor}{%
@@ -67,3 +66,4 @@
}%
}
+% 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 995b8874161..45a8270e5a1 100644
--- a/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.bbx
@@ -1,8 +1,6 @@
-% vim:ft=tex:ts=2:sw=2
-%
% Casper Ti. Vector's biblatex style
%
-% Copyright (c) 2012-2015 Casper Ti. Vector
+% Copyright (c) 2012-2016 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,7 +20,7 @@
% biblatex-caspervector-utf8.def
\ProvidesFile{caspervector.bbx}%
- [2015/06/18 v0.2.2 Casper Ti. Vector's biblatex bibliography style]
+ [2016/03/17 v0.2.3 Casper Ti. Vector's biblatex bibliography style]
\RequireBiber[3]
\RequireBibliographyStyle{numeric}
@@ -46,7 +44,7 @@
\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@cescolon}{\bbx@cegen{\bbx@cnscolon}{\addsemicolon\addspace}}
\newcommand*{\bbx@ceperiod}{\bbx@cegen{\bbx@cnperiod}{\addperiod\addspace}}
\newcommand*{\bbx@cespace}{\bbx@cegen{}{\addspace}}
\newcommand*{\bbx@mybibquote}[1]%
@@ -78,12 +76,6 @@
\newbibmacro*{type}{\iffieldundef{type}{}{\printfield{type}}}
\newbibmacro*{number}{\iffieldundef{number}{}{\printfield{number}}}
-\DeclareNameFormat{default}{%
- \usebibmacro{name:first-last}{#1}{#4}{#5}{#7}%
- \usebibmacro{name:andothers}%
-}
-\DeclareNameAlias{sortname}{default}
-
\newbibmacro*{author+others}{%
\ifthenelse%
{\ifnameundef{author} \and \ifnameundef{editor} \and \ifnameundef{translator}}%
@@ -143,7 +135,7 @@
\newblock
\usebibmacro{cein:}%
\newblock
- \printnames{bookauthor}\setunit{\bbx@ceperiod}%
+ \printnames{bookauthor}\setunit*{\bbx@ceperiod}%
\newblock
\printfield{booktitle}\setunit{\bbx@ceperiod}%
\newblock
@@ -298,3 +290,4 @@
}
}
+% vim:ft=tex:ts=2:sw=2
diff --git a/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.cbx b/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.cbx
index 6f87aa044e5..470935f4843 100644
--- a/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.cbx
@@ -1,5 +1,3 @@
-% vim:ft=tex:ts=2:sw=2
-%
% Casper Ti. Vector's biblatex style
%
% Copyright (c) 2012-2014 Casper Ti. Vector
@@ -22,7 +20,7 @@
% biblatex-caspervector-utf8.def
\ProvidesFile{caspervector.cbx}%
- [2015/06/18 v0.2.2 Casper Ti. Vector's biblatex citation style]
+ [2016/03/17 v0.2.3 Casper Ti. Vector's biblatex citation style]
\RequireCitationStyle{numeric-comp}
\ExecuteBibliographyOptions{
@@ -63,3 +61,4 @@
\usebibmacro{postnote}%
}
+% vim:ft=tex:ts=2:sw=2