diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex/biblatex.def')
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex/biblatex.def | 239 |
1 files changed, 129 insertions, 110 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.def b/Master/texmf-dist/tex/latex/biblatex/biblatex.def index 02a63a4fe74..d93c45ac12e 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.9 2010/02/14 15:42:33 lehman beta $ +% $Id: biblatex.def,v 0.9a 2010/03/19 19:52:15 lehman beta $ \ProvidesFile{biblatex.def} -[\abx@rcsid $Id: biblatex.def,v 0.9 2010/02/14 15:42:33 lehman beta $ +[\abx@rcsid $Id: biblatex.def,v 0.9a 2010/03/19 19:52:15 lehman beta $ biblatex generic definitions] % ------------------------------------------------------------------ @@ -39,7 +39,7 @@ \newcommand*{\multicitedelim}{\addsemicolon\space} \newcommand*{\compcitedelim}{\addcomma\space} \newcommand*{\supercitedelim}{\addcomma} -\newcommand*{\prenotedelim}{\addspace\midsentence} +\newcommand*{\prenotedelim}{\addspace} \newcommand*{\postnotedelim}{\addcomma\space} \newcommand*{\nameyeardelim}{\addspace} @@ -50,6 +50,7 @@ \newcommand*{\finentrypunct}{\addperiod} \newcommand*{\labelnamepunct}{\newunitpunct} \newcommand*{\subtitlepunct}{\newunitpunct} +\newcommand*{\intitlepunct}{\addcolon\space} \newcommand*{\bibpagespunct}{\addcomma\space} \newcommand*{\bibnamedash}{% \ifdimless{\leftmargin}{0.75em} @@ -978,14 +979,14 @@ \defbibheading{losnumbered}[\losname]{% \chapter{#1}% \if@twoside\markright{\MakeUppercase{#1}}\fi} - \defbibheading{subbibliography}[\bibname]{% + \defbibheading{subbibliography}[\refname]{% \section*{#1}% \if@twoside\markright{\MakeUppercase{#1}}\fi} - \defbibheading{subbibintoc}[\bibname]{% + \defbibheading{subbibintoc}[\refname]{% \section*{#1}% \addcontentsline{toc}{section}{#1}% \if@twoside\markright{\MakeUppercase{#1}}\fi} - \defbibheading{subbibnumbered}[\bibname]{% + \defbibheading{subbibnumbered}[\refname]{% \section{#1}} \or % scrartcl @@ -1050,13 +1051,13 @@ \defbibheading{losnumbered}[\losname]{% \chapter{#1}% \markboth{\chaptermarkformat#1}{\chaptermarkformat#1}} - \defbibheading{subbibliography}[\bibname]{% + \defbibheading{subbibliography}[\refname]{% \section*{#1}% \if@twoside\markright{\sectionmarkformat#1}\fi} - \defbibheading{subbibintoc}[\bibname]{% + \defbibheading{subbibintoc}[\refname]{% \addsec{#1}% \markboth{#1}{#1}} - \defbibheading{subbibnumbered}[\bibname]{% + \defbibheading{subbibnumbered}[\refname]{% \section{#1}} \or % memoir (article) @@ -1134,19 +1135,19 @@ \defbibheading{losnumbered}[\losname]{% \chapter{#1}% \if@twoside\markright{\MakeUppercase{#1}}\fi} - \defbibheading{subbibliography}[\bibname]{% + \defbibheading{subbibliography}[\refname]{% \section*{#1}% \ifmemoirbibintoc {\phantomsection \addcontentsline{toc}{section}{#1}} {}% \if@twoside\markright{\MakeUppercase{#1}}\fi} - \defbibheading{subbibintoc}[\bibname]{% + \defbibheading{subbibintoc}[\refname]{% \section*{#1}% \phantomsection \addcontentsline{toc}{section}{#1}% \if@twoside\markright{\MakeUppercase{#1}}\fi} - \defbibheading{subbibnumbered}[\bibname]{% + \defbibheading{subbibnumbered}[\refname]{% \section{#1}} \fi @@ -1315,12 +1316,12 @@ \iffieldundef{prenote} {} {\printfield{prenote}% - \prenotedelim}} + \setunit{\prenotedelim}}} \newbibmacro*{postnote}{% \iffieldundef{postnote} {} - {\postnotedelim + {\setunit{\postnotedelim}% \printfield{postnote}}} % multicite commands @@ -1439,33 +1440,38 @@ {\bibstring{\thefield{editortype}}}}} \newbibmacro*{editor+othersstrg}{% - \ifthenelse{\iffieldundef{editortype}\OR - \iffieldequalstr{editortype}{editor}} + \iffieldundef{editortype} {\ifthenelse{\value{editor}>1\OR\ifandothers{editor}} {\def\abx@tempa{editors}} - {\def\abx@tempa{editor}}% - \ifnamesequal{editor}{translator} - {\appto\abx@tempa{tr}% - \clearname{translator}} - {}% - \ifnamesequal{editor}{commentator} - {\appto\abx@tempa{co}% - \clearname{commentator}} - {\ifnamesequal{editor}{annotator} - {\appto\abx@tempa{an}% - \clearname{annotator}} - {}}% - \ifnamesequal{editor}{introduction} - {\appto\abx@tempa{in}% - \clearname{introduction}} - {\ifnamesequal{editor}{foreword} - {\appto\abx@tempa{fo}% - \clearname{foreword}} - {\ifnamesequal{editor}{afterword} - {\appto\abx@tempa{af}% - \clearname{afterword}} - {}}}% - \bibstring{\abx@tempa}} + {\def\abx@tempa{editor}}} + {\ifthenelse{\value{editor}>1\OR\ifandothers{editor}} + {\edef\abx@tempa{\thefield{editortype}s}} + {\edef\abx@tempa{\thefield{editortype}}}}% + \let\abx@tempb=\empty + \ifnamesequal{editor}{translator} + {\appto\abx@tempa{tr}% + \appto\abx@tempb{\clearname{translator}}} + {}% + \ifnamesequal{editor}{commentator} + {\appto\abx@tempa{co}% + \appto\abx@tempb{\clearname{commentator}}} + {\ifnamesequal{editor}{annotator} + {\appto\abx@tempa{an}% + \appto\abx@tempb{\clearname{annotator}}} + {}}% + \ifnamesequal{editor}{introduction} + {\appto\abx@tempa{in}% + \appto\abx@tempb{\clearname{introduction}}} + {\ifnamesequal{editor}{foreword} + {\appto\abx@tempa{fo}% + \appto\abx@tempb{\clearname{foreword}}} + {\ifnamesequal{editor}{afterword} + {\appto\abx@tempa{af}% + \appto\abx@tempb{\clearname{afterword}}} + {}}}% + \ifbibxstring{\abx@tempa} + {\bibstring{\abx@tempa}% + \abx@tempb} {\usebibmacro{editorstrg}}} \newbibmacro*{translatorstrg}{% @@ -1496,11 +1502,6 @@ {}}}% \bibstring{\abx@tempa}} -\newbibmacro*{bytypestrg}[2]{% - \iffieldundef{#1type} - {\bibstring{by#2}} - {\bibstring{by\thefield{#1type}}}} - \newbibmacro*{byauthor}{% \ifthenelse{\ifuseauthor\OR\ifnameundef{author}} {} @@ -1552,6 +1553,84 @@ \newbibmacro*{byholder}{% \printnames{holder}} +\newbibmacro*{byeditor+others}{% + \ifnameundef{editor} + {} + {\usebibmacro{byeditor+othersstrg}% + \setunit{\addspace}% + \printnames[byeditor]{editor}% + \clearname{editor}% + \newunit}% + \usebibmacro{byeditorx}% + \usebibmacro{bytranslator+others}} + +\newbibmacro*{bytranslator+others}{% + \ifnameundef{translator} + {} + {\usebibmacro{bytranslator+othersstrg}% + \setunit{\addspace}% + \printnames[bytranslator]{translator}% + \clearname{translator}% + \newunit}% + \usebibmacro{withothers}} + +\newbibmacro*{bytypestrg}[2]{% + \iffieldundef{#1type} + {\bibstring{by#2}} + {\bibstring{by\thefield{#1type}}}} + +\newbibmacro*{byeditor+othersstrg}{% + \iffieldundef{editortype} + {\def\abx@tempa{byeditor}} + {\edef\abx@tempa{by\thefield{editortype}}}% + \let\abx@tempb=\empty + \ifnamesequal{editor}{translator} + {\appto\abx@tempa{tr}% + \appto\abx@tempb{\clearname{translator}}} + {}% + \ifnamesequal{editor}{commentator} + {\appto\abx@tempa{co}% + \appto\abx@tempb{\clearname{commentator}}} + {\ifnamesequal{editor}{annotator} + {\appto\abx@tempa{an}% + \appto\abx@tempb{\clearname{annotator}}} + {}}% + \ifnamesequal{editor}{introduction} + {\appto\abx@tempa{in}% + \appto\abx@tempb{\clearname{introduction}}} + {\ifnamesequal{editor}{foreword} + {\appto\abx@tempa{fo}% + \appto\abx@tempb{\clearname{foreword}}} + {\ifnamesequal{editor}{afterword} + {\appto\abx@tempa{af}% + \appto\abx@tempb{\clearname{afterword}}} + {}}}% + \ifbibxstring{\abx@tempa} + {\bibstring{\abx@tempa}% + \abx@tempb} + {\usebibmacro{bytypestrg}{editor}{editor}}} + +\newbibmacro*{bytranslator+othersstrg}{% + \def\abx@tempa{bytranslator}% + \ifnamesequal{translator}{commentator} + {\appto\abx@tempa{co}% + \clearname{commentator}} + {\ifnamesequal{translator}{annotator} + {\appto\abx@tempa{an}% + \clearname{annotator}} + {}}% + \ifnamesequal{translator}{introduction} + {\appto\abx@tempa{in}% + \clearname{introduction}} + {\ifnamesequal{translator}{foreword} + {\appto\abx@tempa{fo}% + \clearname{foreword}} + {\ifnamesequal{translator}{afterword} + {\appto\abx@tempa{af}% + \clearname{afterword}} + {}}}% + \bibstring{\abx@tempa}} + \newbibmacro*{withcommentator}{% \ifnameundef{commentator} {} @@ -1587,69 +1666,6 @@ \setunit{\addspace}% \printnames[withafterword]{afterword}}} -\newbibmacro*{byeditor+others}{% - \ifthenelse{\NOT\ifnameundef{editor}\AND - \(\iffieldundef{editortype}\OR - \iffieldequalstr{editortype}{editor}\)} - {\def\abx@tempa{byeditor}% - \ifnamesequal{editor}{translator} - {\appto\abx@tempa{tr}% - \clearname{translator}} - {}% - \ifnamesequal{editor}{commentator} - {\appto\abx@tempa{co}% - \clearname{commentator}} - {\ifnamesequal{editor}{annotator} - {\appto\abx@tempa{an}% - \clearname{annotator}} - {}}% - \ifnamesequal{editor}{introduction} - {\appto\abx@tempa{in}% - \clearname{introduction}} - {\ifnamesequal{editor}{foreword} - {\appto\abx@tempa{fo}% - \clearname{foreword}} - {\ifnamesequal{editor}{afterword} - {\appto\abx@tempa{af}% - \clearname{afterword}} - {}}}% - \bibstring{\abx@tempa}% - \setunit{\addspace}% - \printnames[byeditor]{editor}% - \clearname{editor}% - \newunit - \usebibmacro{byeditorx}}% - {\usebibmacro{byeditor}} - \usebibmacro{bytranslator+others}} - -\newbibmacro*{bytranslator+others}{% - \ifnameundef{translator} - {} - {\def\abx@tempa{bytranslator}% - \ifnamesequal{translator}{commentator} - {\appto\abx@tempa{co}% - \clearname{commentator}} - {\ifnamesequal{translator}{annotator} - {\appto\abx@tempa{an}% - \clearname{annotator}} - {}}% - \ifnamesequal{translator}{introduction} - {\appto\abx@tempa{in}% - \clearname{introduction}} - {\ifnamesequal{translator}{foreword} - {\appto\abx@tempa{fo}% - \clearname{foreword}} - {\ifnamesequal{translator}{afterword} - {\appto\abx@tempa{af}% - \clearname{afterword}} - {}}}% - \bibstring{\abx@tempa}% - \setunit{\addspace}% - \printnames[bytranslator]{translator}% - \clearname{translator}% - \newunit}% - \usebibmacro{withothers}} - \newbibmacro*{withothers}{% \usebibmacro{withcommentator}% \clearname{commentator}% @@ -1720,6 +1736,10 @@ \setunit{\subtitlepunct}% \printfield[titlecase]{issuesubtitle}}}} +\newbibmacro*{in:}{% + \printtext{% + \bibstring{in}\intitlepunct}} + \newbibmacro*{date}{\printdate} \newbibmacro*{url+urldate}{% @@ -1733,10 +1753,9 @@ \iflistundef{pageref} {} {\printtext[parens]{% - \bibstring{see}\space \ifnumgreater{\value{pageref}}{1} - {\bibstring{pages}\ppspace} - {\bibstring{page}\ppspace}% + {\bibstring{backrefpages}\ppspace} + {\bibstring{backrefpage}\ppspace}% \printlist[pageref][-\value{listtotal}]{pageref}}}} \newbibmacro*{eprint}{% |