diff options
| -rw-r--r-- | Master/texmf-dist/doc/generic/babel-french/README.md | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/generic/babel-french/frenchb-doc.pdf | bin | 185385 -> 186723 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex | 43 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/generic/babel-french/frenchb.pdf | bin | 362890 -> 364942 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/generic/babel-french/frenchb.dtx | 130 | ||||
| -rw-r--r-- | Master/texmf-dist/source/generic/babel-french/frenchb.ins | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/babel-french/acadian.ldf | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/babel-french/canadien.ldf | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/babel-french/francais.ldf | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/babel-french/french.ldf | 102 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/babel-french/frenchb.ldf | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/babel-french/frenchb.lua | 2 |
12 files changed, 186 insertions, 105 deletions
diff --git a/Master/texmf-dist/doc/generic/babel-french/README.md b/Master/texmf-dist/doc/generic/babel-french/README.md index 08a1d95dd87..2ef0d0b281a 100644 --- a/Master/texmf-dist/doc/generic/babel-french/README.md +++ b/Master/texmf-dist/doc/generic/babel-french/README.md @@ -50,5 +50,5 @@ Changes 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 diff --git a/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.pdf b/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.pdf Binary files differindex 27a788be196..a877bbe57c6 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 ff9f5f6aeca..f944831c598 100644 --- a/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex +++ b/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex @@ -121,7 +121,7 @@ \title{Mode d’emploi du module \ext{babel-french}} \author{\href{mailto:daniel.flipo@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 @@ vertical des lettres supérieures simulées par |\fup| (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 @@ comme celle concernant la saisie des guillemets. 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} diff --git a/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf b/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf Binary files differindex 61a6dfd316b..11268e191fb 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 11036d0c9ca..441b411aee2 100644 --- a/Master/texmf-dist/source/generic/babel-french/frenchb.dtx +++ b/Master/texmf-dist/source/generic/babel-french/frenchb.dtx @@ -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@luatex@punct \edef\bbl@tempa{\detokenize\expandafter{\languagename}}% \edef\bbl@tempb{\detokenize{french}}% - \ifx\bbl@tempa\bbl@tempb \FB@dialect=0 \relax - \else \FB@dialect=1 \relax + \ifx\bbl@tempa\bbl@tempb \FB@dialect=\z@ + \else \FB@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@luatex@punct - \newcommand*{\FB@spacing@on}{\FB@spacing=1 \relax} - \newcommand*{\FB@spacing@off}{\FB@spacing=0 \relax} + \newcommand*{\FB@spacing@on}{\FB@spacing=\@ne} + \newcommand*{\FB@spacing@off}{\FB@spacing=\z@} \else \newcommand*{\FB@spacing@on}{\FB@spacingtrue} \newcommand*{\FB@spacing@off}{\FB@spacingfalse} @@ -1602,11 +1602,11 @@ % which parts of the glue table (|.fr| or |.ac|) are taken into % account. % \begin{macrocode} - \newattribute\FB@spacing \FB@spacing=1 \relax - \newattribute\FB@addDPspace \FB@addDPspace=1 \relax - \newattribute\FB@addGUILspace \FB@addGUILspace=0 \relax - \newattribute\FB@ucsNBSP \FB@ucsNBSP=0 \relax - \newattribute\FB@dialect \FB@dialect=0 \relax + \newattribute\FB@spacing \FB@spacing=\@ne + \newattribute\FB@addDPspace \FB@addDPspace=\@ne + \newattribute\FB@addGUILspace \FB@addGUILspace=\z@ + \newattribute\FB@ucsNBSP \FB@ucsNBSP=\z@ + \newattribute\FB@dialect \FB@dialect=\z@ \ifLaTeXe \PackageInfo{french.ldf}{No need for active punctuation characters\MessageBreak with this version @@ -2421,7 +2421,7 @@ return french_punctuation % |\NoAutoSpacing|; this flag is also set to false when the current % font is a typewriter font). % \begin{macrocode} - \XeTeXinterchartokenstate=1 + \XeTeXinterchartokenstate=\@ne \XeTeXcharclass `\: = \FB@punctthick \XeTeXinterchartoks \z@ \FB@punctthick = {% \ifFB@spacing\ifhmode\FDP@colonspace\fi\fi}% @@ -2656,11 +2656,11 @@ return french_punctuation % Set the default now for Plain (done later for LaTeX). % \begin{macrocode} \def\autospace@beforeFDP{% - \ifFB@luatex@punct\FB@addDPspace=1 \fi + \ifFB@luatex@punct \FB@addDPspace=\@ne \fi \def\FDP@thinspace{\penalty\@M\FBthinspace}% \def\FDP@colonspace{\penalty\@M\FBcolonspace}} \def\noautospace@beforeFDP{% - \ifFB@luatex@punct\FB@addDPspace=0 \fi + \ifFB@luatex@punct \FB@addDPspace=\z@ \fi \let\FDP@thinspace\@empty \let\FDP@colonspace\@empty} \ifLaTeXe @@ -2838,11 +2838,11 @@ return french_punctuation \newif\ifFBucsNBSP \ifFB@luatex@punct \DeclareRobustCommand*{\@FB@og}{\leavevmode - \bgroup\FB@spacing=0 \guillemotleft\egroup + \bgroup\FB@spacing=\z@ \guillemotleft\egroup \ifFBucsNBSP\FBgspchar\else\FB@guillspace\fi} \DeclareRobustCommand*{\@FB@fg}{\ifdim\lastskip>\z@\unskip\fi \ifFBucsNBSP\FBgspchar\else\FB@guillspace\fi - \bgroup\FB@spacing=0 \guillemotright\egroup} + \bgroup\FB@spacing=\z@ \guillemotright\egroup} \fi % \end{macrocode} % With XeTeX, |\ifFB@spacing| is set to |false| locally for the @@ -3046,17 +3046,20 @@ return french_punctuation % \changes{v3.5e}{2019/03/23}{reset \cs{FB@addGUILspace} attribute % inside \cs{localleftbox} (LuaTeX).} % +% \changes{v3.5p}{2022/12/04}{\cs{FBeveryline@quote}: no need for +% a penalty inside a \cs{localleftbox}.} +% % \begin{macrocode} \ifx\FBeverylineguill\FBguillopen - \def\FBeveryline@quote{\FB@addGUILspace=0 \guillemotleft - \FB@guillspace}% + \def\FBeveryline@quote{\FB@addGUILspace=\z@ + \guillemotleft\FBguillspace}% \localleftbox{\FBeveryline@quote}% \let\FBeverypar@quote\relax \@ogi #1\ifFBcloseguill\@fgi\fi \else \ifx\FBeverylineguill\FBguillclose - \def\FBeveryline@quote{\FB@addGUILspace=0 \guillemotright - \FB@guillspace}% + \def\FBeveryline@quote{\FB@addGUILspace=\z@ + \guillemotright\FBguillspace}% \localleftbox{\FBeveryline@quote}% \let\FBeverypar@quote\relax \@ogi #1\ifFBcloseguill\@fgi\fi @@ -3585,6 +3588,10 @@ return french_punctuation % \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@icomma @@ -3615,19 +3622,30 @@ return french_punctuation \newcommand*{\dec@math@comma}{\mathcode`\,=\dec@mcc} \newcommand*{\std@math@comma}{\mathcode`\,=\std@mcc} \fi +\let\dec@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@m@c|’s expansion). +% The \pkg{icomma} inhibits |\DecimalMathComma|. % \begin{macrocode} +\newif\if@FBpreamble \ifLaTeXe \@FBpreambletrue \fi +\newif\if@preamble@DecimalMathComma \newcommand*{\DecimalMathComma}{% - \ifFB@icomma - \PackageWarning{french.ldf}{% - icomma package loaded, \protect\DecimalMathComma\MessageBreak - does nothing. Reported}% + \if@FBpreamble \@preamble@DecimalMathCommatrue \else - \ifFBfrench - \dec@math@comma - \expandafter\addto\csname extras\languagename\endcsname - {\dec@math@comma}% + \ifFB@icomma + \PackageWarning{french.ldf}{% + icomma package loaded, \protect\DecimalMathComma\MessageBreak + does nothing. Reported}% + \else + \ifFBfrench + \dec@math@comma + \let\dec@m@c\dec@math@comma + \expandafter\addto\csname extras\languagename\endcsname + {\dec@m@c}% + \fi \fi \fi } @@ -3637,19 +3655,45 @@ return french_punctuation icomma package loaded, \protect\StandardMathComma\MessageBreak does nothing. Reported}% \else - \std@math@comma - \expandafter\addto\csname extras\languagename\endcsname - {\std@math@comma}% + \ifFBfrench + \std@math@comma + \let\dec@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@icommatrue}% - {\addto\noextrasfrench{\std@math@comma}% - \ifdefined\noextrasacadian - \addto\noextrasacadian{\std@math@comma}% - \fi - }% + \AtBeginDocument{% + \@FBpreamblefalse + \@ifpackageloaded{icomma}% + {\FB@icommatrue + \if@preamble@DecimalMathComma + \PackageWarning{french.ldf}{% + icomma package loaded, \protect\DecimalMathComma% + \MessageBreak does nothing. Reported}% + \fi + }% + {\if@preamble@DecimalMathComma + \ifFB@mainlanguage@FR \dec@math@comma \fi + \let\dec@m@c\dec@math@comma + \addto\extrasfrench{\dec@m@c}% + \ifdefined\extrasacadian + \addto\extrasacadian{\dec@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@math@comma}% + \ifdefined\noextrasacadian + \addto\noextrasacadian{\std@math@comma}% + \fi + }% } \else \addto\noextrasfrench{\std@math@comma} @@ -4673,7 +4717,7 @@ return french_punctuation \define@key{FB}{UnicodeNoBreakSpaces}[true]% {\ifFB@luatex@punct \csname FBucsNBSP#1\endcsname - \ifFBucsNBSP \FB@ucsNBSP=1 \fi + \ifFBucsNBSP \FB@ucsNBSP=\@ne \fi \else \FBWarning{Option `UnicodeNoBreakSpaces' skipped:% \MessageBreak this option is for @@ -5510,7 +5554,7 @@ return french_punctuation \itemindent=\descindentFB \else \itemindent=-\leftmargin - \ifnum\@listdepth=1 + \ifnum\@listdepth=\@ne \ifdim\descindentFB=\z@ \ifdim\listindentFB>\z@ \leftmargini=\listindentFB diff --git a/Master/texmf-dist/source/generic/babel-french/frenchb.ins b/Master/texmf-dist/source/generic/babel-french/frenchb.ins index 10f64910faf..0f973a54dfd 100644 --- a/Master/texmf-dist/source/generic/babel-french/frenchb.ins +++ b/Master/texmf-dist/source/generic/babel-french/frenchb.ins @@ -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 diff --git a/Master/texmf-dist/tex/generic/babel-french/acadian.ldf b/Master/texmf-dist/tex/generic/babel-french/acadian.ldf index 111381f918c..6c82696c4d5 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} - [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 diff --git a/Master/texmf-dist/tex/generic/babel-french/canadien.ldf b/Master/texmf-dist/tex/generic/babel-french/canadien.ldf index 30f92f9e655..245e5da9df2 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} - [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 diff --git a/Master/texmf-dist/tex/generic/babel-french/francais.ldf b/Master/texmf-dist/tex/generic/babel-french/francais.ldf index c57885bffc5..23fb5b672c6 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} - [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 diff --git a/Master/texmf-dist/tex/generic/babel-french/french.ldf b/Master/texmf-dist/tex/generic/babel-french/french.ldf index 41e961c04c5..347d8f58e63 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} - [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@luatex@punct \edef\bbl@tempa{\detokenize\expandafter{\languagename}}% \edef\bbl@tempb{\detokenize{french}}% - \ifx\bbl@tempa\bbl@tempb \FB@dialect=0 \relax - \else \FB@dialect=1 \relax + \ifx\bbl@tempa\bbl@tempb \FB@dialect=\z@ + \else \FB@dialect=\@ne \fi \ifdefined\FB@once\else \set@glue@table{colon}% @@ -228,8 +228,8 @@ \fi \newif\ifFB@spacing \FB@spacingtrue \ifFB@luatex@punct - \newcommand*{\FB@spacing@on}{\FB@spacing=1 \relax} - \newcommand*{\FB@spacing@off}{\FB@spacing=0 \relax} + \newcommand*{\FB@spacing@on}{\FB@spacing=\@ne} + \newcommand*{\FB@spacing@off}{\FB@spacing=\z@} \else \newcommand*{\FB@spacing@on}{\FB@spacingtrue} \newcommand*{\FB@spacing@off}{\FB@spacingfalse} @@ -238,11 +238,11 @@ \ifdefined\newluafunction\else \input ltluatex.tex \fi - \newattribute\FB@spacing \FB@spacing=1 \relax - \newattribute\FB@addDPspace \FB@addDPspace=1 \relax - \newattribute\FB@addGUILspace \FB@addGUILspace=0 \relax - \newattribute\FB@ucsNBSP \FB@ucsNBSP=0 \relax - \newattribute\FB@dialect \FB@dialect=0 \relax + \newattribute\FB@spacing \FB@spacing=\@ne + \newattribute\FB@addDPspace \FB@addDPspace=\@ne + \newattribute\FB@addGUILspace \FB@addGUILspace=\z@ + \newattribute\FB@ucsNBSP \FB@ucsNBSP=\z@ + \newattribute\FB@dialect \FB@dialect=\z@ \ifLaTeXe \PackageInfo{french.ldf}{No need for active punctuation characters\MessageBreak with this version @@ -330,7 +330,7 @@ \babel@savevariable{\XeTeXinterchartokenstate}% \bbl@for\FB@char\FB@charlist {\FBsavevariable@loop{\XeTeXcharclass}{\FB@char}}% - \XeTeXinterchartokenstate=1 + \XeTeXinterchartokenstate=\@ne \XeTeXcharclass `\: = \FB@punctthick \XeTeXinterchartoks \z@ \FB@punctthick = {% \ifFB@spacing\ifhmode\FDP@colonspace\fi\fi}% @@ -455,11 +455,11 @@ \fi \newif\ifFBAutoSpacePunctuation \FBAutoSpacePunctuationtrue \def\autospace@beforeFDP{% - \ifFB@luatex@punct\FB@addDPspace=1 \fi + \ifFB@luatex@punct \FB@addDPspace=\@ne \fi \def\FDP@thinspace{\penalty\@M\FBthinspace}% \def\FDP@colonspace{\penalty\@M\FBcolonspace}} \def\noautospace@beforeFDP{% - \ifFB@luatex@punct\FB@addDPspace=0 \fi + \ifFB@luatex@punct \FB@addDPspace=\z@ \fi \let\FDP@thinspace\@empty \let\FDP@colonspace\@empty} \ifLaTeXe @@ -507,11 +507,11 @@ \newif\ifFBucsNBSP \ifFB@luatex@punct \DeclareRobustCommand*{\@FB@og}{\leavevmode - \bgroup\FB@spacing=0 \guillemotleft\egroup + \bgroup\FB@spacing=\z@ \guillemotleft\egroup \ifFBucsNBSP\FBgspchar\else\FB@guillspace\fi} \DeclareRobustCommand*{\@FB@fg}{\ifdim\lastskip>\z@\unskip\fi \ifFBucsNBSP\FBgspchar\else\FB@guillspace\fi - \bgroup\FB@spacing=0 \guillemotright\egroup} + \bgroup\FB@spacing=\z@ \guillemotright\egroup} \fi \ifFB@xetex@punct \DeclareRobustCommand*{\@FB@og}{\leavevmode @@ -596,15 +596,15 @@ \@ogi #1\@fgi \or \ifx\FBeverylineguill\FBguillopen - \def\FBeveryline@quote{\FB@addGUILspace=0 \guillemotleft - \FB@guillspace}% + \def\FBeveryline@quote{\FB@addGUILspace=\z@ + \guillemotleft\FBguillspace}% \localleftbox{\FBeveryline@quote}% \let\FBeverypar@quote\relax \@ogi #1\ifFBcloseguill\@fgi\fi \else \ifx\FBeverylineguill\FBguillclose - \def\FBeveryline@quote{\FB@addGUILspace=0 \guillemotright - \FB@guillspace}% + \def\FBeveryline@quote{\FB@addGUILspace=\z@ + \guillemotright\FBguillspace}% \localleftbox{\FBeveryline@quote}% \let\FBeverypar@quote\relax \@ogi #1\ifFBcloseguill\@fgi\fi @@ -815,16 +815,23 @@ \newcommand*{\dec@math@comma}{\mathcode`\,=\dec@mcc} \newcommand*{\std@math@comma}{\mathcode`\,=\std@mcc} \fi +\let\dec@m@c\relax +\newif\if@FBpreamble \ifLaTeXe \@FBpreambletrue \fi +\newif\if@preamble@DecimalMathComma \newcommand*{\DecimalMathComma}{% - \ifFB@icomma - \PackageWarning{french.ldf}{% - icomma package loaded, \protect\DecimalMathComma\MessageBreak - does nothing. Reported}% + \if@FBpreamble \@preamble@DecimalMathCommatrue \else - \ifFBfrench - \dec@math@comma - \expandafter\addto\csname extras\languagename\endcsname - {\dec@math@comma}% + \ifFB@icomma + \PackageWarning{french.ldf}{% + icomma package loaded, \protect\DecimalMathComma\MessageBreak + does nothing. Reported}% + \else + \ifFBfrench + \dec@math@comma + \let\dec@m@c\dec@math@comma + \expandafter\addto\csname extras\languagename\endcsname + {\dec@m@c}% + \fi \fi \fi } @@ -834,19 +841,36 @@ icomma package loaded, \protect\StandardMathComma\MessageBreak does nothing. Reported}% \else - \std@math@comma - \expandafter\addto\csname extras\languagename\endcsname - {\std@math@comma}% + \ifFBfrench + \std@math@comma + \let\dec@m@c\relax + \fi \fi } \ifLaTeXe - \AtBeginDocument{\@ifpackageloaded{icomma}% - {\FB@icommatrue}% - {\addto\noextrasfrench{\std@math@comma}% - \ifdefined\noextrasacadian - \addto\noextrasacadian{\std@math@comma}% - \fi - }% + \AtBeginDocument{% + \@FBpreamblefalse + \@ifpackageloaded{icomma}% + {\FB@icommatrue + \if@preamble@DecimalMathComma + \PackageWarning{french.ldf}{% + icomma package loaded, \protect\DecimalMathComma% + \MessageBreak does nothing. Reported}% + \fi + }% + {\if@preamble@DecimalMathComma + \ifFB@mainlanguage@FR \dec@math@comma \fi + \let\dec@m@c\dec@math@comma + \addto\extrasfrench{\dec@m@c}% + \ifdefined\extrasacadian + \addto\extrasacadian{\dec@m@c}% + \fi + \fi + \addto\noextrasfrench{\std@math@comma}% + \ifdefined\noextrasacadian + \addto\noextrasacadian{\std@math@comma}% + \fi + }% } \else \addto\noextrasfrench{\std@math@comma} @@ -1325,7 +1349,7 @@ \define@key{FB}{UnicodeNoBreakSpaces}[true]% {\ifFB@luatex@punct \csname FBucsNBSP#1\endcsname - \ifFBucsNBSP \FB@ucsNBSP=1 \fi + \ifFBucsNBSP \FB@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 diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf index e6446525ad5..ff0f3e1bc57 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} - [2022/11/11 v3.5o French support from the babel system] + [2023/01/02 v3.5p 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 5513eb1a77d..0b3c152a366 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 - [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. |