babel-french (27nov13)

git-svn-id: svn://tug.org/texlive/trunk@32256 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 10 insertions, 4 deletions

diff --git a/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf b/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf
index 079223e13f9..453a70595e5 100644
--- a/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf
+++ b/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf
diff --git a/Master/texmf-dist/source/generic/babel-french/frenchb.dtx b/Master/texmf-dist/source/generic/babel-french/frenchb.dtx
index 24426f35db4..ab2ab10999e 100644
--- a/Master/texmf-dist/source/generic/babel-french/frenchb.dtx
+++ b/Master/texmf-dist/source/generic/babel-french/frenchb.dtx
@@ -13,7 +13,7 @@
 %<code>\ProvidesLanguage{frenchb}
 %\fi
 %\ProvidesFile{frenchb.dtx}
-          [2013/07/06 v2.6e French support from the babel system]
+          [2013/11/25 v2.6f French support from the babel system]
 %\iffalse
 %<*dtx>
 %%
@@ -2325,6 +2325,12 @@
 %
 %  \begin{macro}{\itemizeFB}
 %  \begin{macro}{\FB@itemizesettings}
+%
+% \changes{v2.6f}{2013/11/25}{\cs{labelwidth} must be reset, f.i. when
+%    an itemize list occurs inside environments based on trivlist which
+%    set \cs{labelwidth} to 0 (see proof environment in amsthm.sty).
+%    Bug pointed out by Julien Hauseux.}
+%
 %    New environment for French itemize-lists.\\ |\FB@itemizesettings|
 %    does two things: first suppress all vertical spaces including
 %    glue, then set horizontal indentations according to
@@ -2339,8 +2345,8 @@
        \@tempdima=\parskip
        \addtolength{\topsep}{-\@tempdima}%
        \addtolength{\partopsep}{\@tempdima}%
+       \settowidth{\labelwidth}{\csname\@itemitem\endcsname}%
        \ifFBListOldLayout
-         \settowidth{\labelwidth}{\csname\@itemitem\endcsname}%
          \setlength{\leftmargin}{\labelwidth}%
          \addtolength{\leftmargin}{\labelsep}%
          \addtolength{\leftmargin}{\parindent}%
diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
index b0868e39b2a..7065a16c3b0 100644
--- a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
@@ -33,7 +33,7 @@
 %% extension .ins) which are part of the distribution.
 %% 
 \ProvidesLanguage{frenchb}
-          [2013/07/06 v2.6e French support from the babel system]
+          [2013/11/25 v2.6f French support from the babel system]
 %%
 %%    File `frenchb.ldf'
 %%    Babel package for LaTeX version 2e
@@ -756,8 +756,8 @@
        \@tempdima=\parskip
        \addtolength{\topsep}{-\@tempdima}%
        \addtolength{\partopsep}{\@tempdima}%
+       \settowidth{\labelwidth}{\csname\@itemitem\endcsname}%
        \ifFBListOldLayout
-         \settowidth{\labelwidth}{\csname\@itemitem\endcsname}%
          \setlength{\leftmargin}{\labelwidth}%
          \addtolength{\leftmargin}{\labelsep}%
          \addtolength{\leftmargin}{\parindent}%