diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex/biblatex.def')
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex/biblatex.def | 70 |
1 files changed, 45 insertions, 25 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.def b/Master/texmf-dist/tex/latex/biblatex/biblatex.def index 3a8b62b2065..8622d7f3dbb 100644 --- a/Master/texmf-dist/tex/latex/biblatex/biblatex.def +++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.def @@ -1,7 +1,7 @@ -% $Id: biblatex.def,v 0.9d 2010/09/03 20:11:58 lehman beta $ +% $Id: biblatex.def,v 0.9e 2010/10/09 16:39:36 lehman beta $ \ProvidesFile{biblatex.def} -[\abx@rcsid $Id: biblatex.def,v 0.9d 2010/09/03 20:11:58 lehman beta $ +[\abx@rcsid $Id: biblatex.def,v 0.9e 2010/10/09 16:39:36 lehman beta $ biblatex generic definitions] % ------------------------------------------------------------------ @@ -53,6 +53,7 @@ \newcommand*{\subtitlepunct}{\newunitpunct} \newcommand*{\intitlepunct}{\addcolon\space} \newcommand*{\bibpagespunct}{\addcomma\space} +\newcommand*{\bibpagerefpunct}{\addspace} \newcommand*{\bibnamedash}{% \ifdimless{\leftmargin}{0.75em} {\mbox{\textemdash\space}} @@ -615,33 +616,19 @@ % Formatting directives for name lists % ------------------------------------------------------------------ -% The fallback used by \printnames -\DeclareNameFormat{default}{% +\DeclareNameFormat{first-last}{% \iffirstinits {\usebibmacro{name:first-last}{#1}{#4}{#5}{#7}} {\usebibmacro{name:first-last}{#1}{#3}{#5}{#7}}% \usebibmacro{name:andothers}} -% The default used by \citename -\DeclareNameAlias{citename}{default} - -% Used in all citations - -\DeclareNameFormat{labelname}{% - \ifcase\value{uniquename}% - \usebibmacro{name:last}{#1}{#3}{#5}{#7}% - \or - \ifuseprefix - {\usebibmacro{name:first-last}{#1}{#4}{#5}{#8}} - {\usebibmacro{name:first-last}{#1}{#4}{#6}{#8}}% - \or - \usebibmacro{name:first-last}{#1}{#3}{#5}{#7}% - \fi +\DeclareNameFormat{last-first}{% + \iffirstinits + {\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}} + {\usebibmacro{name:last-first}{#1}{#3}{#5}{#7}}% \usebibmacro{name:andothers}} -% Used in the bibliography - -\DeclareNameFormat{sortname}{% +\DeclareNameFormat{last-first/first-last}{% \ifnumequal{\value{listcount}}{1} {\iffirstinits {\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}} @@ -654,12 +641,36 @@ {\usebibmacro{name:first-last}{#1}{#3}{#5}{#7}}}% \usebibmacro{name:andothers}} -% Not used by default - \DeclareNameFormat{initsonly}{% \usebibmacro{name:first-last}{#2}{#4}{#6}{#8}% \usebibmacro{name:andothers}} +% Fallback used by \printnames + +\DeclareNameAlias{default}{first-last} + +% Default used by \citename + +\DeclareNameAlias{citename}{default} + +% Used in some citations + +\DeclareNameFormat{labelname}{% + \ifcase\value{uniquename}% + \usebibmacro{name:last}{#1}{#3}{#5}{#7}% + \or + \ifuseprefix + {\usebibmacro{name:first-last}{#1}{#4}{#5}{#8}} + {\usebibmacro{name:first-last}{#1}{#4}{#6}{#8}}% + \or + \usebibmacro{name:first-last}{#1}{#3}{#5}{#7}% + \fi + \usebibmacro{name:andothers}} + +% Used in the bibliography + +\DeclareNameAlias{sortname}{last-first/first-last} + \DeclareNameAlias{author}{default} \DeclareNameAlias{bookauthor}{author} \DeclareNameAlias{editor}{default} @@ -1813,7 +1824,7 @@ \usebibmacro{withforeword}% \clearname{foreword}% \newunit - \usebibmacro{withafterword} + \usebibmacro{withafterword}% \clearname{afterword}} \newbibmacro*{title}{% @@ -1904,6 +1915,15 @@ {\bibstring{backrefpage}\ppspace}% \printlist[pageref][-\value{listtotal}]{pageref}}}} +\newbibmacro*{setpageref}{% + \iflistundef{pageref} + {} + {\printtext{% + \ifnumgreater{\value{pageref}}{1} + {\bibstring{backrefpages}\ppspace} + {\bibstring{backrefpage}\ppspace}% + \printlist[pageref][-\value{listtotal}]{pageref}}}} + \newbibmacro*{eprint}{% \iffieldundef{eprinttype} {\printfield{eprint}} |