texlive[63088] Master/texmf-dist: babel-french (20apr22)
commits+karl at tug.org
commits+karl at tug.org
Wed Apr 20 21:43:13 CEST 2022
Revision: 63088
http://tug.org/svn/texlive?view=revision&revision=63088
Author: karl
Date: 2022-04-20 21:43:13 +0200 (Wed, 20 Apr 2022)
Log Message:
-----------
babel-french (20apr22)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/generic/babel-french/README.md
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/source/generic/babel-french/frenchb.ins
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/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/generic/babel-french/README.md 2022-04-20 19:42:55 UTC (rev 63087)
+++ trunk/Master/texmf-dist/doc/generic/babel-french/README.md 2022-04-20 19:43:13 UTC (rev 63088)
@@ -50,5 +50,5 @@
See the included manual frenchb.pdf, section "Change History".
---
-Copyright 1996--2021 Daniel Flipo
+Copyright 1996--2022 Daniel Flipo
E-mail: daniel (dot) flipo (at) free (dot) fr
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 2022-04-20 19:42:55 UTC (rev 63087)
+++ trunk/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex 2022-04-20 19:43:13 UTC (rev 63088)
@@ -6,7 +6,6 @@
\usepackage{iftex}[2019/10/24]
\RequireLuaTeX
-\usepackage{xspace}
\usepackage{array,longtable}
\usepackage{varioref}
\renewcommand{\reftextpagerange}[2]{\pageref{#1}--\pageref{#2}}
@@ -122,11 +121,11 @@
\title{Mode d’emploi du module \ext{babel-french}}
\author{\href{mailto:daniel.flipo at free.fr}{Daniel \textsc{Flipo}}}
-\newcommand*{\latestversion}{3.5m}
+\newcommand*{\latestversion}{3.5n}
\date{Version {\latestversion} -- \today}
\begin{document}
-%\def\today{30 juillet 2020}
+\def\today{18 avril 2022}
\maketitle
\thispagestyle{empty}
@@ -147,7 +146,6 @@
La présente documentation en français est également disponible sur CTAN,
il n’y a plus besoin de la récupérer sur mon site
personnel {\expandafter\expandafter\expandafter\url{\urlperso/babel-french}}.
-
\end{abstract}
\bgroup
@@ -161,19 +159,6 @@
\vspace{-\baselineskip}\noindent
\descindentFB=0pt
\begin{description}
- \item[8 juillet 2014] Ajout des sections~\ref{ssec:captions}
- p.~\pageref{ssec:captions} (\textit{caption names}) et \ref{ssec:biblatex}
- p.~\pageref{ssec:biblatex} (\biblatex).
- \item[28 juillet 2014] Présentation des listes,
- configuration d’\ext{enumitem} (section~\ref{ssec:lists}).
- \item[16 sept. 2014] Ajout de l’option \fbo{SmallCapsFigTabCaptions},
- voir p.~\pageref{scfigtab}.
- \item[9 avril 2015] Charger \ext{listings} après \ext{babel}
- (section~\ref{sec:Incomp}).
- \item[14 février 2016] Adaptation à la version 3.2a, voir
- section~\ref{ssec:changes-3.2}.
- \item[30 mars 2016] Charger \ext{subcaption} après \ext{babel}
- (section~\ref{sec:Incomp}).
\item[14 mai 2016] Mise à jour pour TeXLive~2016,
voir section~\ref{ssec:changes-3.2}. L’historique des changements
antérieurs à la version~3.0 a été supprimé.
@@ -199,6 +184,8 @@
voir p.~\pageref{listspacing}.
\item[14 mars 2019] Nouvelle commande |\NoEveryParQuote|, voir
p.~\pageref{frquote}.
+ \item[18 avril 2022] Nouvelle commande |\bname{}|, variante sans petites
+ capitales de |\bsc{}| voir p.~\pageref{bname}.
\end{description}
\end{abstract}
\egroup
@@ -458,21 +445,20 @@
Des commandes ont été prévues pour faciliter la saisie :
\begin{itemize}
-\item Les guillemets peuvent être saisis grâce aux commandes |\og| et |\fg|%
- \footnote{Si les caractères « et » sont accessibles au clavier,
- ils peuvent être utilisés pour saisir les guillemets, voir
- la fin de la section~\ref{sec:Perso}, p.~\pageref{og-fg}.},
- ce qui donne selon la langue de travail « guillemets français » ou
- \begin{otherlanguage}{english}``english quotes’’\end{otherlanguage}.
+\item Les guillemets français peuvent être saisis grâce à la commande
+ |\frquote{|\textit{texte}|}| qui affiche \frquote{\textit{texte}}
+ avec les espaces insécables adéquats. Il est également possible de coder
+ |\og texte\fg{}| (ancienne syntaxe toujours valide).
+ Si les caractères « et » sont accessibles au clavier%
+ \footnote{grâce à une touche \texttt{Compose} par exemple…},
+ ils peuvent être utilisés pour saisir les guillemets français, voir
+ la fin de la section~\ref{sec:Perso}, p.~\pageref{og-fg}.
+
Notez que les guillemets français ne devraient \emph{jamais} être saisis
avec |<<| et |>>| contrairement à ce qui se fait avec
{e-French} (voir section~\ref{sec:CompatFP}).
- Depuis la version~3.1, une alternative, |\frquote{|\textit{texte}|}|, est
- proposée pour la saisie des guillemets français avec l’espace adéquat,
- le résultat est \frquote{\textit{texte}}.
-
L’usage de |\frquote{}| est recommandé pour les citations longues
(c.-à-d. s’étendant sur plus d’un paragraphe) et pour les citations
imbriquées.\hlabel{frquote}
@@ -584,12 +570,21 @@
(voir dans le code de \file{frenchb.dtx} les commandes |\FBsupS| et
|\FBsupR|).
-\item L’usage français veut que les noms propres soient imprimés en
- petites capitales et ne soient pas coupés en bout de ligne, la commande
- |\bsc| (\textit{boxed small caps}) en facilite la saisie :
- on saisira par exemple |Leslie~\bsc{Lamport}| pour
- obtenir Leslie~\bsc{Lamport} sans risque de coupure \textsc{Lam-port}
- en bout de ligne.
+\item Les commandes |\bname{}|\label{bname} (\textit{boxed name})
+ et |\bsc{}| (\textit{boxed small caps}) facilitent la saisie des noms
+ propres : toutes deux empêchent la coupure de leur argument, sauf au niveau
+ du tiret pour les noms composés ;
+ la seconde imprime son argument en petites capitales, ce qui est d’usage par
+ exemple dans les bibliographies ou les signatures.\\
+ Exemples : |\bname{Montesquieu}|, |Albert~\bsc{Camus}|.\\
+ N.B. Ces commandes ne mettent pas leur argument dans une |\mbox{}|, leur
+ effet n’est pas aussi radical : un |\kern0pt| inhibe toute coupure du mot
+ suivant, ce qui marche bien pour les noms simples ou composés avec un tiret
+ et a l’avantage de préserver l’expansion éventuellement faite par
+ \pkg{microtype}. Les patronymes à particule peuvent poser problème : coder
+ |Jean~\bname{de La Fontaine}| n’aurait strictement aucun effet (les coupures
+ après `de’, après `La’ ou `Fon-taine’ restent possibles), en revanche
+ |Jean~de~La~\bname{Fontaine}| empêcherait toute coupure.
\item les commandes |\primo|, |\secundo|,
|\tertio| et |\quarto| peuvent
@@ -598,8 +593,8 @@
Ensuite, |\FrenchEnumerate{6}| donne \FrenchEnumerate{6}.
\item Les abréviations de «numéro», \No, \Nos, \no{} et \nos, sont obtenues
- en tapant |\No|, |\Nos|, |\no| et |\nos| ;
- l’espace qui suit est insécable : coder |\no1| ou |\no 1|.
+ en tapant |\No|, |\Nos|, |\no| et |\nos| ; elles incluent
+ une espace insécable finale : coder |\no1| ou |\no 1| suffit.
\item Le caractère \degre{} (à ne pas confondre avec le petit «o» de \No)
est saisi |\degre|, mais comme les espaces avant
@@ -659,7 +654,10 @@
|\ieme|, |\iemes|,
|\fg| et |\dots| sont
respectés sans avoir à les forcer par des |{}| ou
-des~\code{\boi\textvisiblespace}.
+des~\code{\boi\textvisiblespace}. Noter cependant que l’auteur de \pkg{xspace}
+ne recommande plus vraiment son utilisation, aussi peut-on préférer
+\emph{ne pas charger} \pkg{xspace} et gérer les espaces soi-même :
+« |les 1\ier, 2 et 3~mai| » ou « |le 1\ier~mai| » (espace insécable).
\section{Personnalisation}
\label{sec:Perso}
@@ -982,13 +980,12 @@
\fbsetup{} sont optionnels.} ;
\hlabel{og-fg} lorsqu’on dispose de guillemets français au
clavier (grâce à une touche \textit{compose} par exemple), cette option permet
- d’utiliser directement ces guillemets à la place des commandes |\og| et |\fg|%
- \footnote{Toutefois, si des guillemets doivent être utilisés dans une
- commande \cs{index}, ils \emph{doivent} être codés en \cs{og} et
- \cs{fg}.}.
- On peut ainsi saisir \code{«guillemets»} ou \code{« guillemets »} (avec ou
- sans espaces à l’intérieur) pour obtenir «guillemets» avec espaces
- insécables adéquates en français. En revanche, si on active cette option,
+ d’utiliser directement ces guillemets à la place des commandes |\frquote{}|
+ ou |\og| et |\fg|.
+ On peut ainsi saisir \code{«guillemets»} (sans espace) ou
+ \code{« guillemets »} (avec espaces à l’intérieur) pour obtenir «guillemets»
+ avec les espaces insécables adéquates en français. En revanche, si on active
+ cette option,
\emph{il ne faut pas coder explicitement les espaces insécables} :
\code{«}|~|\code{guillemets}|~|\code{»}
produirait «~guillemets~» où l’espace qui suit le guillemet ouvrant est
@@ -1551,6 +1548,10 @@
|\textorpdfstring{}{}| (suggestion de l’équipe LaTeX3).
\end{itemize}
+La commande |\bname{}| (voir section~\pageref{bname}) a été ajoutée en
+version~3.5n, la documentation concernant la commande |\bsc{}| a été revue
+comme celle concernant la saisie des guillemets.
+
\subsection{Changements entre les versions 3.4d et 3.3d}
\label{ssec:changes-3.4}
@@ -1899,9 +1900,9 @@
virgule par une espace fine.
\item Dans une commande |\index{}|, les guillemets français doivent
- obligatoirement être codés sous la forme |\og|, |\fg| :
+ obligatoirement être codés sous la forme |\frquote{}| (ou |\og|, |\fg|) :
\hlabel{ch-doc4}
- |\index{\og toto\fg}| donne le résultat attendu, tandis que
+ |\index{\frquote{toto}| donne le résultat attendu, tandis que
|\index{«toto»}| provoque soit une erreur à la compilation (en LaTeX),
soit un mauvais classement de l’entrée |«toto»| dans l’index (en
XeLaTeX et LuaLaTeX).
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 2022-04-20 19:42:55 UTC (rev 63087)
+++ trunk/Master/texmf-dist/source/generic/babel-french/frenchb.dtx 2022-04-20 19:43:13 UTC (rev 63088)
@@ -1,4 +1,4 @@
-%\CheckSum{3732}
+%\CheckSum{3741}
%
%\iffalse
% Tell the LaTeX system who we are and write an entry on the
@@ -13,12 +13,12 @@
%<frenchb>\ProvidesLanguage{frenchb}
%<lua>--[[
%<lua> File `frenchb.lua’ generated from frenchb.dtx
- [2021/07/20 v3.5m French support from the babel system]
+ [2022/04/18 v3.5n French support from the babel system]
%<*internal>
\iffalse
%</internal>
%<*lua>
- Copyright © 2014-2021 Daniel Flipo
+ Copyright © 2014-2022 Daniel Flipo
<daniel (dot) flipo (at) free (dot) fr>
License LPPL: see french.ldf.
--]]
@@ -32,7 +32,7 @@
%<*dtx|french>
%%
%% Babel package for LaTeX version 2e
-%% Copyright © 1996-2021
+%% Copyright © 1996-2022
%% by Daniel Flipo <daniel (dot) flipo (at) free (dot) fr>
%%
%</dtx|french>
@@ -228,44 +228,36 @@
% Some commands are provided by \frenchb{} to make typesetting
% easier:
% \begin{enumerate}
-% \item French quotation marks can be entered using the commands
-% |\og| and |\fg| which work in LaTeX2e and PlainTeX,
-% their appearance depending on what is available to draw
-% them; even if you use LaTeX2e \emph{and} |T1|-encoding,
-% you should refrain from entering them as
-% |<<~French quotation~>>|: |\og| and |\fg| provide
-% better horizontal spacing (controlled by |\FBguillspace|).
-% If French quote characters are available on your keyboard,
-% you can use them, to get proper spacing in LaTeX2e see
-% option \fbo{og=«, fg=»} p.~\pageref{option-og-fg}.
+% \item French quotation marks can be entered using the command
+% |\frquote{}|: |\frquote{some text}| will output
+% «~some text~». Former commands |\og| and |\fg| are kept
+% for backward compatibility: |\og some text\fg{}| is an
+% alternative to |\frquote{some text}|.\hlabel{frquote}
%
-% |\og| and |\fg| can be used outside French, they typeset
-% then English quotes `` and ’’.
+% If French quote characters are available on your keyboard,
+% you can use them, to get proper spacing in LaTeX2e see
+% option \fbo{og=«, fg=»} p.~\pageref{option-og-fg}.
%
-% 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.\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.
+% 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.
-% \begin{itemize}
-% \item with all engines: the inner quotation
-% is surrounded by double quotes (``\textit{texte}’’)
-% unless option \fbo{InnerGuillSingle=true}, then
-% a) the inner quotation is printed as
+% |\frquote| is recommended to enter embedded quotations ``à la
+% française’’, several variants are provided through options.
+% \begin{itemize}
+% \item with all engines: the inner quotation
+% is surrounded by double quotes (``\textit{texte}’’)
+% unless option \fbo{InnerGuillSingle=true}, then
+% a) the inner quotation is printed as
% \guilsinglleft\FRguillspace\textit{texte}\FRguillspace
-% \guilsinglright{} and b) if the inner quotation
+% \guilsinglright{} and b) if the inner quotation
% spreads over more than one paragraph, every paragraph
% included in the inner quotation starts with
% a \guilsinglleft{} or a \guilsinglright{} or nothing,
@@ -280,12 +272,12 @@
% option \fbo{InnerGuillSingle};
% the default is \fbo{EveryLineGuill=none} so that
% |\frquote{}| behaves as with non-LuaTeX engines.
-% \end{itemize}
-% A starred variant |\frquote*| is meant for inner quotations
-% which end together with the outer one: using |\frquote*| for
-% the inner quotation will print only one closing quote
-% character (the outer one) as recommended by the French
-% `Imprimerie Nationale’.
+% \end{itemize}
+% A starred variant |\frquote*| is meant for inner quotations
+% which end together with the outer one: using |\frquote*| for
+% the inner quotation will print only one closing quote
+% character (the outer one) as recommended by the French
+% `Imprimerie Nationale’.
%
% \item |\frenchdate|\marg{year}\marg{month}\marg{day} helps
% typesetting dates in French: |\frenchdate{2001}{01}{01}|
@@ -300,12 +292,12 @@
% All these commands take advantage of real superscript
% letters when they are available in the current font.
%
-% \item Family names should be typeset in small capitals and never
-% be hyphenated, the macro |\bsc| (boxed small caps) does
-% this, e.g., |L.~\bsc{Lamport}| will print the same as
-% |L.~\mbox{\textsc{Lamport}}|. Note that composed names
-% (such as Dupont-Durant) may now be hyphenated on explicit
-% hyphens, this differs from \frenchb~v.~1.x.
+% \item Command |\bname{}| (boxed name) is provided to typeset
+% family names: its argument will not be hyphenated except on
+% explicit hyphens. |\bsc{}| (boxed small caps) is a variant
+% that prints its argument in small capitals, it is meant for
+% bibliographies, signatures, etc.
+% Usage: |Albert~\bsc{Camus}|.
%
% \item Commands |\primo|, |\secundo|, |\tertio| and |\quarto|
% print 1\up{o}, 2\up{o}, 3\up{o}, 4\up{o}.
@@ -591,7 +583,7 @@
%
% \item [og=«, fg=»]; when guillemets characters are available on
% the keyboard (through a compose key for instance), it is nice
-% to use them instead of typing |\og| and |\fg|. This option
+% to use them instead of typing |\frquote{}|. This option
% tells \frenchb{} which characters are opening and closing
% French guillemets (they depend on the input encoding), then
% you can type either \hlabel{option-og-fg}
@@ -831,6 +823,9 @@
% |\textorpdfstring{}{}|.
% \end{itemize}
%
+% Version 3.5n introduces a new command |\bname{}| (an alternative to
+% |\bsc{}|).
+%
% \subsubsection*{What’s new in version 3.4?}
%
% Version 3.4a adds a new command |\frenchdate| (see
@@ -3454,15 +3449,14 @@
% \end{macro}
% \end{macro}
%
+% \begin{macro}{\bname}
% \begin{macro}{\bsc}
-% As family names should be written in small capitals and never be
-% hyphenated, we provide a command (its name comes from Boxed Small
-% Caps) to input them easily. Note that this command has changed
-% with version~2 of \frenchb: a |\kern0pt| is used instead of |\hbox|
-% because |\hbox| would break microtype’s font expansion; as a
-% (positive?) side effect, composed names (such as Dupont-Durand)
-% can now be hyphenated on explicit hyphens.
-% Usage: |Jean~\bsc{Duchemin}|.
+% These commands are meant to easily enter family names (in small
+% capitals for the latter) while avoidind hyphenation.
+% A |\kern0pt| is used instead of |\mbox| because |\mbox| would break
+% microtype’s font expansion; as a positive side effect, composed
+% names (such as Dupont-Durand) can now be hyphenated on explicit
+% hyphens.
%
% \changes{v2.0}{2006/11/06}{\cs{hbox} dropped, replaced by
% \cs{kern0pt}.}
@@ -3470,17 +3464,24 @@
% \changes{v3.5k}{2020/07/18}{\cs{bsc} now relies on
% \cs{texorpdfstring} to be safe in bookmarks.}
%
+% \changes{v3.5n}{2022/04/01}{Added command \cs{bname} (no small caps).}
+%
% \begin{macrocode}
\ifLaTeXe
+ \DeclareRobustCommand*{\bname}[1]{%
+ \texorpdfstring{\leavevmode\begingroup\kern0pt #1\endgroup}{#1}%
+ }
\DeclareRobustCommand*{\bsc}[1]{%
\texorpdfstring{\leavevmode\begingroup\kern0pt \scshape #1\endgroup}%
{\textsc{#1}}%
}
\else
- \newcommand*{\bsc}[1]{\leavevmode\begingroup\kern0pt #1\endgroup}
+ \newcommand*{\bname}[1]{\leavevmode\begingroup\kern0pt #1\endgroup}
+ \let\bsc\bname
\fi
% \end{macrocode}
% \end{macro}
+% \end{macro}
%
% Some definitions for special characters. We won’t define |\tilde|
% as a Text Symbol not to conflict with the macro |\tilde| for math
@@ -4429,6 +4430,9 @@
% section~\ref{ssec-loading-order}; a light customisation is
% compatible with the \pkg{beamerarticle} package.
%
+% \changes{v3.5n}{2022/04/18}{\cs{FBGlobalLayoutFrench} no longer set to
+% false when French is not the main language.}
+%
% \begin{macrocode}
\def\FB at french{french}
\def\FB at acadian{acadian}
@@ -4461,8 +4465,6 @@
\FBFrenchFootnotestrue
\FBAutoSpaceFootnotestrue
\FBCustomiseFigTabCaptionstrue
- \else
- \FBGlobalLayoutFrenchfalse
\fi
% \end{macrocode}
% \frenchb{} being an option of \babel, it cannot load a package
@@ -4482,7 +4484,7 @@
\csname FBStandardLayout#1\endcsname
\else
\PackageWarning{french.ldf}%
- {Option `StandardlLayout' skipped:\MessageBreak
+ {Option `StandardLayout' skipped:\MessageBreak
French is *not* babel's last option.\MessageBreak
Reported}%
\fi
@@ -4494,7 +4496,6 @@
\FBIndentFirstfalse
\FBFrenchFootnotesfalse
\FBAutoSpaceFootnotesfalse
- \FBGlobalLayoutFrenchfalse
\else
\FBStandardListSpacingfalse
\FBStandardItemizeEnvfalse
@@ -4517,7 +4518,7 @@
% 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.
+% |\babel at save| will do the job at every language’s switch.
% \begin{macrocode}
\define at key{FB}{ReduceListSpacing}[true]%
{\csname FBReduceListSpacing#1\endcsname
@@ -4934,6 +4935,14 @@
\def\FB at ufl{\update at frenchlists}
\ifFB at mainlanguage@FR
\update at frenchlists
+ \else
+ \ifFBStandardItemizeEnv
+ \else
+ \PackageWarning{french.ldf}%
+ {babel-french will not customize lists' layout\MessageBreak
+ when French is not the main language,\MessageBreak
+ reported}%
+ \fi
\fi
% \end{macrocode}
% The layout of footnotes is handled at the |\begin{document}|
@@ -5582,7 +5591,6 @@
% \label{ssec-indent}
%
% \begin{macro}{\bbl at frenchindent}
-% \begin{macro}{\bbl at nonfrenchindent}
% In French the first paragraph of each section should be indented,
% this is another difference with US-English. This is controlled
% by the flag |\if at afterindent|.
@@ -5592,30 +5600,23 @@
% French which is correct for English but wrong for some languages
% like Spanish. Pointed out by Juan José Torrens.}
%
+% \changes{v3.5n}{2022/04/18}{\cs{bbl at frenchindent} changed.
+% \cs{bbl at nonfrenchindent} removed.}
+%
% We will need to save the value of the flag |\if at afterindent|
% `AtBeginDocument’ before eventually changing its value.
%
% \begin{macrocode}
\def\bbl at frenchindent{%
- \ifFBGlobalLayoutFrench
- \else
- \babel at save\@afterindentfalse
- \fi
+ \ifFBGlobalLayoutFrench\else\babel at save\@afterindentfalse\fi
\ifFBIndentFirst
+ \ifFB at mainlanguage@FR\else\babel at save\@afterindentfalse\fi
\let\@afterindentfalse\@afterindenttrue
\@afterindenttrue
\fi}
-\def\bbl at nonfrenchindent{%
- \ifFBGlobalLayoutFrench
- \ifFBIndentFirst
- \@afterindenttrue
- \fi
- \fi}
\addto\extrasfrench{\bbl at frenchindent}
-\addto\noextrasfrench{\bbl at nonfrenchindent}
% \end{macrocode}
% \end{macro}
-% \end{macro}
%
% \subsection{Formatting footnotes}
% \label{ssec-footnotes}
Modified: trunk/Master/texmf-dist/source/generic/babel-french/frenchb.ins
===================================================================
--- trunk/Master/texmf-dist/source/generic/babel-french/frenchb.ins 2022-04-20 19:42:55 UTC (rev 63087)
+++ trunk/Master/texmf-dist/source/generic/babel-french/frenchb.ins 2022-04-20 19:43:13 UTC (rev 63088)
@@ -2,7 +2,7 @@
%% This file will generate fast loadable files and documentation driver
%% files from the doc files in this package when run through LuaTeX.
%%
-%% Copyright 2001-2021 Daniel Flipo. All rights reserved.
+%% Copyright 2001-2022 Daniel Flipo. All rights reserved.
%%
%% This is a generated file part of the the babel-french bundle
%% to be used with the Babel system.
@@ -14,7 +14,7 @@
%%
%% --------------- start of docstrip commands ------------------
%%
-\def\filedate{2021/01/30}
+\def\filedate{2022/04/18}
\def\batchfile{frenchb.ins}
\input docstrip.tex
Modified: trunk/Master/texmf-dist/tex/generic/babel-french/acadian.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/generic/babel-french/acadian.ldf 2022-04-20 19:42:55 UTC (rev 63087)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/acadian.ldf 2022-04-20 19:43:13 UTC (rev 63088)
@@ -24,7 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{acadian}
- [2021/07/20 v3.5m French support from the babel system]
+ [2022/04/18 v3.5n 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 2022-04-20 19:42:55 UTC (rev 63087)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/canadien.ldf 2022-04-20 19:43:13 UTC (rev 63088)
@@ -24,7 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{canadien}
- [2021/07/20 v3.5m French support from the babel system]
+ [2022/04/18 v3.5n 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 2022-04-20 19:42:55 UTC (rev 63087)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/francais.ldf 2022-04-20 19:43:13 UTC (rev 63088)
@@ -24,7 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{francais}
- [2021/07/20 v3.5m French support from the babel system]
+ [2022/04/18 v3.5n 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 2022-04-20 19:42:55 UTC (rev 63087)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/french.ldf 2022-04-20 19:43:13 UTC (rev 63088)
@@ -24,10 +24,10 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{french}
- [2021/07/20 v3.5m French support from the babel system]
+ [2022/04/18 v3.5n French support from the babel system]
%%
%% Babel package for LaTeX version 2e
-%% Copyright © 1996-2021
+%% Copyright © 1996-2022
%% by Daniel Flipo <daniel (dot) flipo (at) free (dot) fr>
%%
\LdfInit\CurrentOption{FBclean at on@exit}
@@ -772,12 +772,16 @@
\DeclareRobustCommand*{\nos}{%
\texorpdfstring{n\up{os}\FBmedkern}{n\textdegree\space}}
\ifLaTeXe
+ \DeclareRobustCommand*{\bname}[1]{%
+ \texorpdfstring{\leavevmode\begingroup\kern0pt #1\endgroup}{#1}%
+ }
\DeclareRobustCommand*{\bsc}[1]{%
\texorpdfstring{\leavevmode\begingroup\kern0pt \scshape #1\endgroup}%
{\textsc{#1}}%
}
\else
- \newcommand*{\bsc}[1]{\leavevmode\begingroup\kern0pt #1\endgroup}
+ \newcommand*{\bname}[1]{\leavevmode\begingroup\kern0pt #1\endgroup}
+ \let\bsc\bname
\fi
\ifFBunicode
\providecommand*{\textbackslash}{{\char"005C}}
@@ -1176,8 +1180,6 @@
\FBFrenchFootnotestrue
\FBAutoSpaceFootnotestrue
\FBCustomiseFigTabCaptionstrue
- \else
- \FBGlobalLayoutFrenchfalse
\fi
\RequirePackage{keyval}%
\define at key{FB}{ShowOptions}[true]%
@@ -1187,7 +1189,7 @@
\csname FBStandardLayout#1\endcsname
\else
\PackageWarning{french.ldf}%
- {Option `StandardlLayout' skipped:\MessageBreak
+ {Option `StandardLayout' skipped:\MessageBreak
French is *not* babel's last option.\MessageBreak
Reported}%
\fi
@@ -1199,7 +1201,6 @@
\FBIndentFirstfalse
\FBFrenchFootnotesfalse
\FBAutoSpaceFootnotesfalse
- \FBGlobalLayoutFrenchfalse
\else
\FBStandardListSpacingfalse
\FBStandardItemizeEnvfalse
@@ -1505,6 +1506,14 @@
\def\FB at ufl{\update at frenchlists}
\ifFB at mainlanguage@FR
\update at frenchlists
+ \else
+ \ifFBStandardItemizeEnv
+ \else
+ \PackageWarning{french.ldf}%
+ {babel-french will not customize lists' layout\MessageBreak
+ when French is not the main language,\MessageBreak
+ reported}%
+ \fi
\fi
\ifFBAutoSpacePunctuation
\autospace at beforeFDP
@@ -1814,22 +1823,13 @@
}
\addto\extrasfrench{\bbl at frenchlistlayout}
\def\bbl at frenchindent{%
- \ifFBGlobalLayoutFrench
- \else
- \babel at save\@afterindentfalse
- \fi
+ \ifFBGlobalLayoutFrench\else\babel at save\@afterindentfalse\fi
\ifFBIndentFirst
+ \ifFB at mainlanguage@FR\else\babel at save\@afterindentfalse\fi
\let\@afterindentfalse\@afterindenttrue
\@afterindenttrue
\fi}
-\def\bbl at nonfrenchindent{%
- \ifFBGlobalLayoutFrench
- \ifFBIndentFirst
- \@afterindenttrue
- \fi
- \fi}
\addto\extrasfrench{\bbl at frenchindent}
-\addto\noextrasfrench{\bbl at nonfrenchindent}
\AtBeginDocument{\@ifpackageloaded{bigfoot}%
{\PackageInfo{french.ldf}%
{bigfoot package in use.\MessageBreak
Modified: trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf 2022-04-20 19:42:55 UTC (rev 63087)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf 2022-04-20 19:43:13 UTC (rev 63088)
@@ -24,7 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{frenchb}
- [2021/07/20 v3.5m French support from the babel system]
+ [2022/04/18 v3.5n French support from the babel system]
\def\bbl at tempa{frenchb}
\ifx\CurrentOption\bbl at tempa
\chardef\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 2022-04-20 19:42:55 UTC (rev 63087)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.lua 2022-04-20 19:43:13 UTC (rev 63088)
@@ -1,7 +1,7 @@
--[[
File `frenchb.lua’ generated from frenchb.dtx
- [2021/07/20 v3.5m French support from the babel system]
- Copyright © 2014-2021 Daniel Flipo
+ [2022/04/18 v3.5n French support from the babel system]
+ Copyright © 2014-2022 Daniel Flipo
<daniel (dot) flipo (at) free (dot) fr>
License LPPL: see french.ldf.
--]]
More information about the tex-live-commits
mailing list.