babel-french (10apr15)

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

6 files changed, 79 insertions, 31 deletions

diff --git a/Master/texmf-dist/doc/generic/babel-french/README b/Master/texmf-dist/doc/generic/babel-french/README
new file mode 100644
index 00000000000..48eea3cc1f6
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/babel-french/README
@@ -0,0 +1,46 @@
+=========================================================================
+The babel-french bundle
+
+French language support for the babel multilingual package
+
+Copyright 1996--2015 Daniel Flipo
+E-mail: daniel (dot) flipo (at) free (dot) fr
+
+Released under the LaTeX Project Public License v1.3 or later
+See http://www.latex-project.org/lppl.txt
+=========================================================================
+
+== PURPOSE ==
+
+This bundle is an extension to the babel package for multilingual
+typesetting. It provides all necessary macros, definitions and settings
+to typeset French documents. It is designed to work with the following
+engines: pdfTeX, XeTeX and LuaTeX.
+
+== CONTENTS ==
+
+The bundle consists of the following files:
+
+* frenchb.ins: installation file to unpack the language definition files,
+* frenchb.dtx: packed language definition files and documentation,
+* frenchb.pdf: unpacked documentation for frenchb.ldf,
+* README (this file).
+
+== INSTALLATION ==
+
+If the latest version of this package is not included in your LaTeX
+distribution, do the following:
+
+* issue "luatex frenchb.ins" to unpack the language definition files,
+* copy the files frenchb.ldf and frenchb.lua to a location where TeX
+  can find them (default location: $TEXMF/tex/generic/babel-french/).
+
+== DOCUMENTATION ==
+
+See the included manual frenchb.pdf for usage instructions.
+Another more extensive documentation is available in French here:
+http://daniel.flipo.free.fr/frenchb/frenchb-doc.pdf
+
+== CHANGES ==
+
+See the included manual frenchb.pdf, section "Change History".
diff --git a/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf b/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf
index cc11271c13f..a98cd87fc73 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 9842286e5e7..5816c5efae9 100644
--- a/Master/texmf-dist/source/generic/babel-french/frenchb.dtx
+++ b/Master/texmf-dist/source/generic/babel-french/frenchb.dtx
@@ -13,17 +13,18 @@
 %<ldf>\ProvidesLanguage{frenchb}
 %\ProvidesFile{frenchb.dtx}
 %<*!lua>
-         [2015/04/06 v3.1d French support from the babel system]
+         [2015/04/10 v3.1e French support from the babel system]
 %</!lua>
 %<*internal>
 \iffalse
 %</internal>
 %<*lua>
 --
---  File `frenchb.lua' generated from frenchb.dtx [2015/04/06 v3.1d]
+--  File `frenchb.lua' generated from frenchb.dtx [2015/04/10 v3.1e]
 --
---  Copyright (C) 2014 Daniel Flipo <daniel.flipo at free.fr>
---  License LPPL: see frenchb.dtx.
+--  Copyright (C) 2014-2015 Daniel Flipo
+--  <daniel (dot) flipo (at) free (dot) fr>
+--  License LPPL: see frenchb.ldf.
 --
 %</lua>
 %<*internal>
@@ -39,8 +40,8 @@
 %</ldf>
 %<*dtx|ldf>
 %%  Babel package for LaTeX version 2e
-%%  Copyright (C) 1996 - 2014
-%%            by Daniel Flipo <daniel.flipo at free.fr>
+%%  Copyright (C) 1996 - 2015
+%%            by Daniel Flipo <daniel (dot) flipo (at) free (dot) fr>
 %%
 %</dtx|ldf>
 %<*dtx>
@@ -455,15 +456,15 @@
 %       when this occurs, this option should be set to
 %       \fbo{false}, part titles will then be printed as ``Partie I'',
 %       ``Partie II''.
-%     \item [CustomiseFigTabcaptions=false (true*)]; when \fbo{false}
+%     \item [CustomiseFigTabCaptions=false (true*)]; when \fbo{false}
 %       the default separator (colon) is used instead of
 %       |\CaptionSeparator|.  Anyway, \frenchb{} makes sure that the
 %       colon will be typeset with proper preceeding space in French.
-%     \item [OldFigTabcaptions=true (false)] is to be used when
+%     \item [OldFigTabCaptions=true (false)] is to be used when
 %       figures' and tables' captions must be typeset as with pre~3.0
 %       versions of \frenchb{} (with |\CaptionSeparator| in French and
 %       colon otherwise). Intended for standard \LaTeX{} classes only.
-%     \item [SmallCapsFigTabcaptions=false (true*)]; when set to
+%     \item [SmallCapsFigTabCaptions=false (true*)]; when set to
 %       \fbo{false}, |\figurename| and |\tablename| will be printed in
 %       French captions as ``Figure'' and ``Table'' instead of being
 %       printed in small caps (the default).
@@ -560,7 +561,7 @@
 %    colon in other languages); this option only makes sense with the
 %    standard \LaTeX{} classes \cls{article}, \cls{report} and
 %    \cls{book}.
-%    The last option, \fbo{SmallCapsFigTabcaptions}, can be set to
+%    The last option, \fbo{SmallCapsFigTabCaptions}, can be set to
 %    \fbo{false} to typeset |\figurename| and |\tablename| in French as
 %    ``Figure'' and ``Table'' rather than in small caps (the default).
 %
@@ -3001,7 +3002,7 @@ return french_punctuation
 %
 %    With \cls{memoir} and koma-script classes, \frenchb{} customises
 %    |\captiondelim| or |\captionformat| in French (unless option
-%    \fbo{CustomiseFigTabcaptions} is set to \fbo{false}) and issues
+%    \fbo{CustomiseFigTabCaptions} is set to \fbo{false}) and issues
 %    no warning.
 %
 %    When |\@makecaption| has been changed by another class
@@ -3337,6 +3338,10 @@ return french_punctuation
 %
 % \changes{v3.1b}{2014/09/15}{New option SmallCapsFigTabCaptions.}
 %
+% \changes{v3.1e}{2015/04/10}{Corrected typo: SmallCapsFigTabcaptions
+%    instead of SmallCapsFigTabCaptions.  Pointed out by Céline
+%    Chevalier.}
+%
 %    \begin{macrocode}
 \newcommand*{\frenchbsetup}[1]{%
   \setkeys{FB}{#1}%
@@ -3370,7 +3375,7 @@ return french_punctuation
 \newif\ifFBPartNameFull             \FBPartNameFulltrue
 \newif\ifFBCustomiseFigTabCaptions  \FBCustomiseFigTabCaptionsfalse
 \newif\ifFBOldFigTabCaptions        \FBOldFigTabCaptionsfalse
-\newif\ifFBSmallCapsFigTabcaptions  \FBSmallCapsFigTabcaptionstrue
+\newif\ifFBSmallCapsFigTabCaptions  \FBSmallCapsFigTabCaptionstrue
 \newif\ifFBSuppressWarning          \FBSuppressWarningfalse
 \newif\ifFBINGuillSpace             \FBINGuillSpacefalse
 %    \end{macrocode}
diff --git a/Master/texmf-dist/source/generic/babel-french/frenchb.ins b/Master/texmf-dist/source/generic/babel-french/frenchb.ins
index c6a36241ef0..98caddd5a89 100644
--- a/Master/texmf-dist/source/generic/babel-french/frenchb.ins
+++ b/Master/texmf-dist/source/generic/babel-french/frenchb.ins
@@ -3,18 +3,18 @@
 %% driver files from the doc files in this package when run through
 %% LaTeX or TeX.
 %%
-%% Copyright 2001-2014 Daniel Flipo.  All rights reserved.
-%% 
+%% Copyright 2001-2015 Daniel Flipo.  All rights reserved.
+%%
 %% This file is part of the Babel system, release 3.9.
 %% ---------------------------------------------------
-%% 
+%%
 %% It may be distributed under the terms of the LaTeX Project Public
 %% License, as described in lppl.txt in the base LaTeX distribution.
 %% Either version 1.3 or, at your option, any later version.
 %%
 %% --------------- start of docstrip commands ------------------
 %%
-\def\filedate{2014/01/10}
+\def\filedate{2015/04/10}
 \def\batchfile{frenchb.ins}
 \input docstrip.tex
 
@@ -67,14 +67,14 @@ extension .ins) which are part of the distribution.
 
 This is a generated file.
 
-Copyright 2001-2014 Daniel Flipo.  All rights reserved.
+Copyright 2001-2015 Daniel Flipo.  All rights reserved.
 
 This file is part of the Babel system, release 3.9.
 ---------------------------------------------------
 
 It may be distributed under the terms of the LaTeX Project Public
 License, as described in lppl.txt in the base LaTeX distribution.
-Either version 1.2 or, at your option, any later version.
+Either version 1.3 or, at your option, any later version.
 
 In particular, permission is granted to customize the declarations in
 this file to serve the needs of your installation.
@@ -87,7 +87,7 @@ of this file under its original name.
 \keepsilent
 \askforoverwritefalse
 
-\usedir{tex/generic/babel-french} 
+\usedir{tex/generic/babel-french}
 
 \usepreamble\mainpreamble
 \generate{\file{frenchb.ldf}{\from{frenchb.dtx}{ldf}}}
@@ -117,9 +117,5 @@ of this file under its original name.
 \Msg{* Happy TeXing}
 \Msg{***********************************************************}
 }
- 
-\endinput
-
-
-
 
+\endinput
diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
index 8f266d3fdac..a014251917c 100644
--- a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
@@ -33,12 +33,12 @@
 %% extension .ins) which are part of the distribution.
 %% 
 \ProvidesLanguage{frenchb}
-         [2015/04/06 v3.1d French support from the babel system]
+         [2015/04/10 v3.1e French support from the babel system]
 %%
 %%  File `frenchb.ldf'
 %%  Babel package for LaTeX version 2e
-%%  Copyright (C) 1996 - 2014
-%%            by Daniel Flipo <daniel.flipo at free.fr>
+%%  Copyright (C) 1996 - 2015
+%%            by Daniel Flipo <daniel (dot) flipo (at) free (dot) fr>
 %%
 \chardef\atcatcode=\catcode`\@
 \catcode`\@=11\relax
@@ -1000,7 +1000,7 @@
 \newif\ifFBPartNameFull             \FBPartNameFulltrue
 \newif\ifFBCustomiseFigTabCaptions  \FBCustomiseFigTabCaptionsfalse
 \newif\ifFBOldFigTabCaptions        \FBOldFigTabCaptionsfalse
-\newif\ifFBSmallCapsFigTabcaptions  \FBSmallCapsFigTabcaptionstrue
+\newif\ifFBSmallCapsFigTabCaptions  \FBSmallCapsFigTabCaptionstrue
 \newif\ifFBSuppressWarning          \FBSuppressWarningfalse
 \newif\ifFBINGuillSpace             \FBINGuillSpacefalse
 \edef\FB@french{\CurrentOption}
diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.lua b/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
index bad3f4d6dbb..172fb8eb82d 100644
--- a/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
+++ b/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
@@ -1,8 +1,9 @@
 --
---  File `frenchb.lua' generated from frenchb.dtx [2015/04/06 v3.1d]
+--  File `frenchb.lua' generated from frenchb.dtx [2015/04/10 v3.1e]
 --
---  Copyright (C) 2014 Daniel Flipo <daniel.flipo at free.fr>
---  License LPPL: see frenchb.dtx.
+--  Copyright (C) 2014-2015 Daniel Flipo
+--  <daniel (dot) flipo (at) free (dot) fr>
+--  License LPPL: see frenchb.ldf.
 --
 local FB_punct_thin =
   {[string.byte("!")] = true,