summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx38
1 files changed, 21 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
index 40e8b728c27..a7ea8e96e04 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
@@ -1,7 +1,7 @@
-% $Id: standard.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: standard.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
\ProvidesFile{standard.bbx}
-[\abx@bbxid $Id: standard.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@bbxid $Id: standard.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
\newtoggle{bbx:isbn}
\newtoggle{bbx:url}
@@ -437,9 +437,7 @@
\newunit\newblock
\usebibmacro{date}%
\newunit\newblock
- \iftoggle{bbx:url}
- {\usebibmacro{url+urldate}}
- {}%
+ \usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
\newunit\newblock
@@ -592,7 +590,7 @@
\newunit\newblock
\printfield{note}%
\newunit\newblock
- \usebibmacro{date}%
+ \usebibmacro{location+date}%
\newunit\newblock
\iftoggle{bbx:url}
{\usebibmacro{url+urldate}}
@@ -660,17 +658,20 @@
{\newunit
\printfield{series}%
\setunit{\addspace}}%
- \printfield{volume}%
- \setunit*{\adddot}%
- \printfield{number}%
- \setunit{\addcomma\space}%
- \printfield{eid}%
+ \usebibmacro{volume+number+eid}%
\setunit{\addspace}%
\usebibmacro{issue+date}%
\setunit{\addcolon\space}%
\usebibmacro{issue}%
\newunit}
+\newbibmacro*{volume+number+eid}{%
+ \printfield{volume}%
+ \setunit*{\adddot}%
+ \printfield{number}%
+ \setunit{\addcomma\space}%
+ \printfield{eid}}
+
\newbibmacro*{title+issuetitle}{%
\usebibmacro{periodical}%
\setunit*{\addspace}%
@@ -693,18 +694,21 @@
\newbibmacro*{issue+date}{%
\printtext[parens]{%
\iffieldundef{issue}
- {\printdate}
+ {\usebibmacro{date}}
{\printfield{issue}%
- \setunit{\addspace}%
- \printfield{year}}}%
+ \setunit*{\addspace}%
+ \usebibmacro{date}}}%
\newunit}
\newbibmacro*{event+venue+date}{%
\printfield{eventtitle}%
- \ifthenelse{\iffieldundef{venue}\AND
- \iffieldundef{eventyear}}
+ \ifboolexpr{
+ test {\iffieldundef{venue}}
+ and
+ test {\iffieldundef{eventyear}}
+ }
{}
- {\setunit{\addspace}%
+ {\setunit*{\addspace}%
\printtext[parens]{%
\printfield{venue}%
\setunit*{\addcomma\space}%