diff options
author | Karl Berry <karl@freefriends.org> | 2012-11-02 23:54:18 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-11-02 23:54:18 +0000 |
commit | 295b453abefbb11e8491968ce857079ce2b76087 (patch) | |
tree | 6db4bfbfdae39c1b176bdf037f9b02015871c079 /Master/texmf-dist/tex/latex/biblatex/bbx | |
parent | eaaa1a9357feba342a82289c80811777e6f5eed5 (diff) |
biblatex 2.3 (1nov12)
git-svn-id: svn://tug.org/texlive/trunk@28161 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex/bbx')
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx | 1 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx | 30 |
2 files changed, 21 insertions, 10 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx index 60585d04d8f..ba0d4422610 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx @@ -79,6 +79,7 @@ \def\do{\printlist[debug][-\thelisttotal]}% \abx@dolists \def\do{\printfield[debug]}% + \abx@dointernalfields \abx@dofields\do{options}\do{execute}% \item\begingroup\ttfamily\leavevmode \xleaders\hbox to 0.75em{\hss-\hss}\hfill\kern\z@ diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx index d237fba1534..06d73b16a75 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx @@ -831,6 +831,7 @@ \printfield{pubstate}} \newcounter{bbx:relatedcount} +\newcounter{bbx:relatedtotal} \newbibmacro*{related}{% \ifboolexpr{ @@ -840,22 +841,31 @@ } {} {\setcounter{bbx:relatedcount}{0}% + \setcounter{bbx:relatedtotal}{0}% + \def\do##1{\stepcounter{bbx:relatedtotal}}% + \docsvfield{related}% \def\do{% \stepcounter{bbx:relatedcount}% \ifnumgreater{\value{bbx:relatedcount}}{1} {\printtext{\relateddelim}} {}}% - \ifcsundef{abx@macro@related:\strfield{relatedtype}} - {\appto{\do}{\csuse{abx@macro@related:default}}} - {\appto{\do}{\csuse{abx@macro@related:\strfield{relatedtype}}}}% - \ifcsundef{abx@ffd@*@related:\strfield{relatedtype}} - {\def\abx@tempa{related}} - {\def\abx@tempa{related:\strfield{relatedtype}}}% - \printtext[\abx@tempa]{% + \ifbibmacroundef{related:\strfield{relatedtype}} + {\appto{\do}{\usebibmacro{related:default}}} + {\appto{\do}{\usebibmacro*{related:\strfield{relatedtype}}}}% + \iffieldformatundef{related:\strfield{relatedtype}} + {\def\bbx@tempa{related}} + {\def\bbx@tempa{related:\strfield{relatedtype}}}% + \printtext[\bbx@tempa]{% \iffieldundef{relatedstring} - {\iffieldbibstring{relatedtype} - {\printtext{\bibstring{\thefield{relatedtype}}\relatedpunct}} - {}} + {\ifboolexpr{ + test {\ifnumgreater{\value{bbx:relatedtotal}}{1}} + and + test {\ifbibxstring{\thefield{relatedtype}s}} + } + {\printtext{\bibstring{\thefield{relatedtype}s}\relatedpunct}} + {\iffieldbibstring{relatedtype} + {\printtext{\bibstring{\thefield{relatedtype}}\relatedpunct}} + {}}} {\iffieldbibstring{relatedstring} {\printtext{\bibstring{\thefield{relatedstring}}\relatedpunct}} {\printtext{\printfield{relatedstring}\relatedpunct}}}% |