summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-03-01 22:30:07 +0000
committerKarl Berry <karl@freefriends.org>2017-03-01 22:30:07 +0000
commit800462d19ac70da2bba3efcc39db662187751891 (patch)
treec91b747b6c7a07300a60c1c6e1e0188754fffeec
parente3e9184431d3e062adb0f42af32b089090894211 (diff)
biblatex-caspervector (1mar17)
git-svn-id: svn://tug.org/texlive/trunk@43371 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-caspervector/ChangeLog.txt22
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-caspervector/readme.bib30
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-caspervector/readme.pdfbin339138 -> 340808 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-caspervector/readme.tex7
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-caspervector/biblatex-caspervector-gbk.def2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-caspervector/biblatex-caspervector-utf8.def2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.bbx92
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.cbx2
8 files changed, 89 insertions, 68 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-caspervector/ChangeLog.txt b/Master/texmf-dist/doc/latex/biblatex-caspervector/ChangeLog.txt
index 85b29adeb3c..ed57139ee8b 100644
--- a/Master/texmf-dist/doc/latex/biblatex-caspervector/ChangeLog.txt
+++ b/Master/texmf-dist/doc/latex/biblatex-caspervector/ChangeLog.txt
@@ -1,3 +1,21 @@
+2017-03-01. v0.2.7
+
+ * API changes:
+ - caspervector.bbx: provide undocumented option for uglification.
+
+ * Changes to package code:
+ - caspervector.bbx: fix "et al" and `\final*delim'.
+ - caspervector.bbx: make switch between C/E punctuations easier.
+ - caspervector.bbx: remove niche feature.
+
+ * Changes to documentation:
+ - readme.bib: double brace institution names.
+ - readme.tex: remove manual loading of CJKspace.
+
+ * Misc:
+ - utils/qa: add notice about copyright line updates.
+ - Minor fixes and cosmetics.
+
2016-05-24. v0.2.6
* Changes to package code:
@@ -73,7 +91,7 @@
2014-05-24, v0.2.0
- * Changes to API:
+ * API changes:
- Chinese references now (only) require language == {chinese}.
- `userf' becomes an internal entry field (backward compatible for now).
@@ -139,7 +157,7 @@
2012-05-13, v0.1.3
- * Changes to API:
+ * API changes:
- Chinese references now require (userf == 'zh' || userf == 'cn').
- Add {ce,ec}nty sorting scheme, default to ecnty.
diff --git a/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.bib b/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.bib
index 4c044ae97ca..3cfca57c425 100644
--- a/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.bib
@@ -118,7 +118,7 @@
title = {The cataloguer's way through AACR2: from document receipt to document retrieval},
type = {M},
location = {London},
- publisher = {The Library Association},
+ publisher = {{The Library Association}},
year = {1990},
language = {english},
}
@@ -128,7 +128,7 @@
title = {Probability, random variable, and random signal principles (4th ed.)},
type = {M},
location = {New York},
- publisher = {McGraw Hill},
+ publisher = {{McGraw Hill}},
year = {2001},
language = {english},
}
@@ -251,7 +251,7 @@
volume = {1},
number = {1},
location = {Washington, D. C.},
- publisher = {American Association for the Advancement of Science},
+ publisher = {{American Association for the Advancement of Science}},
language = {english},
}
@@ -447,17 +447,17 @@
title = {Futuer libraries: dreams, madness \& reality},
type = {M},
location = {Chicago},
- publisher = {American Library Association},
+ publisher = {{American Library Association}},
year = {1995},
language = {english},
}
@book{a1-7,
- author = {{International Federation of Library Association and institutions}},
+ author = {{International Federation of Library Association and Institutions}},
title = {Names of persons: national usages for entry in catalogues (3rd ed.)},
type = {M},
location = {London},
- publisher = {IFLA International Office for UBC},
+ publisher = {{IFLA International Office for UBC}},
year = {1977},
language = {english},
}
@@ -476,7 +476,7 @@
author = {Rood, H. J.},
title = {Logic and structured design for computer programmers (3rd ed.)},
type = {M},
- publisher = {Brooks/Cole-Thomson Learning},
+ publisher = {{Brooks/Cole-Thomson Learning}},
year = {2001},
language = {english},
}
@@ -495,7 +495,7 @@
title = {Proceedings of the Fifth Canadian Mathematical Congress, University of Montreal, 1961},
type = {C},
location = {Toronto},
- publisher = {University of Toronto Press},
+ publisher = {{University of Toronto Press}},
year = {1963},
language = {english},
}
@@ -515,7 +515,7 @@
title = {Guidelines for handling excavated acid-producing materials, PB 91-194001},
type = {R},
location = {Springfield},
- publisher = {U.S. Department of Commerce National Information Service},
+ publisher = {{U.S. Department of Commerce National Information Service}},
year = {1990},
language = {english},
}
@@ -545,7 +545,7 @@
title = {Infrared spectroscopic studies on solid oxygen},
type = {D},
location = {Berkeley},
- publisher = {Univ. of California},
+ publisher = {{Univ. of California}},
year = {1965},
language = {english},
}
@@ -617,7 +617,7 @@
bookauthor = {Prewitt, C. T.},
booktitle = {Pyroxense},
location = {Washington, D. C.},
- publisher = {Mineralogical Society of America},
+ publisher = {{Mineralogical Society of America}},
year = {c1980},
pages = {117-211},
language = {english},
@@ -627,7 +627,7 @@
author = {Fourney, M. E.},
title = {Advances in holographic photoelasticity},
type = {C},
- bookauthor = {American Society of Mechanical Engineers, Applied Mechanics Division},
+ bookauthor = {{American Society of Mechanical Engineers, Applied Mechanics Division}},
booktitle = {Symposium on Applications of Holography in Mechanics, August 23--25, 1971, University of Southern California, Los Angeles, California},
location = {New York},
publisher = {ASME},
@@ -643,7 +643,7 @@
bookauthor = {Pattle, L. W. and Cox, B. J.},
booktitle = {Electronic resources: selection and bibliographic control},
location = {New York},
- publisher = {The Haworth Press},
+ publisher = {{The Haworth Press}},
year = {1966},
pages = {85-96},
language = {english},
@@ -776,7 +776,7 @@
title = {Fractals and chaos in geology and geophysics},
type = {M/OL},
location = {New York},
- publisher = {Cambridge University Press},
+ publisher = {{Cambridge University Press}},
year = {1992},
url = {http://www.seg.org/reviews/mccorm30.html},
urldate = {1998-09-23},
@@ -788,7 +788,7 @@
title = {Project scheduler},
type = {CP/DK},
location = {Sunnyvale, Calif.},
- publisher = {Scitor Corporation},
+ 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 355369a7519..9091bac3d58 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 9fc6df70d49..a2f6b8f9c05 100644
--- a/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-caspervector/readme.tex
@@ -23,7 +23,6 @@
giveninits = true, sortgiveninits = true
]{biblatex}
\usepackage{fancyhdr, hyperref, enumitem, fancyvrb, hologo}
-\unless\ifxetex\usepackage{CJKspace}\fi
\pagestyle{fancy}\fancyhf{}\cfoot{\thepage}
\renewcommand{\headrulewidth}{0pt}
@@ -40,13 +39,13 @@
\newcommand{\myemph}[1]{\emph{\textcolor{red}{#1}}}
\begin{document}
-\title{\textbf{biblatex 参考文献和引用样式:\texttt{caspervector} v0.2.6}}
+\title{\textbf{biblatex 参考文献和引用样式:\texttt{caspervector} v0.2.7}}
\author{%
Casper Ti.\ Vector\thanks{\ %
\href{mailto:CasperVector@gmail.com}{\texttt{CasperVector@gmail.com}}.%
}%
}
-\date{2016/05/24}
+\date{2017/03/01}
\maketitle
\section{引言}
@@ -75,7 +74,7 @@ biblatex\supercite{biblatex}/biber\supercite{biber}
\section{许可协议}
-版权所有 \copyright\ 2012--2016 Casper Ti.\ Vector。%
+版权所有 \copyright\ 2012--2017 Casper Ti.\ Vector。%
\verb|caspervector| 参考文献和引用样式以
\hologo{LaTeX} Project Public License\footnote{\ %
\url{http://www.latex-project.org/lppl/}.%
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 875a7375f90..b2bf0cc5155 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/05/24 v0.2.6 Chinese punctuations and captions in GBK]
+ [2017/03/01 v0.2.7 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 edc84f14462..a30f255fc49 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/05/24 v0.2.6 Chinese punctuations and captions in UTF-8]
+ [2017/03/01 v0.2.7 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 b7eb83d1760..88c20f1ba5a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.bbx
@@ -1,6 +1,6 @@
% Casper Ti. Vector's biblatex style
%
-% Copyright (c) 2012-2016 Casper Ti. Vector
+% Copyright (c) 2012-2017 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,16 +20,18 @@
% biblatex-caspervector-utf8.def
\ProvidesFile{caspervector.bbx}%
- [2016/05/24 v0.2.6 Casper Ti. Vector's biblatex bibliography style]
+ [2017/03/01 v0.2.7 Casper Ti. Vector's biblatex bibliography style]
\RequireBiber[3]
\RequireBibliographyStyle{numeric}
\newtoggle{bbx:gbk}
+\newtoggle{bbx:ugly}
\DeclareBibliographyOption{utf8}[true]{\togglefalse{bbx:gbk}}
\DeclareBibliographyOption{gbk}[true]{\toggletrue{bbx:gbk}}
+\DeclareBibliographyOption{ugly}[true]{\settoggle{bbx:ugly}{#1}}
\ExecuteBibliographyOptions{
- alldates = iso8601, gbk, defernumbers = true,
+ gbk, ugly = false, alldates = iso8601, defernumbers = true,
sorting = none, minnames = 3, minitems = 3
}
\AtEndOfPackage{%
@@ -39,74 +41,76 @@
}{
\input{biblatex-caspervector-utf8.def}
\ExecuteBibliographyOptions{texencoding = UTF-8}
+ }
+ \iftoggle{bbx:ugly}{
+ \newcommand*{\bbx@cepunct}[2]{#2}
+ \DefineBibliographyStrings{english}{
+ andmore = {\bbx@cetext{\bbx@cnetal}{et\addabbrvspace al\adddot}},
+ andothers = {\bbx@cetext{\bbx@cnetal}{et\addabbrvspace al\adddot}},
+ }
+ \DeclareFieldFormat*{booktitle}{#1}
+ \DeclareFieldFormat*{journaltitle}{#1}
+ \DeclareFieldFormat*{title}{#1}
+ \DeclareFieldFormat*{year}{#1}
+ \DeclareFieldFormat*{volume}{#1}
+ }{
+ \newcommand*{\bbx@cepunct}[2]{\iffieldequalstr{userf}{zh}{#1}{#2}}
+ \DefineBibliographyStrings{english}{
+ andmore =
+ {\bbx@cetext{\bbx@cnetal}{\mkbibemph{et\addabbrvspace al\adddot}}},
+ andothers =
+ {\bbx@cetext{\bbx@cnetal}{\mkbibemph{et\addabbrvspace al\adddot}}},
+ }
+ \DeclareFieldFormat*{booktitle}{\mkbibemph{#1}}
+ \DeclareFieldFormat*{journaltitle}{\mkbibemph{#1}}
+ \DeclareFieldFormat*{title}{\mkbibemph{#1}}
+ \DeclareFieldFormat*{year}{\mkbibbold{#1}}
+ \DeclareFieldFormat*{volume}{\mkbibemph{#1}}
+ \DeclareFieldFormat[inbook, inproceedings, incollection, article]%
+ {title}{\bbx@mybibquote{\mkbibemph{#1}}}
}%
}
-\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}{\addsemicolon\addspace}}
-\newcommand*{\bbx@ceperiod}{\bbx@cegen{\bbx@cnperiod}{\addperiod\addspace}}
-\newcommand*{\bbx@cespace}{\bbx@cegen{}{\addspace}}
+\newcommand*{\bbx@cetext}[2]{\iffieldequalstr{userf}{zh}{#1}{#2}}
+\newcommand*{\bbx@cecomma}{\bbx@cepunct{\bbx@cncomma}{\addcomma\addspace}}
+\newcommand*{\bbx@cecolon}{\bbx@cepunct{\bbx@cncolon}{\addcolon\addspace}}
+\newcommand*{\bbx@cescolon}{\bbx@cepunct{\bbx@cnscolon}{\addsemicolon\addspace}}
+\newcommand*{\bbx@ceperiod}{\bbx@cepunct{\bbx@cnperiod}{\addperiod\addspace}}
+\newcommand*{\bbx@cespace}{\bbx@cepunct{}{\addspace}}
\newcommand*{\bbx@mybibquote}[1]%
- {\bbx@cegen{\bbx@cnldquot{#1}\bbx@cnrdquot}{\mkbibquote{#1}}}
+ {\bbx@cepunct{\bbx@cnldquot{#1}\bbx@cnrdquot}{\mkbibquote{#1}}}
\renewcommand*{\finallistdelim}%
- {\bbx@cegen{\bbx@cncomma}{\addspace\bibstring{and}\space}}
+ {\bbx@cetext{\bbx@cecomma}{\addspace\bibstring{and}\space}}
\renewcommand*{\finalnamedelim}%
- {\bbx@cegen{\bbx@cncomma}{\addspace\bibstring{and}\space}}
+ {\bbx@cetext{\bbx@cecomma}{\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}
+\renewcommand*{\finentrypunct}{\bbx@cepunct{\bbx@cnperiod}{.}}
\DefineBibliographyExtras{english}{%
- \renewcommand*{\finalandcomma}{\bbx@cegen{\addspace}{}}%
+ \renewcommand*{\finalandcomma}{}%
}
-% The alternative settings in comments can be used in case a really plain style
-% (without quotes, italic and bold) is demanded; be prepared that the style
-% might look really ugly.
\DefineBibliographyStrings{english}{
- andmore = {\bbx@cegen{\bbx@cnetal}{\mkbibemph{et\addabbrvspace al\adddot}}},
- andothers = {\bbx@cegen{\bbx@cnetal}{\mkbibemph{et\addabbrvspace al\adddot}}},
- %andmore = {\bbx@cegen{\bbx@cnetal}{et\addabbrvspace al\adddot}},
- %andothers = {\bbx@cegen{\bbx@cnetal}{et\addabbrvspace al\adddot}},
bibliography = {\bbx@cnbib}, references = {\bbx@cnbib}
}
-\DeclareFieldFormat*{booktitle}{\mkbibemph{#1}}
-\DeclareFieldFormat*{journaltitle}{\mkbibemph{#1}}
-\DeclareFieldFormat*{title}{\mkbibemph{#1}}
-\DeclareFieldFormat*{year}{\mkbibbold{#1}}
-\DeclareFieldFormat*{volume}{\mkbibemph{#1}}
-%\DeclareFieldFormat*{booktitle}{#1}
-%\DeclareFieldFormat*{journaltitle}{#1}
-%\DeclareFieldFormat*{title}{#1}
-%\DeclareFieldFormat*{year}{#1}
-%\DeclareFieldFormat*{volume}{#1}
\DeclareFieldFormat*{pages}{#1}
\DeclareFieldFormat*{url}{\url{#1}}
\DeclareFieldFormat*{urldate}{#1}
-\DeclareFieldFormat[inbook, inproceedings, incollection, article]%
- {title}{\bbx@mybibquote{\mkbibemph{#1}}}
-%\DeclareFieldFormat[inbook, inproceedings, incollection, article]%
-% {title}{#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}}}
-\newbibmacro*{cein:}{\printtext{\bbx@cegen{\bbx@cnin}{In}\bbx@cecolon}}
+\newbibmacro*{cein:}{\printtext{\bbx@cetext{\bbx@cnin}{In}\bbx@cecolon}}
\newcommand*{\bbx@byspace}[1]{%
\ifnumgreater{\value{#1}}{\value{maxnames}}{}{\addspace}%
}
\newbibmacro*{cebyauthor}{%
\ifnameundef{author}{}{%
- \bbx@cegen%
+ \bbx@cetext%
{\printnames{author}\printtext{\bbx@byspace{author}\bbx@cnauth}}%
% `\usebibmacro{byauthor}' does not print with `useauthor' enabled.
{\printnames[byauthor]{author}}%
@@ -114,14 +118,14 @@
}
\newbibmacro*{cebyeditor}{%
\ifnameundef{editor}{}{%
- \bbx@cegen%
+ \bbx@cetext%
{\printnames{editor}\printtext{\bbx@byspace{editor}\bbx@cnedit}}%
{\usebibmacro{byeditor}}%
}%
}
\newbibmacro*{cebytranslator}{%
\ifnameundef{translator}{}{%
- \bbx@cegen%
+ \bbx@cetext%
{\printnames{translator}\printtext{\bbx@byspace{translator}\bbx@cntrans}}%
{\usebibmacro{bytranslator}}%
}%
@@ -157,7 +161,7 @@
}
\renewbibmacro*{urldate}{%
\iffieldundef{urlyear}{}{%
- \printtext{\bbx@cegen{\bbx@cnretr}{retrieved on}\addspace}%
+ \printtext{\bbx@cetext{\bbx@cnretr}{retrieved on}\addspace}%
\printurldate%
}%
}
diff --git a/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.cbx b/Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.cbx
index 7e7cce9bd4f..f3911530253 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/05/24 v0.2.6 Casper Ti. Vector's biblatex citation style]
+ [2017/03/01 v0.2.7 Casper Ti. Vector's biblatex citation style]
\RequireCitationStyle{numeric-comp}
\ExecuteBibliographyOptions{