summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/lettrine/lettrine.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-09-04 21:10:42 +0000
committerKarl Berry <karl@freefriends.org>2014-09-04 21:10:42 +0000
commitdce332ec1dc8b171a886c68e3fa442edc482fd17 (patch)
treed511eadff18faeaae29afaf8fbf19ec84338122d /Master/texmf-dist/tex/latex/lettrine/lettrine.sty
parent23550e4b6a7407977d39f6339f6f9fe2db2ba99e (diff)
lettrine (4sep14)
git-svn-id: svn://tug.org/texlive/trunk@35107 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/lettrine/lettrine.sty')
-rw-r--r--Master/texmf-dist/tex/latex/lettrine/lettrine.sty14
1 files changed, 10 insertions, 4 deletions
diff --git a/Master/texmf-dist/tex/latex/lettrine/lettrine.sty b/Master/texmf-dist/tex/latex/lettrine/lettrine.sty
index a58b64b84f9..11e7ca24b80 100644
--- a/Master/texmf-dist/tex/latex/lettrine/lettrine.sty
+++ b/Master/texmf-dist/tex/latex/lettrine/lettrine.sty
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{lettrine.sty}
- [2013/03/14 v1.64 (Daniel Flipo)]
+ [2014/09/04 v1.65 (Daniel Flipo)]
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\RequirePackage{keyval}
\newcounter{DefaultLines}
@@ -100,6 +100,8 @@
\define@key{L}{image}[true]{\csname L@image#1\endcsname}
\newcommand*{\LettrineOptionsFor}[2]{\@namedef{l@#1-keys}{#2}}
\newdimen\LettrineWidth
+\newdimen\LettrineHeight
+\newdimen\LettrineDepth
\def\lettrine{\@ifnextchar[\@lettrine{\@lettrine[]}}
\def\@lettrine[#1]#2#3{%
\setcounter{L@lines}{\theDefaultLines}%
@@ -133,7 +135,7 @@
\let\@tempc\relax
\expandafter\KV@do\l@LOKeys,\relax,
\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,
@@ -175,6 +177,9 @@
\addtolength{\L@next}{-\L@Nindent}%
\addtolength{\L@Pindent}{\rightmargin}%
\addtolength{\L@Nindent}{\rightmargin}%
+ \setlength{\LettrineWidth}{\wd\L@lbox}%
+ \setlength{\LettrineHeight}{\ht\L@lbox}%
+ \setlength{\LettrineDepth}{\dp\L@lbox}%
\addtocounter{L@lines}{1}%
\def\L@parshape{\c@L@lines \the\L@Pindent \the\L@first}%
\@tempcnta=\tw@
@@ -187,8 +192,9 @@
\noindent
\parshape=\L@parshape\relax
\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}%
+}
\InputIfFileExists{lettrine.cfg}
{\typeout{Loading lettrine.cfg}}
{\typeout{lettrine.cfg not found, using default values}}