1 files changed, 23 insertions, 15 deletions
diff --git a/macros/latex/contrib/babel-contrib/french/frenchb.dtx b/macros/latex/contrib/babel-contrib/french/frenchb.dtx
index 331a0195e0..b52e5c67e7 100644
--- a/macros/latex/contrib/babel-contrib/french/frenchb.dtx
+++ b/macros/latex/contrib/babel-contrib/french/frenchb.dtx
@@ -75,7 +75,7 @@ Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
 %<frenchb>\ProvidesLanguage{frenchb}
 %<lua>--[[
 %<lua>   File `frenchb.lua’ generated from frenchb.dtx
-         [2024-05-24 v3.6a French support from the babel system]
+         [2024-07-25 v3.6c French support from the babel system]
 %<lua>   Copyright © 2014-2024 Daniel Flipo
 %<lua>   <daniel (dot) flipo (at) free (dot) fr>
 %<lua>   License LPPL: see french.ldf.
@@ -854,7 +854,7 @@ Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
 %  \subsubsection*{What’s new in version 3.6?}
 %
 %    Version 3.6a no longer loads the \pkg{keyval} package, replaced by
-%    core LaTeX commands (\pkg{ltkeys}). The thin space added before
+%    core LaTeX commands (\pkg{l3keys}). The thin space added before
 %    footnote’s calls is now customisable (suggested by Thomas Savary),
 %    the command’s name is |\FBfnmarkspace|.
 %
@@ -1150,11 +1150,6 @@ Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
 %    \end{macrocode}
 % \end{macro}
 %
-%    Check LaTeX2e version (support for \pkg{ltkeys} required).
-%    \begin{macrocode}
-\ifLaTeXe \NeedsTeXFormat{LaTeX2e}[2022/06/01] \fi
-%    \end{macrocode}
-%
 %\begin{macro}{\ifFBunicode}
 % \begin{macro}{\ifFBLuaTeX}
 % \begin{macro}{\ifFBXeTeX}
@@ -2779,16 +2774,22 @@ return french_punctuation
 %    active punctuation characters (if any).
 %    It is engine independent (works for TeX, LuaTeX and
 %    XeTeX based engines) and is meant to be used inside a group.
+%    The faked definition of |\texorpdfstring| will be overwritten
+%    by \file{hyperref.sty}.
 %
 % \changes{v3.2b}{2016/04/18}{\cs{NoAutoSpacing} made robust.}
 %
 % \changes{v3.2c}{2016/05/14}{New definition based on
 %    \cs{FB@spacing@off} common to all engines.}
 %
+% \changes{v3.6b}{2024/06/26}{\cs{NoAutoSpacing} must be inhibited
+%    in bookmarks.}
+%
 %    \begin{macrocode}
+\providecommand\texorpdfstring[2]{#1}
 \DeclareRobustCommand*{\NoAutoSpacing}{%
-  \FB@spacing@off
-  \ifFB@active@punct\shorthandoff{;:!?}\fi
+  \texorpdfstring{\FB@spacing@off
+                  \ifFB@active@punct\shorthandoff{;:!?}\fi}{}%
 }
 %    \end{macrocode}
 % \end{macro}
@@ -2860,7 +2861,6 @@ return french_punctuation
 %
 %    |\FB@og| and |\FB@fg| are now designed to work in bookmarks.
 %    \begin{macrocode}
-\providecommand\texorpdfstring[2]{#1}
 \newcommand*{\FB@og}{\texorpdfstring{\@FB@og}{\guillemotleft\space}}
 \newcommand*{\FB@fg}{\texorpdfstring{\@FB@fg}{\space\guillemotright}}
 %    \end{macrocode}
@@ -4264,7 +4264,7 @@ return french_punctuation
 }
 %    \end{macrocode}
 %
-%  \subsection{Setup options: key/value stuff (ltkeys)}
+%  \subsection{Setup options: key/value stuff (l3keys)}
 %  \label{ssec-keyval}
 %
 % \changes{v2.0}{2006/11/06}{New command \cs{frenchbsetup} added
@@ -4274,11 +4274,15 @@ return french_punctuation
 %    reorganised, now \cs{babel@save} and\cs{babel@savevariable} are
 %    usable for French.}
 %
-% \changes{v3.6a}{2024/05/16}{Internal `ltkeys’ replaces package
+% \changes{v3.6a}{2024/05/16}{Internal `l3keys’ replaces package
 %    `keyval’ for options’ management.}
 %
+%    Check LaTeX2e version (support for \pkg{l3keys} required).
+%    \begin{macrocode}
+\NeedsTeXFormat{LaTeX2e}[2022-06-01]
+%    \end{macrocode}
 %    All setup options are handled by command \fbsetup{} based on
-%    the \file{ltkeys}’ |\SetKeys{}| command.  A list of flags is
+%    the \file{l3keys}’ |\SetKeys{}| command.  A list of flags is
 %    defined beforehand and set to default values which will possibly
 %    be changed `AtEndOfPackage’ in case French is the main language.
 %    After this, \fbsetup{} eventually modifies the preset values of
@@ -4578,6 +4582,10 @@ return french_punctuation
 \@onlypreamble\frenchbsetup
 %    \end{macrocode}
 %
+% \changes{v3.6c}{2024/07/25}{Removed spurious @ in
+%   \cs{FBCompactItemize@setup} and \cs{FBListOldLayout@setup}
+%   commands’ names.}
+%
 %    The following commands, defined with property |.code| in
 %    |DeclareKeys{}|, execute some post-treatment required to
 %    immediately take the flags value into account.
@@ -4619,14 +4627,14 @@ return french_punctuation
         Reported}%
    \fi
   }
-\newcommand*{\FB@ListOldLayout@setup}[1]%
+\newcommand*{\FBListOldLayout@setup}[1]%
   {\csname FBListOldLayout#1\endcsname
    \ifFBListOldLayout
      \FBStandardEnumerateEnvtrue
      \renewcommand*{\FrenchLabelItem}{\textendash}%
    \fi
   }
-\newcommand*{\FB@CompactItemize@setup}[1]%
+\newcommand*{\FBCompactItemize@setup}[1]%
   {\csname FBCompactItemize#1\endcsname
    \ifFBCompactItemize
      \FBStandardItemizeEnvfalse