texlive[55708] Master/texmf-dist: babel-french (30jun20)
commits+karl at tug.org
commits+karl at tug.org
Tue Jun 30 23:28:35 CEST 2020
Revision: 55708
http://tug.org/svn/texlive?view=revision&revision=55708
Author: karl
Date: 2020-06-30 23:28:35 +0200 (Tue, 30 Jun 2020)
Log Message:
-----------
babel-french (30jun20)
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-06-30 21:28:11 UTC (rev 55707)
+++ trunk/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex 2020-06-30 21:28:35 UTC (rev 55708)
@@ -410,8 +410,8 @@
fichier \file{.log}.
Certaines classes ou extensions modifient la présentation des légendes;
- parmi elles, les classes (\cls{memoir}, koma-script et AMS et les
- extensions(\ext{caption} et \ext{floatrow} sont compatibles avec
+ parmi elles, les classes (\cls{memoir}, \cls{beamer}, koma-script et AMS
+ et les extensions(\ext{caption} et \ext{floatrow} sont compatibles avec
\ext{babel-french}.
Un avertissement est inséré dans le fichier \file{.log} lorsqu’il y a risque
@@ -1531,6 +1531,11 @@
type~1 avec Lua\-(La)TeX : tout crénage était supprimé pour ces polices depuis
la version~3.1f (2015) ; les polices OpenType elles, n’ont jamais été affectées.
+La version 3.5i corrige aussi une bogue ancienne affectant les classes
+koma-script, \cls{memoir} et \cls{beamer} : les redéfinitions du séparateur
+des légendes de figures et tables (commandes |\captionformat|, |\captiondelim|,
+etc.) sont maintenant prises en compte correctement.
+
\subsection{Changements entre les versions 3.4d et 3.3d}
\label{ssec:changes-3.4}
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-06-30 21:28:11 UTC (rev 55707)
+++ trunk/Master/texmf-dist/source/generic/babel-french/frenchb.dtx 2020-06-30 21:28:35 UTC (rev 55708)
@@ -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 at 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 at 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 @@
% 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 @@
% 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 @@
% 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.
+% \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 at 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}
- \ifFBCustomiseFigTabCaptions
- \ifFB at 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 at beforeFDP| in
-% case of \fbo{AutoSpacePunctuation=false}.
-% \begin{macrocode}
- \ifFB at koma
- \renewcommand*{\captionformat}{{\autospace at beforeFDP : }}%
- \fi
- \@ifclassloaded{memoir}%
- {\captiondelim{{\autospace at beforeFDP : }}%
- }{}%
- \@ifclassloaded{beamer}%
- {\defbeamertemplate{caption label separator}{FBcolon}{%
- {\autospace at beforeFDP : }}%
- \setbeamertemplate{caption label separator}[FBcolon]%
- }{}%
+ \ifFB at koma
+ \edef\FB at capsep{\captionformat}\edef\FB at std@capsep{:\ }%
+ \ifx\FB at capsep\FB at std@capsep
+ \ifFBCustomiseFigTabCaptions
+ \renewcommand*{\captionformat}{\CaptionSeparator}%
+ \else
+ \renewcommand*{\captionformat}{{\autospace at beforeFDP :\ }}%
+ \fi
+ \fi
\fi
+ \@ifclassloaded{memoir}%
+ {\edef\FB at capsep{\@contdelim}\edef\FB at std@capsep{: }%
+ \ifx\FB at capsep\FB at std@capsep
+ \ifFBCustomiseFigTabCaptions
+ \captiondelim{\CaptionSeparator}%
+ \else
+ \captiondelim{{\autospace at beforeFDP : }}%
+ \fi
+ \fi}{}%
+ \@ifclassloaded{beamer}%
+ {\edef\FB at std@capsep{:\ }%
+ \edef\FB at capsep{%
+ \csname beamer@@tmpl at caption label separator\endcsname}%
+ \ifx\FB at capsep\FB at std@capsep
+ \ifFBCustomiseFigTabCaptions
+ \defbeamertemplate{caption label separator}{FBcustom}{%
+ \CaptionSeparator}%
+ \setbeamertemplate{caption label separator}[FBcustom]%
+ \else
+ \defbeamertemplate{caption label separator}{FBcolon}{%
+ {\autospace at 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 @@
\localleftbox{\FBeveryline at 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
Modified: trunk/Master/texmf-dist/tex/generic/babel-french/acadian.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/generic/babel-french/acadian.ldf 2020-06-30 21:28:11 UTC (rev 55707)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/acadian.ldf 2020-06-30 21:28:35 UTC (rev 55708)
@@ -24,7 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{acadian}
- [2020/04/18 v3.5h French support from the babel system]
+ [2020/06/30 v3.5i 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-06-30 21:28:11 UTC (rev 55707)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/canadien.ldf 2020-06-30 21:28:35 UTC (rev 55708)
@@ -24,7 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{canadien}
- [2020/04/18 v3.5h French support from the babel system]
+ [2020/06/30 v3.5i 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-06-30 21:28:11 UTC (rev 55707)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/francais.ldf 2020-06-30 21:28:35 UTC (rev 55708)
@@ -24,7 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{francais}
- [2020/04/18 v3.5h French support from the babel system]
+ [2020/06/30 v3.5i 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-06-30 21:28:11 UTC (rev 55707)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/french.ldf 2020-06-30 21:28:35 UTC (rev 55708)
@@ -24,7 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{french}
- [2020/04/18 v3.5h French support from the babel system]
+ [2020/06/30 v3.5i French support from the babel system]
%%
%% Babel package for LaTeX version 2e
%% Copyright © 1996-2020
@@ -1538,29 +1538,40 @@
\else
\renewcommand*{\FB at lc}[1]{##1}%
\fi
- \ifFBCustomiseFigTabCaptions
- \ifFB at koma
- \renewcommand*{\captionformat}{\CaptionSeparator}%
- \fi
- \@ifclassloaded{memoir}%
- {\captiondelim{\CaptionSeparator}}{}%
- \@ifclassloaded{beamer}%
- {\defbeamertemplate{caption label separator}{FBcustom}{%
- \CaptionSeparator}%
- \setbeamertemplate{caption label separator}[FBcustom]}{}%
- \else
- \ifFB at koma
- \renewcommand*{\captionformat}{{\autospace at beforeFDP : }}%
- \fi
- \@ifclassloaded{memoir}%
- {\captiondelim{{\autospace at beforeFDP : }}%
- }{}%
- \@ifclassloaded{beamer}%
- {\defbeamertemplate{caption label separator}{FBcolon}{%
- {\autospace at beforeFDP : }}%
- \setbeamertemplate{caption label separator}[FBcolon]%
- }{}%
+ \ifFB at koma
+ \edef\FB at capsep{\captionformat}\edef\FB at std@capsep{:\ }%
+ \ifx\FB at capsep\FB at std@capsep
+ \ifFBCustomiseFigTabCaptions
+ \renewcommand*{\captionformat}{\CaptionSeparator}%
+ \else
+ \renewcommand*{\captionformat}{{\autospace at beforeFDP :\ }}%
+ \fi
+ \fi
\fi
+ \@ifclassloaded{memoir}%
+ {\edef\FB at capsep{\@contdelim}\edef\FB at std@capsep{: }%
+ \ifx\FB at capsep\FB at std@capsep
+ \ifFBCustomiseFigTabCaptions
+ \captiondelim{\CaptionSeparator}%
+ \else
+ \captiondelim{{\autospace at beforeFDP : }}%
+ \fi
+ \fi}{}%
+ \@ifclassloaded{beamer}%
+ {\edef\FB at std@capsep{:\ }%
+ \edef\FB at capsep{%
+ \csname beamer@@tmpl at caption label separator\endcsname}%
+ \ifx\FB at capsep\FB at std@capsep
+ \ifFBCustomiseFigTabCaptions
+ \defbeamertemplate{caption label separator}{FBcustom}{%
+ \CaptionSeparator}%
+ \setbeamertemplate{caption label separator}[FBcustom]%
+ \else
+ \defbeamertemplate{caption label separator}{FBcolon}{%
+ {\autospace at beforeFDP : }}%
+ \setbeamertemplate{caption label separator}[FBcolon]%
+ \fi
+ \fi}{}%
\ifFBShowOptions
\GenericWarning{* }{%
*** List of possible options for babel-french ***\MessageBreak
Modified: trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf 2020-06-30 21:28:11 UTC (rev 55707)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf 2020-06-30 21:28:35 UTC (rev 55708)
@@ -24,7 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{frenchb}
- [2020/04/18 v3.5h French support from the babel system]
+ [2020/06/30 v3.5i 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-06-30 21:28:11 UTC (rev 55707)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.lua 2020-06-30 21:28:35 UTC (rev 55708)
@@ -1,6 +1,6 @@
--[[
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]
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.