summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/babel-french/french.ldf
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/generic/babel-french/french.ldf')
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/french.ldf41
1 files changed, 30 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/generic/babel-french/french.ldf b/Master/texmf-dist/tex/generic/babel-french/french.ldf
index 34f08f69518..2e38c830121 100644
--- a/Master/texmf-dist/tex/generic/babel-french/french.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/french.ldf
@@ -24,13 +24,12 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{french}
- [2018/07/06 v3.5a French support from the babel system]
+ [2018/07/17 v3.5b French support from the babel system]
%%
%% Babel package for LaTeX version 2e
%% Copyright © 1996-2018
%% by Daniel Flipo <daniel (dot) flipo (at) free (dot) fr>
%%
-
\LdfInit\CurrentOption{FBclean@on@exit}
\def\fb@error#1#2{%
\begingroup
@@ -567,7 +566,14 @@
\newcommand*{\ogii}{\textquotedblleft}
\newcommand*{\fgii}{\textquotedblright}
\newcount\FBguill@level
-\newtoks\FB@everypar
+\newtoks\FBold@everypar
+\def\FB@addquote@everypar{%
+ \let\FBnew@everypar\everypar
+ \FBold@everypar=\expandafter{\the\everypar}%
+ \FBnew@everypar={\the\FBold@everypar\FBeverypar@quote}%
+ \let\everypar\FBold@everypar
+ \let\FB@addquote@everypar\relax
+}
\newif\ifFBcloseguill \FBcloseguilltrue
\newif\ifFBInnerGuillSingle
\def\FBguillopen{\bgroup\NoAutoSpacing\guillemotleft\egroup}
@@ -575,6 +581,8 @@
\let\FBguillnone\empty
\let\FBeveryparguill\FBguillopen
\let\FBeverylineguill\FBguillnone
+\let\FBeverypar@quote\relax
+\let\FBeveryline@quote\empty
\ifLaTeXe
\DeclareRobustCommand\frquote{%
\@ifstar{\FBcloseguillfalse\fr@quote}%
@@ -587,21 +595,22 @@
\advance\FBguill@level by \@ne
\ifcase\FBguill@level
\or
- \FB@everypar=\everypar
\ifx\FBeveryparguill\FBguillnone
\else
\def\FBeverypar@quote{\FBeveryparguill\FB@guillspace}%
- \everypar=\expandafter{\the\everypar \FBeverypar@quote}%
+ \FB@addquote@everypar
\fi
\ogi #1\fgi
\or
\ifx\FBeverylineguill\FBguillopen
- \localleftbox{\guillemotleft\FB@guillspace}%
+ \def\FBeveryline@quote{\guillemotleft\FB@guillspace}%
+ \localleftbox{\FBeveryline@quote}%
\let\FBeverypar@quote\relax
\ogi #1\ifFBcloseguill\fgi\fi
\else
\ifx\FBeverylineguill\FBguillclose
- \localleftbox{\guillemotright\FB@guillspace}%
+ \def\FBeveryline@quote{\guillemotright\FB@guillspace}%
+ \localleftbox{\FBeveryline@quote}%
\let\FBeverypar@quote\relax
\ogi #1\ifFBcloseguill\fgi\fi
\else
@@ -632,8 +641,9 @@
\fi
\fi
\advance\FBguill@level by \m@ne
+ \let\FBeverypar@quote\relax
+ \let\FBeveryline@quote\empty
\ifx\FBeverylineguill\FBguillnone\else\localleftbox{}\fi
- \ifx\FBeveryparguill\FBguillnone\else\everypar=\FB@everypar\fi
}
\def\BabelLanguages{french,acadian}
\StartBabelCommands*{\BabelLanguages}{date}
@@ -1861,14 +1871,21 @@
\ifFBFrenchFootnotes
\ifx\footnote\thanks
\let\@@makefnmark\@@makefnmarkTH
- \begingroup\localleftbox{}\@makefntextTH{#1}\endgroup
+ \begingroup\localleftbox{}\let\FBeverypar@quote\relax
+ \@makefntextTH{#1}\endgroup
\else
\let\@@makefnmark\@@makefnmarkFB
- \begingroup\localleftbox{}\@makefntextFB{#1}\endgroup
+ \begingroup\localleftbox{}\let\FBeverypar@quote\relax
+ \@makefntextFB{#1}\endgroup
\fi
\else
+ \localleftbox{}%
+ \let\FBeverypar@save\FBeverypar@quote
+ \let\FBeverypar@quote\relax
\let\@@makefnmark\@@makefnmarkORI
\@makefntextORI{#1}%
+ \let\FBeverypar@quote\FBeverypar@save
+ \localleftbox{\FBeveryline@quote}%
\fi}%
\else
\@ifclassloaded{memoir}%
@@ -1887,7 +1904,9 @@
\fi
\fi
}{}%
- \long\def\@makefntext#1{\begingroup\localleftbox{}%
+ \long\def\@makefntext#1{\begingroup
+ \localleftbox{}%
+ \let\FBeverypar@quote\relax
\ifFBFrenchFootnotes
\@makefntextFB{#1}%
\else