From 5e03495604a5787b6de3c3dfac3d59ecd240910d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 20 Sep 2016 21:29:23 +0000 Subject: archaeologie (20sep16) git-svn-id: svn://tug.org/texlive/trunk@42109 c570f23f-e606-0410-a88d-b1316a301751 --- .../bib/archaeologie/archaeologie-lstabbrv.bib | 2 +- Master/texmf-dist/doc/latex/archaeologie/README.md | 2 +- .../doc/latex/archaeologie/archaeologie-ger.pdf | Bin 96942 -> 96891 bytes .../doc/latex/archaeologie/archaeologie-ger.tex | 1 + .../doc/latex/archaeologie/archaeologie.pdf | Bin 539089 -> 551308 bytes .../doc/latex/archaeologie/archaeologie.tex | 85 +++++- .../latex/archaeologie/archaeologie-english.lbx | 2 +- .../tex/latex/archaeologie/archaeologie-french.lbx | 2 +- .../latex/archaeologie/archaeologie-italian.lbx | 2 +- .../latex/archaeologie/archaeologie-ngerman.lbx | 2 +- .../latex/archaeologie/archaeologie-spanish.lbx | 2 +- .../tex/latex/archaeologie/archaeologie.bbx | 313 +++++++++++---------- .../tex/latex/archaeologie/archaeologie.cbx | 69 ++++- .../tex/latex/archaeologie/archaeologie.dbx | 2 +- 14 files changed, 307 insertions(+), 177 deletions(-) diff --git a/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-lstabbrv.bib b/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-lstabbrv.bib index 8989571afe6..5ff93ab779a 100644 --- a/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-lstabbrv.bib +++ b/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-lstabbrv.bib @@ -2171,7 +2171,7 @@ @String {CArch = {Cahiers archéologiques}} @String {CarinthiaI = {Carinthia I. Geschichtliche und volkskundliche Beiträge zur Heimatkunde Kärntens}}%*Abweichung! @String {CarnuntumJb = {Carnuntum-Jahrbuch. Zeitschrift für Archäologie und Kulturgeschichte des Donauraumes}} - @String {Carpica = {CarpicaMuzeuljudeeandeistorieiartBacu}} + @String {Carpica = {Carpica. Muzeul judeţean de istorie şi artă, Bacău}} @String {Carrobbio = {Il Carrobbio. Rivista di studi bolognesi}} @String {CAT = {Ch. W. Clairmont, Classical Attic Tombstones (Kilchberg 1993--1995)}} @String {CE = {Cuadernos emeritenses}} diff --git a/Master/texmf-dist/doc/latex/archaeologie/README.md b/Master/texmf-dist/doc/latex/archaeologie/README.md index c7b0428bdad..8fa3fde536e 100644 --- a/Master/texmf-dist/doc/latex/archaeologie/README.md +++ b/Master/texmf-dist/doc/latex/archaeologie/README.md @@ -5,7 +5,7 @@ bibLaTeX-__archaeologie__ bibLaTeX-style for archaeologists, historians and philologists. --- -_2016/07/28 v2.04_ +_2016/09/20 v2.1_ Copyright (c) 2016 Lukas C. Bossert | Johannes Friedl diff --git a/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.pdf b/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.pdf index 78374cb8454..c5b6d673f3a 100644 Binary files a/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.pdf and b/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.pdf differ diff --git a/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.tex b/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.tex index 4a9be92b121..a0a8848a52a 100644 --- a/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.tex +++ b/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.tex @@ -46,6 +46,7 @@ %\begin{multicols}{1} {\parskip=0mm \tableofcontents} %\end{multicols} +\clearpage \section{Verwendung} \DescribeMacro{archaeologie} Der Name des Stils ist |archaeologie| und wird an entsprechender Stelle geladen. diff --git a/Master/texmf-dist/doc/latex/archaeologie/archaeologie.pdf b/Master/texmf-dist/doc/latex/archaeologie/archaeologie.pdf index aa0cb848c9c..b98b0814813 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/doc/latex/archaeologie/archaeologie.tex b/Master/texmf-dist/doc/latex/archaeologie/archaeologie.tex index 974ab1963d5..d7555e552da 100644 --- a/Master/texmf-dist/doc/latex/archaeologie/archaeologie.tex +++ b/Master/texmf-dist/doc/latex/archaeologie/archaeologie.tex @@ -20,8 +20,8 @@ italian, ngerman, english ]{ltxdoc} -\def\thisarchaeologieversion{2.04} -\def\thisarchaeologiedate{2016-07-28} +\def\thisarchaeologieversion{2.1} +\def\thisarchaeologiedate{2016-09-20} \input{archaeologie-preamble.tex} \NewEnviron{bibbsp}[1] {\par\medskip\noindent\footnotesize @@ -858,7 +858,6 @@ year = {2013}, doi = {10.3764/aja.117.3.0461}, eprint = {10.3764/aja.117.3.0461}, eprinttype = {jstor}, -month = {July}, number = {3}, } \end{lstlisting} @@ -871,7 +870,7 @@ the output in the bibliography changes from: to \begin{bibbsp}{Ball2013} -\parbox[t]{3cm}{{\scshape \color{red}Ball – Dobbins} 2013}\parbox[t]{8cm}{% +\parbox[t]{2.9cm}{{\scshape \color{red}Ball – Dobbins} 2013}\parbox[t]{8cm}{% L. F. Ball – J. J. Dobbins, Pompeii Forum Project. Current Thinking on the Pompeii Forum, AJA 117/3, 2013, 461–492\newline ...} \end{bibbsp} @@ -967,7 +966,7 @@ And here a more detailed example with |origlocation|, |origyear| and |origpublis \begin{bibbsp}{Neufert2002} \parbox[t]{1.7cm}{Neufert 2002} \parbox[t]{9.4cm}{% -E. Neufert, Bauentwurfslehre. Grundlagen, Normen, Vorschriften ... Ed. by P.~Neufert – C. Neufert – L. Neff – C. Franken {\color{red} (Wiesbaden: Vieweg \textsuperscript{3}2002 [Berlin: Mann 1936])}} +E. Neufert, Bauentwurfslehre. Grundlagen, Normen, Vorschriften ... Ed. by Peter Neufert – Cornelius Neufert – Ludwig Neff – Corinna Franken {\color{red} (Wiesbaden: Vieweg \textsuperscript{3}2002 [Berlin: Mann 1936])}} \end{bibbsp} \subsubsection{edby}\label{edby} @@ -1078,7 +1077,7 @@ Let us have a look at an example: author = {Tullius Cicero, Marcus}, editor = {Kasten, Helmut}, title = {Atticus-Briefe}, - publisher = AW, %@String used + publisher = AWi, %@String used location = {Düsseldorf and Zürich}, year = {1980}, series = {Tusculum Bücherei}, @@ -1125,7 +1124,7 @@ Another example: year = {1993}, editor = {Fuhrmann, Manfred}, volume = {II}, - publisher = AW, %@String used + publisher = AWi, %@String used pages = {110--185}, origlanguage = {latin}, series = {Sammlung Tusculum}, @@ -1635,7 +1634,7 @@ But you can also have it more detailed like this one: @Reference{Lexikon-der-Technik, editor = {Otto Lueger}, title = {Lexikon der gesamten Technik und ihrer Hilfswissenschaften}, - year = {1904--1920}, + date = {1904/1920}, edition = {2}, location = Stuttgart, %@String used keywords = {corpus}, @@ -1876,7 +1875,7 @@ Here is an example: institution = {Ruprecht-Karls-Universität zu Heidelberg}, eprint = {urn:nbn:de:bsz:16-heidok-74406}, eprinttype = {urn}, - date = {2005-05-31}, + date = {2005}, } \end{lstlisting} @@ -2233,6 +2232,74 @@ or the date of this version with |\archaeologiedate|. \archaeologiedate \end{bsp} +\subsection{Print the citet authors of secondary literature} +In case you want to have an index about the authors you cited in your text, +you can do that quite easily. +We coded it that way so authors of ancient sources (e.\,g. Cicero) will be omitted in that index (when these entries have |options={ancient}| or |options={frgancient}|). + +First you have to activate indexing in the package |biblatex|: +\begin{lstlisting} +\usepackage[style=archaeologie,% + indexing=cite, + *@\meta{further options}@*]{biblatex} +\end{lstlisting} +|cite| will enable indexing in citations only, +you can also do |bib| which will enable indexing in the bibliography only. +Or |true| so in citations and in the bibliography (|false| is the default setting). + +Then you have to load a package for indexing, +we suggest using |imakeidx| since you can create multiple indexes with it. +If you have only one index which will be used for the authors of secondary literature you can pass several options to it. + \begin{lstlisting} +\usepackage{imakeidx} +\makeindex[% + title=Index of authors, + columns=3, +] +\end{lstlisting} + +Now you only need to place |\printindex| whre you want to have the index. + +\alertinfo{If you have the option |initials| activated your index will have some issues with names that are being shortend automatically. +We are working on it, see \href{https://github.com/LukasCBossert/biblatex-archaeologie/issues/97}{github issue} for more information.} + +\clearpage +\subsection{Variant ways of entries in year/date-field} +Sometimes you have a range of years of a publication because it is maybe a sequence of volumes. +Let us take as example the \citetitle{LTUR}: +\begin{lstlisting}[style=bibentry,label=LTUR,caption={{@}Reference\{LTUR,…\} }] +@Reference{LTUR, + editor = {Steinby, Eva Margareta}, + title = LTUR, + date = {1993/2000}, + publisher = {Edizioni Quasar}, + location = Rome, + keywords = {corpus}, + options = {corpus}, + shorthand = LTUR-short, +} +\end{lstlisting} +\printbib[4em]{LTUR} + +Since this reference-series is completed we define the first and last year by using |date = {1993/2000}|. Be sure \emph{not} using field |year| but instead |date| since |year| cannot cope with date ranges dependably. + +Let us take a look at another example: +\begin{lstlisting}[style=bibentry,label=DeVisscher1951-1952,caption={{@}@Article\{DeVisscher1951-1952,…\} }] +@Article{DeVisscher1951-1952, + author = {de Visscher, Fernand and Mertens, Joseph}, + title = {Les puits du Forum d'Alba Fucense}, + journaltitle = BCom, + shortjournal = BCom-short, + volume = {74}, + pages = {3--13}, + date = {1951/1952}, +} +\end{lstlisting} +This time the article appeared in an issue which covers two years (\citedate{DeVisscher1951-1952}) and we want them to appear in the label. +That is why we have to use the field |date| instead of |year|. +\printbib[4em]{DeVisscher1951-1952} +By the way, if you want to cite only the year of publication use |\citedate|\marg{bibtex-key} and not |\citeyear|\marg{bibtex-key} since the field |year| will only give you the first year. + \clearpage \begin{multicols}{2}\footnotesize \lstlistoflistings diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx index a7e7cf960ab..b1eeb3af3a3 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx @@ -11,7 +11,7 @@ % and version 1.3 or later is part of all distributions of LaTeX % version 2005/12/01 or later. \ProvidesFile{archaeologie-english.lbx}% - [2016/07/15 v2.03 archaeologie -- + [2016/09/20 v2.1 archaeologie -- biblatex for archaeologists, historians and philologists, 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 dc13d5e70d7..6733c8fe694 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx @@ -13,7 +13,7 @@ \ProvidesFile{archaeologie-french.lbx}% - [2016/07/15 v2.03 archaeologie -- + [2016/09/20 v2.1 archaeologie -- biblatex for archaeologists, historians and philologists, lbx-Datei] \InheritBibliographyExtras{french} diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx index ed1e4ac8701..8f896a44346 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx @@ -13,7 +13,7 @@ \ProvidesFile{archaeologie-italian.lbx}% - [2016/07/15 v2.03 archaeologie -- + [2016/09/20 v2.1 archaeologie -- biblatex for archaeologists, historians and philologists, 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 5099e7b4040..88c18848c0a 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx @@ -13,7 +13,7 @@ \ProvidesFile{archaeologie-ngerman.lbx}% - [2016/07/15 v2.03 archaeologie -- + [2016/09/20 v2.1 archaeologie -- biblatex for archaeologists, historians and philologists, lbx-Datei] \InheritBibliographyExtras{ngerman} diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx index f4177c906e7..f30ef40b617 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx @@ -12,7 +12,7 @@ % version 2005/12/01 or later. \ProvidesFile{archaeologie-spanish.lbx}% - [2016/07/15 v2.03 archaeologie -- + [2016/09/20 v2.1 archaeologie -- biblatex for archaeologists, historians and philologists, lbx-Datei] \InheritBibliographyExtras{spanish} diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx index 1d72d6d2452..8dde3436877 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx @@ -11,33 +11,34 @@ % and version 1.3 or later is part of all distributions of LaTeX % version 2005/12/01 or later. \ProvidesFile{archaeologie.bbx}% - [2016/07/15 v2.03 archaeologie -- + [2016/09/20 v2.1 archaeologie -- biblatex for archaeologists, historians and philologists, bbx-file] \RequireBibliographyStyle{standard} \AtBeginDocument{% -\RequirePackage[normalem]{ulem} -%\RequirePackage{csquotes} - \urlstyle{sf}% - \typeout{* * * archaeologie * * * - biblatex for archaeologists, - historians and philologists} -} -\def\archaeologieversion{2.04} -\def\archaeologiedate{2016-07-28} + \RequirePackage[normalem]{ulem} + %\RequirePackage{csquotes} + \urlstyle{sf}% + \typeout{* * * archaeologie * * * + biblatex for archaeologists, + historians and philologists} +} +\def\archaeologieversion{2.1} +\def\archaeologiedate{2016-09-20} \ExecuteBibliographyOptions{% - pagetracker=true,% - citecounter=true,% - sortlocale=auto,% - language=auto,% - autolang=other,% - bibencoding=utf8,% - dateabbrev=false, % - sorting=nyt,% - maxnames=2,% - minnames=1,% - maxitems=1,% - maxbibnames=999,% + pagetracker=true,% + citecounter=true,% + sortlocale=auto,% + language=auto,% + autolang=other,% + bibencoding=utf8,% + dateabbrev=false, % + sorting=nyt,% +labeldateparts=true, + maxnames=2,% + minnames=1,% + maxitems=1,% + maxbibnames=999,% } %----------------------- \newbool{bbx:edby} @@ -69,39 +70,33 @@ \setlength{\biblabelsep}{0em} %----------------------- \DeclareBibliographyOption{lstabbrv}[true]{% - \csuse{bool#1}{bib:lstabbrv}% - \addbibresource{archaeologie-lstabbrv.bib} -} + \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}} -} + \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}% -} + \csuse{bool#1}{bib:bibancient}% + \addbibresource{archaeologie-bibancient.bib}} \DeclareBibliographyOption{lstlocations}[true]{% - \csuse{bool#1}{bib:lstlocations}% - \addbibresource{archaeologie-lstlocations.bib}% -} + \csuse{bool#1}{bib:lstlocations}% + \addbibresource{archaeologie-lstlocations.bib}} \DeclareBibliographyOption{lstpublishers}[true]{% - \csuse{bool#1}{bib:lstpublishers}% - \addbibresource{archaeologie-lstpublishers.bib}% -} - + \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}} + \settoggle{bbx:zenon}{#1}} \DeclareBibliographyOption[boolean]{urn}[true]{% - \settoggle{bbx:urn}{#1}} + \settoggle{bbx:urn}{#1}} \ExecuteBibliographyOptions{% - jstor,% - urn,% -} + jstor,% + urn, + } %----------------------- \DeclareBibliographyOption{edby}[true]{\csuse{bool#1}{bbx:edby}} \DeclareBibliographyOption{initials}[true]{\csuse{bool#1}{bbx:initials}} @@ -121,49 +116,53 @@ \ExecuteBibliographyOptions{maxitems=2}} \DeclareBibliographyOption{scshape}[true]{% \ifstrequal{#1}{true}% - {\AtEveryCite{\renewcommand*{\mkbibnamefamily}[1]{\textsc{##1}}}}% - {}% -} + {\AtEveryCite{\renewcommand*{\mkbibnamefamily}[1]{\textsc{##1}}}}% + {}% + } %----------------------- \DeclareEntryOption{ancient}[true]{\csuse{bool#1}{cbx:ancient}} \DeclareEntryOption{frgancient}[true]{% - \ifstrequal{#1}{true}% - {\togglefalse{blx@useauthor}}% - {}% - \csuse{bool#1}{cbx:frgancient}% -} + \ifstrequal{#1}{true}% + {\togglefalse{blx@useauthor}}% + {}% + \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}% + \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}% + 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} @@ -188,28 +187,25 @@ \DeclareFieldFormat{urldate}{\mkbibparens{#1}} \DeclareFieldFormat{note}{\mkbibparens{#1}\nopunct} \DeclareFieldFormat{shorthandwidth}{#1} -\DeclareFieldFormat{origtitle}{\mkbibemph{#1}} +\DeclareFieldFormat{origtitle}{\iffieldequalstr{origlanguage}{greek}{#1}{\mkbibemph{#1}}} \DeclareFieldFormat{eprint:urn}{% \textsc{urn}% \addcolon\space% \ifhyperref% - {\href{http://www.nbn-resolving.org/#1}{\nolinkurl{#1}}}% - {\nolinkurl{#1}}% -} + {\href{http://www.nbn-resolving.org/#1}{\nolinkurl{#1}}}% + {\nolinkurl{#1}}} \DeclareFieldFormat{eprint:zenon}{% \textsc{zenon (opac)}% \addcolon\space% \ifhyperref% - {\href{http://zenon.dainst.org/Record/#1}{\nolinkurl{#1}}}% - {\nolinkurl{#1}}% -} + {\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}}% -} + {\href{http://www.jstor.org/stable/#1}{\nolinkurl{#1}}}% + {\nolinkurl{#1}}} %----------------------- \DeclareFieldAlias{zenon}{eprint:zenon} \DeclareFieldAlias{jstor}{eprint:jstor} @@ -230,17 +226,21 @@ \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}}.% - }% - }% - {}% -} + {\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} \renewcommand*\relateddelim{\addnbspace\textendash\addspace} @@ -253,33 +253,38 @@ \DeclareBibliographyAlias{maintitle}{booktitle} \DeclareBibliographyAlias{incollection}{inbook} \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[padside=left,padwidth=4,padchar=0]{volume}% - \literal{0000}% - }% -} %----------------------- + +\DeclareSortingScheme{nyt}{ + \sort{ + \field{presort} + } + \sort[final]{ + \field{sortkey} + } + \sort{ + \field{shorthand} + \field{sortname} + \field{author} + \field{editor} + \field{translator} + \field{sorttitle} + \field{title} + } + \sort{ + \field{sortyear} + \field{year} + } + \sort{ + \field{sorttitle} + \field{title} + } + \sort{ + \field{volume} + \literal{0} + } +} +%----------------------- \DeclareSortingScheme{shortseries}{\sort{\field{shortseries}}} \DeclareSortingScheme{shortjournal}{\sort{\field{shortjournal}}} %----------------------- @@ -484,13 +489,26 @@ %----------------------- \renewbibmacro{in:}{% \ifthenelse{% - \ifentrytype{article}% - \OR% - \ifentrytype{review}}% + \ifentrytype{article}% + \OR% + \ifentrytype{review}% + }% {}% - {\printtext{\bibstring{in}\intitlepunct}}% -} + {\printtext{% + \bibstring{in}% + \intitlepunct}% + }} %----------------------- +\renewbibmacro*{pageref}{% + \iflistundef{pageref} + {} + { \setunit{\addcomma\newline\nobreak}% + \printtext{% + \ifnumgreater{\value{pageref}}{1} + {\bibstring{backrefpages}\ppspace} + {\bibstring{backrefpage}\ppspace}% + \printlist[pageref][-\value{listtotal}]{pageref}}}} +%----------------------- \newbibmacro*{bbx:parunit}{% \ifbibliography{% \setunit{\bibpagerefpunct}% @@ -575,6 +593,7 @@ %----------------------- \DeclareLabeldate{% \field{date} + \field{year} \field{eventdate} \field{origdate} \field{urldate} @@ -621,15 +640,17 @@ \printfield{number}% }% \newunit% - \iffieldundef{year}% - {\printfield{pubstate}}% -{\printfield{year}}% +\usebibmacro{pubstate+year}% } %----------------------- +\newbibmacro{pubstate+year}{% + \iffieldundef{pubstate}% + {\usebibmacro{date}}% + {\printfield{pubstate}}} + %----------------------- \newbibmacro*{pages}{% \printfield{pages}% - \isdot% -} + \isdot} %----------------------- \newbibmacro{translation}{% \printfield{origtitle}% @@ -792,9 +813,7 @@ {\setunit{\addspace}}% {\newunit}% \usebibmacro{edition}% - \iffieldundef{year}% - {\printfield{pubstate}}% - {\printfield{year}}% + \usebibmacro{pubstate+year}% \setunit*{\addspace}% \ifboolexpr{% test {\iflistundef{origlocation}}% @@ -835,9 +854,7 @@ }% \printlist{location}% \setunit*{\addspace}% - \iffieldundef{year}% - {\printfield{pubstate}}% - {\printfield{year}}% + \usebibmacro{pubstate+year}% }% }% }% @@ -847,9 +864,7 @@ \printlist{location}% \printlist{institution}% \setunit*{\space}% - \iffieldundef{year}% - {\printfield{pubstate}}% - {\printfield{year}}% +\usebibmacro{pubstate+year}% } %----------------------- \newbibmacro{signatur}{% diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx index 9f65776118f..51f6d64bb2f 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx @@ -11,7 +11,7 @@ % and version 1.3 or later is part of all distributions of LaTeX % version 2005/12/01 or later. \ProvidesFile{archaeologie.cbx}% - [2016/07/15 v2.03 archaeologie -- + [2016/09/20 v2.1 archaeologie -- biblatex for archaeologists, historians and philologists, cbx-Datei] %----------------------- @@ -192,11 +192,23 @@ ibidtracker=true,% opcittracker=true,% loccittracker=true,% - labeldate=true,% + alldates=comp,% + dateuncertain=true, + datecirca=true, citeauthorformat=initials,% uniquename=minfull,% } %----------------------- +\renewbibmacro*{citeindex}{% + \ifciteindex% + {\ifboolexpr{% + bool {cbx:ancient}% + or bool {cbx:frgancient}}% + {}% + {\indexnames{labelname}}}% + {}% +} +%----------------------- \renewbibmacro*{postnote}{% \iffieldundef{postnote}% {}% @@ -231,7 +243,9 @@ \newbibmacro*{cite:year}{% \iffieldundef{labelyear}% {}% - {{\printtext[citeyear]{\printfield{labelyear}\printfield{extrayear}}}}} + {\printtext[citeyear]{\usebibmacro{cite:labelyear+extrayear}}}% + % {{\printtext[citeyear]{\printfield{labelyear}\printfield{extrayear}}}} +} %----------------------- \newbibmacro*{cite:lexikon}{% \printfield{booktitle}% @@ -327,11 +341,37 @@ {\printtext[bibhyperref]{\printfield{label}}}} %----------------------- \newbibmacro*{cite:labelyear+extrayear}{% - \iffieldundef{labelyear}% - {}% - {\printtext[bibhyperref]{% - \printfield{labelyear}% - \printfield{extrayear}}}} + \iffieldundef{labelyear} + {} + {\printtext[bibhyperref]{% + \ifdefstring\blx@dateformat@labeldate{edtf} + {} + {\datecircaprint}% + \dateeraprintpre{labelyear}% + \iffieldnums{labelyear} + {\mkyearzeros{\thefield{labelyear}}} + {\printfield{labelyear}}% + \printfield{extrayear}% + \iffieldsequal{labeldateera}{labelenddateera}{} + {\dateeraprint{labelyear}}% + \dateuncertainprint% + \ifdefstring\blx@dateformat@labeldate{edtf} + {\datecircaprintedtf} + {}% + \iffieldundef{labelendyear} + {} + {\iffieldsequal{labelyear}{labelendyear}{} + {\ifdefstring\blx@dateformat@labeldate{edtf} + {\slash}% strict EDTF + {\bibdaterangesep + \enddatecircaprint}% + \dateeraprintpre{labelendyear}% + \mkyearzeros{\thefield{labelendyear}}% + \enddateuncertainprint + \ifdefstring\blx@dateformat@labeldate{edtf} + {\enddatecircaprintedtf} + {}% + \dateeraprint{labelendyear}}}}}} %----------------------- \newbibmacro*{textcite:postnote}{% \iffieldundef{postnote}% @@ -402,9 +442,7 @@ \ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}% \addspace\bibstring{and}\space}% \usebibmacro{prenote}}% - {\ifciteindex% - {\indexnames{labelname}}% - {}% + {\usebibmacro{citeindex}% \ifboolexpr{% test {\ifbool{bbx:inreferences}}% and % @@ -414,6 +452,15 @@ {\printtext[bibhyperref]}% {\printnames[citeauthor]{labelname}}}% {\multicitedelim}% + {\usebibmacro{postnote}} +%----------------------- +\DeclareCiteCommand*{\citeauthor} + {\boolfalse{citetracker}% + \boolfalse{pagetracker}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \printnames[][1-1]{labelname}} + {\multicitedelim} {\usebibmacro{postnote}} %----------------------- \DeclareCiteCommand{\citetitle} % diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx index acdc0caccc8..a8db0dfcfe7 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx @@ -11,7 +11,7 @@ % and version 1.3 or later is part of all distributions of LaTeX % version 2005/12/01 or later. \ProvidesFile{archaeologie.dbx}% - [2016/07/15 v2.03 archaeologie -- + [2016/09/20 v2.1 archaeologie -- biblatex for archaeologists, historians and philologists, dbx-Datei] -- cgit v1.2.3