texlive[48665] Master/texmf-dist: babel-french (14sep18)
commits+karl at tug.org
commits+karl at tug.org
Fri Sep 14 22:55:35 CEST 2018
Revision: 48665
http://tug.org/svn/texlive?view=revision&revision=48665
Author: karl
Date: 2018-09-14 22:55:35 +0200 (Fri, 14 Sep 2018)
Log Message:
-----------
babel-french (14sep18)
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/source/generic/babel-french/frenchb.ins
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-09-14 20:55:20 UTC (rev 48664)
+++ trunk/Master/texmf-dist/source/generic/babel-french/frenchb.dtx 2018-09-14 20:55:35 UTC (rev 48665)
@@ -1,4 +1,4 @@
-%\CheckSum{3714}
+%\CheckSum{3710}
%
%\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/17 v3.5b French support from the babel system]
+ [2018/09/14 v3.5c French support from the babel system]
%<*internal>
\iffalse
%</internal>
@@ -784,7 +784,7 @@
% A new experimental option \fbo{UnicodeNoBreakSpaces} has been
% added for LuaLaTeX in version~3.3c, see p.~\pageref{ucs-nbsp}.
%
-% According to current \babel's standards, every dialect should
+% According to current \babel’s standards, every dialect should
% have it’s own \file{.ldf} file; starting with version~3.3b,
% the main support for French is in \file{french.ldf}, portmanteau
% files \file{frenchb.ldf},\file{francais.ldf}, \file{acadian.ldf}
@@ -1102,7 +1102,7 @@
% \end{macro}
% \end{macro}
%
-% \changes{v3.3b}{2017/07/08}{New `if' \cs{ifFBfrench} to replace
+% \changes{v3.3b}{2017/07/08}{New `if’ \cs{ifFBfrench} to replace
% \cs{iflanguage} test which is based on patterns.}
%
% \begin{macro}{\ifFBfrench}
@@ -1129,9 +1129,9 @@
% The macro |\noextrasfrench| is used to cancel the actions of
% |\extrasfrench|.
%
-% In French, character ``apostrophe’’ is a letter in expressions
-% like |l’ambulance| (French hyphenation patterns provide entries
-% for this kind of words). This means that the |\lccode| of
+% In French, character ``apostrophe’’ (U+27 or U+2019) is a letter in
+% expressions like |l’ambulance| (French hyphenation patterns provide
+% entries for this kind of words). This means that the |\lccode| of
% ``apostrophe’’ has to be non null in French for proper hyphenation
% of those expressions, and has to be reset to null when exiting
% French.
@@ -1140,15 +1140,17 @@
% |d’aventure|, |l’utopie|, with all TeX engines (XeTeX, LuaTeX,
% pdfTeX) using \file{hyph-fr.tex} patterns.
%
+% \changes{v3.5c}{2018/09/11}{\cs{lccode} of quote 0x27 changed from
+% 0x2019 to 0x27 for Unicode engines.}
+%
% \begin{macrocode}
\def\extrasfrench{%
\FBfrenchtrue
- \babel at savevariable{\lccode`\'}%
+ \babel at savevariable{\lccode"27}%
+ \lccode"27="27
\ifFBunicode
- \babel at savevariable{\lccode"2019}%
- \lccode`\'="2019\lccode"2019="2019
- \else
- \lccode`\'=`\'
+ \babel at savevariable{\lccode"2019}%
+ \lccode"2019="2019
\fi
}
\def\noextrasfrench{\FBfrenchfalse}
@@ -1595,8 +1597,8 @@
% \changes{v3.1a}{2014/06/16}{Codes 0x13 and 0x14 added for French
% quotes in T1-encoding.}
%
-% \changes{v3.3c}{2017/09/07}{Function `get\_glue' robustified.
-% `french\_punctuation' can insert Unicode characters instead
+% \changes{v3.3c}{2017/09/07}{Function `get\_glue’ robustified.
+% `french\_punctuation’ can insert Unicode characters instead
% of glues.}
%
% \begin{macrocode}
@@ -1667,8 +1669,8 @@
local remove_node = node.remove
% \end{macrocode}
%
-%\changes{v3.4a}{2018/01/26}{Global `FBsp' table added; local function
-% `get\_glue' changed into global `FBget\_glue'.}
+%\changes{v3.4a}{2018/01/26}{Global `FBsp’ table added; local function
+% `get\_glue’ changed into global `FBget\_glue’.}
%
% Commands |\FBthinspace|, |\FBcolonspace| and |\FBguillspace| are
% converted `AtBeginDocument’ by the next function |FBget_glue| into
@@ -2758,8 +2760,9 @@
%
% \begin{macrocode}
\ifLaTeXe
- \def\bbl at frenchguillemets{\renewcommand*{\og}{\FB at og}%
- \renewcommand*{\fg}{\FB at fg\xspace}}
+ \def\bbl at frenchguillemets{%
+ \renewcommand*{\og}{\FB at og}%
+ \renewcommand*{\fg}{\FB at fg\xspace}}
\renewcommand*{\og}{\textquotedblleft}
\renewcommand*{\fg}{\ifdim\lastskip>\z@\unskip\fi
\textquotedblright\xspace}
@@ -2879,6 +2882,9 @@
% \changes{v3.1i}{2015/10/04}{\cs{luatexlocalleftbox} changed to
% \cs{localleftbox} by new LaTeX release 2015/10/01.}
%
+% \changes{v3.5c}{2018/09/14}{\cs{FBeverypar at quote}’s value now properly
+% reset across level changes.}
+%
% \begin{macrocode}
\ifx\FBeverylineguill\FBguillopen
\def\FBeveryline at quote{\guillemotleft\FB at guillspace}%
@@ -2929,9 +2935,11 @@
% 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
+ \ifcase\FBguill at level \let\FBeverypar at quote\relax
+ \or \def\FBeverypar at quote{\FBeveryparguill\FB at guillspace}%
+ \let\FBeveryline at quote\empty
+ \ifx\FBeverylineguill\FBguillnone\else\localleftbox{}\fi
+ \fi
}
% \end{macrocode}
% \end{macro}
@@ -2971,7 +2979,7 @@
% both language options \opt{french} and \opt{acadian} are supplied
% to \babel. Note that coding |\StartBabelCommands*{french,acadian}|
% would \emph{only} define |\csname date\CurrentOption\endcsname|,
-% leaving the second language undefined in \babel's sens.
+% leaving the second language undefined in \babel’s sens.
% \begin{macrocode}
\def\BabelLanguages{french,acadian}
\StartBabelCommands*{\BabelLanguages}{date}
@@ -4094,7 +4102,7 @@
% longer delayed AtBeginDocument.}
%
% \changes{v3.5a}{2018/07/04}{New option ListItemsAsPar for displaying
-% lists' items ``as paragraphs''.}
+% lists’ items ``as paragraphs’’.}
%
% \begin{macrocode}
\newcommand*{\frenchsetup}[1]{%
@@ -4432,7 +4440,7 @@
\fi}%
% \end{macrocode}
%
-% \changes{v3.3c}{2017/07/23}{New option `UnicodeNoBreakSpaces' for
+% \changes{v3.3c}{2017/07/23}{New option `UnicodeNoBreakSpaces’ for
% html translators (LuaLaTeX only).}
%
% Option \fbo{UnicodeNoBreakSpaces} (LuaLaTeX only) is meant for
@@ -5587,6 +5595,9 @@
% \changes{v3.5b}{2018/07/17}{Reset \cs{FBeverypar at quote} locally
% inside \cs{@makefntext}. Needed by \cs{frquote}.}
%
+% \changes{v3.5c}{2018/09/13}{Remove grouping inside \cs{@makefntext},
+% \cs{localleftbox} and \cs{FBeverypar at quote} reset instead.}
+%
% The LuaTeX command |\localleftbox| and |\FBeverypar at quote| used
% by |\frquote{}| have to be reset inside footnotes; done for LaTeX
% based formats only.
@@ -5612,25 +5623,23 @@
% \begin{macrocode}
\let\@@makefnmarkORI\@@makefnmark
\long\def\@makefntext#1{%
+ \localleftbox{}%
+ \let\FBeverypar at save\FBeverypar at quote
+ \let\FBeverypar at quote\relax
\ifFBFrenchFootnotes
\ifx\footnote\thanks
\let\@@makefnmark\@@makefnmarkTH
- \begingroup\localleftbox{}\let\FBeverypar at quote\relax
- \@makefntextTH{#1}\endgroup
+ \@makefntextTH{#1}
\else
\let\@@makefnmark\@@makefnmarkFB
- \begingroup\localleftbox{}\let\FBeverypar at quote\relax
- \@makefntextFB{#1}\endgroup
+ \@makefntextFB{#1}
\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}%
+ \fi
+ \let\FBeverypar at quote\FBeverypar at save
+ \localleftbox{\FBeveryline at quote}}%
\else
% \end{macrocode}
% Special add-on for the \cls{memoir} class: |\maketitle| redefines
@@ -5658,17 +5667,19 @@
\fi
}{}%
% \end{macrocode}
-% Definition of |\@makefntext| for all classes other than
-% koma-script:
+% Definition of |\@makefntext| for all other classes:
% \begin{macrocode}
- \long\def\@makefntext#1{\begingroup
+ \long\def\@makefntext#1{%
\localleftbox{}%
+ \let\FBeverypar at save\FBeverypar at quote
\let\FBeverypar at quote\relax
\ifFBFrenchFootnotes
\@makefntextFB{#1}%
\else
\@makefntextORI{#1}%
- \fi\endgroup}%
+ \fi
+ \let\FBeverypar at quote\FBeverypar at save
+ \localleftbox{\FBeveryline at quote}}%
\fi
}%
}
@@ -5821,3 +5832,8 @@
%</!lua>
% \fi
\endinput
+
+%%% Local Variables:
+%%% fill-column: 72
+%%% coding: utf-8
+%%% End:
Modified: trunk/Master/texmf-dist/source/generic/babel-french/frenchb.ins
===================================================================
--- trunk/Master/texmf-dist/source/generic/babel-french/frenchb.ins 2018-09-14 20:55:20 UTC (rev 48664)
+++ trunk/Master/texmf-dist/source/generic/babel-french/frenchb.ins 2018-09-14 20:55:35 UTC (rev 48665)
@@ -34,7 +34,7 @@
\fi}
\declarepreamble\mainpreamble
-This is a generated file part of the the babel-french bundle
+This is a generated file part of the babel-french bundle
to be used with the Babel system.
-------------------------------------------------------------
Modified: trunk/Master/texmf-dist/tex/generic/babel-french/acadian.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/generic/babel-french/acadian.ldf 2018-09-14 20:55:20 UTC (rev 48664)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/acadian.ldf 2018-09-14 20:55:35 UTC (rev 48665)
@@ -5,7 +5,7 @@
%% The original source files were:
%%
%% frenchb.dtx (with options: `acadian')
-%% This is a generated file part of the the babel-french bundle
+%% This is a generated file part of the babel-french bundle
%% to be used with the Babel system.
%% -------------------------------------------------------------
%%
@@ -24,7 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{acadian}
- [2018/07/17 v3.5b French support from the babel system]
+ [2018/09/14 v3.5c 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-09-14 20:55:20 UTC (rev 48664)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/canadien.ldf 2018-09-14 20:55:35 UTC (rev 48665)
@@ -5,7 +5,7 @@
%% The original source files were:
%%
%% frenchb.dtx (with options: `canadien')
-%% This is a generated file part of the the babel-french bundle
+%% This is a generated file part of the babel-french bundle
%% to be used with the Babel system.
%% -------------------------------------------------------------
%%
@@ -24,7 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{canadien}
- [2018/07/17 v3.5b French support from the babel system]
+ [2018/09/14 v3.5c 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-09-14 20:55:20 UTC (rev 48664)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/francais.ldf 2018-09-14 20:55:35 UTC (rev 48665)
@@ -5,7 +5,7 @@
%% The original source files were:
%%
%% frenchb.dtx (with options: `francais')
-%% This is a generated file part of the the babel-french bundle
+%% This is a generated file part of the babel-french bundle
%% to be used with the Babel system.
%% -------------------------------------------------------------
%%
@@ -24,7 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{francais}
- [2018/07/17 v3.5b French support from the babel system]
+ [2018/09/14 v3.5c 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-09-14 20:55:20 UTC (rev 48664)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/french.ldf 2018-09-14 20:55:35 UTC (rev 48665)
@@ -5,7 +5,7 @@
%% The original source files were:
%%
%% frenchb.dtx (with options: `french')
-%% This is a generated file part of the the babel-french bundle
+%% This is a generated file part of the babel-french bundle
%% to be used with the Babel system.
%% -------------------------------------------------------------
%%
@@ -24,7 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{french}
- [2018/07/17 v3.5b French support from the babel system]
+ [2018/09/14 v3.5c French support from the babel system]
%%
%% Babel package for LaTeX version 2e
%% Copyright © 1996-2018
@@ -119,12 +119,11 @@
\newif\ifFBfrench
\def\extrasfrench{%
\FBfrenchtrue
- \babel at savevariable{\lccode`\'}%
+ \babel at savevariable{\lccode"27}%
+ \lccode"27="27
\ifFBunicode
- \babel at savevariable{\lccode"2019}%
- \lccode`\'="2019\lccode"2019="2019
- \else
- \lccode`\'=`\'
+ \babel at savevariable{\lccode"2019}%
+ \lccode"2019="2019
\fi
}
\def\noextrasfrench{\FBfrenchfalse}
@@ -549,8 +548,9 @@
\newcommand*{\og}{\@empty}
\newcommand*{\fg}{\@empty}
\ifLaTeXe
- \def\bbl at frenchguillemets{\renewcommand*{\og}{\FB at og}%
- \renewcommand*{\fg}{\FB at fg\xspace}}
+ \def\bbl at frenchguillemets{%
+ \renewcommand*{\og}{\FB at og}%
+ \renewcommand*{\fg}{\FB at fg\xspace}}
\renewcommand*{\og}{\textquotedblleft}
\renewcommand*{\fg}{\ifdim\lastskip>\z@\unskip\fi
\textquotedblright\xspace}
@@ -641,9 +641,11 @@
\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
+ \ifcase\FBguill at level \let\FBeverypar at quote\relax
+ \or \def\FBeverypar at quote{\FBeveryparguill\FB at guillspace}%
+ \let\FBeveryline at quote\empty
+ \ifx\FBeverylineguill\FBguillnone\else\localleftbox{}\fi
+ \fi
}
\def\BabelLanguages{french,acadian}
\StartBabelCommands*{\BabelLanguages}{date}
@@ -1868,25 +1870,23 @@
\ifFB at koma
\let\@@makefnmarkORI\@@makefnmark
\long\def\@makefntext#1{%
+ \localleftbox{}%
+ \let\FBeverypar at save\FBeverypar at quote
+ \let\FBeverypar at quote\relax
\ifFBFrenchFootnotes
\ifx\footnote\thanks
\let\@@makefnmark\@@makefnmarkTH
- \begingroup\localleftbox{}\let\FBeverypar at quote\relax
- \@makefntextTH{#1}\endgroup
+ \@makefntextTH{#1}
\else
\let\@@makefnmark\@@makefnmarkFB
- \begingroup\localleftbox{}\let\FBeverypar at quote\relax
- \@makefntextFB{#1}\endgroup
+ \@makefntextFB{#1}
\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}%
+ \fi
+ \let\FBeverypar at quote\FBeverypar at save
+ \localleftbox{\FBeveryline at quote}}%
\else
\@ifclassloaded{memoir}%
{\ifFBFrenchFootnotes
@@ -1904,14 +1904,17 @@
\fi
\fi
}{}%
- \long\def\@makefntext#1{\begingroup
+ \long\def\@makefntext#1{%
\localleftbox{}%
+ \let\FBeverypar at save\FBeverypar at quote
\let\FBeverypar at quote\relax
\ifFBFrenchFootnotes
\@makefntextFB{#1}%
\else
\@makefntextORI{#1}%
- \fi\endgroup}%
+ \fi
+ \let\FBeverypar at quote\FBeverypar at save
+ \localleftbox{\FBeveryline at quote}}%
\fi
}%
}
Modified: trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf 2018-09-14 20:55:20 UTC (rev 48664)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf 2018-09-14 20:55:35 UTC (rev 48665)
@@ -5,7 +5,7 @@
%% The original source files were:
%%
%% frenchb.dtx (with options: `frenchb')
-%% This is a generated file part of the the babel-french bundle
+%% This is a generated file part of the babel-french bundle
%% to be used with the Babel system.
%% -------------------------------------------------------------
%%
@@ -24,7 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{frenchb}
- [2018/07/17 v3.5b French support from the babel system]
+ [2018/09/14 v3.5c 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-09-14 20:55:20 UTC (rev 48664)
+++ trunk/Master/texmf-dist/tex/generic/babel-french/frenchb.lua 2018-09-14 20:55:35 UTC (rev 48665)
@@ -1,6 +1,6 @@
--[[
File `frenchb.lua’ generated from frenchb.dtx
- [2018/07/17 v3.5b French support from the babel system]
+ [2018/09/14 v3.5c French support from the babel system]
Copyright © 2014-2018 Daniel Flipo
<daniel (dot) flipo (at) free (dot) fr>
License LPPL: see french.ldf.
More information about the tex-live-commits
mailing list