diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx')
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx | 357 |
1 files changed, 243 insertions, 114 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx index b63981cd98c..4f6a3f3fa93 100644 --- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx @@ -1,15 +1,15 @@ -% $Id: fiwi.bbx, v1.5 2016/05/17 Simon Spiegel +% $Id: fiwi.bbx, v1.6 2016/09/09 Simon Spiegel % Ragged2e % Alternatetitle % Uniquetitle -\ProvidesFile{fiwi.bbx}[v1.5 2016/05/17 film studies bibliography style] +\ProvidesFile{fiwi.bbx}[v1.6 2016/09/09 film studies bibliography style] -%\@ifpackagelater{biblatex}{2016/04/01} +%\@ifpackagelater{biblatex}{2016/08/01} % {} % {\PackageError{biblatex} % {Outdated 'biblatex' package} -% {The 'fiwi' style requires biblatex v3.4 or later.\MessageBreak +% {The 'fiwi' style requires biblatex v3.5 or later.\MessageBreak % You are using: '\csuse{ver@biblatex.sty}'.\MessageBreak % This is a fatal error. I'm aborting now.}% % \endinput} @@ -126,6 +126,9 @@ \togglefalse{ignoreaddendumcit} \providetoggle{markmissingpublisher} \togglefalse{markmissingpublisher} +\newtoggle{cbx:orgigyearcite} +\newtoggle{cbx:superscriptcite} + % BibliographyOptions @@ -216,8 +219,6 @@ {} }% - - \DeclareBibliographyOption{publisher}[true]{% \ifstrequal{#1}{true} {\toggletrue{printpublisher}} @@ -231,26 +232,30 @@ {} } - \DeclareBibliographyOption{parensvolume}[true]{\settoggle{bbx:volumeinparens}{#1}} + \DeclareBibliographyOption{script}[true]{\settoggle{bbx:scriptwriter}{#1}} \DeclareBibliographyOption{actor}[true]{\settoggle{bbx:actor}{#1}} \DeclareBibliographyOption{ignorearticle}[true]{\settoggle{ignorearticle}{#1}} \DeclareBibliographyOption{partofcited}[true]{\settoggle{partofcitedflag}{#1}} \DeclareBibliographyOption{germ}[true]{\settoggle{germfassung}{#1}} \DeclareBibliographyOption{translatedas}[true]{\settoggle{germfassung}{#1}} + \DeclareBibliographyOption{noseries}[true]{% \ifstrequal{#1}{true} {\togglefalse{printseriesflag}} {\toggletrue{printseriesflag}}}% \DeclareBibliographyOption{series}[true]{\settoggle{printseriesflag}{#1}}% + \DeclareBibliographyOption{nopublisher}[true]{% \ifstrequal{#1}{true} {\togglefalse{printpublisher}} {\toggletrue{printpublisher}}} + \DeclareBibliographyOption{filmruntime}[true]{\settoggle{filmruntime}{#1}}% \DeclareBibliographyOption{citeprefix}[true]{\settoggle{citeprefix}{#1}} \newbibmacro*{bbx:savehash}{} + \DeclareBibliographyOption{dashed}[true]{% \ifstrequal{#1}{true} {\renewbibmacro*{bbx:savehash}{\savefield{fullhash}{\bbx@lasthash}}} @@ -264,6 +269,7 @@ \ifstrequal{#1}{brackets}{\toggletrue{origyearwithyear} \toggletrue{origyearbrackets}{}}} \DeclareBibliographyOption{origyearsuperscript}[true]{\settoggle{origyearsuperscript}{#1}} + \DeclareBibliographyOption{pages}[true]{% \ifstrequal{#1}{true} {\toggletrue{bibpages}\toggletrue{citepages}} @@ -278,9 +284,44 @@ {\toggletrue{citepages}} {} }% + +\DeclareBibliographyOption{origcite}[false]{% + \ifstrequal{#1}{true} + {\toggletrue{cbx:orgigyearcite}} + {} + \ifstrequal{#1}{superscript} + {\toggletrue{cbx:orgigyearcite}% + \toggletrue{cbx:superscriptcite}} + {} +}% -\ExecuteBibliographyOptions{indexing=cite,maxnames=3,minnames=1,maxitems=9,useprefix=true,sorting=nyt,date=long,datelabel=long,urldate=long,hyperref=auto,pagetracker=true,ibidtracker=context,citetracker=context,labeldate=true,isbn=false,autolang=hyphen} -\ExecuteBibliographyOptions[misc,movie,video]{uniquename=false,labeltitle=true,uniquetitle=true} +\ExecuteBibliographyOptions{% + indexing=cite, + maxnames=3, + minnames=1, + maxitems=9, + useprefix=true, + sorting=nyt, + origdate=long, + labeldate=year, + urldate=long, + hyperref=auto, + pagetracker=true, + ibidtracker=context, + citetracker=context, + isbn=false, + autolang=hyphen, + datezeros=false, + dateuncertain=true, + datecirca=true, + labeldateparts + } + +\ExecuteBibliographyOptions[misc,movie,video]{% + uniquename=false, + labeltitle=true, + uniquetitle=true + } \InitializeBibliographyStyle{% \let\bbx@lasthash\undefined} @@ -313,6 +354,9 @@ % format definitions +\DeclareLabeldate[movie,misc,video]{ + \field{date} + } \DeclareFieldFormat{pages}{% \iftoggle{bibpages} @@ -385,7 +429,7 @@ \DeclareFieldFormat{part}{\iffieldundef{parttitle}{.#1}{#1}}% physical part of a logical volume \DeclareFieldFormat[misc]{note}{\mkbibparens{#1}} \DeclareFieldFormat{addendum}{\mkbibparens{#1}} -\DeclareFieldFormat{nameaddon}{\addspace\mkbibbrackets{=#1}} +\DeclareFieldFormat{nameaddon}{\addspace\mkbibbrackets{#1}} \DeclareFieldFormat{season}{\bibstring{tvseason} #1} \DeclareFieldFormat{episode}{\bibstring{tvepisode} #1} \DeclareFieldFormat{urldate}{\addthinspace --\addnbspace\bibstring{urlseen}\space#1} @@ -404,16 +448,22 @@ {\bibstring{jourvol}\addnbthinspace{#1}} } \DeclareFieldFormat[article,review,periodical]{number}{\bibstring{number}\addnbthinspace{#1}} -\DeclareFieldFormat{origyearbook}{\iftoggle{origyearsuperscript} -{\addspace\mkbibparens{#1}} -{\addspace\mkbibparens{\textsuperscript{1}#1}}} + +\DeclareFieldFormat{origyear}{\iftoggle{origyearsuperscript} + {\textsuperscript{1}#1} + {#1}} +\DeclareFieldFormat{origyearbook}{% + \iftoggle{origyearbrackets}% + {\addthinspace\bibopenbracket}{\addslash}% + \iftoggle{origyearsuperscript}% + {\textsuperscript{1}#1}% + {#1}% + \iftoggle{origyearbrackets} + {\bibclosebracket}{}} \DeclareFieldFormat{origyearart}{\mkbibparens{#1}} \DeclareFieldFormat{origtit}{\mkbibparens{Original\addcolon\addspace #1}} \DeclareFieldFormat{origtit:related}{Original\addcolon\addspace #1} \DeclareFieldFormat{germfassung}{\mkbibbrackets{\midsentence\bibstring{translatedto}\adddot\addcolon\addspace#1}} -\DeclareFieldFormat{origyear}{\iftoggle{origyearsuperscript} -{\textsuperscript{1}#1} -{#1}} \DeclareListFormat{default}{% \usebibmacro{list:delim}{#1}% @@ -441,7 +491,8 @@ {\ifthenelse{\value{listcount}=3}{}{\addslash}}% {}}} - +\DeclareNameAlias{bytranslator}{name:given-family} +\DeclareNameAlias{actor}{bytranslator} \DeclareNameAlias{byeditor}{bytranslator} \DeclareNameAlias{withafterword}{bytranslator} \DeclareNameAlias{byredactor}{bytranslator} @@ -451,41 +502,49 @@ \DeclareNameAlias{withforeword}{bytranslator} \DeclareNameAlias[misc,movie,video]{author}[movie]{director} \DeclareNameAlias[misc,movie,video]{editor}[movie]{scriptwriter} -\DeclareNameAlias{author}{sortname} +\DeclareNameAlias{scriptwriter}{director} +\DeclareNameAlias{author}{family-given} \DeclareNameAlias{editor}{author} \DeclareNameAlias{bookauthor}{author} - - - % name format definitions - \DeclareNameFormat{sortname}{% - \ifnumequal{\value{listcount}}{1} - {\ifgiveninits - {\usebibmacro{name:family-given} - {\namepartfamily} - {\namepartgiveni} - {\namepartprefix} - {\namepartsuffix}} - {\usebibmacro{name:family-given} - {\namepartfamily}% - {\namepartgiven}% - {\namepartprefix} - {\namepartsuffix}}}% - {\ifgiveninits - {\usebibmacro{name:family-given} - {\namepartfamily} - {\namepartgiveni} - {\namepartprefix} - {\namepartsuffix}} - {\usebibmacro{name:family-given} - {\namepartfamily} - {\namepartgiven} - {\namepartprefix} - {\namepartsuffix}}}% - \usebibmacro{name:andothers}} +\newrobustcmd{\ifpseudo}[2]{% +\ifboolexpr{% + ( not test {\ifdefvoid{\nameparttruefamily}} or not test + {\ifdefvoid{\nameparttruegiven}})}% + {#1}{#2}% +} +\DeclareNameFormat{family-given}{% + \ifgiveninits + {\usebibmacro{name:family-given} + {\namepartfamily} + {\namepartgiveni} + {\namepartprefix} + {\namepartsuffix} + \ifpseudo% + {\usebibmacro{name:true:family-given} + {\nameparttruefamily} + {\nameparttruegiveni} + {\nameparttrueprefix} + {\nameparttruesuffix}} + {} + } + {\usebibmacro{name:family-given} + {\namepartfamily} + {\namepartgiven}% + {\namepartprefix}% + {\namepartsuffix}% + \ifpseudo% + {\usebibmacro{name:true:family-given}% + {\nameparttruefamily}% + {\nameparttruegiven}% + {\nameparttrueprefix}% + {\nameparttruesuffix}}% + {}}% + \usebibmacro{name:andothers}} + \DeclareNameFormat{name:commas}{% \renewcommand*{\multinamedelim}{\addcomma\addspace}% \renewcommand*{\finalnamedelim}{\addcomma\addspace}% @@ -494,7 +553,15 @@ {\namepartfamily} {\namepartgiveni} {\namepartprefix} - {\namepartsuffix}} + {\namepartsuffix} + \ifpseudo% + {\addthinspace\bibopenbracket{=}\usebibmacro{actor:given-family} + {\nameparttruefamily} + {\nameparttruegiveni} + {\nameparttrueprefix} + {\nameparttruesuffix} + \bibclosebracket} + {}} {\usebibmacro{actor:given-family} {\namepartfamily} {\namepartgiven} @@ -502,18 +569,31 @@ {\namepartsuffix}}% \ifblank{\namepartgiven\namepartprefix} {} - {\usebibmacro{name:revsdelim}} + {\usebibmacro{name:revsdelim} + \ifpseudo% + {\addthinspace\bibopenbracket{=}\usebibmacro{actor:given-family} + {\nameparttruefamily} + {\nameparttruegiven} + {\nameparttrueprefix} + {\nameparttruesuffix}\bibclosebracket} + {}} \renewcommand*{\multinamedelim}{\addslash}% \renewcommand*{\finalnamedelim}{\addslash}} - -\DeclareNameFormat{bytranslator}{% +\DeclareNameFormat{name:given-family}{% \ifgiveninits {\usebibmacro{name:given-family} {\namepartfamily} {\namepartgiveni} {\namepartprefix} - {\namepartsuffix}} + {\namepartsuffix} + \ifpseudo% + {\addthinspace\bibopenbracket{=}\usebibmacro{name:given-family} + {\nameparttruefamily} + {\nameparttruegiveni} + {\nameparttrueprefix} + {\nameparttruesuffix}\bibclosebracket} + {}} {\usebibmacro{name:given-family} {\namepartfamily} {\namepartgiven} @@ -521,7 +601,14 @@ {\namepartsuffix}}% \ifblank{\namepartgiven\namepartprefix} {} - {\usebibmacro{name:revsdelim}}% + {\usebibmacro{name:revsdelim}% + \ifpseudo% + {\addthinspace\bibopenbracket{=}\usebibmacro{name:given-family} + {\nameparttruefamily} + {\nameparttruegiven} + {\nameparttrueprefix} + {\nameparttruesuffix}\bibclosebracket} + {}}% \usebibmacro{name:andothers}} \DeclareNameFormat{actor}{% @@ -550,7 +637,18 @@ \ifblank{\namepartgiven\namepartprefix} {} {\usebibmacro{name:revsdelim}}% - \usebibmacro{name:andothers}} + \ifpseudo + {\addthinspace\bibopenbracket{=}% + \usebibmacro{director:given-family} + {\nameparttruefamily} + {\nameparttruegiven} + {\nameparttrueprefix} + {\nameparttruesuffix}% + \ifblank{\namepartgiven\namepartprefix} + {} + {\usebibmacro{name:revsdelim}}\bibclosebracket} + {} + \usebibmacro{name:andothers}} \newbibmacro*{director:given-family}[4]{% \usebibmacro{name:delim}{#2#3#1}% @@ -564,7 +662,6 @@ \mkbibnamefamily{#1}\isdot \ifdefvoid{#4}{}{\addlowpenspace\mkbibnamesuffix{#4}\isdot}} - \renewbibmacro*{name:family-given}[4]{% \ifuseprefix% {\usebibmacro{name:delim}{#3#1}% @@ -586,6 +683,36 @@ \ifdefvoid{#4}{}{\addlowpenspace\mkbibnamesuffix{#4}\isdot}% \addspace\ifdefvoid{#3}{}{\addlowpenspace\mkbibnameprefix{#3}\isdot}}} +\newbibmacro*{name:true:family-given}[4]{% +\addthinspace\bibopenbracket{=}% + \ifuseprefix% + {\usebibmacro{name:delim}{#3#1}% + \usebibmacro{name:hook}{#3#1}% + \ifdefvoid{#3}{}{% + \ifcapital + {\mkbibnametrueprefix{\MakeCapital{#3}}\isdot}% + {\mkbibnametrueprefix{#3}\isdot}% + }%\ifpunctmark{'}{}{\addhighpenspace}}% + \mkbibnametruefamily{#1}\isdot% + \ifdefvoid{#2} + {}{\addcomma\addlowpenspace\mkbibnametruegiven{#2}\isdot}% + \ifdefvoid{#4} + {}{\addcomma\addlowpenspace\mkbibnametruesuffix{#4}\isdot}}% + {\usebibmacro{name:delim}{#1}% + \usebibmacro{name:hook}{#1}% + \mkbibnametruefamily{#1}\addspace\isdot + \ifdefvoid{#4} + {} + {\addlowpenspace\mkbibnametruesuffix{#4}\isdot}% + \addcomma\ifdefvoid{#3}{}{\addcomma}% + \ifdefvoid{#2}{}{\addlowpenspace\mkbibnametruegiven{#2}\isdot}% + \ifdefvoid{#4}{}{\addlowpenspace\mkbibnametruesuffix{#4}\isdot}% + \addspace\ifdefvoid{#3} + {} + {\addlowpenspace\mkbibnametrueprefix{#3}\isdot}}% + \bibclosebracket +} + \renewbibmacro*{name:given-family}[4]{% \usebibmacro{name:delimfirst}{#2#3#1}% \usebibmacro{name:hook}{#2#3#1}% @@ -610,7 +737,7 @@ \mkbibnamefamily{#1}\isdot \ifdefvoid{#4}{}{\addlowpenspace\mkbibnamesuffix{#4}\isdot}} - \newbibmacro*{name:delimfirst}[1]{% +\newbibmacro*{name:delimfirst}[1]{% \ifthenelse{\value{listcount}>\value{liststart}} {\ifthenelse{\value{listcount}<\value{liststop}\OR \ifmorenames} @@ -620,6 +747,7 @@ \newcommand*{\mkfinalnamedelimfirst}[1]{\addspace\bibstring{and}\addspace} + %\newbibmacro*{translatedversion}[1]{% % \toggletrue{intransdecision}% % \edef\@tempa{\noexpand\docsvlist{#1}}% @@ -627,8 +755,6 @@ % \fullcite{##1}}}% % \@tempa\toggletrue{dontprintorig}% % \togglefalse{dontprintextrayear}\togglefalse{intransdecision}} - - \renewbibmacro*{url+urldate}{% \printfield{url}% @@ -732,7 +858,8 @@ %\NewBibliographyString{citepage} %\NewBibliographyString{citepages} - +\DefineBibliographyExtras{german}{% +\protected\def\bibdateeraprefix{-}} \DefineBibliographyStrings{german}{% andothers = {et al\adddot\addspace}, @@ -741,7 +868,6 @@ writtenby = {Buch\addcolon\addspace}, writtendirectedby = {Buch und Regie\addcolon\addspace}, fromhebrew = {aus dem Hebr\"aischen}, fromjapanese = {aus dem Japanischen}, -frompolish = {aus dem Polnischen}, bycompiler = {zusammengestellt von}, bypublisher = {bei}, ibidem = {ebd\adddot}, @@ -954,12 +1080,10 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} ) \usebibmacro{labeltitle}% \setunit*{\addspace}}} - - \renewbibmacro*{editor}{% - \usebibmacro{bbx:editor}{editorstrg}} + \usebibmacro{bbx:editor}{editorstrg}}% \renewbibmacro*{editor+others}{% - \usebibmacro{bbx:editor}{editor+othersstrg}} + \usebibmacro{bbx:editor}{editor+othersstrg}}% \newbibmacro*{bbx:editor}[1]{% \ifboolexpr{ test \ifuseeditor @@ -969,7 +1093,7 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} ) {\usebibmacro{bbx:dashcheck} {\bibnamedash} {\printnames{editor}% - \iffieldundef{nameaddon}{} + \iffieldundef{nameaddon}{}% {\printfield{nameaddon}}% \addspace% \iftoggle{isreview}{}{\usebibmacro{bbx:savehash}}}% @@ -990,7 +1114,7 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} ) {\bibstring{idempp}\addnbspace}% {\bibstring{idem\thefield{gender}}\addnbspace}}% {\printnames{editor}}}}% - \usebibmacro{editorstrg}} + \usebibmacro{editorstrg}} \newbibmacro*{collby}{% \ifnameundef{author}% @@ -1020,39 +1144,38 @@ or ( test {\iftoggle{ignoreaddendumcit}} and test {\ifcitation} ) {\printdate}}} \newbibmacro*{date+extrayear}{% -\ifboolexpr{test {\iftoggle{usera}} -or test {\ifentrytype{set}}} +\ifentrytype{set} {\usebibmacro{labelyear}} {\iffieldundef{year} {\bibstring[\mkbibbrackets]{nodate}\addcolon\addspace} - {\printtext{% - \iffieldundef{endyear}% - {\iftoggle{dontprintextrayear}% - {\printfield{year}}{\printdateextralabel}%% - \ifboolexpr{( - test {\iftoggle{origyearwithyear}} - ( and not test {\iffieldundef{origyear}} - or test {\iffieldequalstr{relatedtype}{origpubin}} ) - and test {\iffieldundef{origtitle}} ) } - {\iftoggle{origyearbrackets} - {\addthinspace\mkbibbrackets{% - \iffieldequalstr{relatedtype}{origpubin} - {\entrydata*{\thefield{related}}{% - \printfield[origyear]{year}% - }} - {\printfield{origyear}} - }} - {\addslash% - \iffieldequalstr{relatedtype}{origpubin} - {\entrydata*{\thefield{related}}{% - \printfield[origyear]{year}}} - {\printfield{origyear}}}} - {}}% - {\printfield{year}% - \iffieldsequal{year}{endyear}% - {}{\printfield{endyear}}}% - }}}} - + {\iftoggle{dontprintextrayear}% + {\printfield{year}}{\printdateextra}%% + \ifboolexpr{( + test {\iftoggle{origyearwithyear}} + ( and not test {\iffieldundef{origyear}} + or test {\iffieldequalstr{relatedtype}{origpubin}} ) + and test {\iffieldundef{origtitle}} ) } + {\iffieldequalstr{relatedtype}{origpubin} + {\entrydata*{\thefield{related}}{% + \printfield[origyearbook]{year}% + }} + {\usebibmacro{bbx:origdate}} + {}} + {}}}} + +\newbibmacro*{bbx:origdate} +{\iftoggle{origyearbrackets}% + {\addthinspace\bibopenbracket}{\addslash}% + \iftoggle{origyearsuperscript}% + {\textsuperscript{1}\printorigdate}% + {\iffieldundef{origyear}{}% + {\iffieldequalstr{origdateunspecified}{yearincentury} + {\number\numexpr\thefield{origyear}/100+1\relax + \adddot\addnbthinspace{Jhdt\adddot}} + {\printorigdate}}}% + \iftoggle{origyearbrackets} + {\bibclosebracket}{}} + \newbibmacro*{labelyear}{% \iffieldundef{year} {} @@ -1102,8 +1225,7 @@ or test {\ifentrytype{set}}} \iffieldundef{endyear}% {}{\printfield{endyear}}}} {\ifboolexpr{ (test{\iffieldundef{origtitle}} and not test {\ifentrytype{bookinbook}})} - {\setunit{\addspace}\printtext[origyearart]{\printfield{origyear}% - \printfield{origendyear}}} + {\setunit{\addspace}\printtext[origyear]{\mkbibparens{\printorigdate}}} {}} }} @@ -1210,9 +1332,10 @@ or test {\ifentrytype{set}}} test {\ifbibxstring{\thefield{relatedtype}s}} } {\printtext{\bibstring{\thefield{relatedtype}s}\relatedpunct}} - {\iffieldbibstring{relatedtype} - {\printtext{\bibstring{\thefield{relatedtype}}\relatedpunct}} - {}}} + {%\iffieldbibstring{relatedtype} + %{\printtext{\bibstring{\thefield{relatedtype}}\relatedpunct}} + %{} + }} {\iffieldbibstring{relatedstring} {\printtext{\bibstring{\thefield{relatedstring}}\relatedpunct}} {\printtext{\printfield{relatedstring}\relatedpunct}}}% @@ -1302,9 +1425,12 @@ and test {\iffieldequalstr{relatedtype}{translatedas}}} }% \iffieldundef{origyear}{}% {\iflistundef{origlocation} -{\adddot}{}\addspace\printorigdate +{\adddot}{} +\iffieldequalstr{origdateunspecified}{yearincentury} +{\number\numexpr\thefield{origyear}/100+1\relax \adddot\addnbthinspace{Jhdt\adddot}} +{\addspace\printorigdate \iffieldundef{origendyear} -{}{\printfield{origendyear}}}% +{}{\printfield{origendyear}}}}% }}} % serials @@ -1375,11 +1501,14 @@ and test {\iffieldequalstr{relatedtype}{translatedas}}} \ifnamesequal{scriptwriter}{director} {\bibstring{writtendirectedby}\printnames{director}} {\ifpunct{\unspace}{}\bibstring{directedby}\printnames{director} - \ifnameundef{scriptwriter}{}{\newunit\bibstring{writtenby}\printnames{scriptwriter}}} + \ifnameundef{scriptwriter} + {}{\newunit\bibstring{writtenby}\printnames{scriptwriter}}} } \newbibmacro*{movie:actor}{% - \bibstring{actors}\printnames[name:commas][-\value{listtotal}]{actor} +\ifnameundef{actor} +{} +{\bibstring{actors}\printnames[name:commas][-\value{listtotal}]{actor}} } \newbibmacro*{mtitle+vol+btitle+bstitle}{% @@ -1471,15 +1600,14 @@ and (test {\iffieldundef{origyear}}% {\ifboolexpr{ (test {\iffieldundef{origtitle}} and not test {\iftoggle{origyearwithyear}} )} % - {\printtext[origyearbook]{\iffieldequalstr{relatedtype}{origpubin} - {\entrydata*{\thefield{related}}{% - \printfield{year}% + {\iffieldequalstr{relatedtype}{origpubin} + {\printtext[origyearbook]{\entrydata*{\thefield{related}}{% + \printfield{year}}% \iffieldundef{endyear}% {}{\printfield{endyear}}% }}% - {\printfield{origyear}% - \iffieldundef{origendyear} - {}{\printfield{origendyear}}}}}% + {%\printorigdate + \usebibmacro{bbx:origdate}}}% {}}% } @@ -1682,8 +1810,10 @@ and (test {\iffieldundef{origyear}}% %\newunit% \iftoggle{partofcited}% {\iffieldundef{xref}% - {\mancite\textcite{\thefield{crossref}}}% - {\mancite\textcite{\thefield{xref}}} + {\entrydata*{\thefield{crossref}}{% + \printnames{labelname}\addspace\mkbibparens{\printlabeldateextra}}} + {\entrydata*{\thefield{xref}}{% + \printnames{labelname}\addspace\mkbibparens{\printlabeldateextra}}} \usebibmacro{chap+pag}}% {\newunit\newblock% \ifnameundef{bookauthor}% @@ -1718,7 +1848,6 @@ and (test {\iffieldundef{origyear}}% \printfield{note}% \newunit% \usebibmacro{org+publ+loc+year}% - %\printtext{\printfield{labelyear}}% \newblock% \usebibmacro{chap+pag}% %\setunit{\par}\newblock @@ -1763,7 +1892,7 @@ and (test {\iffieldundef{origyear}}% \newunit\newblock% \usebibmacro{publ+loc+year}% \usebibmacro{chap+pag}% - \newblock + \ifterm{.}{}\newblock \ifthenelse{\iffieldundef{doi} \and \iffieldundef{url} \and \iffieldundef{eprint}} {} {\addperiod\addspace\usebibmacro{doi+eprint+url}}% |