summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-10-09 20:20:30 +0000
committerKarl Berry <karl@freefriends.org>2020-10-09 20:20:30 +0000
commit734c835ecdb73a59f1c336c8283950e04613f19f (patch)
tree3f636f6cedf29325ff61215b2bff72bd8af51f43 /Master
parentc1f0d03307650f7f9294d0733eacc3ed3dd2cc69 (diff)
babel-french (9oct20)
git-svn-id: svn://tug.org/texlive/trunk@56607 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/generic/babel-french/frenchb-doc.pdfbin154900 -> 154799 bytes
-rw-r--r--Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex9
-rw-r--r--Master/texmf-dist/doc/generic/babel-french/frenchb.pdfbin327379 -> 328108 bytes
-rw-r--r--Master/texmf-dist/source/generic/babel-french/frenchb.dtx40
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/acadian.ldf2
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/canadien.ldf2
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/francais.ldf2
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/french.ldf16
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/frenchb.ldf2
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/frenchb.lua2
10 files changed, 51 insertions, 24 deletions
diff --git a/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.pdf b/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.pdf
index 26bb961678c..d55eccfeee7 100644
--- a/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.pdf
+++ b/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.pdf
Binary files differ
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 850f59aec5c..2ff7f143077 100644
--- a/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex
+++ b/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex
@@ -125,7 +125,7 @@
%
\title{Documentation sur le module \ext{babel-french}}
\author{\href{mailto:daniel.flipo@free.fr}{Daniel \textsc{Flipo}}}
-\newcommand*{\latestversion}{3.5k}
+\newcommand*{\latestversion}{3.5l}
\date{Version {\latestversion} -- \today}
\begin{document}
@@ -1080,8 +1080,9 @@ La liste étant longue, les options sont regroupées par thèmes.
\item [SmallCapsFigTabcaptions=false (true*)]; si cette option est mise
à \fbo{false}, le recours aux petites capitales dans les intitulés des
légendes de figures et tables est supprimé, on obtient « Figure » et
- « Table » au lieu de « \textsc{Figure} » et « \textsc{Table} ».%
- \hlabel{scfigtab}
+ « Table » au lieu de « \textsc{Figure} » et « \textsc{Table} ».
+ Noter que le même résultat peut être obtenu en définissant |\FBfigtabshape|
+ comme |\relax| avant le chargement de \ext{babel}.%\hlabel{scfigtab}
\item [CustomiseFigTabcaptions=false (true*)] ; si cette option est mise
à \fbo{false}, le séparateur défini par |\CaptionSeparator| est remplacé par
@@ -1479,7 +1480,7 @@ préambule :\hlabel{enumitem-cfg}
|\settowidth{\mylabelwidth}{\mylabel}|\\
|\setlist[itemize]{label=\mylabel, nosep}|\\ % nosep ou noitemsep
|\setlist[1]{labelindent=\parindent}|\\
-|\setlist{labelwidth=\mylabelwidth, leftmargin=!|\\
+|\setlist{labelwidth=\mylabelwidth, leftmargin=!,|\\
| itemsep=0.4ex plus 0.2ex minus 0.2ex,|\\ % enumitem ne redéfinit pas
| parsep=0.4ex plus 0.2ex minus 0.2ex,|\\ % \list, on peut s’en passer
| topsep=0.8ex plus 0.4ex minus 0.4ex,|\\ % sauf option StandardLists,
diff --git a/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf b/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf
index f8d5e00fbe1..56a5c87b0d7 100644
--- a/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf
+++ b/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/generic/babel-french/frenchb.dtx b/Master/texmf-dist/source/generic/babel-french/frenchb.dtx
index c30847224f1..161833dd13a 100644
--- a/Master/texmf-dist/source/generic/babel-french/frenchb.dtx
+++ b/Master/texmf-dist/source/generic/babel-french/frenchb.dtx
@@ -1,4 +1,4 @@
-%\CheckSum{3748}
+%\CheckSum{3759}
%
%\iffalse
% Tell the LaTeX system who we are and write an entry on the
@@ -13,7 +13,7 @@
%<frenchb>\ProvidesLanguage{frenchb}
%<lua>--[[
%<lua> File `frenchb.lua’ generated from frenchb.dtx
- [2020/09/09 v3.5k French support from the babel system]
+ [2020/10/10 v3.5l French support from the babel system]
%<*internal>
\iffalse
%</internal>
@@ -646,7 +646,9 @@
% \item [SmallCapsFigTabCaptions=false (true*)]; when set to
% \fbo{false}, |\figurename| and |\tablename| will be printed in
% French captions as ``Figure’’ and ``Table’’ instead of being
-% printed in small caps (the default).
+% printed in small caps (the default). The same result can be
+% achieved by defining |\FBfigtabshape| as |\relax| before
+% loading \frenchb{} (in a document class f.i.).
%
% \item [CustomiseFigTabCaptions=false (true*)]; when \fbo{false}
% the default separator (colon) is used instead of
@@ -3778,6 +3780,9 @@ return french_punctuation
% \changes{v3.5k}{2020/09/09}{Small caps removed in \cs{figurename} and
% \cs{tablename}, use \cs{fnum@figure} and \cs{fnum@table} instead.}
%
+% \changes{v3.5l}{2020/10/08}{Redefine \cs{fnum@figure} and
+% \cs{fnum@table} separately.}
+%
% |\figurename| and |\tablename| are printed in small caps in French,
% unless either \fbo{SmallCapsFigTabCaptions} is set to \fbo{false}
% or a class or package loaded before \frenchb{} defines
@@ -3863,9 +3868,11 @@ return french_punctuation
\else
\ifdefined\fnum@figure
\let\fnum@figureORI\fnum@figure
- \let\fnum@tableORI\fnum@table
\renewcommand{\fnum@figure}{{\ifFBfrench\FBfigtabshape\fi
\fnum@figureORI}}%
+ \fi
+ \ifdefined\fnum@table
+ \let\fnum@tableORI\fnum@table
\renewcommand{\fnum@table}{{\ifFBfrench\FBfigtabshape\fi
\fnum@tableORI}}%
\fi
@@ -3946,7 +3953,7 @@ return french_punctuation
\egroup
% \end{macrocode}
%
-% No warning is issued for SMF, AMS and ACM classes as their layout
+% No warning is issued for SMF and AMS classes as their layout
% of captions is compatible with French typographic standards.
%
% With \cls{memoir} and koma-script classes, \frenchb{} customises
@@ -3982,9 +3989,8 @@ return french_punctuation
% \changes{v3.0a}{2014/02/20}{No warning about \cs{@makecaption} for
% SMF classes.}
%
-% Disable the standard warning with ACM, AMS and SMF classes.
+% Disable the standard warning with AMS and SMF classes.
% \begin{macrocode}
-\@ifclassloaded{acmart}{\@FBwarning@capsepfalse}{}
\@ifclassloaded{amsart}{\@FBwarning@capsepfalse}{}
\@ifclassloaded{amsbook}{\@FBwarning@capsepfalse}{}
\@ifclassloaded{amsdtx}{\@FBwarning@capsepfalse}{}
@@ -3994,6 +4000,18 @@ return french_punctuation
\@ifclassloaded{smfbook}{\@FBwarning@capsepfalse}{}
% \end{macrocode}
%
+% \changes{v3.5l}{2020/10/01}{No warning about \cs{@makecaption} for
+% more classes.}
+%
+% Disable the standard warning for some classes that do not use
+% `:’ as caption separator.
+% \begin{macrocode}
+\@ifclassloaded{IEEEconf}{\@FBwarning@capsepfalse}{}
+\@ifclassloaded{IEEEtran}{\@FBwarning@capsepfalse}{}
+\@ifclassloaded{revtex4-2}{\@FBwarning@capsepfalse}{}
+\@ifclassloaded{svjour3}{\@FBwarning@capsepfalse}{}
+% \end{macrocode}
+%
% \changes{v2.6c}{2013/05/18}{No warning about \cs{@makecaption} for
% koma-script classes. \cs{captionformat} customised in French.}
%
@@ -4063,9 +4081,11 @@ return french_punctuation
\@FBwarning@capsepfalse
\fi
% \end{macrocode}
-% No Warning if \file{caption.sty} has been loaded.
+% No Warning if \file{caption.sty} or \file{caption-light.sty}
+% has been loaded.
% \begin{macrocode}
- \@ifpackageloaded{caption}{\@FBwarning@capsepfalse}{}%
+ \@ifpackageloaded{caption}{\@FBwarning@capsepfalse}{}%
+ \@ifpackageloaded{caption-light}{\@FBwarning@capsepfalse}{}%
% \end{macrocode}
% Final warning if relevant:
% \begin{macrocode}
@@ -4074,8 +4094,8 @@ return french_punctuation
{Figures' and tables' captions might look like\MessageBreak
`Figure 1:' in French instead of `Figure 1 :'.\MessageBreak
If this happens, to fix this issue\MessageBreak
- just add \protect\usepackage{caption} or\MessageBreak
switch to LuaLaTeX or XeLaTeX or\MessageBreak
+ try to add \protect\usepackage{caption} or\MessageBreak
... leave it as it is; reported}%
\fi
\let\FB@makecaption\relax
diff --git a/Master/texmf-dist/tex/generic/babel-french/acadian.ldf b/Master/texmf-dist/tex/generic/babel-french/acadian.ldf
index 16eed4a35a0..4b19892df7d 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}
- [2020/09/09 v3.5k French support from the babel system]
+ [2020/10/10 v3.5l 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 45a9f11fef4..b5250f3f1f2 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}
- [2020/09/09 v3.5k French support from the babel system]
+ [2020/10/10 v3.5l 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 dd9b70a435d..9fa29281243 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}
- [2020/09/09 v3.5k French support from the babel system]
+ [2020/10/10 v3.5l 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 3de1d098ab6..71d3b78c886 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}
- [2020/09/09 v3.5k French support from the babel system]
+ [2020/10/10 v3.5l French support from the babel system]
%%
%% Babel package for LaTeX version 2e
%% Copyright © 1996-2020
@@ -982,9 +982,11 @@
\else
\ifdefined\fnum@figure
\let\fnum@figureORI\fnum@figure
- \let\fnum@tableORI\fnum@table
\renewcommand{\fnum@figure}{{\ifFBfrench\FBfigtabshape\fi
\fnum@figureORI}}%
+ \fi
+ \ifdefined\fnum@table
+ \let\fnum@tableORI\fnum@table
\renewcommand{\fnum@table}{{\ifFBfrench\FBfigtabshape\fi
\fnum@tableORI}}%
\fi
@@ -1018,7 +1020,6 @@
\hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
\fi
\vskip\belowcaptionskip}
-\@ifclassloaded{acmart}{\@FBwarning@capsepfalse}{}
\@ifclassloaded{amsart}{\@FBwarning@capsepfalse}{}
\@ifclassloaded{amsbook}{\@FBwarning@capsepfalse}{}
\@ifclassloaded{amsdtx}{\@FBwarning@capsepfalse}{}
@@ -1026,6 +1027,10 @@
\@ifclassloaded{amproc}{\@FBwarning@capsepfalse}{}
\@ifclassloaded{smfart}{\@FBwarning@capsepfalse}{}
\@ifclassloaded{smfbook}{\@FBwarning@capsepfalse}{}
+\@ifclassloaded{IEEEconf}{\@FBwarning@capsepfalse}{}
+\@ifclassloaded{IEEEtran}{\@FBwarning@capsepfalse}{}
+\@ifclassloaded{revtex4-2}{\@FBwarning@capsepfalse}{}
+\@ifclassloaded{svjour3}{\@FBwarning@capsepfalse}{}
\@ifclassloaded{memoir}{\@FBwarning@capsepfalse}{}
\ifFB@koma \@FBwarning@capsepfalse \fi
\@ifclassloaded{beamer}{\@FBwarning@capsepfalse}{}
@@ -1044,14 +1049,15 @@
\fi
\@FBwarning@capsepfalse
\fi
- \@ifpackageloaded{caption}{\@FBwarning@capsepfalse}{}%
+ \@ifpackageloaded{caption}{\@FBwarning@capsepfalse}{}%
+ \@ifpackageloaded{caption-light}{\@FBwarning@capsepfalse}{}%
\if@FBwarning@capsep
\FBWarning
{Figures' and tables' captions might look like\MessageBreak
`Figure 1:' in French instead of `Figure 1 :'.\MessageBreak
If this happens, to fix this issue\MessageBreak
- just add \protect\usepackage{caption} or\MessageBreak
switch to LuaLaTeX or XeLaTeX or\MessageBreak
+ try to add \protect\usepackage{caption} or\MessageBreak
... leave it as it is; reported}%
\fi
\let\FB@makecaption\relax
diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
index d6faeb52bef..fbd3c9c3390 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}
- [2020/09/09 v3.5k French support from the babel system]
+ [2020/10/10 v3.5l 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 f5185a9bc3a..a181ba2d3f9 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
- [2020/09/09 v3.5k French support from the babel system]
+ [2020/10/10 v3.5l French support from the babel system]
Copyright © 2014-2020 Daniel Flipo
<daniel (dot) flipo (at) free (dot) fr>
License LPPL: see french.ldf.