diff options
author | Karl Berry <karl@freefriends.org> | 2016-07-01 22:03:12 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-07-01 22:03:12 +0000 |
commit | 8e9533e8eb59f990e39a9ca18c9f3ef5d5889701 (patch) | |
tree | 15736adee0dde5509873ce0b8f88e35c4bdfe4b3 /Master/texmf-dist/tex/latex/archaeologie | |
parent | 511d12ce71d7023f76adc3e05490d24638bd0d69 (diff) |
archaeologie (1jul16)
git-svn-id: svn://tug.org/texlive/trunk@41595 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/archaeologie')
7 files changed, 194 insertions, 76 deletions
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx index 59a5433228c..43ae4ff8e82 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx @@ -21,9 +21,11 @@ \NewBibliographyString{reference} \NewBibliographyString{talk} \NewBibliographyString{editor} +\NewBibliographyString{subvoce} \DeclareBibliographyStrings{% inherit = {english}, + subvoce = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}}, reference = {{Article}{Art\adddot}}, origtitle = {{original title}{orig\adddot title}}, firstprint = {{first\addspace edition}{first\addspace edition}}, diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx index 7a4f9eee64d..407617d2699 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx @@ -25,10 +25,12 @@ \NewBibliographyString{reference} \NewBibliographyString{translationof} \NewBibliographyString{talk} +\NewBibliographyString{subvoce} \DeclareBibliographyStrings{% inherit = {french}, + subvoce = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}}, translationof = {{traduction\addspace de}{trad\adddot\addspace de}}, reference = {{article}{art\adddot}}, reviewof = {{recension\addspace de}{rec\adddot\addspace de}}, diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx index d1924002398..7427a0d12b5 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx @@ -29,10 +29,12 @@ \NewBibliographyString{forthcoming} \NewBibliographyString{inpress} \NewBibliographyString{prepublished} +\NewBibliographyString{subvoce} \DeclareBibliographyStrings{% inherit = {italian}, + subvoce = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}}, translationof = {{traduzione\addspace di}{trad\adddot\addabthinspace di}}, reference = {{articolo}{art\adddot}}, reviewof = {{recensione\addspace di}{recens\adddot\addabthinspace di}}, diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx index e914291d857..220ed08ce6a 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx @@ -27,10 +27,12 @@ \NewBibliographyString{seenote} \NewBibliographyString{loccit} +\NewBibliographyString{subvoce} \DeclareBibliographyStrings{% inherit = {ngerman}, + subvoce = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}}, reference = {{Artikel}{Art\adddot}}, reviewof = {{Rezension\addspace zu}{Rez\adddot\addabthinspace zu}}, origtitle = {{Originaltitel}{Orig\adddot titel}}, diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx index 1ea3c75d59f..551072fe6a6 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx @@ -21,12 +21,14 @@ \NewBibliographyString{firstprint} \NewBibliographyString{reference} \NewBibliographyString{talk} +\NewBibliographyString{subvoce} \DeclareBibliographyStrings{% inherit = {spanish}, - reference = {{}{}}, - origtitle = {{título\addspace original}{título\addspace original}}, - firstprint = {{edición}{edición}}, - talk = {{charla}{charla}}, + subvoce = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}}, + reference = {{Artículo}{Art\adddot}}, + origtitle = {{Título original}{Título original}}, + firstprint = {{Primera edición}{Primera edición}}, + talk = {{Conferencia}{Conferencia}}, } \endinput
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx index 381a59491dc..c69792d0094 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx @@ -24,7 +24,7 @@ \ExecuteBibliographyOptions{% pagetracker=true,% citecounter=true,% - giveninits=true,% + %%giveninits=true,% sortlocale=auto,% language=auto,% autolang=other,% @@ -129,6 +129,7 @@ \DeclareFieldFormat{edition}{#1} \DeclareFieldFormat{volumes}{#1} \DeclareFieldFormat{volume}{#1} +\DeclareFieldFormat[inreference]{number}{\mkbibbrackets{#1}} \DeclareFieldFormat{parens}{\mkbibparens{#1}} \DeclareFieldFormat{brackets}{\mkbibbrackets{#1}} \DeclareFieldFormat{quotes}{\mkbibquote{#1}} @@ -196,6 +197,7 @@ \renewcommand*\relateddelim{\addnbspace\textendash\addspace} \newcommand*{\volnumdelim}{\addslash} \newcommand*{\jourvoldelim}{\addnbspace} +%%\newcommand*{\subvoce}{\addspace s\adddot\addnbthinspace v\adddot} %----------------------- \DeclareBibliographyAlias{collection}{book} \DeclareBibliographyAlias{reference}{book} @@ -442,30 +444,22 @@ %----------------------- \newbibmacro*{zenon}{% \usebibmacro{bbx:parunit}% - \iffieldundef{zenon}% - {}% {\printfield{zenon}}% } %----------------------- \newbibmacro*{jstor}{% \usebibmacro{bbx:parunit}% - \iffieldundef{jstor}% - {}% {\printfield{jstor}}% } %----------------------- \newbibmacro*{urn}{% \usebibmacro{bbx:parunit}% - \iffieldundef{urn}% - {}% {\printfield{urn}}% } %----------------------- \renewbibmacro*{url+urldate}{% \usebibmacro{bbx:parunit}% \printfield{url}% - \iffieldundef{urlyear}% - {}% {\setunit*{\addspace}% \printtext{\printurldate}% }% @@ -543,8 +537,8 @@ \usebibmacro{journal}% \setunit{\jourvoldelim}% \printfield{volume}% - \iffieldundef{number}% - {}% + %\iffieldundef{number}% + % {}% {\setunit{\volnumdelim}% \printfield{number}% }% @@ -590,6 +584,19 @@ } } %----------------------- +\newbibmacro*{inreference:title+author}{% +\iffieldundef{title}% + {}% + {\setunit{\addspace} + \bibstring{subvoce}% + \setunit{\addspace}% + \printfield{title}% + \setunit*{\addspace}% + \printfield{number}} + \setunit{\addspace}% + \printtext[parens]{\printnames[name:inreference]{labelname}} +} +%----------------------- \newbibmacro*{maintitle+title+volumes}{% \iffieldsequal{maintitle}{title}% {\clearfield{maintitle}% @@ -1131,21 +1138,7 @@ \printfield[parens]{year}% \setunit{\addspace}% \usebibmacro{pages}% - \iffieldundef{title}% - {}% - {\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}}% + \usebibmacro{inreference:title+author} \setunit*{\addspace}% \usebibmacro{addendum}% \usebibmacro{doi+eprint+url}% diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx index 0ca2204ad72..fd2b95fda5e 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx @@ -14,19 +14,34 @@ [2016/06/06 v2.0 archaeologie -- biblatex for archaeologists, historians and philologists, cbx-Datei] -\ExecuteBibliographyOptions{% - citetracker=true,% - idemtracker=false,% - ibidtracker=true,% - opcittracker=true,% - loccittracker=true,% - labeldate=true,% -} %----------------------- \newbool{cbx:yearinparens} \newbool{cbx:seenote} \newbool{cbx:seen} %----------------------- +\newcommand*{\cbx@fseen@names}{} +\newcommand*{\cbx@tseen@names}{} +\newrobustcmd*{\cbx@nameseen}[1]{% + \iftoggle{blx@footnote} + {\listcsxadd{cbx@fseen@names}{#1}} + {\listcsxadd{cbx@tseen@names}{#1}}} +\newrobustcmd*{\cbx@ifnameseen}[1]{% + \iftoggle{blx@footnote} + {\xifinlistcs{#1}{cbx@fseen@names}} + {\xifinlistcs{#1}{cbx@tseen@names}}} + +\renewcommand*{\multicitedelim}{\addsemicolon\addspace} +\newcommand*{\labelyeardelim}{\addspace} +\renewcommand{\textcitedelim}{\multicitedelim} +\renewcommand{\postnotedelim}{% + \ifboolexpr{bool {cbx:ancient}% + or bool {cbx:frgancient}% + or bool {cbx:corpus}% + }% + {\addspace}% + {\newunitpunct}% +} +%----------------------- \DeclareBibliographyOption{yearinparens}[true]{% \ifstrequal{#1}{true} {\DeclareFieldFormat{citeyear}{\mkbibparens{##1}} @@ -36,11 +51,50 @@ {cbx:seenote}% \ExecuteBibliographyOptions{maxnames=999}% }% +\DeclareBibliographyOption[string]{citeauthorformat}{% + \ifcsdef{cbx@arch@citeauthorformat@#1} + {\csuse{cbx@arch@citeauthorformat@#1}} + {\PackageError{biblatex-archaeologie} + {Option 'citeauthorformat=#1' invalid} + {The option you have supplied is invalid.\MessageBreak + Use one of the values 'initials', 'full', 'family' or 'firstfull'.}}} %----------------------- \DeclareFieldFormat{citeyear}{#1} \DeclareFieldFormat{prenote}{#1\isdot}% \DeclareFieldFormat{postnote}{#1}% \DeclareFieldFormat{shorttitle}{#1}% +\DeclareFieldFormat{pages}{#1} + +\DeclareNameFormat{labelname}{% + \ifcase\value{uniquename}% + \usebibmacro{name:family} + {\namepartfamily} + {\namepartgiven} + {\namepartprefix} + {\namepartsuffix}% + \or + \ifuseprefix + {\usebibmacro{name:family-given} + {\namepartfamily} + {\namepartgiveni} + {\namepartprefix} + {\namepartsuffixi}} + {\usebibmacro{name:family-given} + {\namepartfamily} + {\namepartgiveni} + {\namepartprefixi} + {\namepartsuffixi}}% + \or + \usebibmacro{name:family-given} + {\namepartfamily} + {\namepartgiven} + {\namepartprefix} + {\namepartsuffix}% + \fi + \usebibmacro{name:andothers}} + + + \DeclareNameFormat{frg}{% \nameparts{#1}% \ifgiveninits% @@ -55,17 +109,85 @@ {\namepartprefix} {\namepartsuffix}}% \usebibmacro{name:andothers}} -%----------------------- -\renewcommand*{\multicitedelim}{\addsemicolon\addspace} -\newcommand*{\labelyeardelim}{\addspace} -\renewcommand{\textcitedelim}{\multicitedelim} -\renewcommand{\postnotedelim}{% - \ifboolexpr{bool {cbx:ancient}% - or bool {cbx:frgancient}% - or bool {cbx:corpus}% - }% - {\addspace}% - {\newunitpunct}% + +\def\cbx@arch@citeauthorformat@family{% + \DeclareNameFormat{citeauthor}{% + \usebibmacro{name:family} + {\namepartfamily} + {\namepartgiven} + {\namepartprefix} + {\namepartsuffix}% + \usebibmacro{name:andothers}}} + +\def\cbx@arch@citeauthorformat@full{% + \DeclareNameFormat{citeauthor}{% + \usebibmacro{name:given-family} + {\namepartfamily} + {\namepartgiven} + {\namepartprefix} + {\namepartsuffix}% + \usebibmacro{name:andothers}}} + +\def\cbx@arch@citeauthorformat@initials{% + \DeclareNameFormat{citeauthor}{% + \ifuseprefix + {\usebibmacro{name:given-family} + {\namepartfamily} + {\namepartgiveni} + {\namepartprefix} + {\namepartsuffixi}} + {\usebibmacro{name:given-family} + {\namepartfamily} + {\namepartgiveni} + {\namepartprefixi} + {\namepartsuffixi}}% + \usebibmacro{name:andothers}}} + +\def\cbx@arch@citeauthorformat@firstfull{% + \DeclareNameFormat{citeauthor}{% + \cbx@ifnameseen{\thefield{hash}} + {\ifuseprefix + {\usebibmacro{name:given-family} + {\namepartfamily} + {\namepartgiveni} + {\namepartprefix} + {\namepartsuffixi}} + {\usebibmacro{name:given-family} + {\namepartfamily} + {\namepartgiveni} + {\namepartprefixi} + {\namepartsuffixi}}} + {\usebibmacro{name:given-family} + {\namepartfamily} + {\namepartgiven} + {\namepartprefix} + {\namepartsuffix}% + \cbx@nameseen{\thefield{hash}}}% + \usebibmacro{name:andothers}}} + +\DeclareNameFormat{name:inreference}{% + \ifuseprefix + {\usebibmacro{name:given-family} + {\namepartfamily} + {\namepartgiveni} + {\namepartprefix} + {\namepartsuffixi}} + {\usebibmacro{name:given-family} + {\namepartfamily} + {\namepartgiveni} + {\namepartprefixi} + {\namepartsuffixi}}% + \usebibmacro{name:andothers}} +%----------------------- +\ExecuteBibliographyOptions{% + citetracker=true,% + idemtracker=false,% + ibidtracker=true,% + opcittracker=true,% + loccittracker=true,% + labeldate=true,% + citeauthorformat=initials,% + uniquename=minfull,% } %----------------------- \renewbibmacro*{postnote}{% @@ -97,13 +219,6 @@ \renewcommand{\postnotedelim}{\addspace}% }% %----------------------- -\newbibmacro*{cite:name}{% -% 0: only last names, 1: last name + first name initials, 2: full name - \ifbool{cbx:fullnames}{\c@uniquename=2}{\ifbool{cbx:lastnames}{\c@uniquename=0}{\c@uniquename=1}}% - \ifciteindex{\indexnames{labelname}}{}% - \printtext[bibhyperref]{% - \iffootnote{\c@uniquename=0 \printnames{labelname}}{\printnames{labelname}}}} -%----------------------- \newbibmacro*{cite:title}{\printfield{labeltitle}}% %----------------------- \newbibmacro*{cite:year}{% @@ -112,22 +227,17 @@ {{\printtext[citeyear]{\printfield{labelyear}\printfield{extrayear}}}}} %----------------------- \newbibmacro*{cite:lexikon}{% - \printfield{booktitle}% - \setunit{\addspace}% - \printfield{volume}% - \setunit{\addspace}% - \printfield[parens]{year}% - \setunit{\addspace}% - \iffieldundef{postnote}{\printfield{pages}}% - {\printfield{postnote}}% - \iffieldundef{title}{}{\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}}% - } + \printfield{booktitle}% + \setunit{\addspace}% + \printfield{volume}% + \setunit{\addspace}% + \printfield[parens]{year}% + \setunit{\addspace}% + \iffieldundef{postnote}% + {\printfield{pages}}% + {\printfield{postnote}}% + \usebibmacro{inreference:title+author} +} %----------------------- \newbibmacro{cite:seenote}{% \ifboolexpr{bool{cbx:ancient}% @@ -274,7 +384,7 @@ \DeclareMultiCiteCommand{\textcites}% {\textcite}{\textcitedelim} %----------------------- -\DeclareCiteCommand{\citeauthor}% +\DeclareCiteCommand{\citeauthor} {\boolfalse{citetracker}% \boolfalse{pagetracker}% \renewcommand*{\multinamedelim}{\addcomma\space}% @@ -282,9 +392,13 @@ \ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}% \addspace\bibstring{and}\space}% \usebibmacro{prenote}}% - {\usebibmacro{cite:name}}% - {\multicitedelim}% - {\usebibmacro{postnote}}% + {\ifciteindex + {\indexnames{labelname}} + {}% + \printtext[bibhyperref]{% + \printnames[citeauthor]{labelname}}} + {\multicitedelim} + {\usebibmacro{postnote}} %----------------------- \DeclareCiteCommand{\citetitle} % {\boolfalse{citetracker}% @@ -300,5 +414,6 @@ }}}% {\multicitedelim}% {\usebibmacro{postnote}}% + \endinput %% End of file `archaeologie.cbx'.
\ No newline at end of file |