summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/babel-french/french.ldf
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-09-08 21:02:06 +0000
committerKarl Berry <karl@freefriends.org>2019-09-08 21:02:06 +0000
commit52783dec5aad4f166336a1844a697892379c4dfb (patch)
tree355c3af792baf711e7aa52b355db493e6be02b6e /Master/texmf-dist/tex/generic/babel-french/french.ldf
parent3dbf4f3fa11c18e4342033a7e86a01f9c4ac2a3c (diff)
babel-french (8sep19)
git-svn-id: svn://tug.org/texlive/trunk@52054 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.ldf39
1 files changed, 32 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/generic/babel-french/french.ldf b/Master/texmf-dist/tex/generic/babel-french/french.ldf
index fcf3dc7d05b..044ba8f8d5e 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}
- [2019/03/30 v3.5e French support from the babel system]
+ [2019/09/07 v3.5f French support from the babel system]
%%
%% Babel package for LaTeX version 2e
%% Copyright © 1996-2019
@@ -85,7 +85,12 @@
\fi
\@nopatterns{French}}
\ifdefined\l@french \else \FB@nopatterns \fi
-\ifdefined\l@acadian \else \adddialect\l@acadian\l@french \fi
+\ifdefined\l@acadian
+ \adddialect\l@canadien\l@acadian
+\else
+ \adddialect\l@acadian\l@french
+ \adddialect\l@canadien\l@french
+\fi
\providehyphenmins{french}{\tw@\thr@@}
\providehyphenmins{acadian}{\tw@\thr@@}
\newif\ifLaTeXe
@@ -825,17 +830,37 @@
\newcommand*{\std@math@comma}{\mathcode`\,=\std@mcc}
\fi
\newcommand*{\DecimalMathComma}{%
- \ifFBfrench\dec@math@comma\fi
- \ifFB@icomma\else\addto\extrasfrench{\dec@math@comma}\fi
+ \ifFB@icomma
+ \PackageWarning{french.ldf}{%
+ icomma package loaded, \protect\DecimalMathComma\MessageBreak
+ does nothing. Reported}%
+ \else
+ \ifFBfrench
+ \dec@math@comma
+ \expandafter\addto\csname extras\languagename\endcsname
+ {\dec@math@comma}%
+ \fi
+ \fi
}
\newcommand*{\StandardMathComma}{%
- \std@math@comma
- \ifFB@icomma\else\addto\extrasfrench{\std@math@comma}\fi
+ \ifFB@icomma
+ \PackageWarning{french.ldf}{%
+ icomma package loaded, \protect\StandardMathComma\MessageBreak
+ does nothing. Reported}%
+ \else
+ \std@math@comma
+ \expandafter\addto\csname extras\languagename\endcsname
+ {\std@math@comma}%
+ \fi
}
\ifLaTeXe
\AtBeginDocument{\@ifpackageloaded{icomma}%
{\FB@icommatrue}%
- {\addto\noextrasfrench{\std@math@comma}}%
+ {\addto\noextrasfrench{\std@math@comma}%
+ \ifdefined\noextrasacadian
+ \addto\noextrasacadian{\std@math@comma}%
+ \fi
+ }%
}
\else
\addto\noextrasfrench{\std@math@comma}