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.ldf921
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/frenchb.lua2
2 files changed, 481 insertions, 442 deletions
diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
index 0171d82eebf..1d689979bc8 100644
--- a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
@@ -33,7 +33,7 @@
%% extension .ins) which are part of the distribution.
%%
\ProvidesLanguage{frenchb}
- [2017/01/15 v3.2f French support from the babel system]
+ [2017/01/30 v3.2g French support from the babel system]
%%
%% File `frenchb.ldf'
%% Babel package for LaTeX version 2e
@@ -455,10 +455,10 @@
\ifLaTeXe
\else
\ifFBunicode
- \def\guillemotleft{{\char"00AB}}
- \def\guillemotright{{\char"00BB}}
- \def\textquotedblleft{{\char"201C}}
- \def\textquotedblright{{\char"201D}}
+ \def\guillemotleft{{\char"00AB}}
+ \def\guillemotright{{\char"00BB}}
+ \def\textquotedblleft{{\char"201C}}
+ \def\textquotedblright{{\char"201D}}
\else
\def\guillemotleft{\leavevmode\raise0.25ex
\hbox{$\scriptscriptstyle\ll$}}
@@ -523,19 +523,15 @@
\newif\ifFBInnerGuillSingle
\def\FBguillopen{\bgroup\NoAutoSpacing\guillemotleft\egroup}
\def\FBguillclose{\bgroup\NoAutoSpacing\guillemotright\egroup}
-\let\FBguillnone\relax
+\let\FBguillnone\empty
\let\FBeveryparguill\FBguillopen
-\ifFB@luatex@punct
- \let\FBeverylineguill\FBguillopen
-\else
- \let\FBeverylineguill\FBguillnone
-\fi
+\let\FBeverylineguill\FBguillnone
\ifLaTeXe
- \DeclareRobustCommand\frquote{%
+ \DeclareRobustCommand\frquote{%
\@ifstar{\FBcloseguillfalse\fr@quote}%
{\FBcloseguilltrue\fr@quote}}
\else
- \newcommand\frquote[1]{\fr@quote{#1}}
+ \newcommand\frquote[1]{\fr@quote{#1}}
\fi
\newcommand{\fr@quote}[1]{%
\leavevmode
@@ -544,7 +540,7 @@
\ifcase\FBguill@level
\or
\FB@everypar=\everypar
- \ifx\FBeveryparguill\relax
+ \ifx\FBeveryparguill\FBguillnone
\else
\def\FBeverypar@quote{\FBeveryparguill\FB@quotespace}%
\everypar=\expandafter{\the\everypar \FBeverypar@quote}%
@@ -552,44 +548,44 @@
\ogi #1\fgi
\or
\ifx\FBeverylineguill\FBguillopen
- \localleftbox{\guillemotleft\FB@quotespace}%
- \let\FBeverypar@quote\relax
- \ogi #1\ifFBcloseguill\fgi\fi
+ \localleftbox{\guillemotleft\FB@quotespace}%
+ \let\FBeverypar@quote\relax
+ \ogi #1\ifFBcloseguill\fgi\fi
\else
\ifx\FBeverylineguill\FBguillclose
- \localleftbox{\guillemotright\FB@quotespace}%
- \let\FBeverypar@quote\relax
- \ogi #1\ifFBcloseguill\fgi\fi
+ \localleftbox{\guillemotright\FB@quotespace}%
+ \let\FBeverypar@quote\relax
+ \ogi #1\ifFBcloseguill\fgi\fi
\else
- \let\FBeverypar@quote\relax
- \ifFBInnerGuillSingle
- \def\ogii{\leavevmode
- \guilsinglleft\FBguillspace}%
- \def\fgii{\ifdim\lastskip>\z@\unskip\fi
- \FBguillspace\guilsinglright}%
- \ifx\FBeveryparguill\FBguillopen
- \def\FBeverypar@quote{\guilsinglleft\FB@quotespace}%
- \fi
- \ifx\FBeveryparguill\FBguillclose
- \def\FBeverypar@quote{\guilsinglright\FB@quotespace}%
- \fi
- \fi
- \ogii #1\ifFBcloseguill \fgii \fi
+ \let\FBeverypar@quote\relax
+ \ifFBInnerGuillSingle
+ \def\ogii{\leavevmode
+ \guilsinglleft\FBguillspace}%
+ \def\fgii{\ifdim\lastskip>\z@\unskip\fi
+ \FBguillspace\guilsinglright}%
+ \ifx\FBeveryparguill\FBguillopen
+ \def\FBeverypar@quote{\guilsinglleft\FB@quotespace}%
+ \fi
+ \ifx\FBeveryparguill\FBguillclose
+ \def\FBeverypar@quote{\guilsinglright\FB@quotespace}%
+ \fi
+ \fi
+ \ogii #1\ifFBcloseguill \fgii \fi
\fi
\fi
\else
- \ifx\PackageWarning\@undefined
- \fb@warning{\noexpand\frquote\space accepts no more than
- two levels.\\ Quotation not printed.}%
- \else
- \PackageWarning{frenchb.ldf}{%
- \protect\frquote\space accepts no more than two levels
- \MessageBreak Quotation not printed. Reported}
- \fi
+ \ifx\PackageWarning\@undefined
+ \fb@warning{\noexpand\frquote\space accepts no more than
+ two levels.\\ Quotation not printed.}%
+ \else
+ \PackageWarning{frenchb.ldf}{%
+ \protect\frquote\space accepts no more than two levels
+ \MessageBreak Quotation not printed. Reported}
+ \fi
\fi
\advance\FBguill@level by \m@ne
\ifx\FBeverylineguill\FBguillnone\else\localleftbox{}\fi
- \ifx\FBeveryparguill\relax\else\everypar=\FB@everypar\fi
+ \ifx\FBeveryparguill\FBguillnone\else\everypar=\FB@everypar\fi
}
\ifLaTeXe
\def\BabelLanguages{french,acadian}
@@ -660,7 +656,7 @@
\fontfamily{\FB@firstthree -sup}\selectfont \FB@lc{#1}\egroup}
\DeclareRobustCommand*{\fup}[1]{%
\ifx\realsuperscript\@undefined
- \FB@up{#1}%
+ \FB@up{#1}%
\else
\bgroup\let\fakesuperscript\FB@up@fake
\realsuperscript{\FB@lc{#1}}\egroup
@@ -695,11 +691,11 @@
\scshape #1\endgroup}
\ifLaTeXe\else\let\scshape\relax\fi
\ifFBunicode
- \newcommand*{\at}{{\char"0040}}
- \newcommand*{\circonflexe}{{\char"005E}}
- \newcommand*{\tild}{{\char"007E}}
- \newcommand*{\boi}{\textbackslash}
- \newcommand*{\degre}{{\char"00B0}}
+ \newcommand*{\at}{{\char"0040}}
+ \newcommand*{\circonflexe}{{\char"005E}}
+ \newcommand*{\tild}{{\char"007E}}
+ \newcommand*{\boi}{{\char"005C}}
+ \newcommand*{\degre}{{\char"00B0}}
\else
\ifLaTeXe
\DeclareTextSymbol{\at}{T1}{64}
@@ -728,19 +724,18 @@
\ifFBunicode
\DeclareRobustCommand*{\degres}{\degre}
\else
- \def\Warning@degree@TSone{%
- \PackageWarning{frenchb.ldf}{%
- Degrees would look better in TS1-encoding:%
- \MessageBreak add \protect
- \usepackage{textcomp} to the preamble.%
- \MessageBreak Degrees used}}
+ \def\Warning@degree@TSone{\FBWarning
+ {Degrees would look better in TS1-encoding:%
+ \MessageBreak add \protect
+ \usepackage{textcomp} to the preamble.%
+ \MessageBreak Degrees used}}
\AtBeginDocument{\ifx\DeclareEncodingSubset\@undefined
- \DeclareRobustCommand*{\degres}{%
- \leavevmode\hbox to 0.3em{\hss\degre\hss}%
- \Warning@degree@TSone
- \global\let\Warning@degree@TSone\relax}%
+ \DeclareRobustCommand*{\degres}{%
+ \leavevmode\hbox to 0.3em{\hss\degre\hss}%
+ \Warning@degree@TSone
+ \global\let\Warning@degree@TSone\relax}%
\else
- \DeclareRobustCommand*{\degres}{%
+ \DeclareRobustCommand*{\degres}{%
\hbox{\UseTextSymbol{TS1}{\textdegree}}}%
\fi
}
@@ -801,26 +796,26 @@
\let\LaTeXefalse\undefined}
\ifx\magnification\@undefined
\else
- \def\FBstop@here{\ifFB@luatex@punct
- \activate@luatexpunct
- \fi
- \FBclean@on@exit
- \ldf@quit\CurrentOption\endinput}
+ \def\FBstop@here{\ifFB@luatex@punct
+ \activate@luatexpunct
+ \fi
+ \FBclean@on@exit
+ \ldf@quit\CurrentOption\endinput}
\fi
\FBstop@here
\renewcommand*{\nombre}[1]{\Warning@nombre{#1}}
\newcommand*{\Warning@nombre}[1]{%
\ifdefined\numprint
- \numprint{#1}%
+ \numprint{#1}%
\else
- \PackageWarning{frenchb.ldf}{%
- \protect\nombre\space now relies on package numprint.sty,%
- \MessageBreak add \protect
- \usepackage[autolanguage]{numprint},\MessageBreak
- see file numprint.pdf for more options.\MessageBreak
- \protect\nombre\space called}%
- \global\let\Warning@nombre\relax
- {#1}%
+ \PackageWarning{frenchb.ldf}{%
+ \protect\nombre\space now relies on package numprint.sty,%
+ \MessageBreak add \protect
+ \usepackage[autolanguage]{numprint},\MessageBreak
+ see file numprint.pdf for more options.\MessageBreak
+ \protect\nombre\space called}%
+ \global\let\Warning@nombre\relax
+ {#1}%
\fi
}
\ifx\FBfigtabshape\@undefined \let\FBfigtabshape\scshape \fi
@@ -877,13 +872,13 @@
\EndBabelCommands
\AtEndOfPackage{%
\ifFB@koma
- \ifdefined\partformat
- \FB@addto{captions}{%
- \ifFBPartNameFull
- \babel@save\partformat
- \renewcommand*{\partformat}{\partname}%
- \fi}%
- \fi
+ \ifdefined\partformat
+ \FB@addto{captions}{%
+ \ifFBPartNameFull
+ \babel@save\partformat
+ \renewcommand*{\partformat}{\partname}%
+ \fi}%
+ \fi
\fi
}
\bgroup
@@ -901,7 +896,7 @@
\egroup
\newif\if@FBwarning@capsep
\@FBwarning@capseptrue
-\newcommand{\FBWarning}[2]{\PackageWarning{#1}{#2}}
+\newcommand{\FBWarning}[1]{\PackageWarning{frenchb.ldf}{#1}}
\newcommand*{\CaptionSeparator}{\space\textendash\space}
\def\FBCaption@Separator{: }
\long\def\FB@makecaption#1#2{%
@@ -930,39 +925,36 @@
\@ifclassloaded{beamer}{\@FBwarning@capsepfalse}{}
\ifdefined\@makecaption\else\@FBwarning@capsepfalse\fi
\@ifpackageloaded{caption}
- {\FBWarning{frenchb.ldf}%
- {Please load the "caption" package\MessageBreak
- AFTER babel/frenchb; reported}%
- \@FBwarning@capsepfalse}%
- {}
+ {\FBWarning{Please load the "caption" package\MessageBreak
+ AFTER babel/frenchb; reported}%
+ \@FBwarning@capsepfalse}%
+ {}
\@ifpackageloaded{subcaption}
- {\FBWarning{frenchb.ldf}%
- {Please load the "subcaption" package\MessageBreak
- AFTER babel/frenchb; reported}%
- \@FBwarning@capsepfalse}%
- {}
+ {\FBWarning{Please load the "subcaption" 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}%
- {}
+ {\FBWarning{Please load the "floatrow" package\MessageBreak
+ AFTER babel/frenchb; reported}%
+ \@FBwarning@capsepfalse}%
+ {}
\AtBeginDocument{%
\ifx\@makecaption\STD@makecaption
- \global\let\@makecaption\FB@makecaption
- \ifFBOldFigTabCaptions
- \else
- \def\FBCaption@Separator{{\autospace@beforeFDP : }}%
- \fi
- \ifFBCustomiseFigTabCaptions
- \ifx\bbl@main@language\FB@french
- \def\FBCaption@Separator{\CaptionSeparator}%
- \fi
+ \global\let\@makecaption\FB@makecaption
+ \ifFBOldFigTabCaptions
+ \else
+ \def\FBCaption@Separator{{\autospace@beforeFDP : }}%
+ \fi
+ \ifFBCustomiseFigTabCaptions
+ \ifx\bbl@main@language\FB@french
+ \def\FBCaption@Separator{\CaptionSeparator}%
\fi
- \@FBwarning@capsepfalse
+ \fi
+ \@FBwarning@capsepfalse
\fi
\if@FBwarning@capsep
- \FBWarning{frenchb.ldf}%
+ \FBWarning
{Figures' and tables' captions might look like\MessageBreak
`Figure 1:' which is wrong in French.\MessageBreak
Check your class or packages to change this;\MessageBreak
@@ -989,23 +981,33 @@
\FB@addto{extras}{\bbl@frenchdots}
\ifFB@active@punct
\@ifpackageloaded{listings}
- {\FBWarning{frenchb.ldf}%
- {Please load the "listings" package\MessageBreak
- AFTER babel/frenchb; reported}%
+ {\FBWarning{Please load the "listings" package\MessageBreak
+ AFTER babel/frenchb; reported}%
}{}
\fi
\newif\if@FBwarning@natbib
\ifFB@active@punct
- \@ifpackageloaded{natbib}{}{\@FBwarning@natbibtrue}
+ \@ifpackageloaded{natbib}{}{\@FBwarning@natbibtrue}
\fi
\AtBeginDocument{%
\if@FBwarning@natbib
- \@ifpackageloaded{natbib}{}{\@FBwarning@natbibfalse}%
+ \@ifpackageloaded{natbib}{}{\@FBwarning@natbibfalse}%
\fi
\if@FBwarning@natbib
- \FBWarning{frenchb.ldf}%
- {Please load the "natbib" package\MessageBreak
- BEFORE babel/frenchb; reported}%
+ \FBWarning{Please load the "natbib" package\MessageBreak
+ BEFORE babel/frenchb; reported}%
+ \fi
+}
+\newif\if@FBwarning@beamerarticle
+\@ifpackageloaded{beamerarticle}{}{\@FBwarning@beamerarticletrue}
+\AtBeginDocument{%
+ \if@FBwarning@beamerarticle
+ \@ifpackageloaded{beamerarticle}{}%
+ {\@FBwarning@beamerarticlefalse}%
+ \fi
+ \if@FBwarning@beamerarticle
+ \FBWarning{Please load the "beamerarticle" package\MessageBreak
+ BEFORE babel/frenchb; reported}%
\fi
}
\newcommand*{\frenchbsetup}[1]{%
@@ -1044,10 +1046,17 @@
{\PackageInfo{frenchb.ldf}{%
No list customisation for the beamer class,%
\MessageBreak reported}}%
- {\FBReduceListSpacingtrue
- \FBStandardItemizeEnvfalse
- \FBStandardEnumerateEnvfalse
- \FBStandardItemLabelsfalse}%
+ {\@ifpackageloaded{beamerarticle}%
+ {\FBStandardItemLabelsfalse
+ \FBReduceListSpacingtrue
+ \PackageInfo{frenchb.ldf}{%
+ Minimal list customisation for the beamerarticle%
+ \MessageBreak package; reported}}%
+ {\FBReduceListSpacingtrue
+ \FBStandardItemizeEnvfalse
+ \FBStandardEnumerateEnvfalse
+ \FBStandardItemLabelsfalse}%
+ }
\FBIndentFirsttrue
\FBFrenchFootnotestrue
\FBAutoSpaceFootnotestrue
@@ -1057,304 +1066,334 @@
\fi
\RequirePackage{keyval}%
\define@key{FB}{ShowOptions}[true]%
- {\csname FBShowOptions#1\endcsname}%
+ {\csname FBShowOptions#1\endcsname}%
\define@key{FB}{StandardLayout}[true]%
- {\csname FBStandardLayout#1\endcsname
- \ifFBStandardLayout
- \FBReduceListSpacingfalse
- \FBStandardItemizeEnvtrue
- \FBStandardItemLabelstrue
- \FBStandardEnumerateEnvtrue
- \FBIndentFirstfalse
- \FBFrenchFootnotesfalse
- \FBAutoSpaceFootnotesfalse
- \FBGlobalLayoutFrenchfalse
- \else
- \FBReduceListSpacingtrue
- \FBStandardItemizeEnvfalse
- \FBStandardItemLabelsfalse
- \FBStandardEnumerateEnvfalse
- \FBIndentFirsttrue
- \FBFrenchFootnotestrue
- \FBAutoSpaceFootnotestrue
- \fi}%
+ {\csname FBStandardLayout#1\endcsname
+ \ifFBStandardLayout
+ \FBReduceListSpacingfalse
+ \FBStandardItemizeEnvtrue
+ \FBStandardItemLabelstrue
+ \FBStandardEnumerateEnvtrue
+ \FBIndentFirstfalse
+ \FBFrenchFootnotesfalse
+ \FBAutoSpaceFootnotesfalse
+ \FBGlobalLayoutFrenchfalse
+ \else
+ \FBReduceListSpacingtrue
+ \FBStandardItemizeEnvfalse
+ \FBStandardItemLabelsfalse
+ \FBStandardEnumerateEnvfalse
+ \FBIndentFirsttrue
+ \FBFrenchFootnotestrue
+ \FBAutoSpaceFootnotestrue
+ \fi}%
\define@key{FB}{GlobalLayoutFrench}[true]%
- {\csname FBGlobalLayoutFrench#1\endcsname
- \ifFBGlobalLayoutFrench
- \ifx\bbl@main@language\FB@french
- \else
- \PackageWarning{frenchb.ldf}%
- {Option `GlobalLayoutFrench' skipped:%
- \MessageBreak French is *not*
- babel's last option.\MessageBreak}%
- \fi
- \fi}%
+ {\csname FBGlobalLayoutFrench#1\endcsname
+ \ifFBGlobalLayoutFrench
+ \ifx\bbl@main@language\FB@french
+ \else
+ \PackageWarning{frenchb.ldf}%
+ {Option `GlobalLayoutFrench' skipped:\MessageBreak
+ French is *not* babel's last option.\MessageBreak
+ Reported}%
+ \fi
+ \fi}%
\define@key{FB}{ReduceListSpacing}[true]%
- {\csname FBReduceListSpacing#1\endcsname}%
+ {\csname FBReduceListSpacing#1\endcsname}%
\define@key{FB}{ListOldLayout}[true]%
- {\csname FBListOldLayout#1\endcsname
- \ifFBListOldLayout
- \FBStandardEnumerateEnvtrue
- \renewcommand*{\FrenchLabelItem}{\textendash}%
- \fi}%
+ {\csname FBListOldLayout#1\endcsname
+ \ifFBListOldLayout
+ \FBStandardEnumerateEnvtrue
+ \renewcommand*{\FrenchLabelItem}{\textendash}%
+ \fi}%
\define@key{FB}{CompactItemize}[true]%
- {\csname FBCompactItemize#1\endcsname
- \ifFBCompactItemize
- \FBStandardItemizeEnvfalse
- \FBStandardEnumerateEnvfalse
- \else
- \FBStandardItemizeEnvtrue
- \FBStandardEnumerateEnvtrue
- \fi}%
+ {\csname FBCompactItemize#1\endcsname
+ \ifFBCompactItemize
+ \FBStandardItemizeEnvfalse
+ \FBStandardEnumerateEnvfalse
+ \else
+ \FBStandardItemizeEnvtrue
+ \FBStandardEnumerateEnvtrue
+ \fi}%
\define@key{FB}{StandardItemizeEnv}[true]%
- {\csname FBStandardItemizeEnv#1\endcsname}%
+ {\csname FBStandardItemizeEnv#1\endcsname}%
\define@key{FB}{StandardEnumerateEnv}[true]%
- {\csname FBStandardEnumerateEnv#1\endcsname}%
+ {\csname FBStandardEnumerateEnv#1\endcsname}%
\define@key{FB}{StandardItemLabels}[true]%
- {\csname FBStandardItemLabels#1\endcsname}%
- \define@key{FB}{ItemLabels}{%
- \renewcommand*{\FrenchLabelItem}{#1}}%
- \define@key{FB}{ItemLabeli}{%
- \renewcommand*{\Frlabelitemi}{#1}}%
- \define@key{FB}{ItemLabelii}{%
- \renewcommand*{\Frlabelitemii}{#1}}%
- \define@key{FB}{ItemLabeliii}{%
- \renewcommand*{\Frlabelitemiii}{#1}}%
- \define@key{FB}{ItemLabeliv}{%
- \renewcommand*{\Frlabelitemiv}{#1}}%
+ {\csname FBStandardItemLabels#1\endcsname}%
+ \define@key{FB}{ItemLabels}%
+ {\renewcommand*{\FrenchLabelItem}{#1}}%
+ \define@key{FB}{ItemLabeli}%
+ {\renewcommand*{\Frlabelitemi}{#1}}%
+ \define@key{FB}{ItemLabelii}%
+ {\renewcommand*{\Frlabelitemii}{#1}}%
+ \define@key{FB}{ItemLabeliii}%
+ {\renewcommand*{\Frlabelitemiii}{#1}}%
+ \define@key{FB}{ItemLabeliv}%
+ {\renewcommand*{\Frlabelitemiv}{#1}}%
\define@key{FB}{StandardLists}[true]%
- {\csname FBStandardLists#1\endcsname
- \ifFBStandardLists
- \FBReduceListSpacingfalse
- \FBCompactItemizefalse
- \FBStandardItemizeEnvtrue
- \FBStandardEnumerateEnvtrue
- \FBStandardItemLabelstrue
- \else
- \FBReduceListSpacingtrue
- \FBCompactItemizetrue
- \FBStandardItemizeEnvfalse
- \FBStandardEnumerateEnvfalse
- \FBStandardItemLabelsfalse
- \fi}%
+ {\csname FBStandardLists#1\endcsname
+ \ifFBStandardLists
+ \FBReduceListSpacingfalse
+ \FBCompactItemizefalse
+ \FBStandardItemizeEnvtrue
+ \FBStandardEnumerateEnvtrue
+ \FBStandardItemLabelstrue
+ \else
+ \FBReduceListSpacingtrue
+ \FBCompactItemizetrue
+ \FBStandardItemizeEnvfalse
+ \FBStandardEnumerateEnvfalse
+ \FBStandardItemLabelsfalse
+ \fi}%
\define@key{FB}{IndentFirst}[true]%
- {\csname FBIndentFirst#1\endcsname}%
+ {\csname FBIndentFirst#1\endcsname}%
\define@key{FB}{FrenchFootnotes}[true]%
- {\csname FBFrenchFootnotes#1\endcsname}%
+ {\csname FBFrenchFootnotes#1\endcsname}%
\define@key{FB}{AutoSpaceFootnotes}[true]%
- {\csname FBAutoSpaceFootnotes#1\endcsname}%
+ {\csname FBAutoSpaceFootnotes#1\endcsname}%
\define@key{FB}{AutoSpacePunctuation}[true]%
- {\csname FBAutoSpacePunctuation#1\endcsname}%
+ {\csname FBAutoSpacePunctuation#1\endcsname}%
\define@key{FB}{OriginalTypewriter}[true]%
- {\csname FBOriginalTypewriter#1\endcsname}%
+ {\csname FBOriginalTypewriter#1\endcsname}%
\define@key{FB}{ThinColonSpace}[true]%
- {\csname FBThinColonSpace#1\endcsname}%
+ {\csname FBThinColonSpace#1\endcsname}%
\define@key{FB}{ThinSpaceInFrenchNumbers}[true]%
- {\csname FBThinSpaceInFrenchNumbers#1\endcsname}%
+ {\csname FBThinSpaceInFrenchNumbers#1\endcsname}%
\define@key{FB}{FrenchSuperscripts}[true]%
- {\csname FBFrenchSuperscripts#1\endcsname}
+ {\csname FBFrenchSuperscripts#1\endcsname}
\define@key{FB}{LowercaseSuperscripts}[true]%
- {\csname FBLowercaseSuperscripts#1\endcsname}
+ {\csname FBLowercaseSuperscripts#1\endcsname}
\define@key{FB}{PartNameFull}[true]%
- {\csname FBPartNameFull#1\endcsname}%
+ {\csname FBPartNameFull#1\endcsname}%
\define@key{FB}{CustomiseFigTabCaptions}[true]%
{\csname FBCustomiseFigTabCaptions#1\endcsname}%
\define@key{FB}{OldFigTabCaptions}[true]%
{\csname FBOldFigTabCaptions#1\endcsname
\ifFBOldFigTabCaptions
- \FB@addto{extras}{\babel@save\FBCaption@Separator
- \def\FBCaption@Separator{\CaptionSeparator}}%
+ \FB@addto{extras}{\babel@save\FBCaption@Separator
+ \def\FBCaption@Separator{\CaptionSeparator}}%
\fi}%
\define@key{FB}{SmallCapsFigTabCaptions}[true]%
{\csname FBSmallCapsFigTabCaptions#1\endcsname
\ifFBSmallCapsFigTabCaptions
- \let\FBfigtabshape\scshape
+ \let\FBfigtabshape\scshape
\else
- \let\FBfigtabshape\relax
+ \let\FBfigtabshape\relax
\fi}%
\define@key{FB}{SuppressWarning}[true]%
- {\csname FBSuppressWarning#1\endcsname
- \ifFBSuppressWarning
- \renewcommand{\FBWarning}[2]{\relax}%
- \fi}%
+ {\csname FBSuppressWarning#1\endcsname
+ \ifFBSuppressWarning
+ \renewcommand{\FBWarning}[1]{}%
+ \fi}%
\define@key{FB}{INGuillSpace}[true]%
- {\csname FBINGuillSpace#1\endcsname}%
+ {\csname FBINGuillSpace#1\endcsname}%
\define@key{FB}{InnerGuillSingle}[true]%
- {\csname FBInnerGuillSingle#1\endcsname}%
- \define@key{FB}{EveryParGuill}{\expandafter\let\expandafter
- \FBeveryparguill\csname FBguill#1\endcsname}%
- \define@key{FB}{EveryLineGuill}{\expandafter\let\expandafter
- \FBeverylineguill\csname FBguill#1\endcsname
- \ifFB@luatex@punct
- \else
- \let\FBeverylineguill\FBguillnone
- \PackageWarning{frenchb.ldf}%
- {Option `EveryLineGuill' skipped:%
- \MessageBreak this option is for
- LuaTeX *only*.\MessageBreak Reported}%
- \fi}%
- \define@key{FB}{og}{%
- \ifFBunicode
- \ifFB@luatex@punct
- \FB@addGUILspace=1 \relax
- \fi
- \ifFB@xetex@punct
- \XeTeXcharclass"13 = \FB@guilo
- \XeTeXcharclass"AB = \FB@guilo
- \XeTeXcharclass"A0 = \FB@guilnul
- \XeTeXcharclass"202F = \FB@guilnul
- \fi
- \ifFB@active@punct
- \FBWarning{frenchb.ldf}%
- {Option og=« not supported with this version
- of\MessageBreak LuaTeX/XeTeX; reported}%
- \fi
- \else
- \newcommand*{\FB@@og}{%
- \iflanguage{french}%
- {\ifFB@spacing\FB@og\ignorespaces
- \else\guillemotleft
- \fi}%
- {\guillemotleft}}%
- \AtBeginDocument{%
- \ifdefined\DeclareInputText
- \ifdefined\uc@dclc
- \uc@dclc{171}{default}{\FB@@og}%
- \else
- \ifdefined\DeclareUnicodeCharacter
- \DeclareUnicodeCharacter{00AB}{\FB@@og}%
- \else
- \@tempcnta`#1\relax
- \ifdefined\mule@def
- \mule@def{11}{\FB@@og}%
+ {\csname FBInnerGuillSingle#1\endcsname}%
+ \define@key{FB}{EveryParGuill}[open]%
+ {\expandafter\let\expandafter
+ \FBeveryparguill\csname FBguill#1\endcsname
+ \ifx\FBeveryparguill\FBguillopen
+ \else\ifx\FBeveryparguill\FBguillclose
+ \else\ifx\FBeveryparguill\FBguillnone
+ \else
+ \let\FBeveryparguill\FBguillopen
+ \PackageWarning{frenchb.ldf}%
+ {Wrong value for `EveryParGuill':
+ try `open’,\MessageBreak
+ `close’ or `none’. Reported}%
+ \fi
+ \fi
+ \fi}%
+ \define@key{FB}{EveryLineGuill}[open]%
+ {\ifFB@luatex@punct
+ \expandafter\let\expandafter
+ \FBeverylineguill\csname FBguill#1\endcsname
+ \ifx\FBeverylineguill\FBguillopen
+ \else\ifx\FBeverylineguill\FBguillclose
+ \else\ifx\FBeverylineguill\FBguillnone
+ \else
+ \let\FBeverylineguill\FBguillnone
+ \FBWarning{Wrong value for `EveryLineGuill':
+ try `open’,\MessageBreak
+ `close’ or `none’. Reported}%
+ \fi
+ \fi
+ \fi
+ \else
+ \FBWarning{Option `EveryLineGuill' skipped:%
+ \MessageBreak this option is for
+ LuaTeX *only*.\MessageBreak Reported}%
+ \fi}%
+ \define@key{FB}{og}%
+ {\ifFBunicode
+ \ifFB@luatex@punct
+ \FB@addGUILspace=1 \relax
+ \fi
+ \ifFB@xetex@punct
+ \XeTeXcharclass"13 = \FB@guilo
+ \XeTeXcharclass"AB = \FB@guilo
+ \XeTeXcharclass"A0 = \FB@guilnul
+ \XeTeXcharclass"202F = \FB@guilnul
+ \fi
+ \ifFB@active@punct
+ \PackageWarning{frenchb.ldf}%
+ {Option og=« not supported with this version
+ of\MessageBreak LuaTeX/XeTeX; reported}%
+ \fi
+ \else
+ \newcommand*{\FB@@og}{%
+ \iflanguage{french}%
+ {\ifFB@spacing\FB@og\ignorespaces
+ \else\guillemotleft
+ \fi}%
+ {\guillemotleft}}%
+ \AtBeginDocument{%
+ \ifdefined\DeclareInputText
+ \ifdefined\uc@dclc
+ \uc@dclc{171}{default}{\FB@@og}%
+ \else
+ \ifdefined\DeclareUnicodeCharacter
+ \DeclareUnicodeCharacter{00AB}{\FB@@og}%
\else
- \DeclareInputText{\the\@tempcnta}{\FB@@og}%
+ \@tempcnta`#1\relax
+ \ifdefined\mule@def
+ \mule@def{11}{\FB@@og}%
+ \else
+ \DeclareInputText{\the\@tempcnta}{\FB@@og}%
+ \fi
\fi
- \fi
- \fi
- \else
- \PackageWarning{frenchb.ldf}%
- {Option `og' requires package inputenc.\MessageBreak}%
+ \fi
+ \else
+ \PackageWarning{frenchb.ldf}%
+ {Option `og' requires package inputenc;%
+ \MessageBreak reported}%
+ \fi
+ }%
\fi
- }%
- \fi
- }%
- \define@key{FB}{fg}{%
- \ifFBunicode
- \ifFB@luatex@punct
- \FB@addGUILspace=1 \relax
- \fi
- \ifFB@xetex@punct
- \XeTeXcharclass"14 = \FB@guilf
- \XeTeXcharclass"BB = \FB@guilf
- \XeTeXcharclass"A0 = \FB@guilnul
- \XeTeXcharclass"202F = \FB@guilnul
- \fi
- \ifFB@active@punct
- \FBWarning{frenchb.ldf}%
- {Option fg=» not supported with this version
- of\MessageBreak LuaTeX/XeTeX; reported}%
- \fi
- \else
- \newcommand*{\FB@@fg}{%
- \iflanguage{french}%
- {\ifFB@spacing\FB@fg
- \else\guillemotright
- \fi}%
- {\guillemotright}}%
- \AtBeginDocument{%
- \ifdefined\DeclareInputText
- \ifdefined\uc@dclc
- \uc@dclc{187}{default}{\FB@@fg}%
- \else
- \ifdefined\DeclareUnicodeCharacter
- \DeclareUnicodeCharacter{00BB}{\FB@@fg}%
+ }%
+ \define@key{FB}{fg}%
+ {\ifFBunicode
+ \ifFB@luatex@punct
+ \FB@addGUILspace=1 \relax
+ \fi
+ \ifFB@xetex@punct
+ \XeTeXcharclass"14 = \FB@guilf
+ \XeTeXcharclass"BB = \FB@guilf
+ \XeTeXcharclass"A0 = \FB@guilnul
+ \XeTeXcharclass"202F = \FB@guilnul
+ \fi
+ \ifFB@active@punct
+ \PackageWarning{frenchb.ldf}%
+ {Option fg=» not supported with this version
+ of\MessageBreak LuaTeX/XeTeX; reported}%
+ \fi
+ \else
+ \newcommand*{\FB@@fg}{%
+ \iflanguage{french}%
+ {\ifFB@spacing\FB@fg
+ \else\guillemotright
+ \fi}%
+ {\guillemotright}}%
+ \AtBeginDocument{%
+ \ifdefined\DeclareInputText
+ \ifdefined\uc@dclc
+ \uc@dclc{187}{default}{\FB@@fg}%
\else
- \@tempcnta`#1\relax
+ \ifdefined\DeclareUnicodeCharacter
+ \DeclareUnicodeCharacter{00BB}{\FB@@fg}%
+ \else
+ \@tempcnta`#1\relax
\ifdefined\mule@def
- \mule@def{27}{{\FB@@fg}}%
+ \mule@def{27}{{\FB@@fg}}%
\else
- \DeclareInputText{\the\@tempcnta}{\FB@@fg}%
+ \DeclareInputText{\the\@tempcnta}{\FB@@fg}%
\fi
+ \fi
\fi
- \fi
- \else
- \PackageWarning{frenchb.ldf}%
- {Option `fg' requires package inputenc.\MessageBreak}%
+ \else
+ \PackageWarning{frenchb.ldf}%
+ {Option `fg' requires package inputenc;%
+ \MessageBreak reported}%
+ \fi
+ }%
\fi
- }%
- \fi
- }%
+ }%
}
\newcommand*{\FBprocess@options}{%
\@ifpackageloaded{enumitem}{%
\ifFBStandardItemizeEnv
\else
- \FBStandardItemizeEnvtrue
- \PackageInfo{frenchb.ldf}%
+ \FBStandardItemizeEnvtrue
+ \PackageInfo{frenchb.ldf}%
{Setting StandardItemizeEnv=true for\MessageBreak
- compatibility with enumitem package,\MessageBreak}%
+ compatibility with enumitem package,\MessageBreak
+ reported}%
\fi
\ifFBStandardEnumerateEnv
\else
- \FBStandardEnumerateEnvtrue
- \PackageInfo{frenchb.ldf}%
+ \FBStandardEnumerateEnvtrue
+ \PackageInfo{frenchb.ldf}%
{Setting StandardEnumerateEnv=true for\MessageBreak
- compatibility with enumitem package,\MessageBreak}%
+ compatibility with enumitem package,\MessageBreak
+ reported}%
\fi}{}%
\@ifpackageloaded{paralist}{%
\ifFBStandardItemizeEnv
\else
- \FBStandardItemizeEnvtrue
- \PackageInfo{frenchb.ldf}%
+ \FBStandardItemizeEnvtrue
+ \PackageInfo{frenchb.ldf}%
{Setting StandardItemizeEnv=true for\MessageBreak
- compatibility with paralist package,\MessageBreak}%
+ compatibility with paralist package,\MessageBreak
+ reported}%
\fi
\ifFBStandardEnumerateEnv
\else
- \FBStandardEnumerateEnvtrue
- \PackageInfo{frenchb.ldf}%
+ \FBStandardEnumerateEnvtrue
+ \PackageInfo{frenchb.ldf}%
{Setting StandardEnumerateEnv=true for\MessageBreak
- compatibility with paralist package,\MessageBreak}%
+ compatibility with paralist package,\MessageBreak
+ reported}%
\fi}{}%
\@ifpackageloaded{enumerate}{%
\ifFBStandardEnumerateEnv
\else
- \FBStandardEnumerateEnvtrue
- \PackageInfo{frenchb.ldf}%
+ \FBStandardEnumerateEnvtrue
+ \PackageInfo{frenchb.ldf}%
{Setting StandardEnumerateEnv=true for\MessageBreak
- compatibility with enumerate package,\MessageBreak}%
+ compatibility with enumerate package,\MessageBreak
+ reported}%
\fi}{}%
\def\FB@ufl{\update@frenchlists}
\ifx\bbl@main@language\FB@french
- \update@frenchlists
+ \update@frenchlists
\fi
\ifFBAutoSpacePunctuation
- \autospace@beforeFDP
+ \autospace@beforeFDP
\else
- \noautospace@beforeFDP
+ \noautospace@beforeFDP
\fi
\ifFBOriginalTypewriter
\else
- \let\ttfamilyORI\ttfamily
- \let\rmfamilyORI\rmfamily
- \let\sffamilyORI\sffamily
- \let\ttfamily\ttfamilyFB
- \let\rmfamily\rmfamilyFB
- \let\sffamily\sffamilyFB
+ \let\ttfamilyORI\ttfamily
+ \let\rmfamilyORI\rmfamily
+ \let\sffamilyORI\sffamily
+ \let\ttfamily\ttfamilyFB
+ \let\rmfamily\rmfamilyFB
+ \let\sffamily\sffamilyFB
\fi
\ifFBThinColonSpace
\ifFB@luatex@punct
- \FBcolonskip=\FBthinskip\relax
+ \FBcolonskip=\FBthinskip\relax
\else
- \renewcommand*{\FBcolonspace}{\FBthinspace}%
+ \renewcommand*{\FBcolonspace}{\FBthinspace}%
\fi
\fi
\ifFBINGuillSpace
\ifFB@luatex@punct
- \FBguillskip=3.33pt plus 1.665pt minus 1.11pt \relax
+ \FBguillskip=3.33pt plus 1.665pt minus 1.11pt \relax
\else
- \renewcommand*{\FBguillspace}{\space}%
+ \renewcommand*{\FBguillspace}{\space}%
\fi
\fi
\@ifpackageloaded{numprint}%
@@ -1392,27 +1431,27 @@
\renewcommand*{\FB@lc}[1]{##1}%
\fi
\ifFBCustomiseFigTabCaptions
- \ifFB@koma
- \renewcommand*{\captionformat}{\CaptionSeparator}%
- \fi
- \@ifclassloaded{memoir}%
+ \ifFB@koma
+ \renewcommand*{\captionformat}{\CaptionSeparator}%
+ \fi
+ \@ifclassloaded{memoir}%
{\captiondelim{\CaptionSeparator}}{}%
- \@ifclassloaded{beamer}%
+ \@ifclassloaded{beamer}%
{\defbeamertemplate{caption label separator}{FBcustom}{%
\CaptionSeparator}%
\setbeamertemplate{caption label separator}[FBcustom]}{}%
\else
- \ifFB@koma
- \renewcommand*{\captionformat}{{\autospace@beforeFDP : }}%
- \fi
- \@ifclassloaded{memoir}%
- {\captiondelim{{\autospace@beforeFDP : }}%
- }{}%
- \@ifclassloaded{beamer}%
- {\defbeamertemplate{caption label separator}{FBcolon}{%
+ \ifFB@koma
+ \renewcommand*{\captionformat}{{\autospace@beforeFDP : }}%
+ \fi
+ \@ifclassloaded{memoir}%
+ {\captiondelim{{\autospace@beforeFDP : }}%
+ }{}%
+ \@ifclassloaded{beamer}%
+ {\defbeamertemplate{caption label separator}{FBcolon}{%
{\autospace@beforeFDP : }}%
- \setbeamertemplate{caption label separator}[FBcolon]%
- }{}%
+ \setbeamertemplate{caption label separator}[FBcolon]%
+ }{}%
\fi
\ifFBShowOptions
\GenericWarning{* }{%
@@ -1466,7 +1505,7 @@
\AtBeginDocument{%
\providecommand*{\xspace}{\relax}%
\ifdefined\pdfstringdefDisableCommands
- \pdfstringdefDisableCommands{%
+ \pdfstringdefDisableCommands{%
\let\up\relax
\let\fup\relax
\let\degre\textdegree
@@ -1488,32 +1527,32 @@
\def\at{@}%
\def\circonflexe{\string^}%
\def\tild{\string~}%
+ \def\boi{\textbackslash}%
\let\bsc\textsc
- }%
+ }%
\fi
\FBprocess@options
\ifFB@luatex@punct
\activate@luatexpunct
\fi
\ifFBunicode
- \ifdefined\DeclareUTFcharacter
- \else
- \@ifpackageloaded{luainputenc}{}%
- {\PackageWarning{frenchb.ldf}%
- {Add \protect\usepackage{fontspec} to the\MessageBreak
- preamble of your document,}%
- }%
- \fi
+ \@ifpackageloaded{fontspec}{}%
+ {\@ifpackageloaded{luainputenc}{}%
+ {\PackageWarning{frenchb.ldf}%
+ {Add \protect\usepackage{fontspec} to the\MessageBreak
+ preamble of your document, reported}%
+ }%
+ }
\else
- \begingroup \newcommand{\FBOTone}{OT1}%
- \ifx\encodingdefault\FBOTone
- \PackageWarning{frenchb.ldf}%
- {OT1 encoding should not be used for French.%
- \MessageBreak
- Add \protect\usepackage[T1]{fontenc} to the
- preamble\MessageBreak of your document,}%
- \fi
- \endgroup
+ \begingroup \newcommand{\FBOTone}{OT1}%
+ \ifx\encodingdefault\FBOTone
+ \PackageWarning{frenchb.ldf}%
+ {OT1 encoding should not be used for French.%
+ \MessageBreak
+ Add \protect\usepackage[T1]{fontenc} to the
+ preamble\MessageBreak of your document; reported}%
+ \fi
+ \endgroup
\fi
}
\let\listORI\list
@@ -1552,21 +1591,21 @@
}
\def\FB@itemizesettings{%
\ifFBReduceListSpacing
- \setlength{\itemsep}{\z@}%
- \setlength{\parsep}{\z@}%
- \setlength{\topsep}{\z@}%
- \setlength{\partopsep}{\z@}%
- \@tempdima=\parskip
- \addtolength{\topsep}{-\@tempdima}%
- \addtolength{\partopsep}{\@tempdima}%
+ \setlength{\itemsep}{\z@}%
+ \setlength{\parsep}{\z@}%
+ \setlength{\topsep}{\z@}%
+ \setlength{\partopsep}{\z@}%
+ \@tempdima=\parskip
+ \addtolength{\topsep}{-\@tempdima}%
+ \addtolength{\partopsep}{\@tempdima}%
\fi
\settowidth{\labelwidth}{\csname\@itemitem\endcsname}%
\ifFBListOldLayout
- \setlength{\leftmargin}{\labelwidth}%
- \addtolength{\leftmargin}{\labelsep}%
- \addtolength{\leftmargin}{\parindent}%
+ \setlength{\leftmargin}{\labelwidth}%
+ \addtolength{\leftmargin}{\labelsep}%
+ \addtolength{\leftmargin}{\parindent}%
\else
- \FB@listHsettings
+ \FB@listHsettings
\fi
}
\def\itemizeFB{%
@@ -1651,7 +1690,7 @@
}
\def\bbl@nonfrenchlistlayout{%
\ifFBGlobalLayoutFrench
- \update@frenchlists
+ \update@frenchlists
\fi
}
\FB@addto{extras}{\bbl@frenchlistlayout}
@@ -1659,22 +1698,22 @@
\def\bbl@frenchindent{%
\ifFBGlobalLayoutFrench\else\babel@save\@afterindentfalse\fi
\ifFBIndentFirst
- \let\@afterindentfalse\@afterindenttrue
- \@afterindenttrue
+ \let\@afterindentfalse\@afterindenttrue
+ \@afterindenttrue
\fi}
\def\bbl@nonfrenchindent{%
\ifFBGlobalLayoutFrench
- \ifFBIndentFirst
- \@afterindenttrue
- \fi
+ \ifFBIndentFirst
+ \@afterindenttrue
+ \fi
\fi}
\FB@addto{extras}{\bbl@frenchindent}
\FB@addto{noextras}{\bbl@nonfrenchindent}
\AtBeginDocument{\@ifpackageloaded{bigfoot}%
{\PackageInfo{frenchb.ldf}%
{bigfoot package in use.\MessageBreak
- frenchb will NOT customise footnotes;\MessageBreak
- reported}}%
+ frenchb will NOT customise footnotes;%
+ \MessageBreak reported}}%
{\let\@footnotemarkORI\@footnotemark
\def\@footnotemarkFB{\leavevmode\unskip\unkern
\,\@footnotemarkORI}%
@@ -1688,18 +1727,18 @@
\newcommand*{\kernFFN}{\kern .5em}
\newlength\FBfnindent
\ifFB@koma
- \let\@makefntextORI\@makefntext
- \let\@@makefnmarkORI\@@makefnmark
- \deffootnote[\FBfnindent]{0pt}{\parindentFFN}%
- {\thefootnotemark\dotFFN\kernFFN}
- \let\@makefntextFB\@makefntext
- \let\@@makefnmarkFB\@@makefnmark
- \deffootnote[\parindentFFN]{0pt}{\parindentFFN}%
- {\textsuperscript{\thefootnotemark}}
- \let\@makefntextTH\@makefntext
- \let\@@makefnmarkTH\@@makefnmark
- \let\@makefntext\@makefntextORI
- \let\@@makefnmark\@@makefnmarkORI
+ \let\@makefntextORI\@makefntext
+ \let\@@makefnmarkORI\@@makefnmark
+ \deffootnote[\FBfnindent]{0pt}{\parindentFFN}%
+ {\thefootnotemark\dotFFN\kernFFN}
+ \let\@makefntextFB\@makefntext
+ \let\@@makefnmarkFB\@@makefnmark
+ \deffootnote[\parindentFFN]{0pt}{\parindentFFN}%
+ {\textsuperscript{\thefootnotemark}}
+ \let\@makefntextTH\@makefntext
+ \let\@@makefnmarkTH\@@makefnmark
+ \let\@makefntext\@makefntextORI
+ \let\@@makefnmark\@@makefnmarkORI
\fi
\@ifclassloaded{memoir}
{\newcommand{\@makefntextFB}[1]{%
@@ -1729,54 +1768,54 @@
\providecommand\@makefntextFB[1]{\insertfootnotemarkFB #1}
\AtBeginDocument{%
\@ifpackageloaded{bigfoot}{}%
- {\ifdim\parindentFFN<10in
- \else
- \parindentFFN=\parindent
- \ifdim\parindentFFN<1.5em \parindentFFN=1.5em \fi
- \fi
- \settowidth{\FBfnindent}{\dotFFN\kernFFN}%
- \addtolength{\FBfnindent}{\parindentFFN}%
- \let\@makefntextORI\@makefntext
- \ifFB@koma
- \let\@@makefnmarkORI\@@makefnmark
- \long\def\@makefntext#1{%
- \ifFBFrenchFootnotes
- \ifx\footnote\thanks
- \let\@@makefnmark\@@makefnmarkTH
- \@makefntextTH{#1}%
- \else
- \let\@@makefnmark\@@makefnmarkFB
- \@makefntextFB{#1}%
- \fi
- \else
- \let\@@makefnmark\@@makefnmarkORI
- \@makefntextORI{#1}%
- \fi}%
- \else
- \@ifclassloaded{memoir}%
- {\ifFBFrenchFootnotes
- \setlength{\thanksmarkwidth}{\parindentFFN}%
- \setlength{\thanksmarksep}{-\thanksmarkwidth}%
- \fi
- }{}%
- \@ifclassloaded{beamer}%
- {\ifFBFrenchFootnotes
- \ifdim\parindentFFN=1.5em\else
- \FBWarning{frenchb}{%
+ {\ifdim\parindentFFN<10in
+ \else
+ \parindentFFN=\parindent
+ \ifdim\parindentFFN<1.5em \parindentFFN=1.5em \fi
+ \fi
+ \settowidth{\FBfnindent}{\dotFFN\kernFFN}%
+ \addtolength{\FBfnindent}{\parindentFFN}%
+ \let\@makefntextORI\@makefntext
+ \ifFB@koma
+ \let\@@makefnmarkORI\@@makefnmark
+ \long\def\@makefntext#1{%
+ \ifFBFrenchFootnotes
+ \ifx\footnote\thanks
+ \let\@@makefnmark\@@makefnmarkTH
+ \@makefntextTH{#1}%
+ \else
+ \let\@@makefnmark\@@makefnmarkFB
+ \@makefntextFB{#1}%
+ \fi
+ \else
+ \let\@@makefnmark\@@makefnmarkORI
+ \@makefntextORI{#1}%
+ \fi}%
+ \else
+ \@ifclassloaded{memoir}%
+ {\ifFBFrenchFootnotes
+ \setlength{\thanksmarkwidth}{\parindentFFN}%
+ \setlength{\thanksmarksep}{-\thanksmarkwidth}%
+ \fi
+ }{}%
+ \@ifclassloaded{beamer}%
+ {\ifFBFrenchFootnotes
+ \ifdim\parindentFFN=1.5em\else
+ \FBWarning{%
\protect\parindentFFN\space is ineffective%
- \MessageBreak within the beamer class.\MessageBreak
- Reported}%
- \fi
- \fi
- }{}%
- \long\def\@makefntext#1{%
+ \MessageBreak within the beamer class.%
+ \MessageBreak Reported}%
+ \fi
+ \fi
+ }{}%
+ \long\def\@makefntext#1{%
\ifFBFrenchFootnotes
\@makefntextFB{#1}%
\else
\@makefntextORI{#1}%
\fi}%
- \fi
- }%
+ \fi
+ }%
}
\newcommand*{\AddThinSpaceBeforeFootnotes}{\FBAutoSpaceFootnotestrue}
\newcommand*{\FrenchFootnotes}{\FBFrenchFootnotestrue}
diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.lua b/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
index 873ec7061c4..45b37a71d3d 100644
--- a/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
+++ b/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
@@ -1,5 +1,5 @@
--
--- File `frenchb.lua' generated from frenchb.dtx [2017/01/15 v3.2f]
+-- File `frenchb.lua' generated from frenchb.dtx [2017/01/30 v3.2g]
--
-- Copyright © 2014-2017 Daniel Flipo
-- <daniel (dot) flipo (at) free (dot) fr>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 02:14:56 +0000