texlive[70261] branches/branch2023.final/Master/texmf-dist:
commits+karl at tug.org
commits+karl at tug.org
Thu Feb 29 22:23:06 CET 2024
Revision: 70261
https://tug.org/svn/texlive?view=revision&revision=70261
Author: karl
Date: 2024-02-29 22:23:06 +0100 (Thu, 29 Feb 2024)
Log Message:
-----------
babel-french (branch) (29feb24)
Modified Paths:
--------------
branches/branch2023.final/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.pdf
branches/branch2023.final/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex
branches/branch2023.final/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf
branches/branch2023.final/Master/texmf-dist/source/generic/babel-french/frenchb.dtx
branches/branch2023.final/Master/texmf-dist/tex/generic/babel-french/acadian.ldf
branches/branch2023.final/Master/texmf-dist/tex/generic/babel-french/canadien.ldf
branches/branch2023.final/Master/texmf-dist/tex/generic/babel-french/francais.ldf
branches/branch2023.final/Master/texmf-dist/tex/generic/babel-french/french.ldf
branches/branch2023.final/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
branches/branch2023.final/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
Modified: branches/branch2023.final/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.pdf
===================================================================
(Binary files differ)
Modified: branches/branch2023.final/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex
===================================================================
--- branches/branch2023.final/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex 2024-02-29 21:22:55 UTC (rev 70260)
+++ branches/branch2023.final/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex 2024-02-29 21:23:06 UTC (rev 70261)
@@ -120,7 +120,7 @@
\title{Mode d’emploi du module \ext{babel-french}}
\author{\href{mailto:daniel.flipo at free.fr}{Daniel \textsc{Flipo}}}
-\newcommand*{\latestversion}{3.5r}
+\newcommand*{\latestversion}{3.5s}
\date{Version {\latestversion} -- \today}
\begin{document}
@@ -267,7 +267,7 @@
commandes\\
|\usepackage[T1]{fontenc}|\\
|\usepackage{lmodern}|\\
- rapellons que la déclaration du codage d’entrée n’est nécessaire que si
+ rappelons que la déclaration du codage d’entrée n’est nécessaire que si
celui-ci n’est pas le codage par défaut (|utf8| depuis 2018), par exemple
|latin9| ou |latin1| ou |applemac|, etc.\\
|\usepackage[latin9]{inputenc}|
@@ -1603,6 +1603,11 @@
D’autre part le fichier \file{frenchb.ins} n’est plus nécessaire pour extraire
les fichiers \file{*.ldf} de \file{frenchb.dtx} (voir~\file{README.md}).
+\vspace{\parskip}
+La version 3.5s désactive l’option \opt{FrenchFootnotes} lorsque l’extension
+\pkg{footnotebackref} est chargée, les deux étant incompatibles ; un message
+d’avertissement est affiché dans le fichier \file{.log}.
+
\subsection{Changements entre les versions 3.4d et 3.3d}
\label{ssec:changes-3.4}
Modified: branches/branch2023.final/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf
===================================================================
(Binary files differ)
Modified: branches/branch2023.final/Master/texmf-dist/source/generic/babel-french/frenchb.dtx
===================================================================
--- branches/branch2023.final/Master/texmf-dist/source/generic/babel-french/frenchb.dtx 2024-02-29 21:22:55 UTC (rev 70260)
+++ branches/branch2023.final/Master/texmf-dist/source/generic/babel-french/frenchb.dtx 2024-02-29 21:23:06 UTC (rev 70261)
@@ -1,7 +1,5 @@
% \iffalse meta-comment
%
-% Copyright © 1996-2023 Daniel Flipo.
-%
% This program can be distributed and/or modified under the terms
% of the LaTeX Project Public License either version 1.3c of this
% license or (at your option) any later version.
@@ -77,8 +75,8 @@
%<frenchb>\ProvidesLanguage{frenchb}
%<lua>--[[
%<lua> File `frenchb.lua’ generated from frenchb.dtx
- [2023-12-19 v3.5r French support from the babel system]
-%<lua> Copyright © 2014-2023 Daniel Flipo
+ [2024-02-29 v3.5s French support from the babel system]
+%<lua> Copyright © 2014-2024 Daniel Flipo
%<lua> <daniel (dot) flipo (at) free (dot) fr>
%<lua> License LPPL: see french.ldf.
%<lua>--]]
@@ -86,7 +84,7 @@
%<*dtx|french>
%%
%% Babel package for LaTeX version 2e
-%% Copyright © 1996-2023
+%% Copyright © 1996-2024
%% by Daniel Flipo <daniel (dot) flipo (at) free (dot) fr>
%%
%</dtx|french>
@@ -1815,6 +1813,7 @@
local node_id = node.id
local HLIST = node_id("hlist")
local TEMP = node_id("temp")
+local DISC = node_id("disc")
local KERN = node_id("kern")
local GLUE = node_id("glue")
local GLYPH = node_id("glyph")
@@ -2025,6 +2024,9 @@
% if next node is a glyph or not. If it is, turn the `auto’ flag
% to false (avoids spurious spaces in URLs, MSDOS paths or 10:35).}
%
+% \changes{v3.5s}{2024/02/28}{A `:’ followed by `-’ or a ligature
+% should not trigger spacing.}
+%
% For characters for which |FB_punct_thin| or |FB_punct_thick| is
% \emph{true}, the amount of spacing to be typeset before them
% is controlled by commands |\FBthinspace| and |\FBcolonspace|
@@ -2056,7 +2058,8 @@
if next then
next_id = next.id
end
- if next_id and next_id == GLYPH then
+ if next_id and
+ (next_id == GLYPH or next_id == DISC) then
auto = false
end
end
@@ -5070,7 +5073,7 @@
\ifFBStandardItemizeEnv
\else
\PackageWarning{french.ldf}%
- {babel-french will not customize lists' layout\MessageBreak
+ {babel-french will not customise lists' layout\MessageBreak
when French is not the main language,\MessageBreak
reported}%
\fi
@@ -5784,9 +5787,16 @@
% \changes{v2.0b}{2007/04/18}{Footnotes: Just do nothing
% (except warning) when the bigfoot package is loaded.}
%
+% \changes{v3.5s}{2024/01/05}{Footnotes: no customising of
+% \cs{@footnotetext} when the footnotebackref package is loaded.
+% Just warn the user.}
+%
% The \pkg{bigfoot} package deeply changes the way footnotes are
% handled. When \file{bigfoot} is loaded, we just warn the user
-% that \frenchb{} will drop the customisation of footnotes.
+% that \frenchb{} will not customise footnotes at all.
+% When the \pkg{footnotebackref} package is loaded, \frenchb{}
+% will not customise |\@footnotetext| in order to keep back
+% referencing working.
%
% The layout of footnotes is controlled by two flags
% |\ifFBAutoSpaceFootnotes| and |\ifFBFrenchFootnotes| which are
@@ -5808,8 +5818,9 @@
% \cs{PackageInfo} (when bigfoot package in use).}
%
% \begin{macrocode}
-\AtBeginDocument{\@ifpackageloaded{bigfoot}%
- {\PackageInfo{french.ldf}%
+\AtBeginDocument{%
+ \@ifpackageloaded{bigfoot}%
+ {\PackageWarning{french.ldf}%
{bigfoot package in use.\MessageBreak
babel-french will NOT customise footnotes;%
\MessageBreak reported}}%
@@ -5819,7 +5830,14 @@
\ifFBAutoSpaceFootnotes
\let\@footnotemark\@footnotemarkFB
\fi}%
- }
+ \@ifpackageloaded{footnotebackref}%
+ {\FBFrenchFootnotesfalse
+ \PackageWarning{french.ldf}%
+ {footnotebackref package loaded.\MessageBreak
+ babel-french will NOT customise footnotes;%
+ \MessageBreak reported}}%
+ {}%
+ }
% \end{macrocode}
%
% \begin{macro}{\@makefntextFB}
Modified: branches/branch2023.final/Master/texmf-dist/tex/generic/babel-french/acadian.ldf
===================================================================
--- branches/branch2023.final/Master/texmf-dist/tex/generic/babel-french/acadian.ldf 2024-02-29 21:22:55 UTC (rev 70260)
+++ branches/branch2023.final/Master/texmf-dist/tex/generic/babel-french/acadian.ldf 2024-02-29 21:23:06 UTC (rev 70261)
@@ -24,7 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{acadian}
- [2023-12-19 v3.5r French support from the babel system]
+ [2024-02-29 v3.5s French support from the babel system]
\PackageInfo{acadian.ldf}%
{`acadian' dialect is currently\MessageBreak
*absolutely identical* to the\MessageBreak
Modified: branches/branch2023.final/Master/texmf-dist/tex/generic/babel-french/canadien.ldf
===================================================================
--- branches/branch2023.final/Master/texmf-dist/tex/generic/babel-french/canadien.ldf 2024-02-29 21:22:55 UTC (rev 70260)
+++ branches/branch2023.final/Master/texmf-dist/tex/generic/babel-french/canadien.ldf 2024-02-29 21:23:06 UTC (rev 70261)
@@ -24,7 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{canadien}
- [2023-12-19 v3.5r French support from the babel system]
+ [2024-02-29 v3.5s 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: branches/branch2023.final/Master/texmf-dist/tex/generic/babel-french/francais.ldf
===================================================================
--- branches/branch2023.final/Master/texmf-dist/tex/generic/babel-french/francais.ldf 2024-02-29 21:22:55 UTC (rev 70260)
+++ branches/branch2023.final/Master/texmf-dist/tex/generic/babel-french/francais.ldf 2024-02-29 21:23:06 UTC (rev 70261)
@@ -24,7 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{francais}
- [2023-12-19 v3.5r French support from the babel system]
+ [2024-02-29 v3.5s 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: branches/branch2023.final/Master/texmf-dist/tex/generic/babel-french/french.ldf
===================================================================
--- branches/branch2023.final/Master/texmf-dist/tex/generic/babel-french/french.ldf 2024-02-29 21:22:55 UTC (rev 70260)
+++ branches/branch2023.final/Master/texmf-dist/tex/generic/babel-french/french.ldf 2024-02-29 21:23:06 UTC (rev 70261)
@@ -24,10 +24,10 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{french}
- [2023-12-19 v3.5r French support from the babel system]
+ [2024-02-29 v3.5s French support from the babel system]
%%
%% Babel package for LaTeX version 2e
-%% Copyright © 1996-2023
+%% Copyright © 1996-2024
%% by Daniel Flipo <daniel (dot) flipo (at) free (dot) fr>
%%
\LdfInit\CurrentOption{FBclean at on@exit}
@@ -1524,7 +1524,7 @@
\ifFBStandardItemizeEnv
\else
\PackageWarning{french.ldf}%
- {babel-french will not customize lists' layout\MessageBreak
+ {babel-french will not customise lists' layout\MessageBreak
when French is not the main language,\MessageBreak
reported}%
\fi
@@ -1854,8 +1854,9 @@
\@afterindenttrue
\fi}
\addto\extrasfrench{\bbl at frenchindent}
-\AtBeginDocument{\@ifpackageloaded{bigfoot}%
- {\PackageInfo{french.ldf}%
+\AtBeginDocument{%
+ \@ifpackageloaded{bigfoot}%
+ {\PackageWarning{french.ldf}%
{bigfoot package in use.\MessageBreak
babel-french will NOT customise footnotes;%
\MessageBreak reported}}%
@@ -1865,7 +1866,14 @@
\ifFBAutoSpaceFootnotes
\let\@footnotemark\@footnotemarkFB
\fi}%
- }
+ \@ifpackageloaded{footnotebackref}%
+ {\FBFrenchFootnotesfalse
+ \PackageWarning{french.ldf}%
+ {footnotebackref package loaded.\MessageBreak
+ babel-french will NOT customise footnotes;%
+ \MessageBreak reported}}%
+ {}%
+ }
\newdimen\parindentFFN
\parindentFFN=10in
\newcommand*{\dotFFN}{.}
Modified: branches/branch2023.final/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
===================================================================
--- branches/branch2023.final/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf 2024-02-29 21:22:55 UTC (rev 70260)
+++ branches/branch2023.final/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf 2024-02-29 21:23:06 UTC (rev 70261)
@@ -24,7 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{frenchb}
- [2023-12-19 v3.5r French support from the babel system]
+ [2024-02-29 v3.5s French support from the babel system]
\def\bbl at tempa{frenchb}
\ifx\CurrentOption\bbl at tempa
\chardef\l at frenchb\l at french
Modified: branches/branch2023.final/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
===================================================================
--- branches/branch2023.final/Master/texmf-dist/tex/generic/babel-french/frenchb.lua 2024-02-29 21:22:55 UTC (rev 70260)
+++ branches/branch2023.final/Master/texmf-dist/tex/generic/babel-french/frenchb.lua 2024-02-29 21:23:06 UTC (rev 70261)
@@ -1,7 +1,7 @@
--[[
File `frenchb.lua’ generated from frenchb.dtx
- [2023-12-19 v3.5r French support from the babel system]
- Copyright © 2014-2023 Daniel Flipo
+ [2024-02-29 v3.5s French support from the babel system]
+ Copyright © 2014-2024 Daniel Flipo
<daniel (dot) flipo (at) free (dot) fr>
License LPPL: see french.ldf.
--]]
@@ -36,6 +36,7 @@
local node_id = node.id
local HLIST = node_id("hlist")
local TEMP = node_id("temp")
+local DISC = node_id("disc")
local KERN = node_id("kern")
local GLUE = node_id("glue")
local GLYPH = node_id("glyph")
@@ -160,7 +161,8 @@
if next then
next_id = next.id
end
- if next_id and next_id == GLYPH then
+ if next_id and
+ (next_id == GLYPH or next_id == DISC) then
auto = false
end
end
More information about the tex-live-commits
mailing list.