summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-01-30 23:08:02 +0000
committerKarl Berry <karl@freefriends.org>2019-01-30 23:08:02 +0000
commit02dce538759c2d2cfd8c184f1c52c021db0b0643 (patch)
tree802c06908c2994cd6bd168380de145154227e5b6 /Master/texmf-dist/tex
parentb74c095b1b8555c7f85c1880a6038bea9a0a0f54 (diff)
babel-french (30jan19)
git-svn-id: svn://tug.org/texlive/trunk@49875 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/acadian.ldf2
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/canadien.ldf2
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/francais.ldf2
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/french.ldf36
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/frenchb.ldf2
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/frenchb.lua4
6 files changed, 27 insertions, 21 deletions
diff --git a/Master/texmf-dist/tex/generic/babel-french/acadian.ldf b/Master/texmf-dist/tex/generic/babel-french/acadian.ldf
index 1fe294b616e..0cebb369f07 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}
- [2018/09/14 v3.5c French support from the babel system]
+ [2019/01/30 v3.5d 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 ee4f43e0c38..86dbbfd4411 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}
- [2018/09/14 v3.5c French support from the babel system]
+ [2019/01/30 v3.5d 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 1635db6179c..db3a710306f 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}
- [2018/09/14 v3.5c French support from the babel system]
+ [2019/01/30 v3.5d 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 24d87693dc3..ecb35924393 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}
- [2018/09/14 v3.5c French support from the babel system]
+ [2019/01/30 v3.5d French support from the babel system]
%%
%% Babel package for LaTeX version 2e
-%% Copyright © 1996-2018
+%% Copyright © 1996-2019
%% by Daniel Flipo <daniel (dot) flipo (at) free (dot) fr>
%%
\LdfInit\CurrentOption{FBclean@on@exit}
@@ -1077,6 +1077,7 @@
\newif\ifFBStandardLayout \FBStandardLayouttrue
\newif\ifFBGlobalLayoutFrench \FBGlobalLayoutFrenchtrue
\newif\ifFBReduceListSpacing
+\newif\ifFBStandardListSpacing \FBStandardListSpacingtrue
\newif\ifFBListOldLayout
\newif\ifFBListItemsAsPar
\newif\ifFBCompactItemize
@@ -1123,11 +1124,11 @@
\MessageBreak reported}}%
{\@ifpackageloaded{beamerarticle}%
{\FBStandardItemLabelsfalse
- \FBReduceListSpacingtrue
+ \FBStandardListSpacingfalse
\PackageInfo{french.ldf}{%
Minimal list customisation for the beamerarticle%
\MessageBreak package; reported}}%
- {\FBReduceListSpacingtrue
+ {\FBStandardListSpacingfalse
\FBStandardItemizeEnvfalse
\FBStandardEnumerateEnvfalse
\FBStandardItemLabelsfalse}%
@@ -1145,7 +1146,7 @@
\define@key{FB}{StandardLayout}[true]%
{\csname FBStandardLayout#1\endcsname
\ifFBStandardLayout
- \FBReduceListSpacingfalse
+ \FBStandardListSpacingtrue
\FBStandardItemizeEnvtrue
\FBStandardItemLabelstrue
\FBStandardEnumerateEnvtrue
@@ -1154,7 +1155,7 @@
\FBAutoSpaceFootnotesfalse
\FBGlobalLayoutFrenchfalse
\else
- \FBReduceListSpacingtrue
+ \FBStandardListSpacingfalse
\FBStandardItemizeEnvfalse
\FBStandardItemLabelsfalse
\FBStandardEnumerateEnvfalse
@@ -1175,7 +1176,12 @@
\fi
\fi}%
\define@key{FB}{ReduceListSpacing}[true]%
- {\csname FBReduceListSpacing#1\endcsname}%
+ {\csname FBReduceListSpacing#1\endcsname
+ \ifFBReduceListSpacing \FBStandardListSpacingfalse
+ \else \FBStandardListSpacingtrue\fi
+ }%
+ \define@key{FB}{StandardListSpacing}[true]%
+ {\csname FBStandardListSpacing#1\endcsname}%
\define@key{FB}{ListOldLayout}[true]%
{\csname FBListOldLayout#1\endcsname
\ifFBListOldLayout
@@ -1210,14 +1216,12 @@
\define@key{FB}{StandardLists}[true]%
{\csname FBStandardLists#1\endcsname
\ifFBStandardLists
- \FBReduceListSpacingfalse
- \FBCompactItemizefalse
+ \FBStandardListSpacingtrue
\FBStandardItemizeEnvtrue
\FBStandardEnumerateEnvtrue
\FBStandardItemLabelstrue
\else
- \FBReduceListSpacingtrue
- \FBCompactItemizetrue
+ \FBStandardListSpacingfalse
\FBStandardItemizeEnvfalse
\FBStandardEnumerateEnvfalse
\FBStandardItemLabelsfalse
@@ -1529,7 +1533,7 @@
PartNameFull=false [true]\MessageBreak
IndentFirst=false [true]\MessageBreak
ListItemsAsPar=true [false]\MessageBreak
- ReduceListSpacing=false [true]\MessageBreak
+ StandardListSpacing=true [false]\MessageBreak
StandardItemizeEnv=true [false]\MessageBreak
StandardEnumerateEnv=true [false]\MessageBreak
StandardItemLabels=true [false]\MessageBreak
@@ -1545,7 +1549,6 @@
\protect\ding{43},... [\textendash]\MessageBreak
StandardLists=true [false]\MessageBreak
ListOldLayout=true [false]\MessageBreak
- CompactItemize=false [true]\MessageBreak
FrenchFootnotes=false [true]\MessageBreak
AutoSpaceFootnotes=false [true]\MessageBreak
AutoSpacePunctuation=false [true]\MessageBreak
@@ -1592,6 +1595,7 @@
\def\nos{n\degre\space}%
\def\FB@og{\guillemotleft\space}%
\def\FB@fg{\space\guillemotright}%
+ \def\frquote#1{\FB@og #1\FB@fg}%
\def\at{@}%
\def\circonflexe{\string^}%
\def\tild{\string~}%
@@ -1665,7 +1669,8 @@
ii\fi\endcsname
}
\def\FB@itemizesettings{%
- \ifFBReduceListSpacing
+ \ifFBStandardListSpacing
+ \else
\setlength{\itemsep}{\z@}%
\setlength{\parsep}{\z@}%
\setlength{\topsep}{\z@}%
@@ -1762,7 +1767,8 @@
\let\enddescriptionFB\endlistORI
\def\update@frenchlists{%
\setlistindentFB
- \ifFBReduceListSpacing \let\list\listFB \fi
+ \ifFBStandardListSpacing
+ \else \let\list\listFB \fi
\ifFBStandardItemizeEnv
\else \let\itemize\itemizeFB \fi
\ifFBStandardItemLabels
diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
index d6a09161eaa..f9ae6bf5778 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}
- [2018/09/14 v3.5c French support from the babel system]
+ [2019/01/30 v3.5d French support from the babel system]
\def\bbl@tempa{frenchb}
\ifx\CurrentOption\bbl@tempa
\let\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 2912843766f..029f433845a 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
- [2018/09/14 v3.5c French support from the babel system]
- Copyright © 2014-2018 Daniel Flipo
+ [2019/01/30 v3.5d French support from the babel system]
+ Copyright © 2014-2019 Daniel Flipo
<daniel (dot) flipo (at) free (dot) fr>
License LPPL: see french.ldf.
--]]