diff options
author | Karl Berry <karl@freefriends.org> | 2012-07-22 22:53:22 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-07-22 22:53:22 +0000 |
commit | 8552ae7941203f1a1cf1779b74b219b9b838a7e3 (patch) | |
tree | ef9d45d7b5de601712097d38d048ad6555438f11 /Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx | |
parent | 6fd75aabad83fbb48ec147ceff36a609f6e1e6ba (diff) |
biblatex-fiwi 1.2 (19jul12)
git-svn-id: svn://tug.org/texlive/trunk@27096 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 | 91 |
1 files changed, 73 insertions, 18 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx index 0113e900f62..6ef2ff58d32 100644 --- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx @@ -1,7 +1,7 @@ -% $Id: fiwi.cbx,v 1.1e 2012/02/16 Simon Spiegel +% $Id: fiwi.cbx,v 1.2 2012/07/20 Simon Spiegel \ProvidesFile{fiwi.cbx} -[\abx@cbxid $Id: fiwi.cbx,v 1.1e 2012/02/16 spiegel $] +[\abx@cbxid $Id: fiwi.cbx,v 1.2 2012/07/20 spiegel $] \ExecuteBibliographyOptions{labelyear,autocite=inline,firstinits=false,uniquename=full,uniquelist=true} @@ -37,7 +37,7 @@ \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}} @@ -117,11 +117,29 @@ \newcommand{\Citealts}{\Cites} \renewbibmacro*{citeindex}{% - \indexnames[indexname]{labelname}}% + \ifciteindex{% + \indexnames[indexname]{labelname}} + {}}% % Zitierbefehle für Filme und Serien -\newbibmacro*{citeserial}{% +\newbibmacro*{cite:tv}{% +\ifciteseen{\ifboolexpr{ test {\ifnameundef{author}} +and test {\iffieldundef{maintitle}}} +{\iffieldundef{extratitle} +{\usebibmacro{cite:filmtitle}} +{\usebibmacro{cite:filmtitle}\addspace\mkbibparens{\printdate}}} +{\usebibmacro{cite:filmtitle}}} +{\usebibmacro{cite:filmtitle} +\addspace\mkbibparens{% +\iflistundef{organization} +{\printlist{location}} +{\printlist{organization}\addcomma} +\printdate}}% +} + + +\newbibmacro*{cite:serial}{% \ifciteseen {\iffieldundef{shorttitle} {\printtext[bibhyperref]{\printfield[film]{title}}} @@ -134,8 +152,14 @@ \printfield{year}}}}% } +\newbibmacro*{cite:filmtitle} +{\iffieldundef{maintitle} +{\printtext[bibhyperref]{\printfield[film]{title}}}% +{\printtext[bibhyperref]{\printfield[tvmaintitle]{maintitle}% +\printfield[film]{title}}} +} -\newbibmacro*{citeserialfull}{% +\newbibmacro*{cite:serialfull}{% \printtext[bibhyperref]{\printfield[film]{title} \addspace\mkbibparens{% \printlist{location}\iflistundef{organization}{}{\addcomma\addspace\printlist{organization}}\addspace\printfield[]{year}\addcomma\addspace% @@ -146,12 +170,37 @@ {\usebibmacro{cite:film:directorcountry}} {\iftoggle{citecompletefilm}% {\usebibmacro{cite:film:directorcountrytranstitle}} - {\printtext[bibhyperref]{\printfield[film]{title}}% + {\usebibmacro{cite:filmtitle}% \addspace\printfield[citeyear]{year}}}} +\newbibmacro*{cite:episode} +{\ifboolexpr{not test {\iffieldequalstr{entrysubtype}{tv}} +and not test {\ifciteseen} +and test {\iftoggle{citefullfilm}}} +{\usebibmacro{cite:film:directorcountry}} +{\ifboolexpr{not test {\iffieldequalstr{entrysubtype}{tv}} +and not test {\ifciteseen} +and test {\iftoggle{citecompletefilm}}} +{\usebibmacro{cite:film:directorcountrytranstitle}} +{\printtext[bibhyperref]{\printfield[film]{title}}% +\ifciteseen{}{% +\iffieldequalstr{entrysubtype}{tv} +{\addspace\mkbibparens{% +\iflistundef{organization} +{\printlist{location}}% +{\printlist{organization}\addcomma} +\printdate}}{% +\addspace\mkbibparens{% +\iflistundef{organization} +{\printlist{location}} +{\printlist{organization}} +\printfield{year}}}}}% +}% +} + \newbibmacro*{cite:film:seen}{% \iffieldundef{shorttitle} - {\printtext[bibhyperref]{\printfield[film]{title}}} + {\usebibmacro{cite:filmtitle}} {\printtext[bibhyperref]{\printfield[film]{shorttitle}}}} \newbibmacro*{cite:film:countryear}{% @@ -212,9 +261,7 @@ \newbibmacro*{cite:year+labelyear}{% \printtext[bibhyperref]{% \iffieldundef{year}% - {\iffieldequalstr{entrytype}{online}% - {\printfield{urlyear}}% - {}}% + {\bibstring[\mkbibbrackets]{undated}\printfield{extrayear}}% {\printfield{labelyear}}% \printfield{extrayear}}} @@ -276,8 +323,8 @@ \DeclareCiteCommand{\parencite}[\mkbibparens] {\usebibmacro{prenote}} {\ifthenelse{\ifciteibid\AND - \NOT\iffirstonpage} - {\bibstring[\mkibid]{ibidem}} + \NOT\iffirstonpage}% + {\bibstring[\mkibid]{ibidem}\unspace}% {\usebibmacro{citeindex}% \usebibmacro{cite}}} {\multicitedelim} @@ -379,13 +426,21 @@ {\addspace\bibopenparen}% \printfield{postnote}\bibcloseparen}} +\DeclareCiteCommand{\citeepisode} + {\usebibmacro{prenote}} + {\indexfield{indextitle}% + \usebibmacro{cite:episode}} + {\multicitedelim} + {\usebibmacro{postnote}} + \DeclareCiteCommand{\citefilm} {\usebibmacro{prenote}} {\indexfield{indextitle}% - \iffieldequalstr{entrysubtype}{serial} - {\usebibmacro{citeserial}} - {\ifciteseen{\usebibmacro{cite:film:seen}} - {\usebibmacro{cite:film}}}} + \iffieldequalstr{entrysubtype}{serial}% + {\usebibmacro{cite:serial}}% + {\iffieldequalstr{entrysubtype}{tv}% + {\usebibmacro{cite:tv}}{\ifciteseen{\usebibmacro{cite:film:seen}} + {\usebibmacro{cite:film}}}}} {\multicitedelim} {\usebibmacro{postnote}} @@ -400,7 +455,7 @@ {\usebibmacro{prenote}} {\indexfield{indextitle}% \iffieldequalstr{entrysubtype}{serial} - {\usebibmacro{citeserialfull}} + {\usebibmacro{cite:serialfull}} {\usebibmacro{cite:film}}} {\multicitedelim} {\usebibmacro{postnote}} |