summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/babel-french
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-12-30 23:23:45 +0000
committerKarl Berry <karl@freefriends.org>2013-12-30 23:23:45 +0000
commitedd5eca5b6e0a7fd2e06c0773db98005b25adfa7 (patch)
treefc030ac21520f24f664355ee9debf01132c3aa03 /Master/texmf-dist/tex/generic/babel-french
parent3f30cad80839bb6f0464f54c6caf66622ba1d783 (diff)
babel-french (30dec13)
git-svn-id: svn://tug.org/texlive/trunk@32507 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/babel-french')
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/frenchb.ldf44
1 files changed, 25 insertions, 19 deletions
diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
index 7065a16c3b0..ce2fc8d947f 100644
--- a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
@@ -33,7 +33,7 @@
%% extension .ins) which are part of the distribution.
%%
\ProvidesLanguage{frenchb}
- [2013/11/25 v2.6f French support from the babel system]
+ [2013/12/30 v2.6g French support from the babel system]
%%
%% File `frenchb.ldf'
%% Babel package for LaTeX version 2e
@@ -103,11 +103,13 @@
\else
\FBunicodetrue \FBXeTeXtrue
\fi
-\@namedef{extras\CurrentOption}{\lccode`\'=`\'
- \ifFBLuaTeX \lccode`\'="2019 \fi
- \ifFBXeTeX \lccode"2019=`\' \fi}
-\@namedef{noextras\CurrentOption}{\lccode`\'=0
- \ifFBXeTeX \lccode"2019=0 \fi}
+\@namedef{extras\CurrentOption}{%
+ \ifFBunicode \lccode`\'="2019 \lccode"2019="2019
+ \else \lccode`\'=`\'
+ \fi}
+\@namedef{noextras\CurrentOption}{%
+ \ifFBunicode \lccode"2019=\z@\fi
+ \lccode`\'=\z@}
\addto\extrasfrench{\bbl@frenchspacing}
\addto\noextrasfrench{\bbl@nonfrenchspacing}
\long\def\STD@makecaption#1#2{%
@@ -172,8 +174,9 @@
\newcommand*{\FB@xetex@punct@french}{%
\ifx\FB@charclassesORI\empty
\FB@interchartokenstateORI=\XeTeXinterchartokenstate
- \@for\FB@char:={`\:,`\;,`\!,`\?,"AB,"BB,`\(,`\[,`\{,`\,,`\.,%
- `\-,`\),`\],`\},`\%,"22,"27,"60,"2019}\do
+ \@for\FB@char:={`\:,`\;,`\!,`\?,"AB,"BB,%
+ `\(,`\[,`\{,`\,,`\.,`\-,`\),`\],`\},%
+ `\%,"22,"27,"60,"2019,"A0,"202F}\do
{\edef\FB@charclassesORI{\FB@charclassesORI%
\the\XeTeXcharclass\FB@char,}}%
\let\shorthandonORI\shorthandon
@@ -205,7 +208,7 @@
\ifFBAutoSpaceGuill\FBguill@spacing\fi}%
\XeTeXinterchartoks 255 \FB@punctguilf = {%
\ifFBAutoSpaceGuill\unskip\FBguill@spacing\fi}%
- \@for\FB@char:={`\[,`\(}\do
+ \@for\FB@char:={`\[,`\(,"A0,"202F}\do
{\XeTeXcharclass\FB@char=\FB@punctnul}%
\@for\FB@char:={`\{,`\,,`\.,`\-,`\),`\],`\},`\%,%
"22,"27,"60,"2019}\do
@@ -223,8 +226,9 @@
\newcommand*{\FB@xetex@punct@nonfrench}{%
\ifx\FB@charclassesORI\empty
\else
- \@for\FB@char:={`\:,`\;,`\!,`\?,"AB,"BB,`\(,`\[,`\{,`\,,`\.,%
- `\-,`\),`\],`\},"22,"25,"27,"60,"2019}\do
+ \@for\FB@char:={`\:,`\;,`\!,`\?,"AB,"BB,%
+ `\(,`\[,`\{,`\,,`\.,`\-,`\),`\],`\},%
+ `\%,"22,"27,"60,"2019,"A0,"202F}\do
{\expandafter\FB@parse\FB@charclassesORI\endparse
\XeTeXcharclass\FB@char=\FB@class}%
\def\FB@charclassesORI{}%
@@ -749,6 +753,7 @@
\leftmargin\csname leftmargin\romannumeral\the\@listdepth\endcsname
}
\def\FB@itemizesettings{%
+ \ifFBReduceListSpacing
\setlength{\itemsep}{\z@}%
\setlength{\parsep}{\z@}%
\setlength{\topsep}{\z@}%
@@ -756,14 +761,15 @@
\@tempdima=\parskip
\addtolength{\topsep}{-\@tempdima}%
\addtolength{\partopsep}{\@tempdima}%
- \settowidth{\labelwidth}{\csname\@itemitem\endcsname}%
- \ifFBListOldLayout
- \setlength{\leftmargin}{\labelwidth}%
- \addtolength{\leftmargin}{\labelsep}%
- \addtolength{\leftmargin}{\parindent}%
- \else
- \FB@listHsettings
- \fi
+ \fi
+ \settowidth{\labelwidth}{\csname\@itemitem\endcsname}%
+ \ifFBListOldLayout
+ \setlength{\leftmargin}{\labelwidth}%
+ \addtolength{\leftmargin}{\labelsep}%
+ \addtolength{\leftmargin}{\parindent}%
+ \else
+ \FB@listHsettings
+ \fi
}
\def\itemizeFB{%
\ifnum \@itemdepth >\thr@@\@toodeep\else