diff options
author | Karl Berry <karl@freefriends.org> | 2016-07-30 23:09:45 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-07-30 23:09:45 +0000 |
commit | ef1b5554439daf89b038b385c15e92f969a88a37 (patch) | |
tree | f75e1f0d3178506542dd56b87c6c7428a7e892b4 /Master/texmf-dist/tex/latex/archaeologie | |
parent | 6bc76ff170ee1e2992b12073207cc9a412e6bfe9 (diff) |
archaeologie (28jul16)
git-svn-id: svn://tug.org/texlive/trunk@41771 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/archaeologie')
-rw-r--r-- | Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx | 547 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx | 104 |
2 files changed, 354 insertions, 297 deletions
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx index e66a79fa11e..1d72d6d2452 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx @@ -16,11 +16,15 @@ historians and philologists, bbx-file] \RequireBibliographyStyle{standard} \AtBeginDocument{% +\RequirePackage[normalem]{ulem} +%\RequirePackage{csquotes} \urlstyle{sf}% \typeout{* * * archaeologie * * * - biblatex for archaeologists, + biblatex for archaeologists, historians and philologists} } +\def\archaeologieversion{2.04} +\def\archaeologiedate{2016-07-28} \ExecuteBibliographyOptions{% pagetracker=true,% citecounter=true,% @@ -56,50 +60,55 @@ \newbool{bib:lstpublishers} \newsavebox\arch@labelbox \newlength{\labwidthsameline} - \setlength{\labwidthsameline}{4em} +\setlength{\labwidthsameline}{4em} \newtoggle{bbx:jstor} \newtoggle{bbx:zenon} \newtoggle{bbx:urn} +\setlength{\biblabelsep}{0em} %----------------------- \DeclareBibliographyOption{lstabbrv}[true]{% \csuse{bool#1}{bib:lstabbrv}% \addbibresource{archaeologie-lstabbrv.bib} } \DeclareBibliographyOption{bibcorpora}[true]{% + \csuse{bool#1}{bib:bibcorpora}% \addbibresource{archaeologie-bibcorpora.bib}% \ifbool{bib:lstabbrv}% {}% {\addbibresource{archaeologie-lstabbrv.bib}} } \DeclareBibliographyOption{bibancient}[true]{% + \csuse{bool#1}{bib:bibancient}% \addbibresource{archaeologie-bibancient.bib}% } \DeclareBibliographyOption{lstlocations}[true]{% + \csuse{bool#1}{bib:lstlocations}% \addbibresource{archaeologie-lstlocations.bib}% } \DeclareBibliographyOption{lstpublishers}[true]{% + \csuse{bool#1}{bib:lstpublishers}% \addbibresource{archaeologie-lstpublishers.bib}% } \DeclareBibliographyOption[boolean]{jstor}[true]{% - \settoggle{bbx:jstor}{#1}} +\settoggle{bbx:jstor}{#1}} \DeclareBibliographyOption[boolean]{zenon}[true]{% \settoggle{bbx:zenon}{#1}} \DeclareBibliographyOption[boolean]{urn}[true]{% - \settoggle{bbx:urn}{#1}} + \settoggle{bbx:urn}{#1}} \ExecuteBibliographyOptions{% jstor,% - zenon,% urn,% } %----------------------- \DeclareBibliographyOption{edby}[true]{\csuse{bool#1}{bbx:edby}} \DeclareBibliographyOption{initials}[true]{\csuse{bool#1}{bbx:initials}} \DeclareBibliographyOption{width}[]{% - \csuse{booltrue}{bbx:width} - \setlength{\labwidthsameline}{#1}} + \csuse{booltrue}{bbx:width}% + \setlength{\labwidthsameline}{#1}% + \def\labwidthsamelineVALUE{#1}} \DeclareBibliographyOption{yearseries}[true]{\csuse{bool#1}{bbx:yearseries}} \DeclareBibliographyOption{counter}[true]{\csuse{bool#1}{bbx:counter}} \DeclareBibliographyOption{bibfullname}[true]{\csuse{bool#1}{bbx:bibfullname} @@ -111,9 +120,9 @@ \DeclareBibliographyOption{publisher}[true]{\csuse{bool#1}{bbx:publisher} \ExecuteBibliographyOptions{maxitems=2}} \DeclareBibliographyOption{scshape}[true]{% - \ifstrequal{#1}{true}% - {\AtEveryCite{\renewcommand*{\mkbibnamefamily}[1]{\textsc{##1}}}}% - {}% + \ifstrequal{#1}{true}% + {\AtEveryCite{\renewcommand*{\mkbibnamefamily}[1]{\textsc{##1}}}}% + {}% } %----------------------- \DeclareEntryOption{ancient}[true]{\csuse{bool#1}{cbx:ancient}} @@ -124,10 +133,43 @@ \csuse{bool#1}{cbx:frgancient}% } \DeclareEntryOption{corpus}[true]{\csuse{bool#1}{cbx:corpus}} +%---------- +\newcommand{\archaeologieoptions}[1][]{% +\ifstrempty{#1}{% +\iflanguage{ngerman}{Zusätzlich geladene oder \xout{deaktivierte} Optionen von \textsc{bib}\LaTeX-\textsf{archaeologie} (Version \archaeologieversion~| \archaeologiedate):}% +{Additional options of \textsc{bib}\LaTeX-\textsf{archaeologie} (version \archaeologieversion~| \archaeologiedate) used or \xout{omitted}:}\addspace}% +{\ifthenelse{\equal{#1}{plain}}{}{{\PackageError{biblatex-archaeologie}% + {command 'archaeologieoptions[#1]' invalid.\MessageBreak% + Use 'archaeologieoptions[plain]' or omit the brackets.}{}}}}% +\def\seperator{ | }% +\ifbool{bib:bibancient}{bibancient\seperator}{}% +\ifbool{bib:bibcorpora}{bibcorpora\seperator}{}% +\ifbool{bib:lstabbrv}{lstabbrv\seperator}{}% +\ifbool{bib:lstlocations}{lstlocations\seperator}{}% +\ifbool{bib:lstpublishers}{lstpublishers\seperator}{}% +\ifbool{bbx:bibfullname}{bibfullname\seperator}{}% +\ifdefstring\citeauthorformatVALUE{initials}{}{citeauthorformat\,= \citeauthorformatVALUE\seperator}% +\ifbool{bbx:counter}{counter\seperator}{}% +\ifbool{bbx:edby}{edby\seperator}{}% +\ifbool{bbx:inreferences}{inreferences\seperator}{}% +\ifbool{bbx:initials}{initials\seperator}{}% +\ifbool{bbx:noabbrv}{noabbrv\seperator}{}% +\ifbool{bbx:publisher}{publisher\seperator}{}% +\ifbool{cbx:seenote}{seenote\seperator}{}% +\ifbool{bbx:translation}{translation\seperator}{}% +\ifbool{bbx:width}{width=\labwidthsamelineVALUE\seperator}{}% +\ifbool{cbx:yearinparens}{yearinparens\seperator}{}% +\ifbool{bbx:yearseries}{yearseries\seperator}{}% +\iftoggle{bbx:zenon}{zenon\seperator}{}% +\iftoggle{bbx:jstor}{}{\xout{jstor}\seperator}% +\iftoggle{bbx:urn}{}{\xout{urn}\seperator}% +\iftoggle{bbx:doi}{}{\xout{doi}\seperator}% +} %----------------------- \DeclareFieldFormat*{title}{#1} \DeclareFieldFormat{subtitle}{#1} \DeclareFieldFormat{booktitle}{#1} +\DeclareFieldFormat{editortype}{\mkbibparens{#1}} \DeclareFieldFormat{booksubtitle}{#1} \DeclareFieldFormat{titlecase}{#1} \DeclareFieldFormat*{maintitle}{#1} @@ -155,24 +197,23 @@ {\nolinkurl{#1}}% } \DeclareFieldFormat{eprint:zenon}{% - \textsc{zenon (opac)}% - \addcolon\space% - \ifhyperref% - {\href{http://zenon.dainst.org/Record/#1}{\nolinkurl{#1}}}% - {\nolinkurl{#1}}% + \textsc{zenon (opac)}% + \addcolon\space% + \ifhyperref% + {\href{http://zenon.dainst.org/Record/#1}{\nolinkurl{#1}}}% + {\nolinkurl{#1}}% } \DeclareFieldFormat{eprint:jstor}{% - \textsc{jstor}% - \addcolon\space% - \ifhyperref% - {\href{http://www.jstor.org/stable/#1}{\nolinkurl{#1}}}% - {\nolinkurl{#1}}% + \textsc{jstor}% + \addcolon\space% + \ifhyperref% + {\href{http://www.jstor.org/stable/#1}{\nolinkurl{#1}}}% + {\nolinkurl{#1}}% } %----------------------- \DeclareFieldAlias{zenon}{eprint:zenon} \DeclareFieldAlias{jstor}{eprint:jstor} \DeclareFieldAlias{urn}{eprint:urn} - %----------------------- \DeclareRedundantLanguages{ngerman}{german,ngerman,austrian,naustrian} \DeclareRedundantLanguages{english,american}{english,american,british,% @@ -188,17 +229,17 @@ \renewcommand*{\newunitpunct}{\addcomma\addspace} \newcommand*{\orttrennzeichen}{\addnbspace\textendash\addspace} \renewcommand{\finentrypunct}{%http://tex.stackexchange.com/a/14159/98739 - \ifbool{bbx:counter}% - {\addspace$\vert$ \addspace\scshape% - \iflanguage{ngerman}% - {wurde \ifnumequal{\value{citecounter}}{0}{{\color{red}{keinmal}}}% - {\arabic{citecounter}-mal} zitiert.% - } - {cited \ifnumequal{\value{citecounter}}{0}{{\color{red}{not once}}}% - {\arabic{citecounter}~time\ifnumequal{\value{citecounter}}{1}{}{s}}.% - }% - }% - {}% + \ifbool{bbx:counter}% + {\addspace$\vert$ \addspace\scshape% + \iflanguage{ngerman}% + {wurde \ifnumequal{\value{citecounter}}{0}{{\color{red}{keinmal}}}% + {\arabic{citecounter}-mal} zitiert.% + } + {cited \ifnumequal{\value{citecounter}}{0}{{\color{red}{not once}}}% + {\arabic{citecounter}~time\ifnumequal{\value{citecounter}}{1}{}{s}}.% + }% + }% + {}% } \renewcommand{\multinamedelim}{\addnbspace\textendash\addspace} \renewcommand{\finalnamedelim}{\multinamedelim} @@ -214,55 +255,55 @@ \DeclareBibliographyAlias{manual}{book} %----------------------- \DeclareSortingScheme{nyt}{% - \sort{\field{presort}}% - \sort[final]{\field{sortkey}}% - \sort{% - \field{shorthand}% - \name{sortname}% - \name{author}% - \name{editor}% - \name{translator}% - \field{sorttitle}% - \field{title}% - }% - \sort{% - \field{sortyear}% - \field{year}% - }% - \sort{% - \field{sorttitle}% - \field{title}% - }% + \sort{\field{presort}}% + \sort[final]{\field{sortkey}}% + \sort{% + \field{shorthand}% + \name{sortname}% + \name{author}% + \name{editor}% + \name{translator}% + \field{sorttitle}% + \field{title}% + }% + \sort{% + \field{sortyear}% + \field{year}% + }% + \sort{% + \field{sorttitle}% + \field{title}% + }% \sort{% - \field[padside=left,padwidth=4,padchar=0]{volume}% - \literal{0000}% - }% + \field[padside=left,padwidth=4,padchar=0]{volume}% + \literal{0000}% + }% } %----------------------- \DeclareSortingScheme{shortseries}{\sort{\field{shortseries}}} \DeclareSortingScheme{shortjournal}{\sort{\field{shortjournal}}} %----------------------- \defbibcheck{shortseries}{% - \iffieldundef{shortseries}% - {\skipentry}% - {}% + \iffieldundef{shortseries}% + {\skipentry}% + {}% \iffieldundef{series}% - {\skipentry}% - {\ifcsdef{\strfield{series}}% - {\skipentry}% - {\savefieldcs{series}{\strfield{series}}}% - }% + {\skipentry}% + {\ifcsdef{\strfield{series}}% + {\skipentry}% + {\savefieldcs{series}{\strfield{series}}}% + }% } \defbibcheck{shortjournal}{% - \iffieldundef{shortjournal}% - {\skipentry}% - {}% - \iffieldundef{journaltitle}% - {\skipentry}% - {\ifcsdef{\strfield{journaltitle}}% - {\skipentry}% - {\savefieldcs{journaltitle}{\strfield{journaltitle}}}% - }% + \iffieldundef{shortjournal}% + {\skipentry}% + {}% + \iffieldundef{journaltitle}% + {\skipentry}% + {\ifcsdef{\strfield{journaltitle}}% + {\skipentry}% + {\savefieldcs{journaltitle}{\strfield{journaltitle}}}% + }% } %----------------------- \DeclareNameAlias{author}{name:initials} @@ -270,28 +311,30 @@ \DeclareNameAlias{translator}{author} %----------------------- \DeclareListFormat{location}{% - #1\ifthenelse{\value{listcount}<\value{liststop}}% - {\orttrennzeichen}% - {}% + #1\ifthenelse{\value{listcount}<\value{liststop}}% + {\orttrennzeichen}% + {}% } %----------------------- \AtEveryBibitem{% - \iffieldequalstr{relatedtype}{translationof} - {\savename{translator}{\savedrelatedtranslator}% - \clearname{translator}} - {} - \ifboolexpr{bool {bbx:translation}% - or bool {cbx:ancient}% - or bool {cbx:frgancient}}% - {}% - {\clearname{translator}% - \clearfield{origtitle}}} + \iffieldequalstr{relatedtype}{translationof} + {\savename{translator}{\savedrelatedtranslator}% + \clearname{translator}} + {} + \ifboolexpr{bool {bbx:translation}% + or bool {cbx:ancient}% + or bool {cbx:frgancient}}% + {}% + {\clearname{translator}% + \clearfield{origtitle}% + }% +} %----------------------- \AtBeginDocument{% - \ifbool{bbx:initials}{%http://tex.stackexchange.com/a/295486/98739 - \DeclareStyleSourcemap{% - \maps[datatype=bibtex]{% - \map{% + \ifbool{bbx:initials}{%http://tex.stackexchange.com/a/295486/98739 + \DeclareStyleSourcemap{% + \maps[datatype=bibtex]{% + \map{% % Author field \step[fieldsource=author,% match={\regexp{\b(Chr|Ch|Th|Ph|[B-DF-HJ-NP-TV-XZ](l|r))(\S*,)}},% @@ -406,29 +449,46 @@ } %----------------------- \newbibmacro{labelwidthbib}{% - \begingroup% - \DeclareFieldFormat{bibhyperref}{##1}% - \csuse{blx@hook@cite}% - \csuse{blx@hook@citekey}% - \defcounter{maxnames}{\blx@maxcitenames}% - \usebibmacro{cite}% - \endgroup% + \begingroup% + \DeclareFieldFormat{bibhyperref}{##1}% + \csuse{blx@hook@cite}% + \csuse{blx@hook@citekey}% + \defcounter{maxnames}{\blx@maxcitenames}% + \usebibmacro{cite}% + \endgroup% } %----------------------- \newbibmacro{kicklabel}{% - \sbox\arch@labelbox{\usebibmacro{labelwidthbib}}% - \global\togglefalse{blx@insert}% - \ifdim.9\wd\arch@labelbox>% - \labwidthsameline\leavevmode\newline\fi% + \sbox\arch@labelbox{\usebibmacro{labelwidthbib}}% + \global\togglefalse{blx@insert}% + \ifdim1.1\wd\arch@labelbox>% + \labwidthsameline\leavevmode\newline\fi% +} +%----------------------- +\newbibmacro{labelwidthfield}[1]{% + \begingroup + \DeclareFieldFormat{bibhyperref}{##1}% + \csuse{blx@hook@cite}% + \csuse{blx@hook@citekey}% + \defcounter{maxnames}{\blx@maxcitenames}% + \printfield{#1}% + \endgroup +} +%----------------------- +\newbibmacro{kicklabelfield}[1]{% + \sbox\arch@labelbox{\usebibmacro{labelwidthfield}{#1}}% + \global\togglefalse{blx@insert}% + \ifdim.9\wd\arch@labelbox>% + \labwidthsameline\leavevmode\newline\fi } %----------------------- \renewbibmacro{in:}{% - \ifthenelse{% - \ifentrytype{article}% - \OR% - \ifentrytype{review}}% - {}% - {\printtext{\bibstring{in}\intitlepunct}}% + \ifthenelse{% + \ifentrytype{article}% + \OR% + \ifentrytype{review}}% + {}% + {\printtext{\bibstring{in}\intitlepunct}}% } %----------------------- \newbibmacro*{bbx:parunit}{% @@ -450,16 +510,16 @@ } %----------------------- \newbibmacro*{zenon}{% - \iffieldundef{zenon} - {} + \iffieldundef{zenon}% + {}% {\usebibmacro{bbx:parunit}% \printfield{zenon}% } } %----------------------- \newbibmacro*{jstor}{% - \iffieldundef{jstor} - {} + \iffieldundef{jstor}% + {}% {\usebibmacro{bbx:parunit}% \printfield{jstor}% } @@ -493,12 +553,11 @@ \iftoggle{bbx:url}{\usebibmacro{url+urldate}}{}% } %----------------------- -\DeclareFieldFormat{editortype}{\mkbibparens{#1}} - \renewbibmacro*{editor}{% +\renewbibmacro*{editor}{% \ifboolexpr{% test \ifuseeditor % and % - not test {\ifnameundef{editor}} + not test {\ifnameundef{editor}}% }% {\printnames{editor}% \setunit{\addspace}% @@ -514,6 +573,15 @@ \savefield{booktitle}{\bbx@lastbooktitle}% } %----------------------- +\DeclareLabeldate{% + \field{date} + \field{eventdate} + \field{origdate} + \field{urldate} + \field{pubstate} + \literal{nodate} +} +%----------------------- \newbibmacro*{series}{% \ifboolexpr{test {\iffieldundef{shortseries}} % or bool {bbx:noabbrv}}% @@ -549,15 +617,13 @@ \usebibmacro{journal}% \setunit{\jourvoldelim}% \printfield{volume}% - %\iffieldundef{number}% - % {}% {\setunit{\volnumdelim}% \printfield{number}% }% \newunit% \iffieldundef{year}% {\printfield{pubstate}}% - {\printfield{year}}% +{\printfield{year}}% } %----------------------- \newbibmacro*{pages}{% @@ -592,8 +658,8 @@ \bibstring{bytranslator}%keine Sprache ausgegeben? \setunit{\addspace}% \printnames{savedtranslator}% - } - } + }% + }% } %----------------------- \newbibmacro*{inreference:title+author}{% @@ -610,11 +676,11 @@ } %----------------------- \newbibmacro*{maintitle+title+volumes}{% - \iffieldsequal{maintitle}{title}% - {\clearfield{maintitle}% - \clearfield{mainsubtitle}% - \clearfield{maintitleaddon}% - }% + \iffieldsequal{maintitle}{title}% + {\clearfield{maintitle}% + \clearfield{mainsubtitle}% + \clearfield{maintitleaddon}% + }% {\iffieldundef{maintitle}% {}% {\usebibmacro{maintitle}% @@ -660,7 +726,7 @@ \ifboolexpr{% test {\iffieldundef{title}}% and% - test {\iffieldundef{subtitle}}} + test {\iffieldundef{subtitle}}}% {}% {\printtext[title]{% \printfield[titlecase]{title}% @@ -675,7 +741,7 @@ \ifboolexpr{% test {\iffieldundef{booktitle}}% and% - test {\iffieldundef{booksubtitle}}} + test {\iffieldundef{booksubtitle}}}% {}% {\printtext[booktitle]{% \printfield[titlecase]{booktitle}% @@ -701,11 +767,6 @@ \printfield{maintitleaddon}% } %----------------------- -\newbibmacro*{Erstauflage}{% - \bibstring{firstprint}% - \setunit{\addcolon\addspace}% -} -%----------------------- \newbibmacro*{edition}{% \iffieldint{edition}% {\setunit*{\addspace}% @@ -717,66 +778,68 @@ } %----------------------- \newbibmacro*{location+edition+year}{% - \ifboolexpr{% - test {\iflistundef{location}}% - and test {\iflistundef{publisher}}% - and test {\iffieldundef{year}}}% - {}% - {\ifbool{bbx:publisher}% - {\printtext[parens]{% - \printlist{location}% - \setunit*{\addcolon\addspace}% - \printlist{publisher}% - \iffieldint{edition}% - {\setunit{\addspace}}% - {\newunit}% - \usebibmacro{edition}% - \iffieldundef{year}% - {\printfield{pubstate}}% - {\printfield{year}}% - \setunit*{\addspace}% - \ifboolexpr{% - test {\iflistundef{origlocation}}% - and test {\iflistundef{origpublisher}}% - and test {\iffieldundef{origyear}}}% - {}% - {\printtext[parens]{%\usebibmacro{Erstauflage}% - \printlist{origlocation}% - \iflistundef{origpublisher}% - {}% - {\setunit*{\addcolon\addspace}% - \printlist{origpublisher}% + \ifboolexpr{% + test {\iflistundef{location}}% + and test {\iflistundef{publisher}}% + and test {\iffieldundef{year}}}% + {}% + {\ifbool{bbx:publisher}% + {\printtext[parens]{% + \printlist{location}% + \setunit*{\addcolon\addspace}% + \printlist{publisher}% + \iffieldint{edition}% + {\setunit{\addspace}}% + {\newunit}% + \usebibmacro{edition}% + \iffieldundef{year}% + {\printfield{pubstate}}% + {\printfield{year}}% + \setunit*{\addspace}% + \ifboolexpr{% + test {\iflistundef{origlocation}}% + and test {\iflistundef{origpublisher}}% + and test {\iffieldundef{origyear}}}% + {}% + {\printtext[parens]{% + \printlist{origlocation}% + \iflistundef{origpublisher}% + {}% + {\setunit*{\addcolon\addspace}% + \printlist{origpublisher}% + }% + \setunit{\addspace}% + \printfield{origyear}% + }% + }% + }% + }% + {\usebibmacro{edition}% + \printtext[parens]{% + \ifboolexpr{% + test {\iflistundef{origlocation}}% + and test {\iffieldundef{origyear}}% + }% + {}% + {\iflistundef{origlocation}% + {\printlist{location}}% + {\printlist{origlocation}}% + \setunit{\addspace}% + \printfield{origyear}% + \setunit*{\addsemicolon\addspace}% + \iffieldundef{origyear}% + {}% + {\bibstring{reprint}% + \addspace% + }% + }% + \printlist{location}% + \setunit*{\addspace}% + \iffieldundef{year}% + {\printfield{pubstate}}% + {\printfield{year}}% + }% }% - \setunit{\addspace}% - \printfield{origyear}% - }% - }% - }% - }% - {\usebibmacro{edition}% - \printtext[parens]{% - \ifboolexpr{test {\iflistundef{origlocation}}% - and test {\iffieldundef{origyear}}}% - {}% - {\iflistundef{origlocation}% - {\printlist{location}}% - {\printlist{origlocation}}% - \setunit{\addspace}% - \printfield{origyear}% - \setunit*{\addsemicolon\addspace}% - \iffieldundef{origyear}% - {}% - {\bibstring{reprint}% -\addspace% - }% - }% - \printlist{location}% - \setunit*{\addspace}% - \iffieldundef{year}% - {\printfield{pubstate}}% - {\printfield{year}}% - }% - }% }% } %----------------------- @@ -789,26 +852,6 @@ {\printfield{year}}% } %----------------------- -\DeclareLabeldate{%http://tex.stackexchange.com/a/154367/98739 - \field{date}% - \field{eventdate}% - \field{origdate}% - \field{urldate}% - \field{pubstate}% - \literal{nodate}% -} -%----------------------- -\newbibmacro*{addendum}{}%%notwendig? -%----------------------- -\renewbibmacro*{addendum+pubstate}{% - \printfield{addendum}% - \iffieldundef{\thefield{datelabesource}year}% - {}% - {\newunit\newblock% - \printfield{pubstate}% - }% -} -%----------------------- \newbibmacro{signatur}{% \printfield{note}% } @@ -824,7 +867,7 @@ \iffieldundef{maintitle}% {}% {\usebibmacro{maintitle}% - \iffieldundef{volume} + \iffieldundef{volume}% {\setunit{\maintitlepunct}}% {\setunit{\addspace}% \printfield{volume}% @@ -833,7 +876,7 @@ }% }% \usebibmacro{booktitle}% - \newunit + \newunit% } %----------------------- \newbibmacro*{booktitle+volume+editor}{% @@ -879,18 +922,16 @@ } %----------------------- \DeclareBibliographyDriver{shortjournal}{% - \printtext[journaltitle]{% - \printfield[titlecase]{journaltitle}% - \setunit{\subtitlepunct}% - \printfield[titlecase]{journalsubtitle}% - }% -} + \printtext[journaltitle]{% + \printfield[titlecase]{journaltitle}% + \setunit{\subtitlepunct}% + \printfield[titlecase]{journalsubtitle}}% + \blx@initunit} %----------------------- \DeclareBibliographyDriver{shortseries}{% - \printtext[seriestitle]{% - \printfield[titlecase]{series}% - }% -} + \printtext[seriestitle]{% + \printfield[titlecase]{series}}% + \blx@initunit} %----------------------- \DeclareDataInheritance{reference}{inreference}{% \inherit{shorthand}{booktitle}% @@ -917,8 +958,8 @@ \usebibmacro{pages}% \setunit{\addspace}% \usebibmacro{doi+eprint+url}% - \newunit\newblock% - \setunit{\bibpagerefpunct}% + \newblock% + \usebibmacro{signatur}% \newblock% \usebibmacro{pageref}% \newunit\newblock% @@ -967,7 +1008,7 @@ \DeclareBibliographyDriver{thesis}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% - \usebibmacro{author/editor} + \usebibmacro{author/editor}% \setunit*{\labelnamepunct}% \newblock% \usebibmacro{title}% @@ -979,11 +1020,11 @@ \usebibmacro{doi+eprint+url}% \setunit*{\addperiod\addspace}% \usebibmacro{signatur}% - \newunit\newblock - \iftoggle{bbx:related} + \newunit\newblock% + \iftoggle{bbx:related}% {\usebibmacro{related:init}% \usebibmacro{related}% - } + }% {}% \usebibmacro{savestuff}% \usebibmacro{finentry}% @@ -1027,7 +1068,7 @@ %----------------------- \DeclareBibliographyDriver{inproceedings}{% \usebibmacro{bibindex}% - \usebibmacro{begentry}%% + \usebibmacro{begentry}% \usebibmacro{author/editor}% \setunit*{\labelnamepunct}% \newblock% @@ -1077,7 +1118,7 @@ \newunit\newblock% \bibstring{talk}% \setunit{\addspace}% - \printdate + \printdate% \newunit\newblock% \printlist{institution}% \newunit\newblock% @@ -1150,13 +1191,12 @@ \printfield[parens]{year}% \setunit{\addspace}% \usebibmacro{pages}% - \usebibmacro{inreference:title+author} - \setunit*{\addspace}% - \usebibmacro{addendum}% + \usebibmacro{inreference:title+author}% + \newunit\newblock% \usebibmacro{doi+eprint+url}% \setunit{\addperiod\addspace}% \usebibmacro{signatur}% - \newunit\newblock + \newunit\newblock% \usebibmacro{savestuff}% \usebibmacro{finentry}% } @@ -1186,19 +1226,32 @@ } %----------------------- \defbibenvironment{bibliography}% - {\list% - {\usebibmacro{labelwidthbib}}% - {\setlength{\labelwidth}{\labwidthsameline} - \setlength{\leftmargin}{\labelwidth}% - \setlength{\labelsep}{\biblabelsep}% - \addtolength{\leftmargin}{\labelsep}% - \setlength{\itemsep}{\bibitemsep}% - \setlength{\parsep}{\bibparsep}% - \renewcommand*{\makelabel}[1]{##1\hss}% - }% - }% - {\endlist}% - {\item% - \usebibmacro{kicklabel}% - } + {\list% + {\usebibmacro{labelwidthbib}}% + {\setlength{\labelwidth}{\labwidthsameline}% + \setlength{\leftmargin}{\labelwidth}% + \setlength{\labelsep}{\biblabelsep}% + \addtolength{\leftmargin}{\labelsep}% + \setlength{\itemsep}{\bibitemsep}% + \setlength{\parsep}{\bibparsep}% + \renewcommand*{\makelabel}[1]{##1\hss}}}% + {\endlist}% + {\item\usebibmacro{kicklabel}} + %----------------------- +\def\do#1{% + \defbibenvironment{#1} + {\list% + {\printfield{#1}}% + {\setlength{\labelwidth}{\labwidthsameline}% + \setlength{\leftmargin}{\labelwidth}% + \setlength{\labelsep}{\biblabelsep}% + \addtolength{\leftmargin}{\labelsep}% + \setlength{\itemsep}{\bibitemsep}% + \setlength{\parsep}{\bibparsep}% + \renewcommand*{\makelabel}[1]{####1\hss}}} + {\endlist} + {\item\usebibmacro{kicklabelfield}{#1}}% +} +\docsvlist{shortjournal,shortseries} + \endinput
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx index 5a8ab8b7477..9f65776118f 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx @@ -26,8 +26,8 @@ {\listcsxadd{cbx@fseen@names}{#1}} {\listcsxadd{cbx@tseen@names}{#1}}} \newrobustcmd*{\cbx@ifnameseen}[1]{% - \iftoggle{blx@footnote} - {\xifinlistcs{#1}{cbx@fseen@names}} + \iftoggle{blx@footnote}% + {\xifinlistcs{#1}{cbx@fseen@names}}% {\xifinlistcs{#1}{cbx@tseen@names}}} \renewcommand*{\multicitedelim}{\addsemicolon\addspace} @@ -43,21 +43,22 @@ } %----------------------- \DeclareBibliographyOption{yearinparens}[true]{% - \ifstrequal{#1}{true} - {\DeclareFieldFormat{citeyear}{\mkbibparens{##1}} - \csuse{bool#1}{cbx:yearinparens}} - {\DeclareFieldFormat{citeyear}{##1}}} + \ifstrequal{#1}{true}% + {\DeclareFieldFormat{citeyear}{\mkbibparens{##1}}% + \csuse{bool#1}{cbx:yearinparens}}% + {\DeclareFieldFormat{citeyear}{##1}}}% \DeclareBibliographyOption{seenote}[true]{\csuse{bool#1}% {cbx:seenote}% \ExecuteBibliographyOptions{maxnames=999}% }% \DeclareBibliographyOption[string]{citeauthorformat}{% - \ifcsdef{cbx@arch@citeauthorformat@#1} - {\csuse{cbx@arch@citeauthorformat@#1}} - {\PackageError{biblatex-archaeologie} - {Option 'citeauthorformat=#1' invalid} - {The option you have supplied is invalid.\MessageBreak - Use one of the values 'initials', 'full', 'family' or 'firstfull'.}}} + \ifcsdef{cbx@arch@citeauthorformat@#1}% + {\csuse{cbx@arch@citeauthorformat@#1}}% + {\PackageError{biblatex-archaeologie}% + {Option 'citeauthorformat=#1' invalid.\MessageBreak% + Use one of the values 'initials', 'full', 'family' or 'firstfull'.}{}}% +\def\citeauthorformatVALUE{#1}% +} %----------------------- \DeclareFieldFormat{citeyear}{#1} \DeclareFieldFormat{prenote}{#1\isdot} @@ -153,34 +154,37 @@ \def\cbx@arch@citeauthorformat@initials{% \DeclareNameAlias{citeauthor}{name:initials}} + \DeclareNameFormat{citeauthor:fancy}{% + \cbx@ifnameseen{\thefield{hash}} + {\ifnum\value{uniquename}=2 + \usebibmacro{name:given-family} + {\namepartfamily} + {\namepartgiven} + {\namepartprefix} + {\namepartsuffix}% + \else + \ifuseprefix + {\usebibmacro{name:given-family} + {\namepartfamily} + {\namepartgiveni} + {\namepartprefix} + {\namepartsuffixi}} + {\usebibmacro{name:given-family} + {\namepartfamily} + {\namepartgiveni} + {\namepartprefixi} + {\namepartsuffixi}}% + \fi} + {\usebibmacro{name:given-family} + {\namepartfamily} + {\namepartgiven} + {\namepartprefix} + {\namepartsuffix}% + \cbx@nameseen{\thefield{hash}}}% + \usebibmacro{name:andothers}} + \def\cbx@arch@citeauthorformat@firstfull{% - \DeclareNameFormat{citeauthor}{% - \cbx@ifnameseen{\thefield{hash}} - {\ifnum\value{uniquename}=2% - \usebibmacro{name:given-family} - {\namepartfamily} - {\namepartgiven} - {\namepartprefix} - {\namepartsuffix}% - \else - \ifuseprefix - {\usebibmacro{name:given-family} - {\namepartfamily} - {\namepartgiveni} - {\namepartprefix} - {\namepartsuffixi}} - {\usebibmacro{name:given-family} - {\namepartfamily} - {\namepartgiveni} - {\namepartprefixi} - {\namepartsuffixi}}} - {\usebibmacro{name:given-family} - {\namepartfamily} - {\namepartgiven} - {\namepartprefix} - {\namepartsuffix}% - \cbx@nameseen{\thefield{hash}}}% - \usebibmacro{name:andothers}}} + \DeclareNameAlias{citeauthor}{citeauthor:fancy}} %----------------------- \ExecuteBibliographyOptions{% citetracker=true,% @@ -294,7 +298,7 @@ {\usebibmacro{cite:labelyear+extrayear}}}% {\usebibmacro{cite}}} %----------------------- -\newbibmacro*{textcite}{%aus authoryear +\newbibmacro*{textcite}{% \ifnameundef{labelname}% {\iffieldundef{shorthand}% {\usebibmacro{cite:label}% @@ -355,7 +359,7 @@ test{\ifentrytype{inreference}}% }{}{\usebibmacro{postnote}}}% %----------------------- -\DeclareCiteCommand{\textcite}%aus authoryear +\DeclareCiteCommand{\textcite}% {\boolfalse{cbx:yearinparens}% \usebibmacro{prenote}% }% @@ -384,11 +388,11 @@ }{}{\usebibmacro{postnote}}}% %----------------------- \DeclareMultiCiteCommand{\cites}% - {\cite}{\multicitedelim} + {\cite}{\multicitedelim}% \DeclareMultiCiteCommand{\parencites}[\mkbibparens]% - {\parencite}{\multicitedelim} - \DeclareMultiCiteCommand{\textcites}% - {\textcite}{\textcitedelim} + {\parencite}{\multicitedelim}% +\DeclareMultiCiteCommand{\textcites}% + {\textcite}{\textcitedelim}% %----------------------- \DeclareCiteCommand{\citeauthor} {\boolfalse{citetracker}% @@ -398,8 +402,8 @@ \ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}% \addspace\bibstring{and}\space}% \usebibmacro{prenote}}% - {\ifciteindex - {\indexnames{labelname}} + {\ifciteindex% + {\indexnames{labelname}}% {}% \ifboolexpr{% test {\ifbool{bbx:inreferences}}% @@ -407,9 +411,9 @@ test {\ifentrytype{inreference}}% }% {\printtext}% - {\printtext[bibhyperref]} - {\printnames[citeauthor]{labelname}}} - {\multicitedelim} + {\printtext[bibhyperref]}% + {\printnames[citeauthor]{labelname}}}% + {\multicitedelim}% {\usebibmacro{postnote}} %----------------------- \DeclareCiteCommand{\citetitle} % |