summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/archaeologie
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-11-19 22:17:06 +0000
committerKarl Berry <karl@freefriends.org>2017-11-19 22:17:06 +0000
commit39010d345f62fd98626853160fbacf66fc329f0d (patch)
tree04cf2a9a138c050ad152b5099162784c3740bdaf /Master/texmf-dist/tex/latex/archaeologie
parenta7b966f17514051acc780c2aa7fee25ca8748ecc (diff)
archaeologie (19nov17)
git-svn-id: svn://tug.org/texlive/trunk@45852 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/archaeologie')
-rw-r--r--Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx154
-rw-r--r--Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx44
-rw-r--r--Master/texmf-dist/tex/latex/archaeologie/english-archaeologie.lbx (renamed from Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx)0
-rw-r--r--Master/texmf-dist/tex/latex/archaeologie/french-archaeologie.lbx (renamed from Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx)2
-rw-r--r--Master/texmf-dist/tex/latex/archaeologie/german-archaeologie.lbx (renamed from Master/texmf-dist/tex/latex/archaeologie/archaeologie-german.lbx)0
-rw-r--r--Master/texmf-dist/tex/latex/archaeologie/italian-archaeologie.lbx (renamed from Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx)2
-rw-r--r--Master/texmf-dist/tex/latex/archaeologie/spanish-archaeologie.lbx (renamed from Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx)2
7 files changed, 113 insertions, 91 deletions
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/archaeologie-english.lbx b/Master/texmf-dist/tex/latex/archaeologie/english-archaeologie.lbx
index 413971f3d06..413971f3d06 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/english-archaeologie.lbx
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx b/Master/texmf-dist/tex/latex/archaeologie/french-archaeologie.lbx
index c1506bdef32..f66b1a9096f 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/french-archaeologie.lbx
@@ -53,5 +53,5 @@
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!
+ 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/german-archaeologie.lbx
index da9d1243e2c..da9d1243e2c 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-german.lbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/german-archaeologie.lbx
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx b/Master/texmf-dist/tex/latex/archaeologie/italian-archaeologie.lbx
index 4536a4404e7..aca0683694b 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/italian-archaeologie.lbx
@@ -46,6 +46,6 @@
inpress = {{in\addspace corso\addspace di\addspace stampa}{c\adddot\addabthinspace d\adddot\addabthinspace s\adddot}},
prepublished = {{}{}},% FIX ME!
forthcoming = {{prossimo}{prossimo}},
- owntranslation = {{}{}},% FIX ME!
+ owntranslation = {{??}{??}},% FIX ME!
}
\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx b/Master/texmf-dist/tex/latex/archaeologie/spanish-archaeologie.lbx
index 5d2b9a6c0f0..89daf2c73c1 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/spanish-archaeologie.lbx
@@ -30,6 +30,6 @@
origtitle = {{Título\addspace original}{Título\addspace original}},
firstprint = {{Primera\addspace edición}{Primera\addspace edición}},
talk = {{Conferencia}{Conferencia}},
- owntranslation = {{}{}},% FIX ME!
+ owntranslation = {{??}{??}},% FIX ME!
}
\endinput \ No newline at end of file