diff options
author | Karl Berry <karl@freefriends.org> | 2021-07-20 19:43:38 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-07-20 19:43:38 +0000 |
commit | 0ea1c4cbf396454ec3d8f39b878ef2df9fc16a76 (patch) | |
tree | 70002555f09d0756bcbea756c96b9325b104fa91 | |
parent | d8f236ed4ca893b9e1366faa021be88d6619d2ba (diff) |
babel-french (20jul21)
git-svn-id: svn://tug.org/texlive/trunk@59997 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/texmf-dist/doc/generic/babel-french/README.md | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/generic/babel-french/frenchb-doc.pdf | bin | 154799 -> 159363 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex | 20 | ||||
-rw-r--r-- | Master/texmf-dist/doc/generic/babel-french/frenchb.pdf | bin | 328108 -> 331863 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/generic/babel-french/frenchb.dtx | 70 | ||||
-rw-r--r-- | Master/texmf-dist/source/generic/babel-french/frenchb.ins | 4 | ||||
-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 | 21 | ||||
-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 | 4 |
12 files changed, 54 insertions, 75 deletions
diff --git a/Master/texmf-dist/doc/generic/babel-french/README.md b/Master/texmf-dist/doc/generic/babel-french/README.md index 50845e36843..0e046586e0f 100644 --- a/Master/texmf-dist/doc/generic/babel-french/README.md +++ b/Master/texmf-dist/doc/generic/babel-french/README.md @@ -50,5 +50,5 @@ Changes See the included manual frenchb.pdf, section "Change History". --- -Copyright 1996--2020 Daniel Flipo +Copyright 1996--2021 Daniel Flipo E-mail: daniel (dot) flipo (at) free (dot) fr 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 d55eccfeee7..bf4c8438e43 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 2ff7f143077..467181d9dc7 100644 --- a/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex +++ b/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex @@ -1,3 +1,5 @@ +\RequirePackage{pdfmanagement-testphase} +\DeclareDocumentMetadata{pdfstandard=A-2b, lang=fr-FR} \documentclass[a4paper,12pt,german,english,french]{article} % LuaTeX ONLY! @@ -107,11 +109,8 @@ \makeatother \usepackage{hyperref} -\hypersetup{pdftitle={Documentation de babel-french}, - pdfcreator={LuaTeX}, +\hypersetup{pdftitle={Mode d’emploi de babel-french}, pdfauthor={Daniel FLIPO}, - unicode, - bookmarksopen, colorlinks, urlcolor=PineGreen, linkcolor=Blue, @@ -121,11 +120,9 @@ \newcommand*{\samefntmk}{% \addtocounter{Hfootnote}{-1}\addtocounter{footnote}{-1}\footnotemark} -\usepackage[open]{bookmark} -% -\title{Documentation sur le module \ext{babel-french}} +\title{Mode d’emploi du module \ext{babel-french}} \author{\href{mailto:daniel.flipo@free.fr}{Daniel \textsc{Flipo}}} -\newcommand*{\latestversion}{3.5l} +\newcommand*{\latestversion}{3.5m} \date{Version {\latestversion} -- \today} \begin{document} @@ -400,9 +397,8 @@ document (ou maquette) est modifiée de la façon suivante% «Figure~1~--~Légende» au lieu de «Figure~1\string:~Légende». Il est possible de choisir un autre séparateur : pour remplacer le tiret double «--» par un tiret triple «---», - ajouter dans le préambule - |\renewcommand*{\CaptionSeparator}{\space\textemdash\space}|.% - \hlabel{captionseparator} + ajouter dans le préambule\hlabel{captionseparator}\\ + |\renewcommand*{\CaptionSeparator}{\space\textemdash\space}|. Lorsque la langue principale n’est pas le français, le séparateur «\string:» est utilisé pour toutes les langues mais une espace insécable est en principe @@ -1082,7 +1078,7 @@ La liste étant longue, les options sont regroupées par thèmes. légendes de figures et tables est supprimé, on obtient « Figure » et « Table » au lieu de « \textsc{Figure} » et « \textsc{Table} ». Noter que le même résultat peut être obtenu en définissant |\FBfigtabshape| - comme |\relax| avant le chargement de \ext{babel}.%\hlabel{scfigtab} + comme |\relax| avant le chargement de \ext{babel}.\hlabel{scfigtab} \item [CustomiseFigTabcaptions=false (true*)] ; si cette option est mise à \fbo{false}, le séparateur défini par |\CaptionSeparator| est remplacé par 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 56a5c87b0d7..2f202d918f0 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 161833dd13a..4630c18ef41 100644 --- a/Master/texmf-dist/source/generic/babel-french/frenchb.dtx +++ b/Master/texmf-dist/source/generic/babel-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: diff --git a/Master/texmf-dist/source/generic/babel-french/frenchb.ins b/Master/texmf-dist/source/generic/babel-french/frenchb.ins index 4313f3501a8..a8bfed7524f 100644 --- a/Master/texmf-dist/source/generic/babel-french/frenchb.ins +++ b/Master/texmf-dist/source/generic/babel-french/frenchb.ins @@ -2,7 +2,7 @@ %% This file will generate fast loadable files and documentation driver %% files from the doc files in this package when run through LuaTeX. %% -%% Copyright 2001-2020 Daniel Flipo. All rights reserved. +%% Copyright 2001-2021 Daniel Flipo. All rights reserved. %% %% This is a generated file part of the the babel-french bundle %% to be used with the Babel system. @@ -14,7 +14,7 @@ %% %% --------------- start of docstrip commands ------------------ %% -\def\filedate{2020/01/30} +\def\filedate{2021/01/30} \def\batchfile{frenchb.ins} \input docstrip.tex diff --git a/Master/texmf-dist/tex/generic/babel-french/acadian.ldf b/Master/texmf-dist/tex/generic/babel-french/acadian.ldf index 4b19892df7d..56efa199895 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} - [2020/10/10 v3.5l French support from the babel system] + [2021/07/20 v3.5m 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 b5250f3f1f2..14875f1954a 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} - [2020/10/10 v3.5l French support from the babel system] + [2021/07/20 v3.5m 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 9fa29281243..fd0f278b8a9 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} - [2020/10/10 v3.5l French support from the babel system] + [2021/07/20 v3.5m 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 71d3b78c886..1d5fe829df9 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} - [2020/10/10 v3.5l French support from the babel system] + [2021/07/20 v3.5m French support from the babel system] %% %% Babel package for LaTeX version 2e -%% Copyright © 1996-2020 +%% Copyright © 1996-2021 %% by Daniel Flipo <daniel (dot) flipo (at) free (dot) fr> %% \LdfInit\CurrentOption{FBclean@on@exit} @@ -1064,21 +1064,16 @@ \let\STD@makecaption\relax } \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 -\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} \ifFB@active@punct \@ifpackageloaded{listings} {\AtBeginDocument{% diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf index fbd3c9c3390..860e30d6e3f 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} - [2020/10/10 v3.5l French support from the babel system] + [2021/07/20 v3.5m 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 a181ba2d3f9..c394d93fabf 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 - [2020/10/10 v3.5l French support from the babel system] - Copyright © 2014-2020 Daniel Flipo + [2021/07/20 v3.5m French support from the babel system] + Copyright © 2014-2021 Daniel Flipo <daniel (dot) flipo (at) free (dot) fr> License LPPL: see french.ldf. --]] |