diff options
author | Karl Berry <karl@freefriends.org> | 2012-12-10 21:24:38 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-12-10 21:24:38 +0000 |
commit | 362f16976de82e4f2551304ab60382bb4257bd12 (patch) | |
tree | 3178380e2e10caf623e39cd8b04404c88a15e75e /Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx | |
parent | 1f3eb662eba1d792d0aff58cbe37f0976f330bb3 (diff) |
biblatex-fiwi (10dec12)
git-svn-id: svn://tug.org/texlive/trunk@28491 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx')
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx | 36 |
1 files changed, 12 insertions, 24 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx index 483d52aa2f6..185f5e0ebe8 100644 --- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx @@ -1,19 +1,21 @@ -% $Id: fiwi.cbx,v 1.2a 2012/12/03 Simon Spiegel +% $Id: fiwi.cbx,v 1.2b 2012/12/09 Simon Spiegel \ProvidesFile{fiwi.cbx} -[\abx@cbxid $Id: fiwi.cbx,v 1.2a 2012/12/03 spiegel $] +[\abx@cbxid $Id: fiwi.cbx,v 1.2b 2012/12/09 spiegel $] \ExecuteBibliographyOptions{labelyear,autocite=inline,firstinits=false,uniquename=full,uniquelist=true} +\RequireBibliographyStyle{fiwi} + + \newbool{cbx@bool} \providetoggle{citefullfilm} \newcommand*{\fullcitefilm}{\settoggle{citefullfilm}{true}} \DeclareBibliographyOption{fullcitefilm}[false]{\settoggle{citefullfilm}{#1}} - \providetoggle{citecompletefilm} \newcommand*{\completecitefilm}{\settoggle{citecompletefilm}{true}} @@ -37,29 +39,15 @@ \providetoggle{xindy} \DeclareBibliographyOption{xindy}[true]{\settoggle{xindy}{#1}} -\DeclareFieldFormat{tvmaintitle}{\film{#1}\addcolon\addspace} + \DeclareFieldFormat{citeyear}{\mkbibparens{#1}} -%\DeclareFieldFormat{labelyear}{\mknumalph{#1}} -\DeclareFieldFormat{film}{\film{#1}} -\DeclareFieldFormat[misc]{subtitle}{#1} -\DeclareFieldFormat[movie]{subtitle}{#1} -\DeclareFieldFormat{title}{\mkbibemph{#1}} \DeclareFieldFormat{citetitle:incollection}{\emph{#1}\isdot} -\DeclareFieldFormat[misc]{citetitle}{\film{#1}} -\DeclareIndexFieldFormat[misc]{indextitle}{% +\DeclareFieldFormat[misc,video,movie]{citetitle}{\film{#1}} +\DeclareIndexFieldFormat[movie,misc,video]{indextitle}{% \usebibmacro{index:filmtitle}{\index}{#1}} \DeclareIndexNameFormat{default}{% \iftoggle{xindy}{\usebibmacro{xindy:name}{\index}{#1}{#3}{#5}{#7}} {\usebibmacro{index:name}{\index}{#1}{#3}{#5}{#7}}} -\DeclareFieldAlias[movie]{title}[misc]{title} -\DeclareFieldAlias[video]{title}[misc]{title} - -\DeclareIndexFieldAlias[movie]{indextitle}[misc]{indextitle} -\DeclareIndexFieldAlias[video]{indextitle}[misc]{indextitle} - -\DeclareBibliographyAlias{movie}{misc} -\DeclareBibliographyAlias{video}{misc} - \DeclareNameFormat{labelname}{% \ifcase\value{uniquename}% @@ -124,7 +112,7 @@ % Zitierbefehle für Filme und Serien \newbibmacro*{cite:tv}{% -\ifciteseen{\ifboolexpr{ test {\ifnameundef{author}} +\ifciteseen{\ifboolexpr{ test {\ifnameundef{director}} and test {\iffieldundef{maintitle}}} {\iffieldundef{extratitle} {\usebibmacro{cite:filmtitle}} @@ -163,7 +151,7 @@ and test {\iffieldundef{maintitle}}} \printtext[bibhyperref]{\printfield[film]{title} \addspace\mkbibparens{% \printlist{location}\iflistundef{organization}{}{\addcomma\addspace\printlist{organization}}\addspace\printfield[]{year}\addcomma\addspace% -\printnames[director]{author}\unspace}}}% +\printnames[director]{director}\unspace}}}% \newbibmacro*{cite:film}{% \iftoggle{citefullfilm}% @@ -211,14 +199,14 @@ and test {\iftoggle{citecompletefilm}}} \printtext[bibhyperref]{\printfield[film]{title}}% \addspace\printtext[citeyear]% {\printfield{subtitle}\setunit*{\addcomma\addspace}% - \printnames[director]{author}\addcomma\addthinspace\printlist{location}% + \printnames[director]{director}\addcomma\addthinspace\printlist{location}% \addspace\printfield{year}} } \newbibmacro*{cite:film:directorcountry}{% Film mit Regisseur \printtext[bibhyperref]{\printfield[film]{title}}% \addspace\mkbibparens{% - \printnames[director]{author}% + \printnames{director}% \addcomma\addthinspace\printlist{location}\addspace\printfield{year}}} \newbibmacro*{cite}{% |