diff options
author | Karl Berry <karl@freefriends.org> | 2024-02-29 21:21:35 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-02-29 21:21:35 +0000 |
commit | 54c5cd86bfbcb4ec822f93004ee30ea49b9034e9 (patch) | |
tree | cad065f9a8b62fb6e9d248f729f550e4933ef2c8 /Master | |
parent | 262eaacb2e4c3664ff7cc843e7498a5cb0f4d208 (diff) |
babel-french (29feb24)
git-svn-id: svn://tug.org/texlive/trunk@70254 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf-dist/doc/generic/babel-french/frenchb-doc.pdf | bin | 190030 -> 190506 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex | 9 | ||||
-rw-r--r-- | Master/texmf-dist/doc/generic/babel-french/frenchb.pdf | bin | 369496 -> 366313 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/generic/babel-french/frenchb.dtx | 40 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel-french/acadian.ldf | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel-french/canadien.ldf | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel-french/francais.ldf | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel-french/french.ldf | 20 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel-french/frenchb.ldf | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel-french/frenchb.lua | 8 |
10 files changed, 59 insertions, 26 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 Binary files differindex ec1b68e6e4a..4b901cdf3ea 100644 --- a/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.pdf +++ b/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.pdf 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 d76aa39eb39..9434072bd62 100644 --- a/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex +++ b/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex @@ -120,7 +120,7 @@ \title{Mode d’emploi du module \ext{babel-french}} \author{\href{mailto:daniel.flipo@free.fr}{Daniel \textsc{Flipo}}} -\newcommand*{\latestversion}{3.5r} +\newcommand*{\latestversion}{3.5s} \date{Version {\latestversion} -- \today} \begin{document} @@ -267,7 +267,7 @@ le faire dépend du format utilisé : 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 @@ chargé avec l’extension \pkg{fontsetup} lorsque le moteur XeTeX est utilisé. 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} diff --git a/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf b/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf Binary files differindex e5dd20f656f..b0ab9ae43b2 100644 --- a/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf +++ b/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf diff --git a/Master/texmf-dist/source/generic/babel-french/frenchb.dtx b/Master/texmf-dist/source/generic/babel-french/frenchb.dtx index d0a8f15715b..71171ba2bf1 100644 --- a/Master/texmf-dist/source/generic/babel-french/frenchb.dtx +++ b/Master/texmf-dist/source/generic/babel-french/frenchb.dtx @@ -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 @@ Please report errors to: <daniel (dot) flipo (at) free (dot) fr> %<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 @@ Please report errors to: <daniel (dot) flipo (at) free (dot) fr> %<*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 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") @@ -2025,6 +2024,9 @@ local function french_punctuation (head) % 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 @@ 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 @@ -5070,7 +5073,7 @@ return french_punctuation \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 @@ return french_punctuation % \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 @@ return french_punctuation % \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 @@ return french_punctuation \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} 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 |