texlive[65435] Master/texmf-dist: babel-french (2jan23)
commits+karl at tug.org
commits+karl at tug.org
Mon Jan 2 22:20:52 CET 2023
Revision: 65435
http://tug.org/svn/texlive?view=revision&revision=65435
Author: karl
Date: 2023-01-02 22:20:51 +0100 (Mon, 02 Jan 2023)
Log Message:
-----------
babel-french (2jan23)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/generic/babel-french/README.md
trunk/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.pdf
trunk/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex
trunk/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf
trunk/Master/texmf-dist/source/generic/babel-french/frenchb.dtx
trunk/Master/texmf-dist/source/generic/babel-french/frenchb.ins
trunk/Master/texmf-dist/tex/generic/babel-french/acadian.ldf
trunk/Master/texmf-dist/tex/generic/babel-french/canadien.ldf
trunk/Master/texmf-dist/tex/generic/babel-french/francais.ldf
trunk/Master/texmf-dist/tex/generic/babel-french/french.ldf
trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
Modified: trunk/Master/texmf-dist/doc/generic/babel-french/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/generic/babel-french/README.md 2023-01-02 21:20:25 UTC (rev 65434)
+++ trunk/Master/texmf-dist/doc/generic/babel-french/README.md 2023-01-02 21:20:51 UTC (rev 65435)
@@ -50,5 +50,5 @@
See the included manual frenchb.pdf, section "Change History".
---
-Copyright 1996--2022 Daniel Flipo
+Copyright 1996--2023 Daniel Flipo
E-mail: daniel (dot) flipo (at) free (dot) fr
Modified: trunk/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex 2023-01-02 21:20:25 UTC (rev 65434)
+++ trunk/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex 2023-01-02 21:20:51 UTC (rev 65435)
@@ -121,7 +121,7 @@
\title{Mode d’emploi du module \ext{babel-french}}
\author{\href{mailto:daniel.flipo at free.fr}{Daniel \textsc{Flipo}}}
-\newcommand*{\latestversion}{3.5o}
+\newcommand*{\latestversion}{3.5p}
\date{Version {\latestversion} -- \today}
\begin{document}
@@ -158,9 +158,6 @@
\vspace{-\baselineskip}\noindent
\descindentFB=0pt
\begin{description}
- \item[3 juillet 2016] Ajout dans la version~3.2d, du paramètre
- |\descindentFB| pour les listes \env{description}, voir
- section~\ref{ssec:lists}.
\item[15 janvier 2017] La version~3.2f est compatible avec l’extension
\ext{icomma}.
\item[30 janvier 2017] Le comportement par défaut de la commande
@@ -182,10 +179,12 @@
p.~\pageref{frquote}.
\item[18 avril 2022] Nouvelle commande |\bname{}|, variante sans petites
capitales de |\bsc{}| voir p.~\pageref{bname}.
- \item[11 novembre 2022] Avec Lua(La)TeX le codage |«~abc~»| ne produit plus
+ \item[11 nov. 2022] Avec Lua(La)TeX le codage |«~abc~»| ne produit plus
d’espace parasite. La redéfinition de |\shorthandoff{}|,
|\shorthandon{}| sous LuaTeX/XeTeX est supprimée.
-\end{description}
+ \item[3 janvier 2022] Modification de la commande |\DecimalMathComma|,
+ voir p.~\pageref{decimalmathcomma}.
+ \end{description}
\end{abstract}
\egroup
@@ -623,15 +622,23 @@
(jan-vier, dé-cembre, …) qui est interdite par défaut.
\enlargethispage{\baselineskip}
-\item En mode mathématique, la virgule est toujours suivie d’une espace
- car elle est traitée comme un signe de ponctuation et non comme
- une virgule décimale. La commande |\DecimalMathComma| supprime cette
- espace (mais uniquement en français), on revient au comportement par
- défaut avec |\StandardMathComma|. Remarquer qu’après une
- commande |\DecimalMathComma|, il est nécessaire de saisir un espace
- explicite dans les listes et les intervalles par exemple |$(x,\ y)$|
- et |$[0,\ 1]$|.
- Ces deux commandes sont utilisables n’importe où dans le document.
+\item En mode mathématique, la virgule est toujours suivie d’une espace car
+ elle est traitée comme un signe de ponctuation et non comme une virgule
+ décimale%
+ \footnote{Une virgule décimale peut toujours être codée \code{\{,\}} en mode
+ math.}.
+ La commande |\DecimalMathComma| supprime cette espace (mais uniquement en
+ français), on revient au comportement standard avec |\StandardMathComma|.
+ On peut l’utiliser dans un groupe pour limiter sa portée, sinon
+ après une commande |\DecimalMathComma|, il est nécessaire de saisir une
+ espace (fine) dans les listes et les intervalles par exemple |$(x,\,y)$| et
+ |$[0,\,1]$|.\hlabel{decimalmathcomma}
+
+ |\DecimalMathComma| peut être placée soit dans le préambule, soit dans le
+ corps du document \emph{en mode texte} et dans une partie \emph{en français},
+ son effet survit à un changement de langue (passage en anglais et retour en
+ français par exemple), sauf bien sûr si elle est placée dans un groupe.
+
Une solution alternative consiste à utiliser l’extension \ext{icomma}.
\item La commande |\nombre|, destinée à formater
@@ -1566,6 +1573,12 @@
car elle cassait la variante |\shorthandoff*{}|.
\end{itemize}
+\vspace{\parskip}
+Le comportement de |\DecimalMathComma| a changé en version~3.5p suite à une
+remarque de Fabrice Eudes : elle peut désormais être utilisée dans le préambule.
+Voir section~\ref{decimalmathcomma} p.~\pageref{decimalmathcomma} pour plus de
+détails.
+
\subsection{Changements entre les versions 3.4d et 3.3d}
\label{ssec:changes-3.4}
Modified: trunk/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/generic/babel-french/frenchb.dtx
===================================================================
--- trunk/Master/texmf-dist/source/generic/babel-french/frenchb.dtx 2023-01-02 21:20:25 UTC (rev 65434)
+++ trunk/Master/texmf-dist/source/generic/babel-french/frenchb.dtx 2023-01-02 21:20:51 UTC (rev 65435)
@@ -11,7 +11,7 @@
%<frenchb>\ProvidesLanguage{frenchb}
%<lua>--[[
%<lua> File `frenchb.lua’ generated from frenchb.dtx
- [2022/11/11 v3.5o French support from the babel system]
+ [2023/01/02 v3.5p French support from the babel system]
%<*internal>
\iffalse
%</internal>
@@ -82,7 +82,7 @@
\let\Module\meta % no math mode (see doc.sty)
\renewcommand*\descriptionlabel[1]{%
\hspace{\labelsep}\normalfont \fbo{#1}}
-\let\up\textsuperscript
+\NewCommandCopy{\up}{\textsuperscript}
\newcommand*{\FRguillspace}{\penalty 10000
\hskip.8\fontdimen2\font
plus.3\fontdimen3\font
@@ -318,8 +318,8 @@
% ordinary character \emph{when the current language is French}
% (no space added);
% as a counterpart, if |\DecimalMathComma| is active, an
-% explicit space has to be added in lists and intervals:
-% |$[0,\ 1]$|, |$(x,\ y)$|. |\StandardMathComma| switches
+% explicit thin space has to be added in lists and intervals:
+% |$(x,\,y)$|, |$[0,\,1]$|. |\StandardMathComma| switches
% back to the standard behaviour of the comma in French.
%
% The \pkg{icomma} package is an alternative workaround.
@@ -1458,8 +1458,8 @@
\ifFB at luatex@punct
\edef\bbl at tempa{\detokenize\expandafter{\languagename}}%
\edef\bbl at tempb{\detokenize{french}}%
- \ifx\bbl at tempa\bbl at tempb \FB at dialect=0 \relax
- \else \FB at dialect=1 \relax
+ \ifx\bbl at tempa\bbl at tempb \FB at dialect=\z@
+ \else \FB at dialect=\@ne
\fi
% \end{macrocode}
% When first entering French, we must set the LuaTeX
@@ -1528,8 +1528,8 @@
% any engine (up to version 3.2b, results were engine dependent).
% \begin{macrocode}
\ifFB at luatex@punct
- \newcommand*{\FB at spacing@on}{\FB at spacing=1 \relax}
- \newcommand*{\FB at spacing@off}{\FB at spacing=0 \relax}
+ \newcommand*{\FB at spacing@on}{\FB at spacing=\@ne}
+ \newcommand*{\FB at spacing@off}{\FB at spacing=\z@}
\else
\newcommand*{\FB at spacing@on}{\FB at spacingtrue}
\newcommand*{\FB at spacing@off}{\FB at spacingfalse}
@@ -1602,11 +1602,11 @@
% which parts of the glue table (|.fr| or |.ac|) are taken into
% account.
% \begin{macrocode}
- \newattribute\FB at spacing \FB at spacing=1 \relax
- \newattribute\FB at addDPspace \FB at addDPspace=1 \relax
- \newattribute\FB at addGUILspace \FB at addGUILspace=0 \relax
- \newattribute\FB at ucsNBSP \FB at ucsNBSP=0 \relax
- \newattribute\FB at dialect \FB at dialect=0 \relax
+ \newattribute\FB at spacing \FB at spacing=\@ne
+ \newattribute\FB at addDPspace \FB at addDPspace=\@ne
+ \newattribute\FB at addGUILspace \FB at addGUILspace=\z@
+ \newattribute\FB at ucsNBSP \FB at ucsNBSP=\z@
+ \newattribute\FB at dialect \FB at dialect=\z@
\ifLaTeXe
\PackageInfo{french.ldf}{No need for active punctuation
characters\MessageBreak with this version
@@ -2421,7 +2421,7 @@
% |\NoAutoSpacing|; this flag is also set to false when the current
% font is a typewriter font).
% \begin{macrocode}
- \XeTeXinterchartokenstate=1
+ \XeTeXinterchartokenstate=\@ne
\XeTeXcharclass `\: = \FB at punctthick
\XeTeXinterchartoks \z@ \FB at punctthick = {%
\ifFB at spacing\ifhmode\FDP at colonspace\fi\fi}%
@@ -2656,11 +2656,11 @@
% Set the default now for Plain (done later for LaTeX).
% \begin{macrocode}
\def\autospace at beforeFDP{%
- \ifFB at luatex@punct\FB at addDPspace=1 \fi
+ \ifFB at luatex@punct \FB at addDPspace=\@ne \fi
\def\FDP at thinspace{\penalty\@M\FBthinspace}%
\def\FDP at colonspace{\penalty\@M\FBcolonspace}}
\def\noautospace at beforeFDP{%
- \ifFB at luatex@punct\FB at addDPspace=0 \fi
+ \ifFB at luatex@punct \FB at addDPspace=\z@ \fi
\let\FDP at thinspace\@empty
\let\FDP at colonspace\@empty}
\ifLaTeXe
@@ -2838,11 +2838,11 @@
\newif\ifFBucsNBSP
\ifFB at luatex@punct
\DeclareRobustCommand*{\@FB at og}{\leavevmode
- \bgroup\FB at spacing=0 \guillemotleft\egroup
+ \bgroup\FB at spacing=\z@ \guillemotleft\egroup
\ifFBucsNBSP\FBgspchar\else\FB at guillspace\fi}
\DeclareRobustCommand*{\@FB at fg}{\ifdim\lastskip>\z@\unskip\fi
\ifFBucsNBSP\FBgspchar\else\FB at guillspace\fi
- \bgroup\FB at spacing=0 \guillemotright\egroup}
+ \bgroup\FB at spacing=\z@ \guillemotright\egroup}
\fi
% \end{macrocode}
% With XeTeX, |\ifFB at spacing| is set to |false| locally for the
@@ -3046,17 +3046,20 @@
% \changes{v3.5e}{2019/03/23}{reset \cs{FB at addGUILspace} attribute
% inside \cs{localleftbox} (LuaTeX).}
%
+% \changes{v3.5p}{2022/12/04}{\cs{FBeveryline at quote}: no need for
+% a penalty inside a \cs{localleftbox}.}
+%
% \begin{macrocode}
\ifx\FBeverylineguill\FBguillopen
- \def\FBeveryline at quote{\FB at addGUILspace=0 \guillemotleft
- \FB at guillspace}%
+ \def\FBeveryline at quote{\FB at addGUILspace=\z@
+ \guillemotleft\FBguillspace}%
\localleftbox{\FBeveryline at quote}%
\let\FBeverypar at quote\relax
\@ogi #1\ifFBcloseguill\@fgi\fi
\else
\ifx\FBeverylineguill\FBguillclose
- \def\FBeveryline at quote{\FB at addGUILspace=0 \guillemotright
- \FB at guillspace}%
+ \def\FBeveryline at quote{\FB at addGUILspace=\z@
+ \guillemotright\FBguillspace}%
\localleftbox{\FBeveryline at quote}%
\let\FBeverypar at quote\relax
\@ogi #1\ifFBcloseguill\@fgi\fi
@@ -3585,6 +3588,10 @@
% \changes{v3.5f}{2019/09/07}{Fixed bug with the acadian language.
% Warning added if used with the icomma package.}
%
+% \changes{v3.5p}{2023/01/02}{\cs{DecimalMathComma} can again be
+% used in the preamble for a global action. It now works as
+% expected inside a group.}
+%
% Unfortunately, |\newcount| inside |\if| breaks Plain formats.
% \begin{macrocode}
\newif\ifFB at icomma
@@ -3615,19 +3622,30 @@
\newcommand*{\dec at math@comma}{\mathcode`\,=\dec at mcc}
\newcommand*{\std at math@comma}{\mathcode`\,=\std at mcc}
\fi
+\let\dec at m@c\relax
% \end{macrocode}
-% |\DecimalMathComma| operates in French or Acadian independently.
+% If |\DecimalMathComma| is issued in the document body
+% (when the current language is French or Acadian) its effect will
+% survive to a language switch, unless issued inside a group
+% (see |\dec at m@c|’s expansion).
+% The \pkg{icomma} inhibits |\DecimalMathComma|.
% \begin{macrocode}
+\newif\if at FBpreamble \ifLaTeXe \@FBpreambletrue \fi
+\newif\if at preamble@DecimalMathComma
\newcommand*{\DecimalMathComma}{%
- \ifFB at icomma
- \PackageWarning{french.ldf}{%
- icomma package loaded, \protect\DecimalMathComma\MessageBreak
- does nothing. Reported}%
+ \if at FBpreamble \@preamble at DecimalMathCommatrue
\else
- \ifFBfrench
- \dec at math@comma
- \expandafter\addto\csname extras\languagename\endcsname
- {\dec at math@comma}%
+ \ifFB at icomma
+ \PackageWarning{french.ldf}{%
+ icomma package loaded, \protect\DecimalMathComma\MessageBreak
+ does nothing. Reported}%
+ \else
+ \ifFBfrench
+ \dec at math@comma
+ \let\dec at m@c\dec at math@comma
+ \expandafter\addto\csname extras\languagename\endcsname
+ {\dec at m@c}%
+ \fi
\fi
\fi
}
@@ -3637,19 +3655,45 @@
icomma package loaded, \protect\StandardMathComma\MessageBreak
does nothing. Reported}%
\else
- \std at math@comma
- \expandafter\addto\csname extras\languagename\endcsname
- {\std at math@comma}%
+ \ifFBfrench
+ \std at math@comma
+ \let\dec at m@c\relax
+ \fi
\fi
}
+% \end{macrocode}
+% Ii issued in the preamble, |\DecimalMathComma| works globally on
+% all parts of the document that are typeset in a French dialect.
+% Can be canceled anytime by |\StandardMathComma|.
+% \begin{macrocode}
\ifLaTeXe
- \AtBeginDocument{\@ifpackageloaded{icomma}%
- {\FB at icommatrue}%
- {\addto\noextrasfrench{\std at math@comma}%
- \ifdefined\noextrasacadian
- \addto\noextrasacadian{\std at math@comma}%
- \fi
- }%
+ \AtBeginDocument{%
+ \@FBpreamblefalse
+ \@ifpackageloaded{icomma}%
+ {\FB at icommatrue
+ \if at preamble@DecimalMathComma
+ \PackageWarning{french.ldf}{%
+ icomma package loaded, \protect\DecimalMathComma%
+ \MessageBreak does nothing. Reported}%
+ \fi
+ }%
+ {\if at preamble@DecimalMathComma
+ \ifFB at mainlanguage@FR \dec at math@comma \fi
+ \let\dec at m@c\dec at math@comma
+ \addto\extrasfrench{\dec at m@c}%
+ \ifdefined\extrasacadian
+ \addto\extrasacadian{\dec at m@c}%
+ \fi
+ \fi
+% \end{macrocode}
+% The comma is reset to type |\mathpunct| when leaving French
+% dialects (only if the icomma package is not loaded).
+% \begin{macrocode}
+ \addto\noextrasfrench{\std at math@comma}%
+ \ifdefined\noextrasacadian
+ \addto\noextrasacadian{\std at math@comma}%
+ \fi
+ }%
}
\else
\addto\noextrasfrench{\std at math@comma}
@@ -4673,7 +4717,7 @@
\define at key{FB}{UnicodeNoBreakSpaces}[true]%
{\ifFB at luatex@punct
\csname FBucsNBSP#1\endcsname
- \ifFBucsNBSP \FB at ucsNBSP=1 \fi
+ \ifFBucsNBSP \FB at ucsNBSP=\@ne \fi
\else
\FBWarning{Option `UnicodeNoBreakSpaces' skipped:%
\MessageBreak this option is for
@@ -5510,7 +5554,7 @@
\itemindent=\descindentFB
\else
\itemindent=-\leftmargin
- \ifnum\@listdepth=1
+ \ifnum\@listdepth=\@ne
\ifdim\descindentFB=\z@
\ifdim\listindentFB>\z@
\leftmargini=\listindentFB
Modified: trunk/Master/texmf-dist/source/generic/babel-french/frenchb.ins
===================================================================
--- trunk/Master/texmf-dist/source/generic/babel-french/frenchb.ins 2023-01-02 21:20:25 UTC (rev 65434)
+++ trunk/Master/texmf-dist/source/generic/babel-french/frenchb.ins 2023-01-02 21:20:51 UTC (rev 65435)
@@ -2,7 +2,7 @@
%% This file will generate fast loadable files and documentation driver
%% files from the doc files in this package when run through LuaTeX.
%%
-%% Copyright 2001-2022 Daniel Flipo. All rights reserved.
+%% Copyright 2001-2023 Daniel Flipo. All rights reserved.
%%
%% This is a generated file part of the the babel-french bundle
%% to be used with the Babel system.
@@ -14,7 +14,7 @@
%%
%% --------------- start of docstrip commands ------------------
%%
-\def\filedate{2022/04/18}
+\def\filedate{2023/01/02}
\def\batchfile{frenchb.ins}
\input docstrip.tex
Modified: trunk/Master/texmf-dist/tex/generic/babel-french/acadian.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/generic/babel-french/acadian.ldf 2023-01-02 21:20:25 UTC (rev 65434)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/acadian.ldf 2023-01-02 21:20:51 UTC (rev 65435)
@@ -24,7 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{acadian}
- [2022/11/11 v3.5o French support from the babel system]
+ [2023/01/02 v3.5p French support from the babel system]
\PackageInfo{acadian.ldf}%
{`acadian' dialect is currently\MessageBreak
*absolutely identical* to the\MessageBreak
Modified: trunk/Master/texmf-dist/tex/generic/babel-french/canadien.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/generic/babel-french/canadien.ldf 2023-01-02 21:20:25 UTC (rev 65434)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/canadien.ldf 2023-01-02 21:20:51 UTC (rev 65435)
@@ -24,7 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{canadien}
- [2022/11/11 v3.5o French support from the babel system]
+ [2023/01/02 v3.5p 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
Modified: trunk/Master/texmf-dist/tex/generic/babel-french/francais.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/generic/babel-french/francais.ldf 2023-01-02 21:20:25 UTC (rev 65434)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/francais.ldf 2023-01-02 21:20:51 UTC (rev 65435)
@@ -24,7 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{francais}
- [2022/11/11 v3.5o French support from the babel system]
+ [2023/01/02 v3.5p 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
Modified: trunk/Master/texmf-dist/tex/generic/babel-french/french.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/generic/babel-french/french.ldf 2023-01-02 21:20:25 UTC (rev 65434)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/french.ldf 2023-01-02 21:20:51 UTC (rev 65435)
@@ -24,7 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{french}
- [2022/11/11 v3.5o French support from the babel system]
+ [2023/01/02 v3.5p French support from the babel system]
%%
%% Babel package for LaTeX version 2e
%% Copyright © 1996-2022
@@ -199,8 +199,8 @@
\ifFB at luatex@punct
\edef\bbl at tempa{\detokenize\expandafter{\languagename}}%
\edef\bbl at tempb{\detokenize{french}}%
- \ifx\bbl at tempa\bbl at tempb \FB at dialect=0 \relax
- \else \FB at dialect=1 \relax
+ \ifx\bbl at tempa\bbl at tempb \FB at dialect=\z@
+ \else \FB at dialect=\@ne
\fi
\ifdefined\FB at once\else
\set at glue@table{colon}%
@@ -228,8 +228,8 @@
\fi
\newif\ifFB at spacing \FB at spacingtrue
\ifFB at luatex@punct
- \newcommand*{\FB at spacing@on}{\FB at spacing=1 \relax}
- \newcommand*{\FB at spacing@off}{\FB at spacing=0 \relax}
+ \newcommand*{\FB at spacing@on}{\FB at spacing=\@ne}
+ \newcommand*{\FB at spacing@off}{\FB at spacing=\z@}
\else
\newcommand*{\FB at spacing@on}{\FB at spacingtrue}
\newcommand*{\FB at spacing@off}{\FB at spacingfalse}
@@ -238,11 +238,11 @@
\ifdefined\newluafunction\else
\input ltluatex.tex
\fi
- \newattribute\FB at spacing \FB at spacing=1 \relax
- \newattribute\FB at addDPspace \FB at addDPspace=1 \relax
- \newattribute\FB at addGUILspace \FB at addGUILspace=0 \relax
- \newattribute\FB at ucsNBSP \FB at ucsNBSP=0 \relax
- \newattribute\FB at dialect \FB at dialect=0 \relax
+ \newattribute\FB at spacing \FB at spacing=\@ne
+ \newattribute\FB at addDPspace \FB at addDPspace=\@ne
+ \newattribute\FB at addGUILspace \FB at addGUILspace=\z@
+ \newattribute\FB at ucsNBSP \FB at ucsNBSP=\z@
+ \newattribute\FB at dialect \FB at dialect=\z@
\ifLaTeXe
\PackageInfo{french.ldf}{No need for active punctuation
characters\MessageBreak with this version
@@ -330,7 +330,7 @@
\babel at savevariable{\XeTeXinterchartokenstate}%
\bbl at for\FB at char\FB at charlist
{\FBsavevariable at loop{\XeTeXcharclass}{\FB at char}}%
- \XeTeXinterchartokenstate=1
+ \XeTeXinterchartokenstate=\@ne
\XeTeXcharclass `\: = \FB at punctthick
\XeTeXinterchartoks \z@ \FB at punctthick = {%
\ifFB at spacing\ifhmode\FDP at colonspace\fi\fi}%
@@ -455,11 +455,11 @@
\fi
\newif\ifFBAutoSpacePunctuation \FBAutoSpacePunctuationtrue
\def\autospace at beforeFDP{%
- \ifFB at luatex@punct\FB at addDPspace=1 \fi
+ \ifFB at luatex@punct \FB at addDPspace=\@ne \fi
\def\FDP at thinspace{\penalty\@M\FBthinspace}%
\def\FDP at colonspace{\penalty\@M\FBcolonspace}}
\def\noautospace at beforeFDP{%
- \ifFB at luatex@punct\FB at addDPspace=0 \fi
+ \ifFB at luatex@punct \FB at addDPspace=\z@ \fi
\let\FDP at thinspace\@empty
\let\FDP at colonspace\@empty}
\ifLaTeXe
@@ -507,11 +507,11 @@
\newif\ifFBucsNBSP
\ifFB at luatex@punct
\DeclareRobustCommand*{\@FB at og}{\leavevmode
- \bgroup\FB at spacing=0 \guillemotleft\egroup
+ \bgroup\FB at spacing=\z@ \guillemotleft\egroup
\ifFBucsNBSP\FBgspchar\else\FB at guillspace\fi}
\DeclareRobustCommand*{\@FB at fg}{\ifdim\lastskip>\z@\unskip\fi
\ifFBucsNBSP\FBgspchar\else\FB at guillspace\fi
- \bgroup\FB at spacing=0 \guillemotright\egroup}
+ \bgroup\FB at spacing=\z@ \guillemotright\egroup}
\fi
\ifFB at xetex@punct
\DeclareRobustCommand*{\@FB at og}{\leavevmode
@@ -596,15 +596,15 @@
\@ogi #1\@fgi
\or
\ifx\FBeverylineguill\FBguillopen
- \def\FBeveryline at quote{\FB at addGUILspace=0 \guillemotleft
- \FB at guillspace}%
+ \def\FBeveryline at quote{\FB at addGUILspace=\z@
+ \guillemotleft\FBguillspace}%
\localleftbox{\FBeveryline at quote}%
\let\FBeverypar at quote\relax
\@ogi #1\ifFBcloseguill\@fgi\fi
\else
\ifx\FBeverylineguill\FBguillclose
- \def\FBeveryline at quote{\FB at addGUILspace=0 \guillemotright
- \FB at guillspace}%
+ \def\FBeveryline at quote{\FB at addGUILspace=\z@
+ \guillemotright\FBguillspace}%
\localleftbox{\FBeveryline at quote}%
\let\FBeverypar at quote\relax
\@ogi #1\ifFBcloseguill\@fgi\fi
@@ -815,16 +815,23 @@
\newcommand*{\dec at math@comma}{\mathcode`\,=\dec at mcc}
\newcommand*{\std at math@comma}{\mathcode`\,=\std at mcc}
\fi
+\let\dec at m@c\relax
+\newif\if at FBpreamble \ifLaTeXe \@FBpreambletrue \fi
+\newif\if at preamble@DecimalMathComma
\newcommand*{\DecimalMathComma}{%
- \ifFB at icomma
- \PackageWarning{french.ldf}{%
- icomma package loaded, \protect\DecimalMathComma\MessageBreak
- does nothing. Reported}%
+ \if at FBpreamble \@preamble at DecimalMathCommatrue
\else
- \ifFBfrench
- \dec at math@comma
- \expandafter\addto\csname extras\languagename\endcsname
- {\dec at math@comma}%
+ \ifFB at icomma
+ \PackageWarning{french.ldf}{%
+ icomma package loaded, \protect\DecimalMathComma\MessageBreak
+ does nothing. Reported}%
+ \else
+ \ifFBfrench
+ \dec at math@comma
+ \let\dec at m@c\dec at math@comma
+ \expandafter\addto\csname extras\languagename\endcsname
+ {\dec at m@c}%
+ \fi
\fi
\fi
}
@@ -834,19 +841,36 @@
icomma package loaded, \protect\StandardMathComma\MessageBreak
does nothing. Reported}%
\else
- \std at math@comma
- \expandafter\addto\csname extras\languagename\endcsname
- {\std at math@comma}%
+ \ifFBfrench
+ \std at math@comma
+ \let\dec at m@c\relax
+ \fi
\fi
}
\ifLaTeXe
- \AtBeginDocument{\@ifpackageloaded{icomma}%
- {\FB at icommatrue}%
- {\addto\noextrasfrench{\std at math@comma}%
- \ifdefined\noextrasacadian
- \addto\noextrasacadian{\std at math@comma}%
- \fi
- }%
+ \AtBeginDocument{%
+ \@FBpreamblefalse
+ \@ifpackageloaded{icomma}%
+ {\FB at icommatrue
+ \if at preamble@DecimalMathComma
+ \PackageWarning{french.ldf}{%
+ icomma package loaded, \protect\DecimalMathComma%
+ \MessageBreak does nothing. Reported}%
+ \fi
+ }%
+ {\if at preamble@DecimalMathComma
+ \ifFB at mainlanguage@FR \dec at math@comma \fi
+ \let\dec at m@c\dec at math@comma
+ \addto\extrasfrench{\dec at m@c}%
+ \ifdefined\extrasacadian
+ \addto\extrasacadian{\dec at m@c}%
+ \fi
+ \fi
+ \addto\noextrasfrench{\std at math@comma}%
+ \ifdefined\noextrasacadian
+ \addto\noextrasacadian{\std at math@comma}%
+ \fi
+ }%
}
\else
\addto\noextrasfrench{\std at math@comma}
@@ -1325,7 +1349,7 @@
\define at key{FB}{UnicodeNoBreakSpaces}[true]%
{\ifFB at luatex@punct
\csname FBucsNBSP#1\endcsname
- \ifFBucsNBSP \FB at ucsNBSP=1 \fi
+ \ifFBucsNBSP \FB at ucsNBSP=\@ne \fi
\else
\FBWarning{Option `UnicodeNoBreakSpaces' skipped:%
\MessageBreak this option is for
@@ -1749,7 +1773,7 @@
\itemindent=\descindentFB
\else
\itemindent=-\leftmargin
- \ifnum\@listdepth=1
+ \ifnum\@listdepth=\@ne
\ifdim\descindentFB=\z@
\ifdim\listindentFB>\z@
\leftmargini=\listindentFB
Modified: trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf 2023-01-02 21:20:25 UTC (rev 65434)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf 2023-01-02 21:20:51 UTC (rev 65435)
@@ -24,7 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{frenchb}
- [2022/11/11 v3.5o French support from the babel system]
+ [2023/01/02 v3.5p French support from the babel system]
\def\bbl at tempa{frenchb}
\ifx\CurrentOption\bbl at tempa
\chardef\l at frenchb\l at french
Modified: trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
===================================================================
--- trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.lua 2023-01-02 21:20:25 UTC (rev 65434)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.lua 2023-01-02 21:20:51 UTC (rev 65435)
@@ -1,6 +1,6 @@
--[[
File `frenchb.lua’ generated from frenchb.dtx
- [2022/11/11 v3.5o French support from the babel system]
+ [2023/01/02 v3.5p French support from the babel system]
Copyright © 2014-2022 Daniel Flipo
<daniel (dot) flipo (at) free (dot) fr>
License LPPL: see french.ldf.
More information about the tex-live-commits
mailing list.