From 01bb97b7cce21d16ac4b2b953469cd66236d58a2 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 3 Dec 2015 22:46:11 +0000 Subject: archaeologie (3dec15) git-svn-id: svn://tug.org/texlive/trunk@39008 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/archaeologie/README.md | 3 +- .../doc/latex/archaeologie/antike-corpora.bib | 367 +++++++++++++++++++++ .../doc/latex/archaeologie/archaeologie.pdf | Bin 289267 -> 299120 bytes .../doc/latex/archaeologie/dai-abkuerzungen.bib | 4 +- .../latex/archaeologie/archaeologie-english.lbx | 4 +- .../latex/archaeologie/archaeologie-ngerman.lbx | 4 +- .../tex/latex/archaeologie/archaeologie.bbx | 106 ++++-- .../tex/latex/archaeologie/archaeologie.cbx | 3 +- 8 files changed, 457 insertions(+), 34 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/archaeologie/antike-corpora.bib diff --git a/Master/texmf-dist/doc/latex/archaeologie/README.md b/Master/texmf-dist/doc/latex/archaeologie/README.md index 251b5678b2b..221641a8b21 100644 --- a/Master/texmf-dist/doc/latex/archaeologie/README.md +++ b/Master/texmf-dist/doc/latex/archaeologie/README.md @@ -1,7 +1,7 @@ ##################################### ## bibLaTeX-archaeologie ## ##################################### -Version: [2015/11/11 v1.21] +Version: 1.22 [2015/12/06] archaeologie: biblatex fuer Archaeologen, Historiker und Philologen (Deutsch und Englisch) @@ -30,6 +30,7 @@ Zum Stil gehören: - archaeologie-ngerman.lbx - archaeologie-english.lbx - dai-abkuerzungen.bib +- antike-corpora.bib This work may be distributed and/or modified under the diff --git a/Master/texmf-dist/doc/latex/archaeologie/antike-corpora.bib b/Master/texmf-dist/doc/latex/archaeologie/antike-corpora.bib new file mode 100644 index 00000000000..944bdc57821 --- /dev/null +++ b/Master/texmf-dist/doc/latex/archaeologie/antike-corpora.bib @@ -0,0 +1,367 @@ +% archaeologie --% +% biblatex fuer Archaeologen, Historiker und Philologen +% Copyright (c) 2015 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. +@Book{ABV, + Title = {Attic Black-figure Vase-painters}, + Author = {Beazley, J. D.}, + Location = {Oxford}, + Year = {1956}, + + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = ABV-kurz +} +@Book{AE, + Title = AE-lang, + + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = AE-kurz +} +@Reference{AHw, + Title = {Akkadisches Handwörterbuch}, + Location = {Wiesbaden}, + Year = {1965--1981}, + + Author = {von Soden, W.}, + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = AHw-kurz +} +@Book{ARV2, + Title = {Attic Red-figure Vase-painters}, + Author = {Beazley, J. D.}, + Location = {Oxford}, + Year = {1963}, + + Edition = {2}, + + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = ARV2-kurz +} +@Reference{CAD, + Title = CAD-lang, + + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = CAD-kurz +} + +@Book{CIL, + Title = CIL-lang, + + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = CIL-kurz +} +@Reference{DACL, + Title = DACL-lang, + + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = DACL-kurz +} +@Reference{Daremberg-Saglio, + Title = Daremberg-Saglio-lang, + + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = Daremberg-Saglio-kurz +} +@Reference{DNP, + Title = DNP-lang, + + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = DNP-kurz +} +@Reference{EAA, + Title = EAA-lang, + + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = EAA-kurz +} +@Reference{FGrHist, + Title = {Die Fragmente der griechischen Historiker}, + + Author = {Felix Jacoby}, + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = FGrHist-kurz +} +@Reference{FHG, + Title = FHG-lang, + + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = FHG-kurz +} +@Reference{FR, + Title = {Griechische Vasenmalerei}, + Location = {München}, + Year = {1900--1925}, + + Author = {Adolph Furtwängler and Karl Reichhold}, + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = FR-kurz +} +@Reference{HAW, + Title = HAW-lang, + + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = HAW-kurz +} +@Reference{HdArch, + Title = HdArch-lang, + + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = HdArch-kurz +} +@Reference{Head, + Title = {Historia Numorum}, + Edition = {2}, + Location = {Oxford}, + Subtitle = {A Manual of Greek Numismatics}, + Year = {1911}, + + Author = {Head, B. V.}, + Keywords = {Sigel}, + Options = {corpus}, + Origyear = {1887}, + Shorthand = Head-kurz +} +@Reference{Helbig, + Title = {Führer durch die öffentlichen Sammlungen klassischer Altertümer in Rom}, + + Author = {Helbig, W.}, + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = Helbig-kurz +} +@Reference{IG, + Title = IG-lang, + + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = IG-kurz +} +@Reference{IGR, + Title = IGR-lang, + + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = IGR-kurz +} +@Reference{IK, + Title = IK-lang, + + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = IK-kurz +} +@Book{ILS, + Title = {Inscriptiones Latinae selectae}, + Editor = {Dessau, Hermann}, + Location = {Berlin}, + Year = {1892--1916}, + + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = ILS-kurz +} +@Reference{LAe, + Title = LAe-lang, + + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = LAe-kurz +} +@Reference{Liddell-Scott-Jones, + Title = Liddell-­Scott-Jones-lang, + + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = Liddell-­Scott-Jones-kurz, +} +@Reference{LIMC, + Title = LIMC-lang, + + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = LIMC-kurz +} +@Reference{LTUR, + Title = LTUR-lang, + + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = LTUR-kurz +} +@Reference{PIR, + Title = PIR-lang, + + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = PIR-kurz +} +@Reference{PPM, + Title = {Pompei}, + Subtitle = {Pitture e Mosaici}, + Volume = {1-9}, + Year = {1990--2000}, + + Author = {Ida Baldassare and T. Lanzillotta and S. Salomi}, + Keywords = {Sigel}, + Options = {corpus}, + Shorthand =PPM-kurz, +} +@Reference{PPP, + Title = {Pitture e Pavimenti di Pompei}, + Volume = {1-3}, + Year = {1981--1985}, + + Author = {Irene Bragantini and Marietta de Vos and Franca Parise Badoni}, + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = {PPP} +} +@Reference{RAC, + Title = RAC-lang, + + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = RAC-kurz +} +@Reference{RBK, + Title = RBK-lang, + + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = RBK-kurz +} +@Reference{RE, + Title = RE-lang, + + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = RE-kurz +} +@Reference{RES, + Title = {Répertoire d’épigraphie sémitique}, + Location = {Paris}, + Year = {1900–1950}, + + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = RES-kurz +} +@Reference{RIA, + Title = RIA-lang, + + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = RIA-kurz +} +@Reference{RIC, + Title = {The Roman Imperial Coinage}, + + Author = {H. Mattingly and E. A. Sydenham}, + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = RIC-kurz +} +@Reference{RoscherML, + Title = {Ausführliches Lexikon der griechischen und römischen Mythologie}, + + Author = {Roscher, W. H.}, + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = RoscherML-kurz +} +@Reference{RPC, + Title = RPC-lang, + + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = RPC-kurz +} +@Reference{RRC, + Title = {Roman Republican Coinage}, + Location = {London}, + Year = {1974}, + + Author = {Crawford, M.}, + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = RRC-kurz +} +@Reference{SEG, + Title = SEG-lang, + + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = SEG-kurz +} +@Reference{SIG, + Title = {Sylloge inscriptionum Graecarum}, + Edition = {3}, + Location = {Leipzig}, + Year = {1915--1924}, + + Author = {Dittenberger, W.}, + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = SIG-kurz +} +@Reference{SNG, + Title = SNG-lang, + + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = SNG-kurz +} +@Reference{TAM, + Title = {Tituli Asiae Minoris}, + Editor = {Kalinka, E.}, + Location = {Wien}, + Year = {1901--1941}, + + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = TAM-kurz +} +@Reference{ThesCRA, + Title = ThesCRA-lang, + + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = ThesCRA-kurz +} +@Reference{Thieme-Becker, + Title = {Allgemeines Lexikon der bildenden Künstler}, + Editor = {U. Thieme and F. Becker}, + + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = Thieme-Becker-kurz +} +@Reference{TIB, + Title = TIB-lang, + + Keywords = {Sigel}, + Options = {corpus}, + Shorthand = TIB-kurz +} diff --git a/Master/texmf-dist/doc/latex/archaeologie/archaeologie.pdf b/Master/texmf-dist/doc/latex/archaeologie/archaeologie.pdf index 3e1f8a8867a..2335da75a74 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/dai-abkuerzungen.bib b/Master/texmf-dist/doc/latex/archaeologie/dai-abkuerzungen.bib index 37f112a0779..eb514b9ee2f 100644 --- a/Master/texmf-dist/doc/latex/archaeologie/dai-abkuerzungen.bib +++ b/Master/texmf-dist/doc/latex/archaeologie/dai-abkuerzungen.bib @@ -1115,7 +1115,7 @@ @String {MusRiv-kurz = {MusRiv}} @String {MusTusc-kurz = {MusTusc}} @String {MuzEvkSzeged-kurz = {MuzEvkSzeged}} - @String {MuzNa-kurz = {MuzNa}} + @String {MuzNat-kurz = {MuzNaţ}} @String {MuzPamKul-kurz = {MuzPamKul}} @String {NachrArbUWA-kurz = {NachrArbUWA}} @String {NapNobil-kurz = {NapNobil}} @@ -2729,7 +2729,7 @@ @String {MusRiv-lang = {Museo in rivista. Notiziario dei Musei civici di Pavia}} @String {MusTusc-lang = {Museum Tusculanum. København}} @String {MuzEvkSzeged-lang = {A Móra Ferenc múzeum évkönyve}} - @String {MuzNa-lang = {MuzeulnaionalBucureti}} + @String {MuzNat-lang = {Muzeul naţional. Bucureşti}} @String {MuzPamKul-lang = {Muzei i pametnici na kulturata}} @String {NachrArbUWA-lang = {Nachrichtenblatt Arbeitskreis Unterwasserarchäologie}} @String {NapNobil-lang = {Napoli nobilissima}} diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx index c7b5e2b51e8..2dea0eea013 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx @@ -11,8 +11,8 @@ % version 2005/12/01 or later. -\ProvidesFile{archaeologie_english.lbx}% - [2015/11/11 v1.2 archaeologie --% +\ProvidesFile{archaeologie-english.lbx}% + [2015/12/06 v1.22 archaeologie --% biblatex fuer Archaeologen, Historiker und Philologen, lbx-Datei] \InheritBibliographyExtras{english} diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx index ba231534c1f..f7ac1a4f6d1 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx @@ -11,8 +11,8 @@ % version 2005/12/01 or later. -\ProvidesFile{archaeologie_ngerman.lbx}% - [2015/11/11 v1.2 archaeologie --% +\ProvidesFile{archaeologie-ngerman.lbx}% + [2015/12/06 v1.22 archaeologie --% biblatex fuer Archaeologen, Historiker und Philologen, lbx-Datei] \InheritBibliographyExtras{ngerman} diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx index 516b36c3ad5..ef5dbca9baa 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx @@ -11,13 +11,13 @@ % version 2005/12/01 or later. \ProvidesFile{archaeologie.bbx}% - [2015/11/11 v1.2 archaeologie --% + [2015/12/06 v1.22 archaeologie --% biblatex fuer Archaeologen, Historiker und Philologen, bbx-Datei] \RequireBibliographyStyle{standard} \AtBeginDocument{% -%\urlstyle{same}% \urlstyle{sf}% -\typeout{* * * archaeologie * * * biblatex fuer Archaeologen, Historiker und Philologen}} +\typeout{* * * archaeologie * * * biblatex fuer Archaeologen, Historiker und Philologen} +} \ExecuteBibliographyOptions{% pagetracker=true,% firstinits=true, @@ -31,7 +31,6 @@ maxitems=1, maxbibnames=999,% }% - \addbibresource{dai-abkuerzungen.bib} %\addbibresource{antike-corpora.bib} % Version 2.0 @@ -124,6 +123,7 @@ maxitems=2, \renewcommand{\finentrypunct}{} \renewcommand{\multinamedelim}{\addnbspace\textendash\addspace} \renewcommand{\finalnamedelim}{\multinamedelim} +\renewcommand*\relateddelim{\addnbspace\textendash\addspace} \newcommand*{\volnumdelim}{\addslash} \newcommand*{\jourvoldelim}{\addnbspace} @@ -339,7 +339,7 @@ maxitems=2, }% {\printnames{editor}% \setunit{\addspace}% - \usebibmacro{editorstrg}% + \printtext[parens]{\bibstring{editor}} \clearname{editor}}% {}% } @@ -444,9 +444,10 @@ maxitems=2, \printfield{volumes}% \setunit*{\addspace}% \bibstring{volumes}% - \newunit}}% - {\printfield{volume}% - \setunit*{\addcolon\addspace}}}}}% + \setunit{\addspace}}}% + {\setunit{\addspace} + \printfield{volume}% + \setunit*{\adddot\addspace}}}}}% \iffieldundef{volumes}{% \usebibmacro{title}}{}% \newunit% @@ -462,20 +463,54 @@ maxitems=2, \newunit% } + \renewbibmacro*{title}{% - \ifboolexpr{test {\iffieldundef{title}} and% - test {\iffieldundef{subtitle}}}{}% + \ifboolexpr{ + test {\iffieldundef{title}} + and + test {\iffieldundef{subtitle}} + } + {} {\printtext[title]{% \printfield[titlecase]{title}% - \setunit*{\subtitlepunct}% + \setunit{\subtitlepunct}% \printfield[titlecase]{subtitle}}% - \iffieldundef{titleaddon}{% - \setunit*{\addspace}}% - {\setunit*{\subtitlepunct}}% - \ifentrytype{book}{\usebibmacro{volume}}{}}% - \newunit\printfield{titleaddon}\isdot% + \setunit{\subtitlepunct} + }% + \printfield{titleaddon}} + +\renewbibmacro*{booktitle}{% + \ifboolexpr{ + test {\iffieldundef{booktitle}} + and + test {\iffieldundef{booksubtitle}} + } + {} + {\printtext[booktitle]{% + \printfield[titlecase]{booktitle}% + \setunit{\subtitlepunct}% + \printfield[titlecase]{booksubtitle}}% + \setunit{\subtitlepunct} + }% + \printfield{booktitleaddon}} + +\renewbibmacro*{maintitle}{% + \ifboolexpr{ + test {\iffieldundef{maintitle}} + and + test {\iffieldundef{mainsubtitle}} } - + {} + {\printtext[maintitle]{% + \printfield[titlecase]{maintitle}% + \setunit{\subtitlepunct}% + \printfield[titlecase]{mainsubtitle}}% + \setunit{\subtitlepunct} + }% + \printfield{maintitleaddon}} + + + \newbibmacro*{Erstauflage}{% \bibstring{firstprint}% \setunit{\addcolon\addspace}% @@ -515,9 +550,7 @@ maxitems=2, \printtext[parens]{% \ifthenelse{\iffieldundef{origlocation}% \AND \NOT \iffieldundef{origyear}}% - {\printlist[][1-1]{location}}% - {\printlist[][1-1]{origlocation}}% - \setunit*{\addspace}% + {\printlist{origlocation}\setunit*{\addspace}}{}% \printfield{origyear}% \setunit*{\addsemicolon\addspace}% \iffieldundef{origyear}{}{\bibstring{reprint}}% @@ -539,15 +572,34 @@ maxitems=2, } \newbibmacro*{addendum}{} - +\renewbibmacro*{addendum+pubstate}{% + \printfield{addendum}% + \iffieldundef{\thefield{datelabesource}year}{} + {\newunit\newblock\printfield{pubstate}}} + \newbibmacro{signatur}{% \printfield{note}% } \newbibmacro*{volume}{% - \printfield{volume}\newunit% - } - + \iffieldundef{maintitle}{% + \printfield{volume}% + \newunit}% + {}% + } +\renewbibmacro*{maintitle+booktitle}{% + \iffieldundef{maintitle} + {} + {\usebibmacro{maintitle}% + \iffieldundef{volume} + {\setunit{\maintitlepunct}}% + {\setunit{\addspace} + \printfield{volume}% + \printfield{part}% + \setunit{\adddot\space}}}% + \usebibmacro{booktitle}% + \newunit} + \newbibmacro*{booktitle+volume+editor}{% \ifnameundef{editor}{% \usebibmacro{maintitle+booktitle}% @@ -760,7 +812,8 @@ maxitems=2, \usebibmacro{title}% \newunit\newblock% \usebibmacro{intranslation}% - \newunit\newblock% +\iffieldundef{title}{\setunit{\addspace}}% + {\newunit\newblock}% \usebibmacro{in:}% \usebibmacro{booktitle+volume+editor}% \setunit{\addspace}% @@ -794,9 +847,10 @@ maxitems=2, {\printfield{booktitle}% \setunit{\addspace}\printfield{volume}% \setunit{\addspace}\printfield[parens]{year}% - \setunit{\addspace} \usebibmacro{pages}% + \setunit{\addspace}\usebibmacro{pages}% \setunit{\addspace}\printtext{s\adddot\addnbthinspace v\adddot}% \setunit{\addspace}\printfield{title}% + \iffieldundef{number}{}{\setunit{\addspace}\printtext[brackets]{\printfield{number}}}% \setunit{\addspace}\printtext[parens]{% \c@uniquename=1% \printnames{labelname}}% diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx index fbb5e16c2ef..6998b86506e 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx @@ -11,7 +11,7 @@ % version 2005/12/01 or later. \ProvidesFile{archaeologie.cbx}% - [2015/11/11 v1.2 archaeologie --% + [2015/12/06 v1.22 archaeologie --% biblatex fuer Archaeologen, Historiker und Philologen, cbx-Datei] \ExecuteBibliographyOptions{% citetracker=true,% @@ -103,6 +103,7 @@ \iffieldundef{postnote}{\printfield{pages}}{\printfield{postnote}}% \setunit{\addspace}\printtext{s\adddot\addnbthinspace v\adddot}% \setunit{\addspace}\printfield{title}% + \iffieldundef{number}{}{\setunit{\addspace}\printtext[brackets]{\printfield{number}}}% \setunit{\addspace}\printtext[parens]{\c@uniquename=1 \printnames{labelname}}% } -- cgit v1.2.3