diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/archaeologie')
4 files changed, 86 insertions, 31 deletions
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx index c7b5e2b51e8..2dea0eea013 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx @@ -11,8 +11,8 @@ % version 2005/12/01 or later. -\ProvidesFile{archaeologie_english.lbx}% - [2015/11/11 v1.2 archaeologie --% +\ProvidesFile{archaeologie-english.lbx}% + [2015/12/06 v1.22 archaeologie --% biblatex fuer Archaeologen, Historiker und Philologen, lbx-Datei] \InheritBibliographyExtras{english} diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx index ba231534c1f..f7ac1a4f6d1 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx @@ -11,8 +11,8 @@ % version 2005/12/01 or later. -\ProvidesFile{archaeologie_ngerman.lbx}% - [2015/11/11 v1.2 archaeologie --% +\ProvidesFile{archaeologie-ngerman.lbx}% + [2015/12/06 v1.22 archaeologie --% biblatex fuer Archaeologen, Historiker und Philologen, lbx-Datei] \InheritBibliographyExtras{ngerman} diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx index 516b36c3ad5..ef5dbca9baa 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx @@ -11,13 +11,13 @@ % version 2005/12/01 or later. \ProvidesFile{archaeologie.bbx}% - [2015/11/11 v1.2 archaeologie --% + [2015/12/06 v1.22 archaeologie --% biblatex fuer Archaeologen, Historiker und Philologen, bbx-Datei] \RequireBibliographyStyle{standard} \AtBeginDocument{% -%\urlstyle{same}% \urlstyle{sf}% -\typeout{* * * archaeologie * * * biblatex fuer Archaeologen, Historiker und Philologen}} +\typeout{* * * archaeologie * * * biblatex fuer Archaeologen, Historiker und Philologen} +} \ExecuteBibliographyOptions{% pagetracker=true,% firstinits=true, @@ -31,7 +31,6 @@ maxitems=1, maxbibnames=999,% }% - \addbibresource{dai-abkuerzungen.bib} %\addbibresource{antike-corpora.bib} % Version 2.0 @@ -124,6 +123,7 @@ maxitems=2, \renewcommand{\finentrypunct}{} \renewcommand{\multinamedelim}{\addnbspace\textendash\addspace} \renewcommand{\finalnamedelim}{\multinamedelim} +\renewcommand*\relateddelim{\addnbspace\textendash\addspace} \newcommand*{\volnumdelim}{\addslash} \newcommand*{\jourvoldelim}{\addnbspace} @@ -339,7 +339,7 @@ maxitems=2, }% {\printnames{editor}% \setunit{\addspace}% - \usebibmacro{editorstrg}% + \printtext[parens]{\bibstring{editor}} \clearname{editor}}% {}% } @@ -444,9 +444,10 @@ maxitems=2, \printfield{volumes}% \setunit*{\addspace}% \bibstring{volumes}% - \newunit}}% - {\printfield{volume}% - \setunit*{\addcolon\addspace}}}}}% + \setunit{\addspace}}}% + {\setunit{\addspace} + \printfield{volume}% + \setunit*{\adddot\addspace}}}}}% \iffieldundef{volumes}{% \usebibmacro{title}}{}% \newunit% @@ -462,20 +463,54 @@ maxitems=2, \newunit% } + \renewbibmacro*{title}{% - \ifboolexpr{test {\iffieldundef{title}} and% - test {\iffieldundef{subtitle}}}{}% + \ifboolexpr{ + test {\iffieldundef{title}} + and + test {\iffieldundef{subtitle}} + } + {} {\printtext[title]{% \printfield[titlecase]{title}% - \setunit*{\subtitlepunct}% + \setunit{\subtitlepunct}% \printfield[titlecase]{subtitle}}% - \iffieldundef{titleaddon}{% - \setunit*{\addspace}}% - {\setunit*{\subtitlepunct}}% - \ifentrytype{book}{\usebibmacro{volume}}{}}% - \newunit\printfield{titleaddon}\isdot% + \setunit{\subtitlepunct} + }% + \printfield{titleaddon}} + +\renewbibmacro*{booktitle}{% + \ifboolexpr{ + test {\iffieldundef{booktitle}} + and + test {\iffieldundef{booksubtitle}} + } + {} + {\printtext[booktitle]{% + \printfield[titlecase]{booktitle}% + \setunit{\subtitlepunct}% + \printfield[titlecase]{booksubtitle}}% + \setunit{\subtitlepunct} + }% + \printfield{booktitleaddon}} + +\renewbibmacro*{maintitle}{% + \ifboolexpr{ + test {\iffieldundef{maintitle}} + and + test {\iffieldundef{mainsubtitle}} } - + {} + {\printtext[maintitle]{% + \printfield[titlecase]{maintitle}% + \setunit{\subtitlepunct}% + \printfield[titlecase]{mainsubtitle}}% + \setunit{\subtitlepunct} + }% + \printfield{maintitleaddon}} + + + \newbibmacro*{Erstauflage}{% \bibstring{firstprint}% \setunit{\addcolon\addspace}% @@ -515,9 +550,7 @@ maxitems=2, \printtext[parens]{% \ifthenelse{\iffieldundef{origlocation}% \AND \NOT \iffieldundef{origyear}}% - {\printlist[][1-1]{location}}% - {\printlist[][1-1]{origlocation}}% - \setunit*{\addspace}% + {\printlist{origlocation}\setunit*{\addspace}}{}% \printfield{origyear}% \setunit*{\addsemicolon\addspace}% \iffieldundef{origyear}{}{\bibstring{reprint}}% @@ -539,15 +572,34 @@ maxitems=2, } \newbibmacro*{addendum}{} - +\renewbibmacro*{addendum+pubstate}{% + \printfield{addendum}% + \iffieldundef{\thefield{datelabesource}year}{} + {\newunit\newblock\printfield{pubstate}}} + \newbibmacro{signatur}{% \printfield{note}% } \newbibmacro*{volume}{% - \printfield{volume}\newunit% - } - + \iffieldundef{maintitle}{% + \printfield{volume}% + \newunit}% + {}% + } +\renewbibmacro*{maintitle+booktitle}{% + \iffieldundef{maintitle} + {} + {\usebibmacro{maintitle}% + \iffieldundef{volume} + {\setunit{\maintitlepunct}}% + {\setunit{\addspace} + \printfield{volume}% + \printfield{part}% + \setunit{\adddot\space}}}% + \usebibmacro{booktitle}% + \newunit} + \newbibmacro*{booktitle+volume+editor}{% \ifnameundef{editor}{% \usebibmacro{maintitle+booktitle}% @@ -760,7 +812,8 @@ maxitems=2, \usebibmacro{title}% \newunit\newblock% \usebibmacro{intranslation}% - \newunit\newblock% +\iffieldundef{title}{\setunit{\addspace}}% + {\newunit\newblock}% \usebibmacro{in:}% \usebibmacro{booktitle+volume+editor}% \setunit{\addspace}% @@ -794,9 +847,10 @@ maxitems=2, {\printfield{booktitle}% \setunit{\addspace}\printfield{volume}% \setunit{\addspace}\printfield[parens]{year}% - \setunit{\addspace} \usebibmacro{pages}% + \setunit{\addspace}\usebibmacro{pages}% \setunit{\addspace}\printtext{s\adddot\addnbthinspace v\adddot}% \setunit{\addspace}\printfield{title}% + \iffieldundef{number}{}{\setunit{\addspace}\printtext[brackets]{\printfield{number}}}% \setunit{\addspace}\printtext[parens]{% \c@uniquename=1% \printnames{labelname}}% diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx index fbb5e16c2ef..6998b86506e 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx @@ -11,7 +11,7 @@ % version 2005/12/01 or later. \ProvidesFile{archaeologie.cbx}% - [2015/11/11 v1.2 archaeologie --% + [2015/12/06 v1.22 archaeologie --% biblatex fuer Archaeologen, Historiker und Philologen, cbx-Datei] \ExecuteBibliographyOptions{% citetracker=true,% @@ -103,6 +103,7 @@ \iffieldundef{postnote}{\printfield{pages}}{\printfield{postnote}}% \setunit{\addspace}\printtext{s\adddot\addnbthinspace v\adddot}% \setunit{\addspace}\printfield{title}% + \iffieldundef{number}{}{\setunit{\addspace}\printtext[brackets]{\printfield{number}}}% \setunit{\addspace}\printtext[parens]{\c@uniquename=1 \printnames{labelname}}% } |