diff options
author | Karl Berry <karl@freefriends.org> | 2018-02-02 22:53:19 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-02-02 22:53:19 +0000 |
commit | 6cc1d48e0bd2de812e70a28e0e980533b5c6e755 (patch) | |
tree | 36b4738002227b0a87c2ce620fb215be76e8cbaf /Master/texmf-dist/tex/latex/biblatex-trad/trad-standard.bbx | |
parent | abd9c49f4d380217c26293669e9e41b800decbef (diff) |
biblatex-trad (2feb18)
git-svn-id: svn://tug.org/texlive/trunk@46523 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-trad/trad-standard.bbx')
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-trad/trad-standard.bbx | 273 |
1 files changed, 135 insertions, 138 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-trad/trad-standard.bbx b/Master/texmf-dist/tex/latex/biblatex-trad/trad-standard.bbx index 5b5afcddf06..5f6a5ed36aa 100644 --- a/Master/texmf-dist/tex/latex/biblatex-trad/trad-standard.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-trad/trad-standard.bbx @@ -1,11 +1,11 @@ %% Copyright (c) 2012 -- 2015 Marco Daniel -%% 2016 -- Moritz Wemheuer +%% 2016 -- 2018 Moritz Wemheuer %% %% This package is released under the terms of the %% LaTeX Project Public License v1.3c or later %% See http://www.latex-project.org/lppl.txt %% -\ProvidesFile{trad-standard.bbx}[2016/06/26 v0.3 biblatex-trad] +\ProvidesFile{trad-standard.bbx}[2018/02/02 v0.4 biblatex-trad base bibliography style] %==========================================% %==========================================% %==========================================% @@ -14,7 +14,7 @@ %==========================================% %==========================================% \providebool{bbx:subentry} -\DeclareBibliographyOption{subentry}[true]{% +\DeclareBibliographyOption[boolean]{subentry}[true]{% \setbool{bbx:subentry}{#1}} \newbool{bbxtrad:doisequal} \newbool{bbxtrad:eprintsequal} @@ -48,14 +48,15 @@ {title}{\mkbibemph{#1}} \DeclareFieldFormat*{number}{\mkbibparens{#1}} -\DeclareFieldFormat[book,incollection,inproceedings,proceedings]{number}{\biblstring{number}~#1} +\DeclareFieldFormat[book,incollection,inproceedings,proceedings] + {number}{\biblstring{number}~#1} \DeclareFieldFormat[techreport,report]{number}{#1} \DeclareFieldFormat{edition}{% \ifinteger{#1} {\mkbibordedition{#1}~\bibstring{edition}} {\MakeLowercase{#1}~\bibstring{edition}}} -\DeclareFieldFormat{chapter}{\bibstring{part}~#1} -\DeclareFieldFormat[article]{pages}{{#1}} +\DeclareFieldFormat{chapter}{\bibstring{chapter}~#1} +\DeclareFieldFormat[article]{pages}{#1} \DeclareFieldFormat[book,inproceedings,proceedings]{series}{\mkbibemph{#1}} \DeclareFieldFormat{journaltitle}{\mkbibemph{#1}\isdot} \DeclareFieldFormat{titlecase}{\MakeTitleCase{#1}} @@ -76,7 +77,7 @@ {#1} {\MakeSentenceCase{#1}}} -\newbibmacro*{in:}{% +\renewbibmacro*{in:}{% \printtext{% \bibstring{in}% \printunit{\intitlepunct}}} @@ -89,7 +90,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/translator+others}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% \newunit \printlist{language}% @@ -126,7 +127,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor+others/translator+others}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{maintitle+title}% \newunit \printlist{language}% @@ -145,7 +146,9 @@ test {\iffieldundef{part}} and test {\iffieldundef{number}} - }{}{\newblock}% + } + {} + {\newblock}% \usebibmacro{publisher+location+date}% \newunit\newblock \usebibmacro{chapter+pages}% @@ -175,7 +178,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/translator+others}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% \newunit \printlist{language}% @@ -197,7 +200,7 @@ \usebibmacro{series+number}% \newcommaunit\newblock \usebibmacro{chapter+pages}% - \setunit{\addperiod\space} + \newunit \usebibmacro{publisher+location+date}% \newunit\newblock \iftoggle{bbx:isbn} @@ -222,7 +225,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/translator+others}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% \newunit \printlist{language}% @@ -232,11 +235,11 @@ \usebibmacro{in:}% \iffieldundef{crossref} {\usebibmacro{inproc:crossref:full}} - {\usebibmacro{crossref:label}} + {\usebibmacro{crossref:label}}% \usebibmacro{chapter+pages}% \iffieldundef{crossref} {\usebibmacro{inproc:crossref:extra}} - {\usebibmacro{inproc:crossref:conditional}} + {\usebibmacro{inproc:crossref:conditional}}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock @@ -250,7 +253,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor+others/translator+others}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% \newunit \printlist{language}% @@ -287,7 +290,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{editor+others}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{maintitle+title}% \newunit \printlist{language}% @@ -299,20 +302,18 @@ and test {\iffieldundef{eventyear}} }% - {}% - {% - \newunit\newblock - \usebibmacro{event+venue+date}% - \newunit\newblock - }% + {}% + {\newunit\newblock + \usebibmacro{event+venue+date}% + \newunit\newblock}% \usebibmacro{byeditor+others}% \newcommaunit \usebibmacro{book:series+number}% - \newcommaunit% + \newcommaunit \iffieldundef{maintitle}% - {\printfield{volumes}% - \newcommaunit}% - {}% + {\printfield{volumes}% + \newcommaunit} + {}% \newunit \printlist{location}% \newcommaunit @@ -321,7 +322,7 @@ \usebibmacro{date}% \newunit \printlist{organization}% - \newcommaunit* + \newcommaunit*% \printlist{publisher}% \newunit \usebibmacro{chapter+pages}% @@ -350,7 +351,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% \newunit \printlist{language}% @@ -388,7 +389,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% \newunit \printlist{language}% @@ -431,7 +432,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor+others/translator+others}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% \newunit \printlist{language}% @@ -466,7 +467,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% \newunit \printlist{language}% @@ -474,9 +475,9 @@ \usebibmacro{byauthor}% \newunit\newblock \printfield{howpublished}% - \newcommaunit* + \newcommaunit*% \printfield{note}% - \newcommaunit* + \newcommaunit*% \usebibmacro{location+date}% \newunit\newblock \iftoggle{bbx:url} @@ -499,21 +500,22 @@ %new-/redefinition of bibmacros \newbibmacro*{crossref:label}{% \usebibmacro{maintitle+booktitle:noemph}% - \setunit{\addspace} - \entrydata - {\strfield{crossref}} - {\printtext{\mkbibbrackets{\printfield{labelnumber}}}}} + \setunit{\addspace}% + \entrydata{\strfield{crossref}} + {\printtext[labelnumberwidth]{% + \printfield{prefixnumber}% + \printfield{labelnumber}}}} \newbibmacro*{maintitle+booktitle:noemph}{% \iffieldundef{maintitle} - {} - {\usebibmacro{maintitle:noemph}% - \newunit\newblock - \iffieldundef{volume} {} - {\printfield{volume}% - \printfield{part}% - \setunit{\addcolon\space}}}% + {\usebibmacro{maintitle:noemph}% + \newunit\newblock + \iffieldundef{volume} + {} + {\printfield{volume}% + \printfield{part}% + \setunit{\addcolon\space}}}% \usebibmacro{booktitle:noemph}% \newunit} @@ -523,12 +525,12 @@ and test {\iffieldundef{mainsubtitle}} }% - {}% - {\printtext{% - \printfield[titlecase]{maintitle}% - \setunit{\subtitlepunct}% - \printfield[titlecase]{mainsubtitle}}% - \newunit}% + {}% + {\printtext{% + \printfield[titlecase]{maintitle}% + \setunit{\subtitlepunct}% + \printfield[titlecase]{mainsubtitle}}% + \newunit}% \printfield{maintitleaddon}} \newbibmacro*{booktitle:noemph}{% @@ -537,12 +539,12 @@ and test {\iffieldundef{booksubtitle}} }% - {}% - {\printtext{% - \printfield[titlecase]{booktitle}% - \setunit{\subtitlepunct}% - \printfield[titlecase]{booksubtitle}}% - \newunit}% + {}% + {\printtext{% + \printfield[titlecase]{booktitle}% + \setunit{\subtitlepunct}% + \printfield[titlecase]{booksubtitle}}% + \newunit}% \printfield{booktitleaddon}} \newbibmacro*{inproc:crossref:full}{% @@ -557,30 +559,29 @@ and test {\ifnameundef{translator}} }% - {}% - {\usebibmacro{byeditor+others}\newcommaunit}% + {}% + {\usebibmacro{byeditor+others}\newcommaunit}% \usebibmacro{maintitle+booktitle}% \newunit \usebibmacro{event+venue+date}% \newcommaunit \iffieldundef{maintitle}% - {\printfield{volume}% - \printfield{part}% - \ifboolexpr{ - test {\iffieldundef{volume}} - and - test {\iffieldundef{part}} - }% + {\printfield{volume}% + \printfield{part}% + \ifboolexpr{ + test {\iffieldundef{volume}} + and + test {\iffieldundef{part}} + }% + {}% + {\setunit{\addspace\bibstring{ofseries}\addspace}}}% {}% - {\setunit{\addspace\bibstring{ofseries}\addspace}}}% - {}% \usebibmacro{series+number:emphcond}% - \newcommaunit% + \newcommaunit \iffieldundef{maintitle}% - {\printfield{volumes}% - \newcommaunit}% - {}% -} + {\printfield{volumes}% + \newcommaunit}% + {}} \newbibmacro*{inproc:crossref:extra}{% \newcommaunit @@ -589,14 +590,14 @@ \printfield{edition}% \newunit \printlist{organization}% - \newcommaunit* + \newcommaunit*% \printlist{publisher}% \newcommaunit \usebibmacro{date}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url} \newunit\newblock @@ -605,34 +606,34 @@ \usebibmacro{addendum+pubstate}} \newbibmacro*{inproc:crossref:conditional}{% - \entrydata*{\strfield{crossref}}{ + \entrydata*{\strfield{crossref}}{% \iffieldsequal{doi}{saveddoi} - {\global\booltrue{bbxtrad:doisequal}} - {\global\boolfalse{bbxtrad:doisequal}} + {\global\booltrue{bbxtrad:doisequal}} + {\global\boolfalse{bbxtrad:doisequal}} \iffieldsequal{eprint}{savedeprint} - {\global\booltrue{bbxtrad:eprintsequal}} - {\global\boolfalse{bbxtrad:eprintsequal}} + {\global\booltrue{bbxtrad:eprintsequal}} + {\global\boolfalse{bbxtrad:eprintsequal}} \iffieldsequal{url}{savedurl} - {\global\booltrue{bbxtrad:urlsequal}} - {\global\boolfalse{bbxtrad:urlsequal}} + {\global\booltrue{bbxtrad:urlsequal}} + {\global\boolfalse{bbxtrad:urlsequal}} \iffieldsequal{note}{savednote} - {\global\booltrue{bbxtrad:notesequal}} - {\global\boolfalse{bbxtrad:notesequal}} + {\global\booltrue{bbxtrad:notesequal}} + {\global\boolfalse{bbxtrad:notesequal}} \iffieldsequal{addendum}{savedaddendum} - {\global\booltrue{bbxtrad:addendumsequal}} - {\global\boolfalse{bbxtrad:addendumsequal}}} + {\global\booltrue{bbxtrad:addendumsequal}} + {\global\boolfalse{bbxtrad:addendumsequal}}} \newunit\newblock \iftoggle{bbx:doi} - {\ifbool{bbxtrad:doisequal}{}{\printfield{saveddoi}}} - {}% + {\ifbool{bbxtrad:doisequal}{}{\printfield{saveddoi}}} + {}% \newunit\newblock \iftoggle{bbx:eprint} - {\ifbool{bbxtrad:eprintsequal}{}{\usebibmacro{eprint}}} - {}% + {\ifbool{bbxtrad:eprintsequal}{}{\usebibmacro{eprint}}} + {}% \newunit\newblock \iftoggle{bbx:url} - {\ifbool{bbxtrad:urlsequal}{}{\usebibmacro{url+urldate}}} - {}% + {\ifbool{bbxtrad:urlsequal}{}{\usebibmacro{url+urldate}}} + {}% \newunit\newblock \ifbool{bbxtrad:notesequal}{}{\printfield{note}}% \newunit\newblock @@ -660,22 +661,20 @@ \printfield{number}% \setunit{\addcolon} \printfield{pages}% - \newcommaunit% - \printfield{eid}}% + \newcommaunit + \printfield{eid}} \renewbibmacro*{byeditor+others}{% \ifnameundef{editor} {} - {% - \printnames[byeditor]{editor}% - \setunit{\addcomma\space}% - \usebibmacro{editorlstr}% - \clearname{editor}% - \newunit}% + {\printnames[byeditor]{editor}% + \setunit{\addcomma\space}% + \usebibmacro{editorlstr}% + \clearname{editor}% + \newunit}% \usebibmacro{byeditorx}% - \usebibmacro{bytranslator+others} -} + \usebibmacro{bytranslator+others}} \newbibmacro*{editorlstr}{% @@ -684,8 +683,8 @@ or test {\ifandothers{editor}} }% - {\biblstring{editors}}% - {\biblstring{editor}}% + {\biblstring{editors}}% + {\biblstring{editor}}% } \renewbibmacro*{series+number}{% @@ -700,33 +699,33 @@ \ifboolexpr{ not test {\iffieldundef{volume}} }% - {\printfield{series}}% - {\ifboolexpr{ - test {\iffieldundef{volume}} - and - test {\iffieldundef{part}} - and - test {\iffieldundef{number}} - and - test {\ifentrytype{book}} + {\printfield{series}}% + {\ifboolexpr{ + test {\iffieldundef{volume}} + and + test {\iffieldundef{part}} + and + test {\iffieldundef{number}} + and + test {\ifentrytype{book}} }% - {\newunit\newblock}% - {}% - \printfield[noformat]{series}}% + {\newunit\newblock}% + {}% + \printfield[noformat]{series}}% \newunit} \newbibmacro*{book:series+number}{% \iffieldundef{maintitle}% - {\printfield{volume}% - \printfield{part}% - \ifboolexpr{ - test {\iffieldundef{volume}} - and - test {\iffieldundef{part}} - }% + {\printfield{volume}% + \printfield{part}% + \ifboolexpr{ + test {\iffieldundef{volume}} + and + test {\iffieldundef{part}} + }% + {}% + {\setunit{\addspace\bibstring{ofseries}\addspace}}}% {}% - {\setunit{\addspace\bibstring{ofseries}\addspace}}}% - {}% \usebibmacro{series+number:emphcond}% \newunit} @@ -739,37 +738,35 @@ \renewbibmacro*{publisher+location+date}{% \printlist{publisher}% - \newcommaunit* + \newcommaunit*% \printlist{location}% - \newcommaunit* + \newcommaunit*% \printfield{edition}% - \newcommaunit* + \newcommaunit*% \usebibmacro{date}% \newunit} \renewbibmacro*{institution+location+date}{% \printlist{institution}% - \newcommaunit* + \newcommaunit*% \printlist{location}% - \newcommaunit* + \newcommaunit*% \usebibmacro{date}% \newunit} \newbibmacro*{location+date+publisher}{% \printlist{location}% - \newcommaunit* + \newcommaunit*% \printfield{edition}% - \newcommaunit* + \newcommaunit*% \usebibmacro{date}% \newunit \printlist{publisher}} \newbibmacro*{issue+date-parens}{% - \iffieldundef{issue}% - {\usebibmacro{date}}% - {\printfield{issue}% - \newcommaunit*% - \usebibmacro{date}}% + \printfield{issue}% + \newcommaunit*% + \usebibmacro{date}% \newunit} |