summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-01-08 00:40:13 +0000
committerKarl Berry <karl@freefriends.org>2011-01-08 00:40:13 +0000
commit686b506d441e4258181e3c918e94f3bc767b9b34 (patch)
tree76447946afa14a129ad641b43ec73b7bcbbacc85 /Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
parent3fa71c8703f40728cf20c8d9f6ed721cbe9bfd44 (diff)
biblatex 1.1 (5jan11)
git-svn-id: svn://tug.org/texlive/trunk@20968 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx60
1 files changed, 31 insertions, 29 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
index 220875f605a..65f2920e45b 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
@@ -1,10 +1,9 @@
-% $Id: authoryear.bbx,v 1.0 2010/11/19 16:16:35 lehman stable $
+% $Id: authoryear.bbx,v 1.1 2011/01/05 21:45:11 lehman stable $
\ProvidesFile{authoryear.bbx}
-[\abx@bbxid $Id: authoryear.bbx,v 1.0 2010/11/19 16:16:35 lehman stable $]
+[\abx@bbxid $Id: authoryear.bbx,v 1.1 2011/01/05 21:45:11 lehman stable $]
\RequireBibliographyStyle{standard}
-\ExecuteBibliographyOptions{labelyear,sorting=nyt,pagetracker}
\DeclareBibliographyOption{dashed}[true]{%
\ifstrequal{#1}{true}
@@ -13,6 +12,12 @@
{\ExecuteBibliographyOptions{pagetracker=false}%
\renewbibmacro*{bbx:savehash}{}}}
+\DeclareBibliographyOption{mergedate}[true]{%
+ \setbool{bbx:mergedate}{#1}}
+\newbool{bbx:mergedate}
+
+\ExecuteBibliographyOptions{labelyear,sorting=nyt,pagetracker,mergedate}
+
\DeclareFieldFormat{shorthandwidth}{#1}
\setlength{\bibitemsep}{0pt}
@@ -143,7 +148,11 @@
\newbibmacro*{date+extrayear}{%
\iffieldundef{year}
{}
- {\printtext[parens]{\printdateextra}}}
+ {\printtext[parens]{%
+ \ifbool{bbx:mergedate}
+ {\printdateextra}
+ {\printfield{labelyear}%
+ \printfield{extrayear}}}}}
\newbibmacro*{labeltitle}{%
\iffieldundef{label}
@@ -153,33 +162,26 @@
{\printfield[title]{shorttitle}}}
{\printfield{label}}}
-\renewbibmacro*{publisher+location+date}{%
- \printlist{location}%
- \setunit*{\addcolon\space}%
- \printlist{publisher}%
- \newunit}
-
-\renewbibmacro*{institution+location+date}{%
- \printlist{location}%
- \setunit*{\addcolon\space}%
- \printlist{institution}%
- \newunit}
-
-\renewbibmacro*{organization+location+date}{%
- \printlist{location}%
- \setunit*{\addcolon\space}%
- \printlist{organization}%
- \newunit}
-
-\renewbibmacro*{location+date}{%
- \printlist{location}}
-
\renewbibmacro*{issue+date}{%
- \iffieldundef{issue}
- {}
- {\printtext[parens]{\printfield{issue}}}%
+ \ifbool{bbx:mergedate}
+ {\iffieldundef{issue}
+ {}
+ {\printtext[parens]{\printfield{issue}}}}
+ {\printtext[parens]{%
+ \iffieldundef{issue}
+ {\usebibmacro{date}}
+ {\printfield{issue}%
+ \setunit*{\addspace}%
+ \usebibmacro{date}}}}
\newunit}
-\renewbibmacro*{date}{}
+\renewbibmacro*{date}{%
+ \ifboolexpr{
+ bool {bbx:mergedate}
+ or
+ test {\iffieldundef{month}}
+ }
+ {}
+ {\printdate}}
\endinput