diff options
Diffstat (limited to 'Master/texmf-dist/tex')
7 files changed, 160 insertions, 44 deletions
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx index a6995bebd0f..c1375cb6e2f 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx @@ -12,7 +12,7 @@ \ProvidesFile{archaeologie-english.lbx}% - [2016/03/12 v1.41 archaeologie --% + [2016/03/17 v1.42 archaeologie --% biblatex fuer Archaeologen, Historiker und Philologen, lbx-Datei] \InheritBibliographyExtras{english} diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx index 1b6c7c84869..3d7a251a5eb 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx @@ -12,7 +12,7 @@ \ProvidesFile{archaeologie-french.lbx}% - [2016/03/12 v1.41 archaeologie --% + [2016/03/17 v1.42 archaeologie --% biblatex fuer Archaeologen, Historiker und Philologen, lbx-Datei] \InheritBibliographyExtras{french} \DefineBibliographyExtras{french}{\restorecommand\mkbibnamelast} diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx index 740e52b59de..bdd77fd3456 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx @@ -12,7 +12,7 @@ \ProvidesFile{archaeologie-italian.lbx}% - [2016/03/12 v1.41 archaeologie --% + [2016/03/17 v1.42 archaeologie --% biblatex fuer Archaeologen, Historiker und Philologen, lbx-Datei] \InheritBibliographyExtras{italian} diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx index bbdb11ef88b..681a0d75e45 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx @@ -12,7 +12,7 @@ \ProvidesFile{archaeologie-ngerman.lbx}% - [2016/03/12 v1.41 archaeologie --% + [2016/03/17 v1.42 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 424b15c0604..9c92f144cb4 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx @@ -11,7 +11,7 @@ % version 2005/12/01 or later. \ProvidesFile{archaeologie.bbx}% - [2016/03/12 v1.41 archaeologie --% + [2016/03/17 v1.42 archaeologie --% biblatex fuer Archaeologen, Historiker und Philologen, bbx-Datei] \RequireBibliographyStyle{standard} \AtBeginDocument{% @@ -44,26 +44,35 @@ maxbibnames=999,% \newbool{bbx:noabbrevs}% keineabkuerzung \newbool{bbx:translation}% uebersetzung \newbool{bbx:publisher}% verlag +\newbool{bbx:initials}% \newbool{bbx:counter}% + \newbool{cbx:antik}% \newbool{cbx:frgantik}% \newbool{cbx:corpus}% \newbool{cbx:lastnames}% nurnachname -\newbool{cbx:fullnames}% vollername +\newbool{cbx:fullnames}% vollername -\DeclareBibliographyOption{strings}[true]{% -\IfFileExists{dai-abkuerzungen.bib}{\addbibresource{dai-abkuerzungen.bib}}{\addbibresource[location=remote]{https://www.ctan.org/tex-archive/macros/latex/contrib/biblatex-contrib/archaeologie/dai-abkuerzungen.bib}}} -%\addbibresource{antike-corpora.bib} % Version 2.0 + +\newlength{\labwidthsameline} +\setlength{\labwidthsameline}{4em} +\DeclareBibliographyOption{strings}[true]{% +\addbibresource{archaeologie-abbrv.bib} +%\addbibresource{archaeologie-corpora.bib} +} + %% \DeclareBibliographyOption %% \DeclareBibliographyOption{edby}[true]{\csuse{bool#1}{bbx:edby}} +\DeclareBibliographyOption{initials}[true]{\csuse{bool#1}{bbx:initials}} + \DeclareBibliographyOption{width}[]{% \csuse{booltrue}{bbx:width} - \newcommand{\width}{#1}} + \setlength{\labwidthsameline}{#1}} \DeclareBibliographyOption{yearseries}[true]{\csuse{bool#1}{bbx:yearseries}} \DeclareBibliographyOption{counter}[true]{\csuse{bool#1}{bbx:counter}} -\DeclareBibliographyOption{bibfullname}[true]{\ExecuteBibliographyOptions{firstinits=false}} +\DeclareBibliographyOption{bibfullname}[true]{\ExecuteBibliographyOptions{giveninits=false}} \DeclareBibliographyOption{inreferences}[true]{\csuse{bool#1}{bbx:inreferences} \ExecuteBibliographyOptions[inreference]{skipbib=true}} \DeclareBibliographyOption{noabbrevs}[true]{\csuse{bool#1}{bbx:noabbrevs}} @@ -83,7 +92,7 @@ maxbibnames=999,% } \DeclareBibliographyOption{scshape}[true]{% \ifstrequal{#1}{true}% - {\AtEveryCite{\renewcommand*{\mkbibnamelast}[1]{\textsc{##1}}}}% + {\AtEveryCite{\renewcommand*{\mkbibnamefamily}[1]{\textsc{##1}}}}% {}} %% \DeclareEntryOption %% @@ -152,7 +161,6 @@ maxbibnames=999,% \newcommand*{\jourvoldelim}{\addnbspace} - \DeclareBibliographyAlias{collection}{book} \DeclareBibliographyAlias{reference}{book} \DeclareBibliographyAlias{institution}{school} @@ -213,7 +221,36 @@ maxbibnames=999,% \clearfield{origtitle} }% } - + + +\AtBeginDocument{% +\ifbool{bbx:initials}{% +\DeclareStyleSourcemap{%% %http://tex.stackexchange.com/a/295486/98739 + \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*,)}},% + replace={\regexp{\{$1\}$3}}]% Protect last names (first last) + \step[fieldsource=author,% + match={\regexp{([^,]\s)\b(Chr|Ch|Th|Ph|[B-DF-HJ-NP-TV-XZ](l|r))}},% + replace={\regexp{$1\{$2\}}}]% Protect last names (last, first) + \step[fieldsource=author,% + match={\regexp{\b(Chr|Ch|Th|Ph|[B-DF-HJ-NP-TV-XZ](l|r))([^\}])}},% + replace={\regexp{\{\\relax\{\}$1\}$3}}]% Insert \relax after abbreviating + % Editor field + \step[fieldsource=editor,% + match={\regexp{\b(Chr|Ch|Th|Ph|[B-DF-HJ-NP-TV-XZ](l|r))(\S*,)}},% + replace={\regexp{\{$1\}$3}}]% Protect last names (first last) + \step[fieldsource=editor,% + match={\regexp{([^,]\s)\b(Chr|Ch|Th|Ph|[B-DF-HJ-NP-TV-XZ](l|r))}},% + replace={\regexp{$1\{$2\}}}]% Protect last names (last, first) + \step[fieldsource=editor,% + match={\regexp{\b(Chr|Ch|Th|Ph|[B-DF-HJ-NP-TV-XZ](l|r))([^\}])}},% + replace={\regexp{\{\\relax\{\}$1\}$3}}]% Insert \relax after abbreviating +}}} +}{} +} %%%%%%%%%%%%%bibmacro%%%%%%%%%%% @@ -912,26 +949,25 @@ maxbibnames=999,% \newbibmacro{labelwidthbib}{% \begingroup% \DeclareFieldFormat{bibhyperref}{##1}% - \csuse{blx@hook@cite}% + \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\shorthandwidth<.9\wd\arch@labelbox\leavevmode\newline\fi% - } + \ifdim.9\wd\arch@labelbox>\labwidthsameline\leavevmode\newline\fi% +} + \defbibenvironment{bibliography}% {\list% {\usebibmacro{labelwidthbib}}% - {\setlength{\labelwidth}{% - \ifbool{bbx:width}{\width}{\shorthandwidth}}% - \setlength{\leftmargin}{\labelwidth}% + {\setlength{\labelwidth}{\labwidthsameline} + \setlength{\leftmargin}{\labelwidth}% \setlength{\labelsep}{\biblabelsep}% \addtolength{\leftmargin}{\labelsep}% \setlength{\itemsep}{\bibitemsep}% diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx index d5d8bfc1440..6a8f96db32e 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}% - [2016/03/12 v1.41 archaeologie --% + [2016/03/17 v1.42 archaeologie --% biblatex fuer Archaeologen, Historiker und Philologen, cbx-Datei] \ExecuteBibliographyOptions{% citetracker=true,% @@ -58,20 +58,21 @@ \renewcommand*{\multicitedelim}{\addsemicolon\addspace}% \newcommand*{\labelyeardelim}{\addspace} - - - - -\renewbibmacro*{postnote}{% +\renewcommand{\textcitedelim}{} +\renewcommand{\postnotedelim}{ \ifboolexpr{bool {cbx:antik}% or bool {cbx:frgantik}% or bool {cbx:corpus}% }% {\setunit{\addspace}}% - {\newunit}% - \iffieldundef{postnote} + {\newunitpunct}% +} + + +\renewbibmacro*{postnote}{% +\iffieldundef{postnote} {}% - {\printfield{postnote}% + {\postnotedelim\printfield{postnote}% \ifbool{cbx:frgantik}% {\setunit{\addspace}% \usebibmacro{cite:frgname}}% @@ -81,7 +82,7 @@ \newbibmacro*{cite:frgname}{% \ifnameundef{shorteditor}% {\printnames[frg]{editor}}% - {\printnames[frg]{shorteditor}} + {\printnames[frg]{shorteditor}}% } \newbibmacro*{cite:name}{% % 0: only last names, 1: last name + first name initials, 2: full name @@ -94,14 +95,11 @@ \newbibmacro*{cite:year}{% - \iffieldundef{labelyear} + \iffieldundef{labelyear}% {}% {{\printtext[citeyear]{\printfield{labelyear}\printfield{extrayear}}}}} -\newbibmacro*{cite:label}{% - \iffieldundef{label} - {\printfield[citetitle]{labeltitle}} - {\printfield{label}}} + @@ -135,11 +133,75 @@ {\printnames{labelname}% \setunit{\nameyeardelim}}% \usebibmacro{cite:year}}% - {\printfield{shorthand}}}}% + {\usebibmacro{cite:shorthand}}}}% } - +\newbibmacro*{citeyear}{% + \iffieldundef{shorthand} + {\iffieldundef{labelyear} + {\usebibmacro{cite:label}} + {\usebibmacro{cite:labelyear+extrayear}}} + {\usebibmacro{cite}}} + +\newbibmacro*{textcite}{%aus authoryear + \ifnameundef{labelname} + {\iffieldundef{shorthand} + {\usebibmacro{cite:label}% + \setunit{% + \global\booltrue{cbx:yearinparens}% + \nonameyeardelim\bibopenparen}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \usebibmacro{cite:labelyear+extrayear}} + {\usebibmacro{cite}}} + {\printnames{labelname}% + \setunit{% + \global\booltrue{cbx:yearinparens}% + \nameyeardelim\bibopenparen}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \usebibmacro{citeyear}}} + +\newbibmacro*{cite:shorthand}{% + \printtext[bibhyperref]{\printfield{shorthand}}} + +\newbibmacro*{cite:label}{% + \iffieldundef{label} + {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}} + {\printtext[bibhyperref]{\printfield{label}}}} + +\newbibmacro*{cite:labelyear+extrayear}{% + \iffieldundef{labelyear}% + {}% + {\printtext[bibhyperref]{% + \printfield{labelyear}% + \printfield{extrayear}}}} + +\newbibmacro*{textcite:postnote}{% + \ifboolexpr{bool {cbx:antik}% + or bool {cbx:frgantik}% + or bool {cbx:corpus}% + }% + {\setunit{\addspace}}% +{}% + \iffieldundef{postnote} + {\ifbool{cbx:yearinparens} + {\bibcloseparen} + {}} + {\ifbool{cbx:yearinparens} + {\setunit{\postnotedelim}} + {\setunit{\extpostnotedelim\bibopenparen}}% + \printfield{postnote}% + \ifbool{cbx:frgantik}% + {\setunit{\addspace}% + \usebibmacro{cite:frgname}% + \bibcloseparen}% + \bibcloseparen}} + + %% Cite Commands %%% \DeclareCiteCommand{\cite}% @@ -153,10 +215,19 @@ and% test{\ifentrytype{inreference}}% }{}{\usebibmacro{postnote}}}% - - - - +\DeclareCiteCommand{\textcite}%aus authoryear + {\boolfalse{cbx:yearinparens}} + {\usebibmacro{citeindex}% + \iffirstcitekey + {\setcounter{textcitetotal}{1}} + {\stepcounter{textcitetotal}% + \textcitedelim}% + \usebibmacro{textcite}} + {\ifbool{cbx:parens} + {\bibcloseparen\global\boolfalse{cbx:yearinparens}} + {}} + {\usebibmacro{textcite:postnote}} + \DeclareCiteCommand{\parencite}[\mkbibparens]% {\usebibmacro{prenote}}% @@ -169,7 +240,16 @@ test{\ifentrytype{inreference}}% test{\ifentrytype{inreference}}% }{}{\usebibmacro{postnote}}}% - + +\DeclareMultiCiteCommand{\cites}% + {\cite}{\multicitedelim} +\DeclareMultiCiteCommand{\parencites}[\mkbibparens]% + {\parencite}{\multicitedelim} + \DeclareMultiCiteCommand{\textcites}% + {\textcite}{\addspace\bibstring{and}\space} + + + \DeclareCiteCommand{\citeauthor}% {\boolfalse{citetracker}% \boolfalse{pagetracker}% diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx index 5844a677286..034131d0bd7 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx @@ -12,7 +12,7 @@ \ProvidesFile{archaeologie.dbx}% - [2016/03/12 v1.41 archaeologie --% + [2016/03/17 v1.42 archaeologie --% biblatex fuer Archaeologen, Historiker und Philologen, dbx-Datei] % new translator etc. fields for "inner" work, that is translator of title (not booktitle) in @in... |