lettrine update (28apr08)

git-svn-id: svn://tug.org/texlive/trunk@7724 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 147 insertions, 38 deletions

diff --git a/Master/texmf-dist/source/latex/lettrine/lettrine.dtx b/Master/texmf-dist/source/latex/lettrine/lettrine.dtx
index a3721b854ac..62b490600a3 100644
--- a/Master/texmf-dist/source/latex/lettrine/lettrine.dtx
+++ b/Master/texmf-dist/source/latex/lettrine/lettrine.dtx
@@ -1,54 +1,71 @@
 %
-% Copyright 1999-2004 Daniel Flipo.
+% \CheckSum{445}
+%
+% \iffalse meta-comment
+%
+% Copyright (C) 1999-2007 Daniel Flipo.
 %
 % This program can be redistributed and/or modified under the terms
-% of the LaTeX Project Public License Distributed from CTAN
-% archives in directory macros/latex/base/lppl.txt; either
-% version 1 of the License, or any later version.
+% 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 2003/12/01 or later.
 % 
+% This file has the LPPL maintenance status "maintained".
+%
 %   NO PERMISSION is granted to produce or to distribute a
 %   modified version of this file under its original name.
-%  
-% \CheckSum{427}
+%
+% \fi
 %
 % \iffalse
-%    Tell the \LaTeX\ system who we are and write an entry on the
-%    transcript.
+%
+%<*sty>
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesFile{lettrine.sty}
+%</sty>
 %<*dtx>
 \ProvidesFile{lettrine.dtx}
 %</dtx>
-%<code>\ProvidesFile{lettrine.sty}
-%\fi
-%\ProvidesFile{lettrine.dtx}
-        [2004/05/22 v1.6 (D. Flipo)]
-%\iffalse
+%<*!cfg>
+             [2007/08/08 v1.62 (Daniel Flipo)]
+%</!cfg>
+%
 %    Lettrine package for LaTeX version 2e
 %
-%    Copyright (C) 1999-2004 by Daniel Flipo
+%    Copyright (C) 1999-2007 by Daniel Flipo
 %
-%    Please report errors to: Daniel.Flipo@univ-lille1.fr
+%    Please report errors to: Daniel.Flipo at univ-lille1.fr
+%
+%<*driver>
+\documentclass[a4paper]{ltxdoc}
+\usepackage{lettrine}
+\GetFileInfo{lettrine.dtx}
+\RecordChanges
+%\OnlyDescription
 %
