summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/generic')
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/frenchb.cfg15
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/frenchb.ldf72
2 files changed, 51 insertions, 36 deletions
diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.cfg b/Master/texmf-dist/tex/generic/babel-french/frenchb.cfg
deleted file mode 100644
index e238d21c8ea..00000000000
--- a/Master/texmf-dist/tex/generic/babel-french/frenchb.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-%% frenchb.cfg: configuration file for frenchb.ldf
-%% Daniel Flipo daniel.flipo at free.fr
-%% File `frenchb.dtx'
-%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2013
-%% by Daniel Flipo, GUTenberg
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%% WARNING: THIS FILE SHOULD NO LONGER BE USED %%%%%%%%%
-%% If you want to customise frenchb, please DO NOT hack into the code!
-%% Do no put any code in this file either, please use the new command
-%% \frenchbsetup{} with the proper options to customise frenchb.
-%%
-%% Add \frenchbsetup{ShowOptions} to your preamble to see the list of
-%% available options and/or read the documentation.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
index 7a46213f841..2b5cac498e2 100644
--- a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
@@ -33,16 +33,13 @@
%% extension .ins) which are part of the distribution.
%%
\ProvidesLanguage{frenchb}
- [2013/03/14 v2.6b French support from the babel system]
-%% File `frenchb.dtx'
+ [2013/05/20 v2.6c French support from the babel system]
+%%
+%% File `frenchb.ldf'
%% Babel package for LaTeX version 2e
%% Copyright (C) 1989 - 2013
-%% by Daniel Flipo, GUTenberg
-%% Frenchb language Definition File
-%% Copyright (C) 1989 - 2013
-%% by Daniel Flipo, GUTenberg
-%% Please report errors to: Daniel Flipo, GUTenberg
-%% daniel.flipo at free.fr
+%% by Daniel Flipo <daniel.flipo at free.fr>
+%%
\def\CurrentOption{french}
\LdfInit\CurrentOption\datefrench
\newif\ifLaTeXe
@@ -627,37 +624,62 @@
\def\extrasacadian{\extrasfrench}%
\def\noextrasacadian{\noextrasfrench}%
}{}
+\newif\if@FBwarning@capsep
+\@FBwarning@capseptrue
\newcommand{\FBWarning}[2]{\PackageWarning{#1}{#2}}
-\def\CaptionSeparator{\string:\space}
+\newcommand*{\CaptionSeparatorORI}{\string:\space}
+\newcommand*{\CaptionSeparator}{\space\textendash\space}
+\def\FBCaption@Separator{\CaptionSeparatorORI}
\long\def\FB@makecaption#1#2{%
\vskip\abovecaptionskip
- \sbox\@tempboxa{#1\CaptionSeparator #2}%
+ \sbox\@tempboxa{#1\FBCaption@Separator #2}%
\ifdim \wd\@tempboxa >\hsize
- #1\CaptionSeparator #2\par
+ #1\FBCaption@Separator #2\par
\else
\global \@minipagefalse
\hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
\fi
\vskip\belowcaptionskip}
+\@ifclassloaded{amsart}{\@FBwarning@capsepfalse}{}
+\@ifclassloaded{amsbook}{\@FBwarning@capsepfalse}{}
+\@ifclassloaded{amsdtx}{\@FBwarning@capsepfalse}{}
+\@ifclassloaded{amsldoc}{\@FBwarning@capsepfalse}{}
+\@ifclassloaded{amproc}{\@FBwarning@capsepfalse}{}
+\AtBeginDocument{%
+ \@ifundefined{captionformat}%
+ {\let\captionformat\undefined}%
+ {\@FBwarning@capsepfalse}%
+}
+\@ifpackageloaded{caption}
+ {\FBWarning{frenchb.ldf}%
+ {Please load the "caption" package\MessageBreak
+ AFTER babel/frenchb; reported}%
+ \@FBwarning@capsepfalse}%
+ {}
+\@ifpackageloaded{floatrow}
+ {\FBWarning{frenchb.ldf}%
+ {Please load the "floatrow" package\MessageBreak
+ AFTER babel/frenchb; reported}%
+ \@FBwarning@capsepfalse}%
+ {}
\AtBeginDocument{%
\ifx\@makecaption\STD@makecaption
\global\let\@makecaption\FB@makecaption
- \else
- \@ifundefined{@makecaption}%
- {\let\@makecaption\undefined}%
- {\FBWarning{frenchb.ldf}%
- {The definition of \protect\@makecaption\space
- has been changed,\MessageBreak
- frenchb will NOT customise it;\MessageBreak reported}%
- }%
+ \@FBwarning@capsepfalse
+ \fi
+ \if@FBwarning@capsep
+ \FBWarning{frenchb.ldf}%
+ {The definition of \protect\@makecaption\space
+ has been changed,\MessageBreak
+ frenchb will NOT customise it;\MessageBreak reported}%
\fi
\let\FB@makecaption\relax
\let\STD@makecaption\relax
}
\addto\extrasfrench{%
- \def\CaptionSeparator{\space\textendash\space}}
+ \def\FBCaption@Separator{\CaptionSeparator}}
\addto\noextrasfrench{%
- \def\CaptionSeparator{\string:\space}}
+ \def\FBCaption@Separator{\CaptionSeparatorORI}}
\let\listORI\list
\def\FB@listVsettings{%
\setlength{\itemsep}{0.4ex plus 0.2ex minus 0.2ex}%
@@ -1355,6 +1377,14 @@
\FBprocess@options
\let\bbl@nonfrenchspacingORI\bbl@nonfrenchspacing
\let\bbl@nonfrenchspacing\relax
+ \@ifundefined{captionformat}%
+ {\let\captionformat\undefined}%
+ {\let\CaptionSeparatorORI\captionformat
+ \addto\extrasfrench{%
+ \renewcommand*{\captionformat}{\CaptionSeparator}}%
+ \addto\noextrasfrench{%
+ \renewcommand*{\captionformat}{\CaptionSeparatorORI}}%
+ }%
\ifx\bbl@main@language\FB@french
\extrasfrench\captionsfrench
\else