summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2006-07-10 21:27:21 +0000
committerKarl Berry <karl@freefriends.org>2006-07-10 21:27:21 +0000
commitfdfb62e01e61d31afda1b823add36f4ef9849475 (patch)
treeb14843f48a8f9dc526203381fafe56b1dee0aba1
parentac151dac1f876a711cd50b4127c3c5aa8e837556 (diff)
remove old package le, get new name frenchle
git-svn-id: svn://tug.org/texlive/trunk@1809 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xBuild/tools/tpm-ctan-check2
l---------Master/texmf-dist/doc/latex/frenchle/ALIRE.le1
-rw-r--r--Master/texmf-dist/doc/latex/frenchle/FAQ.pdfbin0 -> 334464 bytes
-rw-r--r--Master/texmf-dist/doc/latex/frenchle/README.le71
-rw-r--r--Master/texmf-dist/doc/latex/frenchle/frenchle.pdfbin0 -> 446439 bytes
l---------Master/texmf-dist/doc/latex/frenchle/link_to_README.le1
-rw-r--r--Master/texmf-dist/doc/latex/le/ALIRE.le52
-rw-r--r--Master/texmf-dist/doc/latex/le/FAQ.pdfbin320199 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/le/frenchle.pdfbin488782 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/le/link_to_README.le_file52
-rw-r--r--Master/texmf-dist/tex/latex/frenchle/french.ldf (renamed from Master/texmf-dist/tex/latex/le/french.ldf)46
-rw-r--r--Master/texmf-dist/tex/latex/frenchle/frenchle.cfg10
-rw-r--r--Master/texmf-dist/tex/latex/frenchle/frenchle.ldf (renamed from Master/texmf-dist/tex/latex/le/frenchle.ldf)25
-rw-r--r--Master/texmf-dist/tex/latex/frenchle/frenchle.sty (renamed from Master/texmf-dist/tex/latex/le/frenchle.sty)644
-rw-r--r--Master/texmf-dist/tpm/frenchle.tpm31
-rw-r--r--Master/texmf-dist/tpm/le.tpm34
-rw-r--r--Master/texmf/lists/frenchle13
-rw-r--r--Master/texmf/tpm/collection-langfrench.tpm2
18 files changed, 681 insertions, 303 deletions
diff --git a/Build/tools/tpm-ctan-check b/Build/tools/tpm-ctan-check
index a5a27839aa8..6a4d725f88f 100755
--- a/Build/tools/tpm-ctan-check
+++ b/Build/tools/tpm-ctan-check
@@ -45,7 +45,7 @@ sub main
"faktor", "featpost", "fixme", "flagderiv", "flippdf", "floatflt",
"floatrow", "flowfram",
"fltpoint", "fmtcount", "fncychap", "fontspec", "formular",
- "fourier", "free-math-font-survey",
+ "fourier", "free-math-font-survey", "frenchle",
"genmisc", "glossary", "gost", "graphics", "graphicx-psmin",
"hrlatex", "hyphen-base", "hyphen-basque", "hyphen-german",
"hyphen-greek", "hyphen-norwegian", "hyphen-ukenglish",
diff --git a/Master/texmf-dist/doc/latex/frenchle/ALIRE.le b/Master/texmf-dist/doc/latex/frenchle/ALIRE.le
new file mode 120000
index 00000000000..dea0ad29d73
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/frenchle/ALIRE.le
@@ -0,0 +1 @@
+README.le \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/frenchle/FAQ.pdf b/Master/texmf-dist/doc/latex/frenchle/FAQ.pdf
new file mode 100644
index 00000000000..cdfe23c4a82
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/frenchle/FAQ.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/frenchle/README.le b/Master/texmf-dist/doc/latex/frenchle/README.le
new file mode 100644
index 00000000000..05ee5177d28
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/frenchle/README.le
@@ -0,0 +1,71 @@
+% Here is a the light version of the multilingual package FrenchPro for LaTeX.
+% Copyright notice is LPPL, Copyright Bernard GAULLE, 2000-2006.
+%
+% <frenchlebg -AT- free.fr>
+%%%%%%%%%% francais %%%%%%%%%%%
+%% Vous trouverez la documentation de frenchle dans le fichier frenchle.pdf
+%% ou sur le serveur a http://frenchle.free.fr/frenchle.pdf
+%%
+%% Vous trouverez ici, essentiellement 4 fichiers source LaTeX :
+%% frenchle.sty est le fichier style principal
+%% que l'on appelle normalement par \usepackage{frenchle}
+%% frenchle.ldf pour l'appeler depuis babel : \usepackage[frenchle]{babel}
+%% french.ldf qui n'est plus appele par babel depuis 2004 et ne permet donc
+%% plus de l'appeler par \usepackage[french]{babel} ; MERCI !
+%% frenchle.cfg qui permet de personnaliser votre utilisation de frenchle.
+%%
+%% Vous devez deposer ces fichiers dans /texmf/tex/latex/frenchle/
+%% ET ne pas oublier de faire un "texhash" ensuite (ou "mktexlsr")
+%% pour que ces fichiers figurent dans la base des fichiers TeX !
+%% Si vous utilisez la commande latex standard il suffit que vous fassiez
+%% appel au format "frlatex" pour disposer des cesures françaises, ensuite
+%% frenchle fera le maximum pour composer le document en respectant les
+%% regles typographiques usuelles a l'Imprimerie nationale. Vous n'avez
+%% aucune commande a entrer (peu de commandes sont accessibles dans cette
+%% version allegee) mais la macro-typographie sera active (ponctuation,
+%% notes de bas de page) tout comme la mise en page globale (figures, tables,
+%% listes, etc.), avec bien sur la traduction des differents labels et
+%% la prise en compte des classes de documents ; mais pas la coupure de mots
+%% (effective normalement au niveau du format "frlatex"), ni les
+%% abreviations, ni les lettrines, ni le traitement complet des guillemets
+%% a la francaise qui sont des dispositifs de la version professionnelle
+%% FrenchPro qui offre par ailleurs de grandes possibilites de
+%% personnalisation et la capacite d'activer ou neutraliser chaque
+%% dispositif selon les besoins. Si vous voulez plus d'informations au
+%% sujet de la version "pro" voyez
+%% http://www.frenchpro6.com/french.html ou sur CTAN.
+%% Ne pas hesiter a me contacter à <frenchprobg -at- free.fr>.
+%%
+%% Voir la FAQ : http://www.frenchpro6.com/screen.pdf/FAQscreen.pdf
+%% Imprimer la FAQ: http://frenchle.free.fr/FAQ.pdf
+%%
+%%%%%%%%%%%% English %%%%%%%%%
+%% Documentation is available here: http://frenchle.free.fr/frenchle.pdf
+%
+% You can find here 3 LaTeX source files to move to your LaTeX installation
+% at the same place where you normally put any other LaTeX package/extension.
+% frenchle.sty which is the main package
+% to be called just by \usepackage{frenchle}
+% or via babel with:
+% frenchle.ldf which is called when you type \usepackage[frenchle]{babel}
+% french.ldf is no more called by babel since 2004 (THANKS!); so you can't
+% call frenchle by typing \usepackage[french]{babel} or
+% or better choose to type in: \documentcalss[french]{class}
+% and: \usepackage{babel}
+%
+% frenchle package will do its best to typeset your document according to the
+% french typographic rules. You have no command to type in (few commands
+% are available in this light version) but macrotypography (punctuation,
+% foot notes) is in action, as well as french layout (figures, tables, lists,
+% etc.), obviously frenh translation of standard titles and classes
+% changes (book, letter); but not hyphenation, abbreviations, illuminated
+% letters (lettrines), nor complete french guillemets. All that stuff and
+% other features are available with the professional version which gives you
+% the ability of customization and allows you to switch on/off any
+% feature depending of your needs. If you want more informations about the
+% "pro" version (FrenchPro) look at http://www.frenchpro6.com/french.html or
+% on any ctan. Don't hesitate to ask me at <frenchprobg -at- free.fr>
+%
+% Enjoy. --bg update 2006/05/29
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
diff --git a/Master/texmf-dist/doc/latex/frenchle/frenchle.pdf b/Master/texmf-dist/doc/latex/frenchle/frenchle.pdf
new file mode 100644
index 00000000000..4db78e9b06a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/frenchle/frenchle.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/frenchle/link_to_README.le b/Master/texmf-dist/doc/latex/frenchle/link_to_README.le
new file mode 120000
index 00000000000..dea0ad29d73
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/frenchle/link_to_README.le
@@ -0,0 +1 @@
+README.le \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/le/ALIRE.le b/Master/texmf-dist/doc/latex/le/ALIRE.le
deleted file mode 100644
index 184b33c1b06..00000000000
--- a/Master/texmf-dist/doc/latex/le/ALIRE.le
+++ /dev/null
@@ -1,52 +0,0 @@
-% Here is a the light version of THE multilingual package "french" for LaTeX.
-% Copyright notice is LPPL, Copyright Bernard GAULLE, 2000-2003.
-%
-% You can find here 3 LaTeX source files to move to your LaTeX installation
-% at the same place where you normally put any other LaTeX package/extension.
-% frenchle.sty which is the main package
-% to be called just by \usepackage{frenchle}
-% or via babel with either:
-% french.ldf which is called when you type \usepackage[french]{babel} or
-% frenchle.ldf which is called when you type \usepackage[frenchle]{babel}
-% but you should better choose to type in: \documentcalss[french]{class}
-% and: \usepackage{babel}
-% which provides the French option to all packages loaded.
-%
-%%%%%%%%%%%%%%%%%%%%%
-%% La documentation de frenchle est a http://frenchle.free.fr/frldoc.pdf
-%%
-%% Utilisateurs teTeX qui utilisez les commandes fr*tex et fr*latex
-%% vous devez deposer ces fichiers dans /texmf/(ml)tex/french/base/
-%% selon que vous utilisez un format fait avec l'option -mltex ou non,
-%% cf fmtutil.cnf. ET ne pas oublier de faire un "texhash" ensuite !
-%% Si vous utilisez la commande latex standard il suffit que vous
-%% deposiez ces fichiers dans /texmf/tex/latex/frenchle/, puis refaire
-%% un texhash de ce texmf.
-%
-%% Voir la FAQ : http://frenchpro.free.fr/FAQscreen.pdf
-%% Imprimer la FAQ: http://frenchle.free.fr/FAQ.pdf
-%%%%%%%%%%%%%%%%%%%%%
-%
-% frenchle package will do its best to typeset your document according to the
-% french typographic rules. You have no command to type in (no commands
-% are available in the light version) but macrotypography (punctuation,
-% foot notes) is in action, as well as french layout (figures, tables, lists,
-% etc.), obviously frenh translation of standard titles and classes
-% changes (book, letter); but not hyphenation, abbreviations, illuminated
-% letters (lettrines), nor french guillemets. All that stuff and other
-% features are available with the professional version which gives you
-% the ability of customization and allows you to switch on/off any
-% feature depending of your needs. Ask Bernard Gaulle <frenchpro@free.fr>
-% if you want more informations about the "pro" version or look at
-% page http://frenchpro.free.fr/ or on any ctan.
-%
-% Notice to babel users: when you have the light version and the professional
-% version of french available on your (La)TeX engine and you type
-% \usepackage[french]{babel} that's the professional version (french.sty)
-% which will be loaded. If you want the light version then type
-% \usepackage[frenchle]{babel}
-%
-%
-% Enjoy. --bg update 2003/01/13
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
diff --git a/Master/texmf-dist/doc/latex/le/FAQ.pdf b/Master/texmf-dist/doc/latex/le/FAQ.pdf
deleted file mode 100644
index 9a5a84f6c08..00000000000
--- a/Master/texmf-dist/doc/latex/le/FAQ.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/le/frenchle.pdf b/Master/texmf-dist/doc/latex/le/frenchle.pdf
deleted file mode 100644
index 540a5363c6f..00000000000
--- a/Master/texmf-dist/doc/latex/le/frenchle.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/le/link_to_README.le_file b/Master/texmf-dist/doc/latex/le/link_to_README.le_file
deleted file mode 100644
index 184b33c1b06..00000000000
--- a/Master/texmf-dist/doc/latex/le/link_to_README.le_file
+++ /dev/null
@@ -1,52 +0,0 @@
-% Here is a the light version of THE multilingual package "french" for LaTeX.
-% Copyright notice is LPPL, Copyright Bernard GAULLE, 2000-2003.
-%
-% You can find here 3 LaTeX source files to move to your LaTeX installation
-% at the same place where you normally put any other LaTeX package/extension.
-% frenchle.sty which is the main package
-% to be called just by \usepackage{frenchle}
-% or via babel with either:
-% french.ldf which is called when you type \usepackage[french]{babel} or
-% frenchle.ldf which is called when you type \usepackage[frenchle]{babel}
-% but you should better choose to type in: \documentcalss[french]{class}
-% and: \usepackage{babel}
-% which provides the French option to all packages loaded.
-%
-%%%%%%%%%%%%%%%%%%%%%
-%% La documentation de frenchle est a http://frenchle.free.fr/frldoc.pdf
-%%
-%% Utilisateurs teTeX qui utilisez les commandes fr*tex et fr*latex
-%% vous devez deposer ces fichiers dans /texmf/(ml)tex/french/base/
-%% selon que vous utilisez un format fait avec l'option -mltex ou non,
-%% cf fmtutil.cnf. ET ne pas oublier de faire un "texhash" ensuite !
-%% Si vous utilisez la commande latex standard il suffit que vous
-%% deposiez ces fichiers dans /texmf/tex/latex/frenchle/, puis refaire
-%% un texhash de ce texmf.
-%
-%% Voir la FAQ : http://frenchpro.free.fr/FAQscreen.pdf
-%% Imprimer la FAQ: http://frenchle.free.fr/FAQ.pdf
-%%%%%%%%%%%%%%%%%%%%%
-%
-% frenchle package will do its best to typeset your document according to the
-% french typographic rules. You have no command to type in (no commands
-% are available in the light version) but macrotypography (punctuation,
-% foot notes) is in action, as well as french layout (figures, tables, lists,
-% etc.), obviously frenh translation of standard titles and classes
-% changes (book, letter); but not hyphenation, abbreviations, illuminated
-% letters (lettrines), nor french guillemets. All that stuff and other
-% features are available with the professional version which gives you
-% the ability of customization and allows you to switch on/off any
-% feature depending of your needs. Ask Bernard Gaulle <frenchpro@free.fr>
-% if you want more informations about the "pro" version or look at
-% page http://frenchpro.free.fr/ or on any ctan.
-%
-% Notice to babel users: when you have the light version and the professional
-% version of french available on your (La)TeX engine and you type
-% \usepackage[french]{babel} that's the professional version (french.sty)
-% which will be loaded. If you want the light version then type
-% \usepackage[frenchle]{babel}
-%
-%
-% Enjoy. --bg update 2003/01/13
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
diff --git a/Master/texmf-dist/tex/latex/le/french.ldf b/Master/texmf-dist/tex/latex/frenchle/french.ldf
index 35570eca6df..ff0451e736a 100644
--- a/Master/texmf-dist/tex/latex/le/french.ldf
+++ b/Master/texmf-dist/tex/latex/frenchle/french.ldf
@@ -1,8 +1,8 @@
-%% This is french.ldf (french option for Babel) under LaTeX --bg 2001/11/28
+%% This is french.ldf (french option for Babel) under LaTeX --bg 2005/03/21
%%
-% Copyright 1995-2001 Bernard GAULLE, Copyright notice: LPPL
+% Copyright 1995-2005 Bernard GAULLE, Copyright notice: LPPL
%%
-%% checksum = "22527 67 255 2955"
+%% checksum = "46368 87 373 4073"
%
%
\ProvidesFile{french.ldf}% originally:
@@ -14,10 +14,25 @@
% [1999/09/21 v1.6
% [2000/07/04 v1.7 % french light support (frenchle) added.
% [2000/08/29 v1.8 % french light correction (frenchle speaks french)
- [2001/11/28 v1.9 % french loaded before babel, special case.
- french option of babel loading the French package]
+% [2001/11/28 v1.9 % french loaded before babel, special case.
+% [2003/11/19 v1.10 % french loaded before babel frenchle/frenchpro,
+% [2004/06/25 v1.11 % mlp loaded before babel. \atcatcode removed.
+% [2004/09/13 v1.12 % messages numbers changed.
+ [2005/03/21 v1.13 % pb francais/frenchb loaded before babel FrenchPro.
+ french option of babel loading the frenchle/FrenchPro package]
\ifx\undefined\captionsfrench% In case french is allready loaded,
\else% major switchs should be set now:
+ \ifx\@mlp@loaded\undefined% but only if the mlp package wasn't
+ \else% already loaded.
+ \PackageError{\CurrentOption}%
+ {-80- Babel is willing to load the \CurrentOption\space option%
+ \MessageBreak but the mlp package is already loaded, %
+ please choose %
+ \MessageBreak either mlp with \CurrentOption\space option, %
+ \CurrentOption\space alone %
+ \MessageBreak or babel with \CurrentOption\space option}%
+ {just remove the superfluous package or option.}%
+ \expandafter\endinput\fi%
\expandafter\let\expandafter\ifLPA\csname iffalse\endcsname
\let\nofrenchtypography\relax
\let\nofrenchtranslation\relax
@@ -25,9 +40,15 @@
\let\nofrenchmacros\relax
\let\nofrenchhyphenation\relax
\ifx\LdfInit\undefined\else\expandafter\LdfInit\fi
- \selectlanguage{french}\expandafter\endinput
+ \selectlanguage{french}% Select again French
+\expandafter\ifx\csname endfrench\endcsname\relax
+\PackageError{frenchle}{-93- You are using two French options for Babel, %
+ please choose only one.}
+\let\endfrench\stop\fi
+ \endfrench% but stop it until \begin{document}.
+ \expandafter\endinput%
\fi
-\chardef\atcatcode=\catcode`\@\catcode`\@=11\relax
+\ifnum\catcode`\@=11\else\expandafter\catcode`\@=11\fi%
\ifx\undefined\babel@core@loaded% still undefined (>3.5)?
\let\babel@core@loaded\main@language\fi%
\ifx\undefined\originalTeX \let\originalTeX\empty \fi
@@ -36,14 +57,14 @@
\protected@write\@auxout{}{\protect% insure files integrity
\csname auxWARNINGii\protect\endcsname{\protect\typeout
- {-34- this file and other auxiliary files require to
+ {-34a- this file and other auxiliary files require to
use the following}}}
\protected@write\@auxout{}{\protect%
\csname auxWARNINGii\protect\endcsname{\protect\typeout
- {-34- LaTeX packages: french and babel!}}}
+ {-34b- LaTeX packages: french and babel!}}}
\protected@write\@auxout{}{\protect%
\csname auxWARNINGii\protect\endcsname{\protect\typeout
- {-34- check \protect\protect\protect\usepackage
+ {-34c- check \protect\protect\protect\usepackage
\protect\space or remove these files.
Typesetting is aborted!}
\protect\stop}}%
@@ -53,8 +74,8 @@
\InputIfFileExists{french.sty}{}% load our french pro package
{\InputIfFileExists{frenchle.sty}{}% or the light version if any,
{\PackageError{french/frenchle}%
- {-63- french or frenchle style files not found}%
- {-63- Check if files exist somewhere in your system.}%
+ {-63a- french or frenchle style files not found}%
+ {-63b- Check if files exist somewhere in your system.}%
\let\endfrench\stop%
}%
}%
@@ -63,5 +84,4 @@
\let\extrasfrancais\frenchTeXmods% ditto
\let\captionsfrancais\captionsfrench%
\main@language{french}%
-\catcode`\@=\atcatcode \let\atcatcode\relax
\endinput%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/frenchle/frenchle.cfg b/Master/texmf-dist/tex/latex/frenchle/frenchle.cfg
new file mode 100644
index 00000000000..2abfdebd30a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/frenchle/frenchle.cfg
@@ -0,0 +1,10 @@
+% Fichier de configuration pour frenchle (avec ou sans babel)% 2005/03/23
+%
+% par B. Gaulle <frenchlebg -chez- free.fr>
+%
+% Vous pouvez decommenter les lignes suivantes si vous souhaitez
+% utiliser les guillemets 8-bits iso-latin1 ou iso-latin9 :
+%
+%\catcode`\«=\active\catcode`\»=\active
+%\def«{\og\ignorespaces}\def»{\fg}
+\endinput%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/le/frenchle.ldf b/Master/texmf-dist/tex/latex/frenchle/frenchle.ldf
index 874e6230122..d3b505a3dcf 100644
--- a/Master/texmf-dist/tex/latex/le/frenchle.ldf
+++ b/Master/texmf-dist/tex/latex/frenchle/frenchle.ldf
@@ -1,18 +1,27 @@
-%% This is frenchle.ldf (frenchle option for Babel) under LaTeX --bg 2001/06/07
+%% This is frenchle.ldf (frenchle option for Babel) under LaTeX --bg 2005/03/23
%% to be used like this: \usepackage[frenchle]{babel}
%%
%%
-% Copyright 2001 Bernard GAULLE, Copyright notice: LPPL
+% Copyright 2001-2005 Bernard GAULLE, Copyright notice: LPPL
%%
-%% checksum = "14418 52 175 2199"
+%% checksum = "31013 61 238 2743"
%
%
\ProvidesFile{frenchle.ldf}%
% [2001/04/12 v1.0 % Original file.
- [2001/06/07 v1.1 % Doc. & msg changes.
- frenchle option of babel loading the French Light package]
+% [2001/06/07 v1.1 % Doc. & msg changes.
+% [2003/11/19 v1.2 % french loaded before babel frenchle.
+% [2005/03/21 v1.3 % pb francais/frenchb loaded before babel frenchle.
+ [2005/03/23 v1.4 % global French option taken in account.
+ Frenchle option of babel loading the French Light package]
\ifx\undefined\captionsfrench
-\else\selectlanguage{french}\expandafter\endinput
+\else\selectlanguage{french}% Select again French
+\expandafter\ifx\csname endfrench\endcsname\relax
+\PackageError{frenchle}{-93- You are using two French options for Babel, %
+ please choose only one.}
+\let\endfrench\stop\fi
+ \endfrench% but stop it until \begin{document}.
+\expandafter\endinput
\fi
\chardef\atcatcode=\catcode`\@\catcode`\@=11\relax
\ifx\undefined\babel@core@loaded% still undefined (>3.5)?
@@ -27,7 +36,7 @@
use the following}}}
\protected@write\@auxout{}{\protect%
\csname auxWARNINGii\protect\endcsname{\protect\typeout
- {-34- LaTeX packages: french and babel!}}}
+ {-34- LaTeX packages: frenchle and babel!}}}
\protected@write\@auxout{}{\protect%
\csname auxWARNINGii\protect\endcsname{\protect\typeout
{-34- check \protect\protect\protect\usepackage
@@ -36,7 +45,6 @@
\protect\stop}}%
\let\auxWARNINGi=\@gobble% accept aux files produces by french
\let\auxWARNINGii=\@gobble% and those produces by babel+french
-
\InputIfFileExists{frenchle.sty}{}% load the light version package.
{\PackageError{frenchle}%
{-63- frenchle style file not found}%
@@ -49,4 +57,5 @@
\let\captionsfrancais\captionsfrench%
\main@language{french}%
\catcode`\@=\atcatcode \let\atcatcode\relax
+\DeclareOption{french}{}\ProcessOptions% Now global option french is used.
\endinput%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/le/frenchle.sty b/Master/texmf-dist/tex/latex/frenchle/frenchle.sty
index db2a3cecaa9..49628f013bc 100644
--- a/Master/texmf-dist/tex/latex/le/frenchle.sty
+++ b/Master/texmf-dist/tex/latex/frenchle/frenchle.sty
@@ -1,58 +1,68 @@
%
-% This is frenchle.sty (informations en francais ci-dessous)
-% This is the light version of THE multilingual package "french" for LaTeX.
-% Copyright Bernard Gaulle, 2000-2001, Copyright notice is LPLL.
-%% checksum = "01785 1665 2662 68795"
+% This is frenchle.sty (informations en francais ci-dessous.tex)
+% This is the light version of THE multilingual "FrenchPro" package for LaTeX.
+% Copyright Bernard Gaulle, 2000-2006, Copyright notice is LPLL.
+%% checksum = "11734 2225 8767 123024"
% If you want to have informations about the professional version
-% ask Bernard GAULLE <frenchpro@free.fr>, otherwise <frenchle.free.fr>.
+% ask Bernard GAULLE <frenchprobg -At- free.fr>, otherwise <frenchlebg -AT- free.fr>.
%
% Cette extension << french allegee >> a pour objectif de resoudre un maximum
% de problemes de francisation de LaTeX sans avoir a connaitre la moindre
% commande complementaire ; la seule chose a faire est de saisir :
-% usepackage{frenchle} si vous travaillez sans babel ;
-% usepackage[frenchle]{babel} sinon ; dans ce cas il faut
+% \usepackage{frenchle} si vous travaillez sans babel ;
+% \usepackage[frenchle]{babel} sinon ; dans ce cas il faut
% avoir installe frenchle.ldf en plus de frenchle.sty
-% OU usepackage[french]{babel} et dans ce dernier cas il faut avoir
+% OU (mais attention Babel ne charge plus frenchb.ldf depuis 2004, merci !)
+% \usepackage[french]{babel} et dans ce dernier cas il faut avoir
% installe french.ldf en plus de frenchle.sty.
-% mais le mieux avec babel est de coder : documentclass[french]{classe}
-% puis : usepackage{babel}
+% mais le mieux avec babel est de coder : \documentclass[french]{classe}
+% puis : \usepackage[frenchle]{babel}
% car ainsi l'option french est passée a toutes les extensions.
% L'extension frenchle fait plein de choses pour vous au niveau typographique
% (espacement de la ponctuation, composition des notes, etc.) ainsi que
% pour la mise en page (figures, tableaux, listes, etc.), la traduction des
% libelles usuels de LaTeX ou enfin la francisation des classes de documents
-% dont la classe << letter >>.
+% dont la classe << letter >>. Vous pouvez utiliser des guillemets a la
+% francaise tout comme avec l'option frenchb de Babel. Voir d'ailleurs a ce
+% sujet le fichier de configuration frenchle.cfg.
% La documentation a propos de frenchle est disponible sur le serveur
-% a l'url http://frenche.free.fr/frldoc.pdf ou sur ctan.
+% a l'url http://frenche.free.fr/frenchle.pdf ou sur ctan.
%
% Concernant la cesure des mots il est necessaire que votre format LaTeX
% contienne les motifs de cesure du francais. Consultez a ce sujet la
-% FAQ de francisation a http://frenchpro.free.fr/FAQscreen.pdf
+% FAQ de francisation a http://www.frenchpro6.com/screen.pdf/FAQscreen.pdf
% ou sur ctan.
%
% La version professionnelle peut vous apporter encore plein d'autres
% facilites. Si vous ne trouvez pas la documentation a ce sujet, demandez-la
-% a Bernard Gaulle <frenchpro@free.fr>.
+% a Bernard Gaulle <frenchprobg -CHEZ- free.fr>.
%
\expandafter\ifx\csname frenchTeXmods\endcsname\relax%
\else \endinput \fi%
\def\frenchname{frenchle}%
+\def\frenchpack{frenchle}%
\def\ds@french{}%
\def\ds@pmfrench{\pmfrench}%
{\catcode`\@=11{%
\ifx\@unexpandable@protect\undefined\let\protect\empty%
\else\let\protect\@unexpandable@protect%
\fi%
- \xdef\FSfd{14 avril 2003}%
- \xdef\FSfv{V5,10}%
+ \xdef\FSfd{4 juillet 2006}%
+ \xdef\FSfv{V5,998}%
\xdef\frenchstyleid{\FSfv\space-- \FSfd\space --}%
}}%
- \edef\FSfd{2003/04/14 }%
+ \edef\FSfd{2006/07/04 }%
\NeedsTeXFormat{LaTeX2e}[1996/12/01]%
\let\auxWARNINGi=\@gobble%
+\def\@txt@msg#1{#1}%
+\def\@gobbleopt[#1]{}%
+\def\f@issue#1#2{#1{#2}\@ifnextchar[{\@gobbleopt}{}%
+ }%
\newif\ifECM%
-\def\ErrFrench{\message{-26- Erreur d\'etect\'ee dans \frenchname.sty !}%
- \message{(voir p.ex. le fichier language.dat)}}%
+\def\ErrFrench{\f@issue\@fW{-26- %
+ \@txt@msg{Erreur d\'etect\'ee dans \frenchname.sty !}%
+ \@txt@msg{(voir p.ex. le fichier language.dat)}%
+ }}%
\def\ifFTY{\ErrFrench}\def\ifFTR{\ErrFrench}\def\ifFG{\ErrFrench}%
\def\ifFLA{\ErrFrench}\def\ifFMA{\ErrFrench}\def\ifFH{\ErrFrench}%
\def\ifArG{\ErrFrench}\def\ifFTSW{\ErrFrench}\def\ifFW{\ErrFrench}%
@@ -64,7 +74,8 @@
\let\@currnameORI\@currname%
\xdef\@currname{\frenchname}%
{\def\'{\string\'}%
- \ProvidesPackage{\frenchname}[\FSfd\space The light version of the French package /\FSfv/]%
+ \ProvidesPackage{\frenchname}%
+ [\FSfd\space The \frenchpack\space package /\FSfv/]%
}%
\def\GOfrench{babel}\ifx\@currnameORI\GOfrench%
\ifx\undefined\babel@core@loaded\input babel.def\relax\fi%
@@ -74,11 +85,15 @@
\let\FSfv=\undefined%
\IfFileExists{frlpatch.sty}{\def\FSfd@patch{unknown}}{\let\FSfd@patch\FSfd}%
\if@compatibility%
- \typeout{^^J -68- ERROR: \frenchname\space is no more running %
- with 2.09 emulation, sorry!}\expandafter\stop%
+ \f@issue\typeout{^^J -68-
+ \@txt@msg{ERROR: \frenchpack\space is no more running }%
+ \@txt@msg{with 2.09 emulation, sorry!}%
+ }\expandafter\stop%
\fi%
-\ifx\l@french\undefined\typeout{^^J -20- WARNING:
- the french language is undefined in your format.}%
+\ifx\l@french\undefined\f@issue\typeout{^^J -20-
+ \@txt@msg{WARNING:}%
+ \@txt@msg{the French language is undefined in your format.}%
+ }%
\fi%
\fontencoding{\encodingdefault}\selectfont%
\def\@temp@{OT1}\ifx\@temp@\f@encoding%
@@ -90,10 +105,20 @@
\fi%
\fi%
\@temp@%
+\def\@tempa{\let\ifEightBitOutput\iffalse}%
+\ifx\EightBitOutputfalse\undefined\expandafter\@tempa\fi%
\ifECM\else\ifx\charsubdef\undefined%
- \typeout{^^J -29- ****Warning****\string: your TeX V3 engine + CM}%
- \typeout{ -29- fonts (your format default) isn't sufficient to hyphenate}%
- \typeout{ -29- words containing diacritics (like in French).}%
+ \def\@tempa{\noexpand\dGs}%
+ \ifx\@tempa\dGs\else%
+ \ifx\@kb@msgXXIX\relax\else%
+ \f@issue\typeout{^^J -29- %
+ \@txt@msg{***Warning***\string: TeX engine in use along with CM fonts }%
+ \@txt@msg{(as in current TeX format) isn't sufficient to hyphenate }%
+ \@txt@msg{words containing diacritics (like in French).}%
+ }%
+ \let\@kb@msgXXIX\relax%
+ \fi%
+ \fi%
\fi\fi%
\ifx\undefined\@dblarg%
\long\def\@dblarg#1{\@ifnextchar[{#1}{\@xdblarg{#1}}}}%
@@ -113,12 +138,12 @@
\csname OT\string1\string\"\endcsname%
\expandafter\let\expandafter\@cediORI\expandafter=%
\csname OT\string1\string\c\endcsname%
-\def\@tempa{\let\ifEightBitOutput\iffalse}%
-\ifx\EightBitOutputfalse\undefined\expandafter\@tempa\fi%
\let\@tempc\relax%
\ifx\today\undefined\let\today\cejour\fi%
-\ifx\today\undefined\typeout{^^J -52- Error: the \frenchname\space
- package doesn't run in such minimal document class, sorry!}\expandafter\stop%
+\ifx\today\undefined\f@issue\typeout{^^J -52- %
+ \@txt@msg{Error: the \frenchpack\space package doesn't run in }%
+ \@txt@msg{such minimal document class, sorry!}%
+ }\expandafter\stop%
\fi%
{\def\GOfrench{\global\let\ifEightBitOutput\iffalse}%
\let\add@accent\@gobble\edef\@tempa{\`{}}%
@@ -128,7 +153,7 @@
\GOfrench%
\fi%
}%
-\def\@fw#1{{\let\@nobraces\@firstofone%
+\def\@fW#1{{\let\@nobraces\@firstofone%
\ifEightBitOutput%
\setbox\@tempboxa\hbox{\`\space}%
\ifx\charsubdef\undefined\else%
@@ -142,8 +167,10 @@
\fi%
\edef\@tempa{#1}\typeout{\@tempa}}}%
{\def\ier{er}%
-\@fw{^^J -23- Extension \string : style \frenchname\space%
- \frenchstyleid\space(B.Gaulle)}%
+\f@issue%
+\@fW{^^J -23- \@txt@msg{Extension \string : \frenchpack\space}%
+ \@txt@msg{\frenchstyleid\space(B.Gaulle)}%
+ }%
}%
\let\ifFW\iftrue%
\def\@fw#1{{\let\@NoFr\relax%
@@ -160,7 +187,7 @@
\def\kbtypeout{\kbIO[\typeout]}%
\def\kbIO{\bgroup%
\ifECM\fontencoding{OT1}\selectfont\fi%
- \nofrenchtypography%
+ %
\let\@nobraces\@firstofone%
\let\protect\string%
\ifEightBitOutput%
@@ -196,9 +223,12 @@
\fi%
}%
\fi
-\def\@Ffnt#1{\@fw{-2- fichier #1 non trouv\'e}}%
+\def\@Ffnt#1{\f@issue\@fw{-2- \@txt@msg{fichier #1 non trouv\'e}%
+ }[#1]}%
\def\@finput#1{\InputIfFileExists{#1}{}{\@Ffnt{#1}}}%
-\def\@NoFr{\@fw{-3- l'option \frenchname\space n'est pas active ici !}}%
+\def\@NoFr{\f@issue\@fw{-3- %
+ \@txt@msg{\frenchpack\space n'est pas actif ici !}%
+ }}%
\let\ifFrench\iffalse%
\ifx\addto\undefined%
\def\addto#1#2{\ifx#1\@undefined\def#1{#2}%
@@ -211,6 +241,15 @@
\fi%
\def\fraddto#1#2{\addto{#1}{#2}%
\ifFrench\french\else\english\fi}%
+\ifx\MakeRobustCommand\undefined%
+\def\MakeRobustCommand#1{\expandafter\expandafter\expandafter%
+ \let\expandafter\expandafter\csname #1 \endcsname%
+ \csname #1\endcsname%
+ \expandafter%
+ \edef\csname #1\endcsname{\expandafter\protect%
+ \expandafter\noexpand\csname #1 \endcsname}
+ }%
+\fi%
\ifx\DocInput\undefined\else%
\let\fr@di\DocInput\def\DocInput#1{%
\ifFrench\english\fr@di{#1}\french%
@@ -223,6 +262,10 @@
\else\fr@ul{#1}%
\fi\relax}%
\fi%
+\ifx\xy\undefined\else%
+ \let\fr@xy\xy\def\xy{%
+ \ifFrench\nofrenchguillemets\DFPdp\fi\fr@xy}%
+\fi%
\ifx\hyper@n@rmalise\undefined\else%
\let\fr@hne\hyper@n@rmalise\def\fr@hnr#1#2{\fr@hne{#1}{#2}}%
\def\hyper@n@rmalise{\ifFrench\english\expandafter\fr@hnr%
@@ -266,15 +309,24 @@
\else\fr@PL[#1]%
\fi}%
\fi%
- \def\@ifFTYfalse{\let\if@Back\ifFTY\let\ifFTY\iffalse}%
+ \def\@ifFTYfalse{\let\ifFTY\iffalse}%
\def\@ifFTYback{\let\ifFTY\if@Back}%
\let\if@PMF\iffalse%
-\message{ -24- \frenchname.sty utilise dans ce document le codage de fonte %
- \f@encoding.^^J}%
-\message{ -25- \frenchname.sty affiche ici ses messages en %
- \ifEightBitOutput8-bits.\else7-bits << \string\`a la TeX >>.\fi^^J^^J}%
+\f@issue%
+\@fW{ -24- %
+ \@txt@msg{\frenchname.sty utilise dans ce document le codage de fonte }%
+ \@txt@msg{\f@encoding.^^J}%
+ }%
+\f@issue%
+\@fW{ -25- \@txt@msg{\frenchname.sty affiche ici ses messages en }%
+\@txt@msg{\ifEightBitOutput8-bits.\else7-bits << \string\`a la TeX >>.\fi}%
+\@txt@msg{^^J^^J}%
+ }%
\def\CheckSevenBits/#1{\def\@tempa##1##2/##3{\ifx##2\empty\else%
- \@fw{- 51 - ERREUR : ce document n'a pas \'et\'e converti en 8-bits...}%
+ \f@issue%
+ \@fw{-51- %
+ \@txt@msg{ERREUR : ce document n'a pas \'et\'e converti en 8-bits...}%
+ }%
\expandafter ##3\fi}\expandafter\@tempa\noexpand#1}%
\@ifundefined{tt}{\def\tt{\fontfamily{\ttdefault}\selectfont}}{}%
\edef\lq{\string`}\edef\rq{\string'}%
@@ -307,7 +359,11 @@
\ifx\RIfM@\undefined%
\def\nofrenchguillemets{\@noBDfr}%
\def\frenchguillemets{\@noBDfr}%
+\def\nofrenchbguillemets{\@noBDfr}%
+\def\frenchbguillemets{\@noBDfr}%
\fi%
+\global\let\ifCLAfrench\iffalse%
+\def\ConstantLayout{\@noBDfr}%
\def\nofrenchmacros{\@noBDfr}%
\def\frenchmacros{\@noBDfr}%
\def\automaticlettrine{\@noBDfr}%
@@ -349,13 +405,14 @@
\def\@nombre#1{\bgroup\let\ifFTY\iftrue\def\@tempa{#1}%
\def\,{\ifmmode\mskip\thinmuskip\fi}%
\if@filesw{\immediate\openout\@inputcheck=\jobname.tmp%
+ \let\protect\noexpand%
\ifmmode%
- \immediate\write\@inputcheck{\noexpand\makeatletter%
- \noexpand\@@nombre%
+ \immediate\write\@inputcheck{\protect\makeatletter%
+ \protect\@@nombre%
\@tempa\ignorespaces}%
\else%
- \immediate\write\@inputcheck{\noexpand\makeatletter%
- \noexpand\@@nombre%
+ \immediate\write\@inputcheck{\protect\makeatletter%
+ \protect\@@nombre%
$\@tempa$\ignorespaces}%
\fi%
\immediate\closeout\@inputcheck%
@@ -367,8 +424,69 @@
\fi%
\@tempa\egroup%
}%
-\DeclareRobustCommand*{\nombre}{\@nombre}%
+\ifx\nombre\undefined\DeclareRobustCommand*{\nombre}{\@nombre}\fi%
+\ifx\WindowsUnits\undefined%
+ \def\WindowsUnits{\@wu}\fi%
+\def\FileName{\bgroup%
+ \def\@FNenc@loop##1##2{\@tempcnta`##1\relax%
+ \loop\catcode\@tempcnta=11%
+ \ifnum\@tempcnta<`##2\relax%
+ \advance\@tempcnta\@ne%
+ \repeat}%
+ \@FNenc@loop\^^A\^^H%
+ \@FNenc@loop\^^K\^^K%
+ \@FNenc@loop\^^N\^^_%
+ \@FNenc@loop\^^?\^^ff%
+ \@FileName}%
+\def\@FileName#1{\gdef\theFileName{#1}\egroup}%
+\let\og\empty\let\fg\empty%
+ \def\FrenchGuillemetsFrom#1#2#3#4{%
+ \DeclareFontEncoding{#1}{}{}%
+ \DeclareFontSubstitution{#1}{#2}{m}{n}%
+ \DeclareTextCommand{\guillemotleft}{OT1}{%
+ {\fontencoding{#1}\fontfamily{#2}\selectfont\char#3}}%
+ \DeclareTextCommand{\guillemotright}{OT1}{%
+ {\fontencoding{#1}\fontfamily{#2}\selectfont\char#4}}}
+ \def\CyrillicGuillemets{\FrenchGuillemetsFrom{OT2}{wncyr}{60}{62}}
+ \def\PolishGuillemets{\FrenchGuillemetsFrom{T1}{lmr}{19}{20}}
+ \def\LasyGuillemets{%
+ \DeclareTextCommand{\guillemotleft}{OT1}{\hbox{%
+ \fontencoding{U}\fontfamily{lasy}\selectfont(\kern-0.20em(}}%
+ \DeclareTextCommand{\guillemotright}{OT1}{\hbox{%
+ \fontencoding{U}\fontfamily{lasy}\selectfont)\kern-0.20em)}}}
+ \IfFileExists{t1lmr.fd}{\PolishGuillemets}{\LasyGuillemets}
+ \DeclareTextSymbolDefault{\guillemotleft}{OT1}
+ \DeclareTextSymbolDefault{\guillemotright}{OT1}
+ \def\guill@spacing{\penalty\@M\hskip.8\fontdimen2\font
+ plus.3\fontdimen3\font
+ minus.8\fontdimen4\font}
+ \DeclareRobustCommand*{\begin@guill}{\leavevmode
+ \guillemotleft\penalty\@M\guill@spacing}
+ \DeclareRobustCommand*{\end@guill}{\ifdim\lastskip>\z@\unskip\fi
+ \penalty\@M\guill@spacing\guillemotright\xspace}
+ \AtBeginDocument{\ifx\xspace\@undefined\let\xspace\relax\fi}
+ \def\bbl@frenchguillemets{\renewcommand{\og}{\begin@guill}%
+ \renewcommand{\fg}{\end@guill}}
+ \def\bbl@nonfrenchguillemets{\renewcommand{\og}{``}%
+ \renewcommand{\fg}{\ifdim\lastskip>\z@\unskip\fi ''}}
\def\@ifo{%
+\def\kbIO{\bgroup%
+ \ifECM\fontencoding{OT1}\selectfont\fi%
+ \ifFTY\expandafter\nofrenchtypography\fi%
+ \let\@nobraces\@firstofone%
+ \let\protect\string%
+ \ifEightBitOutput%
+ \def\'####1{\expandafter\@nobraces\@aiguORI####1}%
+ \def\`####1{\expandafter\@nobraces\@gravORI####1}%
+ \def\^####1{\expandafter\@nobraces\@acchORI####1}%
+ \def\"####1{\expandafter\@nobraces\@tremORI####1}%
+ \def\c####1{\expandafter\@nobraces\@cediORI####1}%
+ \csname @kbspecials\endcsname%
+ \else%
+ \let\add@accent\@gobble%
+ \def\set@display@protect{\let\protect\noexpand}%
+ \fi%
+ \@kbtypeout}%
\let\s@owhyphens\showhyphens%
\let\@dsORI\dospecials%
\@ifundefined{@sanitize}{\def\@sanitize{\relax}}{}%
@@ -378,16 +496,17 @@
\edef\@uchORI{\the\uchyph}%
\def\@Hif{\ifFH}\let\@Hfi\fi%
\lccode `\'=`\'%
- \ifx\flowercase\undefined\else\let\lowercase\flowercase\fi%
+ \ifx\flowercase\undefined\else\def\lowercase{\flowercase}\fi%
\@ifundefined{allowhyphens}{%
\def\allowhyphens{\ifhmode\nobreak\hskip\z@skip\fi}}{}%
\@ifundefined{lefthyphenmin}{}%
{\lefthyphenmin=2\righthyphenmin=3}%
\@whatUCH%
\def\@tempa####1{{\accenthyphcodes\h@yphenation{####1}}}%
- \ifx\@tempa\hyphenation%
- \@fw{-41- your format is out of date, %
- please run initex again!}\stop%
+ \ifx\@tempa\hyphenation\f@issue%
+ \@fw{-41- \@txt@msg{your format is out of date, }%
+ \@txt@msg{please run initex again!}%
+ }\stop%
\fi%
\def\accenthyphcodes{%
\let\@typeset@protect\protect%
@@ -412,8 +531,16 @@
{\lefthyphenmin=2\righthyphenmin=3}%
\uchyph=\@uchORI%
\fi}%
-\def\regularmathcomma{%
- \def\@mathcomma{\mathcode`,="613B}\@mathcomma}%
+\@tempcnta=\the\mathcode`,\@tempcntb=\the\mathcode`,%
+\divide\@tempcnta by 4096\relax%
+\multiply\@tempcnta by -4096\relax%
+\advance\@tempcntb by \@tempcnta%
+\edef\@tempb{\noexpand\mathcode`,=\the\@tempcntb}%
+\advance\@tempcntb by 24576\relax%
+\edef\@tempa{\noexpand\mathcode`,=\the\@tempcntb}%
+\edef\regularmathcomma{%
+ \noexpand\def\noexpand\@mathcomma{\@tempa}%
+ \noexpand\@mathcomma}%
\def\@tempa{\if\space\next\else\mathord\fi\mathcomma}%
\let\ifFTY\iftrue%
\ifx\@tempa\sm@rtcomma%
@@ -421,23 +548,28 @@
\def\@mathcomma{\ifFTY\mathcode`\,="8000\fi}%
\@mathcomma}%
\else%
- \def\frenchmathcomma{\def\@mathcomma{\ifFTY\mathcode`,="013B\fi}\@mathcomma}%
+\edef\frenchmathcomma{%
+ \noexpand\def\noexpand\@mathcomma%
+ {\noexpand\ifFTY\@tempb\noexpand\fi}%
+ \noexpand\@mathcomma}%
\fi%
\frenchmathcomma%
\def\ifFTY{\ErrFrench}%
\def\nofrenchtypography{%
- \let\ifFTY\iffalse%
+ \let\ifFTY\iffalse\let\if@Back\ifFTY%
\expandafter\let\csname OT1\string\textbackslash \endcsname\undefined%
\nofrenchguillemets%
+ \nofrenchbguillemets%
\sloppy%
\nonfrenchspacing%
\regularmathcomma%
}%
\def\frenchtypography{%
- \let\ifFTY\iftrue%
+ \let\ifFTY\iftrue\let\if@Back\ifFTY%
\expandafter\let\csname OT1\string\textbackslash \endcsname\@boiORI%
\let\ifLPA\iffalse%
\typedspaces%
+ \frenchbguillemets%
\edef\@tempa{\the\vfuzz}%
\fussy%
\vfuzz=\@tempa%
@@ -448,7 +580,28 @@
\let\ifFTR\iffalse\@cORI}%
\def\frenchtranslation{%
\let\ifFTR\iftrue\captionsfrench}%
-\let\nofrenchguillemets\relax%
+\let\frenchguillemets\relax\let\nofrenchguillemets\relax%
+\let\frenchbguillemets\bbl@frenchguillemets%
+\let\nofrenchbguillemets\bbl@nonfrenchguillemets%
+\def\@tempa{\global\let\ifCLA\iffalse}%
+\ifx\ifCLA\undefined\expandafter\@tempa\fi%
+\def\ConstantLayout{\global\let\ifCLA\iftrue%
+ \expandafter\let\csname ifCLA\languagename\endcsname\iftrue%
+ \def\@tempa{\let\ifbbbbfixlanguage\iftrue}%
+ \ifx\ifbbbbfixlanguage\undefined\@tempa\fi%
+ \def\@tempa{\ifbbbbfixlanguage\else%
+ \f@issue%
+ \@fw{-85- \@txt@msg{Attention \string: l'option fixlanguage }%
+ \@txt@msg{n'a pas ete fournie a l'appel de babelbib}%
+ }\fi%
+ }%
+ \ifx\@nodocument\relax\@tempa%
+ \else\ifx\btxselectlanguage\undefined%
+ \PassOptionsToPackage{fixlanguage}{babelbib}%
+ \else\@tempa%
+ \fi%
+ \fi%
+ \let\ConstantLayout\relax}%
\def\nofrenchlayout{\nofrenchtrivsep%
\let\ifFLA\iffalse\@EIM}%
\def\frenchlayout{%
@@ -470,10 +623,17 @@
\fi}%
\let\@fsORI\frenchspacing%
\def\frenchspacing{\@fsORI\ifECM\sfcode`\(=0\sfcode`\)=1000\fi}%
-\catcode`<=\active\catcode`>=\active\catcode`'=\active\catcode``=\active%
+\catcode`<=\active\catcode`>=\active\catcode`'=\active%
+\catcode`:=\active\catcode``=\active%
\let<=\inferieura\let>=\superieura%
\def\@Fstr{\def<{\@LSG}\def>{\@RSG}\def`{\@SLQ}\def'{\@SRQ}%
+ \def:{\deuxpoints}%
\let\dGs\empty}%
+\def\@LiN{\let\@sogORI<\let\@sfgORI>\let\@lqORI`\let\@rqORI'%
+ \let\@dpORI:\@Fstr\@ifFTYfalse}%
+\def\@LiB{\let<\@sogORI\let>\@sfgORI\let`\@lqORI\let'\@rqORI%
+ \let:\@dpORI\@ifFTYback}%
+\catcode\lq:=12%
\let\@s@ORI\special%
\def\newcount{\alloc@0\count\countdef\insc@unt}%
\def\newdimen{\alloc@1\dimen\dimendef\insc@unt}%
@@ -490,6 +650,11 @@
}{}%
\fi%
\def\ifFTY{\ErrFrench}%
+\@ifclassloaded{beamer}{\let\l@chapter\empty%
+ \def\beamer@captiontemplate{\small\structure%
+ {\insertcaptionname\captionseparator\space}%
+ \insertcaption}
+ }{}%
\def\GOfrench{%
\def\special##1{\@ifFTYfalse\bgroup\@Fstr\@s@ORI{##1}%
\egroup\@ifFTYback}%
@@ -502,9 +667,12 @@
\def\@RSG{\ifmmode\@mRSG\else\superieura\fi}\fi}%
\if@PMF\def\pmfrench{}\def\noeveryparguillemets{}\def\@stared{}%
\def\@desarm{}\def\@qquotes{}\def\@staring{}\def\@fniv2{}\fi%
+\def\sm@llerthree{\protect\sm@ller\protect\sm@ller\protect\sm@ller}
\@ifundefined{smaller}{\def\sm@ller{\small}%
+ \let\sm@llerthree\scriptsize%
\def\l@rger{\large}}%
- {\ifx\undefined\sm@ller%
+ {\def\RSsmallest{4pt}%
+ \ifx\undefined\sm@ller%
\let\sm@ller\smaller\fi}%
\@ifundefined{footnotesize}{%
\def\footnotesize{\sm@ller\sm@ller}}{}%
@@ -571,8 +739,8 @@
\def\@gM@@##1[##2]##3{\@gM@@@{##1}[##2]{##3}{}}%
\def\@gM@@@##1[##2]##3##4{\bgroup\@ifFTYfalse\@Fstr%
\xdef\@temp@{\noexpand\@gG@{##3}{##4}}\egroup%
- \protected@edef\@gG@{##2}%
- \ifx\@gG@\empty\else\protected@edef\@gG@{[##2]}\fi%
+ \ifx\empty##2\let\@gG@=\empty%
+ \else\protected@edef\@gG@{[##2]}\fi%
\let\@typeset@protect\protect%
\protected@edef\@temp@{\noexpand\expandafter%
\noexpand\expandafter%
@@ -580,11 +748,12 @@
\@temp@}\@temp@}%
\ifx\babel@sanitize@arg\undefined\else%
\def\babel@sanitize@arg##1{##1}%
-\wlog{\frenchname\string: use of the babel package force me to nullify %
+\wlog{\frenchname.sty\string: use of the babel package force me to nullify %
\noexpand\babel@sanitize@arg.}%
\fi%
\ifx\ifthenelse\undefined\else\let\@iTeORI\ifthenelse%
- \long\def\ifthenelse##1##2##3{\@ifFTYfalse\@iTeORI{##1}{##2}{##3}\@ifFTYback}%
+ \long\def\ifthenelse##1##2##3{\@ifFTYfalse\@iTeORI{##1}%
+ {\@ifFTYback##2}{\@ifFTYback##3}}%
\fi%
\ifx\texttt\undefined\else\@gG{xt}{texttt}{/}{1}\fi%
\ifx\hyperbaseurl\undefined\else\@gG{hl}{hyperbaseurl}{/}{1}\fi%
@@ -598,19 +767,21 @@
\def\@citex[##1][##2]##3{\@ifFTYfalse%
\let\mbox\mboxORI%
\@cxORI[##1][##2]{##3}\aftergroup\@ifFTYback}%
+\@gG{fc}{fullcite}{1}{1}%
+\@gG{cin}{citation}{/}{1}%
+\def\@lbibitem[##1]##2{\protected@edef\jb@key{##2}\def\jb@tempb{##1}}%
\fi%
\ifx\nocite\undefined\else\@gG{nc}{nocite}{/}{1}\fi%
\ifx\backcite\undefined\else\@gG{bkc}{backcite}{//}{2}\fi%
\ifx\bibitem\undefined\else\let\@biORI\bibitem%
- \def\@LiN{\let\@sogORI<\let\@sfgORI>\let\@lqORI`\let\@rqORI'\let\@dqORI"%
- \@Fstr\@ifFTYfalse}%
- \def\@LiB{\let<\@sogORI\let>\@sfgORI\let`\@lqORI\let'\@rqORI%
- \@ifFTYback}%
\def\bibitem{\@LiN\@ifNextNB[{\@bi@cb}{\@bi@ca}%
}%
\def\@bi@ca##1{\@biORI{##1}\@LiB}%
\def\@bi@cb[##1]##2{\@biORI[##1]{##2}\@LiB}%
\fi%
+\expandafter\ifx\string\bt@@item\undefined%
+ \else\@gG{bti}{\string\bt@@item}{1}{1}%
+ \fi%
\ifx\vref\undefined\else%
\ifx\reftextvario\undefined\let\@vrfCode\undefined%
\fi\fi%
@@ -626,7 +797,18 @@
\ifx\sf@@sub@label\undefined\else\@gG{ss}{sf@@sub@label}{/}{1}\fi%
\def\@temp@{%
\def\label{\protect\@LabeL}%
- \def\@LabeL####1{\@ifFTYfalse\if@labelsinmargin\ifMOVING%
+\def\r@LabeL{\ifx\@lim\empty%
+ \else\marginpar{\@lim@}\xdef\@lim{}%
+ \fi}%
+\def\m@LabeL{\def\@setMGtrue{\let\ifMOVING\iftrue}%
+ \ifmmode\@setMGtrue%
+ \aftergroup\r@LabeL%
+ \fi%
+ \expandafter\t@LabeL}%
+\def\@LabeL{\ifMOVING\expandafter\t@LabeL%
+ \else\m@LabeL%
+ \fi}%
+ \def\t@LabeL####1{\@ifFTYfalse\if@labelsinmargin\ifMOVING%
\xdef\@lim{\ifx\@lim\empty\else\@lim\@@par\relax\fi[####1]}%
\gdef\@lim@{\@ifFTYfalse\hbadness=\@M\tt\@lim\@ifFTYback}%
\else\marginpar{%
@@ -660,22 +842,24 @@
\@temp@%
\fi%
\ifx\list\undefined\else%
- \let\@liORI\list\fi%
+ \let\@liORI\list%
+\fi%
\let\@topsepORI\topsep%
\let\@partopsepORI\partopsep%
\let\@itemsepORI\itemsep%
\let\@parsepORI\parsep%
-\def\warn@seps{\def\topsep{\@w@s{\topsep}\@topsepORI}%
- \def\partopsep{\@w@s{\partopsep}\@partopsepORI}%
- \def\itemsep{\@w@s{\itemsep}\@itemsepORI}%
- \def\parsep{\@w@s{\parsep}\@parsepORI}%
+\def\warn@seps{\def\topsep{\@w@s{\string\topsep}\@topsepORI}%
+ \def\partopsep{\@w@s{\string\partopsep}\@partopsepORI}%
+ \def\itemsep{\@w@s{\string\itemsep}\@itemsepORI}%
+ \def\parsep{\@w@s{\string\parsep}\@parsepORI}%
\def\@tempa{verse}\def\@tempb{quotation}%
\ifx\@tempa\@currenvir\let\@w@s\@gobble\else%
\ifx\@tempb\@currenvir\let\@w@s\@gobble\fi%
\fi%
}%
-\def\@w@s##1{\ifFTSW\@fw{-58- valeur de \string##1 ignor\'ee%
- }\fi}%
+\def\@w@s##1{\ifFTSW\f@issue%
+ \@fw{-58- \@txt@msg{valeur de \string##1 ignor\'ee}%
+ }[##1]\fi}%
\def\org@seps{\let\topsep\@topsepORI%
\let\partopsep\@partopsepORI%
\let\itemsep\@itemsepORI%
@@ -685,7 +869,20 @@
\ifx\@trivlist\@tlORI\else\warn@seps\fi%
##2\org@seps}}%
\ifx\@makecaption\undefined\else\let\@mcORI\@makecaption\fi%
-\def\captionseparator{~--}%
+\ifx\captionseparator\undefined%
+ \def\captionseparator{~--}%
+\fi%
+\let\ifFTY\iffalse%
+\ifx\@contdelim\undefined\else%
+ \ifx\@memerror\undefined%
+ \let\@cdORI\@contdelim%
+ \def\@contdelim{\ifFTY\space\else\@cdORI\fi}%
+ \else%
+ \let\captionseparator\empty%
+ \let\captionfont\@conttfont%
+ \fi%
+\fi%
+\def\ifFTY{\ErrFrench}%
\ifx\captionfont\undefined%
\let\captionfont\emph%
\else\let\@cfORI\captionfont%
@@ -710,7 +907,7 @@
\bgroup%
\ifFTY\ifhmode\ifdim\lastskip>\z@\unskip\fi\nobreak\fi%
\def\@footnotemark{\hbox{\@textsuperscript{\normalfont\,\@thefnmark}}}%
- \fi\@thORI{####1}%
+ \fi\let\ifFTY\iffalse\@thORI{####1}%
\egroup}%
}%
\ifx\thanks\undefined\else\let\@thORI\thanks\@temp@\fi%
@@ -754,7 +951,13 @@
\long\def\@footnotetext##1{\bgroup\let\if@labelsinmargin\iffalse%
\@fntORI{##1}\egroup}%
\let\@fnORI\footnote%
-\def\footnote{\bgroup\def\index####1{\@ifFTYfalse\@iORI{####1}\@ifFTYback}%
+\def\footnote{\bgroup%
+ \def\index{\@ifnextchar[{\f@index}%
+ {\f@index@}%
+ }%
+ \def\f@index[####1]####2{\@ifFTYfalse\@iORI[####1]{####2}%
+ \@ifFTYback}%
+ \def\f@index@####1{\@ifFTYfalse\@iORI{####1}\@ifFTYback}%
\ifFTY\ifhmode\ifdim\lastskip>\z@\unskip\fi%
\nobreak\fi\fi%
\ifmmode\let\@fnORI\fr@footnote\fi%
@@ -786,10 +989,13 @@
\let\mboxORI\mbox%
\def\mbox##1{\leavevmode\hbox{\protect\@set@fr@fn@##1}}%
\def\@set@fr@fn@{\ifFrench\let\footnote\fr@footnote\fi}%
-\def\fr@footnote{\@ifNextNB[\fr@fn@{\fr@fn@[]}}%
+\def\fr@footnote{\@ifNextNB[\fr@fn@{\fr@fn@[]}%
+ }%
\def\fr@fn@[##1]##2{\footnotemark%
- \@fw{-8- \string\footnotetext{##2} perdu}%
- \@fw{-8- Coder \'event. \string\protect\string\footnote}%
+ \f@issue%
+ \@fw{-8- \@txt@msg{\string\footnotetext{##2} perdu.}
+ \@txt@msg{Coder \'event. \string\protect\string\footnote}%
+ }[##2]%
}%
\def\@t@blescaption[##1]##2{\let\cur@fn\footnote%
\let\footnote\fr@footnote%
@@ -834,8 +1040,13 @@
\ifx\@lim\empty\else\marginpar{\@lim@}%
\xdef\@lim{}\fi\let\ifMOVING\iffalse}%
}%
-\expandafter\ifx\csname endtable*\endcsname\relax%
- \expandafter\let\csname endtable*\endcsname\endgroup\fi%
+\ifx\endtable\undefined\let\@Fendtable\relax\fi%
+\def\@temp@{\def\endtable{\ifFLA\endgroup%
+ \expandafter\let\csname endtable*\endcsname\endtable%
+ \fi}%
+ }%
+\ifx\endtable\relax\@temp@%
+\fi%
\expandafter\def\csname @Fendtable*\endcsname{%
\expandafter\let%
\expandafter\@dbetORI\csname endtable*\endcsname%
@@ -848,19 +1059,24 @@
\ifx\@lim\empty\else\marginpar{\@lim@}%
\xdef\@lim{}\fi\let\ifMOVING\iffalse}%
}%
-\ifx\endtable\undefined\let\@Fendtable\relax\fi%
-\def\@temp@{\def\endtable{\ifFLA\endgroup%
- \expandafter\let\csname endtable*\endcsname\endtable%
- \fi}%
- }%
-\ifx\endtable\relax\@temp@\fi%
+\expandafter\ifx\csname endtable*\endcsname\relax%
+ \expandafter\let\csname endtable*\endcsname\endtable%
+\fi%
+\expandafter\ifx\csname\string\table\endcsname\undefined\else%
+ \expandafter\let\expandafter\BfigureORI\csname\string\figure\endcsname%
+ \expandafter\def\csname\string\figure\endcsname{\@Fendfigure\BfigureORI}%
+ \expandafter\let\expandafter\BtableORI\csname\string\table\endcsname%
+ \expandafter\def\csname\string\table\endcsname{\@Fendtable\BtableORI}%
+\fi%
\ifx\undefined\Hy@PDFDef\let\Hy@PDFDef\pdfstringdef\fi%
\ifx\undefined\Hy@PDFDef\else%
\let\@hpdORI\Hy@PDFDef%
\def\Hy@PDFDef##1##2{\@ifFTYfalse\afterassignment%
\@Fstr\@hpdORI{##1}{##2}\@ifFTYback}%
\fi%
-\ifx\pdfstringdef\undefined\else\let\pdfstringdef\Hy@PDFDef\fi%
+\ifx\pdfstringdef\undefined\else%
+ \let\pdfstringdef\Hy@PDFDef%
+\fi%
\let\@lti\labelitemi\let\@ltii\labelitemii%
\let\@ltiii\labelitemiii\let\@ltiv\labelitemiv%
\@ifo%
@@ -898,28 +1114,51 @@
use the following}}}%
\protected@write\@auxout{}{\protect%
\csname auxWARNINGi\protect\endcsname{\protect\typeout%
- {-34- LaTeX packages: \frenchname!}}}%
+ {-34- LaTeX packages: \frenchpack!}}}%
\protected@write\@auxout{}{\protect%
\csname auxWARNINGi\protect\endcsname{\protect\typeout%
{-34- check \protect\protect\protect\usepackage%
- \protect\space or remove these files.%
+ \protect\space or remove these files. %
Typesetting is aborted!}%
\protect\stop}}%
\fi%
\@finput{frlpatch.sty}%
\ifx\FSfd@patch\FSfd\else
- \@fw{-42- The French patch file (frlpatch.sty) is not suitable^^J%
- for this version of the "french" package dated \FSfd}\batchmode\@@end%
+ \f@issue%
+ \@fw{-42- %
+ \@txt@msg{The French patch file (frlpatch.sty) is not suitable^^J}%
+ \@txt@msg{for this version of the "\frenchpack" package dated \FSfd}%
+ }%
+ \batchmode\@@end%
\fi%
\let\@Ffnt\ErrFrench\let\ErrFrench\undefined%
- \InputIfFileExists{\frenchname.cfg}{%
- \@fw{-48- Lecture du fichier de %
- configuration de \frenchname}}{}%
+ \IfFileExists{\frenchname.cfg}{%
+ \f@issue%
+ \@fw{-48- \@txt@msg{Lecture du fichier de }%
+ \@txt@msg{configuration de \frenchpack}%
+ }%
+ \@finput{\frenchname.cfg}}{}%
\beginlanguage}%
\let\@dORI\document%
\def\document{%
\ifx\noxcomment\undefined\else%
\global\let\@x@hk\xcomment@hook\global\noxcomment\fi%
+ \ifx\btxselectlanguage\undefined%
+ \else\ifx\babel@savevariable\undefined%
+ \f@issue\@fw{-87- %
+ \@txt@msg{ERREUR \string: }%
+ \@txt@msg{babelbib s'utilise uniquement avec babel}%
+ }%
+ \stop%
+ \fi%
+ \fi%
+ \ifx\@bglngpk\babel@savevariable%
+ \else%
+ \f@issue\@fw{-71- %
+ \@txt@msg{ATTENTION : }%
+ \@txt@msg{si babel est utilis\'e, mettre \frenchname\space en option}%
+ }%
+ \fi\let\@bglngpk\undefined%
\@dORI%
\GOfrench%
\let\GOfrench\undefined%
@@ -927,15 +1166,26 @@
\expandafter\xcomment@hook\fi}%
\@makeother`\@makeother<\@makeother>\@makeother'%
\let\enddocumentasusual\enddocument%
- \def\enddocument{\csname f@lastpage\endcsname%
+ \def\enddocument{\def\@tempa{\AtEndDocument{\french\f@clearpage%
+ \global\let\ifCLA\iffalse%
+ \let\ifCLAfrench\iffalse%
+ \endfrench}}%
+ \csname f@lastpage\endcsname%
\@CGroup%
\ifFLA%
- \AtEndDocument{\french\clearpage\endfrench}%
- \def\@tempa{empty}\ifx\@specialstyle\@tempa%
- \else\gdef\@specialstyle{french}\fi%
+ \@tempa%
+ \def\@tempa{empty}\ifx\@specialstyle\@tempa%
+ \else\gdef\@specialstyle{french}\fi%
\fi%
\let\GOfrench\relax%
\switchtolanguage\englishTeXmods%
+ \let\f@clearpage\clearpage%
+\ifx\lastpage@putlabel\undefined%
+\else\let\clearpage\relax%
+ \let\lastpage@putlabelORI\lastpage@putlabel%
+ \def\lastpage@putlabel{\addtocounter{page}{+1}\lastpage@putlabelORI%
+ \addtocounter{page}{-1}}%
+\fi%
%
\ifx\undefined\babel@core@loaded\else%
\ifx\@testdef\undefined\else%
@@ -981,6 +1231,11 @@
\long\def\@ifundefined#1#2#3{\expandafter\ifx\csname%.......... \@ifundefined
#1\endcsname\relax#2\else#3\fi}%
\fi%
+\let\ifCLAenglish\iffalse%
+\def\@tempa{\global\let\ifCLA\iffalse%
+ }%
+\ifx\ifCLA\undefined\expandafter\@tempa\fi%
+
\global\let\ifnonenglishheadings\iffalse%english style allows english headings!
\gdef\captionsenglish{%...................................... \captionsenglish
\ifx\captionsnames\captionsenglish\else
@@ -990,7 +1245,9 @@
\ifx\bibname\undefined\else%
\def\bibname{Bibliography}%
\fi%
+\ifx\btxselectlanguage\undefined% Don't call \bibsenglish if babelbib loaded.
\csname bibsenglish\endcsname%
+\fi%
\def\contentsname{Table of Contents}%
\def\listfigurename{List of Figures}%
\def\listtablename{List of Tables}%
@@ -1037,9 +1294,17 @@
}%
\@ifundefined{englishTeXmods}{%................................ \englishTeXmods
\gdef\englishTeXmods{%\captionsnames are normally restored by prev. langua.
+ \ifCLA
+ \ifCLAenglish%
\ifx\captionsnames\captionsenglish%
\else\captionsenglish\dateenglish%
\fi%
+ \fi%
+ \else%
+ \ifx\captionsnames\captionsenglish%
+ \else\captionsenglish\dateenglish%
+ \fi%
+ \fi%
\csname @xtrasenglish\endcsname%
\def\languagename{english}% set it for mlp.
\let\switchtolanguage\endenglish%
@@ -1071,6 +1336,7 @@
\english% Ready now to activate the mechanism [english is the default language]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%===================================%
+\def\languagename{french}%
\let\ifnonenglishheadings\iftrue%
\def\datefrench{%
\def\todayfrench{\ifx\ier\undefined\def\ier{er}\fi%
@@ -1080,14 +1346,31 @@
avril\or mai\or juin\or juillet\or ao\^ut\or septembre\or %
octobre\or novembre\or d\'ecembre\fi \space\number\year}%
}\datefrench%
- \def\ordinal#1{\ifcase\value{#1}\or {p}remier\else\ordin@l{#1}\fi}%
- \def\ordin@l#1{\ifcase\value{#1}\or\or {d}euxi\`eme\or %
- {t}roisi\`eme\or {q}uatri\`eme\or {c}inqui\`eme\or {s}ixi\`eme\or %
+\if@filesw
+ \def\ordinalSecondNam{{s}econd}%
+ \def\ordinalSecondName{{s}econde}%
+\else%
+ \def\ordinalSecondNam{{d}euxi\`eme}%
+ \let\ordinalSecondName\ordinalSecondNam%
+\fi%
+ \def\@osn#1#2{\expandafter\ifx\csname#1osn\endcsname%
+ \relax#2\else\csname#1osn\endcsname\fi}%
+ \def\ordinal#1{\ifcase\value{#1}\or {p}remier%
+ \or\@osn{#1}{\ordinalSecondNam}\else\ordin@l{#1}\fi}%
+ \def\ordin@l#1{\ifcase\value{#1}\or\or\or %
+ {t}roisi\`eme\if@filesw{\protected@write\@auxout{}{%
+ \protect\expandafter%
+ \protect\gdef\protect\csname#1osn%
+ \protect\endcsname%
+ {{d}euxi\`eme}}}%
+ \fi%
+ \or {q}uatri\`eme\or {c}inqui\`eme\or {s}ixi\`eme\or %
{s}epti\`eme\or {h}uiti\`eme\or {n}euvi\`eme\or {d}ixi\`eme\or %
{o}nzi\`eme\or {d}ouzi\`eme\or {t}reizi\`eme\or {q}uatorzi\`eme\or %
{q}uinzi\`eme\or {s}eizi\`eme\or {d}ix-septi\`eme\or {d}ix-huiti\`eme\or %
{d}ix-neuvi\`eme\or {v}ingti\`eme\fi}%
- \def\ordinale#1{\ifcase\value{#1}\or {p}remi\`ere\else\ordin@l{#1}\fi}%
+ \def\ordinale#1{\ifcase\value{#1}\or {p}remi\`ere%
+ \or\@osn{#1}{\ordinalSecondName}\else\ordin@l{#1}\fi}%
\def\Ordinal{\expandafter\uppercase\ordinal}%
\def\Ordinale{\expandafter\uppercase\ordinale}%
\def\captionsfrench{%
@@ -1103,7 +1386,9 @@
\ifx\bibname\undefined\else%
\def\bibname{Bibliographie}%
\fi%
+\ifx\btxselectlanguage\undefined%
\csname bibsfrench\endcsname%
+\fi%
\def\contentsname{Table des mati\`eres}%
\def\listfigurename{Table des figures}%
\def\listtablename{Liste des tableaux}%
@@ -1210,6 +1495,8 @@
\let\emailadd\@empty\let\@yourref\@empty\let\@ourref\@empty%
\let\@object\@empty%
\def\ps@firstpage{\ifFLA%
+ \advance\topmargin by -20\p@%
+ %
\def\@oddhead{\ifx\undefined\formhead\else%
\bgroup\hss\formhead\hss\egroup\fi}%
\def\@oddfoot{\raisebox{-45\p@}[\z@]%
@@ -1231,6 +1518,7 @@
\advance\longindentation by 0.22\textwidth%
\advance\parindent by 1.5em%
%
+ \let\nopagenumbers\relax%
\thispagestyle{firstpage}%
%
\raggedbottom%
@@ -1238,16 +1526,15 @@
\ifx\@empty\fromaddress\let\fromaddress\space\fi%
{\raggedright\hspace*{-0.25\indentedwidth}%
\parbox[t]{0.5\textwidth}{\ignorespaces%
- \vbox to 0pt{\fromaddress\vss}}%
- \\*[0.65in]%
- \vspace*{-5\baselineskip}\vspace*{60\p@}%
+ \vbox to 0\p@{\fromaddress\vss}}%
+ \\*[1.75\baselineskip]%
\par}%
\ifx\@empty\toname%
%
{\raggedleft\bgroup\fromlocation\space\@date\egroup\par}%
\else%
{\raggedleft\begin{tabular}{l}\ignorespaces%
- \toname\\ \toaddress\\*[8\parskip]%
+ \toname\\ \toaddress\\*[6\parskip]%
\fromlocation\space\@date\end{tabular}\par}%
\fi%
\ifx\@empty\@ourref\else%
@@ -1315,8 +1602,22 @@
\fi%
\else\@temp@%
\fi%
+\let\ps@frenchORI\ps@french%
\let\@sdORI\secdef%
-\def\secdef{\ifFLA\thispagestyle{french}\fi\@sdORI}%
+\def\nofrenchpagestyle{\let\secdef\@sdORI}%
+\def\frenchpagestyle{%
+ \def\secdef{\ifFLA\thispagestyle{french}\fi\@sdORI}%
+ }%
+\frenchpagestyle%
+\ifx\aliaspagestyle\undefined%
+\def\nobeginingfolio{\let\ps@french\ps@empty}%
+\else%
+\def\nobeginingfolio{\let\ps@french\ps@empty%
+ \aliaspagestyle{chapter}{empty}%
+ }%
+\fi%
+\def\beginingfolio{\let\ps@french\ps@frenchORI%
+ \frenchpagestyle}%
\def\@EIM{\def\labelitemi{\@lti}\def\labelitemii{\@ltii}%
\def\labelitemiii{\@ltiii}\def\labelitemiv{\@ltiv}%
\let\@afterindentfalse\@aifORI\@afterindentfalse%
@@ -1366,7 +1667,9 @@
\def\DFPdq{\catcode`"=12}%
\let\ifLPA\iffalse%
\let\ifFG\iffalse%
-\def\@tempa#1{\@fw{-13- le caract\`ere "#1" est d\'ej\`a actif}%
+\def\@tempa#1{\f@issue%
+ \@fw{-13- \@txt@msg{le caract\`ere "#1" est d\'ej\`a actif}%
+ }[#1]%
\let\@tempb\next\let\@tempc\empty}%
\let\@tempb\empty%
\AFPdp%
@@ -1398,7 +1701,13 @@
\string:%
\@beginparpenalty=\@M\relax%
\fi}%
-\ifx\hhline\unedfined\else\let\@hhlORI\hhline%
+\def\@wu#1{\@@wu#1,\void}%
+\def\@@wu#1,#2{\ifx#1\empty\else\@@@wu #1\fi%
+ \def\@tempa{\@@wu#2}%
+ \ifx#2\void\else\expandafter\@tempa\fi%
+ }%
+\def\@@@wu#1=#2{\expandafter\edef\csname #1\endcsname:{#2\string:}}%
+\ifx\hhline\undefined\else\let\@hhlORI\hhline%
\def\hhline{\omit\ifFrench\let:\@cidp\fi%
\expandafter\@gobble\@hhlORI}%
\fi%
@@ -1426,8 +1735,9 @@
\fi%
\fi%
\string?\fi}%
-\ifx\@tempb\next\let\AFPdp\empty%
- \@fw{la double ponctuation est alors d\'esactiv\'ee}\fi%
+\ifx\@tempb\next\let\AFPdp\empty\f@issue%
+ \@fw{-13b- %
+ \@txt@msg{la double ponctuation est alors d\'esactiv\'ee}}\fi%
\let\ifLPA\ErrFrench%
\let\ifFG\ErrFrench%
\let\@aORI\@array%
@@ -1506,9 +1816,16 @@
}%
\gdef\frenchTeXmods{%
\global\let\ifFrench\iftrue%
+\ifCLA%
+ \ifCLAfrench%
\@AFP%
- \frenchtypography\frenchtranslation%
- \frenchlayout\frenchmacros\frenchwarnings%
+ \frenchtypography\frenchtranslation\frenchlayout%
+ \fi%
+\else%
+ \@AFP%
+ \frenchtypography\frenchtranslation\frenchlayout%
+\fi%
+ \frenchmacros\frenchwarnings%
\let\@HifORI\@Hif\let\@HfiORI\@Hfi%
\frenchhyphenation%
\csname @xtrasfrench\endcsname%
@@ -1526,27 +1843,38 @@
\ifx\babel@savevariable%
\undefined\french%
\else\endenglish\selectlanguage{french}\fi}%
- }%
+ }%
\DeclareOption{english}{\def\beginlanguage{%
\ifx\babel@savevariable%
\undefined\english%
\else\selectlanguage{english}\fi}%
- }%
+ }%
\else\let\extrasfrench\frenchTeXmods%
+ \AtBeginDocument{%
+ \def\@tempa{\protect\@LabeL}%
+ \ifx\@tempa\label\else%
+ \let\@lORI\label\let\label\@tempa\fi%
+ \def\@tempa{\protect\atgH{r}}%
+ \ifx\@tempa\ref\else\@gG{r}{ref}{/}{1}\fi%
+ }%
\fi%
\@ifundefined{switchtolanguage}{%
\def\switchtolanguage#1{#1}}{}%
\let\@stlORI\switchtolanguage
\def\@DFPtestANDset{%
\ifx\ifFrench\iffalse%
- \@fw{-71- ATTENTION : %
- si babel est utilis\'e, mettre \frenchname\space en option}%
+ \f@issue\@fw{-71- %
+ \@txt@msg{ATTENTION : }%
+ \@txt@msg{si babel est utilis\'e, mettre \frenchname\space en option}%
+ }%
\fi%
\let\@DFPtestANDset\@DFP%
\@DFP}%
\def\endfrench{%
+\ifCLAfrench\else%
\@DFPtestANDset%
\nofrenchtypography\nofrenchtranslation\nofrenchlayout%
+\fi%
\nofrenchmacros%
\nofrenchhyphenation%
\let\@Hif\@HifORI\let\@Hfi\@HfiORI%
@@ -1559,12 +1887,14 @@
\global\let\if@FE\iffalse%
\newif\if@more\@moretrue%
\def\@doFh{%
+\def\f@ERRdat{\f@issue%
+ \errmessage{-9- \@txt@msg{Corrupted/absent language.dat file.}%
+ }\global\let\french\@@end%
+ }%
\bgroup%
\let\ORIGfrench\french%
\newcount\@FrCount%
\def\tl@ng##1{}%
-\def\ERRdat{\errmessage{-9- Corrupted/absent language.dat file.}%
- \global\let\french\enddocument}%
\def\@rhef##1/##2 /{\def\@tempa{##2}%
\def\@tempb{##1}%
\def\@tempc{\ifx\space\@tempa\else%
@@ -1579,13 +1909,18 @@
\edef\l@no{##1}\expandafter%
%
\ifx\csname l@##2\endcsname\l@no%
- \else\typeout{^^J \frenchname.sty: -27- language ##1 (##2) was initially %
- (at initex) numbered \csname l@##2\endcsname\space(ERROR!)}\ERRdat%
+ \else\f@issue\typeout{^^J \frenchname.sty \string: -27- %
+ \@txt@msg{language \l@no\space (##2) was initially }%
+ \@txt@msg{(at initex) numbered \csname l@##2\endcsname\space(ERROR!)}%
+ }[##2]\f@ERRdat%
\fi\fi}%
- \expandafter\tl@ng\csname##2TeXmods\endcsname%
- \expandafter\gdef\csname##2\endcsname%
- {\expandafter\switchtolanguage\csname ##2TeXmods\endcsname%
- \@Hif\language=##1\@Hfi\relax}}%
+ \expandafter\tl@ng\csname##2TeXmods\endcsname%
+ \expandafter\gdef\csname##2 \endcsname%
+ {\expandafter\switchtolanguage\csname ##2TeXmods\endcsname%
+ \@Hif\language=##1\@Hfi\relax}%
+ \expandafter\gdef\csname##2\endcsname%
+ {\protect\csname##2 \endcsname}%
+ }%
\edef\@temp@{=}%
\def\@langue##1##2 ##3 ##4/##5{\def\@tempa{=}\def\@tempb{##1}%
\ifx\@tempa\@tempb%
@@ -1605,8 +1940,10 @@
\ifx\undefined\french %
\else\xdef\@PrevF{\french}%
\gdef\french{\switchtolanguage\frenchTeXmods\@PrevF}%
- {\@PrevF\@fw{-15- le langage \frenchname\space porte le %
- num\'ero \the\language}}%
+ {\@PrevF\f@issue\@fw{-15- %
+ \@txt@msg{le langage \frenchname\space porte le }%
+ \@txt@msg{num\'ero \the\language}%
+ }}%
\fi%
\ifx\undefined\l@english %
\def\l@english{0}%
@@ -1614,8 +1951,10 @@
\ifx\undefined\english %
\else\xdef\@PrevE{\language=\l@english}%
\gdef\english{\switchtolanguage\englishTeXmods\@PrevE}%
- {\@PrevE\@fw{-16- the English language\space is numbered %
- \the\language}}%
+ {\@PrevE\f@issue\@fw{-16 %
+ \@txt@msg{the English language\space is numbered }%
+ \@txt@msg{\the\language}%
+ }}%
\fi
\else\@FrCount=-1%
\loop \endlinechar=-1 \read\@inputcheck to \@lineD \endlinechar`\^^M%
@@ -1629,25 +1968,45 @@
\let\hyphenation\@hyphenation%
\def\@MLtst{\@ifundefined{fhyph}%
{\if@PMF\gdef\french{\switchtolanguage\frenchTeXmods}%
- \@fw{-19- utilisation du langage interne num\'ero \the\language}%
- \else\typeout{^^J \frenchname.sty: -20-
- the French language is undefined (ERROR!)}\ERRdat\fi}%
+ \f@issue%
+ \@fw{-19- %
+ \@txt@msg{utilisation du langage interne num\'ero \the\language}%
+ }%
+ \else\f@issue%
+ \typeout{^^J \frenchname.sty: -20b-
+ \@txt@msg{the French language is undefined (ERROR!)}%
+ }\f@ERRdat\fi}%
{\gdef\french{\switchtolanguage\frenchTeXmods\fhyph}%
\gdef\english{\switchtolanguage\englishTeXmods\ehyph}%
}%
}%
\@ifundefined{french}{\@MLtst}{}%
\@ifundefined{endenglish}{\global\let\endenglish\french}{}%
-\gdef\tl@ng##1{\ifx ##1\relax\@fw{-21- ##1 n'est pas d\'efini}\fi}%
-\ifx\ORIGfrench\french\ERRdat\fi%
+\gdef\tl@ng##1{\ifx ##1\relax\f@issue%
+ \@fw{-21- \@txt@msg{##1 n'est pas d\'efini}%
+ }[##1]\fi}%
+\ifx\ORIGfrench\french\f@ERRdat\fi%
\egroup%
}%
+\ifx\vert\undefined\else\let\@bvORI\vert\fi%
+\def\@fwVIIIII{\f@issue%
+ \kbtypeout{^^J -73- \@txt@msg{ERREUR avec AmSTeX : }%
+ \@txt@msg{\frenchname.sty a \'et\'e charg\'e trop t\^ot !}%
+ }\stop}%
+\ifx\RIfM@\undefined%
+\def\vert{\ifx\RIfM@\undefined\expandafter\@bvORI\else\expandafter%
+ \@fwVIIIII\fi}%
+\else%
+\def\vert{\@bvORI}%
+\fi%
\let\@currname\@currnameORI%
+\def\languagename{english}%
\def\beginlanguage{%
- \ifx\babel@savevariable%
- \undefined\french%
- \else\endenglish\selectlanguage{french}\fi%
- }%
+ \ifx\babel@savevariable%
+ \undefined\french%
+ \else\endenglish\selectlanguage{french}\fi%
+ }%
+\let\@bglngpk\babel@savevariable%
\ifx\pg@add@to\undefined\else%
\def\pg@begin{\begingroup}%
\def\pg@end{\endgroup}%
@@ -1659,6 +2018,7 @@
{Initialisation de l'option \frenchname\space pour Babel}%
\GOfrench\let\GOfrench\relax%
\fi%
+\let\@FW\undefined%
\resetat%
\PassOptionsToPackage{french}{varioref}%
\PassOptionsToPackage{french}{pdfscreen}%
diff --git a/Master/texmf-dist/tpm/frenchle.tpm b/Master/texmf-dist/tpm/frenchle.tpm
new file mode 100644
index 00000000000..5d7943c779f
--- /dev/null
+++ b/Master/texmf-dist/tpm/frenchle.tpm
@@ -0,0 +1,31 @@
+<!DOCTYPE rdf:RDF SYSTEM "../../support/tpm.dtd">
+<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:TPM="http://texlive.dante.de/">
+ <rdf:Description about="http://texlive.dante.de/texlive/Package/frenchle.zip">
+ <TPM:Name>frenchle</TPM:Name>
+ <TPM:Type>Package</TPM:Type>
+ <TPM:Date>2006/07/04 19:39:37</TPM:Date>
+ <TPM:Version></TPM:Version>
+ <TPM:Creator>karl</TPM:Creator>
+ <TPM:Title>The frenchle package.</TPM:Title>
+ <TPM:Description></TPM:Description>
+ <TPM:Author></TPM:Author>
+ <TPM:Size>883109</TPM:Size>
+ <TPM:Build/>
+ <TPM:RunFiles size="90694">
+texmf-dist/tex/latex/frenchle/french.ldf
+texmf-dist/tex/latex/frenchle/frenchle.cfg
+texmf-dist/tex/latex/frenchle/frenchle.ldf
+texmf-dist/tex/latex/frenchle/frenchle.sty
+texmf-dist/tpm/frenchle.tpm
+ </TPM:RunFiles>
+ <TPM:DocFiles size="793560">
+texmf-dist/doc/latex/frenchle/ALIRE.le
+texmf-dist/doc/latex/frenchle/FAQ.pdf
+texmf-dist/doc/latex/frenchle/README.le
+texmf-dist/doc/latex/frenchle/frenchle.pdf
+texmf-dist/doc/latex/frenchle/link_to_README.le
+ </TPM:DocFiles>
+ <TPM:Provides>Package/frenchle</TPM:Provides>
+ </rdf:Description>
+</rdf:RDF>
+
diff --git a/Master/texmf-dist/tpm/le.tpm b/Master/texmf-dist/tpm/le.tpm
deleted file mode 100644
index 60627774442..00000000000
--- a/Master/texmf-dist/tpm/le.tpm
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE rdf:RDF SYSTEM "../../support/tpm.dtd">
-<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:TPM="http://texlive.dante.de/">
- <rdf:Description about="http://texlive.dante.de/texlive/Package/le.zip">
- <TPM:Name>le</TPM:Name>
- <TPM:Type>Package</TPM:Type>
- <TPM:Date>2006/01/09 00:44:40</TPM:Date>
- <TPM:Version>1.0</TPM:Version>
- <TPM:Creator>rahtz</TPM:Creator>
- <TPM:Title>
-The light version of &quot;french&quot; package.
- </TPM:Title>
- <TPM:Description>
-The light version of the multilingual
-package &quot;french&quot; for LaTeX.
- </TPM:Description>
- <TPM:Author></TPM:Author>
- <TPM:Size>889601</TPM:Size>
- <TPM:Build/>
- <TPM:RunFiles size="75100">
-texmf-dist/tex/latex/le/french.ldf
-texmf-dist/tex/latex/le/frenchle.ldf
-texmf-dist/tex/latex/le/frenchle.sty
-texmf-dist/tpm/le.tpm
- </TPM:RunFiles>
- <TPM:DocFiles size="814501">
-texmf-dist/doc/latex/le/ALIRE.le
-texmf-dist/doc/latex/le/FAQ.pdf
-texmf-dist/doc/latex/le/frenchle.pdf
-texmf-dist/doc/latex/le/link_to_README.le_file
- </TPM:DocFiles>
- <TPM:Provides>Package/le</TPM:Provides>
- </rdf:Description>
-</rdf:RDF>
-
diff --git a/Master/texmf/lists/frenchle b/Master/texmf/lists/frenchle
new file mode 100644
index 00000000000..646bea5d2c1
--- /dev/null
+++ b/Master/texmf/lists/frenchle
@@ -0,0 +1,13 @@
+texmf-dist/doc/latex/frenchle/ALIRE.le
+texmf-dist/doc/latex/frenchle/FAQ.pdf
+texmf-dist/doc/latex/frenchle/README.le
+texmf-dist/doc/latex/frenchle/frenchle.pdf
+texmf-dist/doc/latex/frenchle/link_to_README.le
+
+texmf-dist/tex/latex/frenchle/french.ldf
+texmf-dist/tex/latex/frenchle/frenchle.cfg
+texmf-dist/tex/latex/frenchle/frenchle.ldf
+texmf-dist/tex/latex/frenchle/frenchle.sty
+texmf-dist/tpm/frenchle.tpm
+
+texmf/lists/frenchle
diff --git a/Master/texmf/tpm/collection-langfrench.tpm b/Master/texmf/tpm/collection-langfrench.tpm
index 28df4defaa8..466a178b460 100644
--- a/Master/texmf/tpm/collection-langfrench.tpm
+++ b/Master/texmf/tpm/collection-langfrench.tpm
@@ -16,7 +16,7 @@
<TPM:RunFiles size="1221">texmf/tpm/collection-langfrench.tpm</TPM:RunFiles>
<TPM:Requires>
<TPM:Package name="aeguill"/>
- <TPM:Package name="le"/>
+ <TPM:Package name="frenchle"/>
<TPM:TLCore name="collection-basic"/>
<TPM:TLCore name="hyphen-basque"/>
<TPM:TLCore name="hyphen-french"/>