summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex/biblatex.def
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-06-24 22:36:25 +0000
committerKarl Berry <karl@freefriends.org>2014-06-24 22:36:25 +0000
commit084a4d47bb53b4091f81ab09e8cff78d684c3107 (patch)
treeb052ec042c85041920033ce9e6f42158b52fcc21 /Master/texmf-dist/tex/latex/biblatex/biblatex.def
parent333c407d9e5338320d940a17eafbf69abd3017cc (diff)
http://events.brucecareyrestaurants.com/bluehour (24jun14)
git-svn-id: svn://tug.org/texlive/trunk@34385 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex/biblatex.def')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/biblatex.def55
1 files changed, 29 insertions, 26 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.def b/Master/texmf-dist/tex/latex/biblatex/biblatex.def
index 9566dd7b057..497e26a1827 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex.def
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.def
@@ -8,7 +8,7 @@
% Generic formatting commands and hooks
% ------------------------------------------------------------------
-% Used in citations, bibliography, list of shorthands
+% Used in citations, bibliography and bibliography lists
\newcommand*{\mkbibnamefirst}[1]{#1}
\newcommand*{\mkbibnamelast}[1]{#1}
@@ -16,7 +16,7 @@
\newcommand*{\mkbibnameaffix}[1]{#1}
\newcommand*{\bibellipsis}{[\textellipsis\unkern]\midsentence}
-% Delimiters used in citations, bibliography, list of shorthands
+% Delimiters used in citations, bibliography and bibliography lists
\newcommand*{\multinamedelim}{\addcomma\space}
\newcommand*{\finalnamedelim}{%
@@ -74,7 +74,7 @@
\newcounter{textcitemaxnames}
\setcounter{textcitemaxnames}{0}
-% Used in the bibliography and the list of shorthands
+% Used in the bibliography and bibliography lists
\newcommand*{\newunitpunct}{\addperiod\space}
\newcommand*{\entrysetpunct}{\addsemicolon\space}
@@ -108,7 +108,7 @@
\newcommand*{\bibindexinithyphendelim}{.-}
% \bibsetup is a generic hook controlling the (low-level) layout of
-% the bibliography and the list of shorthands. The default
+% the bibliography and bibliography lists. The default
% definition should work fine in most cases.
\newcommand*{\bibsetup}{%
@@ -190,7 +190,7 @@
% after hyphens and adjusts \Urlmuskip to add some stretchability
% to URLs.
-% The default font of the bibliography and the list of shorthands.
+% The default font of the bibliography and the bibliography lists.
% We simply reset the current font to the global defaults.
\newcommand*{\bibfont}{\normalfont\normalsize}
@@ -344,7 +344,7 @@
\DeclareFieldFormat{citeurl}{\url{#1}}
-% Used in the bibliography and the list of shorthands
+% Used in the bibliography and bibliography lists
\DeclareFieldFormat{doi}{%
\mkbibacro{DOI}\addcolon\space
@@ -1776,21 +1776,21 @@
\defbibheading{bibliography}[\refname]{%
\section*{#1}%
\markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
- \defbibheading{shorthands}[\losname]{%
+ \defbibheading{biblist}[\biblistname]{%
\section*{#1}%
\markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
\defbibheading{bibintoc}[\refname]{%
\section*{#1}%
\addcontentsline{toc}{section}{#1}%
\markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
- \defbibheading{losintoc}[\losname]{%
+ \defbibheading{biblistintoc}[\biblistname]{%
\section*{#1}%
\addcontentsline{toc}{section}{#1}%
\markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
\defbibheading{bibnumbered}[\refname]{%
\section{#1}%
\if@twoside\markright{\MakeUppercase{#1}}\fi}
- \defbibheading{losnumbered}[\losname]{%
+ \defbibheading{biblistnumbered}[\biblistname]{%
\section{#1}%
\if@twoside\markright{\MakeUppercase{#1}}\fi}
\defbibheading{subbibliography}[\refname]{%
@@ -1805,21 +1805,21 @@
\defbibheading{bibliography}[\bibname]{%
\chapter*{#1}%
\markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
- \defbibheading{shorthands}[\losname]{%
+ \defbibheading{biblist}[\biblistname]{%
\chapter*{#1}%
\markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
\defbibheading{bibintoc}[\bibname]{%
\chapter*{#1}%
\addcontentsline{toc}{chapter}{#1}%
\markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
- \defbibheading{losintoc}[\losname]{%
+ \defbibheading{biblistintoc}[\biblistname]{%
\chapter*{#1}%
\addcontentsline{toc}{chapter}{#1}%
\markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
\defbibheading{bibnumbered}[\bibname]{%
\chapter{#1}%
\if@twoside\markright{\MakeUppercase{#1}}\fi}
- \defbibheading{losnumbered}[\losname]{%
+ \defbibheading{biblistnumbered}[\biblistname]{%
\chapter{#1}%
\if@twoside\markright{\MakeUppercase{#1}}\fi}
\defbibheading{subbibliography}[\refname]{%
@@ -1840,7 +1840,7 @@
{\addsec{#1}}
{\section*{#1}}%
\markboth{#1}{#1}}}
- \defbibheading{shorthands}[\losname]{%
+ \defbibheading{biblist}[\biblistname]{%
\ifkomabibtotocnumbered
{\section{#1}}
{\ifkomabibtotoc
@@ -1850,13 +1850,13 @@
\defbibheading{bibintoc}[\refname]{%
\addsec{#1}%
\markboth{#1}{#1}}
- \defbibheading{losintoc}[\losname]{%
+ \defbibheading{biblistintoc}[\biblistname]{%
\addsec{#1}%
\markboth{#1}{#1}}
\defbibheading{bibnumbered}[\refname]{%
\section{#1}%
\markboth{\sectionmarkformat#1}{\sectionmarkformat#1}}
- \defbibheading{losnumbered}[\losname]{%
+ \defbibheading{biblistnumbered}[\biblistname]{%
\section{#1}%
\markboth{\sectionmarkformat#1}{\sectionmarkformat#1}}
\defbibheading{subbibliography}[\refname]{%
@@ -1875,7 +1875,7 @@
{\addchap{#1}}
{\chapter*{#1}}%
\markboth{#1}{#1}}}
- \defbibheading{shorthands}[\losname]{%
+ \defbibheading{biblist}[\biblistname]{%
\ifkomabibtotocnumbered
{\chapter{#1}}
{\ifkomabibtotoc
@@ -1885,13 +1885,13 @@
\defbibheading{bibintoc}[\bibname]{%
\addchap{#1}%
\markboth{#1}{#1}}
- \defbibheading{losintoc}[\losname]{%
+ \defbibheading{biblistintoc}[\biblistname]{%
\addchap{#1}%
\markboth{#1}{#1}}
\defbibheading{bibnumbered}[\bibname]{%
\chapter{#1}%
\markboth{\chaptermarkformat#1}{\chaptermarkformat#1}}
- \defbibheading{losnumbered}[\losname]{%
+ \defbibheading{biblistnumbered}[\biblistname]{%
\chapter{#1}%
\markboth{\chaptermarkformat#1}{\chaptermarkformat#1}}
\defbibheading{subbibliography}[\refname]{%
@@ -1912,7 +1912,7 @@
\addcontentsline{toc}{section}{#1}}
{}%
\markboth{\memUChead{#1}}{\memUChead{#1}}}
- \defbibheading{shorthands}[\losname]{%
+ \defbibheading{biblist}[\biblistname]{%
\section*{#1}%
\ifmemoirbibintoc
{\phantomsection
@@ -1924,14 +1924,14 @@
\phantomsection
\addcontentsline{toc}{section}{#1}%
\markboth{\memUChead{#1}}{\memUChead{#1}}}
- \defbibheading{losintoc}[\losname]{%
+ \defbibheading{biblistintoc}[\biblistname]{%
\section*{#1}%
\phantomsection
\addcontentsline{toc}{section}{#1}%
\markboth{\memUChead{#1}}{\memUChead{#1}}}
\defbibheading{bibnumbered}[\refname]{%
\section{#1}}
- \defbibheading{losnumbered}[\losname]{%
+ \defbibheading{biblistnumbered}[\biblistname]{%
\section{#1}}
\defbibheading{subbibliography}[\refname]{%
\subsection*{#1}%
@@ -1957,7 +1957,7 @@
\addcontentsline{toc}{chapter}{#1}}
{}%
\markboth{\memUChead{#1}}{\memUChead{#1}}}
- \defbibheading{shorthands}[\losname]{%
+ \defbibheading{biblist}[\biblistname]{%
\chapter*{#1}%
\ifmemoirbibintoc
{\phantomsection
@@ -1969,7 +1969,7 @@
\phantomsection
\addcontentsline{toc}{chapter}{#1}%
\markboth{\memUChead{#1}}{\memUChead{#1}}}
- \defbibheading{losintoc}[\losname]{%
+ \defbibheading{biblistintoc}[\biblistname]{%
\chapter*{#1}%
\phantomsection
\addcontentsline{toc}{chapter}{#1}%
@@ -1977,7 +1977,7 @@
\defbibheading{bibnumbered}[\bibname]{%
\chapter{#1}%
\if@twoside\markright{\memUChead{#1}}\fi}
- \defbibheading{losnumbered}[\losname]{%
+ \defbibheading{biblistnumbered}[\biblistname]{%
\chapter{#1}%
\if@twoside\markright{\memUChead{#1}}\fi}
\defbibheading{subbibliography}[\refname]{%
@@ -2751,11 +2751,14 @@
\newbibmacro*{date}{\printdate}
\newbibmacro*{url+urldate}{%
- \printfield{url}%
+ \usebibmacro{url}%
\iffieldundef{urlyear}
{}
{\setunit*{\addspace}%
- \printurldate}}
+ \usebibmacro{urldate}}}
+
+\newbibmacro*{url}{\printfield{url}}
+\newbibmacro*{urldate}{\printurldate}
\newbibmacro*{pageref}{%
\iflistundef{pageref}