From 39010d345f62fd98626853160fbacf66fc329f0d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 19 Nov 2017 22:17:06 +0000 Subject: archaeologie (19nov17) git-svn-id: svn://tug.org/texlive/trunk@45852 c570f23f-e606-0410-a88d-b1316a301751 --- .../bib/archaeologie/archaeologie-examples.bib | 128 ++++++++++++++++- .../bib/archaeologie/archaeologie-lstlocations.bib | 58 ++++---- Master/texmf-dist/doc/latex/archaeologie/README.md | 33 +++-- .../doc/latex/archaeologie/archaeologie-ger.pdf | Bin 159463 -> 160549 bytes .../doc/latex/archaeologie/archaeologie-ger.tex | 18 ++- .../doc/latex/archaeologie/archaeologie.pdf | Bin 751735 -> 758403 bytes .../doc/latex/archaeologie/archaeologie.tex | 158 ++++++++++++++++----- .../latex/archaeologie/archaeologie-english.lbx | 52 ------- .../tex/latex/archaeologie/archaeologie-french.lbx | 57 -------- .../tex/latex/archaeologie/archaeologie-german.lbx | 43 ------ .../latex/archaeologie/archaeologie-italian.lbx | 51 ------- .../latex/archaeologie/archaeologie-spanish.lbx | 35 ----- .../tex/latex/archaeologie/archaeologie.bbx | 154 ++++++++++---------- .../tex/latex/archaeologie/archaeologie.cbx | 44 +++--- .../latex/archaeologie/english-archaeologie.lbx | 52 +++++++ .../tex/latex/archaeologie/french-archaeologie.lbx | 57 ++++++++ .../tex/latex/archaeologie/german-archaeologie.lbx | 43 ++++++ .../latex/archaeologie/italian-archaeologie.lbx | 51 +++++++ .../latex/archaeologie/spanish-archaeologie.lbx | 35 +++++ 19 files changed, 659 insertions(+), 410 deletions(-) delete mode 100644 Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx delete mode 100644 Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx delete mode 100644 Master/texmf-dist/tex/latex/archaeologie/archaeologie-german.lbx delete mode 100644 Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx delete mode 100644 Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx create mode 100644 Master/texmf-dist/tex/latex/archaeologie/english-archaeologie.lbx create mode 100644 Master/texmf-dist/tex/latex/archaeologie/french-archaeologie.lbx create mode 100644 Master/texmf-dist/tex/latex/archaeologie/german-archaeologie.lbx create mode 100644 Master/texmf-dist/tex/latex/archaeologie/italian-archaeologie.lbx create mode 100644 Master/texmf-dist/tex/latex/archaeologie/spanish-archaeologie.lbx diff --git a/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-examples.bib b/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-examples.bib index c05be86d30a..1f54d9183eb 100644 --- a/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-examples.bib +++ b/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-examples.bib @@ -1,5 +1,103 @@ % Encoding: UTF-8 +@Book{EAOR-01, + editor = {Tumolesi, Patrizia Sabbatini}, + title = {Roma}, + year = {1988}, + volume = {1}, + shorthand = {EAOR I}, + keywords = {corpus}, + options = {corpus,skipbib}, + crossref = {EAOR}, +} + +@InBook{Ganzert1984, +author = {Herz, Peter}, +title = {Gaius Caesar und Artavasdes}, +bookauthor = {Ganzert, Joachim}, +booktitle = {Das Kenotaph für Gaius Caesar in Limyra}, +booksubtitle = {Architektur und Bauornamentik}, +pages = {118--126}, +publisher = {Wasmuth}, +location = Tuebingen, +year = {1984}, +zenon = {000042874}, +series = IstForsch, +shortseries = IstForsch-short, +number = {35} +} + +@Book{EAOR-02, + editor = {Gregori, Gian Luca}, + title = {Regiones Italiae VI--XI}, + year = {1989}, + volume = {2}, + shorthand = {EAOR II}, + keywords = {corpus}, + options = {corpus,skipbib}, + crossref = {EAOR}, +} + +@Book{EAOR-03, + editor = {Marco Buonocore}, + title = {Regiones Italiae II--V}, + subtitle = {Sardinia, Sicilia et Corsica}, + year = {1992}, + volume = {3}, + shorthand = {EAOR III}, + keywords = {corpus}, + options = {corpus,skipbib}, + crossref = {EAOR}, +} + +@Book{EAOR-04, + editor = {Fora, Maurizio}, + title = {Regio Italiae I}, + subtitle = {Latium}, + year = {1992}, + maintitle = {Epigrafia anfiteatrale dell'Occidente Romano}, + volume = {4}, + shorthand = {EAOR IV}, + keywords = {corpus}, + options = {corpus,skipbib}, + crossref = {EAOR}, +} + +@Book{EAOR-05, + editor = {Vismara, Cinzia and Caldelli, Maria Letizia}, + title = {Alpes Maritimae, Gallia Narbonensis, tres Galliae, Germaniae, Britannia}, + year = {2001}, + volume = {5}, + shorthand = {EAOR V}, + keywords = {corpus}, + options = {corpus,skipbib}, + crossref = {EAOR}, +} + +@Book{EAOR-06, + editor = {Orlandi, Silvia}, + title = {Roma}, + subtitle = {Anfiteatri e strutture annesse con una nuova edizione e commento delle iscrizioni del Colosseo}, + year = {2004}, + volume = {6}, + shorthand = {EAOR VI}, + keywords = {corpus}, + options = {corpus,skipbib}, + crossref = {EAOR}, +} + +@Book{EAOR-07, + editor = {Gomez-Pantoja, Joaquín L.}, + title = {Baetica, Tarraconensis, Lusitania}, + subtitle = {Anfiteatri e strutture annesse con una nuova edizione e commento delle iscrizioni del Colosseo}, + year = {2000}, + volume = {7}, + shorthand = {EAOR VII}, + keywords = {corpus}, + options = {corpus,skipbib}, + crossref = {EAOR}, +} + @Inreference{Weinbrenner1914, author = {Weinbrenner}, title = {Rennbahn}, @@ -94,16 +192,17 @@ location = Tuebingen, } -@Article{Bossert:forthcoming, - author = {Lukas C. Bossert}, - title = {\ldots\ \textsc{in formam anitqvam restitvto}?}, - subtitle = {Überlegungen zur Inschrift der ›Porticus Deorum Consentium‹ (CIL\,VI 102) und ihren Ergänzungen im 19.{\,}Jh.}, - journaltitle = {BeStAR. Berliner Studien zum Antiken Rom}, - shortjournal = {BeStAR}, - volume = {2}, +@Article{Doe:forthcoming, + author = {Doe, John}, + title = {My Ideas about Antiquity}, + subtitle = {And Some Lines for a Subtitle}, + journaltitle = {Journal of Ancient Thoughts}, + shortjournal = {JAT}, + volume = {12}, pubstate = {forthcoming}, } + @Review{Taylor2008, author = {Taylor, Rabun}, number = {3}, @@ -705,6 +804,21 @@ options = {ancient}, } +@MvBook{EAOR, + title = {Epigrafia anfiteatrale dell'Occidente Romano}, + date = {1988/2009}, + editor = {Patrizia Sabbatini Tumolesi}, + volumes = {7}, + series = {Vetera. Richerche di storia, epigrafia e antichità}, + publisher = EQ, + location = Rome, + keywords = {corpus}, + options = {corpus}, + related = {EAOR-01,EAOR-02,EAOR-03,EAOR-04,EAOR-05,EAOR-06,EAOR-07}, + relatedtype = {multivolume}, + shorthand = {EAOR I--VII}, +} + @Comment{jabref-meta: databaseType:biblatex;} @Comment{jabref-entrytype: Review: req[author;number;title;subtitle;pages;volume;journaltitle;shortjournal;related;relatedtype;year] opt[]} diff --git a/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-lstlocations.bib b/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-lstlocations.bib index f8846f1a5d3..dd681316d10 100644 --- a/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-lstlocations.bib +++ b/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-lstlocations.bib @@ -1,30 +1,30 @@ % Encoding: UTF-8 -@String{Aix-la-Chapelle= {\iflanguage{english}{Aix-la-Chapelle}{\iflanguage{italian}{}{\iflanguage{french}{Aix-la-Chapelle}{\iflanguage{spanish}{Aquisgrán}{\iflanguage{ngerman}{Aachen}{}}}}}}} -@String{Athens= {\iflanguage{english}{Athens}{\iflanguage{italian}{Atene}{\iflanguage{french}{Athènes}{\iflanguage{spanish}{Atenas}{\iflanguage{ngerman}{Athen}{}}}}}}} -@String{Augsburg= {\iflanguage{english}{Augsburg}{\iflanguage{italian}{Augusta}{\iflanguage{french}{Augsbourg}{\iflanguage{spanish}{Ausburgo}{\iflanguage{ngerman}{Augsburg}{}}}}}}} -@String{Basle= {\iflanguage{english}{Basle}{\iflanguage{italian}{Basilea}{\iflanguage{french}{Basel}{\iflanguage{spanish}{Basilea}{\iflanguage{ngerman}{Basel}{}}}}}}} -@String{Berlin= {\iflanguage{english}{Berlin}{\iflanguage{italian}{Berlino}{\iflanguage{french}{Berlin}{\iflanguage{spanish}{Berlín}{\iflanguage{ngerman}{Berlin}{}}}}}}} -@String{Brussels= {\iflanguage{english}{Brussels}{\iflanguage{italian}{Bruxelles}{\iflanguage{french}{Bruxelles}{\iflanguage{spanish}{Bruselas}{\iflanguage{ngerman}{Brüssel}{}}}}}}} -@String{Cologne= {\iflanguage{english}{Cologne}{\iflanguage{italian}{Colonia}{\iflanguage{french}{Cologne}{\iflanguage{spanish}{Colonia}{\iflanguage{ngerman}{Köln}{}}}}}}} -@String{Copenhagen= {\iflanguage{english}{Copenhagen}{\iflanguage{italian}{Copenaghen}{\iflanguage{french}{Copenhague}{\iflanguage{spanish}{Copenhague}{\iflanguage{ngerman}{Kopenhagen}{}}}}}}} -@String{Dresden= {\iflanguage{english}{Dresden}{\iflanguage{italian}{Desda}{\iflanguage{french}{Dresde}{\iflanguage{spanish}{Dresde}{\iflanguage{ngerman}{Dresden}{}}}}}}} -@String{Florence= {\iflanguage{english}{Florence}{\iflanguage{italian}{Firenze}{\iflanguage{french}{Florence}{\iflanguage{spanish}{Firenze}{\iflanguage{ngerman}{Florenz}{}}}}}}} -@String{Frankfort-on-the-Main= {\iflanguage{english}{Frankfort-on-the-Main}{\iflanguage{italian}{Francoforte sul Meno}{\iflanguage{french}{Francfort-sur-le-Main}{\iflanguage{spanish}{Francfort del Meno}{\iflanguage{ngerman}{Frankfurt am Main}{}}}}}}} -@String{Freiburg= {\iflanguage{english}{Freiburg}{\iflanguage{italian}{Friburgo in Brisgovia}{\iflanguage{french}{Fribourg-en-Brisgau}{\iflanguage{spanish}{Friburgo de Brisgovia}{\iflanguage{ngerman}{Freiburg \parentext{i. Breisgau}}{}}}}}}} -@String{Goettingen= {\iflanguage{english}{Göttingen}{\iflanguage{italian}{Gottinga}{\iflanguage{french}{Gœttingue}{\iflanguage{spanish}{Gotinga}{\iflanguage{ngerman}{Göttingen}{}}}}}}} -@String{Hamburg= {\iflanguage{english}{Hamburg}{\iflanguage{italian}{Amburgo}{\iflanguage{french}{Hambourg}{\iflanguage{spanish}{Hamburgo}{\iflanguage{ngerman}{Hamburg}{}}}}}}} -@String{Leipzig= {\iflanguage{english}{Leipzig}{\iflanguage{italian}{Lipsia}{\iflanguage{french}{Leipzig}{\iflanguage{spanish}{Leipzig}{\iflanguage{ngerman}{Leipzig}{}}}}}}} -@String{London= {\iflanguage{english}{London}{\iflanguage{italian}{Londra}{\iflanguage{french}{Londres}{\iflanguage{spanish}{Londres}{\iflanguage{ngerman}{London}{}}}}}}} -@String{Louvain= {\iflanguage{english}{Louvain}{\iflanguage{italian}{Lovanio}{\iflanguage{french}{Louvain}{\iflanguage{spanish}{Lovaina}{\iflanguage{ngerman}{Löwen}{}}}}}}} -@String{Mainz= {\iflanguage{english}{Mainz}{\iflanguage{italian}{Magonza}{\iflanguage{french}{Mayence}{\iflanguage{spanish}{Maguncia}{\iflanguage{ngerman}{Mainz am Rhein}{}}}}}}} -@String{Milan= {\iflanguage{english}{Milan}{\iflanguage{italian}{Milano}{\iflanguage{french}{Milan}{\iflanguage{spanish}{Milán}{\iflanguage{ngerman}{Mailand}{}}}}}}} -@String{Munich= {\iflanguage{english}{Munich}{\iflanguage{italian}{Monaco \parentext{di Bavaria}}{\iflanguage{french}{Munich}{\iflanguage{spanish}{Múnich}{\iflanguage{ngerman}{München}{}}}}}}} -@String{Naples= {\iflanguage{english}{Naples}{\iflanguage{italian}{Napoli}{\iflanguage{french}{Naples}{\iflanguage{spanish}{Napoli}{\iflanguage{ngerman}{Neapel}{}}}}}}} -@String{Paris= {\iflanguage{english}{Paris}{\iflanguage{italian}{Parigi}{\iflanguage{french}{Paris}{\iflanguage{spanish}{París}{\iflanguage{ngerman}{Paris}{}}}}}}} -@String{Regensburg= {\iflanguage{english}{Regensburg}{\iflanguage{italian}{Ratisbona}{\iflanguage{french}{Ratisbonne}{\iflanguage{spanish}{Ratisbona}{\iflanguage{ngerman}{Regensburg}{}}}}}}} -@String{Rome= {\iflanguage{english}{Rome}{\iflanguage{italian}{Roma}{\iflanguage{french}{Rome}{\iflanguage{spanish}{Roma}{\iflanguage{ngerman}{Rom}{}}}}}}} -@String{Saarbruecken= {\iflanguage{english}{Saarbruecken}{\iflanguage{italian}{}{\iflanguage{french}{Saarbruck}{\iflanguage{spanish}{Saarbruck}{\iflanguage{ngerman}{Saarbrücken}{}}}}}}} -@String{Stuttgart= {\iflanguage{english}{Stuttgart}{\iflanguage{italian}{Stoccardo}{\iflanguage{french}{Stuttgart}{\iflanguage{spanish}{Estútgart}{\iflanguage{ngerman}{Stuttgart}{}}}}}}} -@String{Trier= {\iflanguage{english}{Trier}{\iflanguage{italian}{Treviri}{\iflanguage{french}{Trèves}{\iflanguage{spanish}{Trèveris}{\iflanguage{ngerman}{Trier}{}}}}}}} -@String{Tuebingen= {\iflanguage{english}{Tubingen}{\iflanguage{italian}{Tubinga}{\iflanguage{french}{Tubingue}{\iflanguage{spanish}{Tubinga}{\iflanguage{ngerman}{Tübingen}{}}}}}}} -@String{Vienna= {\iflanguage{english}{Vienna}{\iflanguage{italian}{Vienna}{\iflanguage{french}{Vienne}{\iflanguage{spanish}{Viena}{\iflanguage{ngerman}{Wien}{}}}}}}} \ No newline at end of file +@String{Aix-la-Chapelle= {\iflanguage{english}{Aix-la-Chapelle}{\iflanguage{italian}{}{\iflanguage{french}{Aix-la-Chapelle}{\iflanguage{spanish}{Aquisgrán}{\iflanguage{ngerman}{Aachen}{\iflanguage{german}{Aachen}{}}}}}}}} +@String{Athens= {\iflanguage{english}{Athens}{\iflanguage{italian}{Atene}{\iflanguage{french}{Athènes}{\iflanguage{spanish}{Atenas}{\iflanguage{ngerman}{Athen}{\iflanguage{german}{Athen}{}}}}}}}} +@String{Augsburg= {\iflanguage{english}{Augsburg}{\iflanguage{italian}{Augusta}{\iflanguage{french}{Augsbourg}{\iflanguage{spanish}{Ausburgo}{\iflanguage{ngerman}{Augsburg}{\iflanguage{german}{Augsburg}{}}}}}}}} +@String{Basle= {\iflanguage{english}{Basle}{\iflanguage{italian}{Basilea}{\iflanguage{french}{Basel}{\iflanguage{spanish}{Basilea}{\iflanguage{ngerman}{Basel}{\iflanguage{german}{Basel}{}}}}}}}} +@String{Berlin= {\iflanguage{english}{Berlin}{\iflanguage{italian}{Berlino}{\iflanguage{french}{Berlin}{\iflanguage{spanish}{Berlín}{\iflanguage{ngerman}{Berlin}{\iflanguage{german}{Berlin}{}}}}}}}} +@String{Brussels= {\iflanguage{english}{Brussels}{\iflanguage{italian}{Bruxelles}{\iflanguage{french}{Bruxelles}{\iflanguage{spanish}{Bruselas}{\iflanguage{ngerman}{Brüssel}{\iflanguage{german}{Brüssel}{}}}}}}}} +@String{Cologne= {\iflanguage{english}{Cologne}{\iflanguage{italian}{Colonia}{\iflanguage{french}{Cologne}{\iflanguage{spanish}{Colonia}{\iflanguage{ngerman}{Köln}{\iflanguage{german}{Köln}{}}}}}}}} +@String{Copenhagen= {\iflanguage{english}{Copenhagen}{\iflanguage{italian}{Copenaghen}{\iflanguage{french}{Copenhague}{\iflanguage{spanish}{Copenhague}{\iflanguage{ngerman}{Kopenhagen}{\iflanguage{german}{Kopenhagen}{}}}}}}}} +@String{Dresden= {\iflanguage{english}{Dresden}{\iflanguage{italian}{Desda}{\iflanguage{french}{Dresde}{\iflanguage{spanish}{Dresde}{\iflanguage{ngerman}{Dresden}{\iflanguage{german}{Dresden}{}}}}}}}} +@String{Florence= {\iflanguage{english}{Florence}{\iflanguage{italian}{Firenze}{\iflanguage{french}{Florence}{\iflanguage{spanish}{Firenze}{\iflanguage{ngerman}{Florenz}{\iflanguage{german}{Florenz}{}}}}}}}} +@String{Frankfurt= {\iflanguage{english}{Frankfurt}{\iflanguage{italian}{Francoforte sul Meno}{\iflanguage{french}{Francfort-sur-le-Main}{\iflanguage{spanish}{Francfort del Meno}{\iflanguage{ngerman}{Frankfurt am Main}{\iflanguage{german}{Frankfurt am Main}{}}}}}}}} +@String{Freiburg= {\iflanguage{english}{Freiburg}{\iflanguage{italian}{Friburgo in Brisgovia}{\iflanguage{french}{Fribourg-en-Brisgau}{\iflanguage{spanish}{Friburgo de Brisgovia}{\iflanguage{ngerman}{Freiburg \parentext{i. Breisgau}}{\iflanguage{german}{Freiburg \parentext{i. Breisgau}}{}}}}}}}} +@String{Göttingen= {\iflanguage{english}{Göttingen}{\iflanguage{italian}{Gottinga}{\iflanguage{french}{Gœttingue}{\iflanguage{spanish}{Gotinga}{\iflanguage{ngerman}{Göttingen}{\iflanguage{german}{Göttingen}{}}}}}}}} +@String{Hamburg= {\iflanguage{english}{Hamburg}{\iflanguage{italian}{Amburgo}{\iflanguage{french}{Hambourg}{\iflanguage{spanish}{Hamburgo}{\iflanguage{ngerman}{Hamburg}{\iflanguage{german}{Hamburg}{}}}}}}}} +@String{Leipzig= {\iflanguage{english}{Leipzig}{\iflanguage{italian}{Lipsia}{\iflanguage{french}{Leipzig}{\iflanguage{spanish}{Leipzig}{\iflanguage{ngerman}{Leipzig}{\iflanguage{german}{Leipzig}{}}}}}}}} +@String{London= {\iflanguage{english}{London}{\iflanguage{italian}{Londra}{\iflanguage{french}{Londres}{\iflanguage{spanish}{Londres}{\iflanguage{ngerman}{London}{\iflanguage{german}{London}{}}}}}}}} +@String{Louvain= {\iflanguage{english}{Louvain}{\iflanguage{italian}{Lovanio}{\iflanguage{french}{Louvain}{\iflanguage{spanish}{Lovaina}{\iflanguage{ngerman}{Löwen}{\iflanguage{german}{Löwen}{}}}}}}}} +@String{Mainz= {\iflanguage{english}{Mainz}{\iflanguage{italian}{Magonza}{\iflanguage{french}{Mayence}{\iflanguage{spanish}{Maguncia}{\iflanguage{ngerman}{Mainz am Rhein}{\iflanguage{german}{Mainz am Rhein}{}}}}}}}} +@String{Milano= {\iflanguage{english}{Milano}{\iflanguage{italian}{Milano}{\iflanguage{french}{Milan}{\iflanguage{spanish}{Milán}{\iflanguage{ngerman}{Mailand}{\iflanguage{german}{Mailand}{}}}}}}}} +@String{Munich= {\iflanguage{english}{Munich}{\iflanguage{italian}{Monaco \parentext{di Bavaria}}{\iflanguage{french}{Munich}{\iflanguage{spanish}{Múnich}{\iflanguage{ngerman}{München}{\iflanguage{german}{München}{}}}}}}}} +@String{Naples= {\iflanguage{english}{Naples}{\iflanguage{italian}{Napoli}{\iflanguage{french}{Naples}{\iflanguage{spanish}{Napoli}{\iflanguage{ngerman}{Neapel}{\iflanguage{german}{Neapel}{}}}}}}}} +@String{Paris= {\iflanguage{english}{Paris}{\iflanguage{italian}{Parigi}{\iflanguage{french}{Paris}{\iflanguage{spanish}{París}{\iflanguage{ngerman}{Paris}{\iflanguage{german}{Paris}{}}}}}}}} +@String{Regensburg= {\iflanguage{english}{Regensburg}{\iflanguage{italian}{Ratisbona}{\iflanguage{french}{Ratisbonne}{\iflanguage{spanish}{Ratisbona}{\iflanguage{ngerman}{Regensburg}{\iflanguage{german}{Regensburg}{}}}}}}}} +@String{Rome= {\iflanguage{english}{Rome}{\iflanguage{italian}{Roma}{\iflanguage{french}{Rome}{\iflanguage{spanish}{Roma}{\iflanguage{ngerman}{Rom}{\iflanguage{german}{Rom}{}}}}}}}} +@String{Saarbrucken= {\iflanguage{english}{Saarbrucken}{\iflanguage{italian}{}{\iflanguage{french}{Saarbruck}{\iflanguage{spanish}{Saarbruck}{\iflanguage{ngerman}{Saarbrücken}{\iflanguage{german}{Saarbrücken}{}}}}}}}} +@String{Stuttgart= {\iflanguage{english}{Stuttgart}{\iflanguage{italian}{Stoccardo}{\iflanguage{french}{Stuttgart}{\iflanguage{spanish}{Estútgart}{\iflanguage{ngerman}{Stuttgart}{\iflanguage{german}{Stuttgart}{}}}}}}}} +@String{Trier= {\iflanguage{english}{Trier}{\iflanguage{italian}{Treviri}{\iflanguage{french}{Trèves}{\iflanguage{spanish}{Trèveris}{\iflanguage{ngerman}{Trier}{\iflanguage{german}{Trier}{}}}}}}}} +@String{Tuebingen= {\iflanguage{english}{Tuebingen}{\iflanguage{italian}{Tubinga}{\iflanguage{french}{Tubingue}{\iflanguage{spanish}{Tubinga}{\iflanguage{ngerman}{Tübingen}{\iflanguage{german}{Tübingen}{}}}}}}}} +@String{Vienna= {\iflanguage{english}{Vienna}{\iflanguage{italian}{Vienna}{\iflanguage{french}{Vienne}{\iflanguage{spanish}{Viena}{\iflanguage{ngerman}{Wien}{\iflanguage{german}{Wien}{}}}}}}}} diff --git a/Master/texmf-dist/doc/latex/archaeologie/README.md b/Master/texmf-dist/doc/latex/archaeologie/README.md index 10fa1cb815a..d5afaf32494 100644 --- a/Master/texmf-dist/doc/latex/archaeologie/README.md +++ b/Master/texmf-dist/doc/latex/archaeologie/README.md @@ -5,7 +5,8 @@ bibLaTeX-__archaeologie__ bibLaTeX-style for archaeologists, historians and philologists. --- -_2017/08/10 v2.3.3_ +_2017/11/19 v2.3.4_ + Copyright (c) 2017 Lukas C. Bossert | Johannes Friedl @@ -43,11 +44,11 @@ mandatory: language files: -- archaeologie-german.lbx -- archaeologie-english.lbx -- archaeologie-french.lbx -- archaeologie-italian.lbx -- archaeologie-spanish.lbx +- german-archaeologie.lbx +- english-archaeologie.lbx +- french-archaeologie.lbx +- italian-archaeologie.lbx +- spanish-archaeologie.lbx additional lists and bibliographies: @@ -65,10 +66,26 @@ 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/). -## unreleased (beta status) +## v2.3.4 (2017-11-19) --> [current release] +This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. + +#### *fixed* +* Arrangement of multiple authors with `\textcites`; see +[#115](https://github.com/LukasCBossert/biblatex-archaeologie/issues/115), solved with [https://tex.stackexchange.com/a/387162/98739](https://tex.stackexchange.com/a/387162/98739) +* Delimiter of `subtitle` and `titleaddon`, it is now a comma instead of fullstop. +* Remodelled the bibmacro `volume` and fixed a bug of a duplicate `volume`. +* `in:` is now always with minor `I` it doesn’t matter if follows a dot. + + +#### *added* +* `@MvBook` and its children can be listed in the bibliography together; see [#118](https://github.com/LukasCBossert/biblatex-archaeologie/issues/118) + +* `\citetitle*` for showing the publication title without year of publication + +* You can use the namefield `bookauthor` now, then no *(ed.)* will be printed. -## v2.3.3 (2017-08-10) --> [current release] +## v2.3.3 (2017-08-10) #### *fixed* * typo in documentation diff --git a/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.pdf b/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.pdf index b24368e383f..0faafe3503f 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 27187b85569..9150f8d844c 100644 --- a/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.tex +++ b/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.tex @@ -187,13 +187,19 @@ Dies ist vor allem bei Lexikaeinträgen wichtig: (LIMC 7.1 [1994] 930 Nr. 283 s. Der Unterschied zu \cs{cite} besteht darin, dass der Literaturverweis durch Klammern vom Autor getrennt wird: z.\,B. Emme (2013, 5). \cs{textcite} und \cs{textcites} verhalten sich in der Bedienung analog zu \cs{cite} und \cs{cites}. -\DescribeMacro{\citeauthor} \DescribeMacro{\citetitle} Diese Befehle ermöglich, nur einzelne Elemente einer Publikation zu zitieren. Je nach Verwendung wird entweder nur der Titel oder der Autor eines Bibliographieeintrages ausgegeben. Ein Vorteil gegenüber des händischen Eintippens eines solchen Elementes ist, dass der Eintrag indiziert und referenziert wird. Dies kann z.\,B. für einen (Autoren-)Index, der auf die Textstelle verweisen soll, relevant sein. - -\DescribeMacro{\citetranslator}\rmarginpar{v.2.3.0} Zusätzlich gibt es noch die Möglichkeit den Übersetzer eines (insbesondere) antiken Werkes anzugeben. +\DescribeMacro{\citeauthor} \DescribeMacro{\citetitle} Diese Befehle ermöglich nur einzelne Elemente einer Publikation zu zitieren. +Je nach Verwendung wird entweder nur der Titel oder der Autor eines Bibliographieeintrages ausgegeben. +Ein Vorteil gegenüber des händischen Eintippens eines solchen Elementes ist, dass der Eintrag indiziert und referenziert wird. Dies kann z.\,B. für einen (Autoren-)\-Index, der auf die Textstelle verweisen soll, relevant sein. + +\DescribeMacro{\citetitle*} + \rmarginpar{2.3.4} + Damit wird nur der Titel ohne das Erscheinungsjahr ausgegeben. + +\DescribeMacro{\citetranslator}\rmarginpar{2.3.0} Zusätzlich gibt es noch die Möglichkeit den Übersetzer eines (insbesondere) antiken Werkes anzugeben. Besonders wenn man einen antiken Text in Übersetzung zitiert, ist es üblich den Urheber der Übersetzung anzugeben. Ist kein Übersetzer vorhanden, dann gibt der Befehl einen selbst als Übersetzer an. - \DescribeMacro{\citetranslator*} \rmarginpar{v.2.3.0} Die Sternchen-Variante gibt zusätzlich noch die Sprache an, + \DescribeMacro{\citetranslator*} \rmarginpar{2.3.0} Die Sternchen-Variante gibt zusätzlich noch die Sprache an, aus der übersetzt wurde. \section{Publikationstypen} @@ -210,11 +216,13 @@ Im folgenden werden die zur Verfügung stehenden Publikationstypen (\emph{Entry \DescribeMacro{@book} \DescribeMacro{@collection} Für Monographien und Sammelbände. \begin{description}[topsep=0pt] \item[Notwendig:] |author|/|editor|, |title|, |subtitle|, |titleaddon|, |location|, |year| -\item[Optional:] |maintitle|, |mainsubtitle|, |maintitleaddon|, |related|, |relatedtype|, |publisher|, |series|, |number|, |edition|, |origyear|, |origlanguage|, |origlocation|, |translator|, |volume|, |doi|, |url|, |urldate|, |eprint|, |eprinttype|, |note|, |addendum|, |pubstate| +\item[Optional:] |maintitle|, |mainsubtitle|, |maintitleaddon|, |bookauthor,| |related|, |relatedtype|, |publisher|, |series|, |number|, |edition|, |origyear|, |origlanguage|, |origlocation|, |translator|, |volume|, |doi|, |url|, |urldate|, |eprint|, |eprinttype|, |note|, |addendum|, |pubstate| \end{description} \printbib[7em]{Emme2013} + \DescribeMacro{@mvbook} Für kleinere Reihen bestehend aus einzelnen Bänden. + \printbib[5em]{EAOR} \DescribeMacro{@inbook} \DescribeMacro{@incollection} Für Beiträge innerhalb eines Sammelbandes. \begin{description}[topsep=0pt] diff --git a/Master/texmf-dist/doc/latex/archaeologie/archaeologie.pdf b/Master/texmf-dist/doc/latex/archaeologie/archaeologie.pdf index 7be728c3259..e9a429c3965 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 654cd5bd6d4..31f44775b81 100644 --- a/Master/texmf-dist/doc/latex/archaeologie/archaeologie.tex +++ b/Master/texmf-dist/doc/latex/archaeologie/archaeologie.tex @@ -278,7 +278,7 @@ And again there is also a \cs{textcites} in case of several authors: \begin{example} Public space is part of a city say \textcites{Osland2016}[cf.][]{Evangelidis2014}. \end{example} - +Just be aware that using \oarg{prenote} may be give a odd sounding sentence depending what you use \oarg{prenote} for. \DescribeMacro{\footcite} Beside the listed \cs{cite} commands above there are more possibilities citing: @@ -312,7 +312,7 @@ And sometimes more than that.\footnote{\smartcite[cf.][]{Evangelidis2014}.} \DescribeMacro{\smartcites} -And again there is also a \cs{textcites} in case of several authors: +And again there is also a \cs{smartcites} in case of several authors: \begin{code} \smartcites(pre-prenote)(post-postnote)% *@\oarg{prenote}\oarg{postnote}\marg{bibtex-key}@*% @@ -365,21 +365,27 @@ Public space is part of a city says \citeauthor{Osland2016} in \citetitle{Osland \end{example} For further information cf. \cref{citeauthorformat}. +\DescribeMacro{\citetitle*} +Sometimes you don’t need the year of publication but still want the published title. Then |\citetitle*| is what you need: +\archversion{2.3.4} +\begin{example} +In 2016 \citeauthor{Osland2016} says in \citetitle*{Osland2016} +public space is part of a city. +\end{example} + + \DescribeMacro{\citetranslator}\label{citetranslator}% -\rmarginpar{v.2.3.0} +\archversion{2.3.0} Addionally there is also a \cs{cite}-command which can be used to print the translator of an (ancient) publication. \begin{code} \citetranslator*@\marg{bibtex-key}%@* \end{code} This will print the name(s) of the translator according to the chosen |citeauthorformat|. -\begin{code} -\blockcquote[12,25,1]{Cic:Att}{Aber dein Heim ist das Forum.} (\citetranslator{Cic:Att}) -\end{code} \begin{example} \blockcquote[12,25,1]{Cic:Att}{Aber dein Heim ist das Forum.} (\citetranslator{Cic:Att}) \end{example} -\rmarginpar{v.2.3.3} +\archversion{2.3.3} If there is no translator given it will name you as translator using a |bibstring| with \enquote{own translation}. \begin{example} \blockcquote[3,62,1]{Artem}{The Agora means confusion and uproar because of the people that are gathered there.} (\citetranslator{Artem}) @@ -394,15 +400,13 @@ at least it is done in the preamble of your document. -\DescribeMacro{\citetranslator*}\rmarginpar{v.2.3.0} +\DescribeMacro{\citetranslator*}\archversion{2.3.0} \begin{code} \citetranslator* *@\marg{bibtex-key}%@* \end{code} The starred version prints also the informtion from which language the text has been translated. -\begin{code} -\blockcquote[12,25,1]{Cic:Att}{Aber dein Heim ist das Forum.} (\citetranslator*{Cic:Att}) -\end{code} + \begin{example} \blockcquote[12,25,1]{Cic:Att}{Aber dein Heim ist das Forum.} (\citetranslator*{Cic:Att}) \end{example} @@ -1502,7 +1506,7 @@ We suggest using the field |titleaddon| or if it is a |@Incollection| or |@Inpr } \end{bibexample} -\printbib[9em]{Boehm2001} +\printbib[9.5em]{Boehm2001} \subsubsection{Translated book} If you cite a translated book you can link it to the original book and let display the translator as well as the original language. @@ -1554,7 +1558,7 @@ It will be included automatically. For the following bibliography we only use |\ \printbiball[5em]{Zanker1988} -\subsubsection{Multiple volumes of a monograph} +\subsubsection{Multiple volumes of a monograph (cf. \cref{mvbook})} It may be the case that you have to cite a book which consists of several volumes: usually there is a volume with text and one volume with plates. To cite e.\,g. the second volume in particular you can do the following. @@ -1630,7 +1634,7 @@ but then notice the additional information in |booktitleaddon|. } \end{bibexample} In the bibliography it will look like: -\printbib[5.5em]{Hoelscher2001} +\printbib[6em]{Hoelscher2001} \subsubsection{Short series} Some books or collections are part of a small series (not an ongoing series). @@ -1697,6 +1701,93 @@ and the second example and \printbiball[6em]{Parlasca1969} +\subsubsection{Section of Monograph} +\archversion{2.3.4} +In some cases there are several parts of a monograph which are written by variant people (e.\,g. excavation reports). +Then the book is technically not an edited one by an editor but (mainly) written by one (book)author. + +The difference to an edited volume is that in the bibliography there is no |(ed.)|, cf. \cref{Ganzert1984}. + + +\begin{bibexample}[label=Ganzert1984]{{@}Inbook\{Ganzert1984,…\}} +@Inbook{Ganzert1984, +author = {Herz, Peter}, +title = {Gaius Caesar und Artavasdes}, +bookauthor = {Ganzert, Joachim}, +booktitle = {Das Kenotaph für Gaius Caesar in Limyra}, +booksubtitle = {Architektur und Bauornamentik}, +pages = {118--126}, +publisher = {Wasmuth}, +location = Tuebingen, +year = {1984}, +zenon = {000042874}, +series = IstForsch, +shortseries = IstForsch-short, +number = {35} +} +\end{bibexample} + +\printbib[6em]{Ganzert1984} + + +\subsection{Type \texttt{@MvBook}}\label{mvbook} +\DescribeMacro{@MvBook}\archversion{2.3.4} If you have a small series consistend of several volumes and you want to have them listed together you should read the following. + +Using the entry type |@MvBook| (Multivolume) for the main entry you can have several volumes connected to it (children). +For example we have \citetitle{EAOR} with seven volumes. +The main entry looks like this + +\begin{bibexample}[label=EAOR]{{@}MvBook\{EAOR,…\}} +@Mvbook{EAOR, + title = {Epigrafia anfiteatrale dell'Occidente Romano}, + date = {1988/2009}, + editor = {Patrizia Sabbatini Tumolesi}, + keywords = {corpus}, + location = Rome, %@String used + options = {corpus}, + publisher = EQ, %@String used + related = {EAOR-01,EAOR-02,EAOR-03,EAOR-04,EAOR-05,EAOR-06,EAOR-07}, + relatedtype = {multivolume}, + series = {Vetera. Richerche di storia, epigrafia e antichità}, + shorthand = {EAOR I--VII}, + volumes = {7}, +} +\end{bibexample} + +Two children belonging to \cref{EAOR} look like + +\begin{bibexample}[label=EAOR-01]{{@}MvBook\{EAOR-01,…\}} +@Book{EAOR-01, + title = {Roma}, + year = {1988}, + editor = {Tumolesi, Patrizia Sabbatini}, + volume = {1}, + keywords = {corpus}, + options = {corpus,skipbib}, + shorthand = {EAOR I}, + crossref = {EAOR}, +} +\end{bibexample} + +\begin{bibexample}[label=EAOR-02]{{@}MvBook\{EAOR-02,…\}} +@Book{EAOR-02, + title = {Regiones Italiae VI--XI}, + year = {1989}, + editor = {Gregori, Gian Luca}, + volume = {2}, + keywords = {corpus}, + options = {corpus,skipbib}, + shorthand = {EAOR II}, + crossref = {EAOR}, +} +\end{bibexample} +It is important that you have |skipbib| in the field |options|! + +The advantage is that you cite either |EAOR| then you will all of the volumes listed in the bibliography +or you can only cite individual volumes in your text. +In this case (e.g. citing |EAOR-01| and |EAOR-02|) it looks like this in the bibliography +\printbib[5em]{EAOR-01,EAOR-02} + \subsection{Type \texttt{@Article}}\label{article} \DescribeMacro{@Article} This is probably the most common type @@ -1902,11 +1993,9 @@ Then the output will be like:\\ 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} Then it will look like this in the footnote: -\begin{examplebox} -|\footnote{\cite{Neils1994}.}| -\tcblower +\begin{examplemanual} \footnote{LIMC 7.1 (1994) 922--951 s. v. Theseus (J. Neils).} -\end{examplebox} +\end{examplemanual} When you have the \oarg{postnote} filled out in a citation which belongs to an |@Inreference| then it won’t be printed in the end of the citation. The |postnote| \oarg{930 Nr. 283} will be printed instead of the |pages|: \begin{example} @@ -2303,7 +2392,7 @@ The rule says that within a pair of parentheses you have to use square brackets. Citing |@Inreferences| can lead easily to a false behaviour when you put it in parentheses. This is an example how it should not be done: \begin{tcolorbox}[examplebox] -|\cite[vgl.][930 Nr. 283]{Neils1994}.| +|(\cite[vgl.][930 Nr. 283]{Neils1994}).| \tcblower (vgl. LIMC 7.1 (1994) 930 Nr. 283 s. v. Theseus (J. Neils)). \textcolor{red}{\textbf{WRONG!!}} \end{tcolorbox} @@ -2382,19 +2471,19 @@ pubstate = {prepublished} This following example is about an article which was accepted by the journal and so we use |pubstate = {forthcoming}|: -\begin{bibexample}[label=Bossert:forthcoming]{{@}Article\{Bossert:forthcoming,…\}} -@Article{Bossert:forthcoming, - author = {Lukas C. Bossert}, - title = {\ldots\ \textsc{in formam anitqvam restitvto}?}, - subtitle = {Überlegungen zur Inschrift der ›Porticus Deorum Consentium‹ (CIL\,VI 102) und ihren Ergänzungen im 19.{\,}Jh.}, - journaltitle = {BeStAR. Berliner Studien zum Antiken Rom}, - shortjournal = {BeStAR}, - volume = {2}, +\begin{bibexample}[label=Doe:forthcoming]{{@}Article\{Doe:forthcoming,…\}} +@Article{Doe:forthcoming, + author = {Doe, John}, + title = {My Ideas about Antiquity}, + subtitle = {And Some Lines for a Subtitle}, + journaltitle = {Journal of Ancient Thoughts}, + shortjournal = {JAT}, + volume = {12}, pubstate = {forthcoming}, } \end{bibexample} -\printbib[8em]{Bossert:forthcoming} +\printbib[8em]{Doe:forthcoming} \subsection{Print the used options} @@ -2504,7 +2593,7 @@ The bibliography |archaeologie-bibancient.bib| is filled with ancient authors, w The bold entry on the left is the |bibtex-key|.\footnote{If you think the list should be enlarged, let us know the entries.} All the entries have the fields |keywords={ancient}|, |options={ancient}|. -\begin{multicols}{3} +\begin{multicols}{2} \input{archaeologie-ancient.tex} \end{multicols} \changes{v1.5}{2016/05/31}{Antike Bibliographie} @@ -2542,16 +2631,16 @@ Lexikon-der-Technik,Bergmann2015,LTUR} \item[Copenhagen] <-- English\newline German: Kopenhagen\newline Italian: Copenaghen\newline Spanish: Copenhague\newline French: Copenhague \item[Dresden] <-- English\newline German: Dresden\newline Italian: Desda\newline Spanish: Dresde\newline French: Dresde \item[Florence] <-- English\newline German: Florenz\newline Italian: Firenze\newline Spanish: Firenze\newline French: Florence -\item[Frankfort-on-the-Main] <-- English\newline German: Frankfurt am Main\newline Italian: Francoforte sul Meno\newline Spanish: Francfort del Meno\newline French: Francfort-sur-le-Main -\item[Freiburg] <-- English\newline German: Freiburg (i. Breisgau)\newline Italian: Friburgo in Brisgovia\newline Spanish: Friburgo de Brisgovia\newline French: Fribourg-en-Brisgau -\item[Goettingen] <-- English\newline German: Göttingen\newline Italian: Gottinga\newline Spanish: Gotinga\newline French: Gœttingue +\item[Frankfurt] <-- English\newline German: Frankfurt am Main\newline Italian: Francoforte sul Meno\newline Spanish: Francfort del Meno\newline French: Francfort-sur-le-Main +\item[Freiburg] <-- English\newline German: Freiburg \parentext{i. Breisgau}\newline Italian: Friburgo in Brisgovia\newline Spanish: Friburgo de Brisgovia\newline French: Fribourg-en-Brisgau +\item[Göttingen] <-- English\newline German: Göttingen\newline Italian: Gottinga\newline Spanish: Gotinga\newline French: Gœttingue \item[Hamburg] <-- English\newline German: Hamburg\newline Italian: Amburgo\newline Spanish: Hamburgo\newline French: Hambourg \item[Leipzig] <-- English\newline German: Leipzig\newline Italian: Lipsia\newline Spanish: Leipzig\newline French: Leipzig \item[London] <-- English\newline German: London\newline Italian: Londra\newline Spanish: Londres\newline French: Londres \item[Louvain] <-- English\newline German: Löwen\newline Italian: Lovanio\newline Spanish: Lovaina\newline French: Louvain \item[Mainz] <-- English\newline German: Mainz am Rhein\newline Italian: Magonza\newline Spanish: Maguncia\newline French: Mayence -\item[Milan] <-- English\newline German: Mailand\newline Italian: Milano\newline Spanish: Milán\newline French: Milan -\item[Munich] <-- English\newline German: München\newline Italian: Monaco (di Bavaria)\newline Spanish: Múnich\newline French: Munich +\item[Milano] <-- English\newline German: Mailand\newline Italian: Milano\newline Spanish: Milán\newline French: Milan +\item[Munich] <-- English\newline German: München\newline Italian: Monaco \parentext{di Bavaria}\newline Spanish: Múnich\newline French: Munich \item[Naples] <-- English\newline German: Neapel\newline Italian: Napoli\newline Spanish: Napoli\newline French: Naples \item[Paris] <-- English\newline German: Paris\newline Italian: Parigi\newline Spanish: París\newline French: Paris \item[Regensburg] <-- English\newline German: Regensburg\newline Italian: Ratisbona\newline Spanish: Ratisbona\newline French: Ratisbonne @@ -2561,7 +2650,6 @@ Lexikon-der-Technik,Bergmann2015,LTUR} \item[Trier] <-- English\newline German: Trier\newline Italian: Treviri\newline Spanish: Trèveris\newline French: Trèves \item[Tuebingen] <-- English\newline German: Tübingen\newline Italian: Tubinga\newline Spanish: Tubinga\newline French: Tubingue \item[Vienna] <-- English\newline German: Wien\newline Italian: Vienna\newline Spanish: Viena\newline French: Vienne - \end{description} \end{multicols} \section{List of publishers}\label{list-publishers} diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx deleted file mode 100644 index 413971f3d06..00000000000 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx +++ /dev/null @@ -1,52 +0,0 @@ -% archaeologie --% -% biblatex for archaeologists, -% historians and philologists -% Copyright (c) 2017 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. -% The latest version of this license is in -% 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}% - [\arch@lbxid] -\InheritBibliographyExtras{english} - -\NewBibliographyString{origtitle} -\NewBibliographyString{firstprint} -\NewBibliographyString{reference} -\NewBibliographyString{talk} -\NewBibliographyString{editor} -\NewBibliographyString{subvoce} -\NewBibliographyString{owntranslation} - - -\DeclareBibliographyStrings{% - inherit = {english}, - subvoce = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}}, - reference = {{Article}{Art\adddot}}, - origtitle = {{original title}{orig\adddot title}}, - firstprint = {{first\addspace edition}{first\addspace edition}}, - talk = {{talk}{talk}}, - fromamerican = {{from\addspace American} {from\addspace American}}, - frombrazilian = {{from\addspace Brazilian}{from\addspace Brazilian}}, - fromcroatian = {{from\addspace Croatian}{from\addspace Croatian}}, - fromdanish = {{from\addspace Danish}{from\addspace Danish}}, - fromdutch = {{from\addspace Dutch}{from\addspace Dutch}}, - fromenglish = {{from\addspace English}{from\addspace English}}, - fromfinnish = {{from\addspace Finnish}{from\addspace Finnish}}, - fromfrench = {{from\addspace French}{from\addspace French}}, - fromgerman = {{from\addspace German} {from\addspace German}}, - fromgreek = {{from\addspace Greek}{from\addspace Greek}}, - fromitalian = {{from\addspace Italian}{from\addspace Italian}}, - fromlatin = {{from\addspace Latin}{from\addspace Latin}}, - fromnorwegian = {{from\addspace Norwegian}{from\addspace Norwegian}}, - fromportuguese = {{from\addspace Portuguese}{from\addspace Portuguese}}, - fromrussian = {{from\addspace Russian}{from\addspace Russian}}, - fromspanish = {{from\addspace Spanish}{from\addspace Spanish}}, - fromswedish = {{from\addspace Swedish}{from\addspace Swedish}}, - owntranslation = {{own\addspace trans\adddot}{own\addspace translation}}, -} -\endinput \ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx deleted file mode 100644 index c1506bdef32..00000000000 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx +++ /dev/null @@ -1,57 +0,0 @@ -% archaeologie --% -% biblatex for archaeologists, -% historians and philologists -% Copyright (c) 2017 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. -% The latest version of this license is in -% 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-french.lbx}% - [\arch@lbxid] -\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}, - subvoce = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}}, - translationof = {{traduction\addspace de}{trad\adddot\addspace de}}, - reference = {{article}{art\adddot}}, - reviewof = {{recension\addspace de}{rec\adddot\addspace de}}, - origtitle = {{titre original}{titre orig.\adddot}}, - firstprint = {{première\addspace édition}{première\addspace éd\adddot}}, - talk = {{conférence}{conf.}}, - fromamerican = {{depuis\addspace l'anglais américain} {depuis\addspace l'anglais américain}}, - frombrazilian = {{depuis\addspace le\addspace brésilien}{depuis\addspace le\addspace brésilien}}, - fromcroatian = {{depuis\addspace le\addspace croatien}{depuis\addspace le\addspace croatien}}, - fromdanish = {{depuis\addspace le\addspace danois}{depuis\addspace le\addspace danois}}, - fromdutch = {{depuis\addspace le\addspace néerlandais}{depuis\addspace le\addspace néerlandais}}, - fromenglish = {{depuis\addspace l'anglais}{depuis l'anglais}}, - fromfinnish = {{depuis\addspace Finnish}{depuis\addspace le\addspace Finnish}}, - fromfrench = {{depuis\addspace le\addspace français}{depuis\addspace le\addspace français}}, - fromgerman = {{depuis\addspace l'allemand} {depuis\addspace l'allemand}}, - fromgreek = {{depuis\addspace le\addspace grec}{depuis\addspace le\addspace grec}}, - fromitalian = {{depuis\addspace l'italien}{depuis l'italien}}, - fromlatin = {{depuis\addspace le\addspace latin}{depuis\addspace le\addspace latin}}, - fromnorwegian = {{depuis\addspace le\addspace norvégien}{depuis\addspace le\addspace norvégien}}, - fromportuguese = {{depuis\addspace le\addspace portugais}{depuis\addspace le\addspace portugais}}, - fromrussian = {{depuis\addspace le\addspace russe}{depuis\addspace le\addspace russe}}, - fromspanish = {{depuis\addspace l'espagnole}{depuis\addspace l'espagnol}}, - fromswedish = {{depuis\addspace le\addspace suédois}{depuis\addspace le\addspace suédois}}, - owntranslation = {{}{}},% FIX ME! -} \ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-german.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-german.lbx deleted file mode 100644 index da9d1243e2c..00000000000 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-german.lbx +++ /dev/null @@ -1,43 +0,0 @@ -% archaeologie --% -% biblatex for archaeologists, -% historians and philologists -% Copyright (c) 2017 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. -% The latest version of this license is in -% 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}% - [\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}, - subvoce = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}}, - reference = {{Artikel}{Art\adddot}}, - reviewof = {{Rezension\addspace zu}{Rez\adddot\addabthinspace zu}}, - origtitle = {{Originaltitel}{Orig\adddot titel}}, - firstprint = {{Erstauflage}{Erstaufl\adddot}}, - talk = {{Vortrag}{Vortrag}}, - 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}}, - } -\endinput \ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx deleted file mode 100644 index 4536a4404e7..00000000000 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx +++ /dev/null @@ -1,51 +0,0 @@ -% archaeologie --% -% biblatex for archaeologists, -% historians and philologists -% Copyright (c) 2017 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. -% The latest version of this license is in -% 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-italian.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}, - subvoce = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}}, - translationof = {{traduzione\addspace di}{trad\adddot\addabthinspace di}}, - reference = {{articolo}{art\adddot}}, - reviewof = {{recensione\addspace di}{recens\adddot\addabthinspace di}}, - origtitle = {{titolo\addspace originale}{titolo\addspace orig\adddot}}, - firstprint = {{prima\addspace edizione}{prima\addspace edizione}}, - talk = {{presentazione}{presentazione}}, - inpreparation = {{in\addspace preparazione}{in prep\adddot}}, - submitted = {{}{}},% FIX ME! - 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! -} -\endinput \ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx deleted file mode 100644 index 5d2b9a6c0f0..00000000000 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx +++ /dev/null @@ -1,35 +0,0 @@ -% archaeologie --% -% biblatex for archaeologists, -% historians and philologists -% Copyright (c) 2017 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. -% The latest version of this license is in -% 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-spanish.lbx}% - [\arch@lbxid] - -\InheritBibliographyExtras{spanish} - -\NewBibliographyString{origtitle} -\NewBibliographyString{firstprint} -\NewBibliographyString{reference} -\NewBibliographyString{talk} -\NewBibliographyString{subvoce} -\NewBibliographyString{owntranslation} - -\DeclareBibliographyStrings{% - inherit = {spanish}, - 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! -} -\endinput \ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx index 866a8ed01ab..fcc5c83961e 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{2017/08/10} -\def\arch@version{2.3.3} +\def\arch@date{2017/11/19} +\def\arch@version{2.3.4} \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)} @@ -26,7 +26,7 @@ historians and philologists} } \RequirePackage[normalem]{ulem} -%\RequirePackage{csquotes} +%\RequirePackage{csquotes} % optionclash \def\archaeologieversion{\arch@version} \def\archaeologiedate{\arch@date} \ExecuteBibliographyOptions{% @@ -44,6 +44,7 @@ maxitems=1,% maxbibnames=999,% useprefix=true,% + mincrossrefs=1,% } %----------------------- \newbool{bbx:edby} @@ -173,7 +174,7 @@ \iftoggle{bbx:doi}{}{\xout{doi}\seperator}% \iflanguage{ngerman}% {weitere Informationen unter \url{http://biblatex-archaeologie.de}} - {further information see \url{http://biblatex-archaeologie.de}} + {for further information see \url{http://biblatex-archaeologie.de}} } %----------------------- \DeclareFieldFormat*{title}{#1} @@ -189,6 +190,7 @@ \DeclareFieldFormat{edition}{#1} \DeclareFieldFormat{volumes}{#1} \DeclareFieldFormat{volume}{#1} +\DeclareFieldFormat{part}{#1} \DeclareFieldFormat[article]{date}{\iffieldundef{number}{#1}{\iffieldundef{volume}{#1\yearnumdelim\printfield{number}}{#1}}} \DeclareFieldFormat[inreference]{number}{\mkbibbrackets{#1}} \DeclareFieldFormat{parens}{\mkbibparens{#1}} @@ -199,7 +201,8 @@ \DeclareFieldFormat{urldate}{\mkbibparens{#1}} \DeclareFieldFormat{note}{\mkbibparens{#1}\nopunct} \DeclareFieldFormat{shorthandwidth}{#1} -\DeclareFieldFormat{origtitle}{\iffieldequalstr{origlanguage}{greek}{#1}{\mkbibemph{#1}}} +\DeclareFieldFormat{origtitle}{#1} +%\DeclareFieldFormat{origtitle}{\iffieldequalstr{origlanguage}{greek}{#1}{\mkbibemph{#1}}} \DeclareFieldFormat{eprint:urn}{% \textsc{urn}% \addcolon\space% @@ -226,17 +229,26 @@ \DeclareRedundantLanguages{german}{german,ngerman,austrian,naustrian} \DeclareRedundantLanguages{english,american}{english,american,british,% canadian,australian,newzealand,USenglish,UKenglish} -\DeclareLanguageMapping{german}{archaeologie-german} -\DeclareLanguageMapping{english}{archaeologie-english} -\DeclareLanguageMapping{french}{archaeologie-french} -\DeclareLanguageMapping{italian}{archaeologie-italian} -\DeclareLanguageMapping{spanish}{archaeologie-spanish} +\DeclareLanguageMapping{german}{german-archaeologie} +\DeclareLanguageMapping{english}{english-archaeologie} +\DeclareLanguageMapping{french}{french-archaeologie} +\DeclareLanguageMapping{italian}{italian-archaeologie} +\DeclareLanguageMapping{spanish}{spanish-archaeologie} +%\DeclareLanguageMappingSuffix{-archaeologie} %----------------------- \renewcommand*{\sqspace}{\addnbthinspace} \renewcommand*{\subtitlepunct}{\addperiod\addspace} \renewcommand*{\intitlepunct}{\addcolon\addspace} \renewcommand*{\newunitpunct}{\addcomma\addspace} -\newcommand*{\orttrennzeichen}{\addnbspace\textendash\addspace} +\newcommand*{\maintitlepunct}{\addperiod\addspace} +\newcommand*{\locationdelim}{\addnbspace\textendash\addspace} +\renewcommand{\multinamedelim}{\addnbspace\textendash\addspace} +\renewcommand{\finalnamedelim}{\multinamedelim} +\renewcommand*\relateddelim{\addnbspace\textendash\addspace}% +\newcommand*{\relateddelimmultivolume}{\addcomma\par\nobreak} +\newcommand*{\volnumdelim}{\addcomma} +\newcommand*{\yearnumdelim}{\addslash} +\newcommand*{\jourvoldelim}{\addnbspace} \renewcommand{\finentrypunct}{%http://tex.stackexchange.com/a/14159/98739 \ifbool{bbx:counter}% {\addspace$\vert$ \addspace\scshape% @@ -254,12 +266,6 @@ {s}}.% }}% {}} -\renewcommand{\multinamedelim}{\addnbspace\textendash\addspace} -\renewcommand{\finalnamedelim}{\multinamedelim} -\renewcommand*\relateddelim{\addnbspace\textendash\addspace} -\newcommand*{\volnumdelim}{\addcomma} -\newcommand*{\yearnumdelim}{\addslash} -\newcommand*{\jourvoldelim}{\addnbspace} %----------------------- \DeclareBibliographyAlias{collection}{book} \DeclareBibliographyAlias{reference}{book} @@ -269,7 +275,7 @@ \DeclareBibliographyAlias{manual}{book} %----------------------- -\DeclareSortingScheme{nyt}{ +\DeclareSortingTemplate{nyt}{ \sort{ \field{presort} } @@ -300,8 +306,8 @@ } } %----------------------- -\DeclareSortingScheme{shortseries}{\sort{\field{shortseries}}} -\DeclareSortingScheme{shortjournal}{\sort{\field{shortjournal}}} +\DeclareSortingTemplate{shortseries}{\sort{\field{shortseries}}} +\DeclareSortingTemplate{shortjournal}{\sort{\field{shortjournal}}} %----------------------- \defbibcheck{shortseries}{% \iffieldundef{shortseries}% @@ -333,10 +339,12 @@ \DeclareNameAlias{translator}{author} \DeclareNameAlias{bytranslator}{default} \DeclareNameAlias{bycommentator}{author} +\DeclareNameAlias{bookauthor}{author} + %----------------------- \DeclareListFormat{location}{% #1\ifthenelse{\value{listcount}<\value{liststop}}% - {\orttrennzeichen}% + {\locationdelim}% {}% } %----------------------- @@ -499,7 +507,8 @@ \ifentrytype{review}% }% {}% - {\printtext{\bibstring{in}\intitlepunct}}} + {\setunit{\isdot\addcomma\addspace}% + \printtext{\bibstring{in}\intitlepunct}}} %----------------------- \renewbibmacro*{pageref}{% \iflistundef{pageref} @@ -576,6 +585,10 @@ \clearname{editor}}% {}} %----------------------- +\newbibmacro*{bookauthor}{% + \printnames{bookauthor}% + \newunit} +%----------------------- \DeclareLabeldate{% \field{date} \field{year} @@ -682,25 +695,20 @@ \clearfield{maintitleaddon}% }% {\iffieldundef{maintitle}% - {}% - {\usebibmacro{maintitle}}% - \iffieldundef{title}% + {}% + {\usebibmacro{maintitle}% + \usebibmacro{volume}% + \clearfield{volume}% + }% + \iffieldundef{title}% {}% {\usebibmacro{title}}% - \iffieldundef{volume}% - {\iffieldundef{volumes}% - {}% - {\printfield{volumes}% - \setunit*{\addspace}% - \bibstring{volumes}% - \setunit{\addspace}}}% - {\setunit{\addspace}% - \printfield{volume}% - \setunit*{\adddot\addspace}}% \ifbool{cbx:ancient}% - {\usebibmacro{translation}}% - {}% - }% + {\usebibmacro{translation}% + \usebibmacro{volume}% + }% + {}% + }% \newunit} %----------------------- \renewbibmacro{event+venue+date}{% @@ -723,9 +731,11 @@ \printfield[titlecase]{title}% \setunit{\subtitlepunct}% \printfield[titlecase]{subtitle}}% - \setunit{\subtitlepunct} }% - \printfield{titleaddon}% + \iffieldundef{titleaddon} + {\newunit} + {\setunit*{\subtitlepunct}% + \printfield{titleaddon}}% } %----------------------- \renewbibmacro*{booktitle}{% @@ -761,12 +771,10 @@ \newbibmacro*{edition}{% \iffieldint{edition}% {\setunit*{\addspace}% - \mkbibsuperscript{\printfield{edition}}}% + \mkbibsuperscript{\printfield{edition}}\kern -1pt}% {\newunit% - \printfield{edition}% - \setunit{\addspace}% - }% -} + \printfield{edition}% + \setunit{\addspace}}} %----------------------- \newbibmacro*{location+edition+year}{% \ifboolexpr{% @@ -782,7 +790,7 @@ \iffieldint{edition}% {\setunit{\addspace}}% {\newunit}% - \usebibmacro{edition}% + \usebibmacro{edition}% \usebibmacro{pubstate+year}% \setunit*{\addspace}% \ifboolexpr{% @@ -819,7 +827,7 @@ \iffieldundef{origyear}% {}% {\bibstring{reprint}% - \addspace% + \setunit*{\addspace}% }% }% \printlist{location}% @@ -833,7 +841,7 @@ \renewbibmacro*{institution+location+date}{% \printlist{location}% \printlist{institution}% - \setunit*{\space}% + \setunit*{\addspace}% \usebibmacro{pubstate+year}% } %----------------------- @@ -842,50 +850,52 @@ } %----------------------- \newbibmacro*{volume}{% - \iffieldundef{maintitle}% - {\printfield{volume}% - \newunit}% - {}% + \iffieldundef{volume}% + {\iffieldundef{volumes}% + {}% + {\printfield{volumes}% + \setunit*{\addspace}% + \bibstring{volumes}% + \setunit{\addspace}}}% + {\setunit{\addspace}% + \printfield{volume}% + \clearfield{volume}% + \iffieldundef{part} + {} + {\setunit{\addspace}% + \printfield{part}}% + }% + \newunit% } %----------------------- \renewbibmacro*{maintitle+booktitle}{% \iffieldundef{maintitle}% {}% {\usebibmacro{maintitle}% - \iffieldundef{volume}% - {\setunit{\maintitlepunct}}% - {\setunit{\addspace}% - \printfield{volume}% - \printfield{part}% - \setunit{\adddot\space}% - }% + \usebibmacro{volume}% + \setunit{\maintitlepunct} }% \usebibmacro{booktitle}% + \usebibmacro{volume}% \newunit% } %----------------------- \newbibmacro*{booktitle+volume+editor}{% - \ifnameundef{editor}% - {\usebibmacro{maintitle+booktitle}% - \setunit{\addspace}% - \usebibmacro{volume}% + \ifnameundef{editor}% + {\usebibmacro{bookauthor}% + \usebibmacro{maintitle+booktitle}% + \newunit% }% {\ifbool{bbx:edby}% - {\usebibmacro{booktitle}% - \setunit{\addspace}% - \usebibmacro{volume}% + {\usebibmacro{maintitle+booktitle}% \newunit% \bibstring{byeditor}% \setunit{\addspace}% \printnames{editor}% - }% - {\printnames{editor}% - \setunit*{\addspace}% - \printtext[parens]{\bibstring{editor}}% + }% + {\usebibmacro{editor}% \newunit\newblock% \usebibmacro{maintitle+booktitle}% - \setunit{\addspace}% - \usebibmacro{volume}% \newunit% }% }% diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx index 1db43dfd623..6bf89ec1b7a 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx @@ -20,6 +20,7 @@ %\renewcommand*{\multicitedelim}{\addsemicolon\addspace} \newcommand*{\labelyeardelim}{\addspace} %\renewcommand{\textcitedelim}{\addcomma\space} +\renewcommand*{\iffinalcitedelim}{\iflastcitekey} \renewcommand{\postnotedelim}{% \ifboolexpr{% bool {cbx:ancient}% @@ -258,7 +259,7 @@ \newbibmacro*{cite:year}{% \iffieldundef{labelyear}% {}% - {\printtext[citeyear]{\usebibmacro{cite:labelyear+extrayear}}}% + {\printtext[citeyear]{\usebibmacro{cite:labelyear+extradate}}}% } %----------------------- \newbibmacro*{cite:lexikon}{% @@ -311,7 +312,7 @@ \iffieldundef{shorthand}% {\iffieldundef{labelyear}% {\usebibmacro{cite:label}}% - {\usebibmacro{cite:labelyear+extrayear}}}% + {\usebibmacro{cite:labelyear+extradate}}}% {\usebibmacro{cite}}} %----------------------- \newbibmacro*{textcite}{% @@ -324,7 +325,7 @@ \ifnumequal{\value{citecount}}{1}% {\usebibmacro{prenote}}% {}% - \usebibmacro{cite:labelyear+extrayear}}% + \usebibmacro{cite:labelyear+extradate}}% {\usebibmacro{cite}}}% {\printnames{labelname}% \setunit{% @@ -347,7 +348,7 @@ {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}% {\printtext[bibhyperref]{\printfield{label}}}} %----------------------- -\newbibmacro*{cite:labelyear+extrayear}{% +\newbibmacro*{cite:labelyear+extradate}{% \iffieldundef{labelyear} {} {\printtext[bibhyperref]{% @@ -358,7 +359,7 @@ \iffieldnums{labelyear}% {\mkyearzeros{\thefield{labelyear}}}% {\printfield{labelyear}}% - \printfield{extrayear}% + \printfield{extradate}% \iffieldsequal{labeldateera}{labelenddateera}{}% {\dateeraprint{labelyear}}% \dateuncertainprint% @@ -415,16 +416,16 @@ \renewcommand*{\finalnamedelim}{% \ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}% \addspace\bibstring{and}\space}% - \usebibmacro{prenote}% }% {\usebibmacro{citeindex}% \iffirstcitekey% {\setcounter{textcitetotal}{1}}% {\stepcounter{textcitetotal}% - \textcitedelim}% + \textcitedelim% + \usebibmacro{prenote}}% \ifbool{cbx:seenote}{\usebibmacro{cite:seenote}}% {\usebibmacro{textcite}}}% - {\ifbool{cbx:parens}% + {\ifbool{cbx:yearinparens}% {\bibcloseparen\global\boolfalse{cbx:yearinparens}}% {}}% {\ifbool{cbx:seenote}{\usebibmacro{postnote}}% @@ -465,14 +466,10 @@ {\multicitedelim} {\usebibmacro{postnote}} %----------------------- -\DeclareMultiCiteCommand{\cites}% - {\cite}{\multicitedelim}% -\DeclareMultiCiteCommand{\parencites}[\mkbibparens]% - {\parencite}{\multicitedelim}% -\DeclareMultiCiteCommand{\textcites}% - {\textcite}{\textcitedelim} -\DeclareMultiCiteCommand{\smartcites} - [\iffootnote\textnormal\mkbibfootnote]{\smartcite}{\multicitedelim} +\DeclareMultiCiteCommand{\cites}{\cite}{\multicitedelim} +\DeclareMultiCiteCommand{\parencites}[\mkbibparens]{\parencite}{\multicitedelim} +\DeclareMultiCiteCommand{\textcites}{\textcite}{} +\DeclareMultiCiteCommand{\smartcites}[\iffootnote\textnormal\mkbibfootnote]{\smartcite}{\multicitedelim} %----------------------- \DeclareCiteCommand{\citeauthor} {\boolfalse{citetracker}% @@ -585,5 +582,20 @@ {\multicitedelim}% {\usebibmacro{postnote}}% +\DeclareCiteCommand{\citetitle*} % + {\boolfalse{citetracker}% + \boolfalse{pagetracker}% + \usebibmacro{prenote}}% + {\ifboolexpr{ + bool{bbx:inreferences} + and + test{\ifentrytype{inreference}}} + {\printtext}% + {\printtext[bibhyperref]}{% + \ifbool{cbx:ancient}{\printtext[emph]{\usebibmacro{cite:title}}}% + {\printtext[emph]{\usebibmacro{cite:title}}}}}% + {\multicitedelim}% + {\usebibmacro{postnote}}% + \endinput %% End of file `archaeologie.cbx'. \ 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 new file mode 100644 index 00000000000..413971f3d06 --- /dev/null +++ b/Master/texmf-dist/tex/latex/archaeologie/english-archaeologie.lbx @@ -0,0 +1,52 @@ +% archaeologie --% +% biblatex for archaeologists, +% historians and philologists +% Copyright (c) 2017 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. +% The latest version of this license is in +% 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}% + [\arch@lbxid] +\InheritBibliographyExtras{english} + +\NewBibliographyString{origtitle} +\NewBibliographyString{firstprint} +\NewBibliographyString{reference} +\NewBibliographyString{talk} +\NewBibliographyString{editor} +\NewBibliographyString{subvoce} +\NewBibliographyString{owntranslation} + + +\DeclareBibliographyStrings{% + inherit = {english}, + subvoce = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}}, + reference = {{Article}{Art\adddot}}, + origtitle = {{original title}{orig\adddot title}}, + firstprint = {{first\addspace edition}{first\addspace edition}}, + talk = {{talk}{talk}}, + fromamerican = {{from\addspace American} {from\addspace American}}, + frombrazilian = {{from\addspace Brazilian}{from\addspace Brazilian}}, + fromcroatian = {{from\addspace Croatian}{from\addspace Croatian}}, + fromdanish = {{from\addspace Danish}{from\addspace Danish}}, + fromdutch = {{from\addspace Dutch}{from\addspace Dutch}}, + fromenglish = {{from\addspace English}{from\addspace English}}, + fromfinnish = {{from\addspace Finnish}{from\addspace Finnish}}, + fromfrench = {{from\addspace French}{from\addspace French}}, + fromgerman = {{from\addspace German} {from\addspace German}}, + fromgreek = {{from\addspace Greek}{from\addspace Greek}}, + fromitalian = {{from\addspace Italian}{from\addspace Italian}}, + fromlatin = {{from\addspace Latin}{from\addspace Latin}}, + fromnorwegian = {{from\addspace Norwegian}{from\addspace Norwegian}}, + fromportuguese = {{from\addspace Portuguese}{from\addspace Portuguese}}, + fromrussian = {{from\addspace Russian}{from\addspace Russian}}, + fromspanish = {{from\addspace Spanish}{from\addspace Spanish}}, + fromswedish = {{from\addspace Swedish}{from\addspace Swedish}}, + owntranslation = {{own\addspace trans\adddot}{own\addspace translation}}, +} +\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 new file mode 100644 index 00000000000..f66b1a9096f --- /dev/null +++ b/Master/texmf-dist/tex/latex/archaeologie/french-archaeologie.lbx @@ -0,0 +1,57 @@ +% archaeologie --% +% biblatex for archaeologists, +% historians and philologists +% Copyright (c) 2017 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. +% The latest version of this license is in +% 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-french.lbx}% + [\arch@lbxid] +\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}, + subvoce = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}}, + translationof = {{traduction\addspace de}{trad\adddot\addspace de}}, + reference = {{article}{art\adddot}}, + reviewof = {{recension\addspace de}{rec\adddot\addspace de}}, + origtitle = {{titre original}{titre orig.\adddot}}, + firstprint = {{première\addspace édition}{première\addspace éd\adddot}}, + talk = {{conférence}{conf.}}, + fromamerican = {{depuis\addspace l'anglais américain} {depuis\addspace l'anglais américain}}, + frombrazilian = {{depuis\addspace le\addspace brésilien}{depuis\addspace le\addspace brésilien}}, + fromcroatian = {{depuis\addspace le\addspace croatien}{depuis\addspace le\addspace croatien}}, + fromdanish = {{depuis\addspace le\addspace danois}{depuis\addspace le\addspace danois}}, + fromdutch = {{depuis\addspace le\addspace néerlandais}{depuis\addspace le\addspace néerlandais}}, + fromenglish = {{depuis\addspace l'anglais}{depuis l'anglais}}, + fromfinnish = {{depuis\addspace Finnish}{depuis\addspace le\addspace Finnish}}, + fromfrench = {{depuis\addspace le\addspace français}{depuis\addspace le\addspace français}}, + fromgerman = {{depuis\addspace l'allemand} {depuis\addspace l'allemand}}, + fromgreek = {{depuis\addspace le\addspace grec}{depuis\addspace le\addspace grec}}, + fromitalian = {{depuis\addspace l'italien}{depuis l'italien}}, + fromlatin = {{depuis\addspace le\addspace latin}{depuis\addspace le\addspace latin}}, + fromnorwegian = {{depuis\addspace le\addspace norvégien}{depuis\addspace le\addspace norvégien}}, + fromportuguese = {{depuis\addspace le\addspace portugais}{depuis\addspace le\addspace portugais}}, + fromrussian = {{depuis\addspace le\addspace russe}{depuis\addspace le\addspace russe}}, + fromspanish = {{depuis\addspace l'espagnole}{depuis\addspace l'espagnol}}, + fromswedish = {{depuis\addspace le\addspace suédois}{depuis\addspace le\addspace suédois}}, + owntranslation = {{??}{??}},% FIX ME! +} \ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/archaeologie/german-archaeologie.lbx b/Master/texmf-dist/tex/latex/archaeologie/german-archaeologie.lbx new file mode 100644 index 00000000000..da9d1243e2c --- /dev/null +++ b/Master/texmf-dist/tex/latex/archaeologie/german-archaeologie.lbx @@ -0,0 +1,43 @@ +% archaeologie --% +% biblatex for archaeologists, +% historians and philologists +% Copyright (c) 2017 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. +% The latest version of this license is in +% 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}% + [\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}, + subvoce = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}}, + reference = {{Artikel}{Art\adddot}}, + reviewof = {{Rezension\addspace zu}{Rez\adddot\addabthinspace zu}}, + origtitle = {{Originaltitel}{Orig\adddot titel}}, + firstprint = {{Erstauflage}{Erstaufl\adddot}}, + talk = {{Vortrag}{Vortrag}}, + 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}}, + } +\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 new file mode 100644 index 00000000000..aca0683694b --- /dev/null +++ b/Master/texmf-dist/tex/latex/archaeologie/italian-archaeologie.lbx @@ -0,0 +1,51 @@ +% archaeologie --% +% biblatex for archaeologists, +% historians and philologists +% Copyright (c) 2017 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. +% The latest version of this license is in +% 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-italian.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}, + subvoce = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}}, + translationof = {{traduzione\addspace di}{trad\adddot\addabthinspace di}}, + reference = {{articolo}{art\adddot}}, + reviewof = {{recensione\addspace di}{recens\adddot\addabthinspace di}}, + origtitle = {{titolo\addspace originale}{titolo\addspace orig\adddot}}, + firstprint = {{prima\addspace edizione}{prima\addspace edizione}}, + talk = {{presentazione}{presentazione}}, + inpreparation = {{in\addspace preparazione}{in prep\adddot}}, + submitted = {{}{}},% FIX ME! + 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! +} +\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 new file mode 100644 index 00000000000..89daf2c73c1 --- /dev/null +++ b/Master/texmf-dist/tex/latex/archaeologie/spanish-archaeologie.lbx @@ -0,0 +1,35 @@ +% archaeologie --% +% biblatex for archaeologists, +% historians and philologists +% Copyright (c) 2017 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. +% The latest version of this license is in +% 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-spanish.lbx}% + [\arch@lbxid] + +\InheritBibliographyExtras{spanish} + +\NewBibliographyString{origtitle} +\NewBibliographyString{firstprint} +\NewBibliographyString{reference} +\NewBibliographyString{talk} +\NewBibliographyString{subvoce} +\NewBibliographyString{owntranslation} + +\DeclareBibliographyStrings{% + inherit = {spanish}, + 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! +} +\endinput \ No newline at end of file -- cgit v1.2.3