summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/babel-contrib
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-01-31 03:01:20 +0000
committerNorbert Preining <norbert@preining.info>2020-01-31 03:01:20 +0000
commit1d1c81d42f36755f72bbd69c5a29c2d6a9fec04d (patch)
treec0ecbc7ed9fd2d67ea828d0ec80e160524fc61b3 /macros/latex/contrib/babel-contrib
parent1f2683ba3ec9c1855d5518e773c72d2241637449 (diff)
CTAN sync 202001310301
Diffstat (limited to 'macros/latex/contrib/babel-contrib')
-rw-r--r--macros/latex/contrib/babel-contrib/french/README.md (renamed from macros/latex/contrib/babel-contrib/french/README)41
-rw-r--r--macros/latex/contrib/babel-contrib/french/frenchb-doc.pdfbin158231 -> 156507 bytes
-rw-r--r--macros/latex/contrib/babel-contrib/french/frenchb-doc.tex46
-rw-r--r--macros/latex/contrib/babel-contrib/french/frenchb.dtx84
-rw-r--r--macros/latex/contrib/babel-contrib/french/frenchb.ins4
-rw-r--r--macros/latex/contrib/babel-contrib/french/frenchb.pdfbin245332 -> 246075 bytes
6 files changed, 97 insertions, 78 deletions
diff --git a/macros/latex/contrib/babel-contrib/french/README b/macros/latex/contrib/babel-contrib/french/README.md
index 168ac33d58..103c7cc15a 100644
--- a/macros/latex/contrib/babel-contrib/french/README
+++ b/macros/latex/contrib/babel-contrib/french/README.md
@@ -1,23 +1,15 @@
-=========================================================================
-The babel-french bundle (formerly known as `frenchb')
+The babel-french package (formerly known as `frenchb')
+======================================================
-French language support for the babel multilingual package
+## Description
-Copyright 1996--2019 Daniel Flipo
-E-mail: daniel (dot) flipo (at) free (dot) fr
-
-Released under the LaTeX Project Public License v1.3 or later
-See http://www.latex-project.org/lppl.txt
-=========================================================================
-
-== PURPOSE ==
+This package provides support for the French language for the babel
+multilingual system.
-This bundle is an extension to the babel package for multilingual
-typesetting. It provides all necessary macros, definitions and settings
-to typeset French documents. It is designed to work with the following
-engines: pdfTeX, XeTeX and LuaTeX.
+It is designed to work with the following engines: pdfTeX, XeTeX and LuaTeX.
+Plain and LaTeX formats are supported.
-== CONTENTS ==
+## Contents
The bundle consists of the following files:
@@ -26,9 +18,14 @@ The bundle consists of the following files:
* frenchb.pdf: unpacked documentation for babel-french,
* frenchb-doc.pdf: comprehensive documentation in French,
* frenchb-doc.tex: source file of frenchb-doc.pdf,
-* README (this file).
+* README.md (this file).
-== INSTALLATION ==
+## License
+
+Released under the LaTeX Project Public License v1.3 or later
+See http://www.latex-project.org/lppl.txt
+
+## Installation
If the latest version of this package is not included in your LaTeX
distribution, do the following:
@@ -39,11 +36,15 @@ distribution, do the following:
(default location: $TEXMF/tex/generic/babel-french/);
* rebuild the database (mktexlsr or so).
-== DOCUMENTATION ==
+## Documentation
See the included manuals for usage instructions: frenchb.pdf in English or
the French documentation frenchb-doc.pdf.
-== CHANGES ==
+## Changes
See the included manual frenchb.pdf, section "Change History".
+
+---
+Copyright 1996--2020 Daniel Flipo
+E-mail: daniel (dot) flipo (at) free (dot) fr
diff --git a/macros/latex/contrib/babel-contrib/french/frenchb-doc.pdf b/macros/latex/contrib/babel-contrib/french/frenchb-doc.pdf
index 4de5946fdf..f97bf7df85 100644
--- a/macros/latex/contrib/babel-contrib/french/frenchb-doc.pdf
+++ b/macros/latex/contrib/babel-contrib/french/frenchb-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/babel-contrib/french/frenchb-doc.tex b/macros/latex/contrib/babel-contrib/french/frenchb-doc.tex
index 35c9779203..4b639840da 100644
--- a/macros/latex/contrib/babel-contrib/french/frenchb-doc.tex
+++ b/macros/latex/contrib/babel-contrib/french/frenchb-doc.tex
@@ -1,5 +1,9 @@
\documentclass[a4paper,12pt,german,english,french]{article}
+% LuaTeX ONLY!
+\usepackage{iftex}[2019/10/24]
+\RequireLuaTeX
+
\usepackage{xspace}
\usepackage{array,longtable}
\usepackage{varioref}
@@ -10,22 +14,16 @@
\usepackage{luatexbase} %%% Provisoire : pour microtype
%%% Fontes OpenType avec moteur LuaTeX : Erewhon/Cabin/Inconsolata
-\usepackage{fourier-otf} % Pour les maths seulement
-%\usepackage[upright]{fourier} % Pour les maths seulement
-%\usepackage[no-math]{fontspec}
+\usepackage{fourier-otf}
\usepackage{realscripts}
-\setmainfont{Erewhon}[
- Extension = .otf,
- UprightFont = *-Regular,
- BoldFont = *-Bold,
- ItalicFont = *-Italic,
- BoldItalicFont = *-BoldItalic,
-]
\setsansfont{Cabin}[Scale=MatchLowercase]
\setmonofont{Inconsolatazi4}% voir inconsolata-doc.pdf
- [Scale=MatchLowercase,HyphenChar=None,StylisticSet={2,3},
- AutoFakeSlant=0.2 % XeTeX only, sans effet avec LuaTeX
- ]
+ [Scale=MatchLowercase, HyphenChar=None, StylisticSet={2,3},
+ ItalicFont = *-Regular, ItalicFeatures={FakeSlant=0.225}, % 13°
+ SlantedFont= *-Regular, SlantedFeatures={FakeSlant=0.225},
+ BoldItalicFont = *-Bold, BoldItalicFeatures={FakeSlant=0.225},
+ BoldSlantedFont= *-Bold, BoldSlantedFeatures={FakeSlant=0.225},
+ ]
%%% *** APRÈS fontspec ***
\usepackage{babel}
@@ -127,11 +125,11 @@
%
\title{Documentation sur le module \ext{babel-french}}
\author{\href{mailto:daniel.flipo@free.fr}{Daniel \textsc{Flipo}}}
-\newcommand*{\latestversion}{3.5f}
+\newcommand*{\latestversion}{3.5g}
\date{Version {\latestversion} -- \today}
\begin{document}
-\def\today{7 septembre 2019}
+\def\today{30 janvier 2020}
\maketitle
\thispagestyle{empty}
@@ -648,6 +646,7 @@ vertical des lettres supérieures simulées par |\fup|
un message est affiché dans le fichier \file{.log} indiquant comment
charger \ext{numprint}. Le chargement de \ext{numprint} n’est pas fait
par \ext{babel-french} à cause du risque de conflit d’options.
+ Il doit se faire \emph{après} \ext{babel}.
Les utilisateurs devraient s’habituer progressivement à utiliser
|\numprint| (ou son raccourci |\np|) à la place de |\nombre|.
@@ -658,7 +657,8 @@ les commandes
|\ier|,\dots, |\ieres|,
|\ieme|, |\iemes|,
|\fg| et |\dots| sont
-respectés sans avoir à les forcer par des |{}| ou des~\verb*+\ +.
+respectés sans avoir à les forcer par des |{}| ou
+des~\code{\boi\textvisiblespace}.
\section{Personnalisation}
\label{sec:Perso}
@@ -955,7 +955,7 @@ La liste étant longue, les options sont regroupées par thèmes.
utile pour recompiler à l’identique des anciens textes.
\item [UnicodeNoBreakSpaces=true (false)];\hlabel{ucs-nbsp} cette option
- expérimentale n’a d’effet qu’avec LuaLaTeX ; lorsqu’on la met à \fbo{true}
+ n’a d’effet qu’avec LuaLaTeX ; lorsqu’on la met à \fbo{true}
les espaces insécables ajoutées par \ext{babel-french} dans le fichier PDF
de sortie (ponctuation haute, guillemets, etc.) sont codées sous forme de
caractères Unicode (U+A0 ou U+202F fine) au lieu des pénalités et ressorts
@@ -964,8 +964,8 @@ La liste étant longue, les options sont regroupées par thèmes.
version actuelle de \exe{pdftotext} ne les restitue pas correctement.
En revanche, \exe{lwarp} (v.~0.37 et suivantes) est totalement compatible
- avec \ext{babel-french} pour la conversion des fichiers PDF produits sous
- XeLaTeX et pdfLaTeX : les espaces insécables sont préservées.
+ avec \ext{babel-french} pour la conversion en HTML des fichiers PDF produits
+ sous XeLaTeX et pdfLaTeX : les espaces insécables sont préservées.
\end{description}
@@ -1060,7 +1060,7 @@ La liste étant longue, les options sont regroupées par thèmes.
des nombres, par une espace fine (par défaut c’est une espace mot
insécable et sans élasticité en français).
Cette option n’a d’effet que si l’extension \ext{numprint} est chargée
- avec l’option \opt{autolanguage} ;
+ (\emph{après} \ext{babel}) avec l’option \opt{autolanguage} ;
sans elle, \ext{numprint} formate les nombres indépendamment de la langue
courante et le séparateur des milliers est par défaut l’espace fine.
\par}
@@ -1501,7 +1501,7 @@ aurait :
}
%\newpage
-\section{Changements entre les versions 3.4 et 2.6}
+\section{Changements entre les versions 3.5 et 2.6}
\label{sec:changes-3.0}
\subsection{Changements entre les versions \latestversion{} et 3.4d}
@@ -1521,6 +1521,10 @@ incluse dans la distribution \ext{babel-french} sur CTAN.
La commande |\NoEveryParQuote| a été ajoutée en version~3.5e, voir
p.~\pageref{frquote}.
+La version 3.5g corrige une bogue ancienne affectant l’usage des polices
+type~1 avec Lua\-(La)TeX : tout crénage était supprimé pour ces polices depuis
+la version~3.1f (2015) ; les polices OpenType elles, n’ont jamais été affectées.
+
\subsection{Changements entre les versions 3.4d et 3.3d}
\label{ssec:changes-3.4}
diff --git a/macros/latex/contrib/babel-contrib/french/frenchb.dtx b/macros/latex/contrib/babel-contrib/french/frenchb.dtx
index 8241658b28..4f9697f12d 100644
--- a/macros/latex/contrib/babel-contrib/french/frenchb.dtx
+++ b/macros/latex/contrib/babel-contrib/french/frenchb.dtx
@@ -1,4 +1,4 @@
-%\CheckSum{3801}
+%\CheckSum{3802}
%
%\iffalse
% Tell the LaTeX system who we are and write an entry on the
@@ -13,7 +13,7 @@
%<frenchb>\ProvidesLanguage{frenchb}
%<lua>--[[
%<lua> File `frenchb.lua’ generated from frenchb.dtx
- [2019/09/07 v3.5f French support from the babel system]
+ [2020/01/30 v3.5g French support from the babel system]
%<*internal>
\iffalse
%</internal>
@@ -123,7 +123,7 @@
%
% \frenchb{} has been improved using helpful suggestions from many
% people, mainly from Jacques André, Michel Bovani, Thierry Bouche,
-% Vincent Jalby, Denis Bitouzé and Ulrike Fisher.
+% Vincent Jalby, Denis Bitouzé, Ulrike Fisher and Marcel Krüger.
% Thanks to all of them!
%
% LaTeX-2.09 is no longer supported.
@@ -324,8 +324,9 @@
% \item A command |\nombre| was provided in 1.x versions to easily
% format numbers in slices of three digits separated either
% by a comma in English or with a space in French; |\nombre|
-% is now mapped to |\numprint| from \file{numprint.sty}, see
-% \file{numprint.pdf} for more information.
+% is now mapped to |\numprint| from \file{numprint.sty}, which
+% should be loaded \emph{after} \babel, see \file{numprint.pdf}
+% for more information.
%
% \item \frenchb{} has been designed to take advantage of the
% \pkg{xspace} package if present: adding
@@ -763,7 +764,10 @@
% unwanted guillemets (typically when lists are embedded in
% |\frquote{}|).
%
-% \subsubsection*{What’s new in version 3.4?}
+% Version 3.5g fixes a long standing bug affecting LuaTeX: legacy
+% kerning was disabled for Type1 fonts since v3.1g (2015).
+%
+% \subsubsection*{What’s new in version 3.4?}
%
% Version 3.4a adds a new command |\frenchdate| (see
% p.~\pageref{frenchdate}) and slightly changes number formatting:
@@ -1821,8 +1825,16 @@ local has_attribute = node.has_attribute
% in french\_punctuation (Tikz \cs{nullfont}).
% Bug pointed out by Paul Gaborit.}
%
+% \changes{v3.5g}{2020/01/30}{The kerning callback is a bit specific:
+% adding code with add\_to\_callback actually deletes the legacy
+% kerning as pointed out by Marcel Krüger on SE.}
+%
% \begin{macrocode}
local function french_punctuation (head)
+% \end{macrocode}
+% Restore the built-in kerning for 8-bits fonts.
+% \begin{macrocode}
+ node.kerning(head)
for item in node.traverse_id(GLYPH, head) do
local lang = item.lang
local char = item.char
@@ -2140,7 +2152,9 @@ return french_punctuation
%
% The next definition will be used to activate Lua punctuation: it
% loads \file{frenchb.lua} and adds function |french_punctuation|
-% at the end of the |kerning| callback (no priority).
+% to the |kerning| callback; "adding" anything actually disables
+% the built-in kerning for Type1 fonts (which is now added to
+% |french_punctuation|).
% \begin{macrocode}
\def\activate@luatexpunct{%
\directlua{%
@@ -3693,7 +3707,7 @@ return french_punctuation
Seizi\`eme,Dix-septi\`eme,Dix-huiti\`eme,Dix-neuvi\`eme,%
Vingti\`eme}
\AfterBabelCommands{%
- \DeclareRobustCommand*{\FB@emptypart}{\def\thepart{}}%
+ \DeclareRobustCommand*{\FB@emptypart}{\def\thepart{\unskip}}%
\DeclareRobustCommand*{\FB@partname}{%
\ifFBPartNameFull
\csname ordinal\romannumeral\value{part}\endcsname\space
@@ -4925,16 +4939,16 @@ return french_punctuation
***** List of possible options for babel-french ****\MessageBreak
[Default values between brackets when french is loaded *LAST*]%
\MessageBreak
- ShowOptions=true [false]\MessageBreak
- StandardLayout=true [false]\MessageBreak
- GlobalLayoutFrench=false [true]\MessageBreak
- PartNameFull=false [true]\MessageBreak
- IndentFirst=false [true]\MessageBreak
- ListItemsAsPar=true [false]\MessageBreak
- StandardListSpacing=true [false]\MessageBreak
- StandardItemizeEnv=true [false]\MessageBreak
- StandardEnumerateEnv=true [false]\MessageBreak
- StandardItemLabels=true [false]\MessageBreak
+ ShowOptions [false]\MessageBreak
+ StandardLayout [false]\MessageBreak
+ GlobalLayoutFrench [true]\MessageBreak
+ PartNameFull [true]\MessageBreak
+ IndentFirst [true]\MessageBreak
+ ListItemsAsPar [false]\MessageBreak
+ StandardListSpacing [false]\MessageBreak
+ StandardItemizeEnv [false]\MessageBreak
+ StandardEnumerateEnv [false]\MessageBreak
+ StandardItemLabels [false]\MessageBreak
ItemLabels=\textemdash, \textbullet,
\protect\ding{43},... [\textendash]\MessageBreak
ItemLabeli=\textemdash, \textbullet,
@@ -4945,27 +4959,27 @@ return french_punctuation
\protect\ding{43},... [\textendash]\MessageBreak
ItemLabeliv=\textemdash, \textbullet,
\protect\ding{43},... [\textendash]\MessageBreak
- StandardLists=true [false]\MessageBreak
- ListOldLayout=true [false]\MessageBreak
- FrenchFootnotes=false [true]\MessageBreak
- AutoSpaceFootnotes=false [true]\MessageBreak
- AutoSpacePunctuation=false [true]\MessageBreak
- ThinColonSpace=true [false]\MessageBreak
- OriginalTypewriter=true [false]\MessageBreak
- UnicodeNoBreakSpaces=true [false]\MessageBreak
+ StandardLists [false]\MessageBreak
+ ListOldLayout [false]\MessageBreak
+ FrenchFootnotes [true]\MessageBreak
+ AutoSpaceFootnotes [true]\MessageBreak
+ AutoSpacePunctuation [true]\MessageBreak
+ ThinColonSpace [false]\MessageBreak
+ OriginalTypewriter [false]\MessageBreak
+ UnicodeNoBreakSpaces [false]\MessageBreak
og= <left quote character>, fg= <right quote character>%
- INGuillSpace=true [false]\MessageBreak
+ INGuillSpace [false]\MessageBreak
EveryParGuill=open, close, none [open]\MessageBreak
EveryLineGuill=open, close, none
[open in LuaTeX, none otherwise]\MessageBreak
- InnerGuillSingle=true [false]\MessageBreak
- ThinSpaceInFrenchNumbers=true [false]\MessageBreak
- SmallCapsFigTabCaptions=false [true]\MessageBreak
- CustomiseFigTabCaptions=false [true]\MessageBreak
- OldFigTabCaptions=true [false]\MessageBreak
- FrenchSuperscripts=false [true]\MessageBreak
- LowercaseSuperscripts=false [true]\MessageBreak
- SuppressWarning=true [false]\MessageBreak
+ InnerGuillSingle [false]\MessageBreak
+ ThinSpaceInFrenchNumbers [false]\MessageBreak
+ SmallCapsFigTabCaptions [true]\MessageBreak
+ CustomiseFigTabCaptions [true]\MessageBreak
+ OldFigTabCaptions [false]\MessageBreak
+ FrenchSuperscripts [true]\MessageBreak
+ LowercaseSuperscripts [true]\MessageBreak
+ SuppressWarning [false]\MessageBreak
\MessageBreak
*********************************************%
\MessageBreak\protect\frenchsetup{ShowOptions}}
diff --git a/macros/latex/contrib/babel-contrib/french/frenchb.ins b/macros/latex/contrib/babel-contrib/french/frenchb.ins
index 203ea2a6cc..4313f3501a 100644
--- a/macros/latex/contrib/babel-contrib/french/frenchb.ins
+++ b/macros/latex/contrib/babel-contrib/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-2019 Daniel Flipo. All rights reserved.
+%% Copyright 2001-2020 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{2017/07/06}
+\def\filedate{2020/01/30}
\def\batchfile{frenchb.ins}
\input docstrip.tex
diff --git a/macros/latex/contrib/babel-contrib/french/frenchb.pdf b/macros/latex/contrib/babel-contrib/french/frenchb.pdf
index 35b6dee454..c1454ccc36 100644
--- a/macros/latex/contrib/babel-contrib/french/frenchb.pdf
+++ b/macros/latex/contrib/babel-contrib/french/frenchb.pdf
Binary files differ