summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/babel-french
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-04-09 22:39:50 +0000
committerKarl Berry <karl@freefriends.org>2015-04-09 22:39:50 +0000
commit2268c64ac8b49cb65c08ddd96e618622c140d8f7 (patch)
tree0c530404338de433f6795105f2bec4592a4a5015 /Master/texmf-dist/tex/generic/babel-french
parentf2c2457997e4318b60a659d59a9814ed967aa0be (diff)
babel-french (9apr15)
git-svn-id: svn://tug.org/texlive/trunk@36754 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/frenchb.ldf41
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/frenchb.lua2
2 files changed, 33 insertions, 10 deletions
diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
index 10683a42650..8f266d3fdac 100644
--- a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
@@ -33,7 +33,7 @@
%% extension .ins) which are part of the distribution.
%%
\ProvidesLanguage{frenchb}
- [2014/10/25 v3.1c French support from the babel system]
+ [2015/04/06 v3.1d French support from the babel system]
%%
%% File `frenchb.ldf'
%% Babel package for LaTeX version 2e
@@ -567,10 +567,9 @@
\def\FBeverypar@quote{\FBeveryparguill
\kern.8\fontdimen2\font}%
\fi
- \expandafter\csname og\romannumeral\FBguill@level\endcsname
+ \ogi
\everypar \expandafter{\the\everypar \FBeverypar@quote}%
- #1%
- \expandafter\csname fg\romannumeral\FBguill@level\endcsname
+ #1\fgi
\else
\ifx\FBeverylineguill\FBguillopen
\luatexlocalleftbox{\guillemotleft\kern.8\fontdimen2\font}%
@@ -597,11 +596,7 @@
\kern.8\fontdimen2\font}%
\fi
\fi
- \expandafter\csname og\romannumeral\FBguill@level\endcsname
- #1%
- \ifFBcloseguill\expandafter
- \csname fg\romannumeral\FBguill@level\endcsname
- \fi
+ \ogii #1\ifFBcloseguill \fgii \fi
\fi
\fi
\fi
@@ -952,6 +947,34 @@
}
\def\bbl@frenchdots{\babel@save\Tdots@ \let\Tdots@\FBtextellipsis}
\FB@addto{extras}{\bbl@frenchdots}
+\ifFB@active@punct
+ \@ifpackageloaded{listings}
+ {\FBWarning{frenchb.ldf}%
+ {Please load the "listings" package\MessageBreak
+ AFTER babel/frenchb; reported}%
+ }{}
+\fi
+\newif\if@FBwarning@natbib
+\ifFB@active@punct
+ \@ifpackageloaded{natbib}{}{\@FBwarning@natbibtrue}
+\fi
+\AtBeginDocument{%
+ \if@FBwarning@natbib
+ \@ifpackageloaded{natbib}{}{\@FBwarning@natbibfalse}%
+ \fi
+ \if@FBwarning@natbib
+ \FBWarning{frenchb.ldf}%
+ {Please load the "natbib" package\MessageBreak
+ BEFORE babel/frenchb; reported}%
+ \fi
+}
+\@ifpackageloaded{numprint}
+ {\ifnprt@autolanguage
+ \FBWarning{frenchb.ldf}%
+ {Please load the "numprint" package\MessageBreak
+ AFTER babel/frenchb; reported}%
+ \fi
+ }{}
\newcommand*{\frenchbsetup}[1]{%
\setkeys{FB}{#1}%
}%
diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.lua b/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
index 8fea2ed965b..bad3f4d6dbb 100644
--- a/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
+++ b/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
@@ -1,5 +1,5 @@
--
--- File `frenchb.lua' generated from frenchb.dtx [2014/10/25 v3.1c]
+-- File `frenchb.lua' generated from frenchb.dtx [2015/04/06 v3.1d]
--
-- Copyright (C) 2014 Daniel Flipo <daniel.flipo at free.fr>
-- License LPPL: see frenchb.dtx.