diff options
Diffstat (limited to 'Master/texmf-dist/tex/generic')
-rw-r--r-- | Master/texmf-dist/tex/generic/babel-french/frenchb.ldf | 130 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel-french/frenchb.lua | 2 |
2 files changed, 70 insertions, 62 deletions
diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf index 1ae4b888fde..496da883135 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} - [2015/10/04 v3.1i French support from the babel system] + [2015/11/25 v3.1j French support from the babel system] %% %% File `frenchb.ldf' %% Babel package for LaTeX version 2e @@ -189,25 +189,29 @@ \newskip\FBthinskip \FBthinskip=1.66672pt \relax \ifFB@luatex@punct - \directlua{tex.enableprimitives("", - tex.extraprimitives( - "omega", "aleph", "luatex"))} - \ifLaTeXe - \AtEndOfPackage{% - \RequirePackage{luatexbase}% - \newluatexattribute\FB@addDPspace \FB@addDPspace=1 \relax - \newluatexattribute\FB@addGUILspace \FB@addGUILspace=0 \relax - } - \PackageInfo{frenchb.ldf}{No need for active punctuation characters% - \MessageBreak with this version of LuaTeX!% - \MessageBreak reported} - \else - \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname newluatexattribute\endcsname\relax + \directlua{tex.enableprimitives("", tex.extraprimitives("omega"))} + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname newluafunction\endcsname\relax + \ifLaTeXe + \AtEndOfPackage{% + \RequirePackage{luatexbase}% + \newluatexattribute\FB@addDPspace \FB@addDPspace=1 \relax + \newluatexattribute\FB@addGUILspace \FB@addGUILspace=0 \relax + } + \else \input luatexbase.sty + \newluatexattribute\FB@addDPspace \FB@addDPspace=1 \relax + \newluatexattribute\FB@addGUILspace \FB@addGUILspace=0 \relax \fi - \newluatexattribute\FB@addDPspace \FB@addDPspace=1 \relax - \newluatexattribute\FB@addGUILspace \FB@addGUILspace=0 \relax + \else + \newattribute\FB@addDPspace \FB@addDPspace=1 \relax + \newattribute\FB@addGUILspace \FB@addGUILspace=0 \relax + \fi + \ifLaTeXe + \PackageInfo{frenchb.ldf}{No need for active punctuation + characters\MessageBreak with this version + of LuaTeX!\MessageBreak reported} + \else \fb@info{No need for active punctuation characters\\ with this version of LuaTeX!} \fi @@ -425,7 +429,7 @@ \let\AutoSpaceBeforeFDP\autospace@beforeFDP \let\NoAutoSpaceBeforeFDP\noautospace@beforeFDP \AutoSpaceBeforeFDP - \fi +\fi \ifLaTeXe \DeclareRobustCommand\ttfamilyFB{% \FBAutoSpaceGuillfalse @@ -518,6 +522,7 @@ \newcommand*{\ogii}{\textquotedblleft} \newcommand*{\fgii}{\textquotedblright} \newcount\FBguill@level +\newtoks\FB@everypar \newif\ifFBcloseguill \FBcloseguilltrue \newif\ifFBInnerGuillSingle \def\FBguillopen{\bgroup\NoAutoSpacing\guillemotleft\egroup} @@ -537,55 +542,58 @@ \newcommand\frquote[1]{\fr@quote{#1}} \fi \newcommand{\fr@quote}[1]{% - \bgroup - \ifnum\FBguill@level=2 - \PackageWarning{frenchb.ldf}{% - \protect\frquote\space accepts no more than two levels - \MessageBreak of quotations. Reported} + \leavevmode + \advance\FBguill@level by \@ne + \def\FB@quotespace{\kern.8\fontdimen2\font}% + \ifcase\FBguill@level + \or + \FB@everypar=\everypar + \ifx\FBeveryparguill\relax \else - \advance\FBguill@level by \@ne + \def\FBeverypar@quote{\FBeveryparguill\FB@quotespace}% + \everypar=\expandafter{\the\everypar \FBeverypar@quote}% \fi - \ifnum\FBguill@level=1 - \ifx\FBeveryparguill\relax - \let\FBeverypar@quote\relax - \else - \def\FBeverypar@quote{\FBeveryparguill - \kern.8\fontdimen2\font}% - \fi - \ogi - \everypar \expandafter{\the\everypar \FBeverypar@quote}% - #1\fgi + \ogi #1\fgi + \or + \ifx\FBeverylineguill\FBguillopen + \localleftbox{\guillemotleft\FB@quotespace}% + \let\FBeverypar@quote\relax + \ogi #1\ifFBcloseguill\fgi\fi \else - \ifx\FBeverylineguill\FBguillopen - \localleftbox{\guillemotleft\kern.8\fontdimen2\font}% + \ifx\FBeverylineguill\FBguillclose + \localleftbox{\guillemotright\FB@quotespace}% \let\FBeverypar@quote\relax - \FB@og #1\ifFBcloseguill\FB@fg\fi + \ogi #1\ifFBcloseguill\fgi\fi \else - \ifx\FBeverylineguill\FBguillclose - \localleftbox{\guillemotright\kern.8\fontdimen2\font}% - \let\FBeverypar@quote\relax - \FB@og #1\ifFBcloseguill\FB@fg\fi - \else - \let\FBeverypar@quote\relax - \ifFBInnerGuillSingle - \def\ogii{\leavevmode - \guilsinglleft\FBguillspace}% - \def\fgii{\ifdim\lastskip>\z@\unskip\fi - \FBguillspace\guilsinglright}% - \ifx\FBeveryparguill\FBguillopen - \def\FBeverypar@quote{\guilsinglleft - \kern.8\fontdimen2\font}% - \fi - \ifx\FBeveryparguill\FBguillclose - \def\FBeverypar@quote{\guilsinglright - \kern.8\fontdimen2\font}% - \fi - \fi - \ogii #1\ifFBcloseguill \fgii \fi - \fi + \let\FBeverypar@quote\relax + \ifFBInnerGuillSingle + \def\ogii{\leavevmode + \guilsinglleft\FBguillspace}% + \def\fgii{\ifdim\lastskip>\z@\unskip\fi + \FBguillspace\guilsinglright}% + \ifx\FBeveryparguill\FBguillopen + \def\FBeverypar@quote{\guilsinglleft\FB@quotespace}% + \fi + \ifx\FBeveryparguill\FBguillclose + \def\FBeverypar@quote{\guilsinglright\FB@quotespace}% + \fi + \fi + \ogii #1\ifFBcloseguill \fgii \fi \fi \fi - \egroup + \else + \ifx\PackageWarning\@undefined + \fb@warning{\noexpand\frquote\space accepts no more than + two levels.\\ Quotation not printed.}% + \else + \PackageWarning{frenchb.ldf}{% + \protect\frquote\space accepts no more than two levels + \MessageBreak Quotation not printed. Reported} + \fi + \fi + \advance\FBguill@level by \m@ne + \ifx\FBeverylineguill\FBguillnone\else\localleftbox{}\fi + \ifx\FBeveryparguill\relax\else\everypar=\FB@everypar\fi } \ifLaTeXe \def\BabelLanguages{french,acadian} diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.lua b/Master/texmf-dist/tex/generic/babel-french/frenchb.lua index 685ce072e07..9640acbfc68 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 [2015/06/26 v3.1g] +-- File `frenchb.lua' generated from frenchb.dtx [2015/11/25 v3.1j] -- -- Copyright (C) 2014-2015 Daniel Flipo -- <daniel (dot) flipo (at) free (dot) fr> |