summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/babel-contrib/french/frenchb.dtx
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-07-21 03:00:43 +0000
committerNorbert Preining <norbert@preining.info>2021-07-21 03:00:43 +0000
commitd06b4118c72d0c81fc0760e24add55e808471dbc (patch)
treeb66ab79ad229352b74d6e1f7ed8dc2884e671737 /macros/latex/contrib/babel-contrib/french/frenchb.dtx
parent933416e3a978851a263168f5daad76eea18de483 (diff)
CTAN sync 202107210300
Diffstat (limited to 'macros/latex/contrib/babel-contrib/french/frenchb.dtx')
-rw-r--r--macros/latex/contrib/babel-contrib/french/frenchb.dtx70
1 files changed, 29 insertions, 41 deletions
diff --git a/macros/latex/contrib/babel-contrib/french/frenchb.dtx b/macros/latex/contrib/babel-contrib/french/frenchb.dtx
index 161833dd13..4630c18ef4 100644
--- a/macros/latex/contrib/babel-contrib/french/frenchb.dtx
+++ b/macros/latex/contrib/babel-contrib/french/frenchb.dtx
@@ -1,4 +1,4 @@
-%\CheckSum{3759}
+%\CheckSum{3732}
%
%\iffalse
% Tell the LaTeX system who we are and write an entry on the
@@ -13,12 +13,12 @@
%<frenchb>\ProvidesLanguage{frenchb}
%<lua>--[[
%<lua> File `frenchb.lua’ generated from frenchb.dtx
- [2020/10/10 v3.5l French support from the babel system]
+ [2021/07/20 v3.5m French support from the babel system]
%<*internal>
\iffalse
%</internal>
%<*lua>
- Copyright © 2014-2020 Daniel Flipo
+ Copyright © 2014-2021 Daniel Flipo
<daniel (dot) flipo (at) free (dot) fr>
License LPPL: see french.ldf.
--]]
@@ -32,7 +32,7 @@
%<*dtx|french>
%%
%% Babel package for LaTeX version 2e
-%% Copyright © 1996-2020
+%% Copyright © 1996-2021
%% by Daniel Flipo <daniel (dot) flipo (at) free (dot) fr>
%%
%</dtx|french>
@@ -42,6 +42,8 @@
%%
%</dtx>
%<*filedriver>
+\RequirePackage{pdfmanagement-testphase}
+\DeclareDocumentMetadata{pdfstandard=A-2b, lang=en-US}
\documentclass[a4paper]{ltxdoc}
\usepackage[left=38mm,right=38mm,top=30mm,bottom=50mm]{geometry}
\usepackage[dvipsnames]{xcolor}
@@ -63,10 +65,10 @@
\def\PrintMacroName#1{%
\strut\MacroFont\color{Sepia}\normalsize\string#1}
\def\ColorArg{\color{Sepia}}
-\usepackage[expansion=true,protrusion=true]{microtype}
+\usepackage[verbose=silent]{microtype}
\usepackage{array,url}
\usepackage[numbered]{hypdoc}
-\hypersetup{colorlinks,urlcolor=Blue,linkcolor=Blue,unicode}
+\hypersetup{colorlinks,urlcolor=Blue,linkcolor=Blue}
\newcommand*{\hlabel}[1]{\phantomsection\label{#1}}
\newcommand*\babel{\texttt{Babel}}
\newcommand*\frenchb{\texttt{babel-french}}
@@ -1973,8 +1975,8 @@ local function french_punctuation (head)
% spaces in http://mysite, C:\textbackslash{} or 10:35);
% b) the previous character is part of type |FB_punct_null|
% (avoids spurious spaces in strings like |(!)| or |??|);
-% c) a null glue (actually glues <= 1 sp for tabulars) preceeds
-% the punctuation character (for tabulars and listings);
+% c) a null glue (actually <= 1 sp for tabulars, possibly < 0)
+% preceeds the punctuation character (for tabulars and listings);
% d) the punctuation character starts a paragraph or an |\hbox{}|.
%
% When option \fbo{UnicodeNoBreakSpaces} is set to \fbo{true},
@@ -4107,17 +4109,16 @@ return french_punctuation
% \label{ssec-dots}
%
% \begin{macro}{\FBtextellipsis}
-% LaTeX’s standard definition of |\dots| in text-mode is
-% |\textellipsis| which includes a |\kern| at the end;
-% this space is not wanted in some cases (before a closing brace
-% for instance) and |\kern| breaks hyphenation of the next word.
-% We define |\FBtextellipsis| for French (in LaTeX only).
-%
-% The |\if| construction in the LaTeX definition of |\dots|
-% doesn’t allow the use of |xspace| (|xspace| is always followed
-% by a |\fi|), so we use the AMS-LaTeX construction of |\dots|;
-% this has to be done `AtBeginDocument’ not to be overwritten
-% when \file{amsmath.sty} is loaded after \babel.
+% Unless a ready-made character is available in the current font,
+% LaTeX’s default definition of |\textellipsis| includes a |\kern| at
+% the end; this space is not wanted in some cases (before a closing
+% brace for instance) and |\kern| breaks hyphenation of the next
+% word. We define |\FBtextellipsis| for French (in LaTeX only) the
+% same way but without the last |\kern|.
+%
+% LY1 has a ready made character for |\textellipsis|, it should be
+% used in French. The same is true for Unicode fonts in use
+% with XeTeX and LuaTeX.
%
% \changes{v2.0}{2006/11/06}{Added special case for LY1 encoding,
% see bug report from Bruno Voisin (2004/05/18).}
@@ -4126,36 +4127,22 @@ return french_punctuation
% character for \cs{textellipsis}, let’s just use it!
% (reported by Maxime Chupin, 2011/06/04).}
%
-% LY1 has a ready made character for |\textellipsis|, it should be
-% used in French too. The same is true for Unicode fonts in use
-% with XeTeX and LuaTeX.
+% \changes{v3.5m}{2021/07/19}{No longer redefine \cs{dots}, only
+% \cs{textellipsis}’s default definition is changed in French.}
%
% \begin{macrocode}
\ifFBunicode
- \let\FBtextellipsis\textellipsis
\else
\DeclareTextSymbol{\FBtextellipsis}{LY1}{133}
+ \DeclareTextCommand{\FBtextellipsis}{PU}{\9040\046}
+ \DeclareTextCommand{\FBtextellipsis}{PD1}{\203}
\DeclareTextCommandDefault{\FBtextellipsis}{%
- .\kern\fontdimen3\font.\kern\fontdimen3\font.\xspace}
+ .\kern\fontdimen3\font.\kern\fontdimen3\font.\xspace}%
+ \def\bbl@frenchdots{\babel@save\textellipsis
+ \let\textellipsis\FBtextellipsis}
+ \addto\extrasfrench{\bbl@frenchdots}
\fi
% \end{macrocode}
-% |\Mdots@| and |\Tdots@| hold the definitions of |\dots| in
-% Math and Text mode. They default to those of amsmath-2.0, and
-% will revert to standard LaTeX definitions `AtBeginDocument’,
-% if amsmath has not been loaded. |\Mdots@| doesn’t change when
-% switching from/to French, while |\Tdots@| is redefined as
-% |\FBtextellipsis| in French.
-% \begin{macrocode}
-\newcommand*{\Tdots@}{\@xp\textellipsis}
-\newcommand*{\Mdots@}{\@xp\mdots@}
-\AtBeginDocument{\DeclareRobustCommand*{\dots}{\relax
- \csname\ifmmode M\else T\fi dots@\endcsname}%
- \ifdefined\@xp\else\let\@xp\relax\fi
- \ifdefined\mdots@\else\let\Mdots@\mathellipsis\fi
- }
-\def\bbl@frenchdots{\babel@save\Tdots@ \let\Tdots@\FBtextellipsis}
-\addto\extrasfrench{\bbl@frenchdots}
-% \end{macrocode}
% \end{macro}
%
% \subsection{More checks about packages’ loading order}
@@ -6068,5 +6055,6 @@ return french_punctuation
%%% Local Variables:
%%% fill-column: 72
%%% coding: utf-8
+%%% mode: doctex
%%% TeX-engine: luatex
%%% End: