babel-french (19jun13)

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

3 files changed, 30 insertions, 26 deletions

diff --git a/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf b/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf
index b01748c55d3..917bcd75440 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 6050abb0391..3938e69cc6b 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/05/20 v2.6c French support from the babel system]
+          [2013/06/19 v2.6d French support from the babel system]
 %\iffalse
 %<*dtx>
 %%
@@ -794,17 +794,21 @@
 %    \end{macrocode}
 %
 % \changes{v2.5a}{2010/08/10}{Define \cs{Fthinspace} for those who want
-%   to customise the width of the space before ; ! and ?.}
+%    to customise the width of the space before ; ! and ?.}
+%
+% \changes{v2.6d}{2013/06/19}{Rename \cs{Fthinspace} to
+%    \cs{FBthinspace} and \cs{Fcolonspace} to \cs{FBcolonspace} to avoid
+%    a conflict with fournier.sty.}
 %
 %    According to the I.N.\ specifications, the `:' requires a normal
 %    space before it, but some people prefer a |\thinspace| (just
-%    like the other three).  We define |\Fcolonspace| to hold the
+%    like the other three).  We define |\FBcolonspace| to hold the
 %    required amount of space (user customisable).  In case some users
 %    are not satisfied with |\thinspace|'s width, it is also
 %    customisable.
 %    \begin{macrocode}
-\newcommand*{\Fcolonspace}{\space}
-\newcommand*{\Fthinspace}{\thinspace}
+\newcommand*{\FBcolonspace}{\space}
+\newcommand*{\FBthinspace}{\thinspace}
 %    \end{macrocode}
 %
 %  \begin{macro}{\ifF@active@punct}
@@ -958,7 +962,7 @@
      \XeTeXinterchartoks \FB@punctguilf \FB@punctthick = {%
                      \FDP@colonspace}%
      \XeTeXinterchartoks 255 \FB@punctthick = {%
-                     \ifhmode\unskip\penalty\@M\Fcolonspace\fi}%
+                     \ifhmode\unskip\penalty\@M\FBcolonspace\fi}%
      \@for\FB@char:={`\;,`\!,`\?}\do
           {\XeTeXcharclass\FB@char=\FB@punctthin}%
      \XeTeXinterchartoks \z@ \FB@punctthin = {%
@@ -966,7 +970,7 @@
      \XeTeXinterchartoks \FB@punctguilf \FB@punctthin = {%
                      \FDP@thinspace}%
      \XeTeXinterchartoks 255 \FB@punctthin = {%
-                     \ifhmode\unskip\penalty\@M\Fthinspace\fi}%
+                     \ifhmode\unskip\penalty\@M\FBthinspace\fi}%
      \XeTeXinterchartoks \FB@punctguilo \z@ = {%
                 \ifFBAutoSpaceGuill\FBguill@spacing\fi}%
      \XeTeXinterchartoks \FB@punctguilo 255 = {%
@@ -1053,7 +1057,7 @@
   \declare@shorthand{french}{;}{%
       \ifhmode
       \ifdim\lastskip>\z@
-          \unskip\penalty\@M\Fthinspace
+          \unskip\penalty\@M\FBthinspace
           \else
             \FDP@thinspace
         \fi
@@ -1068,7 +1072,7 @@
   \declare@shorthand{french}{!}{%
       \ifhmode
         \ifdim\lastskip>\z@
-          \unskip\penalty\@M\Fthinspace
+          \unskip\penalty\@M\FBthinspace
         \else
           \FDP@thinspace
         \fi
@@ -1077,7 +1081,7 @@
   \declare@shorthand{french}{?}{%
       \ifhmode
         \ifdim\lastskip>\z@
-          \unskip\penalty\@M\Fthinspace
+          \unskip\penalty\@M\FBthinspace
         \else
           \FDP@thinspace
         \fi
@@ -1086,7 +1090,7 @@
   \declare@shorthand{french}{:}{%
       \ifhmode
         \ifdim\lastskip>\z@
-          \unskip\penalty\@M\Fcolonspace
+          \unskip\penalty\@M\FBcolonspace
         \else
           \FDP@colonspace
         \fi
@@ -1145,8 +1149,8 @@
 %    Set the default now for Plain (done later for \LaTeX).
 %    \begin{macrocode}
 \def\autospace@beforeFDP{%
-          \def\FDP@thinspace{\penalty\@M\Fthinspace}%
-          \def\FDP@colonspace{\penalty\@M\Fcolonspace}}
+          \def\FDP@thinspace{\penalty\@M\FBthinspace}%
+          \def\FDP@colonspace{\penalty\@M\FBcolonspace}}
 \def\noautospace@beforeFDP{\let\FDP@thinspace\@empty
                             \let\FDP@colonspace\@empty}
 \ifLaTeXe
@@ -3331,7 +3335,7 @@
 %    |ThinColonSpace| changes the normal unbreakable space typeset in
 %     French before `:' to a thin space.
 %    \begin{macrocode}
-  \ifFBThinColonSpace\renewcommand*{\Fcolonspace}{\Fthinspace}\fi
+  \ifFBThinColonSpace\renewcommand*{\FBcolonspace}{\FBthinspace}\fi
 %    \end{macrocode}
 %
 %    When |true|, |ThinSpaceInFrenchNumbers| redefines |numprint.sty|'s
diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
index 2b5cac498e2..6f000ddf964 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/05/20 v2.6c French support from the babel system]
+          [2013/06/19 v2.6d French support from the babel system]
 %%
 %%    File `frenchb.ldf'
 %%    Babel package for LaTeX version 2e
@@ -120,8 +120,8 @@
     \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
   \fi
   \vskip\belowcaptionskip}
-\newcommand*{\Fcolonspace}{\space}
-\newcommand*{\Fthinspace}{\thinspace}
+\newcommand*{\FBcolonspace}{\space}
+\newcommand*{\FBthinspace}{\thinspace}
 \newif\ifFB@active@punct  \FB@active@puncttrue
 \newif\ifFB@xetex@punct
 \begingroup\expandafter\expandafter\expandafter\endgroup
@@ -186,7 +186,7 @@
      \XeTeXinterchartoks \FB@punctguilf \FB@punctthick = {%
                      \FDP@colonspace}%
      \XeTeXinterchartoks 255 \FB@punctthick = {%
-                     \ifhmode\unskip\penalty\@M\Fcolonspace\fi}%
+                     \ifhmode\unskip\penalty\@M\FBcolonspace\fi}%
      \@for\FB@char:={`\;,`\!,`\?}\do
           {\XeTeXcharclass\FB@char=\FB@punctthin}%
      \XeTeXinterchartoks \z@ \FB@punctthin = {%
@@ -194,7 +194,7 @@
      \XeTeXinterchartoks \FB@punctguilf \FB@punctthin = {%
                      \FDP@thinspace}%
      \XeTeXinterchartoks 255 \FB@punctthin = {%
-                     \ifhmode\unskip\penalty\@M\Fthinspace\fi}%
+                     \ifhmode\unskip\penalty\@M\FBthinspace\fi}%
      \XeTeXinterchartoks \FB@punctguilo \z@ = {%
                 \ifFBAutoSpaceGuill\FBguill@spacing\fi}%
      \XeTeXinterchartoks \FB@punctguilo 255 = {%
@@ -244,7 +244,7 @@
   \declare@shorthand{french}{;}{%
       \ifhmode
       \ifdim\lastskip>\z@
-          \unskip\penalty\@M\Fthinspace
+          \unskip\penalty\@M\FBthinspace
           \else
             \FDP@thinspace
         \fi
@@ -253,7 +253,7 @@
   \declare@shorthand{french}{!}{%
       \ifhmode
         \ifdim\lastskip>\z@
-          \unskip\penalty\@M\Fthinspace
+          \unskip\penalty\@M\FBthinspace
         \else
           \FDP@thinspace
         \fi
@@ -262,7 +262,7 @@
   \declare@shorthand{french}{?}{%
       \ifhmode
         \ifdim\lastskip>\z@
-          \unskip\penalty\@M\Fthinspace
+          \unskip\penalty\@M\FBthinspace
         \else
           \FDP@thinspace
         \fi
@@ -271,7 +271,7 @@
   \declare@shorthand{french}{:}{%
       \ifhmode
         \ifdim\lastskip>\z@
-          \unskip\penalty\@M\Fcolonspace
+          \unskip\penalty\@M\FBcolonspace
         \else
           \FDP@colonspace
         \fi
@@ -292,8 +292,8 @@
 \fi
 \newif\ifFBAutoSpacePunctuation  \FBAutoSpacePunctuationtrue
 \def\autospace@beforeFDP{%
-          \def\FDP@thinspace{\penalty\@M\Fthinspace}%
-          \def\FDP@colonspace{\penalty\@M\Fcolonspace}}
+          \def\FDP@thinspace{\penalty\@M\FBthinspace}%
+          \def\FDP@colonspace{\penalty\@M\FBcolonspace}}
 \def\noautospace@beforeFDP{\let\FDP@thinspace\@empty
                             \let\FDP@colonspace\@empty}
 \ifLaTeXe
@@ -1247,7 +1247,7 @@
      \let\rmfamily\rmfamilyFB
      \let\sffamily\sffamilyFB
   \fi
-  \ifFBThinColonSpace\renewcommand*{\Fcolonspace}{\Fthinspace}\fi
+  \ifFBThinColonSpace\renewcommand*{\FBcolonspace}{\FBthinspace}\fi
   \@ifpackageloaded{numprint}%
   {\ifnprt@autolanguage
      \providecommand*{\npstylefrench}{}%