summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-caspervector
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-06-25 15:21:32 +0000
committerKarl Berry <karl@freefriends.org>2014-06-25 15:21:32 +0000
commit889e817205bf90bb7e360255960acd44c780afad (patch)
treefd61fa9b26881f74bad698637ca696a919f2edca /Master/texmf-dist/tex/latex/biblatex-caspervector
parent0347d335d6025289c0c74ad0f11046c87ceb6410 (diff)
biblatex-caspervector (24may14)
git-svn-id: svn://tug.org/texlive/trunk@34410 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-caspervector')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-caspervector/biblatex-caspervector-gbk.def36
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-caspervector/biblatex-caspervector-utf8.def36
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.bbx167
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-caspervector/caspervector.cbx6
4 files changed, 129 insertions, 116 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 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