summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-03-31 21:15:21 +0000
committerKarl Berry <karl@freefriends.org>2016-03-31 21:15:21 +0000
commit04599a378adc76d2b1e54df49c17ba45aee22672 (patch)
tree02fd9c3a41c8330aa2d65808218e56c7ec6e7480 /Master/texmf-dist/tex/latex
parent7e2ae4704f0e798e129edb4c3b5e4ababd2d5bb7 (diff)
biblatex-caspervector (31mar16)
git-svn-id: svn://tug.org/texlive/trunk@40195 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-caspervector/biblatex-caspervector-gbk.def46
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-caspervector/biblatex-caspervector-utf8.def46
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.bbx50
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.cbx2
4 files changed, 64 insertions, 80 deletions
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{