From 32a9f0db636aa5f7e7d1ed68c80097683683aee9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 9 Mar 2023 21:09:32 +0000 Subject: babel-french (9mar23) git-svn-id: svn://tug.org/texlive/trunk@66492 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/generic/babel-french/frenchb.dtx | 60 ++++++++++++++++------ 1 file changed, 44 insertions(+), 16 deletions(-) (limited to 'Master/texmf-dist/source/generic/babel-french/frenchb.dtx') 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 -- cgit v1.2.3