summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/lettrine/lettrine.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/lettrine/lettrine.dtx')
-rw-r--r--Master/texmf-dist/source/latex/lettrine/lettrine.dtx39
1 files changed, 24 insertions, 15 deletions
diff --git a/Master/texmf-dist/source/latex/lettrine/lettrine.dtx b/Master/texmf-dist/source/latex/lettrine/lettrine.dtx
index 5fc747abf78..acbf9274d68 100644
--- a/Master/texmf-dist/source/latex/lettrine/lettrine.dtx
+++ b/Master/texmf-dist/source/latex/lettrine/lettrine.dtx
@@ -1,9 +1,9 @@
%
-% \CheckSum{448}
+% \CheckSum{464}
%
% \iffalse meta-comment
%
-% Copyright (C) 1999-2013 Daniel Flipo.
+% Copyright (C) 1999-2014 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
@@ -30,12 +30,12 @@
\ProvidesFile{lettrine.dtx}
%</dtx>
%<*!cfg>
- [2013/03/14 v1.64 (Daniel Flipo)]
+ [2014/09/04 v1.65 (Daniel Flipo)]
%</!cfg>
%
% Lettrine package for LaTeX version 2e
%
-% Copyright (C) 1999-2012 by Daniel Flipo
+% Copyright (C) 1999-2014 by Daniel Flipo
%
% Please report errors to: daniel.flipo at free.fr
%
@@ -152,6 +152,9 @@
% Another possibility to colour lettrines globally is described
% below, see |\LettrineFontHook|.
%
+% Three dimensions, |\LettrineWidth|, |\LettrineHeight| and
+% |\LettrineDepth|, store the final size of the lettrine.
+%
% Once \file{lettrine.sty} will be installed (run \texttt{latex}
% on \file{lettrine.ins} to extract it), compile and print
% \file{demo.tex} to see the possible usage of these parameters.
@@ -181,13 +184,9 @@
% \file{contrib}.
%
% The dimensional parameters |findent|, |nindent| and |slope|,
-% can be set in \textit{filename} relative to |\LettrineWidth|
-% if needed.
-% |\LettrineWidth| should be used \emph{only} in the config file
-% \textit{filename}, its value is non-null only if \textit{filename}
-% is read!
-% The settings read from this file will be overridden by the
-% optional arguments eventually given to |\lettrine|.
+% can be set in \textit{filename} relative to |\LettrineWidth| if
+% needed. The settings read from this file will be overridden by
+% the optional arguments eventually given to |\lettrine|.
%
% |\LettrineTextFont| sets the font used for the second argument
% of |\lettrine|, its default definition is
@@ -473,6 +472,8 @@
% \begin{macrocode}
\newcommand*{\LettrineOptionsFor}[2]{\@namedef{l@#1-keys}{#2}}
\newdimen\LettrineWidth
+\newdimen\LettrineHeight
+\newdimen\LettrineDepth
% \end{macrocode}
% \end{macro}
%
@@ -546,7 +547,7 @@
% measuring the lettrine for |\LettrineWidth| to be set properly.
% \begin{macrocode}
\sbox{\L@lbox}{\LettrineFont #2}%
- \settowidth{\LettrineWidth}{\usebox{\L@lbox}}%
+ \setlength{\LettrineWidth}{\wd\L@lbox}%
\def\KV@prefix{KV@L@}%
\let\@tempc\relax
\expandafter\KV@do\l@LOKeys,\relax,
@@ -653,6 +654,13 @@
\addtolength{\L@Pindent}{\rightmargin}%
\addtolength{\L@Nindent}{\rightmargin}%
% \end{macrocode}
+% \changes{lettrine-1.65}{2014/09/04}{Measure and store the lettrine's
+% final dimensions.}
+% \begin{macrocode}
+ \setlength{\LettrineWidth}{\wd\L@lbox}%
+ \setlength{\LettrineHeight}{\ht\L@lbox}%
+ \setlength{\LettrineDepth}{\dp\L@lbox}%
+% \end{macrocode}
% Now, set up the shape of the new paragraph (designed by
% |\parshape|).
% \begin{macrocode}
@@ -675,12 +683,13 @@
% the rest of paragraph around it.
% \begin{macrocode}
\smash{\llap{\mbox{\L@ante}\raisebox{\L@lraise}{\usebox{\L@lbox}}%
- \hskip \the\L@Findent}}%
- \usebox{\L@tbox}}
+ \hskip \the\L@Findent}}%
+ \usebox{\L@tbox}%
+}
% \end{macrocode}
% \end{macro}
+% This ends the definition of |\lettrine|.
%
-% This ends the definition of |\lettrine|.\\
% Load a local config file if present in \LaTeX{}'s search path.
% \begin{macrocode}
\InputIfFileExists{lettrine.cfg}