-%<*filedriver>
-\documentclass{ltxdoc}
 \newenvironment{key}[2]{\expandafter\macro\expandafter{%
    \csname KV@#1@#2\endcsname}}{\endmacro}
 %
 \newcommand*\file[1]{\texttt{#1}}
 %
-\parindent = 0pt
-\parskip = .3\baselineskip
+\newcommand{\at}{@}
+\setlength{\parindent}{0pt}
+\setlength{\parskip}{.3\baselineskip}
 \begin{document}
 \begin{center}
   \textbf{\Large Typesetting `lettrines' in \LaTeXe{} documents}
-  \\[.2\baselineskip]
+  \\[.2\baselineskip]^^A\]
   {\large Daniel \textsc{Flipo}}\\
-  \texttt{Daniel.Flipo@univ-lille1.fr}
+  \texttt{Daniel.Flipo\at univ-lille1.fr}
 \end{center}
- \DocInput{lettrine.dtx}
+\DocInput{lettrine.dtx}
 \end{document}
-%</filedriver>
+%</driver>
+%
 %\fi
-% \GetFileInfo{lettrine.dtx}
 %
 %  \section{Introduction}
 %
@@ -252,17 +269,18 @@
 %      are implemented as \emph{lists} in \LaTeX{}.
 %    \end{itemize}
 %
-% \StopEventually{}
+% \StopEventually{\PrintChanges}
 %
 %    \pagebreak[3]
 %  \section{\TeX{}nical details}
 %
 %    This package only runs with \LaTeXe{} and requires keyval.sty
+% \iffalse
+%<*sty>
+% \fi
+%
 %    \begin{macrocode}
-%<*code>
-%% Please report errors to: Daniel.Flipo@univ-lille1.fr
-%%
-\NeedsTeXFormat{LaTeX2e}[1995/12/01]
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \RequirePackage{keyval}
 %    \end{macrocode}
 %
@@ -650,11 +668,55 @@
 %    This ends the definition of |\lettrine|.\\
 %    Load a local config file if present in \LaTeX{}'s search path.
 %    \begin{macrocode}
-\InputIfFileExists{lettrine.cfg}{}{}
-%</code>
+\InputIfFileExists{lettrine.cfg}
+   {\typeout{Loading lettrine.cfg}}
+   {\typeout{lettrine.cfg not found, using default values}}
 %    \end{macrocode}
+% \iffalse
+%</sty>
+% \fi
 %
-% \Finale
+%  \section{Fichier de configuration}
+%
+% \iffalse
+%<*cfg>
+% \fi
+%    \begin{macrocode}
+%% lettrine.cfg: configuration file for lettrine.sty
+%%
+%% If you want to customize lettrine, please *do not* hack into the
+%% code, copy this file to the directory where lettrine.sty lies
+%% and customize it as you like. 
+%%
+%% Uncomment these lines and change the parameters' values to fit
+%% your needs (see lettrine.dtx).
+%%
+%%\setcounter{DefaultLines}{2}
+%%
+%% These are *decimal* numbers:
+%%\renewcommand{\DefaultLoversize}{0}
+%%\renewcommand{\DefaultLraise}{0}
+%%\renewcommand{\DefaultLhang}{0}
+%%
+%% These are *lengths* (don't forget the unit):
+%%\setlength{\DefaultFindent}{0pt}
+%%\setlength{\DefaultNindent}{0.5em}
+%%\setlength{\DefaultSlope}{0mm}
+%%
+%% This is a *flag* (value=true/false):
+%%\LettrineImagefalse
+%%
+%% In case you want to set parameters for some letters
+%% in file `optfile.cfl'
+%%\renewcommand{\DefaultOptionsFile}{optfile.cfl}
+%    \end{macrocode}
+% \iffalse
+%</cfg>
+% \fi
+%
+% \iffalse
+%<*dtx>
+% \fi
 %%
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -672,4 +734,14 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 %%
+% \iffalse
+%</dtx>
+% \fi
+%
+% \Finale
 \endinput
+
+%%% Local Variables:
+%%% fill-column: 70
+%%% coding: latin-1
+%%% End:
diff --git a/Master/texmf-dist/source/latex/lettrine/lettrine.ins b/Master/texmf-dist/source/latex/lettrine/lettrine.ins
index f8ef8175632..e71866caee3 100644
--- a/Master/texmf-dist/source/latex/lettrine/lettrine.ins
+++ b/Master/texmf-dist/source/latex/lettrine/lettrine.ins
@@ -1,25 +1,62 @@
 %%
+%% Copyright (C) 1999-2007 Daniel Flipo.
+%%
+%% This program can be redistributed and/or modified under the terms
+%% 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 2003/12/01 or later.
+%% 
 %% This file will generate fast loadable files and documentation
 %% driver files from the doc files in this package when run through
 %% LaTeX or TeX.
 %%
 \def\batchfile{lettrine.ins}
 \input docstrip.tex
+
+{\ifx\generate\undefined
+\Msg{**********************************************}
+\Msg{*}
+\Msg{* This installation requires docstrip}
+\Msg{* version 2.3c or later.}
+\Msg{*}
+\Msg{* An older version of docstrip has been input}
+\Msg{*}
+\Msg{**********************************************}
+\errhelp{Move or rename old docstrip.tex.}
+\errmessage{Old docstrip in input path}
+\batchmode
+\csname @@end\endcsname
+\fi}
+
 \keepsilent
 
-\generateFile{lettrine.sty}{f}{\from{lettrine.dtx}{code}}
+\usedir{tex/latex/lettrine} 
+
+\generate{\file{lettrine.sty}{\from{lettrine.dtx}{sty}}
+         }
+
+\nopreamble
+\generate{\file{lettrine.cfg}{\from{lettrine.dtx}{cfg}}
+         }
 
 \Msg{***********************************************************}
 \Msg{*}
 \Msg{* To finish the installation you have to move lettrine.sty}
-\Msg{* into a directory searched by TeX.}
+\Msg{* lettrine.cfg and the *.cfl files from the contrib}
+\Msg{* directory into a directory searched by TeX.}
+\Msg{*}
+\Msg{* If you want to change the default settings, uncomment the}
+\Msg{* lines you want in file lettrine.cfg and customize them.}
 \Msg{*}
-\Msg{* If you want to change the default settings, you can do so}
-\Msg{* by copying  lettrine.cfg  to the directory where you will}
-\Msg{* install lettrine.sty  and uncomment the lines you want to}
-\Msg{* change.}
+\Msg{* To produce the documentation}
+\Msg{* run lettrine.dtx through LaTeX or pdfLaTeX.}
 \Msg{*}
 \Msg{* Happy TeXing!}
 \Msg{*}
 \Msg{***********************************************************}
 
+\endbatchfile
+\endinput