diff options
author | Karl Berry <karl@freefriends.org> | 2016-03-07 23:27:17 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-03-07 23:27:17 +0000 |
commit | c48ccf7d508e674e10d9771d333993da3a957589 (patch) | |
tree | 8b07dc3139c7af20c5818eb3958bcf0ac71586e7 /Master/texmf-dist/tex/latex/biblatex/cbx | |
parent | 7a90070ab1c2a78ee48e025706907db2b5fb4384 (diff) |
biblatex 3.3 (7mar16)
git-svn-id: svn://tug.org/texlive/trunk@39966 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex/cbx')
18 files changed, 47 insertions, 47 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx index 3e6b1c73e90..d5e5183de32 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx @@ -49,7 +49,7 @@ {\printnames{labelname}% \setunit{% \global\booltrue{cbx:parens}% - \addspace\bibopenparen}}% + \nametitledelim\bibopenparen}}% \stepcounter{textcitecount}% \savefield{namehash}{\cbx@lasthash}}% \ifnumequal{\value{citecount}}{1} @@ -74,7 +74,7 @@ \ifnameundef{labelname} {\setunit{% \global\booltrue{cbx:parens}% - \addspace\bibopenparen}} + \extpostnotedelim\bibopenparen}} {\setunit{\postnotedelim}}% \printfield{postnote}% \ifthenelse{\value{multicitecount}=\value{multicitetotal}} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx index fcf370d48d3..2f7c68df495 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx @@ -10,7 +10,7 @@ \newbool{cbx:parens} \newbool{cbx:loccit} -\DeclareBibliographyOption{ibidpage}[true]{% +\DeclareBibliographyOption[boolean]{ibidpage}[true]{% \ifstrequal{#1}{true} {\ExecuteBibliographyOptions{loccittracker=constrict}} {\ExecuteBibliographyOptions{loccittracker=false}}} @@ -42,7 +42,7 @@ {\printnames{labelname}% \setunit{% \global\booltrue{cbx:parens}% - \addspace\bibopenparen}}% + \nametitledelim\bibopenparen}}% \ifnumequal{\value{citecount}}{1} {\usebibmacro{prenote}} {}% @@ -77,7 +77,7 @@ {}} {\ifbool{cbx:parens} {\postnotedelim} - {\addspace\bibopenparen}% + {\extpostnotedelim\bibopenparen}% \printfield{postnote}\bibcloseparen}} \DeclareCiteCommand{\cite} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx index 828d44bf526..9d248a215eb 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx @@ -13,7 +13,7 @@ \newbool{cbx:parens} \newbool{cbx:loccit} -\DeclareBibliographyOption{ibidpage}[true]{% +\DeclareBibliographyOption[boolean]{ibidpage}[true]{% \ifstrequal{#1}{true} {\ExecuteBibliographyOptions{loccittracker=constrict}} {\ExecuteBibliographyOptions{loccittracker=false}}} @@ -62,7 +62,7 @@ {\printnames{labelname}% \setunit{% \global\booltrue{cbx:parens}% - \addspace\bibopenparen}}% + \nametitledelim\bibopenparen}}% \stepcounter{textcitecount}% \savefield{namehash}{\cbx@lasthash}}% \ifnumequal{\value{citecount}}{1} @@ -103,7 +103,7 @@ {\ifnameundef{labelname} {\setunit{% \global\booltrue{cbx:parens}% - \addspace\bibopenparen}} + \extpostnotedelim\bibopenparen}} {\setunit{\postnotedelim}}% \printfield{postnote}}% \ifthenelse{\value{multicitecount}=\value{multicitetotal}} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx index 7157e5d67ef..c0e8a1fe57c 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx @@ -53,7 +53,7 @@ {\printnames{labelname} \setunit{% \global\booltrue{cbx:parens}% - \addspace\bibopenparen}% + \nametitledelim\bibopenparen}% \ifnumequal{\value{citecount}}{1} {\usebibmacro{prenote}} {}% @@ -73,7 +73,7 @@ {\setunit{\postnotedelim}} {\setunit{% \global\booltrue{cbx:parens}% - \addspace\bibopenparen}}% + \extpostnotedelim\bibopenparen}}% \printfield{postnote}% \ifthenelse{\value{multicitecount}=\value{multicitetotal}} {\setunit{}% diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx index 2e3015ef651..a0f7fef85ac 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx @@ -29,7 +29,7 @@ {\printnames{labelname}% \setunit{% \global\booltrue{cbx:parens}% - \addspace\bibopenparen}% + \nametitledelim\bibopenparen}% \ifnumequal{\value{citecount}}{1} {\usebibmacro{prenote}} {}% diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx index eb19b9de0ae..e485f4fadd9 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx @@ -61,7 +61,7 @@ {\printnames{labelname} \setunit{% \global\booltrue{cbx:parens}% - \addspace\bibopenparen}% + \nametitledelim\bibopenparen}% \ifnumequal{\value{citecount}}{1} {\usebibmacro{prenote}} {}% @@ -83,7 +83,7 @@ {\setunit{\postnotedelim}} {\setunit{% \global\booltrue{cbx:parens}% - \addspace\bibopenparen}}% + \extpostnotedelim\bibopenparen}}% \printfield{postnote}% \ifthenelse{\value{multicitecount}=\value{multicitetotal}} {\setunit{}% diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx index 0ba18e87837..aff0a63a496 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx @@ -27,7 +27,7 @@ {\printnames{labelname}% \setunit{% \global\booltrue{cbx:parens}% - \addspace\bibopenparen}}% + \nametitledelim\bibopenparen}}% \ifnumequal{\value{citecount}}{1} {\usebibmacro{prenote}} {}% @@ -49,7 +49,7 @@ {}} {\ifbool{cbx:parens} {\postnotedelim} - {\addspace\bibopenparen}% + {\extpostnotedelim\bibopenparen}% \printfield{postnote}\bibcloseparen}} \DeclareCiteCommand{\cite} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx index a290293d0ae..966e516fafa 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx @@ -27,7 +27,7 @@ \iffieldundef{shorthand} {\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}} {\usebibmacro{cite:label}% - \setunit{\addspace}% + \setunit{\nonameyeardelim}% \usebibmacro{cite:labelyear+extrayear}% \usebibmacro{cite:reinit}} {\iffieldequals{namehash}{\cbx@lasthash} @@ -85,7 +85,7 @@ {\usebibmacro{cite:label}% \setunit{% \global\booltrue{cbx:parens}% - \addspace\bibopenparen}% + \nonameyeardelim\bibopenparen}% \ifnumequal{\value{citecount}}{1} {\usebibmacro{prenote}} {}% @@ -94,7 +94,7 @@ {\printnames{labelname}% \setunit{% \global\booltrue{cbx:parens}% - \addspace\bibopenparen}% + \nameyeardelim\bibopenparen}% \ifnumequal{\value{citecount}}{1} {\usebibmacro{prenote}} {}% diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx index b0e6eee71b3..bf8cc731263 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx @@ -10,7 +10,7 @@ \newbool{cbx:parens} \newbool{cbx:loccit} -\DeclareBibliographyOption{ibidpage}[true]{% +\DeclareBibliographyOption[boolean]{ibidpage}[true]{% \ifstrequal{#1}{true} {\ExecuteBibliographyOptions{loccittracker=constrict}} {\ExecuteBibliographyOptions{loccittracker=false}}} @@ -22,7 +22,7 @@ {\usebibmacro{cite:ibid}} {\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}} {\usebibmacro{cite:label}% - \setunit{\addspace}} + \setunit{\nonameyeardelim}} {\printnames{labelname}% \setunit{\nameyeardelim}}% \usebibmacro{cite:labelyear+extrayear}}} @@ -45,7 +45,7 @@ {\usebibmacro{cite:label}% \setunit{% \global\booltrue{cbx:parens}% - \addspace\bibopenparen}% + \nonameyeardelim\bibopenparen}% \ifnumequal{\value{citecount}}{1} {\usebibmacro{prenote}} {}% @@ -54,7 +54,7 @@ {\printnames{labelname}% \setunit{% \global\booltrue{cbx:parens}% - \addspace\bibopenparen}% + \nameyeardelim\bibopenparen}% \ifnumequal{\value{citecount}}{1} {\usebibmacro{prenote}} {}% @@ -99,7 +99,7 @@ {}} {\ifbool{cbx:parens} {\postnotedelim} - {\addspace\bibopenparen}% + {\extpostnotedelim\bibopenparen}% \printfield{postnote}\bibcloseparen}} \DeclareCiteCommand{\cite} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx index e5841f52d09..d662299bcb0 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx @@ -11,7 +11,7 @@ \newbool{cbx:parens} \newbool{cbx:loccit} -\DeclareBibliographyOption{ibidpage}[true]{% +\DeclareBibliographyOption[boolean]{ibidpage}[true]{% \ifstrequal{#1}{true} {\ExecuteBibliographyOptions{loccittracker=constrict}} {\ExecuteBibliographyOptions{loccittracker=false}}} @@ -37,7 +37,7 @@ {\usebibmacro{cite:ibid}} {\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}} {\usebibmacro{cite:label}% - \setunit{\addspace}% + \setunit{\nonameyeardelim}% \usebibmacro{cite:labelyear+extrayear}% \usebibmacro{cite:reinit}} {\iffieldequals{namehash}{\cbx@lasthash} @@ -97,7 +97,7 @@ {\usebibmacro{cite:label}% \setunit{% \global\booltrue{cbx:parens}% - \addspace\bibopenparen}% + \nonameyeardelim\bibopenparen}% \ifnumequal{\value{citecount}}{1} {\usebibmacro{prenote}} {}% @@ -108,7 +108,7 @@ {\printnames{labelname}% \setunit{% \global\booltrue{cbx:parens}% - \addspace\bibopenparen}% + \nameyeardelim\bibopenparen}% \ifnumequal{\value{citecount}}{1} {\usebibmacro{prenote}} {}% diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx index c0ac1e0eb07..c36c9729b8a 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx @@ -11,7 +11,7 @@ \iffieldundef{shorthand} {\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}} {\usebibmacro{cite:label}% - \setunit{\addspace}} + \setunit{\nonameyeardelim}} {\printnames{labelname}% \setunit{\nameyeardelim}}% \usebibmacro{cite:labelyear+extrayear}} @@ -30,7 +30,7 @@ {\usebibmacro{cite:label}% \setunit{% \global\booltrue{cbx:parens}% - \addspace\bibopenparen}% + \nonameyeardelim\bibopenparen}% \ifnumequal{\value{citecount}}{1} {\usebibmacro{prenote}} {}% @@ -39,7 +39,7 @@ {\printnames{labelname}% \setunit{% \global\booltrue{cbx:parens}% - \addspace\bibopenparen}% + \nameyeardelim\bibopenparen}% \ifnumequal{\value{citecount}}{1} {\usebibmacro{prenote}} {}% @@ -67,7 +67,7 @@ {}} {\ifbool{cbx:parens} {\setunit{\postnotedelim}} - {\setunit{\addspace\bibopenparen}}% + {\setunit{\extpostnotedelim\bibopenparen}}% \printfield{postnote}\bibcloseparen}} \DeclareCiteCommand{\cite} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx index 7792b77e9b0..846a0f75f38 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx @@ -19,12 +19,12 @@ \newbibmacro*{cite:full:citepages}{} \newbibmacro*{cite:postnote}{} -\DeclareBibliographyOption{ibidpage}[true]{% +\DeclareBibliographyOption[boolean]{ibidpage}[true]{% \ifstrequal{#1}{true} {\ExecuteBibliographyOptions{loccittracker=constrict}} {\ExecuteBibliographyOptions{loccittracker=false}}} -\DeclareBibliographyOption{citepages}[permit]{% +\DeclareBibliographyOption[string]{citepages}[permit]{% \ifcsdef{cbx@opt@citepages@#1} {\csuse{cbx@opt@citepages@#1}} {\PackageError{biblatex} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx index 848f3628893..df81985a88b 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx @@ -18,14 +18,14 @@ \newbibmacro*{cite:full:citepages}{} \newbibmacro*{cite:postnote}{} -\DeclareBibliographyOption{ibidpage}[true]{% +\DeclareBibliographyOption[boolean]{ibidpage}[true]{% \ifstrequal{#1}{true} {\ExecuteBibliographyOptions{loccittracker=constrict}} {\ExecuteBibliographyOptions{loccittracker=false}}} -\DeclareBibliographyOption{pageref}[true]{% +\DeclareBibliographyOption[boolean]{pageref}[true]{% \settoggle{cbx:pageref}{#1}} -\DeclareBibliographyOption{citepages}[permit]{% +\DeclareBibliographyOption[string]{citepages}[permit]{% \ifcsdef{cbx@opt@citepages@#1} {\csuse{cbx@opt@citepages@#1}} {\PackageError{biblatex} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx index 087ba067fb4..b22c4da3cb9 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx @@ -16,13 +16,13 @@ \newbibmacro*{cite:full:citepages}{} \newbibmacro*{cite:postnote}{} -\DeclareBibliographyOption{pageref}[true]{% +\DeclareBibliographyOption[boolean]{pageref}[true]{% \settoggle{cbx:pageref}{#1}% \iftoggle{cbx:pageref} {\ExecuteBibliographyOptions{pagetracker}} {}} -\DeclareBibliographyOption{citepages}[permit]{% +\DeclareBibliographyOption[string]{citepages}[permit]{% \ifcsdef{cbx@opt@citepages@#1} {\csuse{cbx@opt@citepages@#1}} {\PackageError{biblatex} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx index 0fb8dfbdde8..b1729fe0d91 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx @@ -17,15 +17,15 @@ \newtoggle{cbx:loccit} \newbool{cbx:noidem} -\DeclareBibliographyOption{ibidpage}[true]{% +\DeclareBibliographyOption[boolean]{ibidpage}[true]{% \settoggle{cbx:ibidpage}{#1}} -\DeclareBibliographyOption{strict}[true]{% +\DeclareBibliographyOption[boolean]{strict}[true]{% \ifstrequal{#1}{true} {\ExecuteBibliographyOptions{ibidtracker=constrict,idemtracker=constrict}} {\ExecuteBibliographyOptions{ibidtracker=context,idemtracker=context}}} -\DeclareBibliographyOption{citepages}[permit]{% +\DeclareBibliographyOption[string]{citepages}[permit]{% \ifcsdef{cbx@opt@citepages@#1} {\csuse{cbx@opt@citepages@#1}} {\PackageError{biblatex} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx index a287832b6ee..6cdd7b1cde3 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx @@ -22,17 +22,17 @@ \newbibmacro*{cite:full:citepages}{} \newbibmacro*{cite:postnote}{} -\DeclareBibliographyOption{ibidpage}[true]{% +\DeclareBibliographyOption[boolean]{ibidpage}[true]{% \ifstrequal{#1}{true} {\ExecuteBibliographyOptions{loccittracker=constrict}} {\ExecuteBibliographyOptions{loccittracker=false}}} -\DeclareBibliographyOption{strict}[true]{% +\DeclareBibliographyOption[boolean]{strict}[true]{% \ifstrequal{#1}{true} {\ExecuteBibliographyOptions{ibidtracker=constrict,idemtracker=constrict}} {\ExecuteBibliographyOptions{ibidtracker=context,idemtracker=context}}} -\DeclareBibliographyOption{citepages}[permit]{% +\DeclareBibliographyOption[string]{citepages}[permit]{% \ifcsdef{cbx@opt@citepages@#1} {\csuse{cbx@opt@citepages@#1}} {\PackageError{biblatex} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx index 13f8d641633..5ef371196da 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx @@ -15,12 +15,12 @@ \newtoggle{cbx:loccit} -\DeclareBibliographyOption{strict}[true]{% +\DeclareBibliographyOption[boolean]{strict}[true]{% \ifstrequal{#1}{true} {\ExecuteBibliographyOptions{ibidtracker=constrict,loccittracker=constrict}} {\ExecuteBibliographyOptions{ibidtracker=context,loccittracker=context}}} -\DeclareBibliographyOption{citepages}[permit]{% +\DeclareBibliographyOption[string]{citepages}[permit]{% \ifcsdef{cbx@opt@citepages@#1} {\csuse{cbx@opt@citepages@#1}} {\PackageError{biblatex} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx index 04d65224ecc..f373895c82a 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx @@ -16,7 +16,7 @@ \newbibmacro*{cite:full:citepages}{} \newbibmacro*{cite:postnote}{} -\DeclareBibliographyOption{citepages}[permit]{% +\DeclareBibliographyOption[string]{citepages}[permit]{% \ifcsdef{cbx@opt@citepages@#1} {\csuse{cbx@opt@citepages@#1}} {\PackageError{biblatex} |