babel-french (6jul18)

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

6 files changed, 83 insertions, 44 deletions

diff --git a/Master/texmf-dist/tex/generic/babel-french/acadian.ldf b/Master/texmf-dist/tex/generic/babel-french/acadian.ldf
index 4caf29f3db7..5c0ffc9f3c5 100644
--- a/Master/texmf-dist/tex/generic/babel-french/acadian.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/acadian.ldf
@@ -24,7 +24,8 @@
 %% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
 %% 
 \ProvidesLanguage{acadian}
-         [2018/04/12 v3.4d French support from the babel system]
+         [2018/07/06 v3.5a 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 7c1ff2175b1..e0f27b0ce69 100644
--- a/Master/texmf-dist/tex/generic/babel-french/canadien.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/canadien.ldf
@@ -24,7 +24,8 @@
 %% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
 %% 
 \ProvidesLanguage{canadien}
-         [2018/04/12 v3.4d French support from the babel system]
+         [2018/07/06 v3.5a 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 a7613fa1588..ea19749f5a3 100644
--- a/Master/texmf-dist/tex/generic/babel-french/francais.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/francais.ldf
@@ -24,7 +24,8 @@
 %% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
 %% 
 \ProvidesLanguage{francais}
-         [2018/04/12 v3.4d French support from the babel system]
+         [2018/07/06 v3.5a 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 16aafb2ee61..34f08f69518 100644
--- a/Master/texmf-dist/tex/generic/babel-french/french.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/french.ldf
@@ -24,12 +24,13 @@
 %% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
 %% 
 \ProvidesLanguage{french}
-         [2018/04/12 v3.4d French support from the babel system]
+         [2018/07/06 v3.5a French support from the babel system]
 %%
 %%  Babel package for LaTeX version 2e
 %%  Copyright © 1996-2018
 %%            by Daniel Flipo <daniel (dot) flipo (at) free (dot) fr>
 %%
+
 \LdfInit\CurrentOption{FBclean@on@exit}
 \def\fb@error#1#2{%
     \begingroup
@@ -1065,6 +1066,7 @@
 \newif\ifFBGlobalLayoutFrench       \FBGlobalLayoutFrenchtrue
 \newif\ifFBReduceListSpacing
 \newif\ifFBListOldLayout
+\newif\ifFBListItemsAsPar
 \newif\ifFBCompactItemize
 \newif\ifFBStandardItemizeEnv       \FBStandardItemizeEnvtrue
 \newif\ifFBStandardEnumerateEnv     \FBStandardEnumerateEnvtrue
@@ -1208,6 +1210,8 @@
              \FBStandardEnumerateEnvfalse
              \FBStandardItemLabelsfalse
            \fi}%
+  \define@key{FB}{ListItemsAsPar}[true]%
+          {\csname FBListItemsAsPar#1\endcsname}
   \define@key{FB}{IndentFirst}[true]%
           {\csname FBIndentFirst#1\endcsname}%
   \define@key{FB}{FrenchFootnotes}[true]%
@@ -1512,6 +1516,7 @@
      GlobalLayoutFrench=false [true]\MessageBreak
      PartNameFull=false [true]\MessageBreak
      IndentFirst=false [true]\MessageBreak
+     ListItemsAsPar=true [false]\MessageBreak
      ReduceListSpacing=false [true]\MessageBreak
      StandardItemizeEnv=true [false]\MessageBreak
      StandardEnumerateEnv=true [false]\MessageBreak
@@ -1620,20 +1625,31 @@
 \newcommand*{\Frlabelitemii}{\FrenchLabelItem}
 \newcommand*{\Frlabelitemiii}{\FrenchLabelItem}
 \newcommand*{\Frlabelitemiv}{\FrenchLabelItem}
-\newlength\listindentFB
+\newdimen\listindentFB
 \setlength{\listindentFB}{-1pt}
-\newlength\descindentFB
+\newdimen\descindentFB
 \setlength{\descindentFB}{-1pt}
-\newlength\labelwidthFB
+\newdimen\labelindentFB
+\setlength{\labelindentFB}{-1pt}
+\newdimen\labelwidthFB
 \setlength{\labelwidthFB}{-1pt}
-\newlength\leftmarginFB
+\newdimen\leftmarginFB
 \def\FB@listHsettings{%
-   \leftmarginFB\labelwidthFB
-   \advance\leftmarginFB \labelsep
-   \bbl@for\FB@dp {1, 2, 3, 4, 5, 6}%
-     {\csname leftmargin\romannumeral\FB@dp\endcsname \leftmarginFB}%
-   \advance\leftmargini \listindentFB
-   \leftmargin\csname leftmargin\ifnum\@listdepth=\@ne i\else
+  \ifFBListItemsAsPar
+    \itemindent=\labelindentFB
+    \advance\itemindent by \labelwidthFB
+    \advance\itemindent by \labelsep
+    \leftmargini\z@
+    \bbl@for\FB@dp {2, 3, 4, 5, 6}%
+      {\csname leftmargin\romannumeral\FB@dp\endcsname=\labelindentFB}%
+  \else
+    \leftmarginFB=\labelwidthFB
+    \advance\leftmarginFB by \labelsep
+    \bbl@for\FB@dp {1, 2, 3, 4, 5, 6}%
+      {\csname leftmargin\romannumeral\FB@dp\endcsname=\leftmarginFB}%
+    \advance\leftmargini by \listindentFB
+  \fi
+  \leftmargin=\csname leftmargin\ifnum\@listdepth=\@ne i\else
                                                       ii\fi\endcsname
 }
 \def\FB@itemizesettings{%
@@ -1657,7 +1673,7 @@
 }
 \def\itemizeFB{%
     \ifnum \@itemdepth >\thr@@\@toodeep\else
-      \advance\@itemdepth\@ne
+      \advance\@itemdepth by \@ne
       \edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
       \expandafter
       \listORI
@@ -1666,28 +1682,41 @@
     \fi
 }
 \let\enditemizeFB\endlistORI
-\def\labelitemsFB{%
-    \let\labelitemi\Frlabelitemi
-    \let\labelitemii\Frlabelitemii
-    \let\labelitemiii\Frlabelitemiii
-    \let\labelitemiv\Frlabelitemiv
-    \ifdim\labelwidthFB<\z@
-      \settowidth{\labelwidthFB}{\FrenchLabelItem}%
+\def\setlabelitemsFB{%
+  \let\labelitemi\Frlabelitemi
+  \let\labelitemii\Frlabelitemii
+  \let\labelitemiii\Frlabelitemiii
+  \let\labelitemiv\Frlabelitemiv
+  \ifdim\labelwidthFB<\z@
+    \settowidth{\labelwidthFB}{\FrenchLabelItem}%
+  \fi
+}
+\def\setlistindentFB{%
+  \ifdim\labelindentFB<\z@
+    \ifdim\parindent=\z@
+      \setlength{\labelindentFB}{1.5em}%
+    \else
+      \setlength{\labelindentFB}{\parindent}%
     \fi
-    \ifdim\listindentFB<\z@
-      \ifdim\parindent=\z@
-        \setlength{\listindentFB}{1.5em}%
-      \else
-        \setlength{\listindentFB}{\parindent}%
-      \fi
+  \fi
+  \ifdim\listindentFB<\z@
+    \ifdim\parindent=\z@
+      \setlength{\listindentFB}{1.5em}%
+    \else
+      \setlength{\listindentFB}{\parindent}%
     \fi
-    \ifdim\descindentFB<\z@
+  \fi
+  \ifdim\descindentFB<\z@
+    \ifFBListItemsAsPar
+      \setlength{\descindentFB}{\labelindentFB}%
+    \else
       \setlength{\descindentFB}{\listindentFB}%
     \fi
+  \fi
 }
 \def\enumerateFB{%
   \ifnum \@enumdepth >\thr@@\@toodeep\else
-    \advance\@enumdepth\@ne
+    \advance\@enumdepth by \@ne
     \edef\@enumctr{enum\romannumeral\the\@enumdepth}%
     \expandafter
     \list
@@ -1699,28 +1728,33 @@
 \let\endenumerateFB\endlistORI
 \def\descriptionFB{%
       \list{}{\FB@listHsettings
-              \labelwidth\z@
-              \itemindent-\leftmargin
-              \ifnum\@listdepth=1
-                \ifdim\descindentFB=\z@
-                  \ifdim\listindentFB>\z@
-                    \leftmargini\listindentFB
-                    \leftmargin\leftmargini
-                    \itemindent-\leftmargin
+              \labelwidth=\z@
+              \ifFBListItemsAsPar
+                \itemindent=\descindentFB
+              \else
+                \itemindent=-\leftmargin
+                \ifnum\@listdepth=1
+                  \ifdim\descindentFB=\z@
+                    \ifdim\listindentFB>\z@
+                      \leftmargini=\listindentFB
+                      \leftmargin=\leftmargini
+                      \itemindent=-\leftmargin
+                    \fi
+                  \else
+                    \advance\itemindent by \descindentFB
                   \fi
-                \else
-                  \advance\itemindent by \descindentFB
                 \fi
               \fi
               \let\makelabel\descriptionlabel}%
 }
 \let\enddescriptionFB\endlistORI
 \def\update@frenchlists{%
+  \setlistindentFB
   \ifFBReduceListSpacing \let\list\listFB \fi
   \ifFBStandardItemizeEnv
   \else \let\itemize\itemizeFB \fi
   \ifFBStandardItemLabels
-  \else \labelitemsFB \fi
+  \else \setlabelitemsFB \fi
   \ifFBStandardEnumerateEnv
   \else \let\enumerate\enumerateFB \let\description\descriptionFB \fi
 }
@@ -1769,7 +1803,7 @@
 \parindentFFN=10in
 \newcommand*{\dotFFN}{.}
 \newcommand*{\kernFFN}{\kern .5em}
-\newlength\FBfnindent
+\newdimen\FBfnindent
 \ifFB@koma
   \let\@makefntextORI\@makefntext
   \let\@@makefnmarkORI\@@makefnmark
diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
index e8c36d4e847..14f5d0af815 100644
--- a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
@@ -24,7 +24,8 @@
 %% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
 %% 
 \ProvidesLanguage{frenchb}
-         [2018/04/12 v3.4d French support from the babel system]
+         [2018/07/06 v3.5a 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 bf492065382..6121d2545ec 100644
--- a/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
+++ b/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
@@ -1,10 +1,11 @@
 --[[
    File `frenchb.lua’ generated from frenchb.dtx
-         [2018/04/12 v3.4d French support from the babel system]
+         [2018/07/06 v3.5a French support from the babel system]
    Copyright © 2014-2018 Daniel Flipo
    <daniel (dot) flipo (at) free (dot) fr>
    License LPPL: see french.ldf.
 --]]
+
 local FB_punct_thin =
   {[string.byte("!")] = true,
    [string.byte("?")] = true,