summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-07-03 20:55:10 +0000
committerKarl Berry <karl@freefriends.org>2020-07-03 20:55:10 +0000
commit62959e7b001ff4af0605b0055c637c5219b46c82 (patch)
treed6bf062b40b8dcc41227c501fda976602b20396e /Master/texmf-dist/source
parent959e2db1ac1afe62f2c48c71add5ae1fe68af7c0 (diff)
babel-french (3jul20)
git-svn-id: svn://tug.org/texlive/trunk@55742 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r--Master/texmf-dist/source/generic/babel-french/frenchb.dtx32
1 files changed, 24 insertions, 8 deletions
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 @@
%<frenchb>\ProvidesLanguage{frenchb}
%<lua>--[[
%<lua> 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
%</internal>
@@ -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