diff options
author | Norbert Preining <norbert@preining.info> | 2024-03-01 03:01:32 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2024-03-01 03:01:32 +0000 |
commit | 19a826b6e3a0d2ea6bbd1bf733a8e590463275ed (patch) | |
tree | 7f35716856a0813f994b45ca7fd2b5c15b2a794a /macros/latex/contrib/babel-contrib/french/frenchb.dtx | |
parent | cd2d035c39e23ef720cdd58ad3e377f7c60e9858 (diff) |
CTAN sync 202403010301
Diffstat (limited to 'macros/latex/contrib/babel-contrib/french/frenchb.dtx')
-rw-r--r-- | macros/latex/contrib/babel-contrib/french/frenchb.dtx | 40 |
1 files changed, 29 insertions, 11 deletions
diff --git a/macros/latex/contrib/babel-contrib/french/frenchb.dtx b/macros/latex/contrib/babel-contrib/french/frenchb.dtx index d0a8f15715..71171ba2bf 100644 --- a/macros/latex/contrib/babel-contrib/french/frenchb.dtx +++ b/macros/latex/contrib/babel-contrib/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} |