diff options
author | Karl Berry <karl@freefriends.org> | 2012-02-17 23:33:56 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-02-17 23:33:56 +0000 |
commit | c94e6d2a1e2cacd088b3b20469474a895f8cf41c (patch) | |
tree | f494b13cd4e43abc4b69dfac683a73d93764122c /Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx | |
parent | 4adc343d387e50a8d0c103e680325456af1e0242 (diff) |
biblatex-fiwi 1.1e (17feb12)
git-svn-id: svn://tug.org/texlive/trunk@25415 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 | 108 |
1 files changed, 57 insertions, 51 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx index 60027c4224c..0113e900f62 100644 --- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx @@ -1,11 +1,13 @@ -% $Id: fiwi.cbx,v 1.1d 2011/12/21 Simon Spiegel +% $Id: fiwi.cbx,v 1.1e 2012/02/16 Simon Spiegel \ProvidesFile{fiwi.cbx} -[\abx@cbxid $Id: fiwi.cbx,v 1.1d 2011/12/21 spiegel $] +[\abx@cbxid $Id: fiwi.cbx,v 1.1e 2012/02/16 spiegel $] \ExecuteBibliographyOptions{labelyear,autocite=inline,firstinits=false,uniquename=full,uniquelist=true} + + \newbool{cbx@bool} \providetoggle{citefullfilm} \newcommand*{\fullcitefilm}{\settoggle{citefullfilm}{true}} @@ -15,6 +17,18 @@ \providetoggle{citecompletefilm} \newcommand*{\completecitefilm}{\settoggle{citecompletefilm}{true}} +\DeclareBibliographyOption{citefilm}[normal]{% +\ifstrequal{#1}{normal} +{} +{} +\ifstrequal{#1}{full} +{\settoggle{citefullfilm}{true}} +{} +\ifstrequal{#1}{complete} +{\settoggle{citecompletefilm}{true}} +{} +}% + \renewcommand*{\nameyeardelim}{\addspace} \renewcommand*{\bibindexnamedelimi}{\,} @@ -127,47 +141,37 @@ \printlist{location}\iflistundef{organization}{}{\addcomma\addspace\printlist{organization}}\addspace\printfield[]{year}\addcomma\addspace% \printnames[director]{author}\unspace}}}% -\newbibmacro*{citef}{% - \ifciteseen - {\iffieldundef{shorttitle} - {\printtext[bibhyperref]{\printfield[film]{title}}} - {\printtext[bibhyperref]{\printfield[film]{shorttitle}}}} - {\printtext[bibhyperref]{\printfield[film]{title}}% - \addspace\printfield[citeyear]{year}}} +\newbibmacro*{cite:film}{% +\iftoggle{citefullfilm}% + {\usebibmacro{cite:film:directorcountry}} + {\iftoggle{citecompletefilm}% + {\usebibmacro{cite:film:directorcountrytranstitle}} + {\printtext[bibhyperref]{\printfield[film]{title}}% + \addspace\printfield[citeyear]{year}}}} + +\newbibmacro*{cite:film:seen}{% + \iffieldundef{shorttitle} + {\printtext[bibhyperref]{\printfield[film]{title}}} + {\printtext[bibhyperref]{\printfield[film]{shorttitle}}}} -\newbibmacro*{citecf}{% +\newbibmacro*{cite:film:countryear}{% \printtext[bibhyperref]{\printfield[film]{title} \addspace\mkbibparens{\printlist{location}\addspace\printfield{year}}}} -\newbibmacro*{citefilmcomplete}{% Film bei erster Nennung mit Regisseur, Land und dt. Titel - \ifciteseen - {\iffieldundef{shorttitle} - {\printtext[bibhyperref]{\printfield[film]{title}}} - {\printtext[bibhyperref]{\printfield[film]{shorttitle}}}} - {\printtext[bibhyperref]{\printfield[film]{title}}% - \addspace\printtext[citeyear]{\printfield{subtitle}\setunit*{\addcomma\addspace}\printnames[director]{author}\addcomma\addthinspace\printlist{location}\addspace\printfield{year}}}} - -\newbibmacro*{citeff}{% Film bei erster nennung mit Regisseur - \ifciteseen - {\iffieldundef{shorttitle} - {\printtext[bibhyperref]{\printfield[film]{title}}} - {\printtext[bibhyperref]{\printfield[film]{shorttitle}}}} - {\printtext[bibhyperref]{\printfield[film]{title}}% - \addspace\mkbibparens{\printnames[director]{author}\addcomma\addthinspace\printlist{location}\addspace\printfield{year}}}} - - \newbibmacro*{citeffs}{% volle zweitnennung ohne land und jahr +\newbibmacro*{cite:film:directorcountrytranstitle}{% Film mit Regisseur, Land und dt. Titel \printtext[bibhyperref]{\printfield[film]{title}}% - \addspace\mkbibparens{\printfield[]{year}}} - -\newbibmacro*{citefff}{% volle zweitnennung mit land und jahr - \printtext[bibhyperref]{\printfield[film]{title}}% - \addspace\mkbibparens{\printnames[director]{author}\addcomma\addthinspace\printlist{location}\addspace\printfield{year}}} + \addspace\printtext[citeyear]% + {\printfield{subtitle}\setunit*{\addcomma\addspace}% + \printnames[director]{author}\addcomma\addthinspace\printlist{location}% + \addspace\printfield{year}} + } -\newbibmacro*{citefilm2complete}{% volle zweitnennung mit Regisseur, Land und dt. Titel +\newbibmacro*{cite:film:directorcountry}{% Film mit Regisseur \printtext[bibhyperref]{\printfield[film]{title}}% - \addspace\printtext[citeyear]{\printfield{subtitle}\setunit*{\addcomma\addspace}\printnames[director]{author}\addcomma\addthinspace\printlist{location}\addspace\printfield{year}}} - - + \addspace\mkbibparens{% + \printnames[director]{author}% + \addcomma\addthinspace\printlist{location}\addspace\printfield{year}}} + \newbibmacro*{cite}{% \iffieldundef{shorthand} {\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{year}\AND\iffieldundef{urlyear}}% @@ -287,6 +291,17 @@ {\multicitedelim} {\usebibmacro{postnote}} +\DeclareCiteCommand{\inparencite}[] + {} + {\usebibmacro{citeindex}% + \printnames{labelname} + \bibopenparen% + \usebibmacro{prenote}% + \usebibmacro{citeyear}}% + {\multicitedelim}% + {\usebibmacro{postnote} + \unspace\bibcloseparen} + \DeclareCiteCommand{\citetitle} {\citetrackerfalse \pagetrackerfalse @@ -369,39 +384,30 @@ {\indexfield{indextitle}% \iffieldequalstr{entrysubtype}{serial} {\usebibmacro{citeserial}} - {\iftoggle{citefullfilm}% - {\usebibmacro{citeff}} - {\iftoggle{citecompletefilm}% - {\usebibmacro{citefilmcomplete}} - {\usebibmacro{citef}}}}} + {\ifciteseen{\usebibmacro{cite:film:seen}} + {\usebibmacro{cite:film}}}} {\multicitedelim} {\usebibmacro{postnote}} \DeclareCiteCommand{\citecfilm} {\usebibmacro{prenote}} {\indexfield{indextitle}% - \usebibmacro{citecf}} + \usebibmacro{cite:film:countryear}} {\multicitedelim} {\usebibmacro{postnote}} - - \DeclareCiteCommand{\citefullfilm} +\DeclareCiteCommand{\citefullfilm} {\usebibmacro{prenote}} {\indexfield{indextitle}% \iffieldequalstr{entrysubtype}{serial} {\usebibmacro{citeserialfull}} - {\iftoggle{citefullfilm}% - {\usebibmacro{citefff}}% - {\iftoggle{citecompletefilm} - {\usebibmacro{citefilm2complete}}{\usebibmacro{citeffs}} - }% - }} + {\usebibmacro{cite:film}}} {\multicitedelim} {\usebibmacro{postnote}} \DeclareCiteCommand{\citefilmnoindex} {\usebibmacro{prenote}} - {\usebibmacro{citef}} + {\usebibmacro{cite:film}} {\multicitedelim} {\usebibmacro{postnote}} |