diff options
author | Karl Berry <karl@freefriends.org> | 2022-11-12 20:53:09 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-11-12 20:53:09 +0000 |
commit | a96c56be52205ebc6f0e56dbef64e4c98e29d208 (patch) | |
tree | f3c0b8768763f307212b547b4b16318bb11fbb1e /Master/texmf-dist/tex/generic/babel-french/french.ldf | |
parent | f5594b23d4f5bd12b365ce678feb79f25034fe95 (diff) |
babel-french (12nov22)
git-svn-id: svn://tug.org/texlive/trunk@65000 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/babel-french/french.ldf')
-rw-r--r-- | Master/texmf-dist/tex/generic/babel-french/french.ldf | 72 |
1 files changed, 10 insertions, 62 deletions
diff --git a/Master/texmf-dist/tex/generic/babel-french/french.ldf b/Master/texmf-dist/tex/generic/babel-french/french.ldf index 8696f21be6f..41e961c04c5 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/04/18 v3.5n French support from the babel system] + [2022/11/11 v3.5o French support from the babel system] %% %% Babel package for LaTeX version 2e %% Copyright © 1996-2022 @@ -227,18 +227,13 @@ } \fi \newif\ifFB@spacing \FB@spacingtrue -\newcommand*{\FB@spacing@on}{% - \ifFB@luatex@punct - \FB@spacing=1 \relax - \else - \FB@spacingtrue - \fi} -\newcommand*{\FB@spacing@off}{% - \ifFB@luatex@punct - \FB@spacing=0 \relax - \else - \FB@spacingfalse - \fi} +\ifFB@luatex@punct + \newcommand*{\FB@spacing@on}{\FB@spacing=1 \relax} + \newcommand*{\FB@spacing@off}{\FB@spacing=0 \relax} +\else + \newcommand*{\FB@spacing@on}{\FB@spacingtrue} + \newcommand*{\FB@spacing@off}{\FB@spacingfalse} +\fi \ifFB@luatex@punct \ifdefined\newluafunction\else \input ltluatex.tex @@ -290,23 +285,6 @@ } \fi \ifFB@luatex@punct - \newcommand*{\FB@luatex@punct@french}{% - \babel@save\shorthandon - \babel@save\shorthandoff - \def\shorthandoff##1{% - \ifx\PackageWarning\@undefined - \fb@warning{\noexpand\shorthandoff{;:!?} is helpless with - LuaTeX,\\ use \noexpand\NoAutoSpacing - *inside a group* instead.}% - \else - \PackageWarning{french.ldf}{\protect\shorthandoff{;:!?} - is helpless with LuaTeX,\MessageBreak - use \protect\NoAutoSpacing \space *inside a group* - instead;\MessageBreak reported}% - \fi}% - \def\shorthandon##1{}% - } - \addto\extrasfrench{\FB@luatex@punct@french} \def\activate@luatexpunct{% \directlua{% FR_fr = \the\l@french ; FR_ca = \the\l@acadian ; @@ -347,24 +325,11 @@ \x} \def\FB@charlist{"21,"3A,"3B,"3F,"AB,"BB,"28,"5B,"A0,"202F,% "29,"5D,"7B,"7D,"2C,"2D,"2E,"22,"25,"27,"60,"2019} +%% \changes{v3.5o}{2022/11/03}{\cs{shorthandon} and \cs{shorthandoff} \newcommand*{\FB@xetex@punct@french}{% \babel@savevariable{\XeTeXinterchartokenstate}% - \babel@save{\shorthandon}% - \babel@save{\shorthandoff}% \bbl@for\FB@char\FB@charlist {\FBsavevariable@loop{\XeTeXcharclass}{\FB@char}}% - \def\shorthandoff##1{% - \ifx\PackageWarning\@undefined - \fb@warning{\noexpand\shorthandoff{;:!?} is helpless with - XeTeX,\\ use \noexpand\NoAutoSpacing - *inside a group* instead.}% - \else - \PackageWarning{french.ldf}{\protect\shorthandoff{;:!?} - is helpless with XeTeX,\MessageBreak - use \protect\NoAutoSpacing\space *inside a group* - instead;\MessageBreak reported}% - \fi}% - \def\shorthandon##1{}% \XeTeXinterchartokenstate=1 \XeTeXcharclass `\: = \FB@punctthick \XeTeXinterchartoks \z@ \FB@punctthick = {% @@ -1667,7 +1632,7 @@ \addtolength{\partopsep}{\@tempdima}% } \def\listFB#1#2{\listORI{#1}{\FB@listVsettings #2}} -\let\endlistFB\endlist +\let\endlistFB\endlistORI \newcommand*{\FrenchLabelItem}{\textemdash} \newcommand*{\Frlabelitemi}{\FrenchLabelItem} \newcommand*{\Frlabelitemii}{\FrenchLabelItem} @@ -1955,23 +1920,6 @@ \FBclean@on@exit \ldf@finish\CurrentOption \let\loadlocalcfg\FB@llc -%% -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% \endinput %% %% End of file `french.ldf'. |