From 5ba6b30c5ebf5580fcd5057d61b4d07f195fef5e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 4 Aug 2017 22:06:26 +0000 Subject: lettre (4aug17) git-svn-id: svn://tug.org/texlive/trunk@44950 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/lettre/default.ins | 61 -- .../tex/latex/lettre/lettre-USenglish.ldf | 50 ++ Master/texmf-dist/tex/latex/lettre/lettre-amg.cfg | 53 ++ .../texmf-dist/tex/latex/lettre/lettre-default.cfg | 61 ++ .../texmf-dist/tex/latex/lettre/lettre-english.ldf | 50 ++ .../texmf-dist/tex/latex/lettre/lettre-french.ldf | 75 ++ .../texmf-dist/tex/latex/lettre/lettre-german.ldf | 51 ++ Master/texmf-dist/tex/latex/lettre/lettre-obs.cfg | 86 +++ .../texmf-dist/tex/latex/lettre/lettre-romand.ldf | 53 ++ Master/texmf-dist/tex/latex/lettre/lettre.cls | 829 +++++++++++++-------- 10 files changed, 985 insertions(+), 384 deletions(-) delete mode 100644 Master/texmf-dist/tex/latex/lettre/default.ins create mode 100644 Master/texmf-dist/tex/latex/lettre/lettre-USenglish.ldf create mode 100644 Master/texmf-dist/tex/latex/lettre/lettre-amg.cfg create mode 100644 Master/texmf-dist/tex/latex/lettre/lettre-default.cfg create mode 100644 Master/texmf-dist/tex/latex/lettre/lettre-english.ldf create mode 100644 Master/texmf-dist/tex/latex/lettre/lettre-french.ldf create mode 100644 Master/texmf-dist/tex/latex/lettre/lettre-german.ldf create mode 100644 Master/texmf-dist/tex/latex/lettre/lettre-obs.cfg create mode 100644 Master/texmf-dist/tex/latex/lettre/lettre-romand.ldf (limited to 'Master/texmf-dist/tex/latex/lettre') diff --git a/Master/texmf-dist/tex/latex/lettre/default.ins b/Master/texmf-dist/tex/latex/lettre/default.ins deleted file mode 100644 index 53ced772d79..00000000000 --- a/Master/texmf-dist/tex/latex/lettre/default.ins +++ /dev/null @@ -1,61 +0,0 @@ -% file name : `default.ins'. -% pacakge name: lettre -% maintenance : Vincent Belaïche (vincentb1@users.sourceforge.net) -% author : Denis Mégevand - Observatoire de Genève -% email : lettre_observatoire-aide@gna.org -% version : v2.353 -% date : 2014/09/09 -% -% This file is part of the "lettre" package. -% This work may be distributed and/or modified under the conditions of the -% LaTeX Project Public License, either version 1.3 of this license or (at your -% option) any later version. The latest version of this license is in -% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all -% distributions of LaTeX version 2005/12/01 or later. -% -% This work has the LPPL maintenance status `maintained'. -% -% The Current Maintainer of this work is Vincent Belaïche. -% -% This work consists of all files listed in file README -% -% **************************************** -% * DEFINITIONS DE L'INSTITUT B.I.D.O.N * -% **************************************** -% -\address{B.I.D.O.N\\Rue des Mots\\80886 Sassonne-le-Creux} -\telephone{987.64.20} -\fax{987.75.31} -\lieu{Sassonne-le-Creux} -\francais -% -\def\pict@let@width{185}% -\def\pict@let@height{65}% -\def\pict@let@hoffset{0}% -\def\pict@let@voffset{0}% -\def\rule@hpos{-25}% -\def\rule@vpos{-15}% -\def\rule@length{10}% -\def\fromaddress@let@hpos{-10}% -\def\fromaddress@let@vpos{70}% -\fromaddress@let@width=69mm -\def\fromlieu@let@hpos{90}% -\def\fromlieu@let@vpos{62}% -\fromlieu@let@width=69mm -\def\toaddress@let@hpos{90}% -\def\toaddress@let@vpos{40}% -\toaddress@let@width=80mm -% -\def\pict@fax@width{185}% -\def\pict@fax@height{30}% -\def\pict@fax@hoffset{0}% -\def\pict@fax@voffset{0}% -\def\fromaddress@fax@hpos{-10}% -\def\fromaddress@fax@vpos{30}% -\fromaddress@fax@width=69mm -\def\faxstring@hpos{90}% -\def\faxstring@vpos{20}% -\faxstring@width=69mm% -\faxbox@width=170mm% -\toaddress@fax@width=69mm% -\fromname@fax@width=69mm% diff --git a/Master/texmf-dist/tex/latex/lettre/lettre-USenglish.ldf b/Master/texmf-dist/tex/latex/lettre/lettre-USenglish.ldf new file mode 100644 index 00000000000..12f41cb64f4 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lettre/lettre-USenglish.ldf @@ -0,0 +1,50 @@ +% file name : `lettre-USenglish.ldf'. +% package name: lettre +% maintenance : Vincent Belaïche (vincentb1@users.sourceforge.net) +% author : Denis Mégevand - Observatoire de Genève +% email : vincentb1@users.sourceforge.net +% version : v3.000 +% date : 2017/08/03 +% +% This file is part of the "lettre" package. +% This work may be distributed and/or modified under the conditions of the +% LaTeX Project Public License, either version 1.3 of this license or (at your +% option) any later version. The latest version of this license is in +% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all +% distributions of LaTeX version 2005/12/01 or later. +% +% This work has the LPPL maintenance status `maintained'. +% +% The Current Maintainer of this work is Vincent Belaïche. +% +% This work consists of all files listed in file README +% +\LettreDeclareLanguage{USenglish}[english]{% + \sigflag=1\relax + \def\cejour{\ifcase\month\or + January\or February\or March\or April\or May\or June\or + July\or August\or September\or October\or November\or December\fi + \space\number\day ,\space\number\year}% + \def\faxwarning{\large\slshape\bfseries If improperly transmitted, please + call the telefax operator}% + \def\telefaxstring{{\FAXSTR T~E~L~E~F~A~X}}% + \def\telephonelabelname{PHONE:~}% + \def\telefaxlabelname{TELEFAX:~}% + \def\telefaxname{Telefax:~}% + \def\tellabelname{Phn:~}% + \def\faxlabelname{Fax:~}% + \def\emaillabelname{E-Mail:~}% + \def\telexlabelname{TELEX:~}% + \def\headtoname{To:~}% + \def\headfromname{From:~}% + \def\pagetotalname{Total pages:~}% + \def\concname{Re:~}% + \def\ccname{Cc:~}% + \def\enclname{Encl(s):~}% + \def\mentionname{Encl(s).}% + \def\vrefname{Y.\raise.4ex\hbox{\tiny /}ref.~}% + \def\nrefname{O.\raise.4ex\hbox{\tiny /}ref.~}% +}% +\LettreProvidesLanguage{USenglish}[2015/11/18]% +\endinput +% End of file `lettre-USenglish.ldf'. diff --git a/Master/texmf-dist/tex/latex/lettre/lettre-amg.cfg b/Master/texmf-dist/tex/latex/lettre/lettre-amg.cfg new file mode 100644 index 00000000000..706bc50a455 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lettre/lettre-amg.cfg @@ -0,0 +1,53 @@ +% +% **************************************** +% * DEFINITIONS LOCALES AMG * +% **************************************** +% +%\input{graphicx.sty} % appele par la classe lettre +\newcommand{\hvfam}{\fontencoding{T1}\fontfamily{phv}\fontseries{m}% + \fontshape{n}} +\newcommand{\hvten}{\hvfam\fontsize{10}{12pt}\selectfont} +\newcommand{\hvtwfv}{\hvfam\fontsize{25}{30pt}\selectfont} +\address{\centering + \vskip -10mm + \includegraphics[bb=1 0 75 160,totalheight=4cm]{amgmono.eps}% + \vskip -1mm + \mbox{\hss\hvten École de ski\hss}}% +\location{\hvten Denis Mégevand\\Président}% +\telephone{+41 (22) 776 23 07}% +\nofax +\lieu{\if@letter + \mbox{}\\[5cm]% + \fi Commugny}% +\def\telefaxstring{\hvtwfv TELEFAX}% +% +\def\pict@let@width{185}% +\def\pict@let@height{65}% +\def\pict@let@hoffset{0}% +\def\pict@let@voffset{0}% +\def\rule@hpos{-25}% +\def\rule@vpos{-15}% +\def\rule@length{10}% +\def\fromaddress@let@hpos{-10}% +\def\fromaddress@let@vpos{70}% +\fromaddress@let@width=69mm +\def\fromlieu@let@hpos{90}% +\def\fromlieu@let@vpos{62}% +\fromlieu@let@width=69mm +\def\toaddress@let@hpos{90}% +\def\toaddress@let@vpos{40}% +\toaddress@let@width=80mm +% +\def\pict@fax@width{185}% +\def\pict@fax@height{30}% +\def\pict@fax@hoffset{0}% +\def\pict@fax@voffset{0}% +\def\fromaddress@fax@hpos{-10}% +\def\fromaddress@fax@vpos{30}% +\fromaddress@fax@width=69mm +\def\faxstring@hpos{90}% +\def\faxstring@vpos{20}% +\faxstring@width=69mm% +\faxbox@width=170mm% +\toaddress@fax@width=69mm% +\fromname@fax@width=69mm% diff --git a/Master/texmf-dist/tex/latex/lettre/lettre-default.cfg b/Master/texmf-dist/tex/latex/lettre/lettre-default.cfg new file mode 100644 index 00000000000..c919860c134 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lettre/lettre-default.cfg @@ -0,0 +1,61 @@ +% file name : `lettre-default.cfg'. +% pacakge name: lettre +% maintenance : Vincent Belaïche (vincentb1@users.sourceforge.net) +% author : Denis Mégevand - Observatoire de Genève +% email : vincentb1@users.sourceforge.net +% version : vla_version_de_lettre +% date : la_date_de_lettre +% +% This file is part of the "lettre" package. +% This work may be distributed and/or modified under the conditions of the +% LaTeX Project Public License, either version 1.3 of this license or (at your +% option) any later version. The latest version of this license is in +% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all +% distributions of LaTeX version 2005/12/01 or later. +% +% This work has the LPPL maintenance status `maintained'. +% +% The Current Maintainer of this work is Vincent Belaïche. +% +% This work consists of all files listed in file README +% +% **************************************** +% * DEFINITIONS DE L'INSTITUT B.I.D.O.N * +% **************************************** +% +\address{B.I.D.O.N\\Rue des Mots\\80886 Sassonne-le-Creux} +\telephone{987.64.20} +\fax{987.75.31} +\lieu{Sassonne-le-Creux} +\francais +% +\def\pict@let@width{185}% +\def\pict@let@height{65}% +\def\pict@let@hoffset{0}% +\def\pict@let@voffset{0}% +\def\rule@hpos{-25}% +\def\rule@vpos{-15}% +\def\rule@length{10}% +\def\fromaddress@let@hpos{-10}% +\def\fromaddress@let@vpos{70}% +\fromaddress@let@width=69mm +\def\fromlieu@let@hpos{90}% +\def\fromlieu@let@vpos{62}% +\fromlieu@let@width=69mm +\def\toaddress@let@hpos{90}% +\def\toaddress@let@vpos{40}% +\toaddress@let@width=80mm +% +\def\pict@fax@width{185}% +\def\pict@fax@height{30}% +\def\pict@fax@hoffset{0}% +\def\pict@fax@voffset{0}% +\def\fromaddress@fax@hpos{-10}% +\def\fromaddress@fax@vpos{30}% +\fromaddress@fax@width=69mm +\def\faxstring@hpos{90}% +\def\faxstring@vpos{20}% +\faxstring@width=69mm% +\faxbox@width=170mm% +\toaddress@fax@width=69mm% +\fromname@fax@width=69mm% diff --git a/Master/texmf-dist/tex/latex/lettre/lettre-english.ldf b/Master/texmf-dist/tex/latex/lettre/lettre-english.ldf new file mode 100644 index 00000000000..743a9f5aa83 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lettre/lettre-english.ldf @@ -0,0 +1,50 @@ +% file name : `lettre-english.ldf'. +% package name: lettre +% maintenance : Vincent Belaïche (vincentb1@users.sourceforge.net) +% author : Denis Mégevand - Observatoire de Genève +% email : vincentb1@users.sourceforge.net +% version : v3.000 +% date : 2017/08/03 +% +% This file is part of the "lettre" package. +% This work may be distributed and/or modified under the conditions of the +% LaTeX Project Public License, either version 1.3 of this license or (at your +% option) any later version. The latest version of this license is in +% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all +% distributions of LaTeX version 2005/12/01 or later. +% +% This work has the LPPL maintenance status `maintained'. +% +% The Current Maintainer of this work is Vincent Belaïche. +% +% This work consists of all files listed in file README +% +\LettreDeclareLanguage{english}{% + \sigflag=1\space + \def\cejour{\ifcase\month\or + January\or February\or March\or April\or May\or June\or + July\or August\or September\or October\or November\or December\fi + \space\number\day ,\space\number\year}% + \def\faxwarning{\large\slshape\bfseries If improperly transmitted, please + call the telefax operator}% + \def\telefaxstring{{\FAXSTR T~E~L~E~F~A~X}}% + \def\telephonelabelname{TELEPHONE:~}% + \def\telefaxlabelname{TELEFAX:~}% + \def\telefaxname{Telefax:~}% + \def\tellabelname{Tel:~}% + \def\faxlabelname{Fax:~}% + \def\emaillabelname{E-Mail:~}% + \def\telexlabelname{TELEX:~}% + \def\headtoname{To:~}% + \def\headfromname{From:~}% + \def\pagetotalname{Total pages:~}% + \def\concname{Subject:~}% + \def\ccname{Cc:~}% + \def\enclname{Encl(s):~}% + \def\mentionname{Encl(s).}% + \def\vrefname{Y.\raise.4ex\hbox{\tiny /}ref.~}% + \def\nrefname{O.\raise.4ex\hbox{\tiny /}ref.~}% +}% +\LettreProvidesLanguage{english}[2015/11/18]% +\endinput +% End of file `lettre-english.ldf'. diff --git a/Master/texmf-dist/tex/latex/lettre/lettre-french.ldf b/Master/texmf-dist/tex/latex/lettre/lettre-french.ldf new file mode 100644 index 00000000000..d0129e11d1a --- /dev/null +++ b/Master/texmf-dist/tex/latex/lettre/lettre-french.ldf @@ -0,0 +1,75 @@ +% file name : `lettre-french.ldf'. +% package name: lettre +% maintenance : Vincent Belaïche (vincentb1@users.sourceforge.net) +% author : Denis Mégevand - Observatoire de Genève +% email : vincentb1@users.sourceforge.net +% version : v3.000 +% date : 2017/08/03 +% +% This file is part of the "lettre" package. +% This work may be distributed and/or modified under the conditions of the +% LaTeX Project Public License, either version 1.3 of this license or (at your +% option) any later version. The latest version of this license is in +% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all +% distributions of LaTeX version 2005/12/01 or later. +% +% This work has the LPPL maintenance status `maintained'. +% +% The Current Maintainer of this work is Vincent Belaïche. +% +% This work consists of all files listed in file README +% +\LettreDeclareLanguage{french}{% + \sigflag=0\space + \def\cejour{le + \ifnum\day=1\space 1\ifx\ier\undefined er\else\expandafter\ier\fi + \else\number\day\fi + \space\ifcase\month\or + janvier\or f\'evrier\or mars\or avril\or mai\or juin\or + juillet\or ao\^ut\or septembre\or octobre\or novembre\or d\'ecembre\fi + \space \number\year}% + \def\faxwarning{\large\slshape\bfseries En cas de mauvaise transmission, + appelez s.v.p. l'op\'erateur t\'el\'efax}% + \def\telefaxstring{{\FAXSTR T~\'E~L~\'E~F~A~X}}% + \def\telephonelabelname{T\'EL\'EPHONE :~}% + \def\telefaxlabelname{T\'EL\'EFAX :~}% + \def\telefaxname{T\'el\'ecopie :~}% + \def\tellabelname{T\'el.~}% + \def\faxlabelname{Fax :~}% + \def\emaillabelname{E-Mail :~}% + \def\telexlabelname{T\'ELEX :~}% + \def\headtoname{\`A :~}% + \def\headfromname{De :~}% + \def\pagetotalname{Nombre de pages :~}% + \def\concname{Objet :~}% + \def\ccname{C.c.~}% + \def\enclname{P.j.~}% + \def\mentionname{Annexe(s) mentionn\'ee(s)}% + \def\vrefname{V.\raise.4ex\hbox{\tiny /}r\'ef.~} + \def\nrefname{N.\raise.4ex\hbox{\tiny /}r\'ef.~} +}% +\newcommand*{\lettre@set@french@envs}{% + \renewenvironment{itemize}% + {\begin{list}{\textendash}% + {\settowidth{\labelwidth}{\textendash}% + \setlength{\leftmargin}{\listmargin}% + \addtolength{\leftmargin}{\labelwidth}% + \addtolength{\leftmargin}{\labelsep}% + \ifnum\@listdepth=0 + \setlength{\itemindent}{\parindent}% + \else + \addtolength{\leftmargin}{\parindent}% + \fi + \setlength{\itemsep}{\z@}% + \setlength{\parsep}{\z@}% + \setlength{\topsep}{\z@}% + \setlength{\partopsep}{\z@}% + \addtolength{\topsep}{-\parskip}% + \addtolength{\partopsep}{\parskip}% + }% + }% + {\end{list}}% +} +\LettreProvidesLanguage{french}[2015/11/18]% +\endinput +% End of file `lettre-french.ldf'. diff --git a/Master/texmf-dist/tex/latex/lettre/lettre-german.ldf b/Master/texmf-dist/tex/latex/lettre/lettre-german.ldf new file mode 100644 index 00000000000..43a6d8ced61 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lettre/lettre-german.ldf @@ -0,0 +1,51 @@ +% file name : `lettre-german.ldf'. +% package name: lettre +% maintenance : Vincent Belaïche (vincentb1@users.sourceforge.net) +% author : Denis Mégevand - Observatoire de Genève +% email : vincentb1@users.sourceforge.net +% version : v3.000 +% date : 2017/08/03 +% +% This file is part of the "lettre" package. +% This work may be distributed and/or modified under the conditions of the +% LaTeX Project Public License, either version 1.3 of this license or (at your +% option) any later version. The latest version of this license is in +% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all +% distributions of LaTeX version 2005/12/01 or later. +% +% This work has the LPPL maintenance status `maintained'. +% +% The Current Maintainer of this work is Vincent Belaïche. +% +% This work consists of all files listed in file README +% +\LettreDeclareLanguage{german}{% + \sigflag=1\relax + \def\cejour{den \number\day .\space\ifcase\month\or + Januar\or Februar\or M\"arz\or April\or Mai\or Juni\or + Juli\or August\or September\or Oktober\or November\or Dezember\fi + \space \number\year}% + \def\concname{Betrifft: }% + \def\faxwarning{\large\slshape\bfseries Bitte unrichtige \"Ubertragungen dem + Sender telefonisch melden}% + \def\telefaxstring{{\FAXSTR T~E~L~E~F~A~X}}% + \def\telephonelabelname{TELEFON:~}% + \def\telefaxlabelname{TELEFAX:~}% + \def\telefaxname{Telefax:~}% + \def\tellabelname{Tel:~}% + \def\faxlabelname{Fax:~}% + \def\emaillabelname{E-Mail:~}% + \def\telexlabelname{TELEX:~}% + \def\headtoname{An:~}% + \def\headfromname{Von:~}% + \def\pagetotalname{Gesamtanzahl der Bl\"atter:~}% + \def\concname{Betrifft:~}% + \def\ccname{Kopie an:~}% + \def\enclname{Beilage(n):~}% + \def\mentionname{Beilage(n) erw\"ahnt}% + \def\vrefname{Ihr Zeichen~} + \def\nrefname{Unser Zeichen~} +}% +\LettreProvidesLanguage{german}[2015/11/18]% +\endinput +% End of file `lettre-german.ldf'. diff --git a/Master/texmf-dist/tex/latex/lettre/lettre-obs.cfg b/Master/texmf-dist/tex/latex/lettre/lettre-obs.cfg new file mode 100644 index 00000000000..4cb9a33e08b --- /dev/null +++ b/Master/texmf-dist/tex/latex/lettre/lettre-obs.cfg @@ -0,0 +1,86 @@ +% This file is part of the "lettre" package. +% +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either version 1.3 +% of this license or (at your option) any later version. +% The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3 or later is part of all distributions of LaTeX +% version 2005/12/01 or later. +% +% This work has the LPPL maintenance status `maintained'. +% +% The Current Maintainer of this work is Vincent Belaïche. +% +% This work consists of all files listed in doc/latex/lettre/readme/LICENSE. +% +% **************************************** +% * DEFINITIONS LOCALES A L'OBS * +% **************************************** +% +%\input{graphicx.sty} % appele par la classe lettre +\newcommand{\trfam}{\fontencoding{T1}\fontfamily{ptm}\fontseries{m}% + \fontshape{n}} +\newcommand{\treit}{\trfam\fontsize{8}{10pt}\selectfont} +\newcommand{\trten}{\trfam\fontsize{10}{12pt}\selectfont} +\newcommand{\trfvtn}{\trfam\fontsize{15}{18pt}\selectfont} +\long\def\psobs{% + \l@@info{Entete officielle de l'Observatoire}% + \def\fromaddress{\centering + \vskip -5mm% + \if@letter + \treit RÉPUBLIQUE\\[-1mm]% + \treit ET CANTON DE GENÈVE\\[-1mm]% + \fi + \includegraphics[viewport=-5.5 -7 55 65,clip=true,height=2.5cm]{ecusson55.pdf}\\ +% {\unitlength1mm\begin{picture}(0,0)\put(0,20){\makebox(0,0){$\diamond$}}\end{picture}}\\ + \mbox{\hss\trfvtn OBSERVATOIRE DE GENÈVE\hss}\\[2mm]% + \if@letter + %\trten Ch. des Maillettes 51\\% + \fi + \if@detail + %\trten Ch. des Maillettes 51\\% + \fi + \trten CH-1290 SAUVERNY\\% + \if@letter + \trten Suisse + \fi + \if@detail + \trten Suisse + \fi}}% +\newcommand{\dhfam}{\fontencoding{T1}\fontfamily{cmdh}\fontseries{m}% + \fontshape{n}} +\newcommand{\cmd}{\dhfam\fontsize{10}{12pt}\selectfont} +\newcommand{\Cmd}{\dhfam\fontsize{12}{14pt}\selectfont} +\newcommand{\CMD}{\dhfam\fontsize{14}{17pt}\selectfont} +\long\def\addressobs{% + \def\fromaddress{\centering + \CMD OBSERVATOIRE DE GENÈVE\rule[6pt]{0pt}% + {1.0\baselineskip}\\[3mm]% + \cmd + \if@letter + %51, chemin des Maillettes\\% + \fi + \if@detail + %51, chemin des Maillettes\\% + \fi + CH-1290 Sauverny\\% + \if@letter + Suisse + \fi + \if@detail + Suisse + \fi}}% +% +\def\lieuobs{\def\fromlieu{Sauverny}}% +\def\telephoneobs{\def\telephonenum{+41 (22) 755 26 11}}% +\def\faxobs{\def\faxnum{+41 (22) 755 39 83}}% +\def\ccpobs{\ccp{12-2130-4}}% +\def\ccittobs{\l@@warning{L'adresse X400 de l'Observatoire (\string\ccittobs) ne doit plus être utilisée}}% +\def\internetobs{\internet{obs.unige.ch}}% +\def\ftpobs{{\tt obsftp.unige.ch \rm(129.194.65.3)}} +\def\wwwobs{{\tt http://obswww.unige.ch/ \rm(129.194.65.3)}} +% +\addressobs\lieuobs\telephoneobs\faxobs +\romand +%fin du fichier obs.ins diff --git a/Master/texmf-dist/tex/latex/lettre/lettre-romand.ldf b/Master/texmf-dist/tex/latex/lettre/lettre-romand.ldf new file mode 100644 index 00000000000..68c821db870 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lettre/lettre-romand.ldf @@ -0,0 +1,53 @@ +% file name : `lettre-romand.ldf'. +% package name: lettre +% maintenance : Vincent Belaïche (vincentb1@users.sourceforge.net) +% author : Denis Mégevand - Observatoire de Genève +% email : vincentb1@users.sourceforge.net +% version : v3.000 +% date : 2017/08/03 +% +% This file is part of the "lettre" package. +% This work may be distributed and/or modified under the conditions of the +% LaTeX Project Public License, either version 1.3 of this license or (at your +% option) any later version. The latest version of this license is in +% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all +% distributions of LaTeX version 2005/12/01 or later. +% +% This work has the LPPL maintenance status `maintained'. +% +% The Current Maintainer of this work is Vincent Belaïche. +% +% This work consists of all files listed in file README +% +\LettreDeclareLanguage{romand}[french]{% + \sigflag=0 % + \def\cejour{le + \ifx\ier\undefined\def\ier{er}\fi + \ifnum\day=1\relax 1\ier\else \number\day\fi + \space\ifcase\month\or + janvier\or f\'evrier\or mars\or avril\or mai\or juin\or + juillet\or ao\^ut\or septembre\or octobre\or novembre\or d\'ecembre\fi + \space \number\year}% + \def\faxwarning{\large\slshape\bfseries En cas de mauvaise transmission, + appelez s.v.p. l'op\'erateur t\'el\'efax}% + \def\telefaxstring{{\FAXSTR T~\'E~L~\'E~F~A~X}}% + \def\telephonelabelname{T\'EL\'EPHONE :~}% + \def\telefaxlabelname{T\'EL\'EFAX :~}% + \def\telefaxname{T\'el\'efax :~}% + \def\tellabelname{T\'el.~}% + \def\faxlabelname{Fax :~}% + \def\emaillabelname{E-Mail :~}% + \def\telexlabelname{T\'ELEX :~}% + \def\headtoname{\`A :~}% + \def\headfromname{De :~}% + \def\pagetotalname{Nombre de pages :~}% + \def\concname{Concerne :~}% + \def\ccname{C.c.~}% + \def\enclname{Ann.~}% + \def\mentionname{Annexe(s) mentionn\'ee(s)}% + \def\vrefname{V.\raise.4ex\hbox{\tiny /}r\'ef.~} + \def\nrefname{N.\raise.4ex\hbox{\tiny /}r\'ef.~} +}% +\LettreProvidesLanguage{romand}[2015/11/18]% +\endinput +% End of file `lettre-romand.ldf'. diff --git a/Master/texmf-dist/tex/latex/lettre/lettre.cls b/Master/texmf-dist/tex/latex/lettre/lettre.cls index bc77d73564f..5b1f29b6fb0 100644 --- a/Master/texmf-dist/tex/latex/lettre/lettre.cls +++ b/Master/texmf-dist/tex/latex/lettre/lettre.cls @@ -2,9 +2,9 @@ % package name: lettre % maintenance : Vincent Belaïche (vincentb1@users.sourceforge.net) % author : Denis Mégevand - Observatoire de Genève -% email : lettre_observatoire-aide@gna.org -% version : v2.353 -% date : 2014/09/09 +% email : vincentb1@users.sourceforge.net +% version : v3.000 +% date : 2017/08/03 % % This file is part of the "lettre" package. % This work may be distributed and/or modified under the conditions of the @@ -20,17 +20,53 @@ % This work consists of all files listed in file README % \NeedsTeXFormat{LaTeX2e} +\RequirePackage{etoolbox} \RequirePackage{graphicx} -\ProvidesClass{lettre}[2014/09/09 v2.353] -\typeout{Copyleft Denis Megevand - Observatoire de Geneve}% -%% +\ProvidesClass{lettre}[2017/08/03 v3.000]\typeout{Copyleft Denis Megevand - Observatoire de Geneve}% \DeclareOption{10pt}{\renewcommand\@ptsize{0}} \DeclareOption{11pt}{\renewcommand\@ptsize{1}} \DeclareOption{12pt}{\renewcommand\@ptsize{2}} +\newlength\lettre@x@mm +\setlength\lettre@x@mm{1mm}% +\newlength\lettre@y@mm +\setlength\lettre@y@mm{1mm} \if@compatibility\else \DeclareOption{a4paper} {\setlength\paperheight {297mm}% - \setlength\paperwidth {210mm}} + \setlength\paperwidth {210mm}% + \lettre@x@mm=1mm% + \lettre@y@mm=1mm% + } +\DeclareOption{letterpaper} + {\setlength\paperheight {11.00in}% + \setlength\paperwidth {8.50in}% + \lettre@y@mm=0.94074074074mm% + \lettre@x@mm=1.0280952381mm% + } +\DeclareOption{legalpaper} + {\setlength\paperheight {14.00in}% + \setlength\paperwidth {8.50in}% + \lettre@y@mm=1.19730639731mm% + \lettre@x@mm=1.0280952381mm% + } +\DeclareOption{executivepaper} + {\setlength\paperheight {10.50in}% + \setlength\paperwidth {7.25in}% + \lettre@y@mm=0.897979797979mm% + \lettre@x@mm=0.876904761905mm% +} +\DeclareOption{b5paper} + {\setlength\paperheight {250.00mm}% + \setlength\paperwidth {176.00mm}% + \lettre@y@mm=0.841750841751mm% + \lettre@x@mm=0.838095238095mm% +} +\DeclareOption{a5paper} + {\setlength\paperheight {210.00mm}% + \setlength\paperwidth {148.00mm}% + \lettre@y@mm=0.707070707071mm% + \lettre@x@mm=0.704761904762mm% +} \fi \if@compatibility \DeclareOption{twoside}{\ClassError{lettre}{No `twoside' layout for letters}% @@ -45,33 +81,182 @@ \DeclareOption{final}{\setlength\overfullrule{0pt}} \DeclareOption{leqno}{\input{leqno.clo}} \DeclareOption{fleqn}{\input{fleqn.clo}} -\DeclareOption{francais}{\def\defaultlanguage{francais}} -\DeclareOption{romand}{\def\defaultlanguage{romand}} -\DeclareOption{allemand}{\def\defaultlanguage{allemand}} -\DeclareOption{americain}{\def\defaultlanguage{americain}} -\DeclareOption{anglais}{\def\defaultlanguage{anglais}} +\DeclareOption{keepenvs=true}{\lettre@keep@envstrue}% +\DeclareOption{keepenvs=false}{\lettre@keep@envsfalse}% +\DeclareOption{keepenvs}{\ExecuteOptions{keepenvs=true}}% +\def\lettre@iterate#1,{% + {% + \def\@tempa{#1}% + \ifx\@tempa\@nnil + \let\@tempa\@empty + \else + \def\@tempa{% + \lettre@iterate@body{#1}% + \lettre@iterate + }% + \fi + \expandafter + }\@tempa +}% +\newcommand*\lettre@supported@language@list{% + francais,french,frenchb,romand,% + allemand,german,germanb,ngerman,ngermanb,% + americain,american,USenglish,% + anglais,english,british,UKenglish% +}% +\newcommand*\lettre@iterate@body[1]{% + \expandafter\def\csname lettre@#1@alias@of\endcsname{#1}}% +\expandafter\lettre@iterate\lettre@supported@language@list,\@nil,% +\def\@tempa#1#2{\expandafter\def\csname lettre@#1@alias@of\endcsname{#2}}% +\@tempa{frenchb}{french} +\@tempa{francais}{french} +\@tempa{allemand}{german} +\@tempa{germanb}{german} +\@tempa{ngermanb}{german} +\@tempa{ngerman}{german} +\@tempa{anglais}{english} +\@tempa{british}{english} +\@tempa{american}{USenglish} +\@tempa{americain}{USenglish} +\newcommand*\lettre@languages{}% +\newcommand*\lettre@mainlang{}% +\newcommand*\lettre@ldf@filename[1]{lettre-#1.ldf}% +\newcommand*\lettre@ldf@version[1]{ver@\lettre@ldf@filename{#1}}% +\def\lettre@iterate@body#1{% + \DeclareOption{#1}{% + \edef\@tempa{\csname lettre@#1@alias@of\endcsname}% + \ifcsundef{\lettre@ldf@version{\@tempa}}{% + \expandafter\def\csname \lettre@ldf@version{\@tempa}\endcsname{To be loaded}% + \ifx\lettre@languages\@empty + \def\lettre@languages{#1}% + \else + {% + \toks0{#1}% + \toks1\expandafter{\lettre@languages}% + \edef\@tempa{\noexpand\def\noexpand\lettre@languages{\the\toks0,\the\toks1}}% + \expandafter + }\@tempa + \fi + \def\lettre@mainlang{#1}% + }{% + \l@@info{Langage `#1' deja charge par option}% + }% + }% +}% +\expandafter\lettre@iterate\lettre@supported@language@list,\@nil,% +\DeclareOption{passlang=true}{\lettre@pass@langtrue}% +\DeclareOption{passlang=false}{\lettre@pass@langfalse}% +\DeclareOption{passlang}{\ExecuteOptions{pass lang=true}}% +\DeclareOption{noinfo}{\c@infos=0} +\DeclareOption{loghighlight=false}{\lettre@loghighlightfalse} +\DeclareOption{loghighlight=true}{\lettre@loghighlighttrue} +\DeclareOption{loghighlight}{\ExecuteOptions{loghighlight=true}} +\DeclareOption{strict}{\ExecuteOptions{strict=true}} +\DeclareOption{strict=true}{\lettre@stricttrue\l@@info{Mode `strict': traite certains avertissements comme des erreurs}} +\DeclareOption{strict=false}{\lettre@strictfalse\l@@info{Mode `strict' desactive}} \if@compatibility\else \DeclareOption*{\l@@warning{Option inconnue : `\CurrentOption', assurez-vous que c'est une option globale passee aux paquetages utilises dans votre document}} \fi +\def\l@@error#1{\ClassError{lettre}{#1}}% \def\infos{\c@infos=1\relax} \def\noinfos{\c@infos=0\relax} -% \def\l@@warning{% + \iflettre@loghighlight + \typeout{LETTRE AVERTISSEMENT ===============================================}% + \fi \ClassWarning{lettre}% } -\def\l@@info#1{\ifnum\c@infos=1 % - \GenericWarning{% - (lettre)\space\@spaces\@spaces\@spaces - }{Class lettre Message: #1\@gobble}% +\def\l@@warning@strictable#1{% + \iflettre@loghighlight + \typeout{LETTRE AVERTISSEMENT ===============================================}% \fi + \iflettre@strict + \l@@error{#1}{#1\MessageBreak\space + Cette erreur est causee par un avertissement en mode strict}% + \else + \ClassWarning{lettre}{#1}% + \fi +} +\def\l@@info#1{% + \ifnum\c@infos=1 % + \iflettre@loghighlight + \typeout{LETTRE INFO ================================================}% + \fi + \GenericWarning{% + (lettre)\space\space\space\space + }{% + Class lettre Message: #1\@gobble}% + \fi}% +\newcommand*{\LettreProvidesLanguage}[1]{% + \ProvidesFile{lettre-#1.ldf}% +}% +\newcommand*{\LettreDeclareLanguage}[1]{% + \begingroup + \toks0{#1}% + \@ifnextchar[\lettre@declare@language@arg@ii + {% + \toks2{}% + \lettre@declare@language@arg@iii + }% +}% +\ifcsdef{lettre@declare@language@arg@ii}{% + \l@@error{Macro \protect\lettre@declare@language@arg@ii\space dej'a d'efinie}% +}{}% +\def\lettre@declare@language@arg@ii[#1]{% + \def\@tempa##1{% + \toks2{\gdef##1{#1}} + }% + \expandafter\@tempa\csname lettre@lmp@\the\toks0@use\endcsname + \lettre@declare@language@arg@iii} +\newcommand*\lettre@declare@language@arg@iii[1]{% + \toks3{#1}% + \edef\@tempa{% + \noexpand\ifcsdef{lettre@select@\the\toks0 @labels}{% + \noexpand\l@@error{Macro `\string\lettre@select@\the\toks0 @labels\space d'ej`a d'efinie}% + }{% + \noexpand\gdef + \expandafter\noexpand\csname lettre@select@\the\toks0@labels\endcsname{% + \the\toks3}% + \the\toks2 % + }% + }% + \expandafter\endgroup\@tempa }% \newcommand\@ptsize{} \newcount\c@infos\c@infos=1\relax \newif\if@origdate\@origdatefalse \newif\if@etiq\@etiqfalse -\ExecuteOptions{10pt,oneside,final,francais} +\newif\iflettre@pass@lang\lettre@pass@langtrue +\newif\iflettre@keep@envs\lettre@keep@envsfalse +\newif\iflettre@strict\lettre@strictfalse +\newif\iflettre@loghighlight\lettre@loghighlightfalse +\ExecuteOptions{10pt,oneside,final} \ProcessOptions +\def\lettre@iterate@body#1{% + \edef\@tempa{\csname lettre@#1@alias@of\endcsname}% + \def\@tempb{To be loaded}% + \edef\@tempc{\lettre@ldf@version{\@tempa}}% + \expandafter\ifx\csname\@tempc\endcsname\@tempb + \expandafter\let\csname\@tempc\endcsname\undefined + \input{\lettre@ldf@filename{\@tempa}} + \fi +}% +\expandafter\lettre@iterate\lettre@supported@language@list,\@nil,% +\newcommand\lettre@languageable@packages{babel,fmtcount,mlp}% +\ifx\lettre@languages\@empty\else + \iflettre@pass@lang + \def\lettre@iterate@body#1{% + \let\@tempb\lettre@iterate@body + \def\lettre@iterate@body##1{\PassOptionsToPackage{#1}{##1}% + \l@@info{Option `#1' pass'ee au paquetage `##1'}% + }% + \expandafter\lettre@iterate\lettre@languageable@packages,\@nil,% + \let\lettre@iterate@body\@tempb + }% + \expandafter\lettre@iterate\lettre@languages,\@nil,% + \fi +\fi \input{size1\@ptsize.clo} \DeclareOldFontCommand{\rm}{\rmfamily}{\mathrm} \DeclareOldFontCommand{\sl}{\slshape}{\@nomath\sl} @@ -90,32 +275,27 @@ \partopsep 0pt% \itemsep .2em% \renewcommand\baselinestretch{1} -% \@lowpenalty 51\relax \@medpenalty 151\relax \@highpenalty 301\relax \@beginparpenalty -\@lowpenalty \@endparpenalty -\@lowpenalty \@itempenalty -\@lowpenalty -\topmargin 25mm% +\topmargin 25\lettre@y@mm \advance\topmargin by -1in \headheight 0pt% -\headsep 4mm% -\textheight 250mm% -% sep d'embase 9mm -\footskip 9mm% -% -\footnotesep 5mm% -\marginparpush 1mm% -% -% marge gauche 25mm -\oddsidemargin 25mm% -\evensidemargin 25mm% +\headsep 4\lettre@y@mm +\textheight 250\lettre@y@mm +\footskip 9\lettre@y@mm +\footnotesep 5\lettre@y@mm +\marginparpush 1\lettre@x@mm +\oddsidemargin 25\lettre@x@mm +\evensidemargin 25\lettre@x@mm \advance\oddsidemargin by -1in \advance\evensidemargin by -1in -\textwidth 160mm% -\marginparsep 4mm% -\marginparwidth 15mm% +\textwidth 160\lettre@x@mm +\marginparsep 4\lettre@x@mm +\marginparwidth 15\lettre@x@mm \skip\footins 4mm plus 2pt minus 4pt% \newcount\auxcount \newcount\c@labelstart @@ -143,9 +323,10 @@ \newdimen\faxbox@width \newdimen\toaddress@fax@width \newdimen\fromname@fax@width +\newlength\lettre@vref@width +\newlength\lettre@nref@width \newif\if@letter\@lettertrue \newif\if@detail\@detailfalse -% \newwrite\@tensionaux \newwrite\@dateaux \newwrite\@etiqaux @@ -159,13 +340,11 @@ \item #2% \end{list}} \def\detailledaddress{\@detailtrue}% -% \def\stopletter{\vskip0ptplus1filll}% \def\stopfax{\vskip0ptplus1filll}% -% \def\resetopenenv{% \faxpage=0\relax - \csname\defaultlanguage\endcsname + \csuse{\lettre@mainlang}% \def\concdecl{}% \def\fromlocation{}% }% @@ -179,7 +358,7 @@ \def\resetauxenv{ \def\auxflag{} \auxcount=0\relax - \def\toref{}\def\fromref{} + \let\toref\space\let\fromref\space \def\telexnum{}\def\ccpnum{} } \def\resetemailenv{ @@ -188,14 +367,10 @@ \def\@username{} \def\ccittnum{}\def\internetnum{}\def\bitnetnum{}\def\telepacnum{}\def\decnetnum{} } -% -% \@processto extrait \toname et \toaddress de l'environnement letter -% \long\def\@processto#1{\@xproc #1\\@@@\ifx\toaddress\@empty \else \@yproc #1@@@\fi}% \long\def\@xproc #1\\#2@@@{\def\toname{#1}\def\toaddress{#2}}% \long\def\@yproc #1\\#2@@@{\def\toaddress{#2}}% -% \def\stopbreaks{\interlinepenalty \@M \def\par{\@@par\nobreak}\let\\=\@nobreakcr \let\vspace\@nobreakvspace}% @@ -221,14 +396,14 @@ \l@@info{Position de la premiere etiquette: \the\c@labelstart}% \ifnum\c@labelstart>\z@ \ifnum\c@labelstart>16\relax - \l@@warning{Position de la premiere etiquette ignoree}% + \l@@warning@strictable{Position de la premiere etiquette ignoree}% \else \@whilenum\c@labelstart>\@ne\do {\immediate\write\@etiqaux{\string\mlabel{~\string\\~}}% \advance\c@labelstart\m@ne}% \fi% \else - \l@@warning{Position de la premiere etiquette ignoree}% + \l@@warning@strictable{Position de la premiere etiquette ignoree}% \fi }% \def\mlabel#1{\setbox0\vbox{\parbox[b]{70mm}{\rm\strut\ignorespaces #1}}% @@ -238,21 +413,38 @@ \l@@info{On demande des etiquettes}% \@ifnextchar [{\i@makelabels}{\i@makelabels[1]}}% \def\i@makelabels[#1]{\c@labelstart=#1}% -\def\institut#1{% - \l@@info{Fichier de defaut: #1.ins}% - \def\@institut{\makeatletter - \input{#1.ins}% +\newcommand*\lettre@institut[1]{% + \l@@info{Fichier de defaut: #1}% + \def\lettre@input@institut{\makeatletter + \input{#1}% \makeatother}}% +\newcommand*\lettre@institut@parse[1]{% + \filename@parse{#1}% + \edef\filename@area{\filename@area lettre-\filename@base\unless\ifx\filename@ext\relax.\filename@ext\fi.cfg}% +}% +\iflettre@strict +\newcommand*\institut[1]{% + \lettre@institut@parse{#1}% + \expandafter\lettre@institut\expandafter{\filename@area}}% +\else +\newcommand*\institut[1]{% + \lettre@institut@parse{#1}% + \IfFileExists{\filename@area}{\expandafter\lettre@institut\expandafter{\filename@area}}{% + \l@@warning{Le nommage des fichiers instituts en `.ins' est obsolete, veuillez les nommer en + `lettre-.cfg'}% + \lettre@institut{#1.ins}}% +} +\fi \long\def\letter#1{% \rm \global\advance\c@lettre\@ne \l@@info{Lettre \the\c@lettre}% - \expandafter\ifx\csname newletter\the\c@lettre\endcsname\relax - \expandafter\def\csname letter\the\c@lettre\endcsname{2} - \else + \ifcsundef{newletter\the\c@lettre}{% + \expandafter\def\csname letter\the\c@lettre\endcsname{2}% + }{% \expandafter\def\csname letter\the\c@lettre\endcsname{% - \csname newletter\the\c@lettre\endcsname} - \fi + \csname newletter\the\c@lettre\endcsname}% + }% \ifodd\c@page% \else \if@twoside @@ -262,14 +454,14 @@ \fi \fi \c@page\@ne + \c@footnote0 % \resetopenenv\resetcloseenv\resetauxenv\resetemailenv \@lettertrue - \@institut + \lettre@input@institut \let\opening=\letteropening \interlinepenalty=200\relax \@processto{#1} }% -% \def\endletter{\par \ifdim\pagetotal < 50pt \immediate\write\@tensionaux{% @@ -349,7 +541,7 @@ \l@@info{Telefax \the\c@telefax}% \ifnum\c@telefax=\@ne \else - \l@@warning{Un seul telefax par fichier, s.v.p.,\MessageBreak + \l@@warning@strictable{Un seul telefax par fichier, s.v.p.,\MessageBreak sinon le nombre de pages du fax est incorrect !} \fi \ifodd\c@page% @@ -363,7 +555,7 @@ \c@page\@ne \resetopenenv\resetcloseenv\resetauxenv\resetemailenv \@letterfalse - \@institut + \lettre@input@institut \def\tofaxnum{#1}% \let\opening=\faxopening \interlinepenalty=200\relax @@ -373,7 +565,6 @@ \makeatother \@processto{#2} }% -% \def\endtelefax{% \stopfax \begingroup @@ -401,12 +592,10 @@ \string\endcsname{\pdate}}}} \def\lettre@get@date{% \if@origdate - \expandafter\ifx\csname origdate\the\c@lettre - \endcsname\relax - \else + \ifcsundef{origdate\the\c@lettre}{}{% \l@@info{Date originale lue dans \jobname.odt}% \def\pdate{\csname origdate\the\c@lettre\endcsname}% - \fi + }% \lettre@write@pdate@to@dateaux \fi } @@ -545,6 +734,11 @@ \nobreak \noindent \l@@info{Signature \ifcase\signum manquante\or simple\or double\or triple\fi}% + \ifnum\signum=0\space\ifx\fromname\undefined + \l@@error{\protect\fromname\space non d'efini, vous avez sans + doute omis de sp'ecifier \protect\name\space ou + \protect\institut\space!} + \fi\fi \ifcase\sigflag \ifcase\signum \parbox[t]{\letterwidth}{#1}% @@ -632,7 +826,6 @@ \letterwidth=\textwidth \advance\letterwidth by -\lettermargin \advance\letterwidth by 0pt}% -% \def\basdepage#1{% \def\bdp{#1}}% \def\tension#1{% @@ -648,33 +841,43 @@ \ifnum\signum=0\relax \def\fromsig{#1}\signum=1\relax \else - \l@@warning{Signature deja definie}% + \l@@warning@strictable{Signature deja definie}% \fi }% \def\secondsignature#1{% \ifnum\signum=1\relax \def\fromssig{#1}\signum=2\relax \else - \l@@warning{Seconde signature illegale ou deja definie}% + \l@@warning@strictable{Seconde signature illegale ou deja definie}% \fi }% \def\thirdsignature#1{% \ifnum\signum=2\relax \def\fromtsig{#1}\signum=3\relax \else - \l@@warning{Troisieme signature illegale ou deja definie}% + \l@@warning@strictable{Troisieme signature illegale ou deja definie}% + \fi +}% +\def\vref{\l@@warning@strictable{La commande \protect\Vref\space devrait etre utilisee}\Vref} +\def\Vref#1{% + \def\@tempa{#1}% + \ifx\@empty\@tempa + \let\toref\@empty + \else + \def\auxflag{.}% + \def\toref{\parbox[t]{\lettre@vref@width}{#1}}% + \fi +}% +\def\nref{\l@@warning@strictable{La commande \protect\Nref\space devrait etre utilisee}\Nref} +\def\Nref#1{% + \def\@tempa{#1}% + \ifx\@empty\@tempa + \let\fromref\@empty + \else + \def\auxflag{.}% + \def\fromref{\parbox[t]{\lettre@nref@width}{#1}}% \fi }% -\def\vref#1{\l@@warning{La commande \protect\Vref\space devrait etre utilisee} - \def\auxflag{.}% - \def\toref{\parbox[t]{17mm}{#1}}}% -\def\Vref#1{\def\auxflag{.}% - \def\toref{\parbox[t]{17mm}{#1}}}% -\def\nref#1{\l@@warning{La commande \protect\Nref\space devrait etre utilisee} - \def\auxflag{.}% - \def\fromref{\parbox[t]{17mm}{#1}}}% -\def\Nref#1{\def\auxflag{.}% - \def\fromref{\parbox[t]{17mm}{#1}}}% \def\concline{% \noindent\parbox[t]{\letterwidth}% {\@hangfrom{\textrm{\concname}}\ignorespaces\concdecl\strut}% @@ -682,25 +885,32 @@ \def\auxline{% \l@@info{Ligne auxiliaire demandee}% {\scriptsize - \vrefname% - \ifx\@empty \toref - \hspace{21mm}\hfill% - \else - {\small\toref}\hfill% - \fi - \nrefname% - \ifx\@empty \fromref - \hspace{21mm}\hfill% - \else - {\small\fromref}\hfill - \fi - \ifx\@empty \telexnum - \hfill% - \else - T\'ELEX\ \telexnum\hspace{5mm}% + \ifx\@empty\toref\else + \vrefname + \ifx\space\toref + \hspace{\lettre@vref@width}% + \else + {\small\toref} + \fi + \hfill + \fi + \ifx\@empty\fromref\else + \nrefname + \ifx\space\fromref + \hspace{\lettre@nref@width}% + \else + {\small\fromref} + \fi + \hfill + \fi + \ifx\@empty \telexnum + \hfill + \else + T\'ELEX\ \telexnum + \hspace{5mm}% \fi \ifx\@empty \ccpnum - \hfill% + \hfill \else C.C.P.\ \ccpnum\hspace{5mm}% \fi}\par}% @@ -736,9 +946,8 @@ % \l@@info{Adresse avec nom precisee}% % \def\fromaddress{\fromname\\#1} % \else -% \l@@warning{Commande illegale dans un fax} +% \l@@warning@strictable{Commande illegale dans un fax} % \fi}% -% \def\nodate{\l@@info{Date supprimee}\def\pdate{}}% \def\date#1{\l@@info{Date precisee}\def\pdate{#1}}% \def\nolieu{\l@@info{Lieu supprime}\def\fromlieu{}}% @@ -755,7 +964,7 @@ \def\emailflag{.}% \advance\emailcount by 1\relax \def\ccittnum{\ifx\@empty \@username - \l@@warning{<> indefini} + \l@@warning@strictable{<> indefini} #1% \else S=\@username;#1% @@ -767,7 +976,7 @@ \def\emailflag{.}% \advance\emailcount by 1\relax \def\internetnum{\ifx\@empty \@username - \l@@warning{<> indefini} + \l@@warning@strictable{<> indefini} #1\relax \else \@username @#1\relax @@ -779,7 +988,7 @@ \def\emailflag{.}% \advance\emailcount by 1\relax \def\bitnetnum{\ifx\@empty \@username - \l@@warning{<> indefini} + \l@@warning@strictable{<> indefini} #1\relax \else \@username\ at #1\relax @@ -791,7 +1000,7 @@ \def\emailflag{.}% \advance\emailcount by 1\relax \def\telepacnum{\ifx\@empty \@username - \l@@warning{<> indefini} + \l@@warning@strictable{<> indefini} #1\relax \else #1::\@username @@ -803,7 +1012,7 @@ \def\emailflag{.}% \advance\emailcount by 1\relax \def\decnetnum{\ifx\@empty \@username - \l@@warning{<> indefini} + \l@@warning@strictable{<> indefini} #1\relax \else #1::\@username @@ -825,7 +1034,6 @@ \else \def\ccpnum{}% \fi}% -% \def\ps#1#2{\penalty100\relax \if@letter \vskip\csname letter\the\c@lettre\endcsname mm @@ -850,183 +1058,157 @@ \fi \l@@info{Annexes mentionnees}% \noindent\lettre@t{\mentionname\\}{~}\vfill\penalty-100\relax}% +\newcommand*{\lettrelmpselectlanguage}[1]{% + \lettreloadlang{#1}% + {% + \ifcsundef{lettre@#1@alias@of}{% + \l@@warning@strictable{Langue #1 non ger'ee par lettre}% + \let\@tempa\@empty + }{% + \toks0\expandafter\expandafter\expandafter{\csname lettre@#1@alias@of\endcsname}% + \ifcsundef{lettre@lmp@\the\toks0@use}{% + \toks1\toks0 % + }{% + \toks1\expandafter\expandafter\expandafter{\csname lettre@lmp@\the\toks0@use\endcsname}% + }% + \toks4\expandafter{% + \expandafter\lettre@lmp@selectlanguage\expandafter{% + \the\toks1}}% + \iflettre@keep@envs + \toks3{}% + \toks5{}% + \else + \toks3{\lettre@restore@orig@envs}% + \ifcsundef{lettre@set@\the\toks1@envs}{% + \toks5{\lettre@store@orig@envs}% + }{% + \toks5\expandafter{\expandafter\lettre@store@orig@envs + \csname lettre@set@\the\toks1 @envs\endcsname}% + }% + \fi + \edef\@tempa{% + \the\toks3 % + \the\toks4 % + \the\toks5}% + }% + \expandafter + }\@tempa +}% \def\FAXSTR{\fontfamily{cmdh}\fontseries{m}\fontshape{n}\selectfont}% -\def\FRANCAIS{francais} -\def\francais{% - \ifx\defaultlanguage\FRANCAIS\else\l@@info{Langage modifie: francais}\fi - \ifx\undefined\frenchname\else - \french - \fi - \ifx\undefined\extrasfrancais\else - \selectlanguage{francais} - \reset@frenchitemize - \fi - \sigflag=0\relax - \def\cejour{le - \ifnum\day=1\space 1\ifx\ier\undefined er\else\expandafter\ier\fi - \else\number\day\fi - \space\ifcase\month\or - janvier\or f\'evrier\or mars\or avril\or mai\or juin\or - juillet\or ao\^ut\or septembre\or octobre\or novembre\or d\'ecembre\fi - \space \number\year}% - \def\faxwarning{\large\slshape\bfseries En cas de mauvaise transmission, - appelez s.v.p. l'op\'erateur t\'el\'efax}% - \def\telefaxstring{{\FAXSTR T~\'E~L~\'E~F~A~X}}% - \def\telephonelabelname{T\'EL\'EPHONE :~}% - \def\telefaxlabelname{T\'EL\'EFAX :~}% - \def\telefaxname{T\'el\'ecopie :~}% - \def\tellabelname{T\'el.~}% - \def\faxlabelname{Fax :~}% - \def\emaillabelname{E-Mail :~}% - \def\telexlabelname{T\'ELEX :~}% - \def\headtoname{\`A :~}% - \def\headfromname{De :~}% - \def\pagetotalname{Nombre de pages :~}% - \def\concname{Objet :~}% - \def\ccname{C.c.~}% - \def\enclname{P.j.~}% - \def\mentionname{Annexe(s) mentionn\'ee(s)}% - \def\vrefname{V.\raise.4ex\hbox{\tiny /}r\'ef.~} - \def\nrefname{N.\raise.4ex\hbox{\tiny /}r\'ef.~} +\newcommand*\lettre@lmp@selectlanguage[1]{% + \l@@warning{ `\string\lettre@lmp@selectlanguage{#1}' appel'e, mais ne fait rien. Vous n'avez charg'e ni babel, +ni mlp, ni polyglossia, ni french}} +\newcommand*\lettrelabelselectlanguage[1]{% + \lettreloadlang{#1}% + {% + \ifcsundef{lettre@#1@alias@of}{% + \l@@warning@strictable{La langue <<#1>> n'est pas prise en charge par lettre}% + \let\@tempa\@empty + }{% + \expandafter\let\expandafter\@tempa\csname lettre@#1@alias@of\endcsname + \ifcsundef{lettre@select@\@tempa @labels}{% + \l@@warning@strictable{Les d'efinitions de la langue <<\@tempa>> n'ont pas pu etre charg'ees}% + \let\@tempa\@empty + }{% + \expandafter\def\expandafter\@tempa\expandafter{% + \csname lettre@select@\@tempa @labels\endcsname + \def\lettre@mainlang{#1}}% + }% + }% + \expandafter + }\@tempa }% -\def\ROMAND{romand} -\def\romand{% - \ifx\defaultlanguage\ROMAND\else\l@@info{Langage modifie: romand}\fi - \ifx\undefined\frenchname\else - \french - \fi - \ifx\undefined\extrasfrancais\else - \selectlanguage{francais} - \reset@frenchitemize - \fi - \sigflag=0\relax - \def\cejour{le - \ifx\ier\undefined\def\ier{er}\fi - \ifnum\day=1\relax 1\ier\else \number\day\fi - \space\ifcase\month\or - janvier\or f\'evrier\or mars\or avril\or mai\or juin\or - juillet\or ao\^ut\or septembre\or octobre\or novembre\or d\'ecembre\fi - \space \number\year}% - \def\faxwarning{\large\slshape\bfseries En cas de mauvaise transmission, - appelez s.v.p. l'op\'erateur t\'el\'efax}% - \def\telefaxstring{{\FAXSTR T~\'E~L~\'E~F~A~X}}% - \def\telephonelabelname{T\'EL\'EPHONE :~}% - \def\telefaxlabelname{T\'EL\'EFAX :~}% - \def\telefaxname{T\'el\'efax :~}% - \def\tellabelname{T\'el.~}% - \def\faxlabelname{Fax :~}% - \def\emaillabelname{E-Mail :~}% - \def\telexlabelname{T\'ELEX :~}% - \def\headtoname{\`A :~}% - \def\headfromname{De :~}% - \def\pagetotalname{Nombre de pages :~}% - \def\concname{Concerne :~}% - \def\ccname{C.c.~}% - \def\enclname{Ann.~}% - \def\mentionname{Annexe(s) mentionn\'ee(s)}% - \def\vrefname{V.\raise.4ex\hbox{\tiny /}r\'ef.~} - \def\nrefname{N.\raise.4ex\hbox{\tiny /}r\'ef.~} +\newcommand*\lettreloadlang[1]{% + {% + \newif\iflettre@lang@not@supported + \ifcsundef{lettre@#1@alias@of}{% + \lettre@lang@not@supportedtrue + \l@@warning@strictable{La langue <<#1>> ne fait pas partie des langues prises en charge par lettre}% + \def\@tempb##1{\toks0{\def##1{#1}}}% + \expandafter\@tempb\csname lettre@#1@alias@of\endcsname + \def\@tempa{#1}% + }{% + \lettre@lang@not@supportedfalse + \toks0{}% + \expandafter\let\expandafter\@tempa\csname lettre@#1@alias@of\endcsname + }% + \edef\@tempc{\lettre@ldf@filename{\@tempa}}% + \IfFileExists{\@tempc}{% + \iflettre@lang@not@supported + \l@@info{Un fichier `\@tempc' ne faisant pas partie de lettre a 'et'e trouv'e, et va etre charg'e.}% + \fi + \ifcsundef{\lettre@ldf@version{\@tempa}}{% + \edef\@tempa{% + \noexpand\l@@info{Chargement du fichier de definition de langue `\@tempc'}% + \noexpand\input{\@tempc}% + \the\toks0 + }}{\edef\@tempa{\the\toks0}}% + }{% + \let\@tempa\@empty + } + \expandafter + }\@tempa }% -\def\ANGLAIS{anglais} -\def\anglais{% - \ifx\defaultlanguage\ANGLAIS\else\l@@info{Langage modifie: anglais}\fi - \ifx\undefined\frenchname\else - \english - \fi - \ifx\undefined\extrasenglish\else - \selectlanguage{english} - \fi - \sigflag=1\relax - \def\cejour{\ifcase\month\or - January\or February\or March\or April\or May\or June\or - July\or August\or September\or October\or November\or December\fi - \space\number\day ,\space\number\year}% - \def\faxwarning{\large\slshape\bfseries If improperly transmitted, please - call the telefax operator}% - \def\telefaxstring{{\FAXSTR T~E~L~E~F~A~X}}% - \def\telephonelabelname{TELEPHONE:~}% - \def\telefaxlabelname{TELEFAX:~}% - \def\telefaxname{Telefax:~}% - \def\tellabelname{Tel:~}% - \def\faxlabelname{Fax:~}% - \def\emaillabelname{E-Mail:~}% - \def\telexlabelname{TELEX:~}% - \def\headtoname{To:~}% - \def\headfromname{From:~}% - \def\pagetotalname{Total pages:~}% - \def\concname{Subject:~}% - \def\ccname{Cc:~}% - \def\enclname{Encl(s):~}% - \def\mentionname{Encl(s).}% - \def\vrefname{Y.\raise.4ex\hbox{\tiny /}ref.~} - \def\nrefname{O.\raise.4ex\hbox{\tiny /}ref.~} +\newcommand*\lettreselectlanguage[1]{% + \lettrelmpselectlanguage{#1}% + \lettrelabelselectlanguage{#1}% }% -\def\AMERICAIN{americain} -\def\americain{% - \ifx\defaultlanguage\AMERICAIN\else\l@@info{Langage modifie: americain}\fi% - \ifx\undefined\frenchname\else - \english - \fi - \ifx\undefined\extrasenglish\else - \selectlanguage{english} +\newcommand*\lettre@babel@selectlanguage[1]{% + \ifcsdef{lettre@babel@#1}{\csname lettre@babel@#1\endcsname}{\selectlanguage{#1}}% +}% +\newcommand*\lettre@babel@german{% + \ifcsdef{ver@ngerman.ldf}{\selectlanguage{ngerman}}{\selectlanguage{german}}% +} +\newcommand*\lettre@efrench@selectlanguage[1]{% + \ifx\undefined\frenchname + \l@@warning@strictable{L'un des paquetages mlp ou french n'a pas 'et'e charg'e correctement}% + \else + \def\@tempb{\l@@warning@strictable{La langue `#1' n'est pas dans \string{french, german, english\string} qui sont les trois seules langues que lettre peut demander `a mlp}}% + \def\@tempc{#1}% + \def\lettre@iterate@body##1{% + \def\@tempd{##1}% + \ifx\@tempc\@tempd + \let\@tempb\@empty + \l@@info{Selection de la langue `#1' dans le paquetage french ou mlp d'efrench}% + \csname lettre@efr@#1\endcsname + \def\@tempc####1\@nil,{}% + \expandafter\@tempc + \fi + }% + \lettre@iterate french,english,german,\@nil,% + \@tempb \fi - \sigflag=1\relax - \def\cejour{\ifcase\month\or - January\or February\or March\or April\or May\or June\or - July\or August\or September\or October\or November\or December\fi - \space\number\day ,\space\number\year}% - \def\faxwarning{\large\slshape\bfseries If improperly transmitted, please - call the telefax operator}% - \def\telefaxstring{{\FAXSTR T~E~L~E~F~A~X}}% - \def\telephonelabelname{PHONE:~}% - \def\telefaxlabelname{TELEFAX:~}% - \def\telefaxname{Telefax:~}% - \def\tellabelname{Phn:~}% - \def\faxlabelname{Fax:~}% - \def\emaillabelname{E-Mail:~}% - \def\telexlabelname{TELEX:~}% - \def\headtoname{To:~}% - \def\headfromname{From:~}% - \def\pagetotalname{Total pages:~}% - \def\concname{Re:~}% - \def\ccname{Cc:~}% - \def\enclname{Encl(s):~}% - \def\mentionname{Encl(s).}% - \def\vrefname{Y.\raise.4ex\hbox{\tiny /}ref.~} - \def\nrefname{O.\raise.4ex\hbox{\tiny /}ref.~} }% -\def\ALLEMAND{allemand} -\def\allemand{% - \ifx\defaultlanguage\ALLEMAND\else\l@@info{Langage modifie: allemand}\fi - \ifx\undefined\extrasgerman\else - \selectlanguage{german} +\newcommand*\lettre@efr@german{% + \ifx\undefined\ngermanTeXmods + \ifx\undefined\germanTeXmods + \l@@warning@strictable{Ni \protect\german\space ni \protect\ngerman\space ne sont d'efinis !} + \else + \german + \fi + \else + \ngerman \fi - \sigflag=1\relax - \def\cejour{den \number\day .\space\ifcase\month\or - Januar\or Februar\or M\"arz\or April\or Mai\or Juni\or - Juli\or August\or September\or Oktober\or November\or Dezember\fi - \space \number\year}% - \def\concname{Betrifft: }% - \def\faxwarning{\large\slshape\bfseries Bitte unrichtige \"Ubertragungen dem - Sender telefonisch melden}% - \def\telefaxstring{{\FAXSTR T~E~L~E~F~A~X}}% - \def\telephonelabelname{TELEFON:~}% - \def\telefaxlabelname{TELEFAX:~}% - \def\telefaxname{Telefax:~}% - \def\tellabelname{Tel:~}% - \def\faxlabelname{Fax:~}% - \def\emaillabelname{E-Mail:~}% - \def\telexlabelname{TELEX:~}% - \def\headtoname{An:~}% - \def\headfromname{Von:~}% - \def\pagetotalname{Gesamtanzahl der Bl\"atter:~}% - \def\concname{Betrifft:~}% - \def\ccname{Kopie an:~}% - \def\enclname{Beilage(n):~}% - \def\mentionname{Beilage(n) erw\"ahnt}% - \def\vrefname{Ihr Zeichen~} - \def\nrefname{Unser Zeichen~} +} +\newcommand*\lettre@efr@french{\ifcsdef{french}{% + \def\lettre@efr@french{\ifFrench\else\french\fi}\lettre@efr@french + }{\l@@warning@strictable{La commande \protect\french\space n'est pas + d'efinie.}}} +\newcommand*\lettre@efr@english{\english} +\def\@tempa#1{% + \expandafter\newcommand\expandafter*\csname #1\endcsname{% + {% + \def\@tempa{#1}% + \ifx\lettre@mainlang\@tempa\else\l@@info{Langage modifie: #1}\fi + }% + \lettreselectlanguage{#1}% + }% }% +\@tempa{romand}% +\@tempa{francais}% +\@tempa{allemand}% +\@tempa{anglais}% +\@tempa{americain}% \AtBeginDocument{% \makeatletter \@input{\jobname.tns}% @@ -1042,6 +1224,31 @@ \immediate\write\@etiqaux{\string\startlabels}% \@startlabels \fi + {% + \toks0{}% + \toks1{\def\lettre@lmp@selectlanguage#1{\selectlanguage{#1}}}% + \toks2{\let\lettre@lmp@selectlanguage\lettre@efrench@selectlanguage}% + \toks3{\let\lettre@lmp@selectlanguage\lettre@babel@selectlanguage}% + \count0=0 % + \def\lettre@iterate@body#1{\@tempb#1\@nil}% + \def\@tempb#1:#2\@nil{% + \@ifpackageloaded{#1}{% + \l@@info{Le paquetage `#1' est charg'e}% + \count0=#2 % + \def\lettre@iterate##1\@nil,{}% + }{% + \l@@info{Le paquetage `#1' n'est pas charg'e}% + }% + }% + \l@@info{Scrutation des paquetages de gestion de langue}% + \lettre@iterate% + babel:3,% + polyglossia:1,% + french:2,% + mlp:2,% + \@nil,% + \expandafter + }\the\toks\count0 % \makeatother }% \AtEndDocument{% @@ -1066,7 +1273,6 @@ \endgroup }% \def\@texttop{\ifnum\c@page=1\vskip 0pt plus .00001fil\relax\fi}% -% \if@twoside \def\ps@headings{% \headheight 12pt% @@ -1087,7 +1293,6 @@ \def\@evenhead{}% \def\@evenfoot{}}% \fi -% \def\ps@empty{% \headheight 0pt% \headsep 9pt% @@ -1111,7 +1316,6 @@ \fi}% \def\@evenhead{}% \def\@evenfoot{}}% -% \def\ps@firstpage{% \headheight 12pt% \headsep 25pt% @@ -1119,7 +1323,6 @@ \def\@oddfoot{}% \def\@evenhead{}% \def\@evenfoot{}}% -% \def\ps@plain{% \headheight 0pt% \headsep 9pt% @@ -1136,7 +1339,6 @@ \leftskip\@flushglue\advance\leftskip\lettermargin \parindent\z@\parfillskip\z@}% \let\endcenter=\endtrivlist -% \def\normalflushleft{\trivlist \normalraggedright\item[]}% \def\letterflushleft{\trivlist \letterraggedright\item[]}% \def\normalraggedright{\let\\=\@centercr\leftskip\z@ @@ -1146,29 +1348,16 @@ \@rightskip\@flushglue\rightskip\@rightskip \parindent\z@}% \let\endflushleft=\endtrivlist -\def\reset@frenchitemize{% - \renewenvironment{itemize}% - {\begin{list}{\textendash}% - {\settowidth{\labelwidth}{\textendash}% - \setlength{\leftmargin}{\listmargin}% - \addtolength{\leftmargin}{\labelwidth}% - \addtolength{\leftmargin}{\labelsep}% - \ifnum\@listdepth=0 - \setlength{\itemindent}{\parindent}% - \else - \addtolength{\leftmargin}{\parindent}% - \fi - \setlength{\itemsep}{\z@}% - \setlength{\parsep}{\z@}% - \setlength{\topsep}{\z@}% - \setlength{\partopsep}{\z@}% - \addtolength{\topsep}{-\parskip}% - \addtolength{\partopsep}{\parskip}% - }% - }% - {\end{list}}% -} -% +\newcommand*{\lettre@store@orig@envs}{% +\let\lettre@orig@itemize\itemize +\let\lettre@orig@enditemize\enditemize +}% +\AtBeginDocument{\lettre@store@orig@envs}% +\newcommand*{\lettre@restore@orig@envs}{% +\let\itemize\lettre@orig@itemize +\let\enditemize\lettre@orig@enditemize}% +\newcommand*{\reset@frenchitemize}{\l@@warning@strictable{\protect\reset@frenchitemize\space est obsolete, utilisez + plutot \protect\lettre@set@french@envs}\lettre@set@french@envs} \rightmargin 25mm% \advance\rightmargin 5pt% \leftmarginii 2.2em% @@ -1193,12 +1382,10 @@ \labelwidth\leftmarginv\advance\labelwidth-\labelsep}% \def\@listvi{\leftmargin\leftmarginvi \labelwidth\leftmarginvi\advance\labelwidth-\labelsep}% -% \def\labelitemi{$\bullet$}% \def\labelitemii{\bfseries --}% \def\labelitemiii{$\ast$}% \def\labelitemiv{$\cdot$}% -% \def\labelenumi{\arabic{enumi}.}% \def\theenumi{\arabic{enumi}}% \def\labelenumii{(\alph{enumii})}% @@ -1220,7 +1407,6 @@ \let\endquotation=\endlist \def\quote{\list{}{\rightmargin\leftmargin}\item[]}% \let\endquote=\endlist -% \def\descriptionlabel#1{\itshape #1}% \def\description{\list{}{\leftmargin=2\listmargin \labelwidth\listmargin \advance\labelwidth -\labelsep @@ -1228,9 +1414,7 @@ \let\enddescription\endlist \def\@begintheorem#1#2{\itshape \trivlist \item[\hskip \labelsep{\bfseries #1\ #2}]}% \def\@endtheorem{\endtrivlist}% -% \def\theequation{\arabic{equation}}% -% \arraycolsep 5pt% \tabcolsep 5pt% \arrayrulewidth .4pt% @@ -1239,10 +1423,10 @@ \skip\@mpfootins=\skip\footins \fboxsep = 3pt \fboxrule = .4pt +\newcommand*\today{\cejour} \def\footnoterule{\kern-1\p@ \hrule width .4\columnwidth \kern .6\p@}% -% \long\def\@makefntext#1{\parindent 1em\noindent \hb@xt@1.8em{% \hss\@textsuperscript{\normalfont\@thefnmark}}#1}% @@ -1262,7 +1446,6 @@ \def\toaddress@let@hpos{90}% \def\toaddress@let@vpos{40}% \toaddress@let@width=80mm -% \def\pict@fax@width{185}% \def\pict@fax@height{30}% \def\pict@fax@hoffset{0}% @@ -1276,33 +1459,37 @@ \faxbox@width=170mm% \toaddress@fax@width=69mm% \fromname@fax@width=69mm% -% -\def\@institut{\makeatletter - \input{default.ins}% +\lettre@vref@width=21mm% +\lettre@nref@width=21mm% +\def\lettre@input@institut{\makeatletter + \input{lettre-default.cfg}% \makeatother}% -% \smallskipamount=.5\parskip \medskipamount=\parskip \bigskipamount=2\parskip -% \ps@plain \pagenumbering{arabic}% \raggedbottom \onecolumn \def\pdate{\cejour}% -% \def\emailnum{}% -% \def\fromlocation{}% \signum=0\relax \def\fromsig{}% \def\fromssig{}% \def\fromtsig{}% -% -\csname\defaultlanguage\endcsname -\l@@info{Langage par defaut: \defaultlanguage} +\ifx\lettre@mainlang\@empty + \def\lettre@mainlang{francais}% + \lettreloadlang{french}% +\fi +{% + \edef\@tempa{% + \noexpand\AtBeginDocument{% + \noexpand\lettreselectlanguage{\lettre@mainlang}% + \noexpand\l@@info{Langage par defaut: \lettre@mainlang}}% + }% +\expandafter}\@tempa \def\concdecl{}% -% \marge{15mm}% \msigwidth=\letterwidth \ssigindent=0.5\letterwidth @@ -1312,18 +1499,15 @@ \sigspace=1.5cm \openingspace=1cm \openingindent=0pt -% \@lettertrue \faxpage=0\relax \def\totalpages{}% -% \def\auxflag{}% \auxcount=0\relax -\def\toref{}% -\def\fromref{}% +\let\toref\space +\let\fromref\space \def\telexnum{}% \def\ccpnum{}% -% \def\emailflag{}% \emailcount=0\relax \def\@username{}% @@ -1332,7 +1516,6 @@ \def\bitnetnum{}% \def\telepacnum{}% \def\decnetnum{}% -% \def\bdp{}% \endinput % End of file `lettre.cls'. -- cgit v1.2.3