From 13ba7aa7d47c053a1bbd749c9b753d084895fed1 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 18 Jul 2013 23:29:51 +0000 Subject: biblatex (18jul13) git-svn-id: svn://tug.org/texlive/trunk@31234 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/biblatex/biblatex.def | 7 +++---- Master/texmf-dist/tex/latex/biblatex/biblatex.sty | 4 ++-- Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx | 14 +++++++++++--- Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx | 14 +++++++++++--- Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx | 14 +++++++++++--- Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx | 14 +++++++++++--- Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx | 14 +++++++++++--- Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx | 14 +++++++++++--- Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx | 14 +++++++++++--- Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx | 4 ++-- 10 files changed, 84 insertions(+), 29 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.def b/Master/texmf-dist/tex/latex/biblatex/biblatex.def index 304d1b58b6f..6b466241f2e 100644 --- a/Master/texmf-dist/tex/latex/biblatex/biblatex.def +++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.def @@ -43,9 +43,8 @@ \newcommand*{\volcitedelim}{\addcomma\space} \newcommand*{\textcitedelim}{% \iffinalcitedelim - {\iftextcitepunct - {\finalandsemicolon} - {\ifnumgreater{\value{textcitetotal}}{2}{\finalandcomma}{}}% + {\ifnumgreater{\value{textcitetotal}}{2} + {\iftextcitepunct{\finalandsemicolon}{\finalandcomma}}{}% \addspace\bibstring{and}} {\iftextcitepunct{\addsemicolon}{\addcomma}}% \space} @@ -2836,7 +2835,7 @@ \entrydata*{#1}{% \printfield{volume}% \printfield{part}% - \setunit{\addcolon\space}% + \setunit*{\addcolon\space}% \usebibmacro{title}% \ifboolexpr{ test {\ifnamesequal{author}{savedauthor}} diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty index 8ff6e0ffc9d..8bbfd065998 100644 --- a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty +++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty @@ -3,8 +3,8 @@ %% % Set up the version strings here, so they are the same for both branches -\def\abx@date{2013/07/08} -\def\abx@version{2.7} +\def\abx@date{2013/07/15} +\def\abx@version{2.7a} \def\abx@bbxid{\abx@date\space v\abx@version\space biblatex bibliography style (PK/JW/AB)} \def\abx@cbxid{\abx@date\space v\abx@version\space biblatex citation style (PK/JW/AB)} \def\abx@lbxid{\abx@date\space v\abx@version\space biblatex localization (PK/JW/AB)} 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 c21cc843edd..7792b77e9b0 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx @@ -187,9 +187,17 @@ \newbibmacro*{textcite:count}{% \stepcounter{textcitetotal}% - \ifnumgreater{\value{labelname}}{\value{textcitemaxnames}} - {\setcounter{textcitemaxnames}{\value{labelname}}} - {}} + \ifnumgreater{\value{uniquelist}}{\value{maxnames}} + {\ifnumgreater{\value{uniquelist}}{\value{textcitemaxnames}} + {\setcounter{textcitemaxnames}{\value{uniquelist}}} + {}} + {\ifnumless{\value{labelname}}{\value{maxnames}} + {\ifnumgreater{\value{labelname}}{\value{textcitemaxnames}} + {\setcounter{textcitemaxnames}{\value{labelname}}} + {}} + {\ifnumgreater{\value{maxnames}}{\value{textcitemaxnames}} + {\setcounter{textcitemaxnames}{\value{maxnames}}} + {}}}} \DeclareCiteCommand{\cbx@textcite} {\usebibmacro{textcite:init}} 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 ab58e623dea..848f3628893 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx @@ -246,9 +246,17 @@ \newbibmacro*{textcite:count}{% \stepcounter{textcitetotal}% - \ifnumgreater{\value{labelname}}{\value{textcitemaxnames}} - {\setcounter{textcitemaxnames}{\value{labelname}}} - {}} + \ifnumgreater{\value{uniquelist}}{\value{maxnames}} + {\ifnumgreater{\value{uniquelist}}{\value{textcitemaxnames}} + {\setcounter{textcitemaxnames}{\value{uniquelist}}} + {}} + {\ifnumless{\value{labelname}}{\value{maxnames}} + {\ifnumgreater{\value{labelname}}{\value{textcitemaxnames}} + {\setcounter{textcitemaxnames}{\value{labelname}}} + {}} + {\ifnumgreater{\value{maxnames}}{\value{textcitemaxnames}} + {\setcounter{textcitemaxnames}{\value{maxnames}}} + {}}}} \DeclareCiteCommand{\cbx@textcite} {\usebibmacro{textcite:init}} 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 cf73b4c72e9..087ba067fb4 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx @@ -217,9 +217,17 @@ \newbibmacro*{textcite:count}{% \stepcounter{textcitetotal}% - \ifnumgreater{\value{labelname}}{\value{textcitemaxnames}} - {\setcounter{textcitemaxnames}{\value{labelname}}} - {}} + \ifnumgreater{\value{uniquelist}}{\value{maxnames}} + {\ifnumgreater{\value{uniquelist}}{\value{textcitemaxnames}} + {\setcounter{textcitemaxnames}{\value{uniquelist}}} + {}} + {\ifnumless{\value{labelname}}{\value{maxnames}} + {\ifnumgreater{\value{labelname}}{\value{textcitemaxnames}} + {\setcounter{textcitemaxnames}{\value{labelname}}} + {}} + {\ifnumgreater{\value{maxnames}}{\value{textcitemaxnames}} + {\setcounter{textcitemaxnames}{\value{maxnames}}} + {}}}} \DeclareCiteCommand{\cbx@textcite} {\usebibmacro{textcite:init}} 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 eca6a17053e..0fb8dfbdde8 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx @@ -219,9 +219,17 @@ \newbibmacro*{textcite:count}{% \stepcounter{textcitetotal}% - \ifnumgreater{\value{labelname}}{\value{textcitemaxnames}} - {\setcounter{textcitemaxnames}{\value{labelname}}} - {}} + \ifnumgreater{\value{uniquelist}}{\value{maxnames}} + {\ifnumgreater{\value{uniquelist}}{\value{textcitemaxnames}} + {\setcounter{textcitemaxnames}{\value{uniquelist}}} + {}} + {\ifnumless{\value{labelname}}{\value{maxnames}} + {\ifnumgreater{\value{labelname}}{\value{textcitemaxnames}} + {\setcounter{textcitemaxnames}{\value{labelname}}} + {}} + {\ifnumgreater{\value{maxnames}}{\value{textcitemaxnames}} + {\setcounter{textcitemaxnames}{\value{maxnames}}} + {}}}} \DeclareCiteCommand{\cbx@textcite} {\usebibmacro{textcite:init}} 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 088d37dfa13..a287832b6ee 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx @@ -213,9 +213,17 @@ \newbibmacro*{textcite:count}{% \stepcounter{textcitetotal}% - \ifnumgreater{\value{labelname}}{\value{textcitemaxnames}} - {\setcounter{textcitemaxnames}{\value{labelname}}} - {}} + \ifnumgreater{\value{uniquelist}}{\value{maxnames}} + {\ifnumgreater{\value{uniquelist}}{\value{textcitemaxnames}} + {\setcounter{textcitemaxnames}{\value{uniquelist}}} + {}} + {\ifnumless{\value{labelname}}{\value{maxnames}} + {\ifnumgreater{\value{labelname}}{\value{textcitemaxnames}} + {\setcounter{textcitemaxnames}{\value{labelname}}} + {}} + {\ifnumgreater{\value{maxnames}}{\value{textcitemaxnames}} + {\setcounter{textcitemaxnames}{\value{maxnames}}} + {}}}} \DeclareCiteCommand{\cbx@textcite} {\usebibmacro{textcite:init}} 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 db9f3714719..13f8d641633 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx @@ -186,9 +186,17 @@ \newbibmacro*{textcite:count}{% \stepcounter{textcitetotal}% - \ifnumgreater{\value{labelname}}{\value{textcitemaxnames}} - {\setcounter{textcitemaxnames}{\value{labelname}}} - {}} + \ifnumgreater{\value{uniquelist}}{\value{maxnames}} + {\ifnumgreater{\value{uniquelist}}{\value{textcitemaxnames}} + {\setcounter{textcitemaxnames}{\value{uniquelist}}} + {}} + {\ifnumless{\value{labelname}}{\value{maxnames}} + {\ifnumgreater{\value{labelname}}{\value{textcitemaxnames}} + {\setcounter{textcitemaxnames}{\value{labelname}}} + {}} + {\ifnumgreater{\value{maxnames}}{\value{textcitemaxnames}} + {\setcounter{textcitemaxnames}{\value{maxnames}}} + {}}}} \DeclareCiteCommand{\cbx@textcite} {\usebibmacro{textcite:init}} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx index bced4a2337f..04d65224ecc 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx @@ -156,9 +156,17 @@ \newbibmacro*{textcite:count}{% \stepcounter{textcitetotal}% - \ifnumgreater{\value{labelname}}{\value{textcitemaxnames}} - {\setcounter{textcitemaxnames}{\value{labelname}}} - {}} + \ifnumgreater{\value{uniquelist}}{\value{maxnames}} + {\ifnumgreater{\value{uniquelist}}{\value{textcitemaxnames}} + {\setcounter{textcitemaxnames}{\value{uniquelist}}} + {}} + {\ifnumless{\value{labelname}}{\value{maxnames}} + {\ifnumgreater{\value{labelname}}{\value{textcitemaxnames}} + {\setcounter{textcitemaxnames}{\value{labelname}}} + {}} + {\ifnumgreater{\value{maxnames}}{\value{textcitemaxnames}} + {\setcounter{textcitemaxnames}{\value{maxnames}}} + {}}}} \DeclareCiteCommand{\cbx@textcite} {\usebibmacro{textcite:init}} diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx index 9a4e048c644..97f63819a11 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx @@ -433,7 +433,7 @@ langitalian = {{italien}{italien}}, langlatin = {{latin}{latin}}, langnorwegian = {{norv\'egien}{norv\'egien}}, -% langpolish = {{}{}},% FIXME: missing + langpolish = {{polonais}{polonais}}, langportuguese = {{portugais}{portugais}}, langrussian = {{russe}{russe}}, langspanish = {{espagnol}{espagnol}}, @@ -453,7 +453,7 @@ fromitalian = {{de l'italien}{de l'italien}}, fromlatin = {{du latin}{du latin}}, fromnorwegian = {{du norv\'egien}{du norv\'egien}}, -% frompolish = {{}{}},% FIXME: missing + frompolish = {{du polonais}{du polonais}}, fromportuguese = {{du portugais}{du portugais}}, fromrussian = {{du russe}{du russe}}, fromspanish = {{de l'espagnol}{de l'espagnol}}, -- cgit v1.2.3