summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi-yearbeginning.bbx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi-yearbeginning.bbx')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi-yearbeginning.bbx84
1 files changed, 66 insertions, 18 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi-yearbeginning.bbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi-yearbeginning.bbx
index 60949eebea6..0170548b063 100644
--- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi-yearbeginning.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi-yearbeginning.bbx
@@ -1,7 +1,7 @@
-% $Id: fiwi-yearbeginning.bbx, v v1.5 2016/05/17 Simon Spiegel
+% $Id: fiwi-yearbeginning.bbx, v v1.6 2016/09/09 Simon Spiegel
% Stil mit Jahrestahl nach Autor
-\ProvidesFile{fiwi-yearbeginning.bbx}[v 1.5 2016/05/17 film studies bibliography style Author (Year)]
+\ProvidesFile{fiwi-yearbeginning.bbx}[v 1.6 2016/09/09 film studies bibliography style Author (Year)]
\RequireBibliographyStyle{fiwi}
@@ -13,6 +13,16 @@
{\ifbibstring{#1}{\mkbibbrackets{\midsentence\bibstring{#1}}}{#1}}
+\DeclareFieldFormat{origyearbook}{%
+ \iftoggle{origyearbrackets}%
+ {\addthinspace\bibopenbracket}{\addspace\bibopenparen}%
+ \iftoggle{origyearsuperscript}%
+ {\textsuperscript{1}#1}%
+ {#1}%
+ \iftoggle{origyearbrackets}
+ {\bibclosebracket}{\bibcloseparen}}
+
+
\renewcommand{\ppspace}{}
\DeclareBibliographyOption{mergedate}[true]{%
@@ -34,19 +44,23 @@
\iftoggle{isreview}{\printfield{year}}%
{\printfield{issue}%
{\setunit*{\addspace}%
- \printdateextralabel%
+ \iffieldsequal{year}{\thefield{labeldatesource}year}
+ {\printlabeldateextra}%
+ {\printfield{labelyear}%
+ \printfield{extrayear}}%
\usebibmacro{date:origyear}}%
}}}%
\renewbibmacro*{date}{}%
\renewbibmacro*{issue+date}{}%
}
+
\def\bbx@opt@mergedate@compact{%
\renewbibmacro*{date+extrayear}{%
\printtext[yearparens]{%
\iftoggle{isreview}{\printfield{year}}%
{\iffieldundef{day}
- {\printdateextralabel}
+ {\printlabeldateextra}
{\printfield{year}\printfield{extrayear}}}%
\usebibmacro{date:origyear}}%
\renewbibmacro*{date}{}%
@@ -70,8 +84,10 @@
\renewbibmacro*{date+extrayear}{%
\printtext[yearparens]{%
\iftoggle{isreview}{\printfield{year}}%
- {\printfield{labelyear}%
- \printfield{extrayear}%
+ {\iffieldsequal{year}{\thefield{labeldatesource}year}
+ {\printlabeldateextra}%
+ {\printfield{labelyear}%
+ \printfield{extrayear}}%
\usebibmacro{date:origyear}}}}%
\renewbibmacro*{date}{%
\iffieldundef{month}
@@ -155,7 +171,20 @@
\newunit}%
}
-\ExecuteBibliographyOptions{indexing=cite,useprefix=true,sorting=nyt,date=long,urldate=long,hyperref=auto,pagetracker=true,ibidtracker=context,citetracker=true,labeldate=true,mergedate=true}
+\ExecuteBibliographyOptions{%
+ indexing=cite,
+ useprefix=true,
+ sorting=nyt,
+ date=long,
+ urldate=long,
+ hyperref=auto,
+ pagetracker=true,
+ ibidtracker=context,
+ citetracker=true,
+ labeldateparts=true,
+ mergedate=true}
+
+
\newbibmacro{date:origyear}{%
\ifboolexpr{ ( (not test {\iffieldundef{origyear}}
@@ -168,15 +197,32 @@
{\entrydata*{\thefield{related}}{%
\printfield[origyear]{year}%
}}
- {\printfield{origyear}}}}%
+ {\iftoggle{origyearsuperscript}
+ {\textsuperscript{1}}{}%
+\printorigdate}}}%
{\addslash%
\iffieldequalstr{relatedtype}{origpubin}
{\entrydata*{\thefield{related}}{%
- \printfield[origyear]{year}%
+ \printfield[origyear]{year}%
}}
- {\printfield{origyear}}}}%
+ {\iftoggle{origyearsuperscript}
+{\textsuperscript{1}}{}%
+ \printorigdate}}}%
{}}
+
+\renewbibmacro*{bbx:origdate}
+{\iftoggle{origyearbrackets}%
+ {\addthinspace\bibopenbracket}{\addthinspace\bibopenparen}%
+ \iftoggle{origyearsuperscript}%
+ {\textsuperscript{1}\printorigdate}%
+ {\iffieldundef{origyear}{}
+ {\iffieldequalstr{origdateunspecified}{yearincentury}
+ {\number\numexpr\thefield{origyear}/100+1\relax \adddot\addnbthinspace{Jhdt\adddot}}
+ {\printorigdate}}}%
+ \iftoggle{origyearbrackets}
+ {\bibclosebracket}{\bibcloseparen}}
+
\renewbibmacro*{incollectioneditor}{%
\ifnameundef{editor}
{}
@@ -212,7 +258,7 @@
{\printfield{chapter}%
\iffieldundef{pages}%
{}%
- {\newunit\printfield{pages}}}%
+ {AA\newunit\printfield{pages}}}%
}
@@ -230,7 +276,7 @@
\iffieldundef{volume}{}{%
\iftoggle{bbx:volumeinparens}
{\addspace\mkbibparens{\printfield{volume}\unspace}}
-{\newunit\printfield{volume}}%
+{\setunit{,\addspace}\printfield{volume}}%
\iffieldundef{number}%
{\ifboolexpr{%
( test {\iffieldundef{number}} and not test {\iffieldundef{issuetitle}})
@@ -378,8 +424,8 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
}
{\iftoggle{partofcited}
{\iffieldundef{xref}
- {\mancite\textcite{\thefield{crossref}}}
- {\mancite\textcite{\thefield{xref}}}
+ {\mancite\textcite{\thefield{crossref}}}%
+ {\mancite\textcite{\thefield{xref}}}%
\usebibmacro{chap+pag}}
{\newblock%
\ifnameundef{bookauthor}%
@@ -487,10 +533,12 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
\newunit\newblock
\usebibmacro{in:}%
%\newunit%
- \iftoggle{partofcited}
- {\iffieldundef{xref}
- {\mancite\textcite{\thefield{crossref}}}
- {\mancite\textcite{\thefield{xref}}}
+ \iftoggle{partofcited}%
+ {\iffieldundef{xref}%
+ {\entrydata*{\thefield{crossref}}{%
+ \printnames{labelname}\addspace\mkbibparens{\printlabeldateextra}}}
+ {\entrydata*{\thefield{xref}}{%
+ \printnames{labelname}\addspace\mkbibparens{\printlabeldateextra}}}
\usebibmacro{chap+pag}}
{\newblock%
\ifnameundef{bookauthor}%