texlive[48222] Master/texmf-dist: babel-french (18jul18)
commits+karl at tug.org
commits+karl at tug.org
Thu Jul 19 00:21:30 CEST 2018
Revision: 48222
http://tug.org/svn/texlive?view=revision&revision=48222
Author: karl
Date: 2018-07-19 00:21:26 +0200 (Thu, 19 Jul 2018)
Log Message:
-----------
babel-french (18jul18)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf
trunk/Master/texmf-dist/source/generic/babel-french/frenchb.dtx
trunk/Master/texmf-dist/tex/generic/babel-french/acadian.ldf
trunk/Master/texmf-dist/tex/generic/babel-french/canadien.ldf
trunk/Master/texmf-dist/tex/generic/babel-french/francais.ldf
trunk/Master/texmf-dist/tex/generic/babel-french/french.ldf
trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
Modified: trunk/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/generic/babel-french/frenchb.dtx
===================================================================
--- trunk/Master/texmf-dist/source/generic/babel-french/frenchb.dtx 2018-07-18 22:21:05 UTC (rev 48221)
+++ trunk/Master/texmf-dist/source/generic/babel-french/frenchb.dtx 2018-07-18 22:21:26 UTC (rev 48222)
@@ -1,4 +1,4 @@
-%\CheckSum{3669}
+%\CheckSum{3714}
%
%\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
- [2018/07/06 v3.5a French support from the babel system]
+ [2018/07/17 v3.5b French support from the babel system]
%<*internal>
\iffalse
%</internal>
@@ -741,8 +741,11 @@
% closer to French typographic standards: see f.i.\ how lists are
% typeset in the book ``Lexique des règles typographiques en usage
% à l’Imprimerie Nationale’’.
-
%
+% Version 3.5b fixes a bug due to wrong |\everypar|’s management in
+% |\frquote{}|; it showed up when |\frquote{}| immediately followed
+% a sectionning command.
+%
% \subsubsection*{What’s new in version 3.4?}
%
% Version 3.4a adds a new command |\frenchdate| (see
@@ -2796,9 +2799,23 @@
% \changes{v3.2g}{2017/01/30}{Default options of \cs{frquote} are no
% longer engine-dependent.}
%
+% \changes{v3.5b}{2018/07/15}{New command \cs{FB at addquote@everypar} to
+% manage \cs{everypar}: \cs{frquote} failed when used immediately
+% after a sectionning command.}
+%
% \begin{macrocode}
\newcount\FBguill at level
-\newtoks\FB at everypar
+\newtoks\FBold at everypar
+% \end{macrocode}
+% |\FB at addquote@everypar| was borrowed from \file{csquotes.sty}.
+% \begin{macrocode}
+\def\FB at addquote@everypar{%
+ \let\FBnew at everypar\everypar
+ \FBold at everypar=\expandafter{\the\everypar}%
+ \FBnew at everypar={\the\FBold at everypar\FBeverypar at quote}%
+ \let\everypar\FBold at everypar
+ \let\FB at addquote@everypar\relax
+}
\newif\ifFBcloseguill \FBcloseguilltrue
\newif\ifFBInnerGuillSingle
\def\FBguillopen{\bgroup\NoAutoSpacing\guillemotleft\egroup}
@@ -2806,6 +2823,8 @@
\let\FBguillnone\empty
\let\FBeveryparguill\FBguillopen
\let\FBeverylineguill\FBguillnone
+\let\FBeverypar at quote\relax
+\let\FBeveryline at quote\empty
% \end{macrocode}
% The main command |\frquote| accepts (in LaTeX2e only) a starred
% version which suppresses the closing quote; it is meant to be used
@@ -2841,15 +2860,14 @@
\ifcase\FBguill at level
\or
% \end{macrocode}
-% This for level 1 (outer) quotations: save |\everypar| before
-% customising it, set |\FBeverypar at quote| for level 1 quotations
-% and add it to |\everypar|, then print the quotation:
+% This for level 1 (outer) quotations: set |\FBeverypar at quote|
+% for level 1 quotations and add it to |\everypar| using
+% |\FB at addquote@everypar|, then print the quotation:
% \begin{macrocode}
- \FB at everypar=\everypar
\ifx\FBeveryparguill\FBguillnone
\else
\def\FBeverypar at quote{\FBeveryparguill\FB at guillspace}%
- \everypar=\expandafter{\the\everypar \FBeverypar at quote}%
+ \FB at addquote@everypar
\fi
\ogi #1\fgi
\or
@@ -2863,12 +2881,14 @@
%
% \begin{macrocode}
\ifx\FBeverylineguill\FBguillopen
- \localleftbox{\guillemotleft\FB at guillspace}%
+ \def\FBeveryline at quote{\guillemotleft\FB at guillspace}%
+ \localleftbox{\FBeveryline at quote}%
\let\FBeverypar at quote\relax
\ogi #1\ifFBcloseguill\fgi\fi
\else
\ifx\FBeverylineguill\FBguillclose
- \localleftbox{\guillemotright\FB at guillspace}%
+ \def\FBeveryline at quote{\guillemotright\FB at guillspace}%
+ \localleftbox{\FBeveryline at quote}%
\let\FBeverypar at quote\relax
\ogi #1\ifFBcloseguill\fgi\fi
\else
@@ -2906,12 +2926,12 @@
\fi
\fi
% \end{macrocode}
-% Clean on exit: adjust |\FBguill at level| and restore
-% |\localleftbox| and |\everypar|.
+% Closing: step down |\FBguill at level| and clean on exit.
% \begin{macrocode}
\advance\FBguill at level by \m at ne
+ \let\FBeverypar at quote\relax
+ \let\FBeveryline at quote\empty
\ifx\FBeverylineguill\FBguillnone\else\localleftbox{}\fi
- \ifx\FBeveryparguill\FBguillnone\else\everypar=\FB at everypar\fi
}
% \end{macrocode}
% \end{macro}
@@ -5564,8 +5584,12 @@
% \changes{v3.3c}{2017/07/28}{Reset \cs{localleftbox} locally
% inside \cs{@makefntext}. Needed by \cs{frquote} with LuaTeX.}
%
-% The LuaTeX command |\localleftbox| used by |\frquote{}| has to
-% be reset inside footnotes, done for LaTeX based formats only.
+% \changes{v3.5b}{2018/07/17}{Reset \cs{FBeverypar at quote} locally
+% inside \cs{@makefntext}. Needed by \cs{frquote}.}
+%
+% The LuaTeX command |\localleftbox| and |\FBeverypar at quote| used
+% by |\frquote{}| have to be reset inside footnotes; done for LaTeX
+% based formats only.
% \begin{macrocode}
\providecommand\localleftbox[1]{}
\AtBeginDocument{%
@@ -5581,10 +5605,10 @@
\ifFB at koma
% \end{macrocode}
% Definition of |\@makefntext| for koma-script classes: running
-% \@makefntextORI inside a group to reset |\localleftbox{}| would
-% mess up the layout of footnotes whenever the first manadatory
-% argument of |\deffootnote{}| (used as |\leftskip|) is non-nil
-% (default is 1em, 0pt in French).
+% \@makefntextORI inside a group to reset |\localleftbox{}| and
+% |\FBeverypar at quote| would mess up the layout of footnotes whenever
+% the first manadatory argument of |\deffootnote{}| (used as
+% |\leftskip|) is non-nil (default is 1em, 0pt in French).
% \begin{macrocode}
\let\@@makefnmarkORI\@@makefnmark
\long\def\@makefntext#1{%
@@ -5591,14 +5615,21 @@
\ifFBFrenchFootnotes
\ifx\footnote\thanks
\let\@@makefnmark\@@makefnmarkTH
- \begingroup\localleftbox{}\@makefntextTH{#1}\endgroup
+ \begingroup\localleftbox{}\let\FBeverypar at quote\relax
+ \@makefntextTH{#1}\endgroup
\else
\let\@@makefnmark\@@makefnmarkFB
- \begingroup\localleftbox{}\@makefntextFB{#1}\endgroup
+ \begingroup\localleftbox{}\let\FBeverypar at quote\relax
+ \@makefntextFB{#1}\endgroup
\fi
\else
+ \localleftbox{}%
+ \let\FBeverypar at save\FBeverypar at quote
+ \let\FBeverypar at quote\relax
\let\@@makefnmark\@@makefnmarkORI
\@makefntextORI{#1}%
+ \let\FBeverypar at quote\FBeverypar at save
+ \localleftbox{\FBeveryline at quote}%
\fi}%
\else
% \end{macrocode}
@@ -5630,7 +5661,9 @@
% Definition of |\@makefntext| for all classes other than
% koma-script:
% \begin{macrocode}
- \long\def\@makefntext#1{\begingroup\localleftbox{}%
+ \long\def\@makefntext#1{\begingroup
+ \localleftbox{}%
+ \let\FBeverypar at quote\relax
\ifFBFrenchFootnotes
\@makefntextFB{#1}%
\else
Modified: trunk/Master/texmf-dist/tex/generic/babel-french/acadian.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/generic/babel-french/acadian.ldf 2018-07-18 22:21:05 UTC (rev 48221)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/acadian.ldf 2018-07-18 22:21:26 UTC (rev 48222)
@@ -24,8 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{acadian}
- [2018/07/06 v3.5a French support from the babel system]
-
+ [2018/07/17 v3.5b French support from the babel system]
\PackageInfo{acadian.ldf}%
{`acadian' dialect is currently\MessageBreak
*absolutely identical* to the\MessageBreak
Modified: trunk/Master/texmf-dist/tex/generic/babel-french/canadien.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/generic/babel-french/canadien.ldf 2018-07-18 22:21:05 UTC (rev 48221)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/canadien.ldf 2018-07-18 22:21:26 UTC (rev 48222)
@@ -24,8 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{canadien}
- [2018/07/06 v3.5a French support from the babel system]
-
+ [2018/07/17 v3.5b 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
Modified: trunk/Master/texmf-dist/tex/generic/babel-french/francais.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/generic/babel-french/francais.ldf 2018-07-18 22:21:05 UTC (rev 48221)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/francais.ldf 2018-07-18 22:21:26 UTC (rev 48222)
@@ -24,8 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{francais}
- [2018/07/06 v3.5a French support from the babel system]
-
+ [2018/07/17 v3.5b 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
Modified: trunk/Master/texmf-dist/tex/generic/babel-french/french.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/generic/babel-french/french.ldf 2018-07-18 22:21:05 UTC (rev 48221)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/french.ldf 2018-07-18 22:21:26 UTC (rev 48222)
@@ -24,13 +24,12 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{french}
- [2018/07/06 v3.5a French support from the babel system]
+ [2018/07/17 v3.5b French support from the babel system]
%%
%% Babel package for LaTeX version 2e
%% Copyright © 1996-2018
%% by Daniel Flipo <daniel (dot) flipo (at) free (dot) fr>
%%
-
\LdfInit\CurrentOption{FBclean at on@exit}
\def\fb at error#1#2{%
\begingroup
@@ -567,7 +566,14 @@
\newcommand*{\ogii}{\textquotedblleft}
\newcommand*{\fgii}{\textquotedblright}
\newcount\FBguill at level
-\newtoks\FB at everypar
+\newtoks\FBold at everypar
+\def\FB at addquote@everypar{%
+ \let\FBnew at everypar\everypar
+ \FBold at everypar=\expandafter{\the\everypar}%
+ \FBnew at everypar={\the\FBold at everypar\FBeverypar at quote}%
+ \let\everypar\FBold at everypar
+ \let\FB at addquote@everypar\relax
+}
\newif\ifFBcloseguill \FBcloseguilltrue
\newif\ifFBInnerGuillSingle
\def\FBguillopen{\bgroup\NoAutoSpacing\guillemotleft\egroup}
@@ -575,6 +581,8 @@
\let\FBguillnone\empty
\let\FBeveryparguill\FBguillopen
\let\FBeverylineguill\FBguillnone
+\let\FBeverypar at quote\relax
+\let\FBeveryline at quote\empty
\ifLaTeXe
\DeclareRobustCommand\frquote{%
\@ifstar{\FBcloseguillfalse\fr at quote}%
@@ -587,21 +595,22 @@
\advance\FBguill at level by \@ne
\ifcase\FBguill at level
\or
- \FB at everypar=\everypar
\ifx\FBeveryparguill\FBguillnone
\else
\def\FBeverypar at quote{\FBeveryparguill\FB at guillspace}%
- \everypar=\expandafter{\the\everypar \FBeverypar at quote}%
+ \FB at addquote@everypar
\fi
\ogi #1\fgi
\or
\ifx\FBeverylineguill\FBguillopen
- \localleftbox{\guillemotleft\FB at guillspace}%
+ \def\FBeveryline at quote{\guillemotleft\FB at guillspace}%
+ \localleftbox{\FBeveryline at quote}%
\let\FBeverypar at quote\relax
\ogi #1\ifFBcloseguill\fgi\fi
\else
\ifx\FBeverylineguill\FBguillclose
- \localleftbox{\guillemotright\FB at guillspace}%
+ \def\FBeveryline at quote{\guillemotright\FB at guillspace}%
+ \localleftbox{\FBeveryline at quote}%
\let\FBeverypar at quote\relax
\ogi #1\ifFBcloseguill\fgi\fi
\else
@@ -632,8 +641,9 @@
\fi
\fi
\advance\FBguill at level by \m at ne
+ \let\FBeverypar at quote\relax
+ \let\FBeveryline at quote\empty
\ifx\FBeverylineguill\FBguillnone\else\localleftbox{}\fi
- \ifx\FBeveryparguill\FBguillnone\else\everypar=\FB at everypar\fi
}
\def\BabelLanguages{french,acadian}
\StartBabelCommands*{\BabelLanguages}{date}
@@ -1861,14 +1871,21 @@
\ifFBFrenchFootnotes
\ifx\footnote\thanks
\let\@@makefnmark\@@makefnmarkTH
- \begingroup\localleftbox{}\@makefntextTH{#1}\endgroup
+ \begingroup\localleftbox{}\let\FBeverypar at quote\relax
+ \@makefntextTH{#1}\endgroup
\else
\let\@@makefnmark\@@makefnmarkFB
- \begingroup\localleftbox{}\@makefntextFB{#1}\endgroup
+ \begingroup\localleftbox{}\let\FBeverypar at quote\relax
+ \@makefntextFB{#1}\endgroup
\fi
\else
+ \localleftbox{}%
+ \let\FBeverypar at save\FBeverypar at quote
+ \let\FBeverypar at quote\relax
\let\@@makefnmark\@@makefnmarkORI
\@makefntextORI{#1}%
+ \let\FBeverypar at quote\FBeverypar at save
+ \localleftbox{\FBeveryline at quote}%
\fi}%
\else
\@ifclassloaded{memoir}%
@@ -1887,7 +1904,9 @@
\fi
\fi
}{}%
- \long\def\@makefntext#1{\begingroup\localleftbox{}%
+ \long\def\@makefntext#1{\begingroup
+ \localleftbox{}%
+ \let\FBeverypar at quote\relax
\ifFBFrenchFootnotes
\@makefntextFB{#1}%
\else
Modified: trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf 2018-07-18 22:21:05 UTC (rev 48221)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf 2018-07-18 22:21:26 UTC (rev 48222)
@@ -24,8 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{frenchb}
- [2018/07/06 v3.5a French support from the babel system]
-
+ [2018/07/17 v3.5b French support from the babel system]
\def\bbl at tempa{frenchb}
\ifx\CurrentOption\bbl at tempa
\let\l at frenchb\l at french
Modified: trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
===================================================================
--- trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.lua 2018-07-18 22:21:05 UTC (rev 48221)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.lua 2018-07-18 22:21:26 UTC (rev 48222)
@@ -1,11 +1,10 @@
--[[
File `frenchb.lua’ generated from frenchb.dtx
- [2018/07/06 v3.5a French support from the babel system]
+ [2018/07/17 v3.5b French support from the babel system]
Copyright © 2014-2018 Daniel Flipo
<daniel (dot) flipo (at) free (dot) fr>
License LPPL: see french.ldf.
--]]
-
local FB_punct_thin =
{[string.byte("!")] = true,
[string.byte("?")] = true,
More information about the tex-live-commits
mailing list