From 734c835ecdb73a59f1c336c8283950e04613f19f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 9 Oct 2020 20:20:30 +0000 Subject: babel-french (9oct20) git-svn-id: svn://tug.org/texlive/trunk@56607 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/generic/babel-french/frenchb.dtx | 40 ++++++++++++++++------ 1 file changed, 30 insertions(+), 10 deletions(-) (limited to 'Master/texmf-dist/source') 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 @@ %\ProvidesLanguage{frenchb} %--[[ % 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 % @@ -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 -- cgit v1.2.3