babel-french (30jun20)

git-svn-id: svn://tug.org/texlive/trunk@55708 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 74 insertions, 62 deletions

diff --git a/Master/texmf-dist/source/generic/babel-french/frenchb.dtx b/Master/texmf-dist/source/generic/babel-french/frenchb.dtx
index 4941b1cea78..d253c3b90b5 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{3802}
+%\CheckSum{3835}
 %
 %\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/04/18 v3.5h French support from the babel system]
+         [2020/06/30 v3.5i French support from the babel system]
 %<*internal>
 \iffalse
 %</internal>
@@ -47,21 +47,16 @@
 \usepackage[dvipsnames]{xcolor}
 \usepackage[no-math]{fontspec}
 \usepackage{realscripts}
-\setmainfont{FiraSans}[
-  Extension = .otf ,
-  UprightFont       = *-Book,
-  ItalicFont        = *-BookItalic,
-  BoldFont          = *-Medium,
-  BoldItalicFont    = *-MediumItalic,
-  SmallCapsFont     = FiraSans-Book,
-  SmallCapsFeatures =  {Letters=SmallCaps},
+\setmainfont{Vera.ttf}[
+  ItalicFont        = VeraIt.ttf,
+  BoldFont          = VeraBd.ttf,
+  BoldItalicFont    = VeraBI.ttf,
+  Scale = 0.92
   ]
-\setmonofont{FiraMono}[
-  Extension = .otf ,
-  UprightFont       = *-Regular,
-  ItalicFont        = *-Oblique,
-  BoldFont          = *-Medium,
-  BoldItalicFont    = *-MediumOblique,
+\setmonofont{VeraMono.ttf}[
+  ItalicFont        = VeraMoIt.ttf,
+  BoldFont          = VeraMoBd.ttf,
+  BoldItalicFont    = VeraMoBI.ttf,
   Scale = MatchLowercase,
   ]
 %
@@ -659,10 +654,10 @@
 %      a proper space before it and warns if it fails to do so.
 %
 %    \item [OldFigTabCaptions=true (false)] is to be used \emph{only}
-%      when
-%      figures’ and tables’ captions must be typeset as with pre~3.0
-%      versions of \frenchb{} (with |\CaptionSeparator| in French and
-%      colon otherwise). Intended for standard LaTeX classes only.
+%      when figures’ and tables’ captions must be typeset as with
+%      pre~3.0 versions of \frenchb{} (with |\CaptionSeparator| in
+%      French and colon otherwise).
+%      Intended for standard LaTeX classes only.
 %
 %    \item [FrenchSuperscripts=false (true)]; then
 %      |\up=\textsuperscript|. % (option added in version 2.1).
@@ -718,7 +713,7 @@
 %    which defaults to ` -- ’ and can be redefined in the preamble with
 %    |\renewcommand*{\CaptionSeparator}{...}|.
 %    This works for the standard LaTeX2e classes, for the \cls{memoir}
-%    and koma-script classes.
+%    koma-script and beamer classes.
 %    In case this procedure fails a warning is issued.
 %
 %    When French is not the main language, the colon is preserved for
@@ -727,9 +722,11 @@
 %
 %    Three options are provided to customise figure and table captions:
 %    \begin{itemize}
-%    \item if \fbo{CustomiseFigTabCaptions} is set to \fbo{false} the
-%      colon will be used as separator in all languages, with a proper
-%      space before the colon in French (if possible);
+%    \item \fbo{CustomiseFigTabCaptions} is set to \fbo{true} when
+%      French is the main language (hence separator = ` -- ’) and to
+%      \fbo{false} otherwise (hence separator = `: ’ with a proper
+%      space before the colon in French if possible); toogle this option
+%      if needed;
 %    \item the second option, \fbo{OldFigTabCaptions}, can be set to
 %      \fbo{true} to print figures’ and tables’ captions as they were
 %      with versions pre~3.0 of \frenchb{} (using |\CaptionSeparator|
@@ -1447,7 +1444,7 @@
       \else                    \FB@dialect=1 \relax
       \fi
 %    \end{macrocode}
-%    When first entering French, we have to set the LuaTeX
+%    When first entering French, we must set the LuaTeX
 %    tables for French (|\FB@dialect=0|) \emph{before} any dialect
 %    redefines any |\FB...space| command.  Doing this `AtBeginDocument’
 %    would be too late: if French or a French dialect is the main
@@ -1687,7 +1684,7 @@ local FB_punct_thick =
 %    Managing spacing after `«’ (U+00AB) and before `»’ (U+00BB) can be
 %    done by the way; we define two flags, |FB_punct_left| for
 %    characters requiring some space before them and |FB_punct_right|
-%    for `\guillemotleft’ which must be followed by some space.
+%    for `«’ which must be followed by some space.
 %    In case LuaTeX is used to output T1-encoded fonts instead of
 %    OpenType fonts, codes \texttt{0x13} and \texttt{0x14}  have to be
 %    added for `«’ and `»’.
@@ -3110,9 +3107,10 @@ return french_punctuation
 %    dialects defines \emph{both} |\datefrench| and |\dateacadian|;
 %    this is required as \file{french.ldf} is read only once even if
 %    both language options \opt{french} and \opt{acadian} are supplied
-%    to \babel. Note that coding |\StartBabelCommands*{french,acadian}|
-%    would \emph{only} define |\csname date\CurrentOption\endcsname|,
+%    to \babel.  Coding |\StartBabelCommands*{french,acadian}|
+%    would \emph{only} define |\date\CurrentOption|,
 %    leaving the second language undefined in \babel’s sens.
+%
 %    \begin{macrocode}
 \def\BabelLanguages{french,acadian}
 \StartBabelCommands*{\BabelLanguages}{date}
@@ -4969,38 +4967,52 @@ return french_punctuation
 %    figure and table captions are now consistent with babel-french’s
 %    documentation.  Pointed out by Denis Bitouzé.}
 %
-%    Unless \fbo{CustomiseFigTabCaptions} has been set to \fbo{false},
-%    use |\CaptionSeparator| for koma-script, \cls{memoir} and
-%    \cls{beamer} classes.
-%    \begin{macrocode}
-  \ifFBCustomiseFigTabCaptions
-    \ifFB@koma
-      \renewcommand*{\captionformat}{\CaptionSeparator}%
-    \fi
-    \@ifclassloaded{memoir}%
-       {\captiondelim{\CaptionSeparator}}{}%
-    \@ifclassloaded{beamer}%
-       {\defbeamertemplate{caption label separator}{FBcustom}{%
-            \CaptionSeparator}%
-        \setbeamertemplate{caption label separator}[FBcustom]}{}%
-  \else
-%    \end{macrocode}
-%    When \fbo{CustomiseFigTabCaptions} is \fbo{false}, have the colon
-%    behave properly in French: locally force |\autospace@beforeFDP| in
-%    case of \fbo{AutoSpacePunctuation=false}.
-%    \begin{macrocode}
-    \ifFB@koma
-      \renewcommand*{\captionformat}{{\autospace@beforeFDP : }}%
-    \fi
-    \@ifclassloaded{memoir}%
-       {\captiondelim{{\autospace@beforeFDP : }}%
-       }{}%
-    \@ifclassloaded{beamer}%
-       {\defbeamertemplate{caption label separator}{FBcolon}{%
-             {\autospace@beforeFDP : }}%
-        \setbeamertemplate{caption label separator}[FBcolon]%
-       }{}%
+% \changes{v3.5i}{2020/06/29}{For memoir, koma-script and beamer
+%    classes, leave caption delimiter unchanged if it has been user
+%    customised.}
+%
+%    This is for koma-script, \cls{memoir} and \cls{beamer} classes.
+%    If the caption delimiter has been user customised, leave it
+%    unchanged.  Otherwise, force the colon to behave properly in French
+%    (add locally  |\autospace@beforeFDP| in case of
+%    \fbo{AutoSpacePunctuation=false}) and change the caption delimiter
+%    to |\CaptionSeparator| if \fbo{CustomiseFigTabCaptions} has been
+%    set to \fbo{true}.
+%    \begin{macrocode}
+  \ifFB@koma
+     \edef\FB@capsep{\captionformat}\edef\FB@std@capsep{:\ }%
+     \ifx\FB@capsep\FB@std@capsep
+       \ifFBCustomiseFigTabCaptions
+          \renewcommand*{\captionformat}{\CaptionSeparator}%
+       \else
+          \renewcommand*{\captionformat}{{\autospace@beforeFDP :\ }}%
+       \fi
+     \fi
   \fi
+  \@ifclassloaded{memoir}%
+     {\edef\FB@capsep{\@contdelim}\edef\FB@std@capsep{: }%
+      \ifx\FB@capsep\FB@std@capsep
+        \ifFBCustomiseFigTabCaptions
+          \captiondelim{\CaptionSeparator}%
+        \else
+          \captiondelim{{\autospace@beforeFDP : }}%
+        \fi
+      \fi}{}%
+  \@ifclassloaded{beamer}%
+     {\edef\FB@std@capsep{:\ }%
+      \edef\FB@capsep{%
+         \csname beamer@@tmpl@caption label separator\endcsname}%
+      \ifx\FB@capsep\FB@std@capsep
+        \ifFBCustomiseFigTabCaptions
+           \defbeamertemplate{caption label separator}{FBcustom}{%
+               \CaptionSeparator}%
+           \setbeamertemplate{caption label separator}[FBcustom]%
+        \else
+           \defbeamertemplate{caption label separator}{FBcolon}{%
+               {\autospace@beforeFDP : }}%
+           \setbeamertemplate{caption label separator}[FBcolon]%
+        \fi
+      \fi}{}%
 %    \end{macrocode}
 %    \fbo{ShowOptions}: if \fbo{true}, print the list of all options
 %    to the \file{.log} file.
@@ -5829,9 +5841,9 @@ return french_punctuation
            \localleftbox{\FBeveryline@quote}}%
        \else
 %    \end{macrocode}
-%    Special add-on for the \cls{memoir} class: |\maketitle| redefines
-%    |\@makefntext| as |\makethanksmark| which is customised as follows
-%    to match the other notes’ vertical alignment.
+%    Special add-on for the \cls{memoir} class: |\@makefntext| is
+%    redefined as |\makethanksmark| by |\maketitle|, hence these
+%    settings to match the other notes’ vertical alignment.
 %    \begin{macrocode}
          \@ifclassloaded{memoir}%
             {\ifFBFrenchFootnotes