From 0536ca13912205612e4e32223b076f0e5b276262 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 30 Apr 2019 22:34:21 +0000 Subject: archaeologie (30apr19) git-svn-id: svn://tug.org/texlive/trunk@50908 c570f23f-e606-0410-a88d-b1316a301751 --- .../bib/archaeologie/archaeologie-bibancient.bib | 7 + .../bib/archaeologie/archaeologie-bibcorpora.bib | 7 + .../bib/archaeologie/archaeologie-examples.bib | 4 + .../bib/archaeologie/archaeologie-lstabbrv.bib | 23 +-- .../bib/archaeologie/archaeologie-lstlocations.bib | 9 +- .../archaeologie/archaeologie-lstpublishers.bib | 7 + Master/texmf-dist/doc/latex/archaeologie/Makefile | 60 ------ Master/texmf-dist/doc/latex/archaeologie/README.md | 26 ++- .../doc/latex/archaeologie/archaeologie.pdf | Bin 1205641 -> 1059841 bytes .../texmf-dist/source/latex/archaeologie/Makefile | 75 +++++++ .../source/latex/archaeologie/archaeologie.dtx | 221 ++++++++++++--------- .../source/latex/archaeologie/archaeologie.ins | 4 +- .../tex/latex/archaeologie/archaeologie.bbx | 74 ++++--- .../tex/latex/archaeologie/archaeologie.cbx | 8 +- .../tex/latex/archaeologie/archaeologie.dbx | 6 +- .../latex/archaeologie/english-archaeologie.lbx | 6 +- .../tex/latex/archaeologie/french-archaeologie.lbx | 6 +- .../tex/latex/archaeologie/german-archaeologie.lbx | 6 +- .../latex/archaeologie/italian-archaeologie.lbx | 6 +- .../latex/archaeologie/spanish-archaeologie.lbx | 6 +- 20 files changed, 323 insertions(+), 238 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/archaeologie/Makefile create mode 100644 Master/texmf-dist/source/latex/archaeologie/Makefile (limited to 'Master') diff --git a/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-bibancient.bib b/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-bibancient.bib index 2a44ac7fd71..b7090bac715 100644 --- a/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-bibancient.bib +++ b/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-bibancient.bib @@ -1,3 +1,9 @@ +%% Additional bibliography file +%% provided by biblatex-archaeologie +%% +%% +%% Encoding: UTF-8 +%% @book{Acc, title = {}, author = {}, shortauthor = {Accius}, shorthand = {Acc.}, options = {ancient}, keywords = {ancient}} @book{AchTat, title = {}, author = {}, shortauthor = {Achilleus Tatios}, shorthand = {Ach. Tat.}, options = {ancient}, keywords = {ancient}} @book{Ael:Ep, title = {Epistulae rusticae}, author = {Claudius Aelianus}, shortauthor = {Aelian}, shorthand = {Ael. Ep.}, options = {ancient}, keywords = {ancient}} @@ -594,3 +600,4 @@ @book{Zenob, title = {}, author = {}, shortauthor = {Zenobios}, shorthand = {Zenob.}, options = {ancient}, keywords = {ancient}} @book{Zenod, title = {}, author = {}, shortauthor = {Zenodotos}, shorthand = {Zenod.}, options = {ancient}, keywords = {ancient}} @book{Zos, title = {}, author = {}, shortauthor = {Zosimos}, shorthand = {Zos.}, options = {ancient}, keywords = {ancient}} +%% created by Lukas C. Bossert // digitales-altertum|de diff --git a/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-bibcorpora.bib b/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-bibcorpora.bib index ff20d7a9dc8..8a6d69d1027 100644 --- a/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-bibcorpora.bib +++ b/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-bibcorpora.bib @@ -1,3 +1,9 @@ +%% Additional bibliography file +%% provided by biblatex-archaeologie +%% +%% +%% Encoding: UTF-8 +%% @Book{ABV, author = {Beazley, J. D.}, title = {Attic Black-figure Vase-painters}, @@ -308,3 +314,4 @@ options = {corpus}, shorthand = LSJ-short, } +%% created by Lukas C. Bossert // digitales-altertum|de diff --git a/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-examples.bib b/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-examples.bib index 0157f7076c1..5ea150ee18f 100644 --- a/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-examples.bib +++ b/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-examples.bib @@ -1,3 +1,6 @@ +%% Additional bibliography file +%% provided by biblatex-archaeologie +%% %% %% Encoding: UTF-8 %% @@ -773,3 +776,4 @@ shorthand = {EAOR I--VII}, } +%% created by Lukas C. Bossert // digitales-altertum|de diff --git a/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-lstabbrv.bib b/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-lstabbrv.bib index 810099e93e9..334ddcb328f 100644 --- a/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-lstabbrv.bib +++ b/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-lstabbrv.bib @@ -1,20 +1,9 @@ -%%%%%%%%%%%%%%%%%%%% +%% Additional bibliography file +%% provided by biblatex-archaeologie %% -%% Liste der Abkürzungen für Zeitschriften, Reihen, -%% Lexika und häufig zitierte Werke %% -%%%%%%%%%%%%%%%%%%%% +%% Encoding: UTF-8 %% -%% Manche Kürzel konnten nicht genau umgesetzt werden. -%% Alle Umlaute, Akzente, etc. werden weggelassen, bzw. -%% geändert: "ü-> ue", etc. -%% Diese sind mit "*Abweichung!" gekennzeichnet -%% -%%%%%%%%%%%%%%%%%%%% -%% -%% Kurzname -%% -%%%%%%%%%%%%%%%%%%%% @String {AA-short = {AA}} @String {AAA-short = {AAA}} @String {AAcque-short = {AAcque}} @@ -1605,11 +1594,6 @@ @String {ZSav-short = {ZSav}} @String {ZSchwA-short = {ZSchwA}} @String {ZVerglSprF-short = {ZVerglSprF}} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% %% -%% Langname %% -%% %% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @String {AA = {Archäologischer Anzeiger}} @String {AAA = {Αρχαιολογικά Ανάλεκτα εξ Αθηνών}} @String {AAcque = {Archeologia delle acque. Rivista semestrale di antropologia, archeologia, etnografia, storia dell'acqua}} @@ -3205,3 +3189,4 @@ %% Stand April 2014, Deutsches Archäologisches Institut %% Bearbeitung: Lukas C. Bossert (2015) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% created by Lukas C. Bossert // digitales-altertum|de diff --git a/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-lstlocations.bib b/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-lstlocations.bib index 3dcc37dee5e..f85dbe6492f 100644 --- a/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-lstlocations.bib +++ b/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-lstlocations.bib @@ -1,4 +1,10 @@ -@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}{}}}}}}}} +%% Additional bibliography file +%% provided by biblatex-archaeologie +%% +%% +%% Encoding: UTF-8 +%% +@String{Aix-la-Chapelle= {\iflanguage{english}{Aix-la-Chapelle}{\iflanguage{italian}{Aquisgrana}{\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}{}}}}}}}} @@ -27,3 +33,4 @@ @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}{}}}}}}}} +%% created by Lukas C. Bossert // digitales-altertum|de diff --git a/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-lstpublishers.bib b/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-lstpublishers.bib index a6134644fce..96163b8e6bf 100644 --- a/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-lstpublishers.bib +++ b/Master/texmf-dist/bibtex/bib/archaeologie/archaeologie-lstpublishers.bib @@ -1,3 +1,9 @@ +%% Additional bibliography file +%% provided by biblatex-archaeologie +%% +%% +%% Encoding: UTF-8 +%% @String { AWi = {Artemis \& Winkler} } @String { CHB = {C.\ H.~Beck} } @String { COUP = {Cornell University Press} } @@ -28,3 +34,4 @@ @String { WBG = {Wissenschaftliche Buchgesellschaft} } @String { WdG = {Walter de Gruyter} } @String { YUP = {Yale University Press} } +%% created by Lukas C. Bossert // digitales-altertum|de diff --git a/Master/texmf-dist/doc/latex/archaeologie/Makefile b/Master/texmf-dist/doc/latex/archaeologie/Makefile deleted file mode 100644 index 60276c63277..00000000000 --- a/Master/texmf-dist/doc/latex/archaeologie/Makefile +++ /dev/null @@ -1,60 +0,0 @@ -MAKE = make -NAME = archaeologie -NAMEtypeout = $(CYAN)*** $(NAME) ***$(NC) -BIB = $(NAME) -PFX = biblatex- -SHELL = bash -PWD = $(shell pwd) -TEMP := $(shell mktemp -d -t tmp.XXXXXXXXXX) -TDIR = $(TEMP)/$(NAME) -VERS = $(shell /bin/date "+%Y-%m-%d---%H-%M-%S") -LOCAL = $(shell kpsewhich --var-value TEXMFLOCAL) -# Colors -RED = \033[0;31m -CYAN = \033[0;36m -NC = \033[0m - -.PHONY: all clean cleanall zip install uninstall -# Just create the PDF -all: $(NAME).pdf - @echo -e "$(NAMEtypeout)\n$(RED) * all up to date * $(NC)" - @exit 0 - -# How to create the PDF -$(NAME).pdf: $(NAME).dtx - latexmk -lualatex -f $(NAME).dtx - - -# clean all temporary files -clean: - rm -f {$(NAME),$(BIB)}.{sectionbibs.aux,thm,bibexample,biographies.aux,xdv,aux,mw,bbl,bcf,blg,doc,fdb_latexmk,fls,glo,gls,hd,idx,ilg,ind,listing,log,nav,out,run.xml,snm,synctex.gz,toc,vrb} - rm -f $(NAME).markdown.{in,lua,out} - rm -f *.{log,aux} - rm -rf _markdown_* - @echo -e "$(NAMEtypeout) \n $(RED)cleaned temp files $(NC)" - -# clean all files -cleanbundle: clean - rm -f *.{{b,c,d,l}bx,ins,pdf,zip,bib} - @echo -e "$(NAMEtypeout) \n $(RED)cleaned all files $(NC)" - -# zip files up for sending etc. -ctan: all - rm -f $(NAME)*.zip - mkdir $(TDIR) - cp $(NAME).{dtx,pdf} README.md Makefile $(TDIR) - cd $(TEMP); zip -Drq $(PWD)/$(NAME)-$(VERS).zip $(NAME) - @echo -e "$(NAMEtypeout) \n $(RED)files zipped $(NC)" - -# install in your local TEX folder -install: all - sudo mkdir -p $(LOCAL)/{tex,source,doc}/latex/$(PFX)$(NAME) - sudo cp $(NAME).{dtx,ins} $(LOCAL)/source/latex/$(PFX)$(NAME) - sudo cp $(BIB).{b,c,d}bx {english,german,italian,french,spanish}-$(NAME).lbx $(LOCAL)/tex/latex/$(PFX)$(NAME) - sudo cp $(NAME).pdf $(NAME)-*.bib $(LOCAL)/doc/latex/$(PFX)$(NAME) - sudo mktexlsr - @echo -e "$(NAMEtypeout) \n $(RED)all files installed$(NC)" - -uninstall: - sudo rm -r $(LOCAL)/{tex,source,doc}/latex/$(PFX)$(NAME) - sudo mktexlsr diff --git a/Master/texmf-dist/doc/latex/archaeologie/README.md b/Master/texmf-dist/doc/latex/archaeologie/README.md index 668e496ff5a..406a03a246a 100644 --- a/Master/texmf-dist/doc/latex/archaeologie/README.md +++ b/Master/texmf-dist/doc/latex/archaeologie/README.md @@ -4,7 +4,7 @@ bibLaTeX-__archaeologie__ Bundle bibLaTeX-style for archaeologists, historians and philologists. --- -Copyright (c) 2016-2018 Lukas C. Bossert +Copyright (c) 2016-2019 Lukas C. Bossert Copyright (c) 2015 Lukas C. Bossert | Johannes Friedl @@ -82,18 +82,35 @@ If you are using macOS you will be asked for your user account password for the Further options of this makefile are: * `clean`: deletes all unnecessary files -* `cleanbundle`: deletes all files except `.dtx`, `.pl`, `.md`. You will get the plain version of this bundle. +* `cleanbundle`: deletes all files except `.dtx`, `.md`. You will get the plain version of this bundle. This might be helpful if you send the bundle to someone else. * `ctan`: this will create a zip file which can be used to send to CTAN. +* `files`: will only create the files from the `.dtx`-scratch. * `uninstall`: will erase the locally installed files. This bundle is constantly updated. For hints, errors or suggestions use the GitHub repository [https://github.com/LukasCBossert/biblatex-archaeologie](https://github.com/LukasCBossert/biblatex-archaeologie). ## Changelog -All notable changes to this project will be documented in the README.md. +All notable changes to this project will be documented in the [README.md](https://github.com/LukasCBossert/biblatex-archaeologie/blob/master/README.md). This project **does not** adhere to [Semantic Versioning](http://semver.org/). The markdown syntax is inspired by the conventions proposed by [keepachangelog.com](http://keepachangelog.com/). +## v2.4.2 (2019-05-01) + +### *Fixed* +* Handling ranges of years for `inreferences` [see issue no. 150](https://github.com/LukasCBossert/biblatex-archaeologie/issues/150) + +### *Changed* +* Renaming `\labelnamepunct` to `\nametitledelim` (biblatex 3.12 compatibility) + +## v2.4.1 (2019-04-11) + +### *Fixed* +* some errors in the documentation + +### *Changed* +* default sorting template changed to `ndymdt`, as suggested in https://tex.stackexchange.com/a/46879/98739 [see issue no. 148](https://github.com/LukasCBossert/biblatex-archaeologie/issues/148) + ## v2.4.0 (2018-09-25) ### *Fixed* @@ -211,6 +228,3 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. ## v2.2 (2016-09-25) * *added*
`uniqueme` for variant translations of ancient works. * *added*
bibliography-file `archaeologie-examples.bib` included - -[current release]: http://www.biblatex-archaeologie.de -[unreleased]: http://github.com/LukasCBossert/biblatex-archaeologie diff --git a/Master/texmf-dist/doc/latex/archaeologie/archaeologie.pdf b/Master/texmf-dist/doc/latex/archaeologie/archaeologie.pdf index d2d92886546..f67d70e0870 100644 Binary files a/Master/texmf-dist/doc/latex/archaeologie/archaeologie.pdf and b/Master/texmf-dist/doc/latex/archaeologie/archaeologie.pdf differ diff --git a/Master/texmf-dist/source/latex/archaeologie/Makefile b/Master/texmf-dist/source/latex/archaeologie/Makefile new file mode 100644 index 00000000000..74ccd0fd0a9 --- /dev/null +++ b/Master/texmf-dist/source/latex/archaeologie/Makefile @@ -0,0 +1,75 @@ +MAKE = make +PROJECT = $(PFX)$(NAME) +NAME = archaeologie +NAMEtypeout = $(CYAN)*** $(NAME) ***$(NC) +BIB = $(NAME) +PFX = biblatex- +SHELL = bash +PWD = $(shell pwd) +TEMP := $(shell mktemp -d -t tmp.XXXXXXXXXX) +TDIR = $(TEMP)/$(NAME) +VERS = $(shell /bin/date "+%Y-%m-%d---%H-%M-%S") +LOCAL = $(shell kpsewhich --var-value TEXMFLOCAL) +# Colors +RED = \033[0;31m +CYAN = \033[0;36m +NC = \033[0m +echoPROJECT = @echo -e "$(CYAN) <$(PROJECT)>$(RED)" + +.PHONY: all clean cleanall zip install uninstall files +# Just create the PDF +all: $(NAME).pdf + @echo -e $(echoPROJECT) "* everything is up to date * $(NC)" + @exit 0 + +# How to create the PDF +$(NAME).pdf: $(NAME).dtx + latexmk -lualatex -f $(NAME).dtx + +# just create the files without pdf +files: $(NAME).ins + latex $(NAME).ins + +$(NAME).ins: + lualatex $(NAME).dtx + +# clean all temporary files +clean: + rm -f {$(NAME),$(BIB)}.{sectionbibs.aux,thm,bibexample,biographies.aux,xdv,aux,mw,bbl,bcf,blg,doc,fdb_latexmk,fls,glo,gls,hd,idx,ilg,ind,listing,log,nav,out,run.xml,snm,synctex.gz,toc,vrb} + rm -f $(NAME).markdown.{in,lua,out} + rm -f *.{log,aux} + rm -rf _markdown_* + $(echoPROJECT) "* cleaned temp files * $(NC)" + + +# clean all files +cleanbundle: clean + rm -f *.{{b,c,d,l}bx,ins,pdf,zip,bib} + $(echoPROJECT) "* cleaned all files * $(NC)" + + +# zip files up for sending etc. +ctan: all + rm -f $(NAME)*.zip + mkdir $(TDIR) + cp $(NAME).{dtx,pdf} README.md Makefile $(TDIR) + cd $(TEMP); zip -Drq $(PWD)/$(NAME)-$(VERS).zip $(NAME) + $(echoPROJECT) "* files zipped * $(NC)" + +# install in your local TEX folder +install: all + sudo mkdir -p $(LOCAL)/{tex,source,doc}/latex/$(PFX)$(NAME) + sudo mkdir -p $(LOCAL)/bibtex/bib/$(PFX)$(NAME) + sudo cp $(NAME).{dtx,ins} $(LOCAL)/source/latex/$(PFX)$(NAME) + sudo cp $(BIB).{b,c,d}bx {english,german,italian,french,spanish}-$(NAME).lbx $(LOCAL)/tex/latex/$(PFX)$(NAME) + sudo cp $(NAME).pdf $(LOCAL)/doc/latex/$(PFX)$(NAME) + sudo cp $(NAME)-*.bib $(LOCAL)/bibtex/bib/$(PFX)$(NAME) + sudo mktexlsr + $(echoPROJECT) "* all files installed * $(NC)" + + +uninstall: + sudo rm -r $(LOCAL)/{tex,source,doc}/latex/$(PFX)$(NAME) + sudo rm -r $(LOCAL)/bibtex/bib/$(PFX)$(NAME) + sudo mktexlsr + $(echoPROJECT) "* all files uninstalled * $(NC)" diff --git a/Master/texmf-dist/source/latex/archaeologie/archaeologie.dtx b/Master/texmf-dist/source/latex/archaeologie/archaeologie.dtx index ce0f705bd26..c75a565e3ed 100644 --- a/Master/texmf-dist/source/latex/archaeologie/archaeologie.dtx +++ b/Master/texmf-dist/source/latex/archaeologie/archaeologie.dtx @@ -1,7 +1,7 @@ %\iffalse %<*internal|bbx|cbx|dbx|lbx> -\def\archDate{2018/09/25} -\def\archVersion{2.4.0} +\def\archDate{2019/05/01} +\def\archVersion{2.4.2} % %<*internal> \iffalse @@ -46,10 +46,6 @@ \ProvidesFile{spanish-archaeologie.lbx} [\archVersion\space\archDate Spanish conventions required by the biblatex-archaeologie style] % -%<*doc> -\ProvidesFile{\jobname-german.tex} - [\archVersion\space\archDate Manual for users] -% %<*driver> \ProvidesFile{\jobname.dtx} [\archVersion\space\archDate Documentation of biblatex-archaeologie Bundle] @@ -68,7 +64,7 @@ bibLaTeX-__archaeologie__ Bundle bibLaTeX-style for archaeologists, historians and philologists. --- -Copyright (c) 2016-2018 Lukas C. Bossert +Copyright (c) 2016-2019 Lukas C. Bossert Copyright (c) 2015 Lukas C. Bossert | Johannes Friedl @@ -148,10 +144,16 @@ The current maintainer of this work is [Lukas C. Bossert](https://github.com/Luk % ▀ ██ ▀██ ██ ██ ██ ██ % ██████ ██ ██████ % */ -%<*bib&expl> +%<*bib> +%% Additional bibliography file +%% provided by biblatex-archaeologie +%% %% %% Encoding: UTF-8 %% +% +% +%<*bib&expl> @InCollection{Hoare1973, author = {Charles Antony Richard Hoare}, title = {Hints on programming language design}, @@ -994,7 +996,7 @@ See: http://www.latex-project.org/lppl.txt \endpreamble \postamble -Copyright (C) 2018 Lukas C. Bossert // digitales-altertum.de +Copyright (C) 2019 Lukas C. Bossert // digitales-altertum.de \endpostamble \usedir{tex/latex/\jobname} @@ -1051,6 +1053,7 @@ ngerman, english, ]{ltxdoc} \AtBeginDocument{ +\setlength{\textwidth}{370pt} \def\theCodelineNo{\color{codegray}\scriptsize\arabic{CodelineNo}\space} \def\MacroFont{\ttfamily\footnotesize} \def\AltMacroFont{\ttfamily\footnotesize} @@ -1059,6 +1062,7 @@ english, %\EnableCrossrefs \RecordChanges} + \RequirePackage{iftex} \ifPDFTeX \RequirePackage[utf8]{inputenc} @@ -1078,27 +1082,17 @@ english, \fi \listfiles \RequirePackage{libertine} -\defaultfontfeatures[AnonymousPro] - { - Extension = .ttf , - BoldFont = AnonymousPro-Bold , - ItalicFont = AnonymousPro-BoldItalic , - BoldItalicFont = AnonymousPro-Italic , - UprightFont = AnonymousPro-Regular , - } -\setmonofont[Scale= MatchLowercase]{AnonymousPro} -\setmainfont[Numbers = {Monospaced, OldStyle}]{Libertinus Serif} -%\setsansfont{Libertinus Sans} -\setmainfont[ -% Scale = 0.95, -% Numbers = {OldStyle}, - Numbers={Proportional,OldStyle}, -% BoldItalicFont = Gentium Book Basic Bold Italic, - Ligatures = TeX, - BoldFont={Gentium Basic Bold}, -% BoldFont = GenBasB, -% BoldFont={Gentium Basic Bold}, -]{Gentium Plus} +\setmainfont[% + Numbers = {OldStyle}, + % Scale = 0.90, + ]{TeXGyrePagella} +\setsansfont[% + Numbers = {OldStyle}, + % Scale = 0.90, + ]{TeXGyreAdventor} +\setmonofont[Scale=MatchLowercase]{TeXGyreCursor} + + \RequirePackage{xr-hyper} \RequirePackage{url} @@ -1143,7 +1137,7 @@ draft=false, ]{scrlayer-scrpage} \pagestyle{scrheadings} \clearscrheadfoot -\ihead{\normalfont\footnotesize \texttt{bib}\LaTeX-style \texttt{archaeologie \archaeologieversion} \copyright\ by Lukas C. Bossert (2015--2018) | Johannes Friedl (2015)}% +\ihead{\normalfont\footnotesize \texttt{bib}\LaTeX-style \texttt{archaeologie \archaeologieversion} \copyright\ by Lukas C. Bossert (2015--\the\year) | Johannes Friedl (2015)}% \rofoot{\normalfont\footnotesize \textbf{\sffamily \thepage}} \lofoot{\normalfont\footnotesize \href{http://www.biblatex-archaeologie.de}{biblatex-archaeologie.de}} @@ -1187,6 +1181,16 @@ draft=false, ]{tcolorbox} \lstMakeShortInline{|} +\lstset{% + % basicstyle = \linespread{0.7} + ,breaklines = true + ,breakatwhitespace + ,alsoletter=\\\{\}\*\[\]\- + ,showstringspaces=true + ,postbreak=\mbox{$\hookrightarrow$} + } + + \newtcblisting[ auto counter, list inside=bibexample, @@ -1396,7 +1400,7 @@ examplebox, pdfsubject = {This citation-style covers the citation and bibliography rules of the \DAI. Various options are available to change and adjust the outcome according to one's own preferences. The style is compatible with the English, German, Italian, Spanish and French languages, since all bibstrings used are defined in each language.},% - subject (PDF meta) - pdfauthor = {Lukas C. Bossert (2015-2018), Johannes Friedl (2015)}, % - author (PDF meta) + pdfauthor = {Lukas C. Bossert (2015--\the\year), Johannes Friedl (2015)}, % - author (PDF meta) pdfauthortitle = {}, pdfcopyright = {This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 @@ -1460,7 +1464,7 @@ examplebox, % */ \begin{document} \pdfbookmark[1]{Titlepage}{title} -\title{\texttt{archaeologie} -- \\\texttt{bib\LaTeX} for archaeologists\footnote{Also very handy for (ancient) History or Classics, too. +\title{\texttt{archaeologie} -- \\\texttt{bib\LaTeX} for archaeologists\footnote{Also very handy for scholars of (ancient) history or classics, too. For further information about the code visit \href{http://www.biblatex-archaeologie.de}{biblatex-archaeologie.de}: Comments and criticisms are welcome. We thank especially \href{https://tex.stackexchange.com/users/35864/moewe}{M. Wemheuer} and \href{https://tex.stackexchange.com/users/2478/herbert}{H. Voß} for their great help with the code.% @@ -1479,8 +1483,11 @@ We thank especially \href{https://tex.stackexchange.com/users/35864/moewe}{M. We \begin{abstract} \noindent This citation-style covers the citation and bibliography rules of the \DAI (DAI). Various options are available to change and adjust the outcome according to one's own preferences. -The style is compatible with the English, German, Italian, Spanish and French languages, since all |bibstrings| used are defined in each language. -\bigskip +The style is compatible with the English, German, Italian, Spanish and French languages, since all |bibstrings| used are defined in each language.\\ +\bigskip\\ +This package is dedicated to \emph{Johannes Friedl} +who inspired me to code, +helped establishing this biblatex-style and introduced me to GitHub and its world beyond. \end{abstract} @@ -1515,9 +1522,10 @@ If you are using macOS you will be asked for your user account password for the Further options of this makefile are: * `clean`: deletes all unnecessary files -* `cleanbundle`: deletes all files except `.dtx`, `.pl`, `.md`. You will get the plain version of this bundle. +* `cleanbundle`: deletes all files except `.dtx`, `.md`. You will get the plain version of this bundle. This might be helpful if you send the bundle to someone else. * `ctan`: this will create a zip file which can be used to send to CTAN. +* `files`: will only create the files from the `.dtx`-scratch. * `uninstall`: will erase the locally installed files. @@ -1525,7 +1533,7 @@ This bundle is constantly updated. For hints, errors or suggestions use the GitH ## Changelog -All notable changes to this project will be documented in the README.md. +All notable changes to this project will be documented in the [README.md](https://github.com/LukasCBossert/biblatex-archaeologie/blob/master/README.md). This project **does not** adhere to [Semantic Versioning](http://semver.org/). The markdown syntax is inspired by the conventions proposed by [keepachangelog.com](http://keepachangelog.com/). % @@ -2278,7 +2286,7 @@ An example with an |@Incollection| demonstrates the effect of this option: \end{bibexample} Without any option activated it will look like this: -\printbib[5em]{Mundt2015} +\printbib[6em]{Mundt2015} By activating |yearseries| it will change to: \begin{bibbox}{Mundt2015}\footnotesize @@ -3865,7 +3873,7 @@ urn = *@\marg{urn:xxx}@* \DescribeMacro{zenon} This eprint-form is especially designed for the OPAC (Online Public Access Catalogue) of the \DAI. All bibliographical entries in this OPAC can be referred to via this link. -You only need to insert the individual Zenon-number of the entry, e.\,g. \emph{http://zenon.dainst.org/Record/001371402} where \emph{001371402} is the individual number---cf. \cref{Osland2016,Wulf-Rheidt2013,Ganzert1984.Zanker2009}. +You only need to insert the individual Zenon-number of the entry, e.\,g. \emph{http://zenon.dainst.org/Record/001371402} where \emph{001371402} is the individual number---cf. \cref{Osland2016,Wulf-Rheidt2013,Ganzert1984,Zanker2009}. This option is set to |false| by default. \begin{code} @@ -4795,7 +4803,7 @@ Lexikon-der-Technik,Bergmann2015,LTUR} \begin{multicols}{3} \begin{description}\footnotesize -\item[Aix-la-Chapelle] <-- English\newline German: Aachen\newline Italian: \newline Spanish: Aquisgrán\newline French: Aix-la-Chapelle +\item[Aix-la-Chapelle] <-- English\newline German: Aachen\newline Italian: Aquisgrana \newline Spanish: Aquisgrán\newline French: Aix-la-Chapelle \item[Athens] <-- English\newline German: Athen\newline Italian: Atene\newline Spanish: Atenas\newline French: Athènes \item[Augsburg] <-- English\newline German: Augsburg\newline Italian: Augusta\newline Spanish: Ausburgo\newline French: Augsbourg \item[Basle] <-- English\newline German: Basel\newline Italian: Basilea\newline Spanish: Basilea\newline French: Basel @@ -8086,10 +8094,8 @@ To see the long forms of journal titles or series you have to switch on the opti \DocInput{\jobname.dtx} % \PrintChanges % \PrintIndex -% -%<*driver|doc> \end{document} -% +% % \fi % \iffalse % /* @@ -8100,6 +8106,23 @@ To see the long forms of journal titles or series you have to switch on the opti % ██ ██████ ██████ ██████ ██████ ██ ██ ███████ ██ ████ ██ % */ %<*readme> +## v2.4.2 (2019-05-01) + +### *Fixed* +* Handling ranges of years for `inreferences` [see issue no. 150](https://github.com/LukasCBossert/biblatex-archaeologie/issues/150) + +### *Changed* +* Renaming `\labelnamepunct` to `\nametitledelim` (biblatex 3.12 compatibility) + +## v2.4.1 (2019-04-11) + +### *Fixed* +* some errors in the documentation + +### *Changed* +* default sorting template changed to `ndymdt`, as suggested in https://tex.stackexchange.com/a/46879/98739 [see issue no. 148](https://github.com/LukasCBossert/biblatex-archaeologie/issues/148) + + ## v2.4.0 (2018-09-25) ### *Fixed* @@ -8224,9 +8247,6 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. ## v2.2 (2016-09-25) * *added*
`uniqueme` for variant translations of ancient works. * *added*
bibliography-file `archaeologie-examples.bib` included - -[current release]: http://www.biblatex-archaeologie.de -[unreleased]: http://github.com/LukasCBossert/biblatex-archaeologie % % /* % ██████ ██████ ██████ ███████ @@ -8256,7 +8276,7 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. language=auto,% bibencoding=utf8,% dateabbrev=false, % - sorting=nyt,% + sorting=ndymdt,% alldates=comp,% labeldateparts=true,% labeldate=year,% @@ -8537,7 +8557,7 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. \newcommand*{\jourvoldelim}{\addnbspace} \renewcommand{\finentrypunct}{%http://tex.stackexchange.com/a/14159/98739 \ifbool{bbx:counter}% - {\addspace$\vert$ \addspace\scshape% + {\addspace\vrule\addspace\scshape% \iflanguage{ngerman}% {wurde \ifnumequal{\value{citecounter}} {0} @@ -8775,7 +8795,7 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. \DeclareBibliographyAlias{mathesis}{thesis} %----------------------- -\DeclareSortingTemplate{nyt}{ +\DeclareSortingTemplate{ndymdt}{ \sort{ \field{presort} } @@ -8783,26 +8803,36 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. \field{sortkey} } \sort{ - \field{sortshorthand} - \field{shorthand} - \field{sortname} - \field{author} - \field{editor} - \field{translator} - \field{sorttitle} - \field{title} + \field{sortshorthand} + \field{shorthand} + \field{sortname} + \field{author} + \field{editor} + \field{translator} } - \sort{ + \sort[direction=ascending]{ \field{sortyear} \field{year} + \literal{9999} + } + \sort[direction=ascending]{ + \field[padside=left,padwidth=2,padchar=0]{month} + \literal{99} + } + \sort[direction=ascending]{ + \field[padside=left,padwidth=2,padchar=0]{day} + \literal{99} } \sort{ - \field{sorttitle} - \field{title} + \field{pubstate} } \sort{ - \field{volume} - \literal{0} + \field{sorttitle} + \field{title} + } + \sort[direction=ascending]{ + \field[padside=left,padwidth=4,padchar=0]{volume} + \literal{9999} } } %----------------------- @@ -9144,7 +9174,10 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. \setunit{\addspace}% \ifnameundef{author}% {} - {\printtext[parens]{\printnames[name:initials]{labelname}}}} + {\printtext[parens]{% + \ifbool{bbx:bibfullname} + {\printnames[author]{labelname}} + {\printnames[name:initials]{labelname}}}}} %----------------------- \newbibmacro*{maintitle+title+volumes}{% \iffieldsequal{maintitle}{title}% @@ -9158,7 +9191,8 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. \clearfield{volume}}% \iffieldundef{title}% {}% - {\usebibmacro{title}}% + {\setunit*{\maintitlepunct}% + \usebibmacro{title}}% \ifbool{cbx:ancient}% {\usebibmacro{translation}}% {\usebibmacro{volume}}}% @@ -9324,7 +9358,7 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. {}% {\usebibmacro{maintitle}% \usebibmacro{volume}% - \setunit{\maintitlepunct}}% + \setunit*{\maintitlepunct}}% \usebibmacro{booktitle}% \usebibmacro{volume}% \newunit @@ -9387,7 +9421,7 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author}% - \setunit*{\labelnamepunct}\newblock + \setunit*{\nametitledelim}\newblock \usebibmacro{title}% \newunit\newblock \usebibmacro{translation}% @@ -9412,7 +9446,7 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor}% - \setunit*{\labelnamepunct}\newblock + \setunit*{\nametitledelim}\newblock \usebibmacro{maintitle+title+volumes}% \newunit\newblock \ifbool{bbx:yearseries}% @@ -9443,7 +9477,7 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor}% - \setunit*{\labelnamepunct}\newblock + \setunit*{\nametitledelim}\newblock \usebibmacro{title}% \setunit{\addspace} \printtext[parens]{\printfield{type}% @@ -9465,7 +9499,7 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor}% - \setunit*{\labelnamepunct}\newblock + \setunit*{\nametitledelim}\newblock \usebibmacro{maintitle+title+volumes}% \usebibmacro{event+venue+date}% \setunit*{\addspace}% @@ -9495,7 +9529,7 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor}% - \setunit*{\labelnamepunct}\newblock + \setunit*{\nametitledelim}\newblock \usebibmacro{title}% \newunit\newblock \usebibmacro{intranslation}% @@ -9531,7 +9565,7 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor}% - \setunit*{\labelnamepunct}\newblock + \setunit*{\nametitledelim}\newblock \usebibmacro{title}% \newunit\newblock \bibstring{talk}% @@ -9558,7 +9592,7 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor}% - \setunit*{\labelnamepunct}\newblock + \setunit*{\nametitledelim}\newblock \usebibmacro{title}% \newunit\newblock \usebibmacro{intranslation}% @@ -9614,7 +9648,7 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor}% - \setunit*{\labelnamepunct}\newblock + \setunit*{\nametitledelim}\newblock \iffieldundef{title}% {}% {\usebibmacro{title}}% @@ -10075,7 +10109,7 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. \setunit{\addspace}% \printfield{volume}% \usebibmacro{edition}% - \printfield[parens]{year}% + \printtext[parens]{\printdate}% \setunit{\addspace}% \iffieldundef{postnote}% {\printfield{pages}}% @@ -10798,7 +10832,7 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. % \fi %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % \section{archaeologie-lstlocations.bib} % \begin{macrocode} -@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{Aix-la-Chapelle= {\iflanguage{english}{Aix-la-Chapelle}{\iflanguage{italian}{Aquisgrana}{\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}{}}}}}}}} @@ -10833,25 +10867,15 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. %<*abbrv> % \fi %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % \section{archaeologie-lstabbrv.bib} +% Liste der Abkürzungen für Zeitschriften, Reihen, +% Lexika und häufig zitierte Werke. +% Manche Kürzel konnten nicht genau umgesetzt werden. +% Alle Umlaute, Akzente, etc. werden weggelassen, bzw. +% geändert: "ü-> ue", etc. +% +% Diese sind mit "*Abweichung!" gekennzeichnet % \subsection{Short names} % \begin{macrocode} -%%%%%%%%%%%%%%%%%%%% -%% -%% Liste der Abkürzungen für Zeitschriften, Reihen, -%% Lexika und häufig zitierte Werke -%% -%%%%%%%%%%%%%%%%%%%% -%% -%% Manche Kürzel konnten nicht genau umgesetzt werden. -%% Alle Umlaute, Akzente, etc. werden weggelassen, bzw. -%% geändert: "ü-> ue", etc. -%% Diese sind mit "*Abweichung!" gekennzeichnet -%% -%%%%%%%%%%%%%%%%%%%% -%% -%% Kurzname -%% -%%%%%%%%%%%%%%%%%%%% @String {AA-short = {AA}} @String {AAA-short = {AAA}} @String {AAcque-short = {AAcque}} @@ -12445,11 +12469,6 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. % \end{macrocode} % \subsection{Long names} % \begin{macrocode} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% %% -%% Langname %% -%% %% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @String {AA = {Archäologischer Anzeiger}} @String {AAA = {Αρχαιολογικά Ανάλεκτα εξ Αθηνών}} @String {AAcque = {Archeologia delle acque. Rivista semestrale di antropologia, archeologia, etnografia, storia dell'acqua}} @@ -14050,6 +14069,7 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. % %<*corpora> % \fi +% \begin{macrocode} @Book{ABV, author = {Beazley, J. D.}, title = {Attic Black-figure Vase-painters}, @@ -14360,10 +14380,13 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. options = {corpus}, shorthand = LSJ-short, } +% \end{macrocode} % \iffalse % %<*ancient> % \fi +%\section{archaeologie-bibancient.bib} +% \begin{macrocode} @book{Acc, title = {}, author = {}, shortauthor = {Accius}, shorthand = {Acc.}, options = {ancient}, keywords = {ancient}} @book{AchTat, title = {}, author = {}, shortauthor = {Achilleus Tatios}, shorthand = {Ach. Tat.}, options = {ancient}, keywords = {ancient}} @book{Ael:Ep, title = {Epistulae rusticae}, author = {Claudius Aelianus}, shortauthor = {Aelian}, shorthand = {Ael. Ep.}, options = {ancient}, keywords = {ancient}} @@ -14960,7 +14983,9 @@ This update is also due to compatibility with `biblatex 3.8a`/`biber 2.8`. @book{Zenob, title = {}, author = {}, shortauthor = {Zenobios}, shorthand = {Zenob.}, options = {ancient}, keywords = {ancient}} @book{Zenod, title = {}, author = {}, shortauthor = {Zenodotos}, shorthand = {Zenod.}, options = {ancient}, keywords = {ancient}} @book{Zos, title = {}, author = {}, shortauthor = {Zosimos}, shorthand = {Zos.}, options = {ancient}, keywords = {ancient}} +% \end{macrocode} % \iffalse % % -% \fi +%%% created by Lukas C. Bossert // digitales-altertum|de +% \fi \ No newline at end of file diff --git a/Master/texmf-dist/source/latex/archaeologie/archaeologie.ins b/Master/texmf-dist/source/latex/archaeologie/archaeologie.ins index 06e899e1e7d..9f6aa470b66 100644 --- a/Master/texmf-dist/source/latex/archaeologie/archaeologie.ins +++ b/Master/texmf-dist/source/latex/archaeologie/archaeologie.ins @@ -58,7 +58,7 @@ See: http://www.latex-project.org/lppl.txt \endpreamble \postamble -Copyright (C) 2018 Lukas C. Bossert // digitales-altertum.de +Copyright (C) 2019 Lukas C. Bossert // digitales-altertum.de \endpostamble \usedir{tex/latex/\jobname} @@ -75,6 +75,6 @@ Copyright (C) 2018 Lukas C. Bossert // digitales-altertum.de } \endbatchfile %% -%% Copyright (C) 2018 Lukas C. Bossert // digitales-altertum.de +%% Copyright (C) 2019 Lukas C. Bossert // digitales-altertum.de %% %% End of file `archaeologie.ins'. diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx index 70055c3ca78..923e8a21950 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx @@ -13,8 +13,8 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\archDate{2018/09/25} -\def\archVersion{2.4.0} +\def\archDate{2019/05/01} +\def\archVersion{2.4.2} \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesFile{archaeologie.bbx} [\archVersion\space\archDate Base settings for bibliography style of biblatex-archaeologie] @@ -32,7 +32,7 @@ language=auto,% bibencoding=utf8,% dateabbrev=false, % - sorting=nyt,% + sorting=ndymdt,% alldates=comp,% labeldateparts=true,% labeldate=year,% @@ -301,7 +301,7 @@ \newcommand*{\jourvoldelim}{\addnbspace} \renewcommand{\finentrypunct}{%http://tex.stackexchange.com/a/14159/98739 \ifbool{bbx:counter}% - {\addspace$\vert$ \addspace\scshape% + {\addspace\vrule\addspace\scshape% \iflanguage{ngerman}% {wurde \ifnumequal{\value{citecounter}} {0} @@ -537,7 +537,7 @@ \DeclareBibliographyAlias{manual}{book} \DeclareBibliographyAlias{mathesis}{thesis} -\DeclareSortingTemplate{nyt}{ +\DeclareSortingTemplate{ndymdt}{ \sort{ \field{presort} } @@ -545,26 +545,36 @@ \field{sortkey} } \sort{ - \field{sortshorthand} - \field{shorthand} - \field{sortname} - \field{author} - \field{editor} - \field{translator} - \field{sorttitle} - \field{title} + \field{sortshorthand} + \field{shorthand} + \field{sortname} + \field{author} + \field{editor} + \field{translator} } - \sort{ + \sort[direction=ascending]{ \field{sortyear} \field{year} + \literal{9999} + } + \sort[direction=ascending]{ + \field[padside=left,padwidth=2,padchar=0]{month} + \literal{99} + } + \sort[direction=ascending]{ + \field[padside=left,padwidth=2,padchar=0]{day} + \literal{99} } \sort{ - \field{sorttitle} - \field{title} + \field{pubstate} } \sort{ - \field{volume} - \literal{0} + \field{sorttitle} + \field{title} + } + \sort[direction=ascending]{ + \field[padside=left,padwidth=4,padchar=0]{volume} + \literal{9999} } } \DeclareSortingTemplate{shortseries}{\sort{\field{shortseries}}} @@ -867,7 +877,10 @@ \setunit{\addspace}% \ifnameundef{author}% {} - {\printtext[parens]{\printnames[name:initials]{labelname}}}} + {\printtext[parens]{% + \ifbool{bbx:bibfullname} + {\printnames[author]{labelname}} + {\printnames[name:initials]{labelname}}}}} \newbibmacro*{maintitle+title+volumes}{% \iffieldsequal{maintitle}{title}% {\clearfield{maintitle}% @@ -880,7 +893,8 @@ \clearfield{volume}}% \iffieldundef{title}% {}% - {\usebibmacro{title}}% + {\setunit*{\maintitlepunct}% + \usebibmacro{title}}% \ifbool{cbx:ancient}% {\usebibmacro{translation}}% {\usebibmacro{volume}}}% @@ -1034,7 +1048,7 @@ {}% {\usebibmacro{maintitle}% \usebibmacro{volume}% - \setunit{\maintitlepunct}}% + \setunit*{\maintitlepunct}}% \usebibmacro{booktitle}% \usebibmacro{volume}% \newunit @@ -1090,7 +1104,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author}% - \setunit*{\labelnamepunct}\newblock + \setunit*{\nametitledelim}\newblock \usebibmacro{title}% \newunit\newblock \usebibmacro{translation}% @@ -1114,7 +1128,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor}% - \setunit*{\labelnamepunct}\newblock + \setunit*{\nametitledelim}\newblock \usebibmacro{maintitle+title+volumes}% \newunit\newblock \ifbool{bbx:yearseries}% @@ -1144,7 +1158,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor}% - \setunit*{\labelnamepunct}\newblock + \setunit*{\nametitledelim}\newblock \usebibmacro{title}% \setunit{\addspace} \printtext[parens]{\printfield{type}% @@ -1165,7 +1179,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor}% - \setunit*{\labelnamepunct}\newblock + \setunit*{\nametitledelim}\newblock \usebibmacro{maintitle+title+volumes}% \usebibmacro{event+venue+date}% \setunit*{\addspace}% @@ -1194,7 +1208,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor}% - \setunit*{\labelnamepunct}\newblock + \setunit*{\nametitledelim}\newblock \usebibmacro{title}% \newunit\newblock \usebibmacro{intranslation}% @@ -1229,7 +1243,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor}% - \setunit*{\labelnamepunct}\newblock + \setunit*{\nametitledelim}\newblock \usebibmacro{title}% \newunit\newblock \bibstring{talk}% @@ -1255,7 +1269,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor}% - \setunit*{\labelnamepunct}\newblock + \setunit*{\nametitledelim}\newblock \usebibmacro{title}% \newunit\newblock \usebibmacro{intranslation}% @@ -1309,7 +1323,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor}% - \setunit*{\labelnamepunct}\newblock + \setunit*{\nametitledelim}\newblock \iffieldundef{title}% {}% {\usebibmacro{title}}% @@ -1360,6 +1374,6 @@ and test {\iffieldsequal{#1dateera}{#2dateera}}}} %% -%% Copyright (C) 2018 Lukas C. Bossert // digitales-altertum.de +%% Copyright (C) 2019 Lukas C. Bossert // digitales-altertum.de %% %% End of file `archaeologie.bbx'. diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx index a483ecf3372..812e1472e6c 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx @@ -13,8 +13,8 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\archDate{2018/09/25} -\def\archVersion{2.4.0} +\def\archDate{2019/05/01} +\def\archVersion{2.4.2} \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesFile{archaeologie.cbx} [\archVersion\space\archDate Base settings for citation style of biblatex-archaeologie] @@ -386,7 +386,7 @@ \setunit{\addspace}% \printfield{volume}% \usebibmacro{edition}% - \printfield[parens]{year}% + \printtext[parens]{\printdate}% \setunit{\addspace}% \iffieldundef{postnote}% {\printfield{pages}}% @@ -669,6 +669,6 @@ {\usebibmacro{postnote}}% %% -%% Copyright (C) 2018 Lukas C. Bossert // digitales-altertum.de +%% Copyright (C) 2019 Lukas C. Bossert // digitales-altertum.de %% %% End of file `archaeologie.cbx'. diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx index e42cb4393cb..e17253d568c 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx @@ -13,8 +13,8 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\archDate{2018/09/25} -\def\archVersion{2.4.0} +\def\archDate{2019/05/01} +\def\archVersion{2.4.2} \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesFile{archaeologie.dbx} [\archVersion\space\archDate Bibliographical data model of biblatex-archaeologie] @@ -33,6 +33,6 @@ \DeclareDatamodelFields[type=field,datatype=verbatim]{eventdatelanguage} \DeclareDatamodelEntryfields[proceedings,inproceedings]{eventdatelanguage} %% -%% Copyright (C) 2018 Lukas C. Bossert // digitales-altertum.de +%% Copyright (C) 2019 Lukas C. Bossert // digitales-altertum.de %% %% End of file `archaeologie.dbx'. diff --git a/Master/texmf-dist/tex/latex/archaeologie/english-archaeologie.lbx b/Master/texmf-dist/tex/latex/archaeologie/english-archaeologie.lbx index f410f1332a2..d3e9df9c5d2 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/english-archaeologie.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/english-archaeologie.lbx @@ -13,8 +13,8 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\archDate{2018/09/25} -\def\archVersion{2.4.0} +\def\archDate{2019/05/01} +\def\archVersion{2.4.2} \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesFile{english-archaeologie.lbx} [\archVersion\space\archDate Generic English conventions required by the biblatex-archaeologie style] @@ -183,6 +183,6 @@ \endgroup} %% -%% Copyright (C) 2018 Lukas C. Bossert // digitales-altertum.de +%% Copyright (C) 2019 Lukas C. Bossert // digitales-altertum.de %% %% End of file `english-archaeologie.lbx'. diff --git a/Master/texmf-dist/tex/latex/archaeologie/french-archaeologie.lbx b/Master/texmf-dist/tex/latex/archaeologie/french-archaeologie.lbx index 93f28935784..b4f68229803 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/french-archaeologie.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/french-archaeologie.lbx @@ -13,8 +13,8 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\archDate{2018/09/25} -\def\archVersion{2.4.0} +\def\archDate{2019/05/01} +\def\archVersion{2.4.2} \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesFile{french-archaeologie.lbx} [\archVersion\space\archDate French conventions required by the biblatex-archaeologie style] @@ -56,6 +56,6 @@ owntranslation = {{??}{??}},% FIXME! } %% -%% Copyright (C) 2018 Lukas C. Bossert // digitales-altertum.de +%% Copyright (C) 2019 Lukas C. Bossert // digitales-altertum.de %% %% End of file `french-archaeologie.lbx'. diff --git a/Master/texmf-dist/tex/latex/archaeologie/german-archaeologie.lbx b/Master/texmf-dist/tex/latex/archaeologie/german-archaeologie.lbx index 79fb6231453..c86aebcd913 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/german-archaeologie.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/german-archaeologie.lbx @@ -13,8 +13,8 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\archDate{2018/09/25} -\def\archVersion{2.4.0} +\def\archDate{2019/05/01} +\def\archVersion{2.4.2} \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesFile{german-archaeologie.lbx} [\archVersion\space\archDate German conventions required by the biblatex-archaeologie style] @@ -38,6 +38,6 @@ } %% -%% Copyright (C) 2018 Lukas C. Bossert // digitales-altertum.de +%% Copyright (C) 2019 Lukas C. Bossert // digitales-altertum.de %% %% End of file `german-archaeologie.lbx'. diff --git a/Master/texmf-dist/tex/latex/archaeologie/italian-archaeologie.lbx b/Master/texmf-dist/tex/latex/archaeologie/italian-archaeologie.lbx index 2eb18a891f1..7ee396092fa 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/italian-archaeologie.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/italian-archaeologie.lbx @@ -13,8 +13,8 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\archDate{2018/09/25} -\def\archVersion{2.4.0} +\def\archDate{2019/05/01} +\def\archVersion{2.4.2} \NeedsTeXFormat{LaTeX2e}[2005/12/01] \InheritBibliographyExtras{italian} @@ -38,6 +38,6 @@ } %% -%% Copyright (C) 2018 Lukas C. Bossert // digitales-altertum.de +%% Copyright (C) 2019 Lukas C. Bossert // digitales-altertum.de %% %% End of file `italian-archaeologie.lbx'. diff --git a/Master/texmf-dist/tex/latex/archaeologie/spanish-archaeologie.lbx b/Master/texmf-dist/tex/latex/archaeologie/spanish-archaeologie.lbx index b9d17af4b97..4c1cf28d91c 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/spanish-archaeologie.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/spanish-archaeologie.lbx @@ -13,8 +13,8 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\archDate{2018/09/25} -\def\archVersion{2.4.0} +\def\archDate{2019/05/01} +\def\archVersion{2.4.2} \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesFile{spanish-archaeologie.lbx} [\archVersion\space\archDate Spanish conventions required by the biblatex-archaeologie style] @@ -33,6 +33,6 @@ owntranslation = {{??}{??}},% FIXME! } %% -%% Copyright (C) 2018 Lukas C. Bossert // digitales-altertum.de +%% Copyright (C) 2019 Lukas C. Bossert // digitales-altertum.de %% %% End of file `spanish-archaeologie.lbx'. -- cgit v1.2.3