summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-06-05 23:17:30 +0000
committerKarl Berry <karl@freefriends.org>2017-06-05 23:17:30 +0000
commitc29ed9d2ba784c0094c2eee64f10f0cd45f3a5b5 (patch)
tree83ef3e801f3d122a79acdfc703ef7a19b5d50ad4
parent683004f8a1d94fc432fd8104903a431e27bfba93 (diff)
archaeologie (30may17)
git-svn-id: svn://tug.org/texlive/trunk@44484 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/archaeologie/CHANGELOG.md7
-rw-r--r--Master/texmf-dist/doc/latex/archaeologie/README.md4
-rw-r--r--Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.pdfbin181422 -> 147271 bytes
-rw-r--r--Master/texmf-dist/doc/latex/archaeologie/archaeologie.pdfbin716878 -> 683180 bytes
-rw-r--r--Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx88
-rw-r--r--Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx16
6 files changed, 66 insertions, 49 deletions
diff --git a/Master/texmf-dist/doc/latex/archaeologie/CHANGELOG.md b/Master/texmf-dist/doc/latex/archaeologie/CHANGELOG.md
index d6ae14d4d2d..4b2be0d55a6 100644
--- a/Master/texmf-dist/doc/latex/archaeologie/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/archaeologie/CHANGELOG.md
@@ -6,6 +6,11 @@ The markdown syntax is inspired by the conventions proposed by [keepachangelog.c
## [unreleased]
+## v2.31 (2017-05-29) --> [current release]
+
+#### *fixed*
+* number after year in an article if there is no volume.
+* volume and title for ancient publications
## v2.3 (2017-02-27)
#### *fixed*
@@ -18,7 +23,7 @@ The markdown syntax is inspired by the conventions proposed by [keepachangelog.c
* more citation commands (`\smartcite`; `\autocite`; `\fullcite`; `\footfullcite`)
* support for `polyglossia`
-## v2.2b (2016-10-06) --> [current release]
+## v2.2b (2016-10-06)
* *typo* <br> documentation with new style
## v2.2 (2016-09-25)
diff --git a/Master/texmf-dist/doc/latex/archaeologie/README.md b/Master/texmf-dist/doc/latex/archaeologie/README.md
index 7506245ba75..2f36623a98a 100644
--- a/Master/texmf-dist/doc/latex/archaeologie/README.md
+++ b/Master/texmf-dist/doc/latex/archaeologie/README.md
@@ -5,7 +5,7 @@ bibLaTeX-__archaeologie__
bibLaTeX-style for archaeologists, historians and philologists.
---
-_2017/02/27 v2.3_
+_2017/05/29 v2.31_
Copyright (c) 2017 Lukas C. Bossert | Johannes Friedl
@@ -13,7 +13,7 @@ Copyright (c) 2017 Lukas C. Bossert | Johannes Friedl
* Website: [www.biblatex-archaeologie.de](http://www.biblatex-archaeologie.de)
This citation-style covers the citation and bibliography rules of
-the [__Deutsches Archäologisches Institut__ (DAI)](http://www.dainst.org/dai/meldungen).
+the [__German Archaeological Institute__ (DAI)](http://www.dainst.org/dai/meldungen).
Various options are available to change and adjust
the outcome according to one’s own preferences.
(German, English, Italian, French, Spanish)
diff --git a/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.pdf b/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.pdf
index b922168ebb7..e6aed9f54c5 100644
--- a/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.pdf
+++ b/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/archaeologie/archaeologie.pdf b/Master/texmf-dist/doc/latex/archaeologie/archaeologie.pdf
index 95a89ca6b40..3d1e1be16a5 100644
--- a/Master/texmf-dist/doc/latex/archaeologie/archaeologie.pdf
+++ b/Master/texmf-dist/doc/latex/archaeologie/archaeologie.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx
index cd9eadb3233..99b79ef0b09 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-02-27}
-\def\arch@version{2.3}
+\def\arch@date{2017-05-29}
+\def\arch@version{2.31}
\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)}
@@ -188,7 +188,7 @@
\DeclareFieldFormat{edition}{#1}
\DeclareFieldFormat{volumes}{#1}
\DeclareFieldFormat{volume}{#1}
-\DeclareFieldFormat[article]{date}{\iffieldundef{number}{#1}{#1\setunit{\yearnumdelim}\printfield{number}}}
+\DeclareFieldFormat[article]{date}{\iffieldundef{number}{#1}{\iffieldundef{volume}{#1\yearnumdelim\printfield{number}}{#1}}}
\DeclareFieldFormat[inreference]{number}{\mkbibbrackets{#1}}
\DeclareFieldFormat{parens}{\mkbibparens{#1}}
\DeclareFieldFormat{brackets}{\mkbibbrackets{#1}}
@@ -325,9 +325,13 @@
}%
}
%-----------------------
+\DeclareNameAlias{name:initials}{default}
\DeclareNameAlias{author}{name:initials}
\DeclareNameAlias{editor}{author}
+\DeclareNameAlias{byeditor}{author}
\DeclareNameAlias{translator}{author}
+\DeclareNameAlias{bytranslator}{default}
+\DeclareNameAlias{bycommentator}{author}
%-----------------------
\DeclareListFormat{location}{%
#1\ifthenelse{\value{listcount}<\value{liststop}}%
@@ -386,7 +390,7 @@
{}
{\usebibmacro{byeditor+othersstrg}%
\setunit{\addspace}%
- \printnames[byeditor]{ineditor}%
+ \printnames[author]{ineditor}%
\clearname{ineditor}%
\newunit}%
\usebibmacro{byintranslator+others}}
@@ -396,7 +400,7 @@
{}
{\usebibmacro{bytranslator+othersstrg}%
\setunit{\addspace}%
- \printnames[bytranslator]{intranslator}%
+ \printnames[author]{intranslator}%
\clearname{intranslator}%
\newunit}%
\usebibmacro{withinothers}}
@@ -406,35 +410,35 @@
{}
{\bibstring{withcommentator}%
\setunit{\addspace}%
- \printnames[withcommentator]{incommentator}}}
+ \printnames[author]{incommentator}}}
%-----------------------
\newbibmacro*{withinannotator}{%
\ifnameundef{inannotator}
{}
{\bibstring{withannotator}%
\setunit{\addspace}%
- \printnames[withannotator]{inannotator}}}
+ \printnames[author]{inannotator}}}
%-----------------------
\newbibmacro*{withinintroduction}{%
\ifnameundef{inintroduction}
{}
{\bibstring{withintroduction}%
\setunit{\addspace}%
- \printnames[withintroduction]{inintroduction}}}
+ \printnames[author]{inintroduction}}}
%-----------------------
\newbibmacro*{withinforeword}{%
\ifnameundef{inforeword}
{}
{\bibstring{withforeword}%
\setunit{\addspace}%
- \printnames[withforeword]{inforeword}}}
+ \printnames[author]{inforeword}}}
%-----------------------
\newbibmacro*{withinafterword}{%
\ifnameundef{inafterword}
{}
{\bibstring{withafterword}%
\setunit{\addspace}%
- \printnames[withafterword]{inafterword}}}
+ \printnames[author]{inafterword}}}
%-----------------------
\newbibmacro*{withinothers}{%
\usebibmacro{withincommentator}%
@@ -612,13 +616,14 @@
\newbibmacro{journal+number+year}{%
\usebibmacro{journal}%
\setunit{\jourvoldelim}%
- \printfield{volume}%
- \iffieldundef{number}
+ \iffieldundef{volume}%
{}
+ {\printfield{volume}%
+ \iffieldundef{number}%
+ {}%
{\setunit{\volnumdelim}%
- \printfield{number}%
- }%
- \newunit%
+ \printfield{number}}%
+ \newunit}%
\usebibmacro{pubstate+year}}
%-----------------------
\newbibmacro{pubstate+year}{%
@@ -655,17 +660,19 @@
\setunit{\addspace}%
\printnames{savedtranslator}}}}
%-----------------------
-\newbibmacro*{inreference:title+author}{%
-\iffieldundef{title}%
- {}%
- {\setunit{\addspace}%
- \bibstring{subvoce}%
- \setunit{\addspace}%
- \printfield{title}%
- \setunit*{\addspace}%
- \printfield{number}}%
- \setunit{\addspace}%
- \printtext[parens]{\printnames[name:initials]{labelname}}}
+\newbibmacro*{inreference:title+author}{%
+ \iffieldundef{title}%
+ {}%
+ {\setunit{\addspace}%
+ \bibstring{subvoce}%
+ \setunit{\addspace}%
+ \printfield{title}%
+ \setunit*{\addspace}%
+ \printfield{number}}%
+ \setunit{\addspace}%
+ \ifnameundef{author}%
+ {}
+ {\printtext[parens]{\printnames[name:initials]{labelname}}}}
%-----------------------
\newbibmacro*{maintitle+title+volumes}{%
\iffieldsequal{maintitle}{title}%
@@ -675,14 +682,12 @@
}%
{\iffieldundef{maintitle}%
{}%
- {\usebibmacro{maintitle}%
- \ifbool{cbx:ancient}%
- {\usebibmacro{title}%
- \iffieldundef{volume}%
- {\newunit\newblock}%
- {}}%
- {\iffieldundef{volume}%
- {\iffieldundef{volumes}%
+ {\usebibmacro{maintitle}}%
+ \iffieldundef{title}%
+ {}%
+ {\usebibmacro{title}}%
+ \iffieldundef{volume}%
+ {\iffieldundef{volumes}%
{}%
{\printfield{volumes}%
\setunit*{\addspace}%
@@ -690,10 +695,11 @@
\setunit{\addspace}}}%
{\setunit{\addspace}%
\printfield{volume}%
- \setunit*{\adddot\addspace}}}}}%
- \iffieldundef{volumes}%
- {\usebibmacro{title}}%
- {}%
+ \setunit*{\adddot\addspace}}%
+ \ifbool{cbx:ancient}%
+ {\usebibmacro{translation}}%
+ {}%
+ }%
\newunit}
%-----------------------
\renewbibmacro{event+venue+date}{%
@@ -704,7 +710,7 @@
\setunit*{\addspace}%
\printeventdate%
\newunit%
- }
+}
%-----------------------
\renewbibmacro*{title}{%
\ifboolexpr{%
@@ -957,10 +963,12 @@
\newblock%
\usebibmacro{maintitle+title+volumes}%
\newunit\newblock%
- \usebibmacro{translation}%
\ifbool{bbx:yearseries}%
{}%
{\newunit\usebibmacro{series+number}}%
+ \ifbool{cbx:ancient}%
+ {}%
+ {\usebibmacro{translation}}%
\setunit{\addspace}%
\newblock%
\usebibmacro{location+edition+year}%
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
index b6728f3d18c..253141e9368 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
@@ -271,7 +271,7 @@
\iffieldundef{postnote}%
{\printfield{pages}}%
{\printfield{postnote}}%
-\usebibmacro{inreference:title+author}%
+ \usebibmacro{inreference:title+author}%
}
%-----------------------
\newbibmacro{cite:seenote}{%
@@ -574,11 +574,15 @@
{\printtext[bibhyperref]}{%
\ifbool{cbx:ancient}{\printtext[emph]{\usebibmacro{cite:title}}}%
{\printtext[emph]{\usebibmacro{cite:title}}%
- \setunit{\addspace}%
- \printtext[parens]{\printfield{year}%
- \iffieldundef{origyear}{}%
- {\addspace\printfield[parens]{origyear}}}%
- }}}%
+ \iffieldundef{year}
+ {}
+ {\setunit{\addspace}%
+ \printtext[parens]{%
+ \printfield{year}%
+ \iffieldundef{origyear}
+ {}%
+ {\addspace\printfield[parens]{origyear}}}%
+ }}}}%
{\multicitedelim}%
{\usebibmacro{postnote}}%