texlive[56607] Master/texmf-dist: babel-french (9oct20)
commits+karl at tug.org
commits+karl at tug.org
Fri Oct 9 22:20:30 CEST 2020
Revision: 56607
http://tug.org/svn/texlive?view=revision&revision=56607
Author: karl
Date: 2020-10-09 22:20:30 +0200 (Fri, 09 Oct 2020)
Log Message:
-----------
babel-french (9oct20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.pdf
trunk/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex
trunk/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf
trunk/Master/texmf-dist/source/generic/babel-french/frenchb.dtx
trunk/Master/texmf-dist/tex/generic/babel-french/acadian.ldf
trunk/Master/texmf-dist/tex/generic/babel-french/canadien.ldf
trunk/Master/texmf-dist/tex/generic/babel-french/francais.ldf
trunk/Master/texmf-dist/tex/generic/babel-french/french.ldf
trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
Modified: trunk/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex 2020-10-09 20:20:05 UTC (rev 56606)
+++ trunk/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex 2020-10-09 20:20:30 UTC (rev 56607)
@@ -125,7 +125,7 @@
%
\title{Documentation sur le module \ext{babel-french}}
\author{\href{mailto:daniel.flipo at free.fr}{Daniel \textsc{Flipo}}}
-\newcommand*{\latestversion}{3.5k}
+\newcommand*{\latestversion}{3.5l}
\date{Version {\latestversion} -- \today}
\begin{document}
@@ -1080,8 +1080,9 @@
\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 @@
|\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,
Modified: trunk/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/generic/babel-french/frenchb.dtx
===================================================================
--- trunk/Master/texmf-dist/source/generic/babel-french/frenchb.dtx 2020-10-09 20:20:05 UTC (rev 56606)
+++ trunk/Master/texmf-dist/source/generic/babel-french/frenchb.dtx 2020-10-09 20:20:30 UTC (rev 56607)
@@ -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 @@
% \changes{v3.5k}{2020/09/09}{Small caps removed in \cs{figurename} and
% \cs{tablename}, use \cs{fnum at figure} and \cs{fnum at table} instead.}
%
+% \changes{v3.5l}{2020/10/08}{Redefine \cs{fnum at figure} and
+% \cs{fnum at 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 @@
\else
\ifdefined\fnum at figure
\let\fnum at figureORI\fnum at figure
- \let\fnum at tableORI\fnum at table
\renewcommand{\fnum at figure}{{\ifFBfrench\FBfigtabshape\fi
\fnum at figureORI}}%
+ \fi
+ \ifdefined\fnum at table
+ \let\fnum at tableORI\fnum at table
\renewcommand{\fnum at table}{{\ifFBfrench\FBfigtabshape\fi
\fnum at tableORI}}%
\fi
@@ -3946,7 +3953,7 @@
\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 @@
% \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 at capsepfalse}{}
\@ifclassloaded{amsart}{\@FBwarning at capsepfalse}{}
\@ifclassloaded{amsbook}{\@FBwarning at capsepfalse}{}
\@ifclassloaded{amsdtx}{\@FBwarning at capsepfalse}{}
@@ -3994,6 +4000,18 @@
\@ifclassloaded{smfbook}{\@FBwarning at 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 at capsepfalse}{}
+\@ifclassloaded{IEEEtran}{\@FBwarning at capsepfalse}{}
+\@ifclassloaded{revtex4-2}{\@FBwarning at capsepfalse}{}
+\@ifclassloaded{svjour3}{\@FBwarning at 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 @@
\@FBwarning at 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 at capsepfalse}{}%
+ \@ifpackageloaded{caption}{\@FBwarning at capsepfalse}{}%
+ \@ifpackageloaded{caption-light}{\@FBwarning at capsepfalse}{}%
% \end{macrocode}
% Final warning if relevant:
% \begin{macrocode}
@@ -4074,8 +4094,8 @@
{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 at makecaption\relax
Modified: trunk/Master/texmf-dist/tex/generic/babel-french/acadian.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/generic/babel-french/acadian.ldf 2020-10-09 20:20:05 UTC (rev 56606)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/acadian.ldf 2020-10-09 20:20:30 UTC (rev 56607)
@@ -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
Modified: trunk/Master/texmf-dist/tex/generic/babel-french/canadien.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/generic/babel-french/canadien.ldf 2020-10-09 20:20:05 UTC (rev 56606)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/canadien.ldf 2020-10-09 20:20:30 UTC (rev 56607)
@@ -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
Modified: trunk/Master/texmf-dist/tex/generic/babel-french/francais.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/generic/babel-french/francais.ldf 2020-10-09 20:20:05 UTC (rev 56606)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/francais.ldf 2020-10-09 20:20:30 UTC (rev 56607)
@@ -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
Modified: trunk/Master/texmf-dist/tex/generic/babel-french/french.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/generic/babel-french/french.ldf 2020-10-09 20:20:05 UTC (rev 56606)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/french.ldf 2020-10-09 20:20:30 UTC (rev 56607)
@@ -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 at figure
\let\fnum at figureORI\fnum at figure
- \let\fnum at tableORI\fnum at table
\renewcommand{\fnum at figure}{{\ifFBfrench\FBfigtabshape\fi
\fnum at figureORI}}%
+ \fi
+ \ifdefined\fnum at table
+ \let\fnum at tableORI\fnum at table
\renewcommand{\fnum at table}{{\ifFBfrench\FBfigtabshape\fi
\fnum at tableORI}}%
\fi
@@ -1018,7 +1020,6 @@
\hb at xt@\hsize{\hfil\box\@tempboxa\hfil}%
\fi
\vskip\belowcaptionskip}
-\@ifclassloaded{acmart}{\@FBwarning at capsepfalse}{}
\@ifclassloaded{amsart}{\@FBwarning at capsepfalse}{}
\@ifclassloaded{amsbook}{\@FBwarning at capsepfalse}{}
\@ifclassloaded{amsdtx}{\@FBwarning at capsepfalse}{}
@@ -1026,6 +1027,10 @@
\@ifclassloaded{amproc}{\@FBwarning at capsepfalse}{}
\@ifclassloaded{smfart}{\@FBwarning at capsepfalse}{}
\@ifclassloaded{smfbook}{\@FBwarning at capsepfalse}{}
+\@ifclassloaded{IEEEconf}{\@FBwarning at capsepfalse}{}
+\@ifclassloaded{IEEEtran}{\@FBwarning at capsepfalse}{}
+\@ifclassloaded{revtex4-2}{\@FBwarning at capsepfalse}{}
+\@ifclassloaded{svjour3}{\@FBwarning at capsepfalse}{}
\@ifclassloaded{memoir}{\@FBwarning at capsepfalse}{}
\ifFB at koma \@FBwarning at capsepfalse \fi
\@ifclassloaded{beamer}{\@FBwarning at capsepfalse}{}
@@ -1044,14 +1049,15 @@
\fi
\@FBwarning at capsepfalse
\fi
- \@ifpackageloaded{caption}{\@FBwarning at capsepfalse}{}%
+ \@ifpackageloaded{caption}{\@FBwarning at capsepfalse}{}%
+ \@ifpackageloaded{caption-light}{\@FBwarning at capsepfalse}{}%
\if at 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 at makecaption\relax
Modified: trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf 2020-10-09 20:20:05 UTC (rev 56606)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf 2020-10-09 20:20:30 UTC (rev 56607)
@@ -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 at tempa{frenchb}
\ifx\CurrentOption\bbl at tempa
\chardef\l at frenchb\l at french
Modified: trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
===================================================================
--- trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.lua 2020-10-09 20:20:05 UTC (rev 56606)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.lua 2020-10-09 20:20:30 UTC (rev 56607)
@@ -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.
More information about the tex-live-commits
mailing list.