summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-03-10 23:21:10 +0000
committerKarl Berry <karl@freefriends.org>2016-03-10 23:21:10 +0000
commitadd40c34bc577070311f0316fceff95083c1f2c2 (patch)
treef46ca315b4427539528c725ba92f2ffa25b13f1b /Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx
parent50fde4c9a5b56177472e5d5538e84cb6333c6b6d (diff)
biblatex-fiwi (10mar16)
git-svn-id: svn://tug.org/texlive/trunk@39985 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx171
1 files changed, 111 insertions, 60 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx
index 2473a816a90..40b328af249 100644
--- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx
@@ -1,12 +1,12 @@
-% $Id: fiwi.bbx, v1.3 2015/06/30 Simon Spiegel
+% $Id: fiwi.bbx, v1.4 2016/03/09 Simon Spiegel
-\ProvidesFile{fiwi.bbx}[v1.3 2015/06/30 film studies bibliography style]
+\ProvidesFile{fiwi.bbx}[v1.4 2016/03/09 film studies bibliography style]
-\@ifpackagelater{biblatex}{2013/05/01}
+\@ifpackagelater{biblatex}{2016/03/01}
{}
{\PackageError{biblatex}
{Outdated 'biblatex' package}
- {The 'fiwi' style requires biblatex v2.4 or later.\MessageBreak
+ {The 'fiwi' style requires biblatex v3.4 or later.\MessageBreak
You are using: '\csuse{ver@biblatex.sty}'.\MessageBreak
This is a fatal error. I'm aborting now.}%
\endinput}
@@ -276,7 +276,7 @@
{}
}%
-\ExecuteBibliographyOptions{indexing=cite,maxnames=3,minnames=1,maxitems=9,useprefix=true,sorting=nyt,date=long,datelabel=long,urldate=long,hyperref=auto,pagetracker=true,ibidtracker=context,citetracker=true,labeldate=true,isbn=false,autolang=hyphen}
+\ExecuteBibliographyOptions{indexing=cite,maxnames=3,minnames=1,maxitems=9,useprefix=true,sorting=nyt,date=long,datelabel=long,urldate=long,hyperref=auto,pagetracker=true,ibidtracker=context,citetracker=context,labeldate=true,isbn=false,autolang=hyphen}
\ExecuteBibliographyOptions[misc,movie,video]{uniquename=false,labeltitle=true}
\InitializeBibliographyStyle{%
@@ -340,6 +340,7 @@
%\DeclareFieldFormat{labelyear}{\mknumalph{#1}}
\DeclareFieldFormat{film}{\film{#1}}
\DeclareFieldFormat{title}{\mkbibemph{#1}}
+\DeclareFieldFormat{noformat}{#1}
\DeclareFieldFormat{citetitle:incollection}{\emph{#1}\isdot}
\DeclareFieldFormat[movie]{citetitle}{\film{#1}}
\DeclareFieldAlias[misc]{title}[movie]{title}
@@ -445,25 +446,51 @@
% name format definitions
\DeclareNameFormat{sortname}{%
+ \nameparts{#1}%
\ifnumequal{\value{listcount}}{1}
- {\iffirstinits
- {\usebibmacro{name:last-first}{#1}{#4}{\bibsentence#5}{#7}}
- {\usebibmacro{name:last-first}{#1}{#3}{\bibsentence#5}{#7}}%
- \ifblank{#3#5}
+ {\ifgiveninits
+ {\usebibmacro{name:family-given}
+ {\namepartfamily}
+ {\namepartgiveni}
+ {\bibsentence\namepartprefix}
+ {\namepartsuffix}}
+ {\usebibmacro{name:family-given}
+ {\namepartfamily}%
+ {\namepartgiven}%
+ {\bibsentence\namepartprefix}
+ {\namepartsuffix}}%
+ \ifblank{\namepartgiven\namepartprefix}
{}
{\usebibmacro{name:revsdelim}}}
- {\iffirstinits
- {\usebibmacro{name:last-first}{#1}{#4}{\bibsentence#5}{#7}}
- {\usebibmacro{name:last-first}{#1}{#3}{\bibsentence#5}{#7}}}%
+ {\ifgiveninits
+ {\usebibmacro{name:family-given}
+ {\namepartfamily}
+ {\namepartgiveni}
+ {\bibsentence\namepartprefix}
+ {\namepartsuffix}}
+ {\usebibmacro{name:family-given}
+ {\namepartfamily}
+ {\namepartgiven}
+ {\bibsentence\namepartprefix}
+ {\namepartsuffix}}}%
\usebibmacro{name:andothers}}
\DeclareNameFormat{name:commas}{%
+ \nameparts{#1}%
\renewcommand*{\multinamedelim}{\addcomma\addspace}%
\renewcommand*{\finalnamedelim}{\addcomma\addspace}%
- \iffirstinits
- {\usebibmacro{actor:first-last}{#1}{#4}{#5}{#7}}
- {\usebibmacro{actor:first-last}{#1}{#3}{#5}{#7}}%
- \ifblank{#3#5}
+ \ifgiveninits
+ {\usebibmacro{actor:given-family}
+ {\namepartfamily}
+ {\namepartgiveni}
+ {\namepartprefix}
+ {\namepartsuffix}}
+ {\usebibmacro{actor:given-family}
+ {\namepartfamily}
+ {\namepartgiven}
+ {\namepartprefix}
+ {\namepartsuffix}}%
+ \ifblank{\namepartgiven\namepartprefix}
{}
{\usebibmacro{name:revsdelim}}
\renewcommand*{\multinamedelim}{\addslash}%
@@ -471,87 +498,110 @@
\DeclareNameFormat{bytranslator}{%
- \iffirstinits
- {\usebibmacro{name:first-last}{#1}{#4}{#5}{#7}}
- {\usebibmacro{name:first-last}{#1}{#3}{#5}{#7}}%
- \ifblank{#3#5}
+ \nameparts{#1}%
+ \ifgiveninits
+ {\usebibmacro{name:given-family}
+ {\namepartfamily}
+ {\namepartgiveni}
+ {\namepartprefix}
+ {\namepartsuffix}}
+ {\usebibmacro{name:given-family}
+ {\namepartfamily}
+ {\namepartgiven}
+ {\namepartprefix}
+ {\namepartsuffix}}%
+ \ifblank{\namepartgiven\namepartprefix}
{}
{\usebibmacro{name:revsdelim}}%
\usebibmacro{name:andothers}}
\DeclareNameFormat{actor}{%
- \iffirstinits
- {\usebibmacro{name:first-last}{#1}{#4}{#5}{#7}}
- {\usebibmacro{name:first-last}{#1}{#3}{#5}{#7}}%
- \ifblank{#3#5}
+ \nameparts{#1}%
+ \ifgiveninits
+ {\usebibmacro{name:given-family}
+ {\namepartfamily}
+ {\namepartgiveni}
+ {\namepartprefix}
+ {\namepartsuffix}}
+ {\usebibmacro{name:given-family}
+ {\namepartfamily}
+ {\namepartgiven}
+ {\namepartprefix}
+ {\namepartsuffix}}%
+ \ifblank{\namepartgiven\namepartprefix}
{}
{\usebibmacro{name:revsdelim}}%
\usebibmacro{name:andothers}}
\DeclareNameFormat{director}{%
- \usebibmacro{director:first-last}{#1}{#3}{#5}{#7}
- \ifblank{#3#5}
+ \nameparts{#1}%
+ \usebibmacro{director:given-family}
+ {\namepartfamily}
+ {\namepartgiven}
+ {\namepartprefix}
+ {\namepartsuffix}%
+ \ifblank{\namepartgiven\namepartprefix}
{}
{\usebibmacro{name:revsdelim}}%
\usebibmacro{name:andothers}}
-\newbibmacro*{director:first-last}[4]{%
+\newbibmacro*{director:given-family}[4]{%
\usebibmacro{name:delim}{#2#3#1}%
\usebibmacro{name:hook}{#2#3#1}%
- \ifblank{#2}{}{\mkbibnamefirst{#2}\isdot\addlowpenspace}%
- \ifblank{#3}{}{%
+ \ifempty{#2}{}{\mkbibnamegiven{#2}\isdot\addlowpenspace}%
+ \ifempty{#3}{}{%
\mkbibnameprefix{#3}\isdot
\ifpunctmark{'}
{}
{\ifuseprefix{\addhighpenspace}{\addlowpenspace}}}%
- \mkbibnamelast{#1}\isdot
- \ifblank{#4}{}{\addlowpenspace\mkbibnameaffix{#4}\isdot}}
+ \mkbibnamefamily{#1}\isdot
+ \ifempty{#4}{}{\addlowpenspace\mkbibnameaffix{#4}\isdot}}
-\renewbibmacro*{name:last-first}[4]{%
+\renewbibmacro*{name:family-given}[4]{%
\ifuseprefix%
{\usebibmacro{name:delim}{#3#1}%
\usebibmacro{name:hook}{#3#1}%
- \ifblank{#3}{}{%
+ \ifempty{#3}{}{%
\ifcapital
{\mkbibnameprefix{\MakeCapital{#3}}\isdot}%
{\mkbibnameprefix{#3}\isdot}%
}%\ifpunctmark{'}{}{\addhighpenspace}}%
-\mkbibnamelast{#1}\isdot
- \ifblank{#2}{}{\addcomma\addlowpenspace\mkbibnamefirst{#2}\isdot}
- \ifblank{#4}{}{\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot}}%
+\mkbibnamefamily{#1}\isdot
+ \ifempty{#2}{}{\addcomma\addlowpenspace\mkbibnamegiven{#2}\isdot}
+ \ifempty{#4}{}{\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot}}%
{\usebibmacro{name:delim}{#1}%
\usebibmacro{name:hook}{#1}%
- \mkbibnamelast{#1}\isdot
- \ifblank{#4}{}{\addlowpenspace\mkbibnameaffix{#4}\isdot}%
- \ifblank{#2#3}{}{\addcomma}%
- \ifblank{#2}{}{\addlowpenspace\mkbibnamefirst{#2}\isdot}%
- \ifblank{#4}{}{\addlowpenspace\mkbibnameaffix{#4}\isdot}%
- \ifblank{#3}{}{\addlowpenspace\mkbibnameprefix{#3}\isdot}}}
-
-\renewbibmacro*{name:first-last}[4]{%
+ \mkbibnamefamily{#1}\isdot
+ \ifempty{#4}{}{\addlowpenspace\mkbibnameaffix{#4}\isdot}%
+ \ifempty{#2#3}{}{\addcomma}%
+ \ifempty{#2}{}{\addlowpenspace\mkbibnamegiven{#2}\isdot}%
+ \ifempty{#4}{}{\addlowpenspace\mkbibnameaffix{#4}\isdot}%
+ \ifempty{#3}{}{\addlowpenspace\mkbibnameprefix{#3}\isdot}}}
+
+\renewbibmacro*{name:given-family}[4]{%
\usebibmacro{name:delimfirst}{#2#3#1}%
\usebibmacro{name:hook}{#2#3#1}%
- \ifblank{#2}{}{\mkbibnamefirst{#2}\isdot\addlowpenspace}%
- \ifblank{#3}{}{%
+ \ifempty{#2}{}{\mkbibnamegiven{#2}\isdot\addlowpenspace}%
+ \ifempty{#3}{}{%
\mkbibnameprefix{#3}\isdot
\ifpunctmark{'}
{}
{\ifuseprefix{\addhighpenspace}{\addlowpenspace}}}%
-\mkbibnamelast{#1}\isdot
- \ifblank{#4}{}{\addlowpenspace\mkbibnameaffix{#4}\isdot}}
+\mkbibnamefamily{#1}\isdot
+ \ifempty{#4}{}{\addlowpenspace\mkbibnameaffix{#4}\isdot}}
-\newbibmacro*{actor:first-last}[4]{%
+\newbibmacro*{actor:given-family}[4]{%
\usebibmacro{name:delim}{#2#3#1}%
\usebibmacro{name:hook}{#2#3#1}%
- \ifblank{#2}{}{\mkbibnamefirst{#2}\isdot\addlowpenspace}%
- \ifblank{#3}{}{%
+ \ifempty{#2}{}{\mkbibnamegiven{#2}\isdot\addlowpenspace}%
+ \ifempty{#3}{}{%
\mkbibnameprefix{#3}\isdot
\ifpunctmark{'}
{}
{\ifuseprefix{\addhighpenspace}{\addlowpenspace}}}%
-\mkbibnamelast{#1}\isdot
- \ifblank{#4}{}{\addlowpenspace\mkbibnameaffix{#4}\isdot}}
+\mkbibnamefamily{#1}\isdot
+ \ifempty{#4}{}{\addlowpenspace\mkbibnameaffix{#4}\isdot}}
\newbibmacro*{name:delimfirst}[1]{%
\ifthenelse{\value{listcount}>\value{liststart}}
@@ -729,7 +779,8 @@ january = {Januar},
\renewbibmacro*{finentry}{\iftoggle{intransdecision}%
{\unspace}{\addperiod}} % unklar, warum \finentry nicht geht
-\renewcommand{\bibsetup}{\raggedright}
+\appto{\bibsetup}{\RaggedRight}
+%\appto{\bibsetup}{\setlength{\emergencystretch}{8em}}
\newcommand*{\mkibid}[1]{#1}
\newrobustcmd{\film}{\textsc}
@@ -876,11 +927,11 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} )
{\bibnamedash}
{\iftoggle{isreview}{}{\usebibmacro{bbx:savehash}}%
\printnames{author}%
- \iffieldundef{nameaddon}{}
- {\printfield{nameaddon}}%
- \iffieldundef{authortype}
- {\setunit{\addspace}\addcolon\addspace}
- {\setunit{\addcomma\space}}}%
+ \iffieldundef{nameaddon}{}%
+ {\printfield{nameaddon}}%
+ \iffieldundef{authortype}
+ {\setunit{\addspace}\addcolon\addspace}
+ {\setunit{\addcomma\space}}}%
\iffieldundef{authortype}
{}
{\usebibmacro{authorstrg}\addcolon\addspace%
@@ -1036,7 +1087,7 @@ or test {\ifentrytype{set}}}
{\setunit{\addspace}\printtext[origyearart]{\printfield{year}%
\iffieldundef{endyear}%
{}{\printfield{endyear}}}}
- {\iffieldundef{origtitle}
+ {\ifboolexpr{ (test{\iffieldundef{origtitle}} and not test {\ifentrytype{bookinbook}})}
{\setunit{\addspace}\printtext[origyearart]{\printfield{origyear}%
\iffieldundef{origendyear}%
{}{\printfield{origendyear}}}}