summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/babel/frenchb.ldf
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/generic/babel/frenchb.ldf')
-rw-r--r--Master/texmf-dist/tex/generic/babel/frenchb.ldf91
1 files changed, 70 insertions, 21 deletions
diff --git a/Master/texmf-dist/tex/generic/babel/frenchb.ldf b/Master/texmf-dist/tex/generic/babel/frenchb.ldf
index d12d4036724..2f4d1481cf6 100644
--- a/Master/texmf-dist/tex/generic/babel/frenchb.ldf
+++ b/Master/texmf-dist/tex/generic/babel/frenchb.ldf
@@ -7,7 +7,7 @@
%% frenchb.dtx (with options: `code')
%% This is a generated file.
%%
-%% Copyright 1989-2008 Johannes L. Braams and any individual authors
+%% Copyright 1989-2009 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,13 +37,13 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
\ProvidesLanguage{frenchb}
- [2008/05/08 v2.2a French support from the babel system]
+ [2009/03/16 v2.3d French support from the babel system]
%% File `frenchb.dtx'
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2008
+%% Copyright (C) 1989 - 2009
%% by Johannes Braams, TeXniek
%% Frenchb language Definition File
-%% Copyright (C) 1989 - 2008
+%% Copyright (C) 1989 - 2009
%% by Johannes Braams, TeXniek
%% Daniel Flipo, GUTenberg
%% Please report errors to: Daniel Flipo, GUTenberg
@@ -114,7 +114,8 @@
\hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
\fi
\vskip\belowcaptionskip}%
-\newif\ifFBpunct@active \FBpunct@activetrue
+\newif\ifFBpunct@active \FBpunct@activetrue
+\newif\ifFBAutoSpacePunctuation \FBAutoSpacePunctuationtrue
\ifFBpunct@active
\initiate@active@char{:}
\initiate@active@char{;}
@@ -157,12 +158,40 @@
\fi
\fi
\string:}
- \def\AutoSpaceBeforeFDP{%
+ \def\autospace@beforeFDP{%
\def\FDP@thinspace{\penalty\@M\thinspace}%
\def\FDP@colonspace{\penalty\@M\Fcolonspace}}
- \def\NoAutoSpaceBeforeFDP{\let\FDP@thinspace\@empty
+ \def\noautospace@beforeFDP{\let\FDP@thinspace\@empty
\let\FDP@colonspace\@empty}
- \AutoSpaceBeforeFDP
+ \ifLaTeXe
+ \def\AutoSpaceBeforeFDP{\autospace@beforeFDP
+ \FBAutoSpacePunctuationtrue}
+ \def\NoAutoSpaceBeforeFDP{\noautospace@beforeFDP
+ \FBAutoSpacePunctuationfalse}
+ \else
+ \let\AutoSpaceBeforeFDP\autospace@beforeFDP
+ \let\NoAutoSpaceBeforeFDP\noautospace@beforeFDP
+ \AutoSpaceBeforeFDP
+ \fi
+ \ifLaTeXe
+ \let\ttfamilyORI\ttfamily
+ \let\rmfamilyORI\rmfamily
+ \let\sffamilyORI\sffamily
+ \DeclareRobustCommand\ttfamilyFB{%
+ \noautospace@beforeFDP\ttfamilyORI}%
+ \DeclareRobustCommand\rmfamilyFB{%
+ \ifFBAutoSpacePunctuation
+ \autospace@beforeFDP\rmfamilyORI
+ \else
+ \noautospace@beforeFDP\rmfamilyORI
+ \fi}%
+ \DeclareRobustCommand\sffamilyFB{%
+ \ifFBAutoSpacePunctuation
+ \autospace@beforeFDP\sffamilyORI
+ \else
+ \noautospace@beforeFDP\sffamilyORI
+ \fi}%
+ \fi
\declare@shorthand{system}{:}{\string:}
\declare@shorthand{system}{!}{\string!}
\declare@shorthand{system}{?}{\string?}
@@ -226,7 +255,7 @@
\AtEndOfPackage{\RequirePackage{scalefnt}}
\newcommand*{\FBsupR}{-0.12}
\newcommand*{\FBsupS}{0.65}
- \newcommand*{\FB@lc}[1]{\lowercase{#1}}
+ \newcommand*{\FB@lc}[1]{\MakeLowercase{#1}}
\DeclareRobustCommand*{\FB@up@fake}[1]{%
\settoheight{\FB@Mht}{M}%
\addtolength{\FB@Mht}{\FBsupR \FB@Mht}%
@@ -530,7 +559,11 @@
\FB@enterFrenchtrue
\fi
}
-\let\@aifORI\@afterindentfalse
+\AtBeginDocument{\ifx\@afterindentfalse\@afterindenttrue
+ \let\@aifORI\@afterindenttrue
+ \else \let\@aifORI\@afterindentfalse
+ \fi
+}
\def\bbl@frenchindent{\let\@afterindentfalse\@afterindenttrue
\@afterindenttrue}
\def\bbl@nonfrenchindent{\let\@afterindentfalse\@aifORI
@@ -547,6 +580,8 @@
\let\@footnotemark\@footnotemarkFB
\fi}%
}
+\newcommand*{\dotFFN}{.}
+\newcommand*{\kernFFN}{\kern .5em}
\newdimen\parindentFFN
\parindentFFN=10in
\def\ftnISsymbol{\@fnsymbol\c@footnote}
@@ -557,7 +592,7 @@
\rule\z@\footnotesep
\setbox\@tempboxa\hbox{\@thefnmark}%
\ifdim\wd\@tempboxa>\z@
- \llap{\@thefnmark}.\kern.5em
+ \llap{\@thefnmark}\dotFFN\kernFFN
\fi #1
\fi}%
\AtBeginDocument{\@ifpackageloaded{bigfoot}{}%
@@ -623,7 +658,7 @@
\newif\ifFBIndentFirst \FBIndentFirstfalse
\newif\ifFBFrenchFootnotes \FBFrenchFootnotesfalse
\newif\ifFBAutoSpaceFootnotes \FBAutoSpaceFootnotesfalse
-\newif\ifFBAutoSpacePunctuation \FBAutoSpacePunctuationtrue
+\newif\ifFBOriginalTypewriter \FBOriginalTypewriterfalse
\newif\ifFBThinColonSpace \FBThinColonSpacefalse
\newif\ifFBThinSpaceInFrenchNumbers \FBThinSpaceInFrenchNumbersfalse
\newif\ifFBFrenchSuperscripts \FBFrenchSuperscriptstrue
@@ -667,13 +702,18 @@
\define@key{FB}{GlobalLayoutFrench}[true]%
{\csname FBGlobalLayoutFrench#1\endcsname
\ifFBGlobalLayoutFrench
- \FBReduceListSpacingtrue
- \FBCompactItemizetrue
- \FBStandardItemLabelsfalse
- \FBIndentFirsttrue
- \FBFrenchFootnotestrue
- \FBAutoSpaceFootnotestrue
- \fi}%
+ \iflanguage{french}%
+ {\FBReduceListSpacingtrue
+ \FBCompactItemizetrue
+ \FBStandardItemLabelsfalse
+ \FBIndentFirsttrue
+ \FBFrenchFootnotestrue
+ \FBAutoSpaceFootnotestrue}%
+ {\PackageWarning{frenchb.ldf}%
+ {Option `GlobalLayoutFrench' skipped:
+ \MessageBreak French is *not*
+ babel's last option.\MessageBreak}}%
+ \fi}%
\define@key{FB}{ReduceListSpacing}[true]%
{\csname FBReduceListSpacing#1\endcsname}%
\define@key{FB}{CompactItemize}[true]%
@@ -709,6 +749,8 @@
{\csname FBAutoSpaceFootnotes#1\endcsname}%
\define@key{FB}{AutoSpacePunctuation}[true]%
{\csname FBAutoSpacePunctuation#1\endcsname}%
+ \define@key{FB}{OriginalTypewriter}[true]%
+ {\csname FBOriginalTypewriter#1\endcsname}%
\define@key{FB}{ThinColonSpace}[true]%
{\csname FBThinColonSpace#1\endcsname}%
\define@key{FB}{ThinSpaceInFrenchNumbers}[true]%
@@ -840,9 +882,15 @@
\addto\noextrasfrench{\bbl@nonfrenchindent}%
\fi
\ifFBAutoSpacePunctuation
- \AutoSpaceBeforeFDP
+ \autospace@beforeFDP
+ \else
+ \noautospace@beforeFDP
+ \fi
+ \ifFBOriginalTypewriter
\else
- \NoAutoSpaceBeforeFDP
+ \let\ttfamily\ttfamilyFB
+ \let\rmfamily\rmfamilyFB
+ \let\sffamily\sffamilyFB
\fi
\ifFBThinColonSpace\renewcommand*{\Fcolonspace}{\thinspace}\fi
\@ifpackageloaded{numprint}%
@@ -907,6 +955,7 @@
FrenchFootnotes=false [true]\MessageBreak
AutoSpaceFootnotes=false [true]\MessageBreak
AutoSpacePunctuation=false [true]\MessageBreak
+ OriginalTypewriter=true [false]\MessageBreak
ThinColonSpace=true [false]\MessageBreak
ThinSpaceInFrenchNumbers=true [false]\MessageBreak
FrenchSuperscripts=false [true]\MessageBreak