diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/lettrine')
-rw-r--r-- | Master/texmf-dist/tex/latex/lettrine/lettrine.cfg | 1 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/lettrine/lettrine.sty | 33 |
2 files changed, 26 insertions, 8 deletions
diff --git a/Master/texmf-dist/tex/latex/lettrine/lettrine.cfg b/Master/texmf-dist/tex/latex/lettrine/lettrine.cfg index 900ad83fbb6..30938553468 100644 --- a/Master/texmf-dist/tex/latex/lettrine/lettrine.cfg +++ b/Master/texmf-dist/tex/latex/lettrine/lettrine.cfg @@ -25,7 +25,6 @@ %%\LettrineImagefalse %%\LettrineOnGridfalse %%\LettrineRealHeightfalse -%%\LettrineSelfReffalse %% %% Theses are *commands* (value=string, only height matters): %%\renewcommand*{\LettrineTestString}{EFTZ} diff --git a/Master/texmf-dist/tex/latex/lettrine/lettrine.sty b/Master/texmf-dist/tex/latex/lettrine/lettrine.sty index 92486bbac83..ab3e863b28d 100644 --- a/Master/texmf-dist/tex/latex/lettrine/lettrine.sty +++ b/Master/texmf-dist/tex/latex/lettrine/lettrine.sty @@ -27,7 +27,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2018-04-01] \ProvidesFile{lettrine.sty} - [2020-03-14 v2.23 (Daniel Flipo)] + [2022-09-25 v2.30 (Daniel Flipo)] \ifdefined\DeclareRelease \DeclareRelease{v1.6}{1999-03-03}{lettrine-2006-03-17.sty} \DeclareRelease{v1.9}{2012-07-20}{lettrine-2015-08-31.sty} @@ -40,7 +40,7 @@ \MessageBreak your LaTeX kernel (2018-04-01 or newer),% \MessageBreak otherwise you are fine; reported} \fi -\RequirePackage{keyval,minifp} +\RequirePackage{xkeyval,minifp} \newcounter{DefaultLines} \setcounter{DefaultLines}{2} \newcounter{DefaultDepth} @@ -59,7 +59,30 @@ \newif\ifLettrineImage \newif\ifLettrineOnGrid \newif\ifLettrineRealHeight -\newif\ifLettrineSelfRef +\InputIfFileExists{lettrine.cfg} + {\typeout{Loading lettrine.cfg}} + {\typeout{lettrine.cfg not found, using default values}} +\DeclareOptionX{lines}[\value{DefaultLines}]{\setcounter{DefaultLines}{#1}} +\DeclareOptionX{depth}[\value{DefaultDepth}]{\setcounter{DefaultDepth}{#1}} +\DeclareOptionX{lhang}[]{\ifx#1\@empty\else + \renewcommand*{\DefaultLhang}{#1}\fi} +\DeclareOptionX{loversize}[]{\ifx#1\@empty\else + \renewcommand*{\DefaultLoversize}{#1}\fi} +\DeclareOptionX{lraise}[]{\ifx#1\@empty\else + \renewcommand*{\DefaultLraise}{#1}} +\DeclareOptionX{findent}[\the\DefaultFindent]{% + \setlength{\DefaultFindent}{#1}} +\DeclareOptionX{nindent}[\the\DefaultNindent]{% + \setlength{\DefaultNindent}{#1}} +\DeclareOptionX{slope}[\the\DefaultSlope]{\setlength{\DefaultSlope}{#1}} +\DeclareOptionX{image}[true]{\csname LettrineImage#1\endcsname} +\DeclareOptionX{grid}[true]{\csname LettrineOnGrid#1\endcsname} +\DeclareOptionX{novskip}[\the\DiscardVskip]{\setlength{\DiscardVskip}{#1}} +\DeclareOptionX{realheight}[true]{\csname LettrineRealHeight#1\endcsname} +\DeclareOptionX{optionsfile}[]{\ifx#1\@empty\else + \renewcommand*{\DefaultOptionsFile}{#1}\fi} +\ProcessOptionsX + \newsavebox{\L@lbox} \newsavebox{\L@tbox} \newcounter{L@lines} @@ -175,7 +198,6 @@ \ifLettrineImage\L@imagetrue\else\L@imagefalse\fi \ifLettrineOnGrid\L@gridtrue\else\L@gridfalse\fi \ifLettrineRealHeight\L@realhtrue\else\L@realhfalse\fi - \ifLettrineSelfRef\L@selfreftrue\else\L@selfreffalse\fi \setkeys{L}{#1}% \sbox{\L@tbox}{\LettrineTextFont{\LettrineSecondString}}% \ifL@realh @@ -293,9 +315,6 @@ \let\everypar\Llist@everypar }% } -\InputIfFileExists{lettrine.cfg} - {\typeout{Loading lettrine.cfg}} - {\typeout{lettrine.cfg not found, using default values}} \endinput %% %% End of file `lettrine.sty'. |