diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-archaeology/biblatex-archaeology.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-archaeology/biblatex-archaeology.sty | 73 |
1 files changed, 42 insertions, 31 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/biblatex-archaeology.sty b/Master/texmf-dist/tex/latex/biblatex-archaeology/biblatex-archaeology.sty index 5e4fb5b5f73..211112b6f16 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/biblatex-archaeology.sty +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/biblatex-archaeology.sty @@ -155,7 +155,7 @@ \def\blxarch@namefirstsep{} \def\blxarch@namefirstdelim{\bibinitperiod\bibinitdelim} \ProvidesPackage{biblatex-archaeology} -[2017/03/11 v1.0 biblatex-archaeology (Ingram Braun) based on biblatex] +[2017/05/27 v1.1 biblatex-archaeology (Ingram Braun) based on biblatex] \RequirePackage{xpatch} \RequireBiber[3] \DeclareLanguageMapping{german}{german-archaeology} @@ -1188,7 +1188,7 @@ \setunit{\addcomma\space}% \printfield{eid}} \DeclareFieldFormat*{journaltitle}{#1} -\xapptobibmacro{note+pages}{%} +\xapptobibmacro{note+pages}{% \iftoggle{archbool:journallocation} {\newunit% \usebibmacro{location}{location}} @@ -1462,13 +1462,35 @@ {\csuse{blxarch@opt@positionlabeldate@#1}}% {\blxarch@errmsg{\blxarch@positionlabeldate@errstr{option 'positionlabeldate'}}}} \ExecuteBibliographyOptions{positionlabeldate} +\newcommand{\ifnewspaper}[2]{% + \ifboolexpr{ + not test {\iffieldundef{newsday}} + or + test {\iffieldequalstr{entrysubtype}{news}} + } + {#1} + {#2}} \newbibmacro*{newsdate}{% - \iffieldundef{newsyear} - {} - {\printtext[newsparens]{\bibstring{articledated}\addspace% - \printnewsdate}}% -} + \printtext[newsparens]{% + \bibstring{articledated}% + \addspace% + \printnewsdate% + \ifbibextrayear + {\printfield{extrayear}} + {}}} \DeclareFieldFormat*{extrayear}{\mknumalph{#1}}% +\newcommand{\ifbibextrayear}[2]{% + \ifboolexpr{ + not test {\iffieldundef{extrayear}} + and + test {\ifpositionlabeldate{location}} + and + not test {\ifrepeatlabel} + and + test {\ifbibliography} + } + {#1} + {#2}} \DeclareFieldFormat*{newsparens}{\addcomma\space#1} \newbibmacro*{extendeddate}[1]{% \iffieldundef{#1year} @@ -1477,42 +1499,31 @@ } \newcommand{\daterealdatedelim}{\addspace} \newbibmacro*{bibliographydate}{% - \ifboolexpr{ - test {\ifpositionlabeldate{location}} - or - test {\ifpositionlabeldate{both}} - } + \ifpositionlabeldate{label} + {\ifnewspaper + {\usebibmacro{newsdate}} + {}% + } {\printtext{% \ifeditionsuperscript{predate} {\usebibmacro{editionsuperscript}} {}% - \iffieldequalstr{entrysubtype}{news} - {\usebibmacro{newsdate}% - \ifboolexpr{ - test {\ifpositionlabeldate{location}} - and - not test {\ifrepeatlabel} - } - {\printfield{extrayear}} - {}} + \ifnewspaper + {\usebibmacro{newsdate}} {\iffieldundef{year} {\iffieldundef{pubstate} {\printtext[missingfield]{\midsentence\bibstring{nodate}}} {\printtext[missingfield]{\midsentence\printfield{pubstate}}}}% - {\printdate% - \ifboolexpr{ - test {\ifpositionlabeldate{location}} - and - not test {\ifrepeatlabel} - } - {\printfield{extrayear}} - {}}}% + {\printdate}% + \ifbibextrayear + {\printfield{extrayear}} + {}% + }% \ifeditionsuperscript{postdate} {\usebibmacro{editionsuperscript}} {}% \setunit{\daterealdatedelim}% - \usebibmacro{extendeddate}{real}}} - {\usebibmacro{newsdate}}} + \usebibmacro{extendeddate}{real}}}} \newbibmacro*{origdate}{% \printtext{% \midsentence% |