summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/lettrine
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-02-16 21:39:55 +0000
committerKarl Berry <karl@freefriends.org>2015-02-16 21:39:55 +0000
commite016928e2bd0e7163bde478d7ab2419f49468c3c (patch)
tree80ddab12be3f8e877312a15ce271710bd56b126f /Master/texmf-dist/tex/latex/lettrine
parentba7aa8ebb398757e83aa09cbbafafb128b0b2fd7 (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')
-rw-r--r--Master/texmf-dist/tex/latex/lettrine/contrib/optfile.cfl (renamed from Master/texmf-dist/tex/latex/lettrine/optfile.cfl)0
-rw-r--r--Master/texmf-dist/tex/latex/lettrine/contrib/pacl.cfl (renamed from Master/texmf-dist/tex/latex/lettrine/pacl.cfl)0
-rw-r--r--Master/texmf-dist/tex/latex/lettrine/contrib/padl.cfl (renamed from Master/texmf-dist/tex/latex/lettrine/padl.cfl)0
-rw-r--r--Master/texmf-dist/tex/latex/lettrine/contrib/pzc2.cfl (renamed from Master/texmf-dist/tex/latex/lettrine/pzc2.cfl)0
-rw-r--r--Master/texmf-dist/tex/latex/lettrine/contrib/pzc3.cfl (renamed from Master/texmf-dist/tex/latex/lettrine/pzc3.cfl)0
-rw-r--r--Master/texmf-dist/tex/latex/lettrine/lettrine.cfg4
-rw-r--r--Master/texmf-dist/tex/latex/lettrine/lettrine.sty27
7 files changed, 28 insertions, 3 deletions
diff --git a/Master/texmf-dist/tex/latex/lettrine/optfile.cfl b/Master/texmf-dist/tex/latex/lettrine/contrib/optfile.cfl
index b41acdb4f38..b41acdb4f38 100644
--- a/Master/texmf-dist/tex/latex/lettrine/optfile.cfl
+++ b/Master/texmf-dist/tex/latex/lettrine/contrib/optfile.cfl
diff --git a/Master/texmf-dist/tex/latex/lettrine/pacl.cfl b/Master/texmf-dist/tex/latex/lettrine/contrib/pacl.cfl
index a7c122313fa..a7c122313fa 100644
--- a/Master/texmf-dist/tex/latex/lettrine/pacl.cfl
+++ b/Master/texmf-dist/tex/latex/lettrine/contrib/pacl.cfl
diff --git a/Master/texmf-dist/tex/latex/lettrine/padl.cfl b/Master/texmf-dist/tex/latex/lettrine/contrib/padl.cfl
index 784bebc935e..784bebc935e 100644
--- a/Master/texmf-dist/tex/latex/lettrine/padl.cfl
+++ b/Master/texmf-dist/tex/latex/lettrine/contrib/padl.cfl
diff --git a/Master/texmf-dist/tex/latex/lettrine/pzc2.cfl b/Master/texmf-dist/tex/latex/lettrine/contrib/pzc2.cfl
index 77799687805..77799687805 100644
--- a/Master/texmf-dist/tex/latex/lettrine/pzc2.cfl
+++ b/Master/texmf-dist/tex/latex/lettrine/contrib/pzc2.cfl
diff --git a/Master/texmf-dist/tex/latex/lettrine/pzc3.cfl b/Master/texmf-dist/tex/latex/lettrine/contrib/pzc3.cfl
index a67ba9b5b0e..a67ba9b5b0e 100644
--- a/Master/texmf-dist/tex/latex/lettrine/pzc3.cfl
+++ b/Master/texmf-dist/tex/latex/lettrine/contrib/pzc3.cfl
diff --git a/Master/texmf-dist/tex/latex/lettrine/lettrine.cfg b/Master/texmf-dist/tex/latex/lettrine/lettrine.cfg
index 96ecca016b4..778ff67b735 100644
--- a/Master/texmf-dist/tex/latex/lettrine/lettrine.cfg
+++ b/Master/texmf-dist/tex/latex/lettrine/lettrine.cfg
@@ -18,9 +18,11 @@
%%\setlength{\DefaultFindent}{0pt}
%%\setlength{\DefaultNindent}{0.5em}
%%\setlength{\DefaultSlope}{0mm}
+%%\setlength{\DiscardVskip}{0.2pt}
%%
-%% This is a *flag* (value=true/false):
+%% Theses are *flags* (value=true/false):
%%\LettrineImagefalse
+%%\LettrineOnGridfalse
%%
%% In case you want to set parameters for some letters
%% in file `optfile.cfl'
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}%