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-yearbeginning.bbx | |
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-yearbeginning.bbx')
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi-yearbeginning.bbx | 73 |
1 files changed, 49 insertions, 24 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 727584961a8..83b5943b645 100644 --- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi-yearbeginning.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi-yearbeginning.bbx @@ -1,12 +1,14 @@ -% $Id: fiwi-yearbeginning.bbx, v 1.1e 2011/12/21 Simon Spiegel +% $Id: fiwi-yearbeginning.bbx, v 1.1e 2012/02/16 Simon Spiegel % Stil mit Jahrestahl nach Autor -\ProvidesFile{fiwi-yearbeginning.bbx}[v 1.1d 2011/12/21 film studies bibliography style Author (Year)] +\ProvidesFile{fiwi-yearbeginning.bbx}[v 1.1e 2012/02/16 film studies bibliography style Author (Year)] + +\RequireBibliographyStyle{fiwi} \ExecuteBibliographyOptions{indexing=cite,maxnames=4,minnames=4,maxitems=9,useprefix=true,sorting=nyt,date=long,urldate=long,hyperref=auto,pagetracker=true,ibidtracker=context,citetracker=true,labelyear=true} \DeclareFieldFormat{yearparens}{\mkbibparens{#1}\iffieldequalstr{entrytype}{collection}{}{\addcolon\addspace}} -\DeclareFieldFormat{pages}{#1} +%\DeclareFieldFormat{pages}{#1} \renewcommand{\ppspace}{} @@ -22,19 +24,20 @@ \ifboolexpr{ ( not test {\iffieldundef{origyear}} and test {\iftoggle{origyearwithyear}} and test {\iffieldundef{origtitle}} ) }% - {\addslash\printfield{origyear}}% + {\iftoggle{origyearbrackets} + {\addthinspace\mkbibbrackets{\printfield{origyear}}} + {\addslash\printfield{origyear}}}% {}% }}} \renewbibmacro*{incollectioneditor}{% \ifnameundef{editor} - {\let\bbx@lasthash\@undefined} + {} {{\ifnamesequal{author}{editor}{% \ifthenelse{\value{author}>1}% {\bibstring{idempp}}% {\bibstring{idem\thefield{gender}}}}{% - \printnames{editor}}\addspace - \global\undef\bbx@lasthash}% + \printnames{editor}}\addspace}% \iffieldequalstr{entrytype}{book}{}{\usebibmacro{editorstrg}}}} \renewbibmacro*{editorstrg}{% @@ -55,7 +58,10 @@ \renewbibmacro*{issue+date}{% - \iffieldundef{pages}{}{\ifterm{}{\setunit{\addcomma\addspace}}}\iffieldundef{issuetitle}{\setunit*{\addcomma}}{\addthinspace}\printtext{% + \iffieldundef{pages} + {} + {\ifterm{}{\setunit{\addcomma\addspace}}} + \iffieldundef{issuetitle}{\setunit*{\addcomma}}{\addthinspace}\printtext{% \iffieldundef{issue}% {\iffieldundef{month}% {}% @@ -66,20 +72,26 @@ {\printfield{issue}}}}% \renewbibmacro*{journal+issuetitle}{% - \usebibmacro{journal}\addperiod% + \iffieldequalstr{entrytype}{periodical} + {\usebibmacro{periodical}} + {\usebibmacro{journal}}% \setunit*{\addspace}% \iffieldundef{series} {} {\newunit \printfield{series}% \setunit{\addspace}}% -\iffieldundef{volume}{}{\printfield{volume}\iffieldundef{number}{\iffieldundef{pages}{\addperiod}{\addcomma}}{\addcomma}}% - \setunit*{\addperiod\addspace}% -\iffieldundef{number}{}{\printtext{\addspace\printfield{number}}\addspace}% -\ifnameundef{editor}{}{\addperiod\addspace\usebibmacro{byeditor}\setunit{\addcomma\space}}% +\iffieldundef{volume}{}{\newunit\printfield{volume}% +\iffieldundef{number}% + {\iffieldundef{pages}{\addperiod}{\addcomma}} + {\addcomma}}% +\iffieldundef{number} + {}{\printtext{\addspace\printfield{number}}\addspace}% +\iffieldequalstr{entrytype}{periodical}{\usebibmacro{labelyear+extrayear}}{} \printfield{eid}%% \usebibmacro{issue+date}% -\iffieldundef{issuetitle}{}{\addcolon\addspace\printtext{\usebibmacro{issue}}}% +\iffieldundef{issuetitle}{}{\addcolon\addspace\printtext{\usebibmacro{issue}}} +\ifnameundef{editor}{}{\addperiod\addspace\usebibmacro{byeditor}\setunit{\addcomma\space}}%% } \renewbibmacro*{org+publ+loc+year}{% @@ -130,8 +142,10 @@ } {\usebibmacro{bbx:dashcheck} {\bibnamedash} - {\usebibmacro{bbx:savehash}% + {\iftoggle{isreview}{}{\usebibmacro{bbx:savehash}}% \printnames{author}% + \iffieldundef{nameaddon}{} + {\printfield{nameaddon}}% \iffieldundef{authortype} {\setunit{\addspace}} {\setunit{\addcomma\space}}}% @@ -149,16 +163,24 @@ \def\do##1{\toggletrue{dontprintextrayear}\printtext[germfassung]{% \fullcite{##1}}}% \@tempa\toggletrue{dontprintorig}% - \togglefalse{dontprintextrayear}\togglefalse{intransdecision}} + \togglefalse{dontprintextrayear}\togglefalse{intransdecision}} + +\renewbibmacro*{labeltitle}{% + \iffieldundef{label} + {\iffieldundef{shorttitle} + {\printfield{title}% + \clearfield{title}} + {\printfield[title]{shorttitle}}} + {\printfield{label}}} \DeclareBibliographyDriver{review}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/translator}% \usebibmacro{labelyear+extrayear}% -\newblock +\newblock\toggletrue{isreview} \usebibmacro{review}{\thefield{usera}}% -\newunit\newblock +\togglefalse{isreview}\newunit\newblock \usebibmacro{bytranslator}% \newunit\newblock \usebibmacro{in:}% @@ -190,14 +212,16 @@ \usebibmacro{in:}% %\newblock% \usebibmacro{journal+issuetitle}% -\iffieldundef{pages}{\setunit{\addperiod}}{\addcomma\addspace\printfield{pages}}% +\iffieldundef{pages} + {\setunit{\addperiod}} + {\addcomma\addspace\printfield{pages}}% \newunit\newblock% \bibsentence\printfield{note}% \newunit\newblock% \usebibmacro{doi+eprint+url}% %\setunit{.}\newblock %\addspace\usebibmacro{origyear+location+title}% -\newblock +%\newblock \addspace\usebibmacro{decidetranslatedversion}% \newblock \usebibmacro{addendum+pubstate}% @@ -222,7 +246,8 @@ \iftoggle{partofcited} {\iffieldundef{xref} {\mancite\textcite{\thefield{crossref}}} - {\mancite\textcite{\thefield{xref}}}} + {\mancite\textcite{\thefield{xref}}} + \usebibmacro{chap+pag}} {\newblock% \ifnameundef{bookauthor}% {\ifnameundef{editor} @@ -259,10 +284,10 @@ \newunit\newblock% \usebibmacro{chap+pag}% %\setunit{\par}\newblock - %\usebibmacro{doi+eprint+url}% - \newblock \addspace\usebibmacro{decidetranslatedversion}% \newblock + \usebibmacro{doi+eprint+url}% + \newblock \usebibmacro{addendum+pubstate}% \newblock} \usebibmacro{pageref}% @@ -296,7 +321,7 @@ \newunit\newblock% \usebibmacro{publ+loc+origyear}% \usebibmacro{chap+pag}% -\newblock +\newblock\newunit \usebibmacro{doi+eprint+url}% \addspace\usebibmacro{decidetranslatedversion}% \newblock |