From e5db423bac837a15f88a6ed1f46540d852b4ce46 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 2 Apr 2019 21:11:24 +0000 Subject: babel-french (2apr19) git-svn-id: svn://tug.org/texlive/trunk@50711 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/generic/babel-french/acadian.ldf | 2 +- .../tex/generic/babel-french/canadien.ldf | 2 +- .../tex/generic/babel-french/francais.ldf | 2 +- .../texmf-dist/tex/generic/babel-french/french.ldf | 55 +++++++++++++--------- .../tex/generic/babel-french/frenchb.ldf | 2 +- .../tex/generic/babel-french/frenchb.lua | 2 +- 6 files changed, 38 insertions(+), 27 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/generic/babel-french/acadian.ldf b/Master/texmf-dist/tex/generic/babel-french/acadian.ldf index 0cebb369f07..6a3fc718ac3 100644 --- a/Master/texmf-dist/tex/generic/babel-french/acadian.ldf +++ b/Master/texmf-dist/tex/generic/babel-french/acadian.ldf @@ -24,7 +24,7 @@ %% Please report errors to: %% \ProvidesLanguage{acadian} - [2019/01/30 v3.5d French support from the babel system] + [2019/03/30 v3.5e French support from the babel system] \PackageInfo{acadian.ldf}% {`acadian' dialect is currently\MessageBreak *absolutely identical* to the\MessageBreak diff --git a/Master/texmf-dist/tex/generic/babel-french/canadien.ldf b/Master/texmf-dist/tex/generic/babel-french/canadien.ldf index 86dbbfd4411..dafc522136a 100644 --- a/Master/texmf-dist/tex/generic/babel-french/canadien.ldf +++ b/Master/texmf-dist/tex/generic/babel-french/canadien.ldf @@ -24,7 +24,7 @@ %% Please report errors to: %% \ProvidesLanguage{canadien} - [2019/01/30 v3.5d French support from the babel system] + [2019/03/30 v3.5e 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 diff --git a/Master/texmf-dist/tex/generic/babel-french/francais.ldf b/Master/texmf-dist/tex/generic/babel-french/francais.ldf index db3a710306f..2f078785dc5 100644 --- a/Master/texmf-dist/tex/generic/babel-french/francais.ldf +++ b/Master/texmf-dist/tex/generic/babel-french/francais.ldf @@ -24,7 +24,7 @@ %% Please report errors to: %% \ProvidesLanguage{francais} - [2019/01/30 v3.5d French support from the babel system] + [2019/03/30 v3.5e 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 diff --git a/Master/texmf-dist/tex/generic/babel-french/french.ldf b/Master/texmf-dist/tex/generic/babel-french/french.ldf index ecb35924393..fcf3dc7d05b 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: %% \ProvidesLanguage{french} - [2019/01/30 v3.5d French support from the babel system] + [2019/03/30 v3.5e French support from the babel system] %% %% Babel package for LaTeX version 2e %% Copyright © 1996-2019 @@ -563,8 +563,12 @@ \addto\extrasfrench{\babel@save\og \babel@save\fg \bbl@frenchguillemets} \newcommand*{\ogi}{\FB@og} \newcommand*{\fgi}{\FB@fg} +\newcommand*{\@ogi}{\ifmmode\hbox{\ogi}\else\ogi\fi} +\newcommand*{\@fgi}{\ifmmode\hbox{\fgi}\else\fgi\fi} \newcommand*{\ogii}{\textquotedblleft} \newcommand*{\fgii}{\textquotedblright} +\newcommand*{\@ogii}{\ifmmode\hbox{\ogii}\else\ogii\fi} +\newcommand*{\@fgii}{\ifmmode\hbox{\fgii}\else\fgii\fi} \newcount\FBguill@level \newtoks\FBold@everypar \def\FB@addquote@everypar{% @@ -600,19 +604,21 @@ \def\FBeverypar@quote{\FBeveryparguill\FB@guillspace}% \FB@addquote@everypar \fi - \ogi #1\fgi + \@ogi #1\@fgi \or \ifx\FBeverylineguill\FBguillopen - \def\FBeveryline@quote{\guillemotleft\FB@guillspace}% + \def\FBeveryline@quote{\FB@addGUILspace=0 \guillemotleft + \FB@guillspace}% \localleftbox{\FBeveryline@quote}% \let\FBeverypar@quote\relax - \ogi #1\ifFBcloseguill\fgi\fi + \@ogi #1\ifFBcloseguill\@fgi\fi \else \ifx\FBeverylineguill\FBguillclose - \def\FBeveryline@quote{\guillemotright\FB@guillspace}% + \def\FBeveryline@quote{\FB@addGUILspace=0 \guillemotright + \FB@guillspace}% \localleftbox{\FBeveryline@quote}% \let\FBeverypar@quote\relax - \ogi #1\ifFBcloseguill\fgi\fi + \@ogi #1\ifFBcloseguill\@fgi\fi \else \let\FBeverypar@quote\relax \ifFBInnerGuillSingle @@ -627,7 +633,7 @@ \def\FBeverypar@quote{\guilsinglright\FB@guillspace}% \fi \fi - \ogii #1\ifFBcloseguill \fgii \fi + \@ogii #1\ifFBcloseguill \@fgii \fi \fi \fi \else @@ -640,13 +646,14 @@ \MessageBreak Quotation not printed. Reported} \fi \fi - \advance\FBguill@level by \m@ne - \ifcase\FBguill@level \let\FBeverypar@quote\relax - \or \def\FBeverypar@quote{\FBeveryparguill\FB@guillspace}% - \let\FBeveryline@quote\empty + \global\advance\FBguill@level by \m@ne + \ifcase\FBguill@level \global\let\FBeverypar@quote\relax + \or \gdef\FBeverypar@quote{\FBeveryparguill\FB@guillspace}% + \global\let\FBeveryline@quote\empty \ifx\FBeverylineguill\FBguillnone\else\localleftbox{}\fi \fi } +\newcommand*{\NoEveryParQuote}{\let\FBeveryparguill\FBguillnone} \def\BabelLanguages{french,acadian} \StartBabelCommands*{\BabelLanguages}{date} [unicode, fontenc=TU EU1 EU2, charset=utf8] @@ -1144,7 +1151,14 @@ \define@key{FB}{ShowOptions}[true]% {\csname FBShowOptions#1\endcsname}% \define@key{FB}{StandardLayout}[true]% - {\csname FBStandardLayout#1\endcsname + {\ifFB@mainlanguage@FR + \csname FBStandardLayout#1\endcsname + \else + \PackageWarning{french.ldf}% + {Option `StandardlLayout' skipped:\MessageBreak + French is *not* babel's last option.\MessageBreak + Reported}% + \fi \ifFBStandardLayout \FBStandardListSpacingtrue \FBStandardItemizeEnvtrue @@ -1164,16 +1178,13 @@ \FBAutoSpaceFootnotestrue \fi}% \define@key{FB}{GlobalLayoutFrench}[true]% - {\csname FBGlobalLayoutFrench#1\endcsname - \ifFBGlobalLayoutFrench - \ifFB@mainlanguage@FR - \else - \FBGlobalLayoutFrenchfalse - \PackageWarning{french.ldf}% - {Option `GlobalLayoutFrench' skipped:\MessageBreak - French is *not* babel's last option.\MessageBreak - Reported}% - \fi + {\ifFB@mainlanguage@FR + \csname FBGlobalLayoutFrench#1\endcsname + \else + \PackageWarning{french.ldf}% + {Option `GlobalLayoutFrench' skipped:\MessageBreak + French is *not* babel's last option.\MessageBreak + Reported}% \fi}% \define@key{FB}{ReduceListSpacing}[true]% {\csname FBReduceListSpacing#1\endcsname diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf index f9ae6bf5778..2b5303d49c6 100644 --- a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf +++ b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf @@ -24,7 +24,7 @@ %% Please report errors to: %% \ProvidesLanguage{frenchb} - [2019/01/30 v3.5d French support from the babel system] + [2019/03/30 v3.5e French support from the babel system] \def\bbl@tempa{frenchb} \ifx\CurrentOption\bbl@tempa \let\l@frenchb\l@french diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.lua b/Master/texmf-dist/tex/generic/babel-french/frenchb.lua index 029f433845a..cb54ac92e52 100644 --- a/Master/texmf-dist/tex/generic/babel-french/frenchb.lua +++ b/Master/texmf-dist/tex/generic/babel-french/frenchb.lua @@ -1,6 +1,6 @@ --[[ File `frenchb.lua’ generated from frenchb.dtx - [2019/01/30 v3.5d French support from the babel system] + [2019/03/30 v3.5e French support from the babel system] Copyright © 2014-2019 Daniel Flipo License LPPL: see french.ldf. -- cgit v1.2.3