From 7a3065406ff5ea857987447b0f775d4aafb56d12 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 16 Feb 2020 22:09:12 +0000 Subject: archaeologie (16feb20) git-svn-id: svn://tug.org/texlive/trunk@53813 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/archaeologie/README.md | 10 +- .../doc/latex/archaeologie/archaeologie.pdf | Bin 1062129 -> 1012609 bytes .../source/latex/archaeologie/archaeologie.dtx | 158 +++++++++++++-------- .../source/latex/archaeologie/archaeologie.ins | 4 +- .../tex/latex/archaeologie/archaeologie.bbx | 17 +-- .../tex/latex/archaeologie/archaeologie.cbx | 29 +--- .../tex/latex/archaeologie/archaeologie.dbx | 6 +- .../latex/archaeologie/english-archaeologie.lbx | 13 +- .../tex/latex/archaeologie/french-archaeologie.lbx | 9 +- .../tex/latex/archaeologie/german-archaeologie.lbx | 9 +- .../latex/archaeologie/italian-archaeologie.lbx | 8 +- .../latex/archaeologie/spanish-archaeologie.lbx | 6 +- 12 files changed, 141 insertions(+), 128 deletions(-) diff --git a/Master/texmf-dist/doc/latex/archaeologie/README.md b/Master/texmf-dist/doc/latex/archaeologie/README.md index a2c67232285..5fcae025060 100644 --- a/Master/texmf-dist/doc/latex/archaeologie/README.md +++ b/Master/texmf-dist/doc/latex/archaeologie/README.md @@ -4,12 +4,12 @@ bibLaTeX-__archaeologie__ Bundle bibLaTeX-style for archaeologists, historians and philologists. --- -Copyright (c) 2015-2019 Lukas C. Bossert +Copyright (c) 2015-2020 Lukas C. Bossert Copyright (c) 2015 Lukas C. Bossert | Johannes Friedl -* Email: [info@biblatex-archaeologie.de](mailto:info@biblatex-archaeologie.de) -* Website: [www.biblatex-archaeologie.de](http://www.biblatex-archaeologie.de) +* Email: [info@biblatex.texografie.de](mailto:info@biblatex.texografie.de) +* Website: [www.biblatex-archaeologie.texografie.de](http://www.biblatex-archaeologie.texografie.de) This citation-style covers the citation and bibliography rules of the [__German Archaeological Institute__ (DAI)](http://www.dainst.org/dai/meldungen). @@ -95,6 +95,10 @@ This bundle is constantly updated. For hints, errors or suggestions use the GitH All notable changes to this project will be documented in the [README.md](https://github.com/LukasCBossert/biblatex-archaeologie/blob/master/README.md). This project **does not** adhere to [Semantic Versioning](http://semver.org/). The markdown syntax is inspired by the conventions proposed by [keepachangelog.com](http://keepachangelog.com/). +## v2.4.4 (2020-02-15) +### *Fixed* +* corrected the use of the `maintitlepunct` in the bibmacro `maintitle+title+volumes` + ## v2.4.3 (2019-12-03) ### *Fixed* * Spelling error in Italian language for Dresden and München. Thanks to Matteo Turri. (Feedback always welcome!) diff --git a/Master/texmf-dist/doc/latex/archaeologie/archaeologie.pdf b/Master/texmf-dist/doc/latex/archaeologie/archaeologie.pdf index 2f58e1ab8aa..2fc9aec4a6c 100644 Binary files a/Master/texmf-dist/doc/latex/archaeologie/archaeologie.pdf and b/Master/texmf-dist/doc/latex/archaeologie/archaeologie.pdf differ diff --git a/Master/texmf-dist/source/latex/archaeologie/archaeologie.dtx b/Master/texmf-dist/source/latex/archaeologie/archaeologie.dtx index bf0085f0e06..5f056a37194 100644 --- a/Master/texmf-dist/source/latex/archaeologie/archaeologie.dtx +++ b/Master/texmf-dist/source/latex/archaeologie/archaeologie.dtx @@ -1,7 +1,7 @@ %\iffalse %<*internal|bbx|cbx|dbx|lbx> -\def\archDate{2019/12/03} -\def\archVersion{2.4.3} +\def\archDate{2020/02/15} +\def\archVersion{2.4.4} % %<*internal> \iffalse @@ -64,13 +64,13 @@ bibLaTeX-__archaeologie__ Bundle bibLaTeX-style for archaeologists, historians and philologists. --- -Copyright (c) 2015-2019 Lukas C. Bossert +Copyright (c) 2015-2020 Lukas C. Bossert Copyright (c) 2015 Lukas C. Bossert | Johannes Friedl -* Email: [info@biblatex-archaeologie.de](mailto:info@biblatex-archaeologie.de) -* Website: [www.biblatex-archaeologie.de](http://www.biblatex-archaeologie.de) +* Email: [info@biblatex.texografie.de](mailto:info@biblatex.texografie.de) +* Website: [www.biblatex-archaeologie.texografie.de](http://www.biblatex-archaeologie.texografie.de) This citation-style covers the citation and bibliography rules of the [__German Archaeological Institute__ (DAI)](http://www.dainst.org/dai/meldungen). @@ -198,7 +198,6 @@ The current maintainer of this work is [Lukas C. Bossert](https://github.com/Luk zenon = {000042874}, } - @Book{EAOR-02, editor = {Gregori, Gian Luca}, title = {Regiones Italiae VI--XI}, @@ -988,7 +987,7 @@ The current maintainer of this work is [Lukas C. Bossert](https://github.com/Luk ---------------------------------------------------------------- biblatex-archaeologie --- Author: Lukas C. Bossert -E-mail: info@biblatex-archaeologie.de +E-mail: info@biblatex.texografie.de License: Released under the LaTeX Project Public License v1.3c or later See: http://www.latex-project.org/lppl.txt ---------------------------------------------------------------- @@ -1139,7 +1138,7 @@ draft=false, \clearscrheadfoot \ihead{\normalfont\footnotesize \texttt{bib}\LaTeX-style \texttt{archaeologie \archaeologieversion} \copyright\ by Lukas C. Bossert (2015--\the\year) | Johannes Friedl (2015)}% \rofoot{\normalfont\footnotesize \textbf{\sffamily \thepage}} -\lofoot{\normalfont\footnotesize \href{http://www.biblatex-archaeologie.de}{biblatex-archaeologie.de}} +\lofoot{\normalfont\footnotesize \href{http://www.biblatex-archaeologie.texografie.de}{biblatex-archaeologie.de}} \RequirePackage[% % flushmargin, % @@ -1465,7 +1464,7 @@ examplebox, \begin{document} \pdfbookmark[1]{Titlepage}{title} \title{\texttt{archaeologie} -- \\\texttt{bib\LaTeX} for archaeologists\footnote{Also very handy for scholars of (ancient) history or classics, too. -For further information about the code visit \href{http://www.biblatex-archaeologie.de}{biblatex-archaeologie.de}: +For further information about the code visit \href{http://www.biblatex-archaeologie.texografie.de}{biblatex-archaeologie.de}: Comments and criticisms are welcome. We thank especially \href{https://tex.stackexchange.com/users/35864/moewe}{M. Wemheuer} and \href{https://tex.stackexchange.com/users/2478/herbert}{H. Voß} for their great help with the code.% }} @@ -1474,7 +1473,7 @@ We thank especially \href{https://tex.stackexchange.com/users/35864/moewe}{M. We \footnotesize 2015--\the\year & Lukas C. Bossert\\ \footnotesize 2015 & \footnotesize Johannes Friedl \\ \end{tabular}\\\footnotesize -\href{mailto:info@biblatex-archaeologie.de}{info@biblatex-archaeologie.de}} +\href{mailto:info@biblatex.texografie.de}{info@biblatex.texografie.de}} \date{Version: \archaeologieversion{} (\archaeologiedate)} \maketitle @@ -8106,6 +8105,11 @@ To see the long forms of journal titles or series you have to switch on the opti % ██ ██████ ██████ ██████ ██████ ██ ██ ███████ ██ ████ ██ % */ %<*readme> +## v2.4.4 (2020-02-15) +### *Fixed* +* corrected the use of the `maintitlepunct` in the bibmacro `maintitle+title+volumes` + + ## v2.4.3 (2019-12-03) ### *Fixed* * Spelling error in Italian language for Dresden and München. Thanks to Matteo Turri. (Feedback always welcome!) @@ -8389,7 +8393,7 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. \DeclareNameAlias{author}{given-family}} \DeclareBibliographyOption{inreferences}[true]{% \PackageWarningNoLine{biblatex-archaeologie}{% - The option 'inreferences' for is deprecated,\MessageBreak + The option 'inreferences' is deprecated,\MessageBreak use 'inreferencesasfullcite' instead.}% \booltrue{bbx:inreferencesasfullcite}} \DeclareBibliographyOption{inreferencesasfullcite}[true]{\csuse{bool#1}{bbx:inreferencesasfullcite} @@ -8576,11 +8580,12 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. \newcommand*{\locationdelim}{\addnbspace\textendash\addspace} \renewcommand{\multinamedelim}{\addnbspace\textendash\addspace} \renewcommand{\finalnamedelim}{\multinamedelim} -\renewcommand*\relateddelim{\addnbspace\textendash\addspace}% +\renewcommand*{\relateddelim}{\addnbspace\textendash\addspace}% \newcommand*{\relateddelimmultivolume}{\addcomma\par\nobreak} \newcommand*{\volnumdelim}{\addcomma\space} \newcommand*{\yearnumdelim}{\addslash} \newcommand*{\jourvoldelim}{\addnbspace} +\renewcommand*{\nametitledelim}{\addcomma\addspace} \renewcommand{\finentrypunct}{%http://tex.stackexchange.com/a/14159/98739 \ifbool{bbx:counter}% {\addspace\vrule\addspace\scshape% @@ -9288,7 +9293,7 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. {\printnames[author]{labelname}} {\printnames[name:initials]{labelname}}}}} % \end{macrocode} -% +% This will take care of maintitle and others. % \begin{macrocode} \newbibmacro*{maintitle+title+volumes}{% \iffieldsequal{maintitle}{title}% @@ -9299,11 +9304,11 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. {}% {\usebibmacro{maintitle}% \usebibmacro{volume}% - \clearfield{volume}}% + \clearfield{volume}% \iffieldundef{title}% {}% - {\setunit*{\maintitlepunct}% - \usebibmacro{title}}% + {\setunit*{\maintitlepunct}}}% + \usebibmacro{title}% \ifbool{cbx:ancient}% {\usebibmacro{translation}}% {\usebibmacro{volume}}}% @@ -9908,12 +9913,16 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. }% {\addspace}% {\newunitpunct}} - +% \end{macrocode} +% +% \begin{macrocode} \newrobustcmd*{\cbx@nametracker@global}[1]{% \xifinlistcs{#1}{cbx@bseen@names@\the\c@refsection} {} {\listcsxadd{cbx@bseen@names@\the\c@refsection}{#1}}} - +% \end{macrocode} +% +% \begin{macrocode} \newrobustcmd*{\cbx@nametracker@context}[1]{% \iftoggle{blx@footnote} {\xifinlistcs{#1}{cbx@fseen@names@\the\c@refsection} @@ -9922,20 +9931,28 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. {\xifinlistcs{#1}{cbx@bseen@names@\the\c@refsection} {} {\listcsxadd{cbx@bseen@names@\the\c@refsection}{#1}}}} - +% \end{macrocode} +% +% \begin{macrocode} \newrobustcmd*{\cbx@ifnameseen@global}[1]{% \xifinlistcs{#1}{cbx@bseen@names@\the\c@refsection}} - +% \end{macrocode} +% +% \begin{macrocode} \newrobustcmd*{\cbx@ifnameseen@context}[1]{% \iftoggle{blx@footnote}% {\xifinlistcs{#1}{cbx@fseen@names@\the\c@refsection}}% {\xifinlistcs{#1}{cbx@bseen@names@\the\c@refsection}}} - +% \end{macrocode} +% +% \begin{macrocode} \DeclareBibliographyOption[boolean]{nametracker}[true]{% \ifcsdef{blx@opt@nametracker@#1} {\csuse{blx@opt@nametracker@#1}} {\blx@err@invopt{nametracker=#1}{}}} - +% \end{macrocode} +% +% \begin{macrocode} \def\blx@opt@nametracker@true{% \let\cbx@ifnameseen\cbx@ifnameseen@global \let\cbx@nametracker\cbx@nametracker@global} @@ -9947,7 +9964,9 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. \def\blx@opt@nametracker@context{% \let\cbx@ifnameseen\cbx@ifnameseen@context \let\cbx@nametracker\cbx@nametracker@context} - +% \end{macrocode} +% +% \begin{macrocode} \appto\blx@secinit{ \ifcsundef{cbx@bseen@names@\the\c@refsection} {\global\cslet{cbx@bseen@names@\the\c@refsection}\@empty} @@ -9955,7 +9974,9 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. \ifcsundef{cbx@fseen@names@\the\c@refsection} {\global\cslet{cbx@fseen@names@\the\c@refsection}\@empty} {}} - +% \end{macrocode} +% +% \begin{macrocode} \InitializeCitationStyle{% \global\cslet{cbx@bseen@names@\the\c@refsection}\@empty \global\cslet{cbx@fseen@names@\the\c@refsection}\@empty} @@ -9988,7 +10009,9 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. \DeclareFieldFormat{multipostnote}{\mknormrange{#1}} \DeclareFieldFormat{shorttitle}{#1} \DeclareFieldFormat{pages}{#1} - +% \end{macrocode} +% +% \begin{macrocode} \DeclareNameFormat{labelname}{% \ifcase\value{uniquename}% \usebibmacro{name:family} @@ -10016,8 +10039,10 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. {\namepartsuffix}% \fi \usebibmacro{name:andothers}} - - \DeclareNameFormat{name:family}{% +% \end{macrocode} +% +% \begin{macrocode} +\DeclareNameFormat{name:family}{% \ifcase\value{uniquename}% \usebibmacro{name:family} {\namepartfamily} @@ -10044,8 +10069,10 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. {\namepartsuffix}% \fi \usebibmacro{name:andothers}} - - \DeclareNameFormat{name:initials}{% +% \end{macrocode} +% +% \begin{macrocode} +\DeclareNameFormat{name:initials}{% \ifnum\value{uniquename}=2% \usebibmacro{name:given-family} {\namepartfamily} @@ -10065,9 +10092,10 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. {\namepartprefixi} {\namepartsuffixi}}% \fi - \usebibmacro{name:andothers}} - - +\usebibmacro{name:andothers}} +% \end{macrocode} +% +% \begin{macrocode} \def\cbx@arch@citeauthorformat@family{% \DeclareNameAlias{citeauthor}{name:family}} @@ -10076,7 +10104,9 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. \def\cbx@arch@citeauthorformat@initials{% \DeclareNameAlias{citeauthor}{name:initials}} - +% \end{macrocode} +% +% \begin{macrocode} \DeclareNameFormat{citeauthor:firstfulltheninitials}{% \cbx@ifnameseen{\thefield{hash}} {\ifnum\value{uniquename}=2 @@ -10105,8 +10135,9 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. {\namepartsuffix}% \cbx@nametracker{\thefield{hash}}}% \usebibmacro{name:andothers}} - - +% \end{macrocode} +% +% \begin{macrocode} \DeclareNameFormat{citeauthor:firstinitialsthenfamily}{% \cbx@ifnameseen{\thefield{hash}} {} @@ -10140,7 +10171,9 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. {\namepartsuffix}% \fi \usebibmacro{name:andothers}} - +% \end{macrocode} +% +% \begin{macrocode} \DeclareNameFormat{citeauthor:firstfullthenfamily}{% \cbx@ifnameseen{\thefield{hash}} {\ifcase\value{uniquename}% @@ -10185,7 +10218,6 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. \def\cbx@arch@citeauthorformat@firstinitialsthenfamily{% \DeclareNameAlias{citeauthor}{citeauthor:firstinitialsthenfamily}} - \def\cbx@arch@citeauthorformat@firstfull{% \PackageWarningNoLine{biblatex-archaeologie}{% Value 'firstfull' for 'citeauthorformat' is deprecated,\MessageBreak @@ -10627,7 +10659,9 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. {\addspace\printfield[parens]{origyear}}}}}}}% {\multicitedelim}% {\usebibmacro{postnote}}% - +% \end{macrocode} +% +% \begin{macrocode} \DeclareCiteCommand*{\citetitle} {\boolfalse{citetracker}% \boolfalse{pagetracker}% @@ -10641,7 +10675,6 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. {\printtext[emph]{\usebibmacro{cite:title}}}}% {\multicitedelim}% {\usebibmacro{postnote}}% - % \end{macrocode} % \iffalse % /* @@ -10706,10 +10739,10 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. % We load the standard set of localization strings, % then add our adjustments. % \begin{macrocode} - - \InheritBibliographyExtras{english} - +% \end{macrocode} +% +% \begin{macrocode} \DeclareBibliographyStrings{% inherit = {english}, magthesis = {{}{}},% FIXME! @@ -10738,7 +10771,9 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. fromswedish = {{from\addspace Swedish}{from\addspace Swedish}}, owntranslation = {{own\addspace trans\adddot}{own\addspace translation}}, } - +% \end{macrocode} +% +% \begin{macrocode} \protected\gdef\lbx@us@mkdaterangetrunc@long#1#2{% \begingroup \blx@metadateinfo{#2}% @@ -10772,7 +10807,9 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. \enddateuncertainprint \dateeraprint{#2endyear}}}}}% \endgroup} - +% \end{macrocode} +% +% \begin{macrocode} \protected\gdef\lbx@us@mkdaterangetrunc@short#1#2{% \begingroup \blx@metadateinfo{#2}% @@ -10802,7 +10839,9 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. \enddateuncertainprint \dateeraprint{#2endyear}}}}}% \endgroup} - +% \end{macrocode} +% +% \begin{macrocode} \protected\gdef\lbx@us@mkdaterangetruncextra@long#1#2{% \begingroup \blx@metadateinfo{#2}% @@ -10838,7 +10877,9 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. \enddateuncertainprint \dateeraprint{#2endyear}}}}}% \endgroup} - +% \end{macrocode} +% +% \begin{macrocode} \protected\gdef\lbx@us@mkdaterangetruncextra@short#1#2{% \begingroup \blx@metadateinfo{#2}% @@ -10870,8 +10911,6 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. \enddateuncertainprint \dateeraprint{#2endyear}}}}}% \endgroup} - - % \end{macrocode} % \iffalse %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % @@ -10883,11 +10922,10 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. % We load the standard set of localization strings, % then add our adjustments. % \begin{macrocode} - - - \InheritBibliographyExtras{ngerman} - +% \end{macrocode} +% +% \begin{macrocode} \DeclareBibliographyStrings{% inherit = {ngerman}, magthesis = {{Magisterarbeit}{Mag.-Arbeit}},% @@ -10903,7 +10941,6 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. translationof = {{\"Ubersetzung\addspace von}{\"Ubers\adddot\addspace von}}, owntranslation = {{eigene\addspace\"Ubersetzung}{eig\adddot\addspace\"Ubers\adddot}}, } - % \end{macrocode} % \iffalse %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % @@ -10915,10 +10952,14 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. % We load the standard set of localization strings, % then add our adjustments. % \begin{macrocode} - \InheritBibliographyExtras{french} +% \end{macrocode} +% +% \begin{macrocode} \DefineBibliographyExtras{french}{\restorecommand\mkbibnamefamily} - +% \end{macrocode} +% +% \begin{macrocode} \DeclareBibliographyStrings{% inherit = {french}, magthesis = {{}{}},% FIXME! @@ -10949,7 +10990,6 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. fromswedish = {{depuis\addspace le\addspace suédois}{depuis\addspace le\addspace suédois}}, owntranslation = {{??}{??}},% FIXME! } - % \end{macrocode} % \iffalse %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % @@ -10962,7 +11002,9 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. % then add our adjustments. % \begin{macrocode} \InheritBibliographyExtras{italian} - +% \end{macrocode} +% +% \begin{macrocode} \DeclareBibliographyStrings{% inherit = {italian}, magthesis = {{}{}},% FIXME! @@ -10981,8 +11023,6 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. forthcoming = {{prossimo}{prossimo}}, owntranslation = {{??}{??}},% FIXME! } - - % \end{macrocode} % \iffalse %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % diff --git a/Master/texmf-dist/source/latex/archaeologie/archaeologie.ins b/Master/texmf-dist/source/latex/archaeologie/archaeologie.ins index 9f6aa470b66..57a0d1296b0 100644 --- a/Master/texmf-dist/source/latex/archaeologie/archaeologie.ins +++ b/Master/texmf-dist/source/latex/archaeologie/archaeologie.ins @@ -8,7 +8,7 @@ %% ---------------------------------------------------------------- %% biblatex-archaeologie --- %% Author: Lukas C. Bossert -%% E-mail: info@biblatex-archaeologie.de +%% E-mail: info@biblatex.texografie.de %% License: Released under the LaTeX Project Public License v1.3c or later %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- @@ -50,7 +50,7 @@ ---------------------------------------------------------------- biblatex-archaeologie --- Author: Lukas C. Bossert -E-mail: info@biblatex-archaeologie.de +E-mail: info@biblatex.texografie.de License: Released under the LaTeX Project Public License v1.3c or later See: http://www.latex-project.org/lppl.txt ---------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx index f62dbb215ec..1d60787dbcc 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx @@ -8,13 +8,13 @@ %% ---------------------------------------------------------------- %% biblatex-archaeologie --- %% Author: Lukas C. Bossert -%% E-mail: info@biblatex-archaeologie.de +%% E-mail: info@biblatex.texografie.de %% License: Released under the LaTeX Project Public License v1.3c or later %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\archDate{2019/12/03} -\def\archVersion{2.4.3} +\def\archDate{2020/02/15} +\def\archVersion{2.4.4} \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesFile{archaeologie.bbx} [\archVersion\space\archDate Base settings for bibliography style of biblatex-archaeologie] @@ -130,7 +130,7 @@ \DeclareNameAlias{author}{given-family}} \DeclareBibliographyOption{inreferences}[true]{% \PackageWarningNoLine{biblatex-archaeologie}{% - The option 'inreferences' for is deprecated,\MessageBreak + The option 'inreferences' is deprecated,\MessageBreak use 'inreferencesasfullcite' instead.}% \booltrue{bbx:inreferencesasfullcite}} \DeclareBibliographyOption{inreferencesasfullcite}[true]{\csuse{bool#1}{bbx:inreferencesasfullcite} @@ -294,11 +294,12 @@ \newcommand*{\locationdelim}{\addnbspace\textendash\addspace} \renewcommand{\multinamedelim}{\addnbspace\textendash\addspace} \renewcommand{\finalnamedelim}{\multinamedelim} -\renewcommand*\relateddelim{\addnbspace\textendash\addspace}% +\renewcommand*{\relateddelim}{\addnbspace\textendash\addspace}% \newcommand*{\relateddelimmultivolume}{\addcomma\par\nobreak} \newcommand*{\volnumdelim}{\addcomma\space} \newcommand*{\yearnumdelim}{\addslash} \newcommand*{\jourvoldelim}{\addnbspace} +\renewcommand*{\nametitledelim}{\addcomma\addspace} \renewcommand{\finentrypunct}{%http://tex.stackexchange.com/a/14159/98739 \ifbool{bbx:counter}% {\addspace\vrule\addspace\scshape% @@ -887,11 +888,11 @@ {}% {\usebibmacro{maintitle}% \usebibmacro{volume}% - \clearfield{volume}}% + \clearfield{volume}% \iffieldundef{title}% {}% - {\setunit*{\maintitlepunct}% - \usebibmacro{title}}% + {\setunit*{\maintitlepunct}}}% + \usebibmacro{title}% \ifbool{cbx:ancient}% {\usebibmacro{translation}}% {\usebibmacro{volume}}}% diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx index 84b7af042d1..812cae6a5c5 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx @@ -8,13 +8,13 @@ %% ---------------------------------------------------------------- %% biblatex-archaeologie --- %% Author: Lukas C. Bossert -%% E-mail: info@biblatex-archaeologie.de +%% E-mail: info@biblatex.texografie.de %% License: Released under the LaTeX Project Public License v1.3c or later %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\archDate{2019/12/03} -\def\archVersion{2.4.3} +\def\archDate{2020/02/15} +\def\archVersion{2.4.4} \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesFile{archaeologie.cbx} [\archVersion\space\archDate Base settings for citation style of biblatex-archaeologie] @@ -32,12 +32,10 @@ }% {\addspace}% {\newunitpunct}} - \newrobustcmd*{\cbx@nametracker@global}[1]{% \xifinlistcs{#1}{cbx@bseen@names@\the\c@refsection} {} {\listcsxadd{cbx@bseen@names@\the\c@refsection}{#1}}} - \newrobustcmd*{\cbx@nametracker@context}[1]{% \iftoggle{blx@footnote} {\xifinlistcs{#1}{cbx@fseen@names@\the\c@refsection} @@ -46,20 +44,16 @@ {\xifinlistcs{#1}{cbx@bseen@names@\the\c@refsection} {} {\listcsxadd{cbx@bseen@names@\the\c@refsection}{#1}}}} - \newrobustcmd*{\cbx@ifnameseen@global}[1]{% \xifinlistcs{#1}{cbx@bseen@names@\the\c@refsection}} - \newrobustcmd*{\cbx@ifnameseen@context}[1]{% \iftoggle{blx@footnote}% {\xifinlistcs{#1}{cbx@fseen@names@\the\c@refsection}}% {\xifinlistcs{#1}{cbx@bseen@names@\the\c@refsection}}} - \DeclareBibliographyOption[boolean]{nametracker}[true]{% \ifcsdef{blx@opt@nametracker@#1} {\csuse{blx@opt@nametracker@#1}} {\blx@err@invopt{nametracker=#1}{}}} - \def\blx@opt@nametracker@true{% \let\cbx@ifnameseen\cbx@ifnameseen@global \let\cbx@nametracker\cbx@nametracker@global} @@ -71,7 +65,6 @@ \def\blx@opt@nametracker@context{% \let\cbx@ifnameseen\cbx@ifnameseen@context \let\cbx@nametracker\cbx@nametracker@context} - \appto\blx@secinit{ \ifcsundef{cbx@bseen@names@\the\c@refsection} {\global\cslet{cbx@bseen@names@\the\c@refsection}\@empty} @@ -79,7 +72,6 @@ \ifcsundef{cbx@fseen@names@\the\c@refsection} {\global\cslet{cbx@fseen@names@\the\c@refsection}\@empty} {}} - \InitializeCitationStyle{% \global\cslet{cbx@bseen@names@\the\c@refsection}\@empty \global\cslet{cbx@fseen@names@\the\c@refsection}\@empty} @@ -106,7 +98,6 @@ \DeclareFieldFormat{multipostnote}{\mknormrange{#1}} \DeclareFieldFormat{shorttitle}{#1} \DeclareFieldFormat{pages}{#1} - \DeclareNameFormat{labelname}{% \ifcase\value{uniquename}% \usebibmacro{name:family} @@ -134,8 +125,7 @@ {\namepartsuffix}% \fi \usebibmacro{name:andothers}} - - \DeclareNameFormat{name:family}{% +\DeclareNameFormat{name:family}{% \ifcase\value{uniquename}% \usebibmacro{name:family} {\namepartfamily} @@ -162,8 +152,7 @@ {\namepartsuffix}% \fi \usebibmacro{name:andothers}} - - \DeclareNameFormat{name:initials}{% +\DeclareNameFormat{name:initials}{% \ifnum\value{uniquename}=2% \usebibmacro{name:given-family} {\namepartfamily} @@ -183,8 +172,7 @@ {\namepartprefixi} {\namepartsuffixi}}% \fi - \usebibmacro{name:andothers}} - +\usebibmacro{name:andothers}} \def\cbx@arch@citeauthorformat@family{% \DeclareNameAlias{citeauthor}{name:family}} @@ -193,7 +181,6 @@ \def\cbx@arch@citeauthorformat@initials{% \DeclareNameAlias{citeauthor}{name:initials}} - \DeclareNameFormat{citeauthor:firstfulltheninitials}{% \cbx@ifnameseen{\thefield{hash}} {\ifnum\value{uniquename}=2 @@ -222,7 +209,6 @@ {\namepartsuffix}% \cbx@nametracker{\thefield{hash}}}% \usebibmacro{name:andothers}} - \DeclareNameFormat{citeauthor:firstinitialsthenfamily}{% \cbx@ifnameseen{\thefield{hash}} {} @@ -256,7 +242,6 @@ {\namepartsuffix}% \fi \usebibmacro{name:andothers}} - \DeclareNameFormat{citeauthor:firstfullthenfamily}{% \cbx@ifnameseen{\thefield{hash}} {\ifcase\value{uniquename}% @@ -649,7 +634,6 @@ {\addspace\printfield[parens]{origyear}}}}}}}% {\multicitedelim}% {\usebibmacro{postnote}}% - \DeclareCiteCommand*{\citetitle} {\boolfalse{citetracker}% \boolfalse{pagetracker}% @@ -663,7 +647,6 @@ {\printtext[emph]{\usebibmacro{cite:title}}}}% {\multicitedelim}% {\usebibmacro{postnote}}% - %% %% Copyright (C) 2019 Lukas C. Bossert // digitales-altertum.de %% diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx index 8a23625977f..d9503e7f8c5 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx @@ -8,13 +8,13 @@ %% ---------------------------------------------------------------- %% biblatex-archaeologie --- %% Author: Lukas C. Bossert -%% E-mail: info@biblatex-archaeologie.de +%% E-mail: info@biblatex.texografie.de %% License: Released under the LaTeX Project Public License v1.3c or later %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\archDate{2019/12/03} -\def\archVersion{2.4.3} +\def\archDate{2020/02/15} +\def\archVersion{2.4.4} \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesFile{archaeologie.dbx} [\archVersion\space\archDate Bibliographical data model of biblatex-archaeologie] diff --git a/Master/texmf-dist/tex/latex/archaeologie/english-archaeologie.lbx b/Master/texmf-dist/tex/latex/archaeologie/english-archaeologie.lbx index 9329ceaf319..5089643a695 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/english-archaeologie.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/english-archaeologie.lbx @@ -8,19 +8,17 @@ %% ---------------------------------------------------------------- %% biblatex-archaeologie --- %% Author: Lukas C. Bossert -%% E-mail: info@biblatex-archaeologie.de +%% E-mail: info@biblatex.texografie.de %% License: Released under the LaTeX Project Public License v1.3c or later %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\archDate{2019/12/03} -\def\archVersion{2.4.3} +\def\archDate{2020/02/15} +\def\archVersion{2.4.4} \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesFile{english-archaeologie.lbx} [\archVersion\space\archDate Generic English conventions required by the biblatex-archaeologie style] - \InheritBibliographyExtras{english} - \DeclareBibliographyStrings{% inherit = {english}, magthesis = {{}{}},% FIXME! @@ -49,7 +47,6 @@ fromswedish = {{from\addspace Swedish}{from\addspace Swedish}}, owntranslation = {{own\addspace trans\adddot}{own\addspace translation}}, } - \protected\gdef\lbx@us@mkdaterangetrunc@long#1#2{% \begingroup \blx@metadateinfo{#2}% @@ -83,7 +80,6 @@ \enddateuncertainprint \dateeraprint{#2endyear}}}}}% \endgroup} - \protected\gdef\lbx@us@mkdaterangetrunc@short#1#2{% \begingroup \blx@metadateinfo{#2}% @@ -113,7 +109,6 @@ \enddateuncertainprint \dateeraprint{#2endyear}}}}}% \endgroup} - \protected\gdef\lbx@us@mkdaterangetruncextra@long#1#2{% \begingroup \blx@metadateinfo{#2}% @@ -149,7 +144,6 @@ \enddateuncertainprint \dateeraprint{#2endyear}}}}}% \endgroup} - \protected\gdef\lbx@us@mkdaterangetruncextra@short#1#2{% \begingroup \blx@metadateinfo{#2}% @@ -181,7 +175,6 @@ \enddateuncertainprint \dateeraprint{#2endyear}}}}}% \endgroup} - %% %% Copyright (C) 2019 Lukas C. Bossert // digitales-altertum.de %% diff --git a/Master/texmf-dist/tex/latex/archaeologie/french-archaeologie.lbx b/Master/texmf-dist/tex/latex/archaeologie/french-archaeologie.lbx index 433c4263704..7ae8d45c928 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/french-archaeologie.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/french-archaeologie.lbx @@ -8,22 +8,20 @@ %% ---------------------------------------------------------------- %% biblatex-archaeologie --- %% Author: Lukas C. Bossert -%% E-mail: info@biblatex-archaeologie.de +%% E-mail: info@biblatex.texografie.de %% License: Released under the LaTeX Project Public License v1.3c or later %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\archDate{2019/12/03} -\def\archVersion{2.4.3} +\def\archDate{2020/02/15} +\def\archVersion{2.4.4} \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesFile{french-archaeologie.lbx} [\archVersion\space\archDate French conventions required by the biblatex-archaeologie style] \ProvidesFile{italien-archaeologie.lbx} [\archVersion\space\archDate Italian conventions required by the biblatex-archaeologie style] - \InheritBibliographyExtras{french} \DefineBibliographyExtras{french}{\restorecommand\mkbibnamefamily} - \DeclareBibliographyStrings{% inherit = {french}, magthesis = {{}{}},% FIXME! @@ -54,7 +52,6 @@ fromswedish = {{depuis\addspace le\addspace suédois}{depuis\addspace le\addspace suédois}}, owntranslation = {{??}{??}},% FIXME! } - %% %% Copyright (C) 2019 Lukas C. Bossert // digitales-altertum.de %% diff --git a/Master/texmf-dist/tex/latex/archaeologie/german-archaeologie.lbx b/Master/texmf-dist/tex/latex/archaeologie/german-archaeologie.lbx index 9d4744a42dc..62948bfb69c 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/german-archaeologie.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/german-archaeologie.lbx @@ -8,19 +8,17 @@ %% ---------------------------------------------------------------- %% biblatex-archaeologie --- %% Author: Lukas C. Bossert -%% E-mail: info@biblatex-archaeologie.de +%% E-mail: info@biblatex.texografie.de %% License: Released under the LaTeX Project Public License v1.3c or later %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\archDate{2019/12/03} -\def\archVersion{2.4.3} +\def\archDate{2020/02/15} +\def\archVersion{2.4.4} \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesFile{german-archaeologie.lbx} [\archVersion\space\archDate German conventions required by the biblatex-archaeologie style] - \InheritBibliographyExtras{ngerman} - \DeclareBibliographyStrings{% inherit = {ngerman}, magthesis = {{Magisterarbeit}{Mag.-Arbeit}},% @@ -36,7 +34,6 @@ translationof = {{\"Ubersetzung\addspace von}{\"Ubers\adddot\addspace von}}, owntranslation = {{eigene\addspace\"Ubersetzung}{eig\adddot\addspace\"Ubers\adddot}}, } - %% %% Copyright (C) 2019 Lukas C. Bossert // digitales-altertum.de %% diff --git a/Master/texmf-dist/tex/latex/archaeologie/italian-archaeologie.lbx b/Master/texmf-dist/tex/latex/archaeologie/italian-archaeologie.lbx index 3e4be6bd691..40e16964564 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/italian-archaeologie.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/italian-archaeologie.lbx @@ -8,16 +8,15 @@ %% ---------------------------------------------------------------- %% biblatex-archaeologie --- %% Author: Lukas C. Bossert -%% E-mail: info@biblatex-archaeologie.de +%% E-mail: info@biblatex.texografie.de %% License: Released under the LaTeX Project Public License v1.3c or later %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\archDate{2019/12/03} -\def\archVersion{2.4.3} +\def\archDate{2020/02/15} +\def\archVersion{2.4.4} \NeedsTeXFormat{LaTeX2e}[2005/12/01] \InheritBibliographyExtras{italian} - \DeclareBibliographyStrings{% inherit = {italian}, magthesis = {{}{}},% FIXME! @@ -36,7 +35,6 @@ forthcoming = {{prossimo}{prossimo}}, owntranslation = {{??}{??}},% FIXME! } - %% %% Copyright (C) 2019 Lukas C. Bossert // digitales-altertum.de %% diff --git a/Master/texmf-dist/tex/latex/archaeologie/spanish-archaeologie.lbx b/Master/texmf-dist/tex/latex/archaeologie/spanish-archaeologie.lbx index 176f57f9339..ac6c8021e75 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/spanish-archaeologie.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/spanish-archaeologie.lbx @@ -8,13 +8,13 @@ %% ---------------------------------------------------------------- %% biblatex-archaeologie --- %% Author: Lukas C. Bossert -%% E-mail: info@biblatex-archaeologie.de +%% E-mail: info@biblatex.texografie.de %% License: Released under the LaTeX Project Public License v1.3c or later %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\archDate{2019/12/03} -\def\archVersion{2.4.3} +\def\archDate{2020/02/15} +\def\archVersion{2.4.4} \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesFile{spanish-archaeologie.lbx} [\archVersion\space\archDate Spanish conventions required by the biblatex-archaeologie style] -- cgit v1.2.3