summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/babel-french/french.ldf
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-04-06 21:35:26 +0000
committerKarl Berry <karl@freefriends.org>2018-04-06 21:35:26 +0000
commit55775bf052ff3a80c31cf9fe831737120b77c31e (patch)
treee36a83fc4aab336b12d65ace2cf2444ddb82ec6b /Master/texmf-dist/tex/generic/babel-french/french.ldf
parent6b64e41067fb2363bf57e03fbbeeb5affa745b4f (diff)
babel-french (6apr18)
git-svn-id: svn://tug.org/texlive/trunk@47332 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/babel-french/french.ldf')
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/french.ldf62
1 files changed, 27 insertions, 35 deletions
diff --git a/Master/texmf-dist/tex/generic/babel-french/french.ldf b/Master/texmf-dist/tex/generic/babel-french/french.ldf
index 2ab988fbf00..4e6d9fb4105 100644
--- a/Master/texmf-dist/tex/generic/babel-french/french.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/french.ldf
@@ -24,7 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{french}
- [2018/02/04 v3.4b French support from the babel system]
+ [2018/03/25 v3.4c French support from the babel system]
%%
%% Babel package for LaTeX version 2e
%% Copyright © 1996-2018
@@ -106,10 +106,14 @@
\newif\ifFBunicode
\newif\ifFBLuaTeX
\newif\ifFBXeTeX
-\ifdefined\luatexversion
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname luatexversion\endcsname\relax
+\else
\FBunicodetrue \FBLuaTeXtrue
\fi
-\ifdefined\XeTeXrevision
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname XeTeXrevision\endcsname\relax
+\else
\FBunicodetrue \FBXeTeXtrue
\fi
\newif\ifFBfrench
@@ -1505,10 +1509,9 @@
ShowOptions=true [false]\MessageBreak
StandardLayout=true [false]\MessageBreak
GlobalLayoutFrench=false [true]\MessageBreak
- StandardLists=true [false]\MessageBreak
+ PartNameFull=false [true]\MessageBreak
IndentFirst=false [true]\MessageBreak
ReduceListSpacing=false [true]\MessageBreak
- ListOldLayout=true [false]\MessageBreak
StandardItemizeEnv=true [false]\MessageBreak
StandardEnumerateEnv=true [false]\MessageBreak
StandardItemLabels=true [false]\MessageBreak
@@ -1522,26 +1525,28 @@
\protect\ding{43},... [\textendash]\MessageBreak
ItemLabeliv=\textemdash, \textbullet,
\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
- OriginalTypewriter=true [false]\MessageBreak
ThinColonSpace=true [false]\MessageBreak
- ThinSpaceInFrenchNumbers=true [false]\MessageBreak
- FrenchSuperscripts=false [true]\MessageBreak
- LowercaseSuperscripts=false [true]\MessageBreak
- PartNameFull=false [true]\MessageBreak
- SuppressWarning=true [false]\MessageBreak
- CustomiseFigTabCaptions=false [true]\MessageBreak
- OldFigTabCaptions=true [false]\MessageBreak
- SmallCapsFigTabCaptions=false [true]\MessageBreak
+ OriginalTypewriter=true [false]\MessageBreak
+ UnicodeNoBreakSpaces=true [false]\MessageBreak
+ og= <left quote character>, fg= <right quote character>%
INGuillSpace=true [false]\MessageBreak
- InnerGuillSingle=true [false]\MessageBreak
EveryParGuill=open, close, none [open]\MessageBreak
EveryLineGuill=open, close, none
[open in LuaTeX, none otherwise]\MessageBreak
- UnicodeNoBreakSpaces=true [false]\MessageBreak
- og= <left quote character>, fg= <right quote character>%
+ 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
\MessageBreak
*********************************************%
\MessageBreak\protect\frenchsetup{ShowOptions}}
@@ -1587,25 +1592,12 @@
\fi
\fi
\begingroup
- \newcommand{\FBTU}{TU}%
\newcommand{\FBOTone}{OT1}%
- \ifFBunicode
- \ifx\encodingdefault\FBTU
- \else
- \@ifpackageloaded{fontspec}{}%
- {\@ifpackageloaded{luainputenc}{}%
- {\FBWarning{Add \protect\usepackage{fontspec} to the%
- \MessageBreak preamble of your document, reported}%
- }%
- }
- \fi
- \else
- \ifx\encodingdefault\FBOTone
- \FBWarning{OT1 encoding should not be used for French.%
- \MessageBreak
- Add \protect\usepackage[T1]{fontenc} to the
- preamble\MessageBreak of your document; reported}%
- \fi
+ \ifx\encodingdefault\FBOTone
+ \FBWarning{OT1 encoding should not be used for French.%
+ \MessageBreak
+ Add \protect\usepackage[T1]{fontenc} to the
+ preamble\MessageBreak of your document; reported}%
\fi
\endgroup
}