11 files changed, 34 insertions, 26 deletions
diff --git a/Master/texmf-dist/doc/generic/babel-french/README.md b/Master/texmf-dist/doc/generic/babel-french/README.md
index 9706a705790..0ab51bc7ac1 100644
--- a/Master/texmf-dist/doc/generic/babel-french/README.md
+++ b/Master/texmf-dist/doc/generic/babel-french/README.md
@@ -31,7 +31,8 @@ See http://www.latex-project.org/lppl.txt
 If the latest version of this package is not included in your LaTeX
 distribution, do the following:
 
-* issue "luatex frenchb.dtx" to unpack the language definition files;
+* execute the command "luatex frenchb.dtx" in a terminal to unpack
+  the language definition files;
 * copy the files frenchb.lua, french.ldf, frenchb.ldf, francais.ldf,
   acadian.ldf and canadien.ldf to a location where TeX can find them
   (default location: $TEXMF/tex/generic/babel-french/);
diff --git a/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.pdf b/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.pdf
index 27f13a814fe..2eb2bb0a713 100644
--- a/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.pdf
+++ b/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.pdf
diff --git a/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex b/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex
index d1ef9c5a3a0..701df1e8965 100644
--- a/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex
+++ b/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex
@@ -120,7 +120,7 @@
 
 \title{Mode d’emploi du module \ext{babel-french}}
 \author{\href{mailto:daniel.flipo@free.fr}{Daniel \textsc{Flipo}}}
-\newcommand*{\latestversion}{3.6a}
+\newcommand*{\latestversion}{3.6b}
 \date{Version {\latestversion} -- \today}
 
 \begin{document}
@@ -1525,8 +1525,11 @@ aurait :
 \subsection{Changements entre les versions \latestversion{} et 3.5s}
 \label{ssec:changes-3.6}
 
+Un bug affectant l’utilisation de la commande |\NoAutoSpacing| dans les
+signets \pkg{hyperref} a été corrigé en version 3.6b.
+
 La version 3.6a n’a plus recours à l’extension \pkg{keyval} pour gérer les
-options, les commandes internes du noyau LaTeX (\pkg{ltkeys})
+options, les commandes internes du noyau LaTeX (\pkg{l3keys})
 |\DeclareKeys{}| et |\SetKeys{}| sont utilisées.\\
 L’espace fine ajoutée avant l’appel des notes de bas de pages est maintenant
 personnalisable (suggestion de Thomas Savary) ; le nom de la commande est
diff --git a/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf b/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf
index d9a61f76819..44cf3388f2e 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 331a0195e04..1ec34d6f5b2 100644
--- a/Master/texmf-dist/source/generic/babel-french/frenchb.dtx
+++ b/Master/texmf-dist/source/generic/babel-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-06-26 v3.6b 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/25}{\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
diff --git a/Master/texmf-dist/tex/generic/babel-french/acadian.ldf b/Master/texmf-dist/tex/generic/babel-french/acadian.ldf
index 146e293ffcd..dc2968cd4a0 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}
-         [2024-05-24 v3.6a French support from the babel system]
+         [2024-06-26 v3.6b 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 c04ed30c114..449c05b0f0e 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}
-         [2024-05-24 v3.6a French support from the babel system]
+         [2024-06-26 v3.6b 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 930425c55a6..03a40729000 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}
-         [2024-05-24 v3.6a French support from the babel system]
+         [2024-06-26 v3.6b 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 e464ea33b0b..7542b22f6e8 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}
-         [2024-05-24 v3.6a French support from the babel system]
+         [2024-06-26 v3.6b French support from the babel system]
 %%
 %%  Babel package for LaTeX version 2e
 %%  Copyright © 1996-2024
@@ -108,7 +108,6 @@
    \fi
 \fi
 \bbl@tempa
-\ifLaTeXe \NeedsTeXFormat{LaTeX2e}[2022/06/01] \fi
 \newif\ifFBunicode
 \newif\ifFBLuaTeX
 \newif\ifFBXeTeX
@@ -505,9 +504,10 @@
   \DeclareRobustCommand\rmfamilyFB{\FB@spacing@on  \rmfamilyORI}
   \DeclareRobustCommand\sffamilyFB{\FB@spacing@on  \sffamilyORI}
 \fi
+\providecommand\texorpdfstring[2]{#1}
 \DeclareRobustCommand*{\NoAutoSpacing}{%
-  \FB@spacing@off
-  \ifFB@active@punct\shorthandoff{;:!?}\fi
+  \texorpdfstring{\FB@spacing@off
+                  \ifFB@active@punct\shorthandoff{;:!?}\fi}{}%
 }
 \ifLaTeXe
 \else
@@ -526,7 +526,6 @@
   \fi
   \let\xspace\relax
 \fi
-\providecommand\texorpdfstring[2]{#1}
 \newcommand*{\FB@og}{\texorpdfstring{\@FB@og}{\guillemotleft\space}}
 \newcommand*{\FB@fg}{\texorpdfstring{\@FB@fg}{\space\guillemotright}}
 \newcommand*{\FB@guillspace}{\penalty\@M\FBguillspace}
@@ -1109,6 +1108,7 @@
                 BEFORE babel/french; reported}%
    \fi
 }
+\NeedsTeXFormat{LaTeX2e}[2022-06-01]
 \newif\ifFBShowOptions
 \newif\ifFBStandardLayout           \FBStandardLayouttrue
 \newif\ifFBGlobalLayoutFrench       \FBGlobalLayoutFrenchtrue
diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
index 59dcd15ac8c..9ca381c455e 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}
-         [2024-05-24 v3.6a French support from the babel system]
+         [2024-06-26 v3.6b French support from the babel system]
 \def\bbl@tempa{frenchb}
 \ifx\CurrentOption\bbl@tempa
   \chardef\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 3149b146ffc..2a824fb924c 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
-         [2024-05-24 v3.6a French support from the babel system]
+         [2024-06-26 v3.6b French support from the babel system]
    Copyright © 2014-2024 Daniel Flipo
    <daniel (dot) flipo (at) free (dot) fr>
    License LPPL: see french.ldf.