summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/babel-french
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-09-14 20:55:35 +0000
committerKarl Berry <karl@freefriends.org>2018-09-14 20:55:35 +0000
commitadcb6d9ce890e651a9643950e377f045d7803e26 (patch)
treed584b6acce2fe2f722860189f1c23afe5abccc62 /Master/texmf-dist/tex/generic/babel-french
parent444e8049bcee0aa51c06dcb124f92180fa2acf4d (diff)
babel-french (14sep18)
git-svn-id: svn://tug.org/texlive/trunk@48665 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/acadian.ldf4
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/canadien.ldf4
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/francais.ldf4
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/french.ldf51
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/frenchb.ldf4
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/frenchb.lua2
6 files changed, 36 insertions, 33 deletions
diff --git a/Master/texmf-dist/tex/generic/babel-french/acadian.ldf b/Master/texmf-dist/tex/generic/babel-french/acadian.ldf
index e42ff1b6a77..1fe294b616e 100644
--- a/Master/texmf-dist/tex/generic/babel-french/acadian.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/acadian.ldf
@@ -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
diff --git a/Master/texmf-dist/tex/generic/babel-french/canadien.ldf b/Master/texmf-dist/tex/generic/babel-french/canadien.ldf
index 42a14cffb0a..ee4f43e0c38 100644
--- a/Master/texmf-dist/tex/generic/babel-french/canadien.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/canadien.ldf
@@ -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
diff --git a/Master/texmf-dist/tex/generic/babel-french/francais.ldf b/Master/texmf-dist/tex/generic/babel-french/francais.ldf
index 4b67f057bfa..1635db6179c 100644
--- a/Master/texmf-dist/tex/generic/babel-french/francais.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/francais.ldf
@@ -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
diff --git a/Master/texmf-dist/tex/generic/babel-french/french.ldf b/Master/texmf-dist/tex/generic/babel-french/french.ldf
index 2e38c830121..24d87693dc3 100644
--- a/Master/texmf-dist/tex/generic/babel-french/french.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/french.ldf
@@ -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@savevariable{\lccode`\'}%
+ \babel@savevariable{\lccode"27}%
+ \lccode"27="27
\ifFBunicode
- \babel@savevariable{\lccode"2019}%
- \lccode`\'="2019\lccode"2019="2019
- \else
- \lccode`\'=`\'
+ \babel@savevariable{\lccode"2019}%
+ \lccode"2019="2019
\fi
}
\def\noextrasfrench{\FBfrenchfalse}
@@ -549,8 +548,9 @@
\newcommand*{\og}{\@empty}
\newcommand*{\fg}{\@empty}
\ifLaTeXe
- \def\bbl@frenchguillemets{\renewcommand*{\og}{\FB@og}%
- \renewcommand*{\fg}{\FB@fg\xspace}}
+ \def\bbl@frenchguillemets{%
+ \renewcommand*{\og}{\FB@og}%
+ \renewcommand*{\fg}{\FB@fg\xspace}}
\renewcommand*{\og}{\textquotedblleft}
\renewcommand*{\fg}{\ifdim\lastskip>\z@\unskip\fi
\textquotedblright\xspace}
@@ -641,9 +641,11 @@
\fi
\fi
\advance\FBguill@level by \m@ne
- \let\FBeverypar@quote\relax
- \let\FBeveryline@quote\empty
- \ifx\FBeverylineguill\FBguillnone\else\localleftbox{}\fi
+ \ifcase\FBguill@level \let\FBeverypar@quote\relax
+ \or \def\FBeverypar@quote{\FBeveryparguill\FB@guillspace}%
+ \let\FBeveryline@quote\empty
+ \ifx\FBeverylineguill\FBguillnone\else\localleftbox{}\fi
+ \fi
}
\def\BabelLanguages{french,acadian}
\StartBabelCommands*{\BabelLanguages}{date}
@@ -1868,25 +1870,23 @@
\ifFB@koma
\let\@@makefnmarkORI\@@makefnmark
\long\def\@makefntext#1{%
+ \localleftbox{}%
+ \let\FBeverypar@save\FBeverypar@quote
+ \let\FBeverypar@quote\relax
\ifFBFrenchFootnotes
\ifx\footnote\thanks
\let\@@makefnmark\@@makefnmarkTH
- \begingroup\localleftbox{}\let\FBeverypar@quote\relax
- \@makefntextTH{#1}\endgroup
+ \@makefntextTH{#1}
\else
\let\@@makefnmark\@@makefnmarkFB
- \begingroup\localleftbox{}\let\FBeverypar@quote\relax
- \@makefntextFB{#1}\endgroup
+ \@makefntextFB{#1}
\fi
\else
- \localleftbox{}%
- \let\FBeverypar@save\FBeverypar@quote
- \let\FBeverypar@quote\relax
\let\@@makefnmark\@@makefnmarkORI
\@makefntextORI{#1}%
- \let\FBeverypar@quote\FBeverypar@save
- \localleftbox{\FBeveryline@quote}%
- \fi}%
+ \fi
+ \let\FBeverypar@quote\FBeverypar@save
+ \localleftbox{\FBeveryline@quote}}%
\else
\@ifclassloaded{memoir}%
{\ifFBFrenchFootnotes
@@ -1904,14 +1904,17 @@
\fi
\fi
}{}%
- \long\def\@makefntext#1{\begingroup
+ \long\def\@makefntext#1{%
\localleftbox{}%
+ \let\FBeverypar@save\FBeverypar@quote
\let\FBeverypar@quote\relax
\ifFBFrenchFootnotes
\@makefntextFB{#1}%
\else
\@makefntextORI{#1}%
- \fi\endgroup}%
+ \fi
+ \let\FBeverypar@quote\FBeverypar@save
+ \localleftbox{\FBeveryline@quote}}%
\fi
}%
}
diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
index 50870a3041a..d6a09161eaa 100644
--- a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
@@ -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@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 fdc815103cb..2912843766f 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
- [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.