summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-02-29 21:21:35 +0000
committerKarl Berry <karl@freefriends.org>2024-02-29 21:21:35 +0000
commit54c5cd86bfbcb4ec822f93004ee30ea49b9034e9 (patch)
treecad065f9a8b62fb6e9d248f729f550e4933ef2c8 /Master/texmf-dist/tex
parent262eaacb2e4c3664ff7cc843e7498a5cb0f4d208 (diff)
babel-french (29feb24)
git-svn-id: svn://tug.org/texlive/trunk@70254 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/acadian.ldf2
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/canadien.ldf2
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/francais.ldf2
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/french.ldf20
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/frenchb.ldf2
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/frenchb.lua8
6 files changed, 23 insertions, 13 deletions
diff --git a/Master/texmf-dist/tex/generic/babel-french/acadian.ldf b/Master/texmf-dist/tex/generic/babel-french/acadian.ldf
index 97b86159330..b5d5301d03f 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-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
diff --git a/Master/texmf-dist/tex/generic/babel-french/canadien.ldf b/Master/texmf-dist/tex/generic/babel-french/canadien.ldf
index 802a1f8af6f..5e63466a33b 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-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
diff --git a/Master/texmf-dist/tex/generic/babel-french/francais.ldf b/Master/texmf-dist/tex/generic/babel-french/francais.ldf
index ff15bf5db8a..38a2822a999 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-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
diff --git a/Master/texmf-dist/tex/generic/babel-french/french.ldf b/Master/texmf-dist/tex/generic/babel-french/french.ldf
index 0118e32d105..37c1f3da27f 100644
--- a/Master/texmf-dist/tex/generic/babel-french/french.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/french.ldf
@@ -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@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@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}{.}
diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
index 156c55cd0d3..8967715209d 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-12-19 v3.5r French support from the babel system]
+ [2024-02-29 v3.5s 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 ea291eeca4c..bc084cc35df 100644
--- a/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
+++ b/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
@@ -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 copy_node = node.copy
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 @@ local function french_punctuation (head)
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