texlive[50711] Master/texmf-dist: babel-french (2apr19)
commits+karl at tug.org
commits+karl at tug.org
Tue Apr 2 23:11:24 CEST 2019
Revision: 50711
http://tug.org/svn/texlive?view=revision&revision=50711
Author: karl
Date: 2019-04-02 23:11:24 +0200 (Tue, 02 Apr 2019)
Log Message:
-----------
babel-french (2apr19)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.pdf
trunk/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex
trunk/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf
trunk/Master/texmf-dist/source/generic/babel-french/frenchb.dtx
trunk/Master/texmf-dist/tex/generic/babel-french/acadian.ldf
trunk/Master/texmf-dist/tex/generic/babel-french/canadien.ldf
trunk/Master/texmf-dist/tex/generic/babel-french/francais.ldf
trunk/Master/texmf-dist/tex/generic/babel-french/french.ldf
trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
Modified: trunk/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex 2019-04-02 21:11:08 UTC (rev 50710)
+++ trunk/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex 2019-04-02 21:11:24 UTC (rev 50711)
@@ -7,6 +7,7 @@
\usepackage{url,alltt,shortvrb}
\usepackage{graphics}
\usepackage[dvipsnames]{xcolor}
+\usepackage{luatexbase} %%% Provisoire : pour microtype
%%% Fontes OpenType avec moteur LuaTeX : Erewhon/Cabin/Inconsolata
\usepackage[upright]{fourier} % Pour les maths seulement
@@ -123,10 +124,11 @@
%
\title{Documentation sur le module \ext{babel-french}}
\author{\href{mailto:daniel.flipo at free.fr}{Daniel \textsc{Flipo}}}
-\newcommand*{\latestversion}{3.5d}
+\newcommand*{\latestversion}{3.5e}
\date{Version {\latestversion} -- \today}
\begin{document}
+\def\today{30 avril 2019}
\maketitle
\thispagestyle{empty}
@@ -196,6 +198,8 @@
voir p.~\pageref{ListAsPar}.
\item[24 janvier 2019] L’option \fbo{StandardListSpacing=true} est à utiliser
de préférence à \fbo{ReduceListSpacing=false}, voir p.~\pageref{ListAsPar}.
+ \item[14 mars 2019] Nouvelle commande |\NoEveryParQuote|, voir
+ p.~\pageref{frquote}.
\end{description}
\end{abstract}
\egroup
@@ -535,8 +539,12 @@
Le codage est le suivant :
{\ttfamily\ColorVerb Xavier raconte… |\frquote{|Au moment… l’hôtesse m’a
dit tout bonnement : |\frquote*{|Je suis désolée, … en anglais.|}}|}
-%%% Fin exemple
+ Une commande |\NoEveryParQuote| permet de supprimer localement des guillemets
+ de début de paragraphe ajoutés inconsidérément par la commande |\frquote{}|
+ notamment dans les listes (après les labels) ; elle doit être utilisée dans
+ un environnement ou un groupe pour en limiter la portée.
+
\item La commande |\up| facilite la saisie des exposants en mode texte :
|M\up{me}| imprime M\up{me},
|1\up{er}| donne 1\up{er} ; % 1\ier ;
@@ -698,13 +706,8 @@
langue principale : retour aux listes standard, pas de
retrait des 1\iers{} paragraphes des sections, notes de bas de page
standard, séparateur «\string:» dans les légendes de figures et tableaux.
+ Lorsque le français n’est pas la langue principale, elle est sans effet.
- Lorsque le français n’est pas la langue principale, l’option
- \fbo{StandardLayout=false} permet la présentation des listes à la française
- et la mise en retrait des 1\iers{} paragraphes des sections dans les
- (seules) parties en français. Ceci me paraît être un mauvais usage de cette
- option, une maquette commune à toutes les langues est bien préférable…
-
\item [GlobalLayoutFrench=false (true*)] ne devrait plus être utilisée sauf,
lorsque le français est la langue principale, pour retrouver le comportement
des versions de \ext{babel-french} antérieures à~v2.2 : dans les parties
@@ -1464,7 +1467,7 @@
|\setlist{labelwidth=\mylabelwidth, leftmargin=!|\\
| itemsep=0.4ex plus 0.2ex minus 0.2ex,|\\ % enumitem ne redéfinit pas
| parsep=0.4ex plus 0.2ex minus 0.2ex,|\\ % \list, on peut s’en passer
-| topsep=0.8ex plus 0.4ex minus 0.4ex,|\\ % sauf option StandarLists,
+| topsep=0.8ex plus 0.4ex minus 0.4ex,|\\ % sauf option StandardLists,
| partopsep=0.4ex plus 0.2ex minus 0.2ex}| % évidemment !
}
@@ -1485,7 +1488,7 @@
|\setlist{leftmargin=\parindent, itemindent=\myitemindent,|\\
| itemsep=0.4ex plus 0.2ex minus 0.2ex,|\\ % enumitem ne redéfinit pas
| parsep=0.4ex plus 0.2ex minus 0.2ex,|\\ % \list, on peut s’en passer
-| topsep=0.8ex plus 0.4ex minus 0.4ex,|\\ % sauf option StandarLists,
+| topsep=0.8ex plus 0.4ex minus 0.4ex,|\\ % sauf option StandardLists,
| partopsep=0.4ex plus 0.2ex minus 0.2ex}| % évidemment !
}
@@ -1507,6 +1510,9 @@
voir p.~\pageref{ListAsPar}. La présente documentation est maintenant
incluse dans la distribution \ext{babel-french} sur CTAN.
+La commande |\NoEveryParQuote| a été ajoutée en version~3.5e, voir
+p.~\pageref{frquote}.
+
\subsection{Changements entre les versions 3.4d et 3.3d}
\label{ssec:changes-3.4}
@@ -1994,9 +2000,7 @@
\nopagebreak
\vspace{2\baselineskip}
\nopagebreak
-\href{https://creativecommons.org/licenses/by-nc-nd/4.0/}%
- {\includegraphics{CC-by-nc-nd}}%
-\hspace{\fill}%
+\hspace*{\fill}%
\begin{minipage}[b]{.5\linewidth}
\raggedleft
\href{mailto:daniel.flipo at free.fr}{Daniel \textsc{Flipo}}\\
Modified: trunk/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/generic/babel-french/frenchb.dtx
===================================================================
--- trunk/Master/texmf-dist/source/generic/babel-french/frenchb.dtx 2019-04-02 21:11:08 UTC (rev 50710)
+++ trunk/Master/texmf-dist/source/generic/babel-french/frenchb.dtx 2019-04-02 21:11:24 UTC (rev 50711)
@@ -1,4 +1,4 @@
-%\CheckSum{3724}
+%\CheckSum{3769}
%
%\iffalse
% Tell the LaTeX system who we are and write an entry on the
@@ -13,7 +13,7 @@
%<frenchb>\ProvidesLanguage{frenchb}
%<lua>--[[
%<lua> File `frenchb.lua’ generated from frenchb.dtx
- [2019/01/30 v3.5d French support from the babel system]
+ [2019/03/30 v3.5e French support from the babel system]
%<*internal>
\iffalse
%</internal>
@@ -227,12 +227,17 @@
% A new command |\frquote{}| has been added in version~3.1 to
% enter French quotations. |\frquote{|\textit{texte}|}| is
% equivalent to |\og| \textit{texte} |\fg{}| for short
-% quotations. For quotations spreading over more than one
-% paragraph, |\frquote| will add at the beginning of every
-% paragraph of the quotation either an opening French
-% guillemet («), or a closing one (») or nothing depending
-% on option \fbo{EveryParGuill=open} or \fbo{=close} or
-% \fbo{=none}, see p.~\pageref{everyparguill}.\hlabel{frquote}
+% quotations.\hlabel{frquote}
+% For quotations spreading over more than one paragraph,
+% |\frquote| will add at the beginning of every paragraph of
+% the quotation either an opening French guillemet («), or
+% a closing one (») or nothing depending on option
+% \fbo{EveryParGuill=open} or \fbo{=close} or \fbo{=none},
+% see p.~\pageref{everyparguill}.
+% Command |\NoEveryParQuote| is provided to locally suppress
+% unwanted guillemets (typically when lists are embedded in
+% |\frquote{}|), it is meant to be used inside an environment
+% or a group.
%
% |\frquote| is recommended to enter embedded quotations ``à la
% française’’, several variants are provided through options.
@@ -362,19 +367,16 @@
% \item [StandardLayout=true (false*)] forces \frenchb{} not to
% interfere with the layout: no action on any kind of lists,
% first paragraphs of sections are not indented (as in English),
-% no action on footnotes. This option can be used to avoid
-% conflicts with classes or packages which customise lists or
-% footnotes.\par
-% When French is not the main language, \fbo{StandardLayout=false}
-% can be misused to ensure French typography (in French only).
-% This is a \emph{bad practice}: the document layout should not
-% be altered by language switches.
-% \item [GlobalLayoutFrench=false (true*)] should no longer be
-% used; it was intended to emulate, when French is the main
-% language, what prior versions of \frenchb{} (pre-2.2) did:
-% lists, and first paragraphs of sections would be displayed
+% no action on footnotes; it useless unless French is the main
+% language. This option can be used to avoid conflicts with
+% classes or packages which customise lists or footnotes.
+% \item [GlobalLayoutFrench=false (true*)] can only be used when
+% French is the main language; setting it to \fbo{false} will
+% emulate what prior versions of \frenchb{} (pre-2.2) did:
+% lists, and first paragraphs of sections will be displayed
% the standard way in other languages than French, and ``à la
-% française’’ in French. Note that the layout of footnotes is
+% française’’ in French (changing the layout inside a document
+% is a bad practice imho). Note that the layout of footnotes is
% language independent anyway (see below \fbo{FrenchFootnotes}
% and \fbo{AutoSpaceFootnotes}).
% \item [IndentFirst=false (true*)]; set this option to \fbo{false}
@@ -748,9 +750,14 @@
% |\frquote{}|; it showed up when |\frquote{}| immediately followed
% a sectionning command.
%
-% Starting with version 3.5d, a new option \fbo{StandarListSpacing}
+% Starting with version 3.5d, a new option \fbo{StandardListSpacing}
% has been added to supersede \fbo{ReduceListSpacing}.
%
+% A new command |\NoEveryParQuote| has been added in version 3.5e:
+% it is meant to be used inside a group or environment to suppress
+% unwanted guillemets (typically when lists are embedded in
+% |\frquote{}|).
+%
% \subsubsection*{What’s new in version 3.4?}
%
% Version 3.4a adds a new command |\frenchdate| (see
@@ -2800,8 +2807,12 @@
% \begin{macrocode}
\newcommand*{\ogi}{\FB at og}
\newcommand*{\fgi}{\FB at fg}
+\newcommand*{\@ogi}{\ifmmode\hbox{\ogi}\else\ogi\fi}
+\newcommand*{\@fgi}{\ifmmode\hbox{\fgi}\else\fgi\fi}
\newcommand*{\ogii}{\textquotedblleft}
\newcommand*{\fgii}{\textquotedblright}
+\newcommand*{\@ogii}{\ifmmode\hbox{\ogii}\else\ogii\fi}
+\newcommand*{\@fgii}{\ifmmode\hbox{\fgii}\else\fgii\fi}
% \end{macrocode}
% and the needed technical stuff to handle options:
%
@@ -2878,7 +2889,7 @@
\def\FBeverypar at quote{\FBeveryparguill\FB at guillspace}%
\FB at addquote@everypar
\fi
- \ogi #1\fgi
+ \@ogi #1\@fgi
\or
% \end{macrocode}
% This for level 2 (inner) quotations: Omega’s command
@@ -2891,18 +2902,23 @@
% \changes{v3.5c}{2018/09/14}{\cs{FBeverypar at quote}’s value now properly
% reset across level changes.}
%
+% \changes{v3.5e}{2019/03/23}{reset \cs{FB at addGUILspace} attribute
+% inside \cs{localleftbox} (LuaTeX).}
+%
% \begin{macrocode}
\ifx\FBeverylineguill\FBguillopen
- \def\FBeveryline at quote{\guillemotleft\FB at guillspace}%
+ \def\FBeveryline at quote{\FB at addGUILspace=0 \guillemotleft
+ \FB at guillspace}%
\localleftbox{\FBeveryline at quote}%
\let\FBeverypar at quote\relax
- \ogi #1\ifFBcloseguill\fgi\fi
+ \@ogi #1\ifFBcloseguill\@fgi\fi
\else
\ifx\FBeverylineguill\FBguillclose
- \def\FBeveryline at quote{\guillemotright\FB at guillspace}%
+ \def\FBeveryline at quote{\FB at addGUILspace=0 \guillemotright
+ \FB at guillspace}%
\localleftbox{\FBeveryline at quote}%
\let\FBeverypar at quote\relax
- \ogi #1\ifFBcloseguill\fgi\fi
+ \@ogi #1\ifFBcloseguill\@fgi\fi
\else
% \end{macrocode}
% otherwise we need to redefine |\FBeverypar at quote| (and eventually
@@ -2921,7 +2937,7 @@
\def\FBeverypar at quote{\guilsinglright\FB at guillspace}%
\fi
\fi
- \ogii #1\ifFBcloseguill \fgii \fi
+ \@ogii #1\ifFBcloseguill \@fgii \fi
\fi
\fi
\else
@@ -2938,16 +2954,29 @@
\fi
\fi
% \end{macrocode}
+%
+% \changes{v3.5e}{2019/03/14}{Make resettings global on exit.}
+%
% Closing: step down |\FBguill at level| and clean on exit.
+% Changes made global in case |\frquote{}| ends inside an
+% environment.
% \begin{macrocode}
- \advance\FBguill at level by \m at ne
- \ifcase\FBguill at level \let\FBeverypar at quote\relax
- \or \def\FBeverypar at quote{\FBeveryparguill\FB at guillspace}%
- \let\FBeveryline at quote\empty
+ \global\advance\FBguill at level by \m at ne
+ \ifcase\FBguill at level \global\let\FBeverypar at quote\relax
+ \or \gdef\FBeverypar at quote{\FBeveryparguill\FB at guillspace}%
+ \global\let\FBeveryline at quote\empty
\ifx\FBeverylineguill\FBguillnone\else\localleftbox{}\fi
\fi
}
% \end{macrocode}
+% \changes{v3.5e}{2019/03/14}{new command \cs{NoEveryParQuote}.}
+%
+% The next command is intended to be used in list environments to
+% suppress quotes which might be added by |\FBeverypar at quote| after
+% items for instance.
+% \begin{macrocode}
+\newcommand*{\NoEveryParQuote}{\let\FBeveryparguill\FBguillnone}
+% \end{macrocode}
% \end{macro}
%
% \subsection{Date in French}
@@ -4111,7 +4140,7 @@
% lists’ items ``as paragraphs’’.}
%
% \changes{v3.5d}{2019/01/24}{ReduceListSpacing option depreciated: see
-% StandarListSpacing.}
+% StandardListSpacing.}
%
% \begin{macrocode}
\newcommand*{\frenchsetup}[1]{%
@@ -4208,6 +4237,10 @@
% \changes{v3.2h}{2017/04/11}{Option GlobalLayoutFrench skipped
% when French is not the main language.}
%
+% \changes{v3.5e}{2019/03/14}{StandardLayout and GlobalLayoutFrench
+% options can no longer be toggled when French is not the main
+% language.}
+%
% Our list customisation conflicts with the \cls{beamer} class and
% with the \pkg{beamerarticle} package. The patch provided in
% \pkg{beamerbasecompatibility} solves the conflict except in case
@@ -4263,8 +4296,19 @@
\RequirePackage{keyval}%
\define at key{FB}{ShowOptions}[true]%
{\csname FBShowOptions#1\endcsname}%
+% \end{macrocode}
+% The next two keys can only be toggled when French is the main
+% language.
+% \begin{macrocode}
\define at key{FB}{StandardLayout}[true]%
- {\csname FBStandardLayout#1\endcsname
+ {\ifFB at mainlanguage@FR
+ \csname FBStandardLayout#1\endcsname
+ \else
+ \PackageWarning{french.ldf}%
+ {Option `StandardlLayout' skipped:\MessageBreak
+ French is *not* babel's last option.\MessageBreak
+ Reported}%
+ \fi
\ifFBStandardLayout
\FBStandardListSpacingtrue
\FBStandardItemizeEnvtrue
@@ -4284,24 +4328,20 @@
\FBAutoSpaceFootnotestrue
\fi}%
\define at key{FB}{GlobalLayoutFrench}[true]%
- {\csname FBGlobalLayoutFrench#1\endcsname
+ {\ifFB at mainlanguage@FR
+ \csname FBGlobalLayoutFrench#1\endcsname
+ \else
+ \PackageWarning{french.ldf}%
+ {Option `GlobalLayoutFrench' skipped:\MessageBreak
+ French is *not* babel's last option.\MessageBreak
+ Reported}%
+ \fi}%
% \end{macrocode}
% If this key is set to \fbo{true} when French is the main language,
% nothing to do: all flags keep their default value.
% If this key is set to \fbo{false}, nothing to do either:
-% |\babel at save| will do the job. Warn and reset in case this key
-% is set to true while the main language is \emph{not} French.
+% |\babel at save| will do the job.
% \begin{macrocode}
- \ifFBGlobalLayoutFrench
- \ifFB at mainlanguage@FR
- \else
- \FBGlobalLayoutFrenchfalse
- \PackageWarning{french.ldf}%
- {Option `GlobalLayoutFrench' skipped:\MessageBreak
- French is *not* babel's last option.\MessageBreak
- Reported}%
- \fi
- \fi}%
\define at key{FB}{ReduceListSpacing}[true]%
{\csname FBReduceListSpacing#1\endcsname
\ifFBReduceListSpacing \FBStandardListSpacingfalse
@@ -5127,10 +5167,11 @@
% lists’ items can be typeset as paragraphs with indented labels
% while the default leaves the labels hanging into the left margin.}
%
-%\begin{macro}{\FB at listHsettings}
% \begin{macro}{\leftmarginFB}
+% \begin{macro}{\FB at listHsettings}
% |\FB at listHsettings| holds the new horizontal settings chosen for
-% French lists itemize and enumerate (two possible layouts).
+% French lists \env{itemize}, \env{enumerate} and \env{description}
+% (two possible layouts).
% \begin{macrocode}
\newdimen\leftmarginFB
\def\FB at listHsettings{%
Modified: trunk/Master/texmf-dist/tex/generic/babel-french/acadian.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/generic/babel-french/acadian.ldf 2019-04-02 21:11:08 UTC (rev 50710)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/acadian.ldf 2019-04-02 21:11:24 UTC (rev 50711)
@@ -24,7 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{acadian}
- [2019/01/30 v3.5d French support from the babel system]
+ [2019/03/30 v3.5e French support from the babel system]
\PackageInfo{acadian.ldf}%
{`acadian' dialect is currently\MessageBreak
*absolutely identical* to the\MessageBreak
Modified: trunk/Master/texmf-dist/tex/generic/babel-french/canadien.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/generic/babel-french/canadien.ldf 2019-04-02 21:11:08 UTC (rev 50710)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/canadien.ldf 2019-04-02 21:11:24 UTC (rev 50711)
@@ -24,7 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{canadien}
- [2019/01/30 v3.5d French support from the babel system]
+ [2019/03/30 v3.5e French support from the babel system]
\PackageWarning{canadien.ldf}%
{Option `canadien' for Babel is *deprecated*,\MessageBreak
it might be removed sooner or later. Please\MessageBreak
Modified: trunk/Master/texmf-dist/tex/generic/babel-french/francais.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/generic/babel-french/francais.ldf 2019-04-02 21:11:08 UTC (rev 50710)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/francais.ldf 2019-04-02 21:11:24 UTC (rev 50711)
@@ -24,7 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{francais}
- [2019/01/30 v3.5d French support from the babel system]
+ [2019/03/30 v3.5e French support from the babel system]
\PackageWarning{francais.ldf}%
{Option `francais' for Babel is *deprecated*,\MessageBreak
it might be removed sooner or later. Please\MessageBreak
Modified: trunk/Master/texmf-dist/tex/generic/babel-french/french.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/generic/babel-french/french.ldf 2019-04-02 21:11:08 UTC (rev 50710)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/french.ldf 2019-04-02 21:11:24 UTC (rev 50711)
@@ -24,7 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{french}
- [2019/01/30 v3.5d French support from the babel system]
+ [2019/03/30 v3.5e French support from the babel system]
%%
%% Babel package for LaTeX version 2e
%% Copyright © 1996-2019
@@ -563,8 +563,12 @@
\addto\extrasfrench{\babel at save\og \babel at save\fg \bbl at frenchguillemets}
\newcommand*{\ogi}{\FB at og}
\newcommand*{\fgi}{\FB at fg}
+\newcommand*{\@ogi}{\ifmmode\hbox{\ogi}\else\ogi\fi}
+\newcommand*{\@fgi}{\ifmmode\hbox{\fgi}\else\fgi\fi}
\newcommand*{\ogii}{\textquotedblleft}
\newcommand*{\fgii}{\textquotedblright}
+\newcommand*{\@ogii}{\ifmmode\hbox{\ogii}\else\ogii\fi}
+\newcommand*{\@fgii}{\ifmmode\hbox{\fgii}\else\fgii\fi}
\newcount\FBguill at level
\newtoks\FBold at everypar
\def\FB at addquote@everypar{%
@@ -600,19 +604,21 @@
\def\FBeverypar at quote{\FBeveryparguill\FB at guillspace}%
\FB at addquote@everypar
\fi
- \ogi #1\fgi
+ \@ogi #1\@fgi
\or
\ifx\FBeverylineguill\FBguillopen
- \def\FBeveryline at quote{\guillemotleft\FB at guillspace}%
+ \def\FBeveryline at quote{\FB at addGUILspace=0 \guillemotleft
+ \FB at guillspace}%
\localleftbox{\FBeveryline at quote}%
\let\FBeverypar at quote\relax
- \ogi #1\ifFBcloseguill\fgi\fi
+ \@ogi #1\ifFBcloseguill\@fgi\fi
\else
\ifx\FBeverylineguill\FBguillclose
- \def\FBeveryline at quote{\guillemotright\FB at guillspace}%
+ \def\FBeveryline at quote{\FB at addGUILspace=0 \guillemotright
+ \FB at guillspace}%
\localleftbox{\FBeveryline at quote}%
\let\FBeverypar at quote\relax
- \ogi #1\ifFBcloseguill\fgi\fi
+ \@ogi #1\ifFBcloseguill\@fgi\fi
\else
\let\FBeverypar at quote\relax
\ifFBInnerGuillSingle
@@ -627,7 +633,7 @@
\def\FBeverypar at quote{\guilsinglright\FB at guillspace}%
\fi
\fi
- \ogii #1\ifFBcloseguill \fgii \fi
+ \@ogii #1\ifFBcloseguill \@fgii \fi
\fi
\fi
\else
@@ -640,13 +646,14 @@
\MessageBreak Quotation not printed. Reported}
\fi
\fi
- \advance\FBguill at level by \m at ne
- \ifcase\FBguill at level \let\FBeverypar at quote\relax
- \or \def\FBeverypar at quote{\FBeveryparguill\FB at guillspace}%
- \let\FBeveryline at quote\empty
+ \global\advance\FBguill at level by \m at ne
+ \ifcase\FBguill at level \global\let\FBeverypar at quote\relax
+ \or \gdef\FBeverypar at quote{\FBeveryparguill\FB at guillspace}%
+ \global\let\FBeveryline at quote\empty
\ifx\FBeverylineguill\FBguillnone\else\localleftbox{}\fi
\fi
}
+\newcommand*{\NoEveryParQuote}{\let\FBeveryparguill\FBguillnone}
\def\BabelLanguages{french,acadian}
\StartBabelCommands*{\BabelLanguages}{date}
[unicode, fontenc=TU EU1 EU2, charset=utf8]
@@ -1144,7 +1151,14 @@
\define at key{FB}{ShowOptions}[true]%
{\csname FBShowOptions#1\endcsname}%
\define at key{FB}{StandardLayout}[true]%
- {\csname FBStandardLayout#1\endcsname
+ {\ifFB at mainlanguage@FR
+ \csname FBStandardLayout#1\endcsname
+ \else
+ \PackageWarning{french.ldf}%
+ {Option `StandardlLayout' skipped:\MessageBreak
+ French is *not* babel's last option.\MessageBreak
+ Reported}%
+ \fi
\ifFBStandardLayout
\FBStandardListSpacingtrue
\FBStandardItemizeEnvtrue
@@ -1164,16 +1178,13 @@
\FBAutoSpaceFootnotestrue
\fi}%
\define at key{FB}{GlobalLayoutFrench}[true]%
- {\csname FBGlobalLayoutFrench#1\endcsname
- \ifFBGlobalLayoutFrench
- \ifFB at mainlanguage@FR
- \else
- \FBGlobalLayoutFrenchfalse
- \PackageWarning{french.ldf}%
- {Option `GlobalLayoutFrench' skipped:\MessageBreak
- French is *not* babel's last option.\MessageBreak
- Reported}%
- \fi
+ {\ifFB at mainlanguage@FR
+ \csname FBGlobalLayoutFrench#1\endcsname
+ \else
+ \PackageWarning{french.ldf}%
+ {Option `GlobalLayoutFrench' skipped:\MessageBreak
+ French is *not* babel's last option.\MessageBreak
+ Reported}%
\fi}%
\define at key{FB}{ReduceListSpacing}[true]%
{\csname FBReduceListSpacing#1\endcsname
Modified: trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf 2019-04-02 21:11:08 UTC (rev 50710)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf 2019-04-02 21:11:24 UTC (rev 50711)
@@ -24,7 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{frenchb}
- [2019/01/30 v3.5d French support from the babel system]
+ [2019/03/30 v3.5e French support from the babel system]
\def\bbl at tempa{frenchb}
\ifx\CurrentOption\bbl at tempa
\let\l at frenchb\l at french
Modified: trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
===================================================================
--- trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.lua 2019-04-02 21:11:08 UTC (rev 50710)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.lua 2019-04-02 21:11:24 UTC (rev 50711)
@@ -1,6 +1,6 @@
--[[
File `frenchb.lua’ generated from frenchb.dtx
- [2019/01/30 v3.5d French support from the babel system]
+ [2019/03/30 v3.5e French support from the babel system]
Copyright © 2014-2019 Daniel Flipo
<daniel (dot) flipo (at) free (dot) fr>
License LPPL: see french.ldf.
More information about the tex-live-commits
mailing list