From f1f526bab825b8ba866d9751f50373df25072817 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 23 Dec 2011 00:39:07 +0000 Subject: biblatex-fiwi 1.1d (22dec11) git-svn-id: svn://tug.org/texlive/trunk@24913 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/biblatex-fiwi/fiwi-yearbeginning.bbx | 76 +++++++--- Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx | 167 +++++++++++++++------ Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx | 6 +- .../texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx | 4 +- .../texmf-dist/tex/latex/biblatex-fiwi/fiwi2.cbx | 4 +- 5 files changed, 179 insertions(+), 78 deletions(-) (limited to 'Master/texmf-dist/tex/latex/biblatex-fiwi') 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 0288ca603a5..727584961a8 100644 --- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi-yearbeginning.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi-yearbeginning.bbx @@ -1,13 +1,14 @@ -% $Id: fiwi-yearbeginning.bbx, v 1.1c 2011/12/03 Simon Spiegel +% $Id: fiwi-yearbeginning.bbx, v 1.1e 2011/12/21 Simon Spiegel % Stil mit Jahrestahl nach Autor -\ProvidesFile{fiwi-yearbeginning.bbx}[v 1.1c 2011/12/03 film studies bibliography style Author (Year)] +\ProvidesFile{fiwi-yearbeginning.bbx}[v 1.1d 2011/12/21 film studies bibliography style Author (Year)] \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} + \renewcommand{\ppspace}{} \renewbibmacro*{labelyear+extrayear}{% @@ -24,11 +25,8 @@ {\addslash\printfield{origyear}}% {}% }}} - - - -\renewbibmacro*{editor}{% +\renewbibmacro*{incollectioneditor}{% \ifnameundef{editor} {\let\bbx@lasthash\@undefined} {{\ifnamesequal{author}{editor}{% @@ -36,9 +34,9 @@ {\bibstring{idempp}}% {\bibstring{idem\thefield{gender}}}}{% \printnames{editor}}\addspace - \savefield{namehash}{\bbx@lasthash}}% + \global\undef\bbx@lasthash}% \iffieldequalstr{entrytype}{book}{}{\usebibmacro{editorstrg}}}} - + \renewbibmacro*{editorstrg}{% \printtext{\mkbibparens{\unspace \ifnum\theeditor>1 @@ -76,7 +74,7 @@ \printfield{series}% \setunit{\addspace}}% \iffieldundef{volume}{}{\printfield{volume}\iffieldundef{number}{\iffieldundef{pages}{\addperiod}{\addcomma}}{\addcomma}}% - \setunit*{\adddot}% + \setunit*{\addperiod\addspace}% \iffieldundef{number}{}{\printtext{\addspace\printfield{number}}\addspace}% \ifnameundef{editor}{}{\addperiod\addspace\usebibmacro{byeditor}\setunit{\addcomma\space}}% \printfield{eid}%% @@ -100,7 +98,7 @@ \iftoggle{printpublisher} {\setunit{\isdot\addcolon\addspace}\printlist{publisher}\setunit{\addcomma\space}}% {} - }} + \iftoggle{dontprintorig}{\printfield{labelyear}}{}}} \newbibmacro*{publ+loc+origyear}{% \printlist{location}% @@ -109,7 +107,7 @@ {\setunit*{\space}}% {\setunit{\isdot\addcolon\space}\printlist{publisher}}}% {\setunit*{\space}}% -\usebibmacro{origyear}% +\iftoggle{dontprintorig}{\iftoggle{printpublisher}{\addspace}{}\printfield{labelyear}}{}\usebibmacro{origyear}% }% \newbibmacro*{inst+loc}{% @@ -124,6 +122,34 @@ \setunit{\isdot\addcolon\space}}% \printlist{institution}}} +\renewbibmacro*{author}{% + \ifboolexpr{ + test \ifuseauthor + and + not test {\ifnameundef{author}} + } + {\usebibmacro{bbx:dashcheck} + {\bibnamedash} + {\usebibmacro{bbx:savehash}% + \printnames{author}% + \iffieldundef{authortype} + {\setunit{\addspace}} + {\setunit{\addcomma\space}}}% + \iffieldundef{authortype} + {} + {\usebibmacro{authorstrg}% + \setunit{\addspace}}}% + {\global\undef\bbx@lasthash + \usebibmacro{labeltitle}% + \setunit*{\addspace}}} + +\renewbibmacro*{translatedversion}[1]{% + \toggletrue{intransdecision}% + \edef\@tempa{\noexpand\docsvlist{#1}}% + \def\do##1{\toggletrue{dontprintextrayear}\printtext[germfassung]{% + \fullcite{##1}}}% + \@tempa\toggletrue{dontprintorig}% + \togglefalse{dontprintextrayear}\togglefalse{intransdecision}} \DeclareBibliographyDriver{review}{% \usebibmacro{bibindex}% @@ -170,10 +196,10 @@ \newunit\newblock% \usebibmacro{doi+eprint+url}% %\setunit{.}\newblock -\addspace\usebibmacro{origyear+location+title}% +%\addspace\usebibmacro{origyear+location+title}% +\newblock +\addspace\usebibmacro{decidetranslatedversion}% \newblock -\usebibmacro{decidetranslatedversion}% - \newblock \usebibmacro{addendum+pubstate}% \newunit\newblock \usebibmacro{pageref}% @@ -183,8 +209,9 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{test:partofcited}% - \usebibmacro{author/translator}% - \usebibmacro{labelyear+extrayear}% + \iftoggle{dontprintorig}{}% + {\usebibmacro{author/translator}% + \usebibmacro{labelyear+extrayear}}% %\newunit\newblock \usebibmacro{title}% \newunit\newblock @@ -193,12 +220,14 @@ \usebibmacro{in:}% %\newunit% \iftoggle{partofcited} - {\citetext{\thefield{xref}}} + {\iffieldundef{xref} + {\mancite\textcite{\thefield{crossref}}} + {\mancite\textcite{\thefield{xref}}}} {\newblock% \ifnameundef{bookauthor}% {\ifnameundef{editor} {} - {\usebibmacro{editor}}} + {\usebibmacro{incollectioneditor}}} {\usebibmacro{bybookauthor}} %\newunit \newblock% @@ -231,7 +260,7 @@ \usebibmacro{chap+pag}% %\setunit{\par}\newblock %\usebibmacro{doi+eprint+url}% - \newunit\newblock + \newblock \addspace\usebibmacro{decidetranslatedversion}% \newblock \usebibmacro{addendum+pubstate}% @@ -242,13 +271,14 @@ \DeclareBibliographyDriver{book}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% - \ifnameundef{author}% + \iftoggle{dontprintorig} + {} + {\ifnameundef{author}% {\ifnameundef{editor}% {} - {\usebibmacro{editor}\addspace}% - \usebibmacro{editorstrg}\addspace}% + {\usebibmacro{editor}\addspace}}% {\usebibmacro{author/translator+others}}% -AA\usebibmacro{labelyear+extrayear}% +\usebibmacro{labelyear+extrayear}}% \newblock \usebibmacro{mtitle+mstitle+vol+part+title+stitle}% \newunit\newblock diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx index 31da9091322..96475501b9b 100644 --- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx @@ -1,6 +1,6 @@ -% $Id: fiwi.bbx, v1.1b 2011/11/22 Simon Spiegel +% $Id: fiwi.bbx, v1.1d 2011/12/21 Simon Spiegel -\ProvidesFile{fiwi.bbx}[v1.1b 2011/11/22 film studies bibliography style] +\ProvidesFile{fiwi.bbx}[v1.1d 2011/12/21 film studies bibliography style] \@ifpackagelater{biblatex}{2011/11/12} {} @@ -14,11 +14,18 @@ \RequireBibliographyStyle{standard} \RequireBiber[2] + +\defcounter{highnamepenalty}{0} +\defcounter{lownamepenalty}{0} + +\renewcommand*{\multinamedelim}{\addslash}% +\renewcommand*{\finalnamedelim}{\addslash}% + + % Diverse Variablen \providetoggle{filmruntime} \providetoggle{citeprefix} \toggletrue{citeprefix} -\providetoggle{bibliographydash} \providetoggle{printseriesflag} \providetoggle{printpublisher} \providetoggle{germfassung} @@ -33,7 +40,12 @@ \togglefalse{origyearwithyear} \providetoggle{origyearsuperscript} \togglefalse{origyearsuperscript} +\providetoggle{partofcitedflag} +\togglefalse{partofcitedflag} +\providetoggle{partofcited} +\togglefalse{partofcited} +\DeclareBibliographyOption{partofcited}[true]{\settoggle{partofcitedflag}{#1}} \DeclareBibliographyOption{germ}[true]{\settoggle{germfassung}{#1}} \DeclareBibliographyOption{noseries}[true]{% \ifstrequal{#1}{true} @@ -46,10 +58,10 @@ \DeclareBibliographyOption{publisher}[true]{\settoggle{printpublisher}{#1}}% \DeclareBibliographyOption{filmruntime}[true]{\settoggle{filmruntime}{#1}}% \DeclareBibliographyOption{citeprefix}[true]{\settoggle{citeprefix}{#1}} +\newbibmacro*{bbx:savehash}{} \DeclareBibliographyOption{dashed}[true]{% \ifstrequal{#1}{true} - {\toggletrue{bibliographydash}% - \renewbibmacro*{bbx:savehash}{\savefield{fullhash}{\bbx@lasthash}}} + {\renewbibmacro*{bbx:savehash}{\savefield{fullhash}{\bbx@lasthash}}} {\renewbibmacro*{bbx:savehash}{}}} \DeclareBibliographyOption{yearatbeginning}[true]{% \ifstrequal{#1}{true} @@ -58,7 +70,7 @@ \DeclareBibliographyOption{origyearsuperscript}[true]{\settoggle{origyearsuperscript}{#1}} -\ExecuteBibliographyOptions{indexing=cite,maxnames=3,minnames=3,maxitems=9,useprefix=true,sorting=nyt,date=long,urldate=long,hyperref=auto,pagetracker=true,ibidtracker=context,citetracker=true,labelyear=true,isbn=false,babel=hyphen} +\ExecuteBibliographyOptions{indexing=cite,maxnames=3,minnames=1,maxitems=9,useprefix=true,sorting=nyt,date=long,urldate=long,hyperref=auto,pagetracker=true,ibidtracker=context,citetracker=true,labelyear=true,isbn=false,babel=hyphen} \ExecuteBibliographyOptions[misc,movie,video]{uniquename=false,labelyear=false} \InitializeBibliographyStyle{% @@ -68,7 +80,6 @@ \newcommand*{\filmruntime}{\toggletrue{filmruntime}}% Schaltet Filmlaufzeit in Filmographie ein \newcommand*{\nopublisher}{\togglefalse{printpublisher}}% Verlag ein oder aus, standardmässig ein \newcommand*{\noseries}{\togglefalse{printseriesflag}}% Reihe ein oder aus, standardmässig ein -\newcommand*{\bibliographydash}{\toggletrue{bibliographydash}}% Ersetzen von wiederh. Autoren in Bibliographie, standardmässig aus \newcommand*{\nociteprefix}{\togglefalse{citeprefix}}% Schaltet Namens-Prefix aus \renewcommand*{\mkbibnameprefix}[1]{#1\addspace} @@ -153,14 +164,21 @@ % name format definitions -\DeclareNameFormat{sortname}{% - \iffirstinits - {\usebibmacro{name:last-first}{#1}{#4}{\bibsentence#5}{#7}}% - {\usebibmacro{name:last-first}{#1}{#3}{\bibsentence#5}{#7}}%#5 - \ifblank{#3#5} - {} - {\usebibmacro{name:revsdelim}}% + + + \DeclareNameFormat{sortname}{% + \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} + {} + {\usebibmacro{name:revsdelim}}} + {\iffirstinits + {\usebibmacro{name:last-first}{#1}{#4}{\bibsentence#5}{#7}} + {\usebibmacro{name:last-first}{#1}{#3}{\bibsentence#5}{#7}}}% \usebibmacro{name:andothers}} + \DeclareNameFormat{bytranslator}{% \iffirstinits @@ -190,6 +208,7 @@ \mkbibnamelast{#1}\isdot \ifblank{#4}{}{\addlowpenspace\mkbibnameaffix{#4}\isdot}} + \renewbibmacro*{name:last-first}[4]{% \ifuseprefix% {\usebibmacro{name:delim}{#3#1}% @@ -455,35 +474,61 @@ january = {Januar}, \printfield{pubstate}} \renewbibmacro*{author}{% -\iftoggle{usera} -{} -{% - \ifnameundef{author} - {\let\bbx@lasthash\@undefined} - \iftoggle{bibliographydash} - {\usebibmacro{bbx:dashcheck} - {\bibnamedash}% - {\usebibmacro{bbx:savehash}% - \printnames{author}\iffieldundef{nameaddon} - {}{\printfield{nameaddon}}}% - \isdot\addcolon\addspace} - {\printnames{author}\iffieldundef{nameaddon} - {}{\printfield{nameaddon}}% - \global\undef\bbx@lasthash% - \isdot\addcolon\addspace% - }}}% + \ifboolexpr{ + test \ifuseauthor + and + not test {\ifnameundef{author}} + } + {\usebibmacro{bbx:dashcheck} + {\bibnamedash} + {\usebibmacro{bbx:savehash}% + \printnames{author}% + \iffieldundef{authortype} + {\setunit{\addspace}\addcolon\addspace} + {\setunit{\addcomma\space}}}% + \iffieldundef{authortype} + {} + {\usebibmacro{authorstrg}\addcolon\addspace% + \setunit{\addspace}}}% + {\global\undef\bbx@lasthash + \usebibmacro{labeltitle}% + \setunit*{\addspace}}} + + \renewbibmacro*{editor}{% + \usebibmacro{bbx:editor}{editorstrg}} +\renewbibmacro*{editor+others}{% + \usebibmacro{bbx:editor}{editor+othersstrg}} +\newbibmacro*{bbx:editor}[1]{% + \ifboolexpr{ + test \ifuseeditor + and + not test {\ifnameundef{editor}} + } + {\usebibmacro{bbx:dashcheck} + {\bibnamedash} + {\printnames{editor}% + \addspace% + \usebibmacro{bbx:savehash}}% + \usebibmacro{#1}% + \clearname{editor}% + \setunit{\addspace}}% + {\global\undef\bbx@lasthash + \usebibmacro{labeltitle}% + \setunit*{\addspace}}} + +\newbibmacro*{incollectioneditor}{% \ifnameundef{editor} {} {\iftoggle{dontprintorig}% - {\printnames{editor}\addspace} + {\printnames{editor}}% {\ifnamesequal{author}{editor}% {\ifthenelse{\value{author}>1}% - {\bibstring{idempp}}% - {\bibstring{idem\thefield{gender}}}}% - {\printnames{editor}}\addspace}}% - \usebibmacro{editorstrg}} + {\bibstring{idempp}\addnbspace}% + {\bibstring{idem\thefield{gender}}\addnbspace}}% + {\printnames{editor}}}}% + \usebibmacro{editorstrg}} \newbibmacro*{collby}{% \ifnameundef{author}% @@ -597,10 +642,6 @@ or test {\iffieldequalstr{entrytype}{set}}} \newunit \printfield{titleaddon}} -\newbibmacro*{bbx:savehash}{% - \savefield{fullhash}{\bbx@lasthash}} - - \newbool{bbx@inset} \DeclareBibliographyDriver{set}{% @@ -631,7 +672,9 @@ or test {\iffieldequalstr{entrytype}{set}}} } {#1} {#2}} - + + + \newbibmacro*{decidetranslatedversion} {% \iftoggle{dontprintorig} @@ -823,13 +866,38 @@ or test {\iffieldequalstr{entrytype}{set}}} \iftoggle{printseriesflag}% {\iffieldundef{series}% {}% - {\setunit{}\addnbspace\printtext{\mkbibparens{=\addspace% + {\setunit{}\addspace\printtext{\mkbibparens{=\addnbspace% \printfield{series}% - \setunit{\addcolon\addnbspace}% - \printfield{number}}}\adddot\addnbspace}% + \iffieldundef{number}{}{\setunit{\addcolon\addnbspace}% + \printfield{number}}}}\adddot\addnbspace}% }}% {} +\newbibmacro*{test:partofcited}{% + \ifboolexpr{( + test {\iffieldundef{crossref}} ) + and test {\iffieldundef{xref}} } + {} + {% + \ifboolexpr{( + test {\iftoggle{partofcitedflag}} + and test {\ifentryseen{\thefield{xref}}} + ) + or ( + test {\iftoggle{partofcitedflag}} + and test {\ifentryseen{\thefield{crossref}}} + )} + {\toggletrue{partofcited}}{}}% + } + +\newbibmacro*{bbx:authorvolumepartof}{% Derzeit nicht gebraucht +\ifnameundef{bookauthor}% + {\ifnameundef{editor} + {} + {\printnames[labelname][-1]{editor}}} + {\printnames[labelname][-1]{bookauthor}} +\addspace\mkbibparens{\printfield{year}}} + \DeclareBibliographyDriver{review}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% @@ -885,6 +953,7 @@ or test {\iffieldequalstr{entrytype}{set}}} \DeclareBibliographyDriver{incollection}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% + \usebibmacro{test:partofcited}% \iftoggle{dontprintorig}{}{\usebibmacro{author/translator}}% %\newunit\newblock \usebibmacro{title}% @@ -896,11 +965,15 @@ or test {\iffieldequalstr{entrytype}{set}}} \newunit\newblock \usebibmacro{in:}% %\newunit% - \newunit\newblock% + \iftoggle{partofcited}% + {\iffieldundef{xref}% + {\mancite\textcite{\thefield{crossref}}}% + {\mancite\textcite{\thefield{xref}}}}% + {\newunit\newblock% \ifnameundef{bookauthor}% {\ifnameundef{editor} {} - {\usebibmacro{editor}}} + {\usebibmacro{incollectioneditor}}} {\usebibmacro{bybookauthor}} %\newunit \newblock% @@ -938,7 +1011,7 @@ or test {\iffieldequalstr{entrytype}{set}}} \addspace\usebibmacro{decidetranslatedversion}% \newblock \usebibmacro{addendum+pubstate}% - \newblock + \newblock} \usebibmacro{pageref}% \usebibmacro{finentry}} diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.cbx index cf8805adc29..60027c4224c 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.1b 2011/11/22 Simon Spiegel +% $Id: fiwi.cbx,v 1.1d 2011/12/21 Simon Spiegel \ProvidesFile{fiwi.cbx} -[\abx@cbxid $Id: fiwi.cbx,v 1.1b 2011/11/22 spiegel $] +[\abx@cbxid $Id: fiwi.cbx,v 1.1d 2011/12/21 spiegel $] \ExecuteBibliographyOptions{labelyear,autocite=inline,firstinits=false,uniquename=full,uniquelist=true} @@ -93,8 +93,6 @@ \renewbibmacro*{index:title}[2]{% \iftoggle{xindy}{\usebibmacro{xindy:field}}{\usebibmacro{index:field}}{#1}{\thefield{indexsorttitle}}{\emph{#2}}} -\renewcommand*{\multinamedelim}{\addslash}% -\renewcommand*{\finalnamedelim}{\addslash}% \renewcommand{\postnotedelim}{\addcolon\addspace} \renewcommand{\sqspace}{\addnbthinspace} diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx index aa6e04eaa5e..7a23fe248c8 100644 --- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx @@ -1,7 +1,7 @@ -% $Id: fiwi2.bbx, v 1.1b 2011/11/22 Simon Spiegel +% $Id: fiwi2.bbx, v 1.1d 2011/12/21 Simon Spiegel % Stil mit Jahrestahl nach Autor -\ProvidesFile{fiwi2.bbx}[v 1.1b 2011/11/22 film studies bibliography style Author (Year)] +\ProvidesFile{fiwi2.bbx}[v 1.1d 2011/12/21 film studies bibliography style Author (Year)] \RequireBibliographyStyle{fiwi} \RequireBibliographyStyle{fiwi-yearbeginning} diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.cbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.cbx index ab4d220b87b..f293e346210 100644 --- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.cbx @@ -1,7 +1,7 @@ -% $Id: fiwi2.cbx,v 1.1b 2011/11/22 Simon Spiegel +% $Id: fiwi2.cbx,v 1.1d 2011/12/21 Simon Spiegel \ProvidesFile{fiwi2.cbx} -[\abx@cbxid $Id: fiwi2.cbx,v 1.1b 2011/11/22 spiegel $] +[\abx@cbxid $Id: fiwi2.cbx,v 1.1d 2011/12/21 spiegel $] \RequireCitationStyle{fiwi} -- cgit v1.2.3