diff options
Diffstat (limited to 'Master')
| -rw-r--r-- | Master/texmf-dist/doc/generic/babel-french/frenchb.pdf | bin | 248296 -> 258269 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/generic/babel-french/frenchb.dtx | 124 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/babel-french/frenchb.ldf | 41 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/babel-french/frenchb.lua | 2 |
4 files changed, 121 insertions, 46 deletions
diff --git a/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf b/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf Binary files differindex 9f95cce6a7d..cc11271c13f 100644 --- a/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf +++ b/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf diff --git a/Master/texmf-dist/source/generic/babel-french/frenchb.dtx b/Master/texmf-dist/source/generic/babel-french/frenchb.dtx index 0821c0870ae..9842286e5e7 100644 --- a/Master/texmf-dist/source/generic/babel-french/frenchb.dtx +++ b/Master/texmf-dist/source/generic/babel-french/frenchb.dtx @@ -1,4 +1,4 @@ -%\CheckSum{3296} +%\CheckSum{3305} % %\iffalse % Tell the \LaTeX\ system who we are and write an entry on the @@ -13,14 +13,14 @@ %<ldf>\ProvidesLanguage{frenchb} %\ProvidesFile{frenchb.dtx} %<*!lua> - [2014/10/25 v3.1c French support from the babel system] + [2015/04/06 v3.1d French support from the babel system] %</!lua> %<*internal> \iffalse %</internal> %<*lua> -- --- 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. @@ -62,8 +62,8 @@ \usepackage[colorlinks,urlcolor=blue,unicode]{hyperref} \newcommand*\babel{\textsf{babel}} \newcommand*\frenchb{\textsf{frenchb}} -\newcommand*\note[1]{} -\newcommand*\Lopt[1]{\textsf{#1}} +\newcommand*\Lopt[1]{\texttt{#1}} +\newcommand*\opt[1]{\texttt{#1}} \newcommand*\file[1]{\texttt{#1}} \newcommand*\cls[1]{\texttt{#1}} \newcommand*\pkg[1]{\texttt{#1}} @@ -85,6 +85,7 @@ \clearpage\PrintChanges } \begin{document} +\sffamily \setlength{\parindent}{0pt} \GetFileInfo{frenchb.dtx} \begin{center} @@ -221,7 +222,8 @@ % française'', several variants are provided through options: % \begin{itemize} % \item with LuaTeX based engines, every line of the inner -% quotation will start with a French guillemet (« or ») +% quotation will start with a French opening or closing +% guillemet (« or ») % depending on option \fbo{EveryLineGuill=open} (default) or % \fbo{=close} unless you explicitly set % \fbo{EveryLineGuill=none}, then |\frquote{}| will behave @@ -408,10 +410,10 @@ % symbol calling the footnote. Making this option \fbo{false} % reverts to the standard setting (no space added). % \item [FrenchSuperscripts=false (true)]; then -% |\up=\textsuperscript| (option added in version 2.1). -% Should only be made \fbo{false} to recompile older documents. -% By default |\up| now relies on |\fup| designed to produce -% better looking superscripts. +% |\up=\textsuperscript|. % (option added in version 2.1). +% Should only be made \fbo{false} to recompile documents written +% before 2008 without changes: by default |\up| now relies on +% |\fup| designed to produce better looking superscripts. % \item [AutoSpacePunctuation=false (true)]; in French, the user % \emph{should} input a space before the four characters `|:;!?|' % but as many people forget about it (even among native French @@ -463,8 +465,8 @@ % colon otherwise). Intended for standard \LaTeX{} classes only. % \item [SmallCapsFigTabcaptions=false (true*)]; when set to % \fbo{false}, |\figurename| and |\tablename| will be printed in -% French captions as ``Figure'' and ``Table'' instead of -% ``\textsc{Figure}'' and ``\textsc{Table}'' (the default). +% French captions as ``Figure'' and ``Table'' instead of being +% printed in small caps (the default). % \item [SuppressWarning=true (false)]; can be turned to \fbo{true} % if you are bored with \frenchb's warnings. % \item [INGuillSpace=true (false)] resets the dimensions of spaces @@ -560,8 +562,7 @@ % \cls{book}. % The last option, \fbo{SmallCapsFigTabcaptions}, can be set to % \fbo{false} to typeset |\figurename| and |\tablename| in French as -% ``Figure'' and ``Table'' instead of \textsc{Figure} and -% \textsc{Table} (the default). +% ``Figure'' and ``Table'' rather than in small caps (the default). % % \subsection{Hyphenation checks} % \label{ssec-hyphen} @@ -1811,9 +1812,9 @@ return french_punctuation % \begin{macro}{\FB@xetex@punct@nonfrench} % The following command will be executed when leaving French for % restoring classes and commands modified in French. -% When French is not the main language, |\noextrasfrench| is -% executed `AtBeginDocument', so the test on -% |\FB@charclassesORI| is mandatory. +% When French is not the main language, |\noextrasfrench| is +% executed `AtBeginDocument', the test on |\FB@charclassesORI| is +% mandatory. % \begin{macrocode} \newcommand*{\FB@xetex@punct@nonfrench}{% \ifx\FB@charclassesORI\empty @@ -2282,10 +2283,9 @@ return french_punctuation \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 % \end{macrocode} % This for level 2 (inner) quotations: Omega's command @@ -2322,11 +2322,7 @@ return french_punctuation \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 @@ -2845,6 +2841,7 @@ return french_punctuation % `AtBeginDocument' by \cs{FBprocess@options}.} % % \subsection{Caption names} +% \label{ssec-captions} % % The next step consists in defining the French equivalents for % the \LaTeX{} caption names. @@ -3191,6 +3188,61 @@ return french_punctuation % \end{macrocode} % \end{macro} % +% \subsection{More checks about packages' loading order} +% \label{ssec-loading-order} +% +% \changes{v3.1d}{2015/04/06}{New section: issue warnings if packages +% listings, numprint and natbib are loaded too early or too late +% vs babel.} +% +% Like packages \file{captions} and \file{floatrow} (see +% section~\ref{ssec-captions}), package \file{listings} should be +% loaded after \babel/\frenchb{} due to active characters issues +% (pdfLaTeX only). +% +% \begin{macrocode} +\ifFB@active@punct + \@ifpackageloaded{listings} + {\FBWarning{frenchb.ldf}% + {Please load the "listings" package\MessageBreak + AFTER babel/frenchb; reported}% + }{} +\fi +% \end{macrocode} +% +% Package \file{natbib} should be loaded before \babel/\frenchb{} +% due to active characters issues (pdfLaTeX only). +% +% \begin{macrocode} +\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 +} +% \end{macrocode} +% +% Package \file{numprint} with option \opt{autolanguage} should be +% loaded after \babel/\frenchb{} (all engines). +% +% \begin{macrocode} +\@ifpackageloaded{numprint} + {\ifnprt@autolanguage + \FBWarning{frenchb.ldf}% + {Please load the "numprint" package\MessageBreak + AFTER babel/frenchb; reported}% + \fi + }{} +% \end{macrocode} +% % \subsection{Setup options: keyval stuff} % \label{ssec-keyval} % @@ -3813,12 +3865,12 @@ return french_punctuation \fi \fi % \end{macrocode} -% When \fbo{true}, \fbo{ThinSpaceInFrenchNumbers} redefines -% |numprint.sty|'s command |\npstylefrench| to set |\npthousandsep| -% to |\,| (thinspace) instead of |~| (default) . This option has no -% effect if package \pkg{numprint} is not loaded with -% `|autolanguage|'. As old versions of \pkg{numprint} did not -% define |\npstylefrench|, we have to provide this command. +% When package \pkg{numprint} is loaded with option +% \opt{autolanguage}, \pkg{numprint}'s command |\npstylefrench| has +% to be redefined differently according to the value of flag +% \fbo{ThinSpaceInFrenchNumbers}. +% As |\npstylefrench| was undefined in old versions of +% \pkg{numprint}, we have to provide this command. % \begin{macrocode} \@ifpackageloaded{numprint}% {\ifnprt@autolanguage @@ -3870,9 +3922,9 @@ return french_punctuation % \changes{v3.0a}{2014/02/20}{With koma-script and memoir class, % customise \cs{captionformat} and \cs{captiondelim}.} % -% Use French |\CaptionSeparator| for koma-script and \cls{memoir} -% classes unless \fbo{CustomiseFigTabCaptions} has been set to -% \fbo{false} (the default). +% Unless \fbo{CustomiseFigTabCaptions} has been set to \fbo{false}, +% use |\CaptionSeparator| for koma-script and \cls{memoir} +% classes. % \begin{macrocode} \ifFBCustomiseFigTabCaptions \ifFB@koma @@ -4001,8 +4053,8 @@ return french_punctuation % \begin{macrocode} \FBprocess@options % \end{macrocode} -% With LuaTeX engines it is time to load file \file{frenchb.lua} -% (|\FBthinskip| and |\FBcolonskip| values are set now). +% With LuaTeX engines (|\FBthinskip| and |\FBcolonskip| values are +% set now), it is time to load file \file{frenchb.lua}. % \begin{macrocode} \ifFB@luatex@punct \activate@luatexpunct 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. |