From 62959e7b001ff4af0605b0055c637c5219b46c82 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 3 Jul 2020 20:55:10 +0000 Subject: babel-french (3jul20) git-svn-id: svn://tug.org/texlive/trunk@55742 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/generic/babel-french/frenchb-doc.pdf | Bin 153907 -> 153909 bytes .../doc/generic/babel-french/frenchb-doc.tex | 6 ++-- .../doc/generic/babel-french/frenchb.pdf | Bin 325661 -> 326852 bytes .../source/generic/babel-french/frenchb.dtx | 32 +++++++++++++++------ .../tex/generic/babel-french/acadian.ldf | 2 +- .../tex/generic/babel-french/canadien.ldf | 2 +- .../tex/generic/babel-french/francais.ldf | 2 +- .../texmf-dist/tex/generic/babel-french/french.ldf | 18 +++++++----- .../tex/generic/babel-french/frenchb.ldf | 2 +- .../tex/generic/babel-french/frenchb.lua | 2 +- 10 files changed, 43 insertions(+), 23 deletions(-) (limited to 'Master') 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 e17f576a214..a1c8ea6289c 100644 Binary files a/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.pdf and b/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.pdf 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 d8c59aeb653..8589fe3043a 100644 --- a/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex +++ b/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex @@ -125,11 +125,11 @@ % \title{Documentation sur le module \ext{babel-french}} \author{\href{mailto:daniel.flipo@free.fr}{Daniel \textsc{Flipo}}} -\newcommand*{\latestversion}{3.5h} +\newcommand*{\latestversion}{3.5j} \date{Version {\latestversion} -- \today} \begin{document} -\def\today{18 avril 2020} +\def\today{2 juillet 2020} \maketitle \thispagestyle{empty} @@ -1531,7 +1531,7 @@ La version 3.5g corrige une bogue ancienne affectant l’usage des polices 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 +La version 3.5j 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. diff --git a/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf b/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf index e2fdf7b604c..f7ac0ff1d4b 100644 Binary files a/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf and b/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf differ diff --git a/Master/texmf-dist/source/generic/babel-french/frenchb.dtx b/Master/texmf-dist/source/generic/babel-french/frenchb.dtx index d253c3b90b5..45d56480d45 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{3835} +%\CheckSum{3841} % %\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/06/30 v3.5i French support from the babel system] + [2020/07/02 v3.5j French support from the babel system] %<*internal> \iffalse % @@ -807,6 +807,11 @@ % Version 3.5g fixes a long standing bug affecting LuaTeX: legacy % kerning was disabled for Type1 fonts since v3.1g (2015). % +% Version 3.5j also fixes a long standing bug affecting koma-script, +% \cls{memoir} et \cls{beamer} classes: redefintions of the caption +% separator (commands |\captionformat|, |\captiondelim|, etc.) are +% now taken into account properly. +% % \subsubsection*{What’s new in version 3.4?} % % Version 3.4a adds a new command |\frenchdate| (see @@ -2489,8 +2494,22 @@ return french_punctuation % \subsubsection{Punctuation with standard (pdf)TeX} % \label{sssec-punct-tex} % +% \changes{v3.5j}{2020/07/02}{For memoir, koma-script and beamer +% captions, \cs{FB@std@sep} has to be defined before activating +% the colon.} +% % In standard (pdf)TeX we need to make the four characters |;| |!| |?| % and |:| `active’ and provide their definitions. +% Before doing so, we have to save some definitions involving |:|. +% \begin{macrocode} +\newif\ifFB@koma +\@ifclassloaded{scrartcl}{\FB@komatrue}{} +\@ifclassloaded{scrbook}{\FB@komatrue}{} +\@ifclassloaded{scrreprt}{\FB@komatrue}{} +\ifFB@koma\def\FB@std@capsep{:\ }\fi +\@ifclassloaded{beamer}{\def\FB@std@capsep{:\ }}{} +\@ifclassloaded{memoir}{\def\FB@std@capsep{: }}{} +% \end{macrocode} % \begin{macrocode} \ifFB@active@punct \initiate@active@char{:}% @@ -4980,8 +4999,7 @@ return french_punctuation % set to \fbo{true}. % \begin{macrocode} \ifFB@koma - \edef\FB@capsep{\captionformat}\edef\FB@std@capsep{:\ }% - \ifx\FB@capsep\FB@std@capsep + \ifx\captionformat\FB@std@capsep \ifFBCustomiseFigTabCaptions \renewcommand*{\captionformat}{\CaptionSeparator}% \else @@ -4990,8 +5008,7 @@ return french_punctuation \fi \fi \@ifclassloaded{memoir}% - {\edef\FB@capsep{\@contdelim}\edef\FB@std@capsep{: }% - \ifx\FB@capsep\FB@std@capsep + {\ifx\@contdelim\FB@std@capsep \ifFBCustomiseFigTabCaptions \captiondelim{\CaptionSeparator}% \else @@ -4999,8 +5016,7 @@ return french_punctuation \fi \fi}{}% \@ifclassloaded{beamer}% - {\edef\FB@std@capsep{:\ }% - \edef\FB@capsep{% + {\protected@edef\FB@capsep{% \csname beamer@@tmpl@caption label separator\endcsname}% \ifx\FB@capsep\FB@std@capsep \ifFBCustomiseFigTabCaptions diff --git a/Master/texmf-dist/tex/generic/babel-french/acadian.ldf b/Master/texmf-dist/tex/generic/babel-french/acadian.ldf index fb28f0c9eeb..fccad56c353 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: %% \ProvidesLanguage{acadian} - [2020/06/30 v3.5i French support from the babel system] + [2020/07/02 v3.5j 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 ba83e1e1a6f..c622fb32613 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: %% \ProvidesLanguage{canadien} - [2020/06/30 v3.5i French support from the babel system] + [2020/07/02 v3.5j 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 b0d97a2219f..d6f942282f8 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: %% \ProvidesLanguage{francais} - [2020/06/30 v3.5i French support from the babel system] + [2020/07/02 v3.5j 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 21e5795355c..ec6d98cf97e 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: %% \ProvidesLanguage{french} - [2020/06/30 v3.5i French support from the babel system] + [2020/07/02 v3.5j French support from the babel system] %% %% Babel package for LaTeX version 2e %% Copyright © 1996-2020 @@ -417,6 +417,13 @@ } \addto\extrasfrench{\FB@xetex@punct@french} \fi +\newif\ifFB@koma +\@ifclassloaded{scrartcl}{\FB@komatrue}{} +\@ifclassloaded{scrbook}{\FB@komatrue}{} +\@ifclassloaded{scrreprt}{\FB@komatrue}{} +\ifFB@koma\def\FB@std@capsep{:\ }\fi +\@ifclassloaded{beamer}{\def\FB@std@capsep{:\ }}{} +\@ifclassloaded{memoir}{\def\FB@std@capsep{: }}{} \ifFB@active@punct \initiate@active@char{:}% \initiate@active@char{;}% @@ -1539,8 +1546,7 @@ \renewcommand*{\FB@lc}[1]{##1}% \fi \ifFB@koma - \edef\FB@capsep{\captionformat}\edef\FB@std@capsep{:\ }% - \ifx\FB@capsep\FB@std@capsep + \ifx\captionformat\FB@std@capsep \ifFBCustomiseFigTabCaptions \renewcommand*{\captionformat}{\CaptionSeparator}% \else @@ -1549,8 +1555,7 @@ \fi \fi \@ifclassloaded{memoir}% - {\edef\FB@capsep{\@contdelim}\edef\FB@std@capsep{: }% - \ifx\FB@capsep\FB@std@capsep + {\ifx\@contdelim\FB@std@capsep \ifFBCustomiseFigTabCaptions \captiondelim{\CaptionSeparator}% \else @@ -1558,8 +1563,7 @@ \fi \fi}{}% \@ifclassloaded{beamer}% - {\edef\FB@std@capsep{:\ }% - \edef\FB@capsep{% + {\protected@edef\FB@capsep{% \csname beamer@@tmpl@caption label separator\endcsname}% \ifx\FB@capsep\FB@std@capsep \ifFBCustomiseFigTabCaptions diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf index f17d3420026..e883c208206 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: %% \ProvidesLanguage{frenchb} - [2020/06/30 v3.5i French support from the babel system] + [2020/07/02 v3.5j 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 b9530d454f6..bfbc48c2486 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/06/30 v3.5i French support from the babel system] + [2020/07/02 v3.5j French support from the babel system] Copyright © 2014-2020 Daniel Flipo License LPPL: see french.ldf. -- cgit v1.2.3