summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-07-18 23:29:51 +0000
committerKarl Berry <karl@freefriends.org>2013-07-18 23:29:51 +0000
commit13ba7aa7d47c053a1bbd749c9b753d084895fed1 (patch)
tree784d944e46da5b1fc3364e602a90e13819709168
parent549f87a2032890440c9d3fc9faa568628588e2b3 (diff)
biblatex (18jul13)
git-svn-id: svn://tug.org/texlive/trunk@31234 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/RELEASE4
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/biblatex.pdfbin1089795 -> 1092312 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/biblatex.tex9
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/biblatex.def7
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/biblatex.sty4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx14
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx14
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx14
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx14
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx14
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx14
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx14
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx4
13 files changed, 95 insertions, 31 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex/RELEASE b/Master/texmf-dist/doc/latex/biblatex/RELEASE
index 755042a7db8..1d8582a70e7 100644
--- a/Master/texmf-dist/doc/latex/biblatex/RELEASE
+++ b/Master/texmf-dist/doc/latex/biblatex/RELEASE
@@ -1,3 +1,7 @@
+RELEASE NOTES FOR VERSION 2.7a
+
+* Bugfix release for 2.7
+
RELEASE NOTES FOR VERSION 2.7
* Biber version 1.7 is required for biblatex 2.7
diff --git a/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf b/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf
index 03541be3961..eaac3bf9540 100644
--- a/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/biblatex.tex b/Master/texmf-dist/doc/latex/biblatex/biblatex.tex
index 1371e490bba..16c150253fb 100644
--- a/Master/texmf-dist/doc/latex/biblatex/biblatex.tex
+++ b/Master/texmf-dist/doc/latex/biblatex/biblatex.tex
@@ -52,8 +52,8 @@
url={\biblatexhome},
author={Philipp Lehman \\(with Philip Kime, Audrey Boruvka and Joseph Wright)},
email={},
- revision={2.7},
- date={07/07/2013}}
+ revision={2.7a},
+ date={14/07/2013}}
\hypersetup{%
pdftitle={The \biblatex Package},
@@ -10948,6 +10948,11 @@ This revision history is a list of changes relevant to users of this package. Ch
\begin{changelog}
+\begin{release}{2.7a}{2013-07-14}
+\item Bugfix - respect maxnames and uniquelist in \cmd{finalandsemicolon}
+\item Corrected French localisation
+\end{release}
+
\begin{release}{2.7}{2013-07-07}
\item Added field \bibfield{eventtitleaddon} to default datamodel and styles\see{bib:fld:dat}
\item Added \cmd{ifentryinbib}, \cmd{iffirstcitekey} and \cmd{iflastcitekey}\see{aut:aux:tst}
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}},