From b79ae331c579d322f377dfd688cd53f8006b83b2 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 9 Mar 2023 21:14:27 +0000 Subject: babel-french (9mar23) (branch) git-svn-id: svn://tug.org/texlive/branches/branch2022.final@66501 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/generic/babel-french/frenchb-doc.pdf | Bin 186723 -> 187963 bytes .../doc/generic/babel-french/frenchb-doc.tex | 16 ++++-- .../doc/generic/babel-french/frenchb.pdf | Bin 364942 -> 367390 bytes .../source/generic/babel-french/frenchb.dtx | 60 +++++++++++++++------ .../tex/generic/babel-french/acadian.ldf | 2 +- .../tex/generic/babel-french/canadien.ldf | 2 +- .../tex/generic/babel-french/francais.ldf | 2 +- .../texmf-dist/tex/generic/babel-french/french.ldf | 32 +++++++---- .../tex/generic/babel-french/frenchb.ldf | 2 +- .../tex/generic/babel-french/frenchb.lua | 2 +- 10 files changed, 82 insertions(+), 36 deletions(-) diff --git a/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.pdf b/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.pdf index a877bbe57c6..dae1c3f7423 100644 Binary files a/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.pdf and b/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.pdf differ diff --git a/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex b/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex index f944831c598..584b8b980f5 100644 --- a/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex +++ b/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex @@ -121,7 +121,7 @@ \title{Mode d’emploi du module \ext{babel-french}} \author{\href{mailto:daniel.flipo@free.fr}{Daniel \textsc{Flipo}}} -\newcommand*{\latestversion}{3.5p} +\newcommand*{\latestversion}{3.5q} \date{Version {\latestversion} -- \today} \begin{document} @@ -158,8 +158,6 @@ \vspace{-\baselineskip}\noindent \descindentFB=0pt \begin{description} - \item[15 janvier 2017] La version~3.2f est compatible avec l’extension - \ext{icomma}. \item[30 janvier 2017] Le comportement par défaut de la commande |\frquote{}| sous LuaTeX est modifié, voir p.~\pageref{frquote}. \item[30 avril 2017] Utiliser |\frenchsetup{}| de préférence à @@ -182,8 +180,10 @@ \item[11 nov. 2022] Avec Lua(La)TeX le codage |«~abc~»| ne produit plus d’espace parasite. La redéfinition de |\shorthandoff{}|, |\shorthandon{}| sous LuaTeX/XeTeX est supprimée. - \item[3 janvier 2022] Modification de la commande |\DecimalMathComma|, + \item[3 janvier 2023] Modification de la commande |\DecimalMathComma|, voir p.~\pageref{decimalmathcomma}. + \item[8 mars 2023] Correction de bug dans les listes, + voir p.~\pageref{par-in-lists}. \end{description} \end{abstract} \egroup @@ -1579,6 +1579,14 @@ remarque de Fabrice Eudes : elle peut désormais être utilisée dans le préamb Voir section~\ref{decimalmathcomma} p.~\pageref{decimalmathcomma} pour plus de détails. +\vspace{\parskip} +La version 3.5q corrige un bug concernant les listes signalé par Denis Bitouzé : +les alinéas inclus dans une liste n’étaient pas distinguables. Dorénavant +|\listparindent| est défini comme |\parindent| et si|\parskip > 0|, |\parsep| +est défini comme |\parskip|. Il est possible de revenir à l’ancienne +présentation en ajoutant \emph{dans l’environnement de liste} les commandes +|\parskip=0pt| et |\parindent=0pt|.\hlabel{par-in-lists} + \subsection{Changements entre les versions 3.4d et 3.3d} \label{ssec:changes-3.4} diff --git a/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf b/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf index 11268e191fb..395080ae3f7 100644 Binary files a/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf and b/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf differ diff --git a/Master/texmf-dist/source/generic/babel-french/frenchb.dtx b/Master/texmf-dist/source/generic/babel-french/frenchb.dtx index 441b411aee2..fa68afd0718 100644 --- a/Master/texmf-dist/source/generic/babel-french/frenchb.dtx +++ b/Master/texmf-dist/source/generic/babel-french/frenchb.dtx @@ -11,7 +11,7 @@ %\ProvidesLanguage{frenchb} %--[[ % File `frenchb.lua’ generated from frenchb.dtx - [2023/01/02 v3.5p French support from the babel system] + [2023/03/08 v3.5q French support from the babel system] %<*internal> \iffalse % @@ -40,8 +40,7 @@ %% % %<*filedriver> -\RequirePackage{pdfmanagement-testphase} -\DeclareDocumentMetadata{pdfstandard=A-2b, lang=en-US} +\DocumentMetadata{pdfstandard=A-2b, lang=en-US} \documentclass[a4paper]{ltxdoc} \usepackage[left=38mm,right=38mm,top=30mm,bottom=50mm]{geometry} \usepackage[dvipsnames]{xcolor} @@ -828,6 +827,13 @@ % Version 3.5n introduces a new command |\bname{}| (an alternative to % |\bsc{}|). % +% Version 3.5q corrects a bug in lists layout: |\listparindent| +% (formely 0pt) is defined as |\parindent| and if |\parskip > 0pt|, +% |\parsep| is now defined as |\parskip|. This ensures that +% paragraphs included in lists are now visible. The former behaviour +% can be recovered by adding |\parskip=0pt|, |\parindent=0pt| +% \emph{inside} the list environment. +% % \subsubsection*{What’s new in version 3.4?} % % Version 3.4a adds a new command |\frenchdate| (see @@ -5250,6 +5256,8 @@ return french_punctuation % An option for backward compatibility is provided.} % % \begin{macro}{\listFB} +% \changes{v3.5q}{2023/02/15}{Bug correction: \cs{parsep} should be +% related to \cs{parskip} and \cs{listparindent} to \cs{parindent}.} % \begin{macro}{\listORI} % \begin{macro}{\FB@listVsettings} % Vertical spacing in lists should be shorter in French texts than @@ -5274,20 +5282,31 @@ return french_punctuation % \begin{macrocode} \let\listORI\list \let\endlistORI\endlist +\newdimen\FB@parskip \def\FB@listVsettings{% - \setlength{\itemsep}{0.4ex plus 0.2ex minus 0.2ex}% - \setlength{\parsep}{0.4ex plus 0.2ex minus 0.2ex}% \setlength{\topsep}{0.8ex plus 0.4ex minus 0.4ex}% \setlength{\partopsep}{0.4ex plus 0.2ex minus 0.2ex}% % \end{macrocode} % |\parskip| is of type `skip’, its mean value only (\emph{not % the glue}) should be subtracted from |\topsep| and added to % |\partopsep|, so convert |\parskip| to a `dimen’ using -% |\@tempdima|. +% |\FB@parskip|. +% \begin{macrocode} + \FB@parskip=\parskip + \addtolength{\topsep}{-\FB@parskip}% + \addtolength{\partopsep}{\FB@parskip}% + \setlength{\itemsep}{0.4ex plus 0.2ex minus 0.2ex}% + \setlength{\parsep}{0.4ex plus 0.2ex minus 0.2ex}% +% \end{macrocode} +% (v3.5q) If |\parskip| is not null, |\parsep| is set to |\parskip|, +% so paragraphs inside items will be preceeded by the same vertical +% space as paragraphs located outside lists; the vertical skip before +% items (|\itemsep| + |\parsep|) doesn’t need to be enlarged. % \begin{macrocode} - \@tempdima=\parskip - \addtolength{\topsep}{-\@tempdima}% - \addtolength{\partopsep}{\@tempdima}% + \ifdim\FB@parskip>0pt + \setlength{\parsep}{\FB@parskip}% + \addtolength{\itemsep}{-\FB@parskip}% + \fi } \def\listFB#1#2{\listORI{#1}{\FB@listVsettings #2}} \let\endlistFB\endlistORI @@ -5387,7 +5406,7 @@ return french_punctuation \labelindentFB}% \else % \end{macrocode} -% Default layout: labels hanging into the left margin. +% Default layout: labels hanging into the list left margin. % \begin{macrocode} \leftmarginFB=\labelwidthFB \advance\leftmarginFB by \labelsep @@ -5395,6 +5414,11 @@ return french_punctuation {\csname leftmargin\romannumeral\FB@dp\endcsname = \leftmarginFB}% \advance\leftmargini by \listindentFB +% \end{macrocode} +% (v3.5q) Same `parindent’ for paragraphs in lists’ items (was null +% as in standard lists). +% \begin{macrocode} + \listparindent=\parindent \fi \leftmargin=\csname leftmargin% \ifnum\@listdepth=\@ne i\else ii\fi\endcsname @@ -5419,18 +5443,22 @@ return french_punctuation % unless option \fbo{StandardListSpacing} is set, then set horizontal % indentations according to |\FB@listHsettings| unless option % \fbo{ListOldLayout} is \fbo{true} (compatibility with lists -% up to v.~2.5k). +% up to v2.5k). % \begin{macrocode} \def\FB@itemizesettings{% \ifFBStandardListSpacing \else - \setlength{\itemsep}{\z@}% - \setlength{\parsep}{\z@}% \setlength{\topsep}{\z@}% \setlength{\partopsep}{\z@}% - \@tempdima=\parskip - \addtolength{\topsep}{-\@tempdima}% - \addtolength{\partopsep}{\@tempdima}% + \FB@parskip=\parskip + \addtolength{\topsep}{-\FB@parskip}% + \addtolength{\partopsep}{\FB@parskip}% + \setlength{\itemsep}{\z@}% + \setlength{\parsep}{\z@}% + \ifdim\FB@parskip>0pt + \setlength{\parsep}{\FB@parskip}% + \addtolength{\itemsep}{-\FB@parskip}% + \fi \fi \settowidth{\labelwidth}{\csname\@itemitem\endcsname}% \ifFBListOldLayout diff --git a/Master/texmf-dist/tex/generic/babel-french/acadian.ldf b/Master/texmf-dist/tex/generic/babel-french/acadian.ldf index 6c82696c4d5..dcd8434972b 100644 --- a/Master/texmf-dist/tex/generic/babel-french/acadian.ldf +++ b/Master/texmf-dist/tex/generic/babel-french/acadian.ldf @@ -24,7 +24,7 @@ %% Please report errors to: %% \ProvidesLanguage{acadian} - [2023/01/02 v3.5p French support from the babel system] + [2023/03/08 v3.5q French support from the babel system] \PackageInfo{acadian.ldf}% {`acadian' dialect is currently\MessageBreak *absolutely identical* to the\MessageBreak diff --git a/Master/texmf-dist/tex/generic/babel-french/canadien.ldf b/Master/texmf-dist/tex/generic/babel-french/canadien.ldf index 245e5da9df2..07025798d30 100644 --- a/Master/texmf-dist/tex/generic/babel-french/canadien.ldf +++ b/Master/texmf-dist/tex/generic/babel-french/canadien.ldf @@ -24,7 +24,7 @@ %% Please report errors to: %% \ProvidesLanguage{canadien} - [2023/01/02 v3.5p French support from the babel system] + [2023/03/08 v3.5q 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 diff --git a/Master/texmf-dist/tex/generic/babel-french/francais.ldf b/Master/texmf-dist/tex/generic/babel-french/francais.ldf index 23fb5b672c6..156fa5c265d 100644 --- a/Master/texmf-dist/tex/generic/babel-french/francais.ldf +++ b/Master/texmf-dist/tex/generic/babel-french/francais.ldf @@ -24,7 +24,7 @@ %% Please report errors to: %% \ProvidesLanguage{francais} - [2023/01/02 v3.5p French support from the babel system] + [2023/03/08 v3.5q 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 diff --git a/Master/texmf-dist/tex/generic/babel-french/french.ldf b/Master/texmf-dist/tex/generic/babel-french/french.ldf index 347d8f58e63..9894431b71c 100644 --- a/Master/texmf-dist/tex/generic/babel-french/french.ldf +++ b/Master/texmf-dist/tex/generic/babel-french/french.ldf @@ -24,7 +24,7 @@ %% Please report errors to: %% \ProvidesLanguage{french} - [2023/01/02 v3.5p French support from the babel system] + [2023/03/08 v3.5q French support from the babel system] %% %% Babel package for LaTeX version 2e %% Copyright © 1996-2022 @@ -1646,14 +1646,19 @@ } \let\listORI\list \let\endlistORI\endlist +\newdimen\FB@parskip \def\FB@listVsettings{% - \setlength{\itemsep}{0.4ex plus 0.2ex minus 0.2ex}% - \setlength{\parsep}{0.4ex plus 0.2ex minus 0.2ex}% \setlength{\topsep}{0.8ex plus 0.4ex minus 0.4ex}% \setlength{\partopsep}{0.4ex plus 0.2ex minus 0.2ex}% - \@tempdima=\parskip - \addtolength{\topsep}{-\@tempdima}% - \addtolength{\partopsep}{\@tempdima}% + \FB@parskip=\parskip + \addtolength{\topsep}{-\FB@parskip}% + \addtolength{\partopsep}{\FB@parskip}% + \setlength{\itemsep}{0.4ex plus 0.2ex minus 0.2ex}% + \setlength{\parsep}{0.4ex plus 0.2ex minus 0.2ex}% + \ifdim\FB@parskip>0pt + \setlength{\parsep}{\FB@parskip}% + \addtolength{\itemsep}{-\FB@parskip}% + \fi } \def\listFB#1#2{\listORI{#1}{\FB@listVsettings #2}} \let\endlistFB\endlistORI @@ -1687,6 +1692,7 @@ {\csname leftmargin\romannumeral\FB@dp\endcsname = \leftmarginFB}% \advance\leftmargini by \listindentFB + \listparindent=\parindent \fi \leftmargin=\csname leftmargin% \ifnum\@listdepth=\@ne i\else ii\fi\endcsname @@ -1694,13 +1700,17 @@ \def\FB@itemizesettings{% \ifFBStandardListSpacing \else - \setlength{\itemsep}{\z@}% - \setlength{\parsep}{\z@}% \setlength{\topsep}{\z@}% \setlength{\partopsep}{\z@}% - \@tempdima=\parskip - \addtolength{\topsep}{-\@tempdima}% - \addtolength{\partopsep}{\@tempdima}% + \FB@parskip=\parskip + \addtolength{\topsep}{-\FB@parskip}% + \addtolength{\partopsep}{\FB@parskip}% + \setlength{\itemsep}{\z@}% + \setlength{\parsep}{\z@}% + \ifdim\FB@parskip>0pt + \setlength{\parsep}{\FB@parskip}% + \addtolength{\itemsep}{-\FB@parskip}% + \fi \fi \settowidth{\labelwidth}{\csname\@itemitem\endcsname}% \ifFBListOldLayout diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf index ff0f3e1bc57..cb526449358 100644 --- a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf +++ b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf @@ -24,7 +24,7 @@ %% Please report errors to: %% \ProvidesLanguage{frenchb} - [2023/01/02 v3.5p French support from the babel system] + [2023/03/08 v3.5q French support from the babel system] \def\bbl@tempa{frenchb} \ifx\CurrentOption\bbl@tempa \chardef\l@frenchb\l@french diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.lua b/Master/texmf-dist/tex/generic/babel-french/frenchb.lua index 0b3c152a366..f9e77202eb7 100644 --- a/Master/texmf-dist/tex/generic/babel-french/frenchb.lua +++ b/Master/texmf-dist/tex/generic/babel-french/frenchb.lua @@ -1,6 +1,6 @@ --[[ File `frenchb.lua’ generated from frenchb.dtx - [2023/01/02 v3.5p French support from the babel system] + [2023/03/08 v3.5q French support from the babel system] Copyright © 2014-2022 Daniel Flipo License LPPL: see french.ldf. -- cgit v1.2.3