diff options
author | Karl Berry <karl@freefriends.org> | 2023-01-02 21:20:51 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-01-02 21:20:51 +0000 |
commit | 298587016f189af9336278f57b0f59980cbe234e (patch) | |
tree | 3f15290f75936b904c1933112d06d2a2317e475d /Master/texmf-dist/tex/generic | |
parent | e31356634fdfc4ff32db402f6ec1f48a5b797686 (diff) |
babel-french (2jan23)
git-svn-id: svn://tug.org/texlive/trunk@65435 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic')
6 files changed, 68 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 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. |