diff options
author | Karl Berry <karl@freefriends.org> | 2023-03-09 21:09:32 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-03-09 21:09:32 +0000 |
commit | 32a9f0db636aa5f7e7d1ed68c80097683683aee9 (patch) | |
tree | 9946db04475a072498ad932ec4697ddd28671582 /Master/texmf-dist/tex | |
parent | 31937c168a60aab51d63b5a108bc60e1184671da (diff) |
babel-french (9mar23)
git-svn-id: svn://tug.org/texlive/trunk@66492 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
6 files changed, 26 insertions, 16 deletions
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: <daniel (dot) flipo (at) free (dot) fr> %% \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: <daniel (dot) flipo (at) free (dot) fr> %% \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: <daniel (dot) flipo (at) free (dot) fr> %% \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: <daniel (dot) flipo (at) free (dot) fr> %% \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: <daniel (dot) flipo (at) free (dot) fr> %% \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 <daniel (dot) flipo (at) free (dot) fr> License LPPL: see french.ldf. |