diff options
Diffstat (limited to 'Master/texmf-dist')
14 files changed, 517 insertions, 488 deletions
diff --git a/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-examples.bib b/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-examples.bib index 7cee3252ba1..59ed893190b 100644 --- a/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-examples.bib +++ b/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-examples.bib @@ -314,8 +314,7 @@ title = {Funktionen republikanischer und frühkaiserzeitlicher Forumsbasiliken in Italien}, type = {phdthesis}, institution = {Ruprecht-Karls-Universität zu Heidelberg}, - eprint = {urn:nbn:de:bsz:16-heidok-74406}, - eprinttype = {urn}, + urn = {urn:nbn:de:bsz:16-heidok-74406}, date = {2005}, } @@ -329,8 +328,7 @@ pages = {461--492}, year = {2013}, doi = {10.3764/aja.117.3.0461}, - eprint = {10.3764/aja.117.3.0461}, - eprinttype = {jstor}, + jstor = {10.3764/aja.117.3.0461}, number = {3}, } @@ -675,8 +673,7 @@ edition = {5}, origlocation = Leipzig, origyear = {1987}, - eprint = {000250713}, - eprinttype = {zenon}, + zenon = {000250713}, language = {german}, origpublisher = {Koehler \& Amelang}, } diff --git a/Master/texmf-dist/doc/latex/archaeologie/README.md b/Master/texmf-dist/doc/latex/archaeologie/README.md index ebf812d0edf..ac089f6a91e 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. --- -_2018/02/20 v2.3.6_ +_2018/04/08 v2.3.7_ Copyright (c) 2016-2018 Lukas C. Bossert | Johannes Friedl @@ -65,6 +65,29 @@ additional lists and bibliographies: All notable changes to this project will be documented in this file. 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.3.7 (2018-04-08) + +### *Added* +* New data-field `arachne = {}` to reference to the database iDAI.objects arachne +* Alias `matheseis` for `thesis` (for all Zotero-users) (`\DeclareBibliographyAlias{mathesis}{thesis}`) +* field `eventdatelanguage`, you can get the date of the field `eventdate` in the chosen language, enable with `eventdatelanguage=true` + + +### *Changed* +* `inreferences=true` is now called `inreferencesasfullcite=true` due to better understanding of the option. There is a fallback. +* `bibstrings` are defined in `archaeologie.bbx` now +* `editortype` is now used as `parens` +* `autolang=hyphen` now you can use `langid={}` to manage to language of an entry + + +### *Fixed* +* better coding for the year delimiter (thanks to moewe!) + + +### *Deleted* +* Version `initials` has to be deleted since its incompatibility to `biber`-version `2.11` see [https://github.com/plk/biber/issues/215](https://github.com/plk/biber/issues/215) + + ## v2.3.6 (2018-02-20) ### *Added* diff --git a/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.pdf b/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.pdf Binary files differindex 4c63541dd87..1f21c3d005b 100644 --- a/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.pdf +++ b/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.pdf diff --git a/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.tex b/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.tex index 80f76c355d1..6e4b4cd8e49 100644 --- a/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.tex +++ b/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.tex @@ -1,8 +1,8 @@ % archaeologie --% -% biblatex for archaeologists, -% historians and philologists +% biblatex for archaeologists, +% historians and philologists % Copyright (c) 2016-2018 Lukas C. Bossert | Johannes Friedl -% +% % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 % of this license or (at your option) any later version. @@ -31,7 +31,11 @@ Weitere Informationen zum Code und zur Weiterentwicklung siehe \url{biblatex-arc Verschiedene zusätzliche Optionen erlauben jedoch, das Erscheinungsbild den eigenen Vorlieben anzupassen. Der Stil ist nicht nur für Dokumente in deutscher Sprache geeignet, sondern unterstützt ebenso die Sprachen Englisch, Italienisch, Spanisch und Französisch. -Dieses Dokument ist die deutsche Kurzfassung der englischen Hauptdokumentation: Für eine vollständige Anleitung siehe die englische Stilbeschreibung \href{http://mirrors.ctan.org/macros/latex/contrib/biblatex-contrib/archaeologie/archaeologie.pdf}{\textbf{online}} oder \href{file:archaeologie.pdf}{\textbf{lokal}}. +Dieses Dokument ist die deutsche Kurzfassung der englischen Hauptdokumentation: +Für eine vollständige Anleitung siehe die englische Stilbeschreibung \href{http://mirrors.ctan.org/macros/latex/contrib/biblatex-contrib/archaeologie/archaeologie.pdf}{\textbf{online}} oder \href{file:archaeologie.pdf}{\textbf{lokal}}. + +Diese Dokumentation wurde nur bis Version 2.3.6 aktualisiert. +Alle änderen in späteren Versionen stehen in der englischen Hauptdokumentation. \end{abstract} %\begin{multicols}{1} @@ -92,8 +96,6 @@ Diese Einträge steuern die Zitationsform und ermöglichen nach Textsorten getre \DescribeMacro{bibfullname} Schreibt die Autoren/Herausgeber mit vollem Namen in die Bibliographie. Standard ist sonst die Abkürzung der Vornamen. -\DescribeMacro{initials} Kürzt die Vornamen der Autoren oder Herausgeber auf die ersten zwei bzw. drei Buchstaben. -Berücksichtigt werden Vornamen mit Anfangsbuchstaben |Ch., Chr., Ph., Th., St.| \DescribeMacro{citeauthorformat} Mit dieser Textoption kann man entscheiden, diff --git a/Master/texmf-dist/doc/latex/archaeologie/archaeologie.pdf b/Master/texmf-dist/doc/latex/archaeologie/archaeologie.pdf Binary files differindex abcc4956b6d..161275391fc 100644 --- a/Master/texmf-dist/doc/latex/archaeologie/archaeologie.pdf +++ b/Master/texmf-dist/doc/latex/archaeologie/archaeologie.pdf diff --git a/Master/texmf-dist/doc/latex/archaeologie/archaeologie.tex b/Master/texmf-dist/doc/latex/archaeologie/archaeologie.tex index 38f1ea18240..bea9198a213 100644 --- a/Master/texmf-dist/doc/latex/archaeologie/archaeologie.tex +++ b/Master/texmf-dist/doc/latex/archaeologie/archaeologie.tex @@ -1,7 +1,7 @@ % archaeologie --% % biblatex for archaeologists, % historians and philologists -% Copyright (c) 2017 Lukas C. Bossert | Johannes Friedl +% Copyright (c) 2016-2018 Lukas C. Bossert | Johannes Friedl % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -147,10 +147,6 @@ You can chose between the options cf. \cref{citeauthorformat}. - -\DescribeMacro{initials} -First names are abbreviated keeping digraphs and trigraphs (this is default); cf. \cref{initials}. - \DescribeMacro{scshape} Cited names are shown with small capital letters cf. \cref{scshape}. Bibliography entries with |option={ancient}| or |option={frgancient}| (\cref{ancient,frgancient}) are not affected by this option. @@ -537,13 +533,13 @@ Optional preferences in the preamble are loaded within the package |bib|\LaTeX: backend=biber, % activates biber (default; % but will give an error if not done) style=archaeologie, % loads the style *@|archaeologie|@* - inreferences=true, % option *@|inreferences|@* is loaded + inreferencesasfullcite=true, % option *@|inreferencesasfullcite|@* is loaded lstabbrv % option *@|lstabbrv|@* is loaded as well ]{biblatex} \end{code} -In this example the style |archaeologie| is loaded with options |inreferences| and |lstabbrv|. +In this example the style |archaeologie| is loaded with options |inreferencesasfullcite| and |lstabbrv|. Now, manual entries don't appear in author-year-style anymore and journal/series |@string|-macros are enabled. -By the way, it doesn't matter if you write |inreferences| or |inreferences=true|. +By the way, it doesn't matter if you write |inreferencesasfullcite| or |inreferencesasfullcite=true|. Each of the listed options is disabled by default even if we strongly recommend their use in particular the additional bibliographies and |@String| lists. All remaining options are rather a matter of taste. @@ -665,6 +661,25 @@ And this is the third footnote and the second citation.\footnote{Ball – Dobbin \changes{v1.5}{2016/05/31}{Rückverweis} +\subsubsection{biblabel}\label{biblabel} +\DescribeMacro{biblabel=bold} +\DescribeMacro{biblabel=parens} +\DescribeMacro{biblabel=brackets} +You can set the ›biblabel‹ in bold, parens or brackets. \archversion{2.3.7} +This only applied to their appearence in the bibliography. +The style in footnotes are not being touched by |biblabel|. + + +%%% Example + + +\subsubsection{eventdatelanguage}\label{eventdatelanguage} +\DescribeMacro{eventdatelanguage} +\archversion{2.3.7} + +%%% Example + + \subsubsection{translation}\label{translation} \DescribeMacro{translation} Once this option is activated the original title, the original language and the translator of the work are printed (|origtitle|, |origlanguage|, |translator|). @@ -724,8 +739,8 @@ Die Produktion des stätischen Raums, \emph{Introduction à l’espace urbain}, {\color{red} trans. from French by F. Hiss -- H.-U. Wegener}, ARCH+ 34/9, 1977, 52–57} \end{bibbox} -\subsubsection{inreferences}\label{inreferences} -\DescribeMacro{inreferences} +\subsubsection{inreferencesasfullcite}\label{inreferences} +\DescribeMacro{inreferencesasfullcite} There is the possibility to cite inreferences in the footnote as a full citations. It is only required that the bibliography-entry is an |@Inreference| (cf. \cref{inreference}). @@ -747,7 +762,7 @@ There are two ways to display this entry: \begin{example} \footnote{\cite{Nieddu1995}.} \end{example} - \item with the option |inreferences| it will change: + \item with the option |inreferencesasfullcite| it will change: \begin{tcolorbox}[examplebox] |\footnote{\cite{Nieddu1995}.}| \tcblower @@ -762,7 +777,7 @@ then it will change the position for the \oarg{postnote}: \begin{example} \footnote{\cite[9]{Nieddu1995}.} \end{example} - \item with the option |inreferences| it will change again: + \item with the option |inreferencesasfullcite| it will change again: \begin{tcolorbox}[examplebox] |\footnote{\cite[9]{Nieddu1995}.}| \tcblower @@ -773,11 +788,11 @@ then it will change the position for the \oarg{postnote}: \begin{marker} - Activating |inreferences=true| causes the cited |@Inreference| entry to be automatically \emph{omitted} in the (final) bibliography, + Activating |inreferencesasfullcite=true| causes the cited |@Inreference| entry to be automatically \emph{omitted} in the (final) bibliography, because the entry is fully cited before in the footnotes (also stated in the \DAI rules). \end{marker} -If the option is not used (|inreferences=false|) the entry will look like this in the bibliography: +If the option is not used (|inreferencesasfullcite=false|) the entry will look like this in the bibliography: \printbib[6em]{Nieddu1995} @@ -1003,8 +1018,7 @@ volume = {117}, pages = {461--492}, year = {2013}, doi = {10.3764/aja.117.3.0461}, -eprint = {10.3764/aja.117.3.0461}, -eprinttype = {jstor}, +jstor = {10.3764/aja.117.3.0461}, number = {3}, } \end{bibexample} @@ -1205,23 +1219,8 @@ Note that |biblatex| provides a related option |backref| which lists per referen that contains the cited reference. But having a different goal that option doesn't support counts. \subsubsection{initials}\label{initials} -\DescribeMacro{initials} -First names are abbreviated keeping digraphs and trigraphs instead of simple first letter initials.\footnote{The code for this option was taken from \href{http://tex.stackexchange.com/a/295486/98739}{tex.stackexchange.com/a/295486/98739} and has been modified.} -Also see the warning when printing an index; cf. \cref{initials:index}. -First names starting with |Ph..., Chr..., Ch..., Th..., St...| are abbreviated to these digraphs and trigraphs. For example in the bibliography or when you use \cs{citeauthor}\marg{bibtex-key}. - -Citing these two authors will show their digraphs and trigraphs: - -\begin{example} -\citeauthor{Mann2011} and \citeauthor{Hufschmid2010} -\end{example} - - - -This option is set to default, but you can --- of course --- deactivate it with |initials=false| in the preamble. - -With this default option you don’t have to change anything in your bibliographical-data. -However you can switch off the option |initials| and do the abbreviation manually: +The former option |initials| was deleted since it got incompatible to |biber| version 2.11. +However you can do the abbreviation manually: \begin{code} author = {family=Mann, given=Christian, given-i={Chr}} @@ -1233,7 +1232,7 @@ author = {family=Hufschmid, given=Thomas, given-i={Th}} \subsection{Bibliography entry options}\label{options-bibentry} \subsubsection{ancient}\label{ancient} \DescribeMacro{ancient} -This option was found in an excellent |bib|\LaTeX-style called |geschichtsfrkl| ( by Jonathan Zachhuber),\footnote{\href{https://www.ctan.org/pkg/geschichtsfrkl}{www.ctan.org/pkg/geschichtsfrkl}} +This option was found in an excellent |bib|\LaTeX-style called |geschichtsfrkl| (by Jonathan Zachhuber),\footnote{\href{https://www.ctan.org/pkg/geschichtsfrkl}{www.ctan.org/pkg/geschichtsfrkl}} so after some modifications we adopted and included it into |archaeologie|. If you intend to cite ancient authors we strongly recommend this option to you @@ -1581,8 +1580,7 @@ The first edition of \citetitle*{Zanker2009} by \citeauthor*{Zanker2009} has bee edition = {5}, origlocation = Leipzig, %@String used origyear = {1987}, - eprint = {000250713}, - eprinttype = {zenon}, + zenon = {000250713}, language = {german}, origpublisher = {Koehler \& Amelang}, } @@ -2047,7 +2045,7 @@ The \DAI has a special rule for inreferences in the footnote. Then the output will be like:\\ |reference volume (year) pages s.v. title (author)| \\ and there will be no reference to the bibliography since the entry is fully described in the footnote. -\DescribeMacro{inreferences} If you prefer this method you have to use the preamble option called |inreferences|---cf. \cref{inreferences} +\DescribeMacro{inreferencesasfullcite} If you prefer this method you have to use the preamble option called |inreferencesasfullcite|---cf. \cref{inreferences} Then it will look like this in the footnote: \begin{examplemanual} \footnote{LIMC 7.1 (1994) 922--951 s. v. Theseus (J. Neils).} @@ -2238,8 +2236,7 @@ Here is an example: title = {Funktionen republikanischer und frühkaiserzeitlicher Forumsbasiliken in Italien}, type = {phdthesis}, institution = {Ruprecht-Karls-Universität zu Heidelberg}, - eprint = {urn:nbn:de:bsz:16-heidok-74406}, - eprinttype = {urn}, + urn = {urn:nbn:de:bsz:16-heidok-74406}, date = {2005}, } \end{bibexample} @@ -2394,24 +2391,15 @@ in the internet via a permanent link there are different possibilities for refer } \DescribeMacro{jstor} - If you can refer to the on-line platform \href{www.jstor.org}{jstor} then you need the individual number for the article---cf. \cref{Ball2013}: -\begin{code} -eprint = *@\marg{jstor-number}@* -eprinttype = {jstor} -\end{code} -OR---cf. \cref{Osland2016} + If you can refer to the on-line platform \href{www.jstor.org}{jstor} then you need the individual number for the article---cf. \cref{Ball2013,Osland2016}: + \begin{code} jstor = *@\marg{jstor-number}@* \end{code} \DescribeMacro{urn} -For all papers referable via an ›urn‹ (\emph{Uniform Resource Name}), which have been registered at the German National Library---cf. \cref{Arnolds2005} -\begin{code} -eprint = *@\marg{urn:xxx}@* -eprinttype = {urn} -\end{code} +For all papers referable via an ›urn‹ (\emph{Uniform Resource Name}), which have been registered at the German National Library---cf. \cref{Arnolds2005}. -OR \begin{code} urn = *@\marg{urn:xxx}@* \end{code} @@ -2419,19 +2407,25 @@ urn = *@\marg{urn:xxx}@* \DescribeMacro{zenon} This eprint-form is especially designed for the OPAC (Online Public Access Catalogue) of the \DAI. All bibliographical entries in this OPAC can be referred to via this link. -You only need to insert the individual Zenon-number of the entry, e.\,g. \emph{http://zenon.dainst.org/Record/001371402} where \emph{001371402} is the individual number---cf. \cref{Zanker2009}. +You only need to insert the individual Zenon-number of the entry, e.\,g. \emph{http://zenon.dainst.org/Record/001371402} where \emph{001371402} is the individual number---cf. \cref{Osland2016,Wulf-Rheidt2013,Ganzert1984.Zanker2009}. This option is set to |false| by default. \begin{code} -eprint = *@\marg{Zenon-number}@* -eprinttype = {zenon} +zenon = *@\marg{Zenon-number}@* \end{code} -OR cf. \cref{Osland2016,Wulf-Rheidt2013}. + +\DescribeMacro{arachne} +There is the object-database of the \DAI which is called iDAI.objects arachne. +You can cite the items with their entity-IDs + + +This option is set to |false| by default. \begin{code} -zenon = *@\marg{Zenon-number}@* +arachne = *@\marg{entity-number}@* \end{code} + \DescribeMacro{doi} In addition you can also refer to a document via its |doi|-number---cf. \cref{Ball2013,Evangelidis2014} \begin{code} doi = *@\marg{doi-number}@* @@ -2455,7 +2449,7 @@ This is an example how it should not be done: \DescribeMacro{\parencite} \DescribeMacro{\parencites} This example shows that the correct order of parentheses has not been followed. -Especially when you activated the preamble option |inreferences=true| \DescribeMacro{inreferences} you should use \cs{parencite}\marg{bibtex-key} instead (\cref{cite-commands}), then the correct order of parentheses and square brackets is given: +Especially when you activated the preamble option |inreferencesasfullcite=true| \DescribeMacro{inreferencesasfullcite} you should use \cs{parencite}\marg{bibtex-key} instead (\cref{cite-commands}), then the correct order of parentheses and square brackets is given: \begin{tcolorbox}[examplebox] |\parencite[vgl.][930 Nr. 283]{Neils1994}.| \tcblower diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx index 57c484fd9aa..9e86e96b98c 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx @@ -10,8 +10,8 @@ % http://www.latex-project.org/lppl.txt % and version 1.3 or later is part of all distributions of LaTeX % version 2005/12/01 or later. -\def\arch@date{2018/02/20} -\def\arch@version{2.3.6} +\def\arch@date{2018/04/08} +\def\arch@version{2.3.7} \def\arch@bbxid{\arch@date\space v\arch@version\space biblatex-archaeologie bibliography style (LCB/JF)} \def\arch@cbxid{\arch@date\space v\arch@version\space biblatex-archaeologie citation style (LCB/JF)} \def\arch@lbxid{\arch@date\space v\arch@version\space biblatex-archaeologie localization (LCB/JF)} @@ -51,12 +51,12 @@ \newbool{bbx:width} \newbool{bbx:yearseries} \newbool{bbx:bibfullname} -\newbool{bbx:inreferences} +\newbool{bbx:inreferencesasfullcite} \newbool{bbx:noabbrv} \newbool{bbx:translation} \newbool{bbx:publisher} -\newbool{bbx:initials} \newbool{bbx:counter} +\newbool{bbx:eventdatelanguage} \newbool{cbx:ancient} \newbool{cbx:frgancient} \newbool{cbx:corpus} @@ -72,6 +72,7 @@ \newtoggle{bbx:jstor} \newtoggle{bbx:zenon} \newtoggle{bbx:urn} +\newtoggle{bbx:arachne} \setlength{\biblabelsep}{0em} %----------------------- @@ -95,6 +96,8 @@ \addbibresource{archaeologie-lstpublishers.bib}} \DeclareBibliographyOption[boolean]{jstor}[true]{% \settoggle{bbx:jstor}{#1}} +\DeclareBibliographyOption[boolean]{arachne}[true]{% + \settoggle{bbx:arachne}{#1}} \DeclareBibliographyOption[boolean]{zenon}[true]{% \settoggle{bbx:zenon}{#1}} \DeclareBibliographyOption[boolean]{urn}[true]{% @@ -106,8 +109,23 @@ lstpublishers,% } %----------------------- +\DeclareBibliographyOption[string]{biblabel}{% + \ifcsundef{archblx@biblabel@#1} + {\PackageError{biblatex-archaeologie} + {Unknown value '#1' for option 'biblabel'.} + {Unknown value '#1' for option 'biblabel'.\MessageBreak + Possible values are 'plain', 'bold', 'brackets', 'parens'.}% + \csdef{archblx@biblabel}{\csuse{archblx@biblabel@plain}}} + {\csdef{archblx@biblabel}{\csuse{archblx@biblabel@#1}}}} +\let\archblx@biblabel@plain\@firstofone +\def\archblx@biblabel@bold{\mkbibbold} +\def\archblx@biblabel@brackets{\mkbibbrackets} +\def\archblx@biblabel@parens{\mkbibparens} + \DeclareBibliographyOption{edby}[true]{\csuse{bool#1}{bbx:edby}} -\DeclareBibliographyOption{initials}[true]{\csuse{bool#1}{bbx:initials}} +\DeclareBibliographyOption{initials}[false]{\PackageWarningNoLine{biblatex-archaeologie}{% + The option 'initials' has been deleted in version 2.3.7,\MessageBreak + due to incompatibility reasons with 'biber'.}} \DeclareBibliographyOption{width}[]{% \csuse{booltrue}{bbx:width}% \setlength{\labwidthsameline}{#1}% @@ -116,9 +134,15 @@ \DeclareBibliographyOption{counter}[true]{\csuse{bool#1}{bbx:counter}} \DeclareBibliographyOption{bibfullname}[true]{\csuse{bool#1}{bbx:bibfullname} \DeclareNameAlias{author}{given-family}} -\DeclareBibliographyOption{inreferences}[true]{\csuse{bool#1}{bbx:inreferences} +\DeclareBibliographyOption{inreferences}[true]{% + \PackageWarningNoLine{biblatex-archaeologie}{% + The option 'inreferences' for is deprecated,\MessageBreak + use 'inreferencesasfullcite' instead.}% + \booltrue{bbx:inreferencesasfullcite}} +\DeclareBibliographyOption{inreferencesasfullcite}[true]{\csuse{bool#1}{bbx:inreferencesasfullcite} \ExecuteBibliographyOptions[inreference]{skipbib=true}% \ExecuteBibliographyOptions[inreference]{skiplab=true}} +\DeclareBibliographyOption{eventdatelanguage}[true]{\csuse{bool#1}{bbx:eventdatelanguage}} \DeclareBibliographyOption{noabbrv}[true]{\csuse{bool#1}{bbx:noabbrv}} \DeclareBibliographyOption{translation}[true]{\csuse{bool#1}{bbx:translation}} \DeclareBibliographyOption{publisher}[true]{\csuse{bool#1}{bbx:publisher} @@ -130,7 +154,7 @@ %----------------------- \ExecuteBibliographyOptions{% initials=true, - autolang=other,% + autolang=hyphen,% } %----------------------- \DeclareEntryOption{ancient}[true]{\csuse{bool#1}{cbx:ancient}} @@ -163,21 +187,22 @@ \ifbool{bbx:bibfullname}{bibfullname\seperator}{}% \ifdefstring\citeauthorformatVALUE{initials}% {} - {citeauthorformat\,= \citeauthorformatVALUE\seperator}% + {citeauthorformat\,= \mbox{\citeauthorformatVALUE\seperator}}% \ifbool{bbx:counter}{counter\seperator}{}% \ifbool{bbx:edby}{edby\seperator}{}% - \ifbool{bbx:inreferences}{inreferences\seperator}{}% + \ifbool{bbx:inreferencesasfullcite}{inreferencesasfullcite\seperator}{}% \ifbool{bbx:initials}{}{\xout{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}{}% + {width\,=\,\labwidthsamelineVALUE\seperator}{}% \ifbool{cbx:yearinparensoption} {yearinparens\seperator}{}% \ifbool{bbx:yearseries}{yearseries\seperator}{}% \iftoggle{bbx:zenon}{zenon\seperator}{}% + \iftoggle{bbx:arachne}{arachne\seperator}{}% \iftoggle{bbx:jstor}{jstor\seperator}{}% \iftoggle{bbx:urn}{}{\xout{urn}\seperator}% \iftoggle{bbx:doi}{}{\xout{doi}\seperator}% @@ -212,6 +237,7 @@ \DeclareFieldFormat{note}{\mkbibparens{#1}\nopunct} \DeclareFieldFormat{shorthandwidth}{#1} \DeclareFieldFormat{origtitle}{#1} +\DeclareFieldFormat{bibcitelabel}{\csuse{archblx@biblabel}{#1}} \DeclareFieldFormat{eprint:urn}{% \textsc{urn}% \addcolon\space% @@ -230,10 +256,17 @@ \ifhyperref% {\href{http://www.jstor.org/stable/#1}{\nolinkurl{#1}}}% {\nolinkurl{#1}}} +\DeclareFieldFormat{eprint:arachne}{% + \textsc{iDAI.objects/arachne}% + \addcolon\space% + \ifhyperref% + {\href{https://arachne.dainst.org/entity/#1}{\nolinkurl{#1}}}% + {\nolinkurl{#1}}} %----------------------- \DeclareFieldAlias{zenon}{eprint:zenon} \DeclareFieldAlias{jstor}{eprint:jstor} \DeclareFieldAlias{urn}{eprint:urn} +\DeclareFieldAlias{arachne}{eprint:arachne} %----------------------- \DeclareRedundantLanguages{german}{german,ngerman,austrian,naustrian} \DeclareRedundantLanguages{english,american}{english,american,british,% @@ -245,6 +278,23 @@ \DeclareLanguageMapping{spanish}{spanish-archaeologie} %\DeclareLanguageMappingSuffix{-archaeologie} %----------------------- +\NewBibliographyString{origtitle} +\NewBibliographyString{firstprint} +\NewBibliographyString{reviewof} +\NewBibliographyString{reference} +\NewBibliographyString{translationof} +\NewBibliographyString{talk} +\NewBibliographyString{inpreparation} +\NewBibliographyString{submitted} +\NewBibliographyString{forthcoming} +\NewBibliographyString{inpress} +\NewBibliographyString{prepublished} +\NewBibliographyString{seenote} +\NewBibliographyString{loccit} +\NewBibliographyString{subvoce} +\NewBibliographyString{owntranslation} +\NewBibliographyString{magthesis} +%----------------------- \renewcommand*{\sqspace}{\addnbthinspace} \renewcommand*{\subtitlepunct}{\addperiod\addspace} \renewcommand*{\intitlepunct}{\addcolon\addspace} @@ -285,197 +335,209 @@ {\bibdaterangesep}} \renewrobustcmd*{\mkdaterangefull}[2]{% - \blx@metadateinfo{#2}% - \iffieldundef{#2year} - {} - {\datecircaprint - \printtext[#2date]{% - % Such a season component can only come from an ISO8601 season which replaces - % a normal month so if it exists, we know that a normal date print is ruled out - \iffieldundef{#2season} - {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% - % Optionally print the time after the date - \blx@printtime{#2}{}} - {\csuse{mkbibseasondate#1}{#2year}{#2season}}% - \dateuncertainprint - \dateeraprint{#2year}% - \iffieldundef{#2endyear} - {} - {\iffieldequalstr{#2endyear}{} - {\mbox{\bibdaterangesep}} - {\bibdaterangesepx{#2}% - \enddatecircaprint - \iffieldundef{#2season} - {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}% - % Optionally print the time after the date - \blx@printtime{#2}{end}} - {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% - \enddateuncertainprint - \dateeraprint{#2endyear}}}}}} - -\renewrobustcmd*{\mkdaterangetrunc}[2]{% - \blx@metadateinfo{#2}% - \iffieldundef{#2year} - {} - {\datecircaprint - \printtext[#2date]{% - % Such a season component can only come from an ISO8601 season which replaces - % a normal month so if it exists, we know that a normal date print is ruled out - \iffieldundef{#2season} - {\iffieldsequal{#2year}{#2endyear} - {\iffieldsequal{#2month}{#2endmonth} - {\csuse{mkbibdate#1}{}{}{#2day}} - {\csuse{mkbibdate#1}{}{#2month}{#2day}}} - {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% - \iffieldsequal{#2dateera}{#2enddateera}{} - {\dateeraprint{#2year}}}} - {\iffieldsequal{#2year}{#2endyear} - {\csuse{mkbibseasondate#1}{}{#2season}} - {\csuse{mkbibseasondate#1}{#2year}{#2season}% - \iffieldsequal{#2dateera}{#2enddateera}{} - {\dateeraprint{#2year}}}}% - \dateuncertainprint - \iffieldundef{#2endyear} - {} - {\iffieldequalstr{#2endyear}{} - {\mbox{\bibdaterangesep}} - {\bibdaterangesepx{#2}% - \enddatecircaprint - \iffieldundef{#2season} - {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}} - {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% - \enddateuncertainprint - \dateeraprint{#2endyear}}}}}} - -\renewrobustcmd*{\mkdaterangefullextra}[2]{% - \blx@metadateinfo{#2}% - \iffieldundef{#2year} - {} - {\datecircaprint - \printtext[#2date]{% - \printtext{% - % Such a season component can only come from an ISO8601 season which replaces - % a normal month so if it exists, we know that a normal date print is ruled out - \iffieldundef{#2season} - {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% - % Optionally print the time after the date - \blx@printtime{#2}{}} - {\csuse{mkbibseasondate#1}{#2year}{#2season}}% - \dateuncertainprint - \dateeraprint{#2year}% - \iffieldundef{#2endyear} - {\printfield{extradate}} - {\iffieldequalstr{#2endyear}{} - {\printfield{extradate}% - \printtext{\mbox{\bibdaterangesep}}} - {\printtext{% - \bibdaterangesepx{#2}% + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {} + {\datecircaprint + \printtext[#2date]{% + % Such a season component can only come from an ISO8601 season which replaces + % a normal month so if it exists, we know that a normal date print is ruled out + \iffieldundef{#2season} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% + % Optionally print the time after the date + \blx@printtime{#2}{}} + {\csuse{mkbibseasondate#1}{#2year}{#2season}}% + \dateuncertainprint + \dateeraprint{#2year}% + \iffieldundef{#2endyear} + {} + {\iffieldequalstr{#2endyear}{} + {\mbox{\bibdaterangesep}} + {\bibdaterangesepx{#2}% \enddatecircaprint \iffieldundef{#2season} {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}% % Optionally print the time after the date \blx@printtime{#2}{end}} - {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}% - \printfield{extradate}% + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% \enddateuncertainprint - \dateeraprint{#2endyear}}}}}}} + \dateeraprint{#2endyear}}}}}% + \endgroup} -\renewrobustcmd*{\mkdaterangetruncextra}[2]{% - \blx@metadateinfo{#2}% - \iffieldundef{#2year} - {} - {\datecircaprint - \printtext[#2date]{% - \printtext{% - % Such a season component can only come from an ISO8601 season which replaces - % a normal month so if it exists, we know that a normal date print is ruled out - \iffieldundef{#2season} - {\iffieldsequal{#2year}{#2endyear} - {\iffieldsequal{#2month}{#2endmonth} - {\csuse{mkbibdate#1}{}{}{#2day}} - {\csuse{mkbibdate#1}{}{#2month}{#2day}}} - {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% - \iffieldsequal{#2dateera}{#2enddateera}{} - {\dateeraprint{#2year}}}} - {\iffieldsequal{#2year}{#2endyear} - {\csuse{mkbibseasondate#1}{}{#2season}} - {\csuse{mkbibseasondate#1}{#2year}{#2season}% - \iffieldsequal{#2dateera}{#2enddateera}{} - {\dateeraprint{#2year}}}}% - \dateuncertainprint - \iffieldundef{#2endyear} - {\printfield{extradate}} - {\iffieldequalstr{#2endyear}{} - {\printfield{extradate}% - \printtext{\mbox{\bibdaterangesep}}} - {\printtext{% - \bibdaterangesepx{#2}% +\renewrobustcmd*{\mkdaterangetrunc}[2]{% + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {} + {\datecircaprint + \printtext[#2date]{% + % Such a season component can only come from an ISO8601 season which replaces + % a normal month so if it exists, we know that a normal date print is ruled out + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\iffieldsequal{#2month}{#2endmonth} + {\csuse{mkbibdate#1}{}{}{#2day}} + {\csuse{mkbibdate#1}{}{#2month}{#2day}}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% + \iffieldsequal{#2dateera}{#2enddateera}{} + {\dateeraprint{#2year}}}} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibseasondate#1}{}{#2season}} + {\csuse{mkbibseasondate#1}{#2year}{#2season}% + \iffieldsequal{#2dateera}{#2enddateera}{} + {\dateeraprint{#2year}}}}% + \dateuncertainprint + \iffieldundef{#2endyear} + {} + {\iffieldequalstr{#2endyear}{} + {\mbox{\bibdaterangesep}} + {\bibdaterangesepx{#2}% \enddatecircaprint \iffieldundef{#2season} {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}} - {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}% - \printfield{extradate}% + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% \enddateuncertainprint - \dateeraprint{#2endyear}}}}}}} + \dateeraprint{#2endyear}}}}}% + \endgroup} -\renewrobustcmd*{\mkdaterangeymd}[1]{% - \blx@metadateinfo{#1}% - \iffieldundef{#1year} - {} - {\datecircaprint - \printtext[#1date]{% - % Such a season component can only come from an ISO8601 season which replaces - % a normal month so if it exists, we know that a normal date print is ruled out - \iffieldundef{#1season} - {\blx@ymddate{#1}{}% - % Optionally print the time after the date - \blx@printtime{#1}{}} - {\csuse{mkbibseasondateshort}{#1year}{#1season}}% - \dateuncertainprint - \dateeraprint{#1year}% - \iffieldundef{#1endyear} - {} - {\iffieldequalstr{#1endyear}{} - {\mbox{\bibdaterangesep}} - {\bibdaterangesepx{#1}% - \enddatecircaprint - \iffieldundef{#1season} - {\blx@ymddate{#1}{end}% - % Optionally print the time after the date - \blx@printtime{#1}{end}} - {\csuse{mkbibseasondateshort}{#1endyear}{#1endseason}}% - \enddateuncertainprint - \dateeraprint{#1endyear}}}}}} +\renewrobustcmd*{\mkdaterangefullextra}[2]{% + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {} + {\datecircaprint + \printtext[#2date]{% + \printtext{% + % Such a season component can only come from an ISO8601 season which replaces + % a normal month so if it exists, we know that a normal date print is ruled out + \iffieldundef{#2season} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% + % Optionally print the time after the date + \blx@printtime{#2}{}} + {\csuse{mkbibseasondate#1}{#2year}{#2season}}% + \dateuncertainprint + \dateeraprint{#2year}% + \iffieldundef{#2endyear} + {\printfield{extradate}} + {\iffieldequalstr{#2endyear}{} + {\printfield{extradate}% + \printtext{\mbox{\bibdaterangesep}}} + {\printtext{% + \bibdaterangesepx{#2}% + \enddatecircaprint + \iffieldundef{#2season} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}% + % Optionally print the time after the date + \blx@printtime{#2}{end}} + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}% + \printfield{extradate}% + \enddateuncertainprint + \dateeraprint{#2endyear}}}}}}% + \endgroup} -\renewrobustcmd*{\mkdaterangeymdextra}[1]{% - \blx@metadateinfo{#1}% - \iffieldundef{#1year} - {} - {\datecircaprint - \printtext[#1date]{% - % Such a season component can only come from an ISO8601 season which replaces - % a normal month so if it exists, we know that a normal date print is ruled out - \iffieldundef{#1season} - {\blx@ymddate[extradate]{#1}{}% - % Optionally print the time after the date - \blx@printtime{#1}{}} - {\csuse{mkbibseasondateshort}{#1year}{#1season}}% - \dateuncertainprint - \dateeraprint{#1year}% - \iffieldundef{#1endyear} - {} - {\iffieldequalstr{#1endyear}{} - {\mbox{\bibdaterangesep}} - {\printtext{% - \bibdaterangesepx{#1}% +\renewrobustcmd*{\mkdaterangetruncextra}[2]{% + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {} + {\datecircaprint + \printtext[#2date]{% + \printtext{% + % Such a season component can only come from an ISO8601 season which replaces + % a normal month so if it exists, we know that a normal date print is ruled out + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\iffieldsequal{#2month}{#2endmonth} + {\csuse{mkbibdate#1}{}{}{#2day}} + {\csuse{mkbibdate#1}{}{#2month}{#2day}}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% + \iffieldsequal{#2dateera}{#2enddateera}{} + {\dateeraprint{#2year}}}} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibseasondate#1}{}{#2season}} + {\csuse{mkbibseasondate#1}{#2year}{#2season}% + \iffieldsequal{#2dateera}{#2enddateera}{} + {\dateeraprint{#2year}}}}% + \dateuncertainprint + \iffieldundef{#2endyear} + {\printfield{extradate}} + {\iffieldequalstr{#2endyear}{} + {\printfield{extradate}% + \printtext{\mbox{\bibdaterangesep}}} + {\printtext{% + \bibdaterangesepx{#2}% + \enddatecircaprint + \iffieldundef{#2season} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}} + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}% + \printfield{extradate}% + \enddateuncertainprint + \dateeraprint{#2endyear}}}}}}% + \endgroup} + +\renewrobustcmd*{\mkdaterangeymd}[1]{% + \begingroup + \blx@metadateinfo{#1}% + \iffieldundef{#1year} + {} + {\datecircaprint + \printtext[#1date]{% + % Such a season component can only come from an ISO8601 season which replaces + % a normal month so if it exists, we know that a normal date print is ruled out + \iffieldundef{#1season} + {\blx@ymddate{#1}{}% + % Optionally print the time after the date + \blx@printtime{#1}{}} + {\csuse{mkbibseasondateshort}{#1year}{#1season}}% + \dateuncertainprint + \dateeraprint{#1year}% + \iffieldundef{#1endyear} + {} + {\iffieldequalstr{#1endyear}{} + {\mbox{\bibdaterangesep}} + {\bibdaterangesepx{#1}% \enddatecircaprint \iffieldundef{#1season} {\blx@ymddate{#1}{end}% % Optionally print the time after the date \blx@printtime{#1}{end}} - {\csuse{mkbibseasondateshort}{#1endyear}{#1endseason}}}% - \enddateuncertainprint - \dateeraprint{#1endyear}}}}}} + {\csuse{mkbibseasondateshort}{#1endyear}{#1endseason}}% + \enddateuncertainprint + \dateeraprint{#1endyear}}}}}% + \endgroup} + +\renewrobustcmd*{\mkdaterangeymdextra}[1]{% + \begingroup + \blx@metadateinfo{#1}% + \iffieldundef{#1year} + {} + {\datecircaprint + \printtext[#1date]{% + % Such a season component can only come from an ISO8601 season which replaces + % a normal month so if it exists, we know that a normal date print is ruled out + \iffieldundef{#1season} + {\blx@ymddate[extradate]{#1}{}% + % Optionally print the time after the date + \blx@printtime{#1}{}} + {\csuse{mkbibseasondateshort}{#1year}{#1season}}% + \dateuncertainprint + \dateeraprint{#1year}% + \iffieldundef{#1endyear} + {} + {\iffieldequalstr{#1endyear}{} + {\mbox{\bibdaterangesep}} + {\printtext{% + \bibdaterangesepx{#1}% + \enddatecircaprint + \iffieldundef{#1season} + {\blx@ymddate{#1}{end}% + % Optionally print the time after the date + \blx@printtime{#1}{end}} + {\csuse{mkbibseasondateshort}{#1endyear}{#1endseason}}}% + \enddateuncertainprint + \dateeraprint{#1endyear}}}}}% + \endgroup} %----------------------- \DeclareBibliographyAlias{collection}{book} \DeclareBibliographyAlias{reference}{book} @@ -483,6 +545,7 @@ \DeclareBibliographyAlias{maintitle}{booktitle} \DeclareBibliographyAlias{incollection}{inbook} \DeclareBibliographyAlias{manual}{book} +\DeclareBibliographyAlias{mathesis}{thesis} %----------------------- \DeclareSortingTemplate{nyt}{ @@ -568,37 +631,6 @@ {\clearname{translator}% \clearfield{origtitle}}} %----------------------- -\AtBeginDocument{% - \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|St)(\S*,)}},% - replace={\regexp{\{$1\}$2}}]% Protect last names (first last) - \step[fieldsource=author,% - match={\regexp{([^,]\s)\b(Chr|Ch|Th|Ph|St)}},% - replace={\regexp{$1\{$2\}}}]% Protect last names (last, first) - \step[fieldsource=author,% - match={\regexp{\b(Chr|Ch|Th|Ph|St)([^\}])}},% - replace={\regexp{\{\\relax\{\}$1\}$2}}]% Insert \relax after abbreviating - % Editor field - \step[fieldsource=editor,% - match={\regexp{\b(Chr|Ch|Th|Ph|St)(\S*,)}},% - replace={\regexp{\{$1\}$2}}]% Protect last names (first last) - \step[fieldsource=editor,% - match={\regexp{([^,]\s)\b(Chr|Ch|Th|Ph|St)}},% - replace={\regexp{$1\{$2\}}}]% Protect last names (last, first) - \step[fieldsource=editor,% - match={\regexp{\b(Chr|Ch|Th|Ph|St)([^\}])}},% - replace={\regexp{\{\\relax\{\}$1\}$2}}]% Insert \relax after abbreviating - } - } - }% - } - {}} -%----------------------- %% provide macros to deal with intranslator, withincommentator, withinannotator, withinintroduction, withinforeword, withinafterword %% that is fields referring to the title work and not the booktitle work in inbook etc. works % these macros are essentially the same as the standard macros without the "in" @@ -671,17 +703,16 @@ \clearname{inforeword}% \newunit \usebibmacro{withinafterword}% - \clearname{inafterword}% -} + \clearname{inafterword}} %----------------------- \newbibmacro{labelwidthbib}{% - \begingroup% + \begingroup \DeclareFieldFormat{bibhyperref}{##1}% \csuse{blx@hook@cite}% \csuse{blx@hook@citekey}% \defcounter{maxnames}{\blx@maxcitenames}% - \usebibmacro{cite}% - \endgroup% + \printtext[bibcitelabel]{\usebibmacro{cite}}% + \endgroup } %----------------------- \newbibmacro{kicklabel}{% @@ -689,8 +720,7 @@ \global\togglefalse{blx@insert}% \ifdim1.1\wd\arch@labelbox>% \labwidthsameline\leavevmode\newline - \fi% -} + \fi} %----------------------- \newbibmacro{labelwidthfield}[1]{% \begingroup @@ -699,24 +729,14 @@ \csuse{blx@hook@citekey}% \defcounter{maxnames}{\blx@maxcitenames}% \printfield{#1}% - \endgroup -} + \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:}{% -% \setunit{\isdot% -% \iffieldundef{title} -% {} -% {\addcomma}% -% \addspace}% -% \printtext{\bibstring{in}\intitlepunct}} + \fi} %----------------------- \renewbibmacro*{pageref}{% \iflistundef{pageref} @@ -756,6 +776,12 @@ {\usebibmacro{bbx:parunit}% \printfield{jstor}}} %----------------------- +\newbibmacro*{arachne}{% + \iffieldundef{arachne} + {} + {\usebibmacro{bbx:parunit}% + \printfield{arachne}}} +%----------------------- \newbibmacro*{urn}{% \iffieldundef{urn} {} @@ -775,6 +801,7 @@ \iftoggle{bbx:doi}{\printfield{doi}}{}% \iftoggle{bbx:eprint}{\usebibmacro{eprint}}{}% \iftoggle{bbx:jstor}{\usebibmacro{jstor}}{}% + \iftoggle{bbx:arachne}{\usebibmacro{arachne}}{}% \iftoggle{bbx:urn}{\usebibmacro{urn}}{}% \iftoggle{bbx:zenon}{\usebibmacro{zenon}}{}% \iftoggle{bbx:url}{\usebibmacro{url+urldate}}{}% @@ -787,7 +814,7 @@ not test {\ifnameundef{editor}}}% {\printnames{editor}% \setunit{\addspace}% - \printtext[parens]{\bibstring{editor}}% + \printtext[editortype]{\bibstring{editor}}% \clearname{editor}}% {}} %----------------------- @@ -910,13 +937,26 @@ {\usebibmacro{volume}}}% \newunit} %----------------------- +%https://tex.stackexchange.com/a/15014/35864 +\newenvironment{fullexpotherlanguage}[1]{% + \begingroup + \edef\temp{\endgroup\noexpand\otherlanguage{#1}}% + \temp +}{\endotherlanguage} +%----------------------- \renewbibmacro{event+venue+date}{% \setunit{\adddot\addspace}% \printfield{eventtitle}% \setunit*{\addspace}% \printfield{venue}% \setunit*{\addspace}% - \printeventdate% +\ifbool{bbx:eventdatelanguage} + {\begingroup + \begin{fullexpotherlanguage}{\thefield{eventdatelanguage}}% + \printeventdate + \end{fullexpotherlanguage}% + \endgroup} + {\printeventdate} \newunit } %----------------------- diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx index 437ba54f2b4..2798d7d09ec 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx @@ -308,6 +308,8 @@ Value 'firstfull' for 'citeauthorformat' is deprecated,\MessageBreak use 'firstfulltheninitials' instead.}% \cbx@arch@citeauthorformat@firstfulltheninitials} + + %----------------------- \ExecuteBibliographyOptions{% citetracker=true, @@ -346,7 +348,7 @@ %----------------------- \renewbibmacro*{postnote}{% \ifboolexpr{ - bool{bbx:inreferences} + bool{bbx:inreferencesasfullcite} and test{\ifentrytype{inreference}} } @@ -419,7 +421,7 @@ %----------------------- \newbibmacro{cite}{% \ifboolexpr{ - bool{bbx:inreferences} + bool{bbx:inreferencesasfullcite} and test{\ifentrytype{inreference}} } @@ -545,7 +547,7 @@ \usebibmacro{cite}} {\multicitedelim} {\ifboolexpr{ - bool{bbx:inreferences} + bool{bbx:inreferencesasfullcite} and test{\ifentrytype{inreference}}} {} @@ -582,7 +584,7 @@ \usebibmacro{prenote}}% {\usebibmacro{citeindex}% \ifboolexpr{ - bool{bbx:inreferences} + bool{bbx:inreferencesasfullcite} and test{\ifentrytype{inreference}}} {\printtext}% @@ -611,7 +613,7 @@ {\ifnameundef{translator}% {\bibstring{owntranslation}}% {\ifboolexpr{ - bool {bbx:inreferences} + bool {bbx:inreferencesasfullcite} and test {\ifentrytype{inreference}} }% @@ -631,7 +633,7 @@ \usebibmacro{prenote}}% {\usebibmacro{citeindex}% \ifboolexpr{ - bool{bbx:inreferences} + bool{bbx:inreferencesasfullcite} and test{\ifentrytype{inreference}}} {\printtext}% @@ -664,7 +666,7 @@ \boolfalse{pagetracker}% \usebibmacro{prenote}}% {\ifboolexpr{ - bool{bbx:inreferences} + bool{bbx:inreferencesasfullcite} and test{\ifentrytype{inreference}}} {\printtext}% @@ -688,7 +690,7 @@ \boolfalse{pagetracker}% \usebibmacro{prenote}}% {\ifboolexpr{% - bool{bbx:inreferences} + bool{bbx:inreferencesasfullcite} and test{\ifentrytype{inreference}}} {\printtext}% diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx index 662bf36bacd..218fd48b753 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx @@ -20,8 +20,12 @@ \DeclareDatamodelEntryfields[talk]{author,title,subtitle,titleaddon,date,labeldate,year,venue,institution,eventtitle,eventdate,url,urldate,note} \DeclareDatamodelFields[type=field,datatype=verbatim]{zenon} \DeclareDatamodelEntryfields{zenon} +\DeclareDatamodelFields[type=field,datatype=verbatim]{arachne} +\DeclareDatamodelEntryfields{arachne} \DeclareDatamodelFields[type=field,datatype=verbatim]{urn} \DeclareDatamodelEntryfields{urn} \DeclareDatamodelFields[type=field,datatype=verbatim]{jstor} \DeclareDatamodelEntryfields{jstor} +\DeclareDatamodelFields[type=field,datatype=verbatim]{eventdatelanguage} +\DeclareDatamodelEntryfields[proceedings,inproceedings]{eventdatelanguage} \endinput
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/archaeologie/english-archaeologie.lbx b/Master/texmf-dist/tex/latex/archaeologie/english-archaeologie.lbx index d9a97a8ed2c..eaba25e327a 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/english-archaeologie.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/english-archaeologie.lbx @@ -1,7 +1,7 @@ % archaeologie --% % biblatex for archaeologists, % historians and philologists -% Copyright (c) 2017 Lukas C. Bossert | Johannes Friedl +% Copyright (c) 2016-2018 Lukas C. Bossert | Johannes Friedl % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -10,21 +10,14 @@ % http://www.latex-project.org/lppl.txt % and version 1.3 or later is part of all distributions of LaTeX % version 2005/12/01 or later. -\ProvidesFile{archaeologie-english.lbx}% +\ProvidesFile{english-archaeologie.lbx}% [\arch@lbxid] \InheritBibliographyExtras{english} -\NewBibliographyString{origtitle} -\NewBibliographyString{firstprint} -\NewBibliographyString{reference} -\NewBibliographyString{talk} -\NewBibliographyString{editor} -\NewBibliographyString{subvoce} -\NewBibliographyString{owntranslation} - - \DeclareBibliographyStrings{% inherit = {english}, + magthesis = {{}{}},% FIX ME! + mathesis = {{Masters-thesis}{MA thesis}},% FIX ME! subvoce = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}}, reference = {{Article}{Art\adddot}}, origtitle = {{original title}{orig\adddot title}}, @@ -51,121 +44,133 @@ } \protected\gdef\lbx@us@mkdaterangetrunc@long#1#2{% - \iffieldundef{#2year} - {} - {\datecircaprint - \printtext[#2date]{% - \iffieldundef{#2season} - {\iffieldsequal{#2year}{#2endyear} - {\csuse{mkbibdate#1}{}{#2month}{#2day}} - {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% - \dateeraprint{#2}}} - {\iffieldsequal{#2year}{#2endyear} - {\csuse{mkbibseasondate#1}{}{#2season}} - {\csuse{mkbibseasondate#1}{#2year}{#2season}}% - \dateeraprint{#2}}% - \dateuncertainprint - \iffieldundef{#2endyear} - {} - {\iffieldequalstr{#2endyear}{} - {\mbox{\bibdaterangesep}} - {\bibdaterangesepx{#2}% - \enddatecircaprint - \iffieldundef{#2season} - {\iffieldsequal{#2year}{#2endyear} - {\iffieldsequal{#2month}{#2endmonth} - {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}} + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {} + {\datecircaprint + \printtext[#2date]{% + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibdate#1}{}{#2month}{#2day}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% + \dateeraprint{#2}}} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibseasondate#1}{}{#2season}} + {\csuse{mkbibseasondate#1}{#2year}{#2season}}% + \dateeraprint{#2}}% + \dateuncertainprint + \iffieldundef{#2endyear} + {} + {\iffieldequalstr{#2endyear}{} + {\mbox{\bibdaterangesep}} + {\bibdaterangesepx{#2}% + \enddatecircaprint + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\iffieldsequal{#2month}{#2endmonth} + {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} - {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} - {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% - \enddateuncertainprint - \dateeraprint{#2}}}}}} + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% + \enddateuncertainprint + \dateeraprint{#2}}}}}% + \endgroup} \protected\gdef\lbx@us@mkdaterangetrunc@short#1#2{% - \iffieldundef{#2year} - {} - {\datecircaprint - \printtext[#2date]{% - \iffieldundef{#2season} - {\iffieldsequal{#2year}{#2endyear} - {\csuse{mkbibdate#1}{}{#2month}{#2day}} - {\csuse{mkbibdate#1}{#2year}{#2month}{#2day} - \dateeraprint{#2}}} - {\iffieldsequal{#2year}{#2endyear} - {\csuse{mkbibseasondate#1}{}{#2season}} - {\csuse{mkbibseasondate#1}{#2year}{#2season}}% - \dateeraprint{#2}}% - \dateuncertainprint - \iffieldundef{#2endyear} - {} - {\iffieldequalstr{#2endyear}{} - {\mbox{\bibdaterangesep}} - {\bibdaterangesepx{#2}% - \enddatecircaprint - \iffieldundef{#2season} - {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}} - {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% - \enddateuncertainprint - \dateeraprint{#2}}}}}} + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {} + {\datecircaprint + \printtext[#2date]{% + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibdate#1}{}{#2month}{#2day}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day} + \dateeraprint{#2}}} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibseasondate#1}{}{#2season}} + {\csuse{mkbibseasondate#1}{#2year}{#2season}}% + \dateeraprint{#2}}% + \dateuncertainprint + \iffieldundef{#2endyear} + {} + {\iffieldequalstr{#2endyear}{} + {\mbox{\bibdaterangesep}} + {\bibdaterangesepx{#2}% + \enddatecircaprint + \iffieldundef{#2season} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}} + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% + \enddateuncertainprint + \dateeraprint{#2}}}}}% + \endgroup} \protected\gdef\lbx@us@mkdaterangetruncextra@long#1#2{% - \iffieldundef{#2year} - {} - {\datecircaprint - \printtext[#2date]{% - \iffieldundef{#2season} - {\iffieldsequal{#2year}{#2endyear} - {\csuse{mkbibdate#1}{}{#2month}{#2day}} - {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}} - {\iffieldsequal{#2year}{#2endyear} - {\csuse{mkbibseasondate#1}{}{#2season}} - {\csuse{mkbibseasondate#1}{#2year}{#2season}}% - \dateeraprint{#2}}% - \dateuncertainprint - \iffieldundef{#2endyear} - {\printfield{extradate}} - {\iffieldequalstr{#2endyear}{} - {\printfield{extradate}% - \mbox{\bibdaterangesep}} - {\bibdaterangesepx{#2}% - \enddatecircaprint - \iffieldundef{#2season} - {\iffieldsequal{#2year}{#2endyear} - {\iffieldsequal{#2month}{#2endmonth} - {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}} - {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} - {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} - {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% - \printfield{extradate}% - \enddateuncertainprint - \dateeraprint{#2}}}}}} + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {} + {\datecircaprint + \printtext[#2date]{% + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibdate#1}{}{#2month}{#2day}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibseasondate#1}{}{#2season}} + {\csuse{mkbibseasondate#1}{#2year}{#2season}}% + \dateeraprint{#2}}% + \dateuncertainprint + \iffieldundef{#2endyear} + {\printfield{extradate}} + {\iffieldequalstr{#2endyear}{} + {\printfield{extradate}% + \mbox{\bibdaterangesep}} + {\bibdaterangesepx{#2}% + \enddatecircaprint + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\iffieldsequal{#2month}{#2endmonth} + {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% + \printfield{extradate}% + \enddateuncertainprint + \dateeraprint{#2}}}}}% + \endgroup} \protected\gdef\lbx@us@mkdaterangetruncextra@short#1#2{% - \iffieldundef{#2year} - {} - {\datecircaprint - \printtext[#2date]{% - \iffieldundef{#2season} - {\iffieldsequal{#2year}{#2endyear} - {\csuse{mkbibdate#1}{}{#2month}{#2day}} - {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}} - {\iffieldsequal{#2year}{#2endyear} - {\csuse{mkbibseasondate#1}{}{#2season}} - {\csuse{mkbibseasondate#1}{#2year}{#2season}}% - \dateeraprint{#2}}% - \dateuncertainprint - \iffieldundef{#2endyear} - {\printfield{extradate}} - {\iffieldequalstr{#2endyear}{} - {\printfield{extradate}% - \mbox{\bibdaterangesep}} - {\bibdaterangesepx{#2}% - \enddatecircaprint - \iffieldundef{#2season} - {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}} - {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% - \printfield{extradate}% - \enddateuncertainprint - \dateeraprint{#2}}}}}} + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {} + {\datecircaprint + \printtext[#2date]{% + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibdate#1}{}{#2month}{#2day}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibseasondate#1}{}{#2season}} + {\csuse{mkbibseasondate#1}{#2year}{#2season}}% + \dateeraprint{#2}}% + \dateuncertainprint + \iffieldundef{#2endyear} + {\printfield{extradate}} + {\iffieldequalstr{#2endyear}{} + {\printfield{extradate}% + \mbox{\bibdaterangesep}} + {\bibdaterangesepx{#2}% + \enddatecircaprint + \iffieldundef{#2season} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}} + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% + \printfield{extradate}% + \enddateuncertainprint + \dateeraprint{#2}}}}}% + \endgroup} \endinput
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/archaeologie/french-archaeologie.lbx b/Master/texmf-dist/tex/latex/archaeologie/french-archaeologie.lbx index f66b1a9096f..b1ba2e8211b 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/french-archaeologie.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/french-archaeologie.lbx @@ -17,18 +17,10 @@ \InheritBibliographyExtras{french} \DefineBibliographyExtras{french}{\restorecommand\mkbibnamefamily} -\NewBibliographyString{origtitle} -\NewBibliographyString{firstprint} -\NewBibliographyString{reviewof} -\NewBibliographyString{reference} -\NewBibliographyString{translationof} -\NewBibliographyString{talk} -\NewBibliographyString{subvoce} -\NewBibliographyString{owntranslation} - - \DeclareBibliographyStrings{% inherit = {french}, + magthesis = {{}{}},% FIX ME! + mathesis = {{}{}},% FIX ME! subvoce = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}}, translationof = {{traduction\addspace de}{trad\adddot\addspace de}}, reference = {{article}{art\adddot}}, diff --git a/Master/texmf-dist/tex/latex/archaeologie/german-archaeologie.lbx b/Master/texmf-dist/tex/latex/archaeologie/german-archaeologie.lbx index da9d1243e2c..62581365863 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/german-archaeologie.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/german-archaeologie.lbx @@ -1,7 +1,7 @@ % archaeologie --% % biblatex for archaeologists, % historians and philologists -% Copyright (c) 2017 Lukas C. Bossert | Johannes Friedl +% Copyright (c) 2016-2018 Lukas C. Bossert | Johannes Friedl % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -10,25 +10,14 @@ % http://www.latex-project.org/lppl.txt % and version 1.3 or later is part of all distributions of LaTeX % version 2005/12/01 or later. -\ProvidesFile{archaeologie-german.lbx}% +\ProvidesFile{german-archaeolgie.lbx}% [\arch@lbxid] \InheritBibliographyExtras{ngerman} -\NewBibliographyString{origtitle} -\NewBibliographyString{firstprint} -\NewBibliographyString{reviewof} -\NewBibliographyString{reference} -\NewBibliographyString{translationof} -\NewBibliographyString{talk} - -\NewBibliographyString{seenote} -\NewBibliographyString{loccit} -\NewBibliographyString{subvoce} -\NewBibliographyString{owntranslation} - - \DeclareBibliographyStrings{% inherit = {ngerman}, + magthesis = {{Magisterarbeit}{Mag.-Arbeit}},% + mathesis = {{Masterarbeit}{MA-Arbeit}},% subvoce = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}}, reference = {{Artikel}{Art\adddot}}, reviewof = {{Rezension\addspace zu}{Rez\adddot\addabthinspace zu}}, @@ -38,6 +27,6 @@ seenote = {{Anmerkung}{Anm\adddot}}, loccit = {{am\addabthinspace Ort}{a\adddot\addabthinspace O\adddot}}, translationof = {{\"Ubersetzung\addspace von}{\"Ubers\adddot\addspace von}}, - owntranslation = {{eigene\addspace\"Ubersetzung}{eig\adddot\addspace\"Ubers\adddot}}, + owntranslation = {{eigene\addspace\"Ubersetzung}{eig\adddot\addspace\"Ubers\adddot}}, } \endinput
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/archaeologie/italian-archaeologie.lbx b/Master/texmf-dist/tex/latex/archaeologie/italian-archaeologie.lbx index aca0683694b..3e097c05c2b 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/italian-archaeologie.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/italian-archaeologie.lbx @@ -1,7 +1,7 @@ % archaeologie --% % biblatex for archaeologists, % historians and philologists -% Copyright (c) 2017 Lukas C. Bossert | Johannes Friedl +% Copyright (c) 2016-2018 Lukas C. Bossert | Johannes Friedl % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -12,28 +12,14 @@ % version 2005/12/01 or later. -\ProvidesFile{archaeologie-italian.lbx}% +\ProvidesFile{italian-archaeologie.lbx}% [\arch@lbxid] \InheritBibliographyExtras{italian} -\NewBibliographyString{origtitle} -\NewBibliographyString{firstprint} -\NewBibliographyString{reviewof} -\NewBibliographyString{reference} -\NewBibliographyString{translationof} -\NewBibliographyString{talk} -\NewBibliographyString{inpreparation} -\NewBibliographyString{submitted} -\NewBibliographyString{forthcoming} -\NewBibliographyString{inpress} -\NewBibliographyString{prepublished} -\NewBibliographyString{subvoce} -\NewBibliographyString{owntranslation} - - - \DeclareBibliographyStrings{% inherit = {italian}, + magthesis = {{}{}},% FIX ME! + mathesis = {{}{}},% FIX ME! subvoce = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}}, translationof = {{traduzione\addspace di}{trad\adddot\addabthinspace di}}, reference = {{articolo}{art\adddot}}, @@ -46,6 +32,6 @@ inpress = {{in\addspace corso\addspace di\addspace stampa}{c\adddot\addabthinspace d\adddot\addabthinspace s\adddot}}, prepublished = {{}{}},% FIX ME! forthcoming = {{prossimo}{prossimo}}, - owntranslation = {{??}{??}},% FIX ME! + owntranslation = {{??}{??}},% FIX ME! } \endinput
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/archaeologie/spanish-archaeologie.lbx b/Master/texmf-dist/tex/latex/archaeologie/spanish-archaeologie.lbx index 89daf2c73c1..34b727b4b8b 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/spanish-archaeologie.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/spanish-archaeologie.lbx @@ -1,7 +1,7 @@ % archaeologie --% % biblatex for archaeologists, % historians and philologists -% Copyright (c) 2017 Lukas C. Bossert | Johannes Friedl +% Copyright (c) 2016-2018 Lukas C. Bossert | Johannes Friedl % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -11,25 +11,20 @@ % and version 1.3 or later is part of all distributions of LaTeX % version 2005/12/01 or later. -\ProvidesFile{archaeologie-spanish.lbx}% +\ProvidesFile{spanish-archaeologie.lbx}% [\arch@lbxid] \InheritBibliographyExtras{spanish} -\NewBibliographyString{origtitle} -\NewBibliographyString{firstprint} -\NewBibliographyString{reference} -\NewBibliographyString{talk} -\NewBibliographyString{subvoce} -\NewBibliographyString{owntranslation} - \DeclareBibliographyStrings{% inherit = {spanish}, + magthesis = {{}{}},% FIX ME! + mathesis = {{}{}},% FIX ME! subvoce = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}}, reference = {{Artículo}{Art\adddot}}, origtitle = {{Título\addspace original}{Título\addspace original}}, firstprint = {{Primera\addspace edición}{Primera\addspace edición}}, talk = {{Conferencia}{Conferencia}}, - owntranslation = {{??}{??}},% FIX ME! + owntranslation = {{??}{??}},% FIX ME! } \endinput
\ No newline at end of file |