babel-french (6apr18)

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

6 files changed, 32 insertions, 40 deletions

diff --git a/Master/texmf-dist/tex/generic/babel-french/acadian.ldf b/Master/texmf-dist/tex/generic/babel-french/acadian.ldf
index 6192d73d9c3..935402251f9 100644
--- a/Master/texmf-dist/tex/generic/babel-french/acadian.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/acadian.ldf
@@ -24,7 +24,7 @@
 %% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
 %% 
 \ProvidesLanguage{acadian}
-         [2018/02/04 v3.4b French support from the babel system]
+         [2018/03/25 v3.4c French support from the babel system]
 \PackageInfo{acadian.ldf}%
   {`acadian' dialect is currently\MessageBreak
    *absolutely identical* to the\MessageBreak
diff --git a/Master/texmf-dist/tex/generic/babel-french/canadien.ldf b/Master/texmf-dist/tex/generic/babel-french/canadien.ldf
index 24fcd0f6fec..46944194bc6 100644
--- a/Master/texmf-dist/tex/generic/babel-french/canadien.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/canadien.ldf
@@ -24,7 +24,7 @@
 %% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
 %% 
 \ProvidesLanguage{canadien}
-         [2018/02/04 v3.4b French support from the babel system]
+         [2018/03/25 v3.4c French support from the babel system]
 \PackageWarning{canadien.ldf}%
   {Option `canadien' for Babel is *deprecated*,\MessageBreak
    it might be removed sooner or later.  Please\MessageBreak
diff --git a/Master/texmf-dist/tex/generic/babel-french/francais.ldf b/Master/texmf-dist/tex/generic/babel-french/francais.ldf
index 36bea3b3d98..97f36d7a9dd 100644
--- a/Master/texmf-dist/tex/generic/babel-french/francais.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/francais.ldf
@@ -24,7 +24,7 @@
 %% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
 %% 
 \ProvidesLanguage{francais}
-         [2018/02/04 v3.4b French support from the babel system]
+         [2018/03/25 v3.4c French support from the babel system]
 \PackageWarning{francais.ldf}%
   {Option `francais' for Babel is *deprecated*,\MessageBreak
    it might be removed sooner or later.  Please\MessageBreak
diff --git a/Master/texmf-dist/tex/generic/babel-french/french.ldf b/Master/texmf-dist/tex/generic/babel-french/french.ldf
index 2ab988fbf00..4e6d9fb4105 100644
--- a/Master/texmf-dist/tex/generic/babel-french/french.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/french.ldf
@@ -24,7 +24,7 @@
 %% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
 %% 
 \ProvidesLanguage{french}
-         [2018/02/04 v3.4b French support from the babel system]
+         [2018/03/25 v3.4c French support from the babel system]
 %%
 %%  Babel package for LaTeX version 2e
 %%  Copyright © 1996-2018
@@ -106,10 +106,14 @@
 \newif\ifFBunicode
 \newif\ifFBLuaTeX
 \newif\ifFBXeTeX
-\ifdefined\luatexversion
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname luatexversion\endcsname\relax
+\else
   \FBunicodetrue \FBLuaTeXtrue
 \fi
-\ifdefined\XeTeXrevision
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname XeTeXrevision\endcsname\relax
+\else
   \FBunicodetrue \FBXeTeXtrue
 \fi
 \newif\ifFBfrench
@@ -1505,10 +1509,9 @@
      ShowOptions=true [false]\MessageBreak
      StandardLayout=true [false]\MessageBreak
      GlobalLayoutFrench=false [true]\MessageBreak
-     StandardLists=true [false]\MessageBreak
+     PartNameFull=false [true]\MessageBreak
      IndentFirst=false [true]\MessageBreak
      ReduceListSpacing=false [true]\MessageBreak
-     ListOldLayout=true [false]\MessageBreak
      StandardItemizeEnv=true [false]\MessageBreak
      StandardEnumerateEnv=true [false]\MessageBreak
      StandardItemLabels=true [false]\MessageBreak
@@ -1522,26 +1525,28 @@
         \protect\ding{43},... [\textendash]\MessageBreak
      ItemLabeliv=\textemdash, \textbullet,
         \protect\ding{43},... [\textendash]\MessageBreak
+     StandardLists=true [false]\MessageBreak
+     ListOldLayout=true [false]\MessageBreak
+     CompactItemize=false [true]\MessageBreak
      FrenchFootnotes=false [true]\MessageBreak
      AutoSpaceFootnotes=false [true]\MessageBreak
      AutoSpacePunctuation=false [true]\MessageBreak
-     OriginalTypewriter=true [false]\MessageBreak
      ThinColonSpace=true [false]\MessageBreak
-     ThinSpaceInFrenchNumbers=true [false]\MessageBreak
-     FrenchSuperscripts=false [true]\MessageBreak
-     LowercaseSuperscripts=false [true]\MessageBreak
-     PartNameFull=false [true]\MessageBreak
-     SuppressWarning=true [false]\MessageBreak
-     CustomiseFigTabCaptions=false [true]\MessageBreak
-     OldFigTabCaptions=true [false]\MessageBreak
-     SmallCapsFigTabCaptions=false [true]\MessageBreak
+     OriginalTypewriter=true [false]\MessageBreak
+     UnicodeNoBreakSpaces=true [false]\MessageBreak
+     og= <left quote character>, fg= <right quote character>%
      INGuillSpace=true [false]\MessageBreak
-     InnerGuillSingle=true [false]\MessageBreak
      EveryParGuill=open, close, none [open]\MessageBreak
      EveryLineGuill=open, close, none
                    [open in LuaTeX, none otherwise]\MessageBreak
-     UnicodeNoBreakSpaces=true [false]\MessageBreak
-     og= <left quote character>, fg= <right quote character>%
+     InnerGuillSingle=true [false]\MessageBreak
+     ThinSpaceInFrenchNumbers=true [false]\MessageBreak
+     SmallCapsFigTabCaptions=false [true]\MessageBreak
+     CustomiseFigTabCaptions=false [true]\MessageBreak
+     OldFigTabCaptions=true [false]\MessageBreak
+     FrenchSuperscripts=false [true]\MessageBreak
+     LowercaseSuperscripts=false [true]\MessageBreak
+     SuppressWarning=true [false]\MessageBreak
      \MessageBreak
      *********************************************%
      \MessageBreak\protect\frenchsetup{ShowOptions}}
@@ -1587,25 +1592,12 @@
      \fi
    \fi
    \begingroup
-     \newcommand{\FBTU}{TU}%
      \newcommand{\FBOTone}{OT1}%
-     \ifFBunicode
-       \ifx\encodingdefault\FBTU
-       \else
-         \@ifpackageloaded{fontspec}{}%
-           {\@ifpackageloaded{luainputenc}{}%
-              {\FBWarning{Add \protect\usepackage{fontspec} to the%
-               \MessageBreak preamble of your document, reported}%
-              }%
-           }
-       \fi
-     \else
-       \ifx\encodingdefault\FBOTone
-         \FBWarning{OT1 encoding should not be used for French.%
-                    \MessageBreak
-                    Add \protect\usepackage[T1]{fontenc} to the
-                    preamble\MessageBreak of your document; reported}%
-       \fi
+     \ifx\encodingdefault\FBOTone
+       \FBWarning{OT1 encoding should not be used for French.%
+                  \MessageBreak
+                  Add \protect\usepackage[T1]{fontenc} to the
+                  preamble\MessageBreak of your document; reported}%
      \fi
    \endgroup
 }
diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
index ccb6c37498e..3e359f24e6d 100644
--- a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
@@ -24,7 +24,7 @@
 %% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
 %% 
 \ProvidesLanguage{frenchb}
-         [2018/02/04 v3.4b French support from the babel system]
+         [2018/03/25 v3.4c French support from the babel system]
 \def\bbl@tempa{frenchb}
 \ifx\CurrentOption\bbl@tempa
   \let\l@frenchb\l@french
diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.lua b/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
index 8b2e9e921cd..a528db4723e 100644
--- a/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
+++ b/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
@@ -1,6 +1,6 @@
 --[[
    File `frenchb.lua’ generated from frenchb.dtx
-         [2018/02/04 v3.4b French support from the babel system]
+         [2018/03/25 v3.4c French support from the babel system]
    Copyright © 2014-2018 Daniel Flipo
    <daniel (dot) flipo (at) free (dot) fr>
    License LPPL: see french.ldf.