diff options
author | Karl Berry <karl@freefriends.org> | 2015-02-16 21:39:55 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-02-16 21:39:55 +0000 |
commit | e016928e2bd0e7163bde478d7ab2419f49468c3c (patch) | |
tree | 80ddab12be3f8e877312a15ce271710bd56b126f /Master/texmf-dist/tex/latex/lettrine/lettrine.sty | |
parent | ba7aa8ebb398757e83aa09cbbafafb128b0b2fd7 (diff) |
lettrine (16feb15)
git-svn-id: svn://tug.org/texlive/trunk@36295 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.sty | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/Master/texmf-dist/tex/latex/lettrine/lettrine.sty b/Master/texmf-dist/tex/latex/lettrine/lettrine.sty index 224b56f0fd3..3f753a0119a 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} - [2014/09/16 v1.70 (Daniel Flipo)] + [2015/02/16 v1.8 (Daniel Flipo)] \NeedsTeXFormat{LaTeX2e}[1999/12/01] \RequirePackage{keyval} \newcounter{DefaultLines} @@ -38,7 +38,10 @@ \setlength{\DefaultNindent}{0.5em} \newdimen\DefaultSlope \setlength{\DefaultSlope}{\z@} +\newdimen\DiscardVskip +\setlength{\DiscardVskip}{0.2\p@} \newif\ifLettrineImage +\newif\ifLettrineOnGrid \newsavebox{\L@lbox} \newsavebox{\L@tbox} \newcounter{L@lines} @@ -51,12 +54,14 @@ \newdimen\L@next \newdimen\L@slope \newdimen\L@height +\newdimen\L@novskip \newcommand*{\L@file}{} \newcommand*{\L@hang}{} \newcommand*{\L@oversize}{} \newcommand*{\L@raise}{} \newcommand*{\L@ante}{} \newif\ifL@image +\newif\ifL@grid \newcommand*{\LettrineTextFont}{\scshape} \def\Lettrine@height{% \@tempdima=\baselineskip @@ -101,6 +106,8 @@ \define@key{L}{nindent}{\setlength{\L@Nindent}{#1}} \define@key{L}{slope}{\setlength{\L@slope}{#1}} \define@key{L}{image}[true]{\csname L@image#1\endcsname} +\define@key{L}{grid}[true]{\csname L@grid#1\endcsname} +\define@key{L}{novskip}{\setlength{\L@novskip}{#1}} \newcommand*{\LettrineOptionsFor}[2]{\@namedef{l@#1-keys}{#2}} \newdimen\LettrineWidth \newdimen\LettrineHeight @@ -116,7 +123,9 @@ \setlength{\L@Findent}{\DefaultFindent}% \setlength{\L@Nindent}{\DefaultNindent}% \setlength{\L@slope}{\DefaultSlope}% + \setlength{\L@novskip}{\DiscardVskip}% \ifLettrineImage\L@imagetrue\else\L@imagefalse\fi + \ifLettrineOnGrid\L@gridtrue\else\L@gridfalse\fi \if\DefaultOptionsFile\relax \else \begingroup @@ -168,7 +177,21 @@ \addtolength{\L@lraise}{\@tempdima}% \fi \par - \ifdim\L@first>0.2\p@\vskip\L@first\fi + \ifdim\L@first>\L@novskip + \ifL@grid + \@tempdima=\baselineskip + \@tempdimb=\@tempdima + \advance\@tempdimb by \L@novskip + \@tempcnta=1 + \loop\ifdim\L@first>\@tempdimb + \advance\@tempcnta by 1 + \advance\L@first by -\@tempdima + \repeat + \vskip\@tempcnta\baselineskip + \else + \vskip\L@first + \fi + \fi \setlength{\L@Pindent}{\wd\L@lbox}% \addtolength{\L@Pindent}{-\L@hang\wd\L@lbox}% \settowidth{\L@first}{\L@ante}% |