summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/generic/babel-french
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-01-01 22:35:36 +0000
committerKarl Berry <karl@freefriends.org>2016-01-01 22:35:36 +0000
commitd3811035194ac8871078112645c9528f9e40a8dc (patch)
tree450fcff83f57a9581b14efef1e32f75ef263ee6f /Master/texmf-dist/source/generic/babel-french
parent01d959ce91af968f01f002d9f7f088cf8ac911b8 (diff)
babel-french (1jan16)
git-svn-id: svn://tug.org/texlive/trunk@39253 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/generic/babel-french')
-rw-r--r--Master/texmf-dist/source/generic/babel-french/frenchb.dtx119
-rw-r--r--Master/texmf-dist/source/generic/babel-french/frenchb.ins6
2 files changed, 83 insertions, 42 deletions
diff --git a/Master/texmf-dist/source/generic/babel-french/frenchb.dtx b/Master/texmf-dist/source/generic/babel-french/frenchb.dtx
index 31edc4a859b..d928f66622a 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{3258}
+%\CheckSum{3264}
%
%\iffalse
% Tell the \LaTeX\ system who we are and write an entry on the
@@ -13,16 +13,16 @@
%<ldf>\ProvidesLanguage{frenchb}
%\ProvidesFile{frenchb.dtx}
%<*!lua>
- [2015/11/25 v3.1j French support from the babel system]
+ [2016/01/01 v3.1k French support from the babel system]
%</!lua>
%<*internal>
\iffalse
%</internal>
%<*lua>
--
--- File `frenchb.lua' generated from frenchb.dtx [2015/11/25 v3.1j]
+-- File `frenchb.lua' generated from frenchb.dtx [2016/01/01 v3.1k]
--
--- Copyright (C) 2014-2015 Daniel Flipo
+-- Copyright © 2014-2016 Daniel Flipo
-- <daniel (dot) flipo (at) free (dot) fr>
-- License LPPL: see frenchb.ldf.
--
@@ -40,7 +40,7 @@
%</ldf>
%<*dtx|ldf>
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1996 - 2015
+%% Copyright © 1996 - 2016
%% by Daniel Flipo <daniel (dot) flipo (at) free (dot) fr>
%%
%</dtx|ldf>
@@ -68,6 +68,7 @@
\newcommand*\file[1]{\texttt{#1}}
\newcommand*\cls[1]{\texttt{#1}}
\newcommand*\pkg[1]{\texttt{#1}}
+\newcommand*\env[1]{\texttt{#1}}
\newcommand*\fbo[1]{\texttt{\ColorArg #1}}
\newcommand*\fbsetup[1]{\cs{frenchbsetup\{\fbo{#1}\}}}
\renewcommand*\descriptionlabel[1]{%
@@ -350,7 +351,8 @@
% environments in French (this includes itemize, enumerate,
% description, but also abstract, quote, quotation and verse and
% possibly others). Setting this option to \fbo{false}
-% reverts to the standard settings of the |list| environment.
+% reverts to the standard settings of the \env{list}
+% environment.
% \item [ListOldLayout=true (false)]; starting with version~2.6a,
% the layout of lists has changed regarding leftmargins' sizes
% and default itemize label (`---' instead of `--' up to~2.5k).
@@ -360,26 +362,26 @@
% (kept only for backward compatibility), it is replaced by the
% next two options.
% \item [StandardItemizeEnv=true (false*)]; \frenchb{} redefines
-% the |itemize| environment to suppress any vertical space
-% between items of |itemize| lists in French and customises
+% the \env{itemize} environment to suppress any vertical space
+% between items of \env{itemize} lists in French and customises
% left margins. Setting this option to \fbo{false} reverts to
-% the standard definition of |itemize|.
+% the standard definition of \env{itemize}.
% \item [StandardEnumerateEnv=true (false*)]; starting with
-% version~2.6 \frenchb{} redefines the |enumerate| and
-% |description| environments to make left margins match those of
-% the French version of |itemize| lists. Setting this option to
-% \fbo{false} reverts to the standard definition of |enumerate|
-% and |description|.
+% version~2.6 \frenchb{} redefines the \env{enumerate} and
+% \env{description} environments to make left margins match those
+% of the French version of \env{itemize} lists. Setting this
+% option to \fbo{false} reverts to the standard definition of
+% \env{enumerate} and \env{description}.
% \item [StandardItemLabels=true (false*)] when set to \fbo{true}
% this option prevents \frenchb{} from changing the labels in
-% |itemize| lists in French.
+% \env{itemize} lists in French.
% \item [ItemLabels=\cs{textbullet}, \cs{textendash},
% \cs{ding\{43\}},...(\cs{textemdash}*)];\\
% when \fbo{StandardItemLabels=false} (the default), this option
-% enables to choose the label used in French |itemize| lists for
-% all levels. The next four options do the same but each one for
-% a specific level only. Note that the example |\ding{43}|
-% requires |\usepackage{pifont}|.
+% enables to choose the label used in French \env{itemize} lists
+% for all levels. The next four options do the same but each
+% one for a specific level only. Note that the example
+% |\ding{43}| requires |\usepackage{pifont}|.
% \item [ItemLabeli=\cs{textbullet}, \cs{textendash},
% \cs{ding\{43\}},...(\cs{textemdash}*)]
% \item [ItemLabelii=\cs{textbullet}, \cs{textendash},
@@ -791,8 +793,8 @@
% \fbsetup{AutoSpaceFootnotes=false,FrenchFootnotes=false}.\\
% Add this command if you want standard footnotes. It is still
% possible to revert locally to the standard layout of footnotes
-% by adding |\StandardFootnotes| (inside a |minipage| environment
-% for instance).
+% by adding |\StandardFootnotes| (inside a \env{minipage}
+% environment for instance).
% \end{itemize}
%
% \StopEventually{}
@@ -1689,11 +1691,12 @@ return french_punctuation
% quotes is required by options \fbo{og=«} and \fbo{fg=»} in
% \fbsetup{} (see section~\ref{ssec-keyval}).
%
-% For every character used in French text-mode (except spaces),
-% |\XeTeXcharclass| value must be 0.
-% |\XeTeXcharclass| value for spaces is assumed to be 255.
-% Otherwise, the spacing before the `high punctuation' characters
-% and inside quotes might not be correct.
+% The default value for |\XeTeXcharclass| is 0 for characters tokens
+% and 255 for all other tokens (glues, kerns, math and box
+% boundaries, etc.).
+% These defaults should not be changed otherwise the spacing before
+% the `high punctuation' characters and inside quotes might not be
+% correct.
%
% We switch |\XeTeXinterchartokenstate| to 1 and change the
% |\XeTeXcharclass| values of |;| |!| |?| |:| |(| |]|
@@ -1777,6 +1780,10 @@ return french_punctuation
% to their original value when leaving French. See
% \cs{FB@xetex@punct@nonfrench} below.}
%
+% \changes{v3.1k}{2015/12/05}{Thin glues (less than 1sp) should not
+% trigger space insertion before high ponctuation. Add a check on
+% \cs{lastkip}.}
+%
% \begin{macrocode}
\newcommand*{\FB@xetex@punct@french}{%
% \end{macrocode}
@@ -1802,8 +1809,23 @@ return french_punctuation
\ifhmode\FDP@colonspace\fi}%
\XeTeXinterchartoks \FB@guilf \FB@punctthick = {%
\FDP@colonspace}%
+% \end{macrocode}
+% Small glues such as ``glue 1sp'' in tabular `l' columns or ``glue
+% 0 plus 1 fil'' in tabular `c' columns or \env{lstlisting}
+% environment should not trigger any extra space; they will still do
+% when \fbo{AutoSpacePunctuation} is true: unfortunately
+% |\XeTeXcharclass|=255 isn't specific to glue tokens (this class
+% includes box and math boundaries f.i.), so the |\else| part cannot
+% be omitted.
+% \begin{macrocode}
\XeTeXinterchartoks 255 \FB@punctthick = {%
- \ifhmode\unskip\penalty\@M\FBcolonspace\fi}%
+ \ifhmode
+ \ifdim\lastskip>1sp
+ \unskip\penalty\@M\FBcolonspace
+ \else
+ \FDP@colonspace
+ \fi
+ \fi}%
\bbl@for\FB@char
{`\;,`\!,`\?}%
{\XeTeXcharclass\FB@char=\FB@punctthin}%
@@ -1812,7 +1834,13 @@ return french_punctuation
\XeTeXinterchartoks \FB@guilf \FB@punctthin = {%
\FDP@thinspace}%
\XeTeXinterchartoks 255 \FB@punctthin = {%
- \ifhmode\unskip\penalty\@M\FBthinspace\fi}%
+ \ifhmode
+ \ifdim\lastskip>1sp
+ \unskip\penalty\@M\FBthinspace
+ \else
+ \FDP@thinspace
+ \fi
+ \fi}%
\XeTeXinterchartoks \FB@guilo \z@ = {%
\ifFBAutoSpaceGuill\FBguillspace\fi}%
\XeTeXinterchartoks \FB@guilo 255 = {%
@@ -1907,13 +1935,18 @@ return french_punctuation
% space has been typed, we add |\FDP@thinspace| which will be
% defined, up to the user's wishes, as |\FBthinspace|, or as
% |\@empty|.
+%
+% \changes{v3.1k}{2015/12/05}{(pdfTeX shorthands) test on \cs{lastskip}
+% changed from 0pt to 1sp for active punctuation for consistency
+% with XeTeX and LuaTeX.}
+%
% \begin{macrocode}
\declare@shorthand{french}{;}{%
\ifhmode
- \ifdim\lastskip>\z@
+ \ifdim\lastskip>1sp
\unskip\penalty\@M\FBthinspace
- \else
- \FDP@thinspace
+ \else
+ \FDP@thinspace
\fi
\fi
% \end{macrocode}
@@ -1925,7 +1958,7 @@ return french_punctuation
% \begin{macrocode}
\declare@shorthand{french}{!}{%
\ifhmode
- \ifdim\lastskip>\z@
+ \ifdim\lastskip>1sp
\unskip\penalty\@M\FBthinspace
\else
\FDP@thinspace
@@ -1934,7 +1967,7 @@ return french_punctuation
\string!}
\declare@shorthand{french}{?}{%
\ifhmode
- \ifdim\lastskip>\z@
+ \ifdim\lastskip>1sp
\unskip\penalty\@M\FBthinspace
\else
\FDP@thinspace
@@ -1943,7 +1976,7 @@ return french_punctuation
\string?}
\declare@shorthand{french}{:}{%
\ifhmode
- \ifdim\lastskip>\z@
+ \ifdim\lastskip>1sp
\unskip\penalty\@M\FBcolonspace
\else
\FDP@colonspace
@@ -1991,6 +2024,9 @@ return french_punctuation
\newif\ifFBAutoSpacePunctuation \FBAutoSpacePunctuationtrue
% \end{macrocode}
%
+% \begin{macro}{\AutoSpaceBeforeFDP}
+% \begin{macro}{\NoAutoSpaceBeforeFDP}
+%
% \changes{v2.3a}{2008/10/10}{\cs{NoAutoSpaceBeforeFDP} and
% \cs{AutoSpaceBeforeFDP} now set the flag
% \cs{ifFBAutoSpacePunctuation} accordingly (LaTeX only).}
@@ -1999,8 +2035,6 @@ return french_punctuation
% also in LaTeX to define \cs{FDP@colonspace}: needed for
% tex4ht, pointed out by MPG.}
%
-% \begin{macro}{\AutoSpaceBeforeFDP}
-% \begin{macro}{\NoAutoSpaceBeforeFDP}
% |\autospace@beforeFDP| and |\noautospace@beforeFDP| are internal
% commands. |\autospace@beforeFDP| defines |\FDP@thinspace| and
% |\FDP@colonspace| as unbreakable spaces and sets LuaTeX attribute
@@ -2038,6 +2072,10 @@ return french_punctuation
% before `high punctuation' characters in computer code.
% Suggested by Yannis Haralambous.}
%
+% \begin{macro}{\rmfamilyFB}
+% \begin{macro}{\sffamilyFB}
+% \begin{macro}{\ttfamilyFB}
+%
% \changes{v2.3c}{2009/02/07}{Commands \cs{ttfamily}, \cs{rmfamily}
% and \cs{sffamily} have to be robust. Bug introduced in 2.3a,
% pointed out by Manuel Pégourié-Gonnard.}
@@ -2091,6 +2129,9 @@ return french_punctuation
\sffamilyORI}%
\fi
% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
%
% \changes{v2.5a}{2010/08/14}{New command \cs{NoAutoSpacing},
% suggested by MPG.}
@@ -4485,9 +4526,9 @@ return french_punctuation
% \changes{v3.0a}{2014/02/28}{Add \cs{listindentFB} to
% \cs{itemindent}. Suggested by Denis Bitouzé.}
%
-% Same tuning for the |description| environment (see the original
-% definition in \file{classes.dtx}). Customisable |\listindentFB|
-% added to |\itemindent| (first level only).
+% Same tuning for the \env{description} environment (see the
+% original definition in \file{classes.dtx}). Customisable
+% |\listindentFB| added to |\itemindent| (first level only).
%
% \begin{macrocode}
\def\descriptionFB{%
diff --git a/Master/texmf-dist/source/generic/babel-french/frenchb.ins b/Master/texmf-dist/source/generic/babel-french/frenchb.ins
index 98caddd5a89..0d55a2e6c8c 100644
--- a/Master/texmf-dist/source/generic/babel-french/frenchb.ins
+++ b/Master/texmf-dist/source/generic/babel-french/frenchb.ins
@@ -3,7 +3,7 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 2001-2015 Daniel Flipo. All rights reserved.
+%% Copyright 2001-2016 Daniel Flipo. All rights reserved.
%%
%% This file is part of the Babel system, release 3.9.
%% ---------------------------------------------------
@@ -14,7 +14,7 @@
%%
%% --------------- start of docstrip commands ------------------
%%
-\def\filedate{2015/04/10}
+\def\filedate{2016/01/02}
\def\batchfile{frenchb.ins}
\input docstrip.tex
@@ -67,7 +67,7 @@ extension .ins) which are part of the distribution.
This is a generated file.
-Copyright 2001-2015 Daniel Flipo. All rights reserved.
+Copyright 2001-2016 Daniel Flipo. All rights reserved.
This file is part of the Babel system, release 3.9.
---------------------------------------------------