diff options
Diffstat (limited to 'Master/texmf-dist/source')
| -rw-r--r-- | Master/texmf-dist/source/generic/babel-french/frenchb.dtx | 314 | ||||
| -rw-r--r-- | Master/texmf-dist/source/generic/babel-french/frenchb.ins | 63 |
2 files changed, 204 insertions, 173 deletions
diff --git a/Master/texmf-dist/source/generic/babel-french/frenchb.dtx b/Master/texmf-dist/source/generic/babel-french/frenchb.dtx index f4b263f49d0..bf8cba8ecbc 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{3486} +%\CheckSum{3473} % %\iffalse % Tell the \LaTeX\ system who we are and write an entry on the @@ -6,44 +6,36 @@ %<*dtx> \ProvidesFile{frenchb.dtx} %</dtx> -% \changes{v2.1d}{2008/05/04}{Argument of \cs{ProvidesLanguage} changed -% from `french’ to `frenchb’, otherwise \cs{listfiles} prints -% no date/version information. The bug with \cs{listfiles} -% (introduced in v.~1.5!), was pointed out by Ulrike Fischer.} -%<ldf>\ProvidesLanguage{frenchb} -%\ProvidesFile{frenchb.dtx} -%<*!lua> - [2017/04/30 v3.3a French support from the babel system] -%</!lua> +%<acadian>\ProvidesLanguage{acadian} +%<canadien>\ProvidesLanguage{canadien} +%<francais>\ProvidesLanguage{francais} +%<french>\ProvidesLanguage{french} +%<frenchb>\ProvidesLanguage{frenchb} +%<lua>--[[ +%<lua> File `frenchb.lua’ generated from frenchb.dtx + [2017/07/08 v3.3b French support from the babel system] %<*internal> \iffalse %</internal> %<*lua> --- --- File `frenchb.lua’ generated from frenchb.dtx [2017/04/30 v3.3a] --- --- Copyright © 2014-2017 Daniel Flipo --- <daniel (dot) flipo (at) free (dot) fr> --- License LPPL: see frenchb.ldf. --- + Copyright © 2014-2017 Daniel Flipo + <daniel (dot) flipo (at) free (dot) fr> + License LPPL: see french.ldf. +--]] %</lua> %<*internal> \fi %</internal> %<*dtx> -%% %% File `frenchb.dtx’ %</dtx> -%<*ldf> +%<*dtx|french> %% -%% File `frenchb.ldf’ -%</ldf> -%<*dtx|ldf> %% Babel package for LaTeX version 2e %% Copyright © 1996 - 2017 %% by Daniel Flipo <daniel (dot) flipo (at) free (dot) fr> %% -%</dtx|ldf> +%</dtx|french> %<*dtx> %% This file is part of the babel system, it provides the source %% code for the French language definition file. @@ -66,6 +58,7 @@ \hypersetup{colorlinks,urlcolor=blue,unicode} \newcommand*\babel{\textsf{babel}} \newcommand*\frenchb{\textsf{babel-french}} +\newcommand*\langvar{$\langle \it lang \rangle$} \newcommand*\Lopt[1]{\texttt{#1}} \newcommand*\opt[1]{\texttt{#1}} \newcommand*\file[1]{\texttt{#1}} @@ -150,6 +143,12 @@ % lists, footnotes, indentation of first paragraphs of sections) and % should apply to the whole document. % +% The French language can be loaded with \babel{} by a command like: +% \\ |\usepackage[german,spanish,french,british]{babel}|% +% \footnote{\emph{Always} use \Lopt{french} as option name for the +% French language, former aliases \Lopt{frenchb} or \Lopt{francais} +% are \emph{depreciated}; expect them to be removed sooner or later!} +% % \frenchb{} takes account of \babel’s \emph{main language} defined % as the \emph{last} option at \babel’s loading. When French is % not \babel’s main language, \frenchb{} does not alter the general @@ -561,7 +560,7 @@ % The older syntax |\addto\captionsfrench{\def\proofname{Preuve}}| % still works. Keep in mind that \emph{only} |french| can be used to % redefine captions, even if \babel{}’s option was entered as -% |francais| or |frenchb|. +% |frenchb|. % % When French is the main language, by default (see below) % \frenchb{} changes the separator (colon) used in figures’ and @@ -635,6 +634,13 @@ % % \subsubsection*{What’s new in version 3.3?} % +% According to current \babel's standards, every dialect should +% have it’s own \file{.ldf} file; the main support for French is +% now in \file{french.ldf}, portemanteau files \file{frenchb.ldf}, +% \file{francais.ldf}, \file{acadian.ldf} and \file{canadien.ldf} +% have been added. Recommended options are \Lopt{french} and +% \Lopt{acadian}, all other are deprecated. +% % Release 3.3a is compatible with LuaTeX v.~0.95 (TL2016) and up. % Former skips |\FBcolonskip|, |\FBthinskip| and |\FBguillskip| % controlling punctuation spacings in LuaTeX have been removed; @@ -754,40 +760,12 @@ % (french) as to be corrected before calling \cs{LdfInit}.} % % \iffalse -%<*ldf> +%<*french> % \fi % % \changes{v3.0a}{2014/02/28}{Support for options frenchb, francais, % canadien, acadian changed.} % -% If \file{frenchb.ldf} was loaded with \babel{}’s options -% \Lopt{francais} or \Lopt{frenchb}, we make it behave as if -% \Lopt{french} was specified. -% In Plain formats, \texttt{@} catcode is not `letter’. -% \begin{macrocode} -\chardef\atcatcode=\catcode`\@ -\catcode`\@=11\relax -\def\bbl@tempa{francais} -\ifx\CurrentOption\bbl@tempa - \let\l@francais\l@french - \def\captionsfrancais{\captionsfrench} - \def\datefrancais{\datefrench} - \def\extrasfrancais{\extrasfrench} - \def\noextrasfrancais{\extrasfrench} - \def\CurrentOption{french} -\fi -\def\bbl@tempa{frenchb} -\ifx\CurrentOption\bbl@tempa - \let\l@frenchb\l@french - \def\captionsfrenchb{\captionsfrench} - \def\datefrenchb{\datefrench} - \def\extrasfrenchb{\extrasfrench} - \def\noextrasfrenchb{\extrasfrench} - \def\CurrentOption{french} -\fi -\catcode`\@=\atcatcode \let\atcatcode\relax -% \end{macrocode} -% % \changes{v3.0a}{2014/02/19}{\cs{LdfInit} checks \cs{datefrench} % instead of \cs{captionsfrench} to avoid a conflict with % papertex.cls which loads datetime.sty.} @@ -832,7 +810,7 @@ \let\bbl@tempa\relax \ifx\magnification\@undefined \ifx\@compatibilitytrue\@undefined - \PackageError{frenchb.ldf} + \PackageError{french.ldf} {LaTeX-2.09 format is no longer supported.\MessageBreak Aborting here} {Please upgrade to LaTeX2e!} @@ -854,13 +832,13 @@ \def\fb@error#1#2{% \begingroup \newlinechar=`\^^J - \def\\{^^J(frenchb.ldf) }% + \def\\{^^J(french.ldf) }% \errhelp{#2}\errmessage{\\#1^^J}% \endgroup} \def\fb@warning#1{% \begingroup \newlinechar=`\^^J - \def\\{^^J(frenchb.ldf) }% + \def\\{^^J(french.ldf) }% \message{\\#1^^J}% \endgroup} \def\fb@info#1{% @@ -879,7 +857,7 @@ \ifx\babeltags\@undefined \let\bbl@tempa\endinput \ifLaTeXe - \PackageError{frenchb.ldf} + \PackageError{french.ldf} {frenchb requires babel v.3.9i.\MessageBreak Aborting here} {Please upgrade Babel!} @@ -892,33 +870,16 @@ \bbl@tempa % \end{macrocode} % -% \file{frenchb.ldf} can be loaded with options \Lopt{canadien} or -% \Lopt{acadian}, which both stand for Canadian French. Internally, -% \Lopt{acadian} will be the name of the corresponding \babel’s -% dialect, so we set |\CurrentOption| to \Lopt{acadian} in both -% cases. +% Babel’s French language can be loaded with option \Lopt{acadian} +% which stands for Canadian French. % If no specific hyphenation patterns are available, Canadian French % will use the French ones. -% -% TODO: Canadian French hyphenation doesn’t work with LuaTeX. % \begin{macrocode} -\ifx\l@acadian\@undefined - \ifx\l@canadien\@undefined - \adddialect\l@acadian\l@french - \adddialect\l@canadien\l@french - \else - \adddialect\l@acadian\l@canadien - \fi -\else - \adddialect\l@canadien\l@acadian -\fi -\def\bbl@tempa{canadien} +\def\bbl@tempa{acadian} \ifx\CurrentOption\bbl@tempa - \def\captionscanadien{\captionsacadian} - \def\datecanadien{\dateacadian} - \def\extrascanadien{\extrasacadian} - \def\noextrascanadien{\extrasacadian} - \def\CurrentOption{acadian} + \ifx\l@acadian\@undefined + \adddialect\l@acadian\l@french + \fi \fi % \end{macrocode} % @@ -930,7 +891,7 @@ \expandafter\providehyphenmins\expandafter{\CurrentOption}{\tw@\thr@@} % \end{macrocode} % -% \begin{macro}{\ifFBunicode} +%\begin{macro}{\ifFBunicode} % \begin{macro}{\ifFBLuaTeX} % \begin{macro}{\ifFBXeTeX} % French hyphenation patterns are now coded in Unicode, see file @@ -972,6 +933,19 @@ % \end{macro} % \end{macro} % +% \changes{v3.3b}{2017/07/08}{New `if' \cs{ifFBfrench} to replace +% \cs{iflanguage} test which is based on patterns.} +% +% \begin{macro}{\ifFBfrench} +% True when the current language is French or any of its dialects; +% will be set to true by |\extras\CurrentOption| and to false by +% |\noextras\CurrentOption|. Used in |\DecimalMathComma| and +% |frenchsetup{og=«, fg=»}|. +% \begin{macrocode} +\newif\ifFBfrench +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\extrasfrench} % \changes{v3.0a}{2014/02/18}{Take advantage of babel’s % \cs{babel@savevariable} to handle apostrophe’s \cs{lccode}.} @@ -995,6 +969,7 @@ % % \begin{macrocode} \@namedef{extras\CurrentOption}{% + \FBfrenchtrue \babel@savevariable{\lccode`\'}% \ifFBunicode \babel@savevariable{\lccode"2019}% @@ -1003,7 +978,7 @@ \lccode`\'=`\' \fi } -\@namedef{noextras\CurrentOption}{} +\@namedef{noextras\CurrentOption}{\FBfrenchfalse} % \end{macrocode} % % Let’s define a handy command for adding stuff to @@ -1065,7 +1040,7 @@ frenchb will make high punctuation characters (;:!?) active\\% with LuaTeX < 0.95.}% \else - \PackageWarning{frenchb.ldf}{Please upgrade LuaTeX + \PackageWarning{french.ldf}{Please upgrade LuaTeX to version 0.95 or above!\MessageBreak frenchb will make high punctuation characters\MessageBreak (;:!?) active with LuaTeX < 0.95;\MessageBreak reported}% @@ -1237,7 +1212,7 @@ \newattribute\FB@addDPspace \FB@addDPspace=1 \relax \newattribute\FB@addGUILspace \FB@addGUILspace=0 \relax \ifLaTeXe - \PackageInfo{frenchb.ldf}{No need for active punctuation + \PackageInfo{french.ldf}{No need for active punctuation characters\MessageBreak with this version of LuaTeX!\MessageBreak reported} \else @@ -1248,8 +1223,7 @@ % \end{macrocode} % % \iffalse -%</ldf> -%<*lua> +%</french> % \fi % This is \file{frenchb.lua}. It holds Lua code to deal with `high % punctuation’ and quotes. This code is based on suggestions from @@ -1263,6 +1237,7 @@ % quotes in T1-encoding.} % % \begin{macrocode} +%<*lua> local FB_punct_thin = {[string.byte("!")] = true, [string.byte("?")] = true, @@ -1634,11 +1609,11 @@ local function french_punctuation (head) return head end return french_punctuation +%</lua> % \end{macrocode} % \end{macro} % \iffalse -%</lua> -%<*ldf> +%<*french> % \fi % % \begin{macro}{\FB@luatex@punct@french} @@ -1662,7 +1637,7 @@ return french_punctuation LuaTeX,\\ use \noexpand\NoAutoSpacing *inside a group* instead.}% \else - \PackageWarning{frenchb.ldf}{\protect\shorthandoff{;:!?} is + \PackageWarning{french.ldf}{\protect\shorthandoff{;:!?} is helpless with LuaTeX,\MessageBreak use \protect\NoAutoSpacing \space *inside a group* instead;\MessageBreak reported}% \fi}% @@ -1747,7 +1722,7 @@ return french_punctuation % \begin{macrocode} \ifFB@xetex@punct \ifLaTeXe - \PackageInfo{frenchb.ldf}{No need for active punctuation characters% + \PackageInfo{french.ldf}{No need for active punctuation characters% \MessageBreak with this version of XeTeX!% \MessageBreak reported} \else @@ -1864,7 +1839,7 @@ return french_punctuation XeTeX,\\ use \noexpand\NoAutoSpacing *inside a group* instead.}% \else - \PackageWarning{frenchb.ldf}{\protect\shorthandoff{;:!?} is + \PackageWarning{french.ldf}{\protect\shorthandoff{;:!?} is helpless with XeTeX,\MessageBreak use \protect\NoAutoSpacing \space *inside a group* instead;\MessageBreak reported}% \fi}% @@ -2487,7 +2462,7 @@ return french_punctuation \fb@warning{\noexpand\frquote\space handles up to two levels.\\ Quotation not printed.}% \else - \PackageWarning{frenchb.ldf}{% + \PackageWarning{french.ldf}{% \protect\frquote\space handles up to two levels. \MessageBreak Quotation not printed. Reported} \fi @@ -2962,7 +2937,7 @@ return french_punctuation \newcommand*{\std@math@comma}{\mathcode`\,=\std@mcc} \fi \newcommand*{\DecimalMathComma}{% - \iflanguage{french}{\dec@math@comma}{}% + \ifFBfrench\dec@math@comma\fi \ifFB@icomma\else\FB@addto{extras}{\dec@math@comma}\fi } \newcommand*{\StandardMathComma}{% @@ -3037,7 +3012,7 @@ return french_punctuation \ifdefined\numprint \numprint{#1}% \else - \PackageWarning{frenchb.ldf}{% + \PackageWarning{french.ldf}{% \protect\nombre\space now relies on package numprint.sty,% \MessageBreak add \protect \usepackage[autolanguage]{numprint},\MessageBreak @@ -3188,8 +3163,8 @@ return french_punctuation % Up to v2.6h \frenchb{} used to merge |\captionsfrenchb| and % |\captionsfrancais| into |\captionsfrench| at |\begin{document}|. % This is deprecated in favor of the new (much simpler!) syntax -% introduced in \babel~3.9. No need to define |\captionscanadien| -% and |\captionsacadian| either. +% introduced in \babel~3.9. No need to define |\captionsacadian| +% either. % % \begin{macro}{\CaptionSeparator} % Let’s consider now captions in figures and tables. @@ -3261,7 +3236,7 @@ return french_punctuation % \begin{macrocode} \newif\if@FBwarning@capsep \@FBwarning@capseptrue -\newcommand{\FBWarning}[1]{\PackageWarning{frenchb.ldf}{#1}} +\newcommand{\FBWarning}[1]{\PackageWarning{french.ldf}{#1}} \newcommand*{\CaptionSeparator}{\space\textendash\space} \def\FBCaption@Separator{: } \long\def\FB@makecaption#1#2{% @@ -3715,13 +3690,13 @@ return french_punctuation \ifx\bbl@main@language\FB@french \FBGlobalLayoutFrenchtrue \@ifclassloaded{beamer}% - {\PackageInfo{frenchb.ldf}{% + {\PackageInfo{french.ldf}{% No list customisation for the beamer class,% \MessageBreak reported}}% {\@ifpackageloaded{beamerarticle}% {\FBStandardItemLabelsfalse \FBReduceListSpacingtrue - \PackageInfo{frenchb.ldf}{% + \PackageInfo{french.ldf}{% Minimal list customisation for the beamerarticle% \MessageBreak package; reported}}% % \end{macrocode} @@ -3741,7 +3716,7 @@ return french_punctuation \fi % \end{macrocode} % \frenchb{} being an option of \babel, it cannot load a package -% (\pkg{keyval}) while \file{frenchb.ldf} is read, so we defer the +% (\pkg{keyval}) while \file{french.ldf} is read, so we defer the % loading of \file{keyval} and the options setup at the end of % \babel’s loading. % \begin{macrocode} @@ -3781,7 +3756,7 @@ return french_punctuation \ifx\bbl@main@language\FB@french \else \FBGlobalLayoutFrenchfalse - \PackageWarning{frenchb.ldf}% + \PackageWarning{french.ldf}% {Option `GlobalLayoutFrench' skipped:\MessageBreak French is *not* babel's last option.\MessageBreak Reported}% @@ -3864,7 +3839,7 @@ return french_punctuation {\csname FBOldFigTabCaptions#1\endcsname % \end{macrocode} % |\CurrentOption| no longer defined. It’s value has been saved -% in |\FB@CurOpt| while reading \file{frenchb.ldf}. +% in |\FB@CurOpt| while reading \file{french.ldf}. % \begin{macrocode} \ifFBOldFigTabCaptions \FB@addto{extras}{\babel@save\FBCaption@Separator @@ -3905,7 +3880,7 @@ return french_punctuation \else\ifx\FBeveryparguill\FBguillnone \else \let\FBeveryparguill\FBguillopen - \PackageWarning{frenchb.ldf}% + \PackageWarning{french.ldf}% {Wrong value for `EveryParGuill': try `open',\MessageBreak `close' or `none'. Reported}% @@ -4001,7 +3976,7 @@ return french_punctuation % characters. % \begin{macrocode} \ifFB@active@punct - \PackageWarning{frenchb.ldf}% + \PackageWarning{french.ldf}% {Option og=« not supported with this version of\MessageBreak LuaTeX/XeTeX; reported}% \fi @@ -4010,11 +3985,11 @@ return french_punctuation % This is for conventional TeX engines: % \begin{macrocode} \newcommand*{\FB@@og}{% - \iflanguage{french}% - {\ifFB@spacing\FB@og\ignorespaces - \else\guillemotleft - \fi}% - {\guillemotleft}}% + \ifFBfrench + \ifFB@spacing\FB@og\ignorespaces + \else\guillemotleft + \fi + \else\guillemotleft\fi}% \AtBeginDocument{% \ifdefined\DeclareInputText \ifdefined\uc@dclc @@ -4049,7 +4024,7 @@ return french_punctuation % \end{macrocode} % Package \pkg{inputenc} not loaded, no way\dots{} % \begin{macrocode} - \PackageWarning{frenchb.ldf}% + \PackageWarning{french.ldf}% {Option `og' requires package inputenc;% \MessageBreak reported}% \fi @@ -4072,17 +4047,17 @@ return french_punctuation \XeTeXcharclass"202F = \FB@guilnul \fi \ifFB@active@punct - \PackageWarning{frenchb.ldf}% + \PackageWarning{french.ldf}% {Option fg=» not supported with this version of\MessageBreak LuaTeX/XeTeX; reported}% \fi \else \newcommand*{\FB@@fg}{% - \iflanguage{french}% - {\ifFB@spacing\FB@fg - \else\guillemotright - \fi}% - {\guillemotright}}% + \ifFBfrench + \ifFB@spacing\FB@fg + \else\guillemotright + \fi + \else\guillemotright\fi}% \AtBeginDocument{% \ifdefined\DeclareInputText \ifdefined\uc@dclc @@ -4100,7 +4075,7 @@ return french_punctuation \fi \fi \else - \PackageWarning{frenchb.ldf}% + \PackageWarning{french.ldf}% {Option `fg' requires package inputenc;% \MessageBreak reported}% \fi @@ -4132,7 +4107,7 @@ return french_punctuation \ifFBStandardItemizeEnv \else \FBStandardItemizeEnvtrue - \PackageInfo{frenchb.ldf}% + \PackageInfo{french.ldf}% {Setting StandardItemizeEnv=true for\MessageBreak compatibility with enumitem package,\MessageBreak reported}% @@ -4140,7 +4115,7 @@ return french_punctuation \ifFBStandardEnumerateEnv \else \FBStandardEnumerateEnvtrue - \PackageInfo{frenchb.ldf}% + \PackageInfo{french.ldf}% {Setting StandardEnumerateEnv=true for\MessageBreak compatibility with enumitem package,\MessageBreak reported}% @@ -4149,7 +4124,7 @@ return french_punctuation \ifFBStandardItemizeEnv \else \FBStandardItemizeEnvtrue - \PackageInfo{frenchb.ldf}% + \PackageInfo{french.ldf}% {Setting StandardItemizeEnv=true for\MessageBreak compatibility with paralist package,\MessageBreak reported}% @@ -4157,7 +4132,7 @@ return french_punctuation \ifFBStandardEnumerateEnv \else \FBStandardEnumerateEnvtrue - \PackageInfo{frenchb.ldf}% + \PackageInfo{french.ldf}% {Setting StandardEnumerateEnv=true for\MessageBreak compatibility with paralist package,\MessageBreak reported}% @@ -4166,7 +4141,7 @@ return french_punctuation \ifFBStandardEnumerateEnv \else \FBStandardEnumerateEnvtrue - \PackageInfo{frenchb.ldf}% + \PackageInfo{french.ldf}% {Setting StandardEnumerateEnv=true for\MessageBreak compatibility with enumerate package,\MessageBreak reported}% @@ -4458,7 +4433,7 @@ return french_punctuation \ifFBunicode \@ifpackageloaded{fontspec}{}% {\@ifpackageloaded{luainputenc}{}% - {\PackageWarning{frenchb.ldf}% + {\PackageWarning{french.ldf}% {Add \protect\usepackage{fontspec} to the\MessageBreak preamble of your document, reported}% }% @@ -4466,7 +4441,7 @@ return french_punctuation \else \begingroup \newcommand{\FBOTone}{OT1}% \ifx\encodingdefault\FBOTone - \PackageWarning{frenchb.ldf}% + \PackageWarning{french.ldf}% {OT1 encoding should not be used for French.% \MessageBreak Add \protect\usepackage[T1]{fontenc} to the @@ -4895,7 +4870,7 @@ return french_punctuation % % \begin{macrocode} \AtBeginDocument{\@ifpackageloaded{bigfoot}% - {\PackageInfo{frenchb.ldf}% + {\PackageInfo{french.ldf}% {bigfoot package in use.\MessageBreak frenchb will NOT customise footnotes;% \MessageBreak reported}}% @@ -5150,8 +5125,89 @@ return french_punctuation \let\loadlocalcfg\FB@llc % \end{macrocode} % \iffalse -%</ldf> -%<*dtx> +%</french> +% \fi +% +% \subsection{Files \file{frenchb.ldf}, \file{francais.ldf}, +% \file{canadien.ldf} and\\ \file{acadian.ldf}} +% +% \changes{v3.3b}{2017/06/28}{Generate portmanteau files +% \file{acadian.ldf}, \file{canadien.ldf}, \file{frenchb.ldf}, +% and \file{francais.ldf} and warn about deprecated options.} +% +% Babel now expects a \file{\langvar{}.ldf} file for each \langvar. +% So we create portmanteau \file{.ldf} files for options \texttt{canadien}, +% \texttt{francais}, \texttt{frenchb} and \texttt{acadian}. +% These files themselves only load \file{french.ldf} which does +% the real work. +% Warn users about options \Lopt{canadien}, \Lopt{frenchb} and +% \Lopt{francais} being deprecated and force recommended options +% \Lopt{acadian} or \Lopt{french}. +% \begin{macrocode} +%<*canadien> +\PackageWarning{canadien.ldf}% + {Option `canadien' for Babel is *deprecated*,\MessageBreak + it might be removed sooner or later. Please\MessageBreak + use `acadian' instead; reported}% +\let\l@canadien\l@acadian +\def\CurrentOption{acadian} +%</canadien> +%<*francais> +\PackageWarning{francais.ldf}% + {Option `francais' for Babel is *deprecated*,\MessageBreak + it might be removed sooner or later. Please\MessageBreak + use `french' instead; reported}% +\let\l@francais\l@french +\def\CurrentOption{french} +%</francais> +% \end{macrocode} +% Compatibility code for \babel{} pre-3.13: \file{frenchb.ldf} +% could be loaded with options \Lopt{acadian}, \Lopt{canadien}, +% \Lopt{frenchb} or \Lopt{francais}. +% \begin{macrocode} +%<*frenchb> +\def\bbl@tempa{frenchb} +\ifx\CurrentOption\bbl@tempa + \let\l@frenchb\l@french + \def\CurrentOption{french} + \PackageWarning{babel-french}% + {Option `frenchb' for Babel is *deprecated*,\MessageBreak + it might be removed sooner or later. Please\MessageBreak + use `french' instead; reported} +\else + \def\bbl@tempa{francais} + \ifx\CurrentOption\bbl@tempa + \let\l@francais\l@french + \def\CurrentOption{french} +% \end{macrocode} +% Plain formats: no warning when \file{francais.sty} loads +% \file{frenchb.ldf} (\babel{} pre-3.13). +% \begin{macrocode} + \ifx\magnification\@undefined + \PackageWarning{babel-french}% + {Option `francais' for Babel is *deprecated*,\MessageBreak + it might be removed sooner or later. Please\MessageBreak + use `french' instead; reported}% + \fi + \else + \def\bbl@tempa{canadien} + \ifx\CurrentOption\bbl@tempa + \let\l@canadien\l@acadian + \def\CurrentOption{acadian} + \PackageWarning{babel-french}% + {Option `canadien' for Babel is *deprecated*,\MessageBreak + it might be removed sooner or later. Please\MessageBreak + use `acadian' instead; reported} + \fi + \fi +\fi +%</frenchb> +%<acadian|canadien|frenchb|francais>\input french.ldf\relax +% \end{macrocode} +% +% \Finale +% \iffalse +%<*!lua> % \fi %% %% \CharacterTable @@ -5171,8 +5227,6 @@ return french_punctuation %% Right brace \} Tilde \~} %% % \iffalse -%</dtx> +%</!lua> % \fi -% -% \Finale \endinput diff --git a/Master/texmf-dist/source/generic/babel-french/frenchb.ins b/Master/texmf-dist/source/generic/babel-french/frenchb.ins index 7ac0e63db5c..672caafa06c 100644 --- a/Master/texmf-dist/source/generic/babel-french/frenchb.ins +++ b/Master/texmf-dist/source/generic/babel-french/frenchb.ins @@ -1,12 +1,12 @@ %% -%% This file will generate fast loadable files and documentation -%% driver files from the doc files in this package when run through -%% LaTeX or TeX. +%% This file will generate fast loadable files and documentation driver +%% files from the doc files in this package when run through LuaTeX. %% %% Copyright 2001-2017 Daniel Flipo. All rights reserved. %% -%% This file is part of the Babel system, release 3.9. -%% --------------------------------------------------- +%% This is a generated file part of the the babel-french bundle +%% to be used with the Babel system. +%% ------------------------------------------------------------- %% %% It may be distributed under the terms of the LaTeX Project Public %% License, as described in lppl.txt in the base LaTeX distribution. @@ -14,7 +14,7 @@ %% %% --------------- start of docstrip commands ------------------ %% -\def\filedate{2017/01/09} +\def\filedate{2017/07/06} \def\batchfile{frenchb.ins} \input docstrip.tex @@ -34,8 +34,9 @@ \fi} \declarepreamble\mainpreamble -This is a generated file of the Babel system. ---------------------------------------------------------- +This is a generated file part of the the babel-french bundle +to be used with the Babel system. +------------------------------------------------------------- It may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 @@ -49,38 +50,7 @@ This work has the LPPL maintenance status "maintained". The Current Maintainer of this work is Daniel Flipo. -This file may only be distributed together with a copy of the Babel -system. You may however distribute the Babel system without -such generated files. - -The list of all files belonging to the Babel distribution is -given in the file `manifest.bbl'. See also `legal.bbl for additional -information. - -The list of derived (unpacked) files belonging to the distribution -and covered by LPPL is defined by the unpacking scripts (with -extension .ins) which are part of the distribution. - -\endpreamble - -\declarepreamble\fdpreamble - -This is a generated file. - -Copyright 2001-2017 Daniel Flipo. All rights reserved. - -This file is part of the Babel system, release 3.9. ---------------------------------------------------- - -It may be distributed under the terms of the LaTeX Project Public -License, as described in lppl.txt in the base LaTeX distribution. -Either version 1.3 or, at your option, any later version. - -In particular, permission is granted to customize the declarations in -this file to serve the needs of your installation. - -However, NO PERMISSION is granted to distribute a modified version -of this file under its original name. +Please report errors to: <daniel (dot) flipo (at) free (dot) fr> \endpreamble @@ -90,7 +60,12 @@ of this file under its original name. \usedir{tex/generic/babel-french} \usepreamble\mainpreamble -\generate{\file{frenchb.ldf}{\from{frenchb.dtx}{ldf}}} +\generate{\file{french.ldf}{\from{frenchb.dtx}{french}} + \file{acadian.ldf}{\from{frenchb.dtx}{acadian}} + \file{canadien.ldf}{\from{frenchb.dtx}{canadien}} + \file{frenchb.ldf}{\from{frenchb.dtx}{frenchb}} + \file{francais.ldf}{\from{frenchb.dtx}{francais}} + } \def\MetaPrefix{-- } @@ -109,7 +84,9 @@ of this file under its original name. \Msg{* To finish the installation you have to move the following} \Msg{* files into a directory searched by TeX:} \Msg{*} -\Msg{* \space\space frenchb.ldf\space\space frenchb.lua} +\Msg{* \space\space frenchb.lua\space\space french.ldf} +\Msg{* \space\space frenchb.ldf\space\space francais.ldf} +\Msg{* \space\space canadian.ldf\space\space and acadian.ldf} \Msg{*} \Msg{* To produce the documentation run the file frenchb.dtx} \Msg{* through pdfLaTeX.} @@ -118,4 +95,4 @@ of this file under its original name. \Msg{***********************************************************} } -\endinput +\endbatchfile |