summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/generic/babel-french
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-06-15 23:28:19 +0000
committerKarl Berry <karl@freefriends.org>2015-06-15 23:28:19 +0000
commit20e51a25c22700214c05b35772c0f08180182e9b (patch)
treed3d0a49e6bf99fcc580bdd0fb22b673fedf80268 /Master/texmf-dist/source/generic/babel-french
parent2f05ae42598d627531926ff3c13d41c27a8e98d9 (diff)
babel-french (2jun15)
git-svn-id: svn://tug.org/texlive/trunk@37554 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/generic/babel-french')
-rw-r--r--Master/texmf-dist/source/generic/babel-french/frenchb.dtx86
1 files changed, 57 insertions, 29 deletions
diff --git a/Master/texmf-dist/source/generic/babel-french/frenchb.dtx b/Master/texmf-dist/source/generic/babel-french/frenchb.dtx
index 5816c5efae9..f8c80ae196f 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{3305}
+%\CheckSum{3315}
%
%\iffalse
% Tell the \LaTeX\ system who we are and write an entry on the
@@ -13,7 +13,7 @@
%<ldf>\ProvidesLanguage{frenchb}
%\ProvidesFile{frenchb.dtx}
%<*!lua>
- [2015/04/10 v3.1e French support from the babel system]
+ [2015/05/31 v3.1f French support from the babel system]
%</!lua>
%<*internal>
\iffalse
@@ -273,7 +273,7 @@
% \item Two commands are provided to typeset the symbol for
% ``degré'': |\degre| prints the raw character and
% |\degres| should be used to typeset temperatures (e.g.,
-% ``|20~\degres C|'' with an unbreakable space), or for
+% ``|20~\degres C|'' with an nobreak space), or for
% alcohols'' strengths (e.g., ``|45\degres|'' with \emph{no}
% space in French).
%
@@ -396,7 +396,7 @@
% \item [IndentFirst=false (true*)]; set this option to \fbo{false}
% if you do not want \frenchb{} to force indentation of the
% first paragraph of sections. When French is the main language,
-% this options applies to all languages.
+% this option applies to all languages.
% \item [FrenchFootnotes=false (true*)] reverts to the standard
% layout of footnotes. By default \frenchb{} typesets leading
% numbers as `1.\hspace{.5em}' instead of `$\hbox{}^1$', but
@@ -419,8 +419,8 @@
% \emph{should} input a space before the four characters `|:;!?|'
% but as many people forget about it (even among native French
% writers!), the default behaviour of \frenchb{} is to
-% automatically typeset nobreakspaces the width of which is
-% either |\FBthinspace| (defauts to |\thinspace|) before `|;|'
+% automatically typeset nobreak spaces the width of which is
+% either |\FBthinspace| (defauts to thin space) before `|;|'
% `|!|' `|?|' or |\FBcolonspace| (defauts to |\space|) before
% `|:|'; the defaults follow the French `Imprimerie Nationale's
% recommendations. This is convenient in most cases but can lead
@@ -542,10 +542,10 @@
% redefine captions, even if \babel{}'s option was entered as
% |francais| or |frenchb|.
%
-% When French is the main language, \frenchb{} changes the separator
-% (colon) used in figures' and tables' captions \emph{for all
-% languages} to |\CaptionSeparator| which defaults to `~--~' and can
-% be redefined in the preamble with\\
+% When French is the main language, by default (see below)
+% \frenchb{} changes the separator (colon) used in figures' and
+% tables' captions \emph{for all languages} to |\CaptionSeparator|
+% which defaults to ` -- ' and can be redefined in the preamble with
% |\renewcommand*{\CaptionSeparator}{...}|.
%
% When French is not the main language, the colon is preserved for
@@ -1154,7 +1154,7 @@
% \cs{FBthinspace} and \cs{Fcolonspace} to \cs{FBcolonspace} to avoid
% a conflict with fournier.sty.}
%
-% \changes{v3.0a}{2014/01/13}{\cs{FBthinspace} is no longer a kern but
+% \changes{v3.1f}{2015/05/31}{\cs{FBthinspace} is no longer a kern but
% a skip (frenchb adds a nobreak penalty before it).}
%
% \begin{macro}{\FBcolonskip}
@@ -1175,7 +1175,7 @@
% |\FBcolonskip| and |\FBthinskip| are also user customisable.
% \begin{macrocode}
\newcommand*{\FBcolonspace}{\space}
-\newcommand*{\FBthinspace}{\thinspace}
+\newcommand*{\FBthinspace}{\hskip .16667em \relax}
\newskip\FBcolonskip
\FBcolonskip=3.33pt plus 1.665pt minus 1.11pt \relax
\newskip\FBthinskip
@@ -1466,7 +1466,7 @@ local function french_punctuation (head)
% «\cs{texttt}\{a\}»).}
%
% \changes{v3.1a}{2014/06/18}{frenchb.lua: look ahead when next is a kern
-% (i.e in « \cs{texttt}\{a\} »).}
+% (i.e. in « \cs{texttt}\{a\} »).}
%
% \begin{macrocode}
elseif SIG and SIG > 0 then
@@ -3013,7 +3013,7 @@ return french_punctuation
\@FBwarning@capseptrue
\newcommand{\FBWarning}[2]{\PackageWarning{#1}{#2}}
\newcommand*{\CaptionSeparator}{\space\textendash\space}
-\def\FBCaption@Separator{:\space}
+\def\FBCaption@Separator{: }
\long\def\FB@makecaption#1#2{%
\vskip\abovecaptionskip
\sbox\@tempboxa{#1\FBCaption@Separator #2}%
@@ -3056,15 +3056,21 @@ return french_punctuation
% warning.}
%
% No warning with \cls{memoir} or koma-script classes: they change
-% |\@makecaption| but we will manage to customise them in French
+% |\@makecaption| but we will manage to customise them in French
% later on (see below after executing |\FBprocess@options|).
-% No warning either if |\@makecaption| is undefined.
% \begin{macrocode}
\newif\ifFB@koma
\@ifclassloaded{memoir}{\@FBwarning@capsepfalse}{}
\@ifclassloaded{scrartcl}{\@FBwarning@capsepfalse\FB@komatrue}{}
\@ifclassloaded{scrbook}{\@FBwarning@capsepfalse\FB@komatrue}{}
\@ifclassloaded{scrreprt}{\@FBwarning@capsepfalse\FB@komatrue}{}
+% \end{macrocode}
+% No warning with the \cls{beamer} class which defines
+% |\beamer@makecaption| (customised below) instead of
+% |\@makecaption|. No warning either if |\@makecaption| is
+% undefined (i.e. \cls{letter}).
+% \begin{macrocode}
+\@ifclassloaded{beamer}{\@FBwarning@capsepfalse}{}
\ifdefined\@makecaption\else\@FBwarning@capsepfalse\fi
% \end{macrocode}
%
@@ -3102,6 +3108,9 @@ return french_punctuation
% |\FBCaption@Separator|, taking care that the colon is typeset
% correctly in French (\emph{not} `Figure~1: légende').
%
+% \changes{v3.1f}{2015/05/31}{\cs{FBCaption@Separator} changed when
+% option CustomiseFigTabCaptions is set to false.}
+%
% \begin{macrocode}
\AtBeginDocument{%
\ifx\@makecaption\STD@makecaption
@@ -3113,7 +3122,7 @@ return french_punctuation
% \begin{macrocode}
\ifFBOldFigTabCaptions
\else
- \def\FBCaption@Separator{\iflanguage{french}{ : }{: }}%
+ \def\FBCaption@Separator{{\autospace@beforeFDP : }}%
\fi
\ifFBCustomiseFigTabCaptions
\ifx\bbl@main@language\FB@french
@@ -3927,27 +3936,46 @@ return french_punctuation
% \changes{v3.0a}{2014/02/20}{With koma-script and memoir class,
% customise \cs{captionformat} and \cs{captiondelim}.}
%
+% \changes{v3.1f}{2015/05/31}{Definition of \cs{captionformat} and
+% \cs{captiondelim} changed when option CustomiseFigTabCaptions
+% is set to false.}
+%
+% \changes{v3.1f}{2015/05/31}{Bug fix for the beamer class:
+% figure and table captions are now consistent with frenchb's
+% documentation. Pointed out by Denis Bitouzé.}
+%
% Unless \fbo{CustomiseFigTabCaptions} has been set to \fbo{false},
-% use |\CaptionSeparator| for koma-script and \cls{memoir}
-% classes.
+% use |\CaptionSeparator| for koma-script, \cls{memoir} and
+% \cls{beamer} classes.
% \begin{macrocode}
- \ifFBCustomiseFigTabCaptions
+ \ifFBCustomiseFigTabCaptions
\ifFB@koma
- \let\captionformat\CaptionSeparator
+ \renewcommand*{\captionformat}{\CaptionSeparator}%
\fi
\@ifclassloaded{memoir}%
{\captiondelim{\CaptionSeparator}}{}%
- \else
+ \@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.
+% behave properly in French: locally force |\autospace@beforeFDP| in
+% case of \fbo{AutoSpacePunctuation=false}.
% \begin{macrocode}
\ifFB@koma
- \def\captionformat{\iflanguage{french}{ : }{: }}%
+ \renewcommand*{\captionformat}{{\autospace@beforeFDP : }}%
\fi
\@ifclassloaded{memoir}%
- {\captiondelim{\iflanguage{french}{ : }{: }}}{}%
- \fi
+ {\captiondelim{{\autospace@beforeFDP : }}%
+ }{}%
+ \@ifclassloaded{beamer}%
+ {\defbeamertemplate{caption label separator}{FBcolon}{%
+ {\autospace@beforeFDP : }}%
+ \setbeamertemplate{caption label separator}[FBcolon]%
+ }{}%
+ \fi
% \end{macrocode}
% \fbo{ShowOptions}: if \fbo{true}, print the list of all options
% to the \file{.log} file.
@@ -4061,9 +4089,9 @@ return french_punctuation
% With LuaTeX engines (|\FBthinskip| and |\FBcolonskip| values are
% set now), it is time to load file \file{frenchb.lua}.
% \begin{macrocode}
- \ifFB@luatex@punct
- \activate@luatexpunct
- \fi
+ \ifFB@luatex@punct
+ \activate@luatexpunct
+ \fi
% \end{macrocode}
%
% \changes{v3.0a}{2014/01/28}{Test \cs{ifXeTeX} changed to