texlive[48513] Master/texmf-dist: lettrine (30aug18)
commits+karl at tug.org
commits+karl at tug.org
Thu Aug 30 21:35:26 CEST 2018
Revision: 48513
http://tug.org/svn/texlive?view=revision&revision=48513
Author: karl
Date: 2018-08-30 21:35:26 +0200 (Thu, 30 Aug 2018)
Log Message:
-----------
lettrine (30aug18)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/lettrine/demo-de.pdf
trunk/Master/texmf-dist/doc/latex/lettrine/demo.pdf
trunk/Master/texmf-dist/doc/latex/lettrine/demo.tex
trunk/Master/texmf-dist/doc/latex/lettrine/lettrine.pdf
trunk/Master/texmf-dist/source/latex/lettrine/lettrine.dtx
trunk/Master/texmf-dist/source/latex/lettrine/lettrine.ins
trunk/Master/texmf-dist/tex/latex/lettrine/lettrine-2006-03-17.sty
trunk/Master/texmf-dist/tex/latex/lettrine/lettrine-2015-08-31.sty
trunk/Master/texmf-dist/tex/latex/lettrine/lettrine-2018-08-18.sty
trunk/Master/texmf-dist/tex/latex/lettrine/lettrine.sty
Modified: trunk/Master/texmf-dist/doc/latex/lettrine/demo-de.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/lettrine/demo.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/lettrine/demo.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/lettrine/demo.tex 2018-08-30 19:35:06 UTC (rev 48512)
+++ trunk/Master/texmf-dist/doc/latex/lettrine/demo.tex 2018-08-30 19:35:26 UTC (rev 48513)
@@ -15,7 +15,7 @@
\frenchbsetup{AutoSpacePunctuation=false,og=«,fg=»}
\usepackage{graphicx,color}
-\usepackage{hyperref}
+\usepackage{hyperref,bookmark}
\newcommand{\MF}{{\small\sffamily\scshape metafont}}
\newcommand{\MP}{{\small\sffamily\scshape metapost}}
Modified: trunk/Master/texmf-dist/doc/latex/lettrine/lettrine.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/lettrine/lettrine.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/lettrine/lettrine.dtx 2018-08-30 19:35:06 UTC (rev 48512)
+++ trunk/Master/texmf-dist/source/latex/lettrine/lettrine.dtx 2018-08-30 19:35:26 UTC (rev 48513)
@@ -1,5 +1,5 @@
%
-% \CheckSum{609}
+% \CheckSum{611}
%
% \iffalse meta-comment
%
@@ -27,7 +27,7 @@
\ProvidesFile{lettrine.dtx}
%</dtx>
%<*!cfg>
- [2018-08-25 v2.2 (Daniel Flipo)]
+ [2018-08-28 v2.21 (Daniel Flipo)]
%</!cfg>
%
% Lettrine package for LaTeX version 2e
@@ -150,10 +150,12 @@
% in pdf, jpg, etc.\ format (pdflatex); this needs the
% |graphicx| package to be loaded in the preamble of course.
% |\lettrine[image=true]{A}{n exemple}| or just
-% |\lettrine[image]{A}{n exemple}| will load |A.eps|
-% or |A.pdf| instead of letter~A. This was suggested
-% by Bill Jetzer. Redefining \verb+\LettrineFont+ as
-% \verb+\LettrineFontEPS+ is no longer supported.
+% |\lettrine[image]{A}{n exemple}| will load |A.eps|,
+% |A.jpg|, |A.png| or |A.pdf| instead of letter~A.
+% This was suggested by Bill Jetzer.\\
+% N.B.: Redefining |\LettrineFont| as |\LettrineFontEPS|
+% is no longer supported and |\LettrineFontEPS| has been
+% renamed as |\LettrineImage|.
%
% \changes{v1.8}{2015/02/06}{Added two keyval options:
% `grid' (true/false) and `novskip' to override \cs{DiscardVskip}.}
@@ -506,17 +508,27 @@
% Provide commands for the fonts used to typeset the two
% mandatory arguments of |\lettrine|.
%
+% \changes{v2.21}{2018/08/28}{Code clean up, new commands
+% \cs{computeL at height}, \cs{compute at fontsize}, \cs{setupL at lbox}.}
+%
% \begin{macro}{\LettrineTextFont}
% In French, small caps usually follow the dropped capital.
% \begin{macrocode}
\newcommand*{\LettrineTextFont}{\scshape}
+\newcommand*{\LettrineSecondString}{x}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\LettrineTestString}
-% \begin{macro}{\LettrineSecondString}
% \begin{macro}{\LettrineFontHook}
-% \begin{macro}{\LettrineFont}
+% |\LettrineFontHook| enables to select another font for the
+% dropped capital. Its default definition is empty (the current
+% text font is used).
+% \begin{macrocode}
+\newcommand*{\LettrineFontHook}{}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\computeL at height}
% The default size for the dropped capital is computed so that the
% top of it is exactly aligned with the top of the following text;
% an extra height (positive or negative) may be added globally by
@@ -553,12 +565,12 @@
% \label{fig:target}
% \end{figure}
%
-% |\Lettrine at height| computes the targeted height for the dropped
-% capital and stores it into |\L at target@tht| which depends only on
-% on |L at lines| and on the height of |\L at tbox| (see
+% |\computeL at height| first computes the targeted height for the
+% dropped capital and stores it into |\L at target@tht|. This height
+% only depends on |L at lines| and on the height of |\L at tbox| (see
% fig.~\ref{fig:target}). So options \emph{must} be read and
% |\L at tbox| must be properly initialised \emph{before} executing
-% |\Lettrine at height| (see below in |\@lettrine| code).
+% |\computeL at height| (see below in |\@lettrine| code).
%
% |\L at height| is set to |\L at target@tht| raised by the |\L at oversize|
% factor.
@@ -566,106 +578,103 @@
% \changes{v1.2}{2002/03/13}{\cs{baselineskip} may be a
% rubber length, we convert it to a dimen.}
%
-% \changes{v1.63}{2012/07/20}{Added command
-% \cs{LettrineTestString} which defaults to
-% `ABCDEFGHIJKLMNOQPRSTUVWXYZ'. In previous versions height
-% computations were based on letter `X' which might not exist
-% in some (rare) fonts. Pointed out by Raphaël Pinson.}
-%
% \changes{v1.9}{2015/08/31}{\cs{theL at lines} changed
% to \cs{value\{L at lines\}}. Needed for babel-hebrew which
% redefines \cs{@arabic}.}
%
-% \changes{v2.0}{2018/07/21}{\cs{LettrineTestString} changed
-% from `ABCDEFGHIJKLMNOQPRSTUVWXYZ' to `EFTZ' as
-% some capitals like C, G, O, Q or X might be slightly taller
-% (possible optical correction).}
-%
% \changes{v2.0}{2018/07/21}{Store targeted dimensions of the
% dropped capital (ht, dp, tht) for further use.}
%
-%\changes{v2.1}{2018/08/01}{\cs{Lettrine at height} moved out of
-% \cs{LettrineFont}: \cs{global} settings no longer required.
-% \cs{fontsize} computations moved into \cs{Lettrine at height}.}
+% \changes{v2.1}{2018/08/01}{Height computations moved out of
+% \cs{LettrineFont}: \cs{global} settings no longer required.}
%
% \begin{macrocode}
-\newcommand*{\LettrineTestString}{EFTZ}
-\newcommand*{\LettrineSecondString}{x}
-\def\Lettrine at height{%
- \setlength{\L at target@ht}{\ht\L at tbox}%
+\def\computeL at height{%
+ \setlength{\L at target@ht}{\ht\L at tbox}%
% \end{macrocode}
% As |\baselineskip| might be a rubber length, let’s convert it
% into a `dimen’ using |\@tempdima|.
% \begin{macrocode}
- \@tempdima=\baselineskip
- \setlength{\L at target@dp}{\value{L at lines}\@tempdima}%
- \ifnum\value{L at lines}>1
- \addtolength{\L at target@dp}{-\@tempdima}%
- \else
- \addtolength{\L at target@ht}{\L at target@dp}%
- \setlength{\L at target@dp}{0pt}%
- \fi
- \setlength{\L at target@tht}{\L at target@ht}%
- \addtolength{\L at target@tht}{\L at target@dp}%
- \setlength{\L at height}{\L at target@tht}%
- \addtolength{\L at height}{\L at oversize\L at target@tht}%
- \ifL at image
- \else
+ \@tempdima=\baselineskip
+ \setlength{\L at target@dp}{\value{L at lines}\@tempdima}%
+ \ifnum\value{L at lines}>1
+ \addtolength{\L at target@dp}{-\@tempdima}%
+ \else
+ \addtolength{\L at target@ht}{\L at target@dp}%
+ \setlength{\L at target@dp}{0pt}%
+ \fi
+ \setlength{\L at target@tht}{\L at target@ht}%
+ \addtolength{\L at target@tht}{\L at target@dp}%
+ \setlength{\L at height}{\L at target@tht}%
+ \addtolength{\L at height}{\L at oversize\L at target@tht}%
+}
% \end{macrocode}
-% |\L at height| now holds the exact height required for the
-% dropped capital, let’s compute the matching |\fontsize|’s value
-% (unless the initial is a picture);
-% we first measure the height of a ``standard’’ capital
-% (i.e.\ either listed in |\LettrineTestString| or the initial
-% itself) scaled by |\fontsize| with argument |\L at height|.
-% Mind that some font designers apply optical correction to
-% capitals C, G, O, or Q (they are slightly taller than `T’ or
-% `Z’), that’s why they are not part of |\LettrineTestString|.
-% When optional argument \lopt{selfref} is \lopt{true} the initial
-% itself is taken as reference to compute |\fontsize|, this can be
-% handy when working with fancy fonts (i.e.\ cfr-initials, Yinit).
+% \end{macro}
+%
+% \begin{macro}{\LettrineTestString}
+% After executing |\computeL at height|, |\L at height| holds the exact
+% height required for the dropped capital, nothing more is needed if
+% the initial is a picture, otherwise we need to compute the matching
+% |\fontsize|’s value. This is done by measuring the height of
+% a ``reference’’ capital (i.e.\ either listed in
+% |\LettrineTestString| or the initial itself).
+% As some font designers apply optical correction to capitals C, G,
+% O, or Q (they are slightly taller than `T’ or `Z’), they are better
+% left out of |\LettrineTestString|. |EFTZ| should be a good default
+% for most fonts.
+%
+% \changes{v1.63}{2012/07/20}{(new) it defaults to
+% `ABCDEFGHIJKLMNOQPRSTUVWXYZ'. In previous versions height
+% computations were based on letter `X' which might not exist
+% in some (rare) fonts. Pointed out by Raphaël Pinson.}
+%
+% \changes{v2.0}{2018/07/21}{changed from `ABCDEFGHIJKLMNOQPRSTUVWXYZ'
+% to `EFTZ' as some capitals like C, G, O, Q or X might be slightly
+% taller (possible optical correction).}
+%
% \begin{macrocode}
- \ifL at selfref
- \def\Lettrine at RefString{\l at refstring}%
- \else
- \def\Lettrine at RefString{\LettrineTestString}%
- \fi
- \sbox{\@tempboxa}{\LettrineFontHook
- \fontsize{\L at height}{\L at height}\selectfont
- \Lettrine at RefString}%
- \@tempcnta=\ht\@tempboxa
- \@tempcntb=\L at height
+\newcommand*{\LettrineTestString}{EFTZ}
% \end{macrocode}
-% |\@tempcntb| holds the target height converted into sp (integer)
-% and |\@tempcnta| holds the height in sp of the ``standard’’
-% initial scaled by |\fontsize| with |\L at height| as argument;
-% let’s divide |\@tempcntb| by |\@tempcnta| to compute a (4 decimal
-% accurate) scaling factor |\L at factor|.
-% |\fontsize|’s argument providing the requested |\L at height| is
-% |\L at factor\L at height|.
+% \end{macro}
%
-% \changes{v2.0}{2018/07/21}{Change factors 100/100 to 50/200
-% to reach larger sizes (initial's height up to 20cm).}
+% \begin{macro}{\compute at fontsize}
+% This command compares the height of a ``reference’’ capital scaled
+% by |\fontsize| with argument |\L at height| to |\L at height| (the
+% required height for the initial); both are converted into integers
+% (in sp) to compute a ratio |\L at factor|.
+% Up to v2.01, possible values for |\L at factor| were either 1 or any
+% value $\geq 1.1$ which was fine for almost every font but not
+% all (i.e.\ \file{cfr-initials}). Starting with v2.1, |\L at factor|
+% is computed more accurately by |\MFPdiv| from \file{minifp.sty}.
%
% \changes{v2.1}{2018/08/14}{Computation of \cs{L at factor} for
% \cs{fontsize} done by the minifp package.}
%
-% Up to v2.01, possible values for |\L at factor| were either 1 or any
-% value $\geq 1.1$ which was fine for almost every font but not
-% all (i.e.\ \file{cfr-initials}). Starting with v2.1, |\L at factor|
-% is computed more accurately by \file{minifp.sty}.
+% When optional argument \lopt{selfref} is \lopt{true} the initial
+% itself is taken as reference to compute |\fontsize|, this can be
+% handy when working with fancy fonts (i.e.\ cfr-initials, Yinit).
+% In most cases, the default is a better choice.
% \begin{macrocode}
- \MFPdiv{\the\@tempcntb}{\the\@tempcnta}\L at factor
- \fi
+\def\compute at fontsize{%
+ \ifL at selfref
+ \def\Lettrine at RefString{\l at refstring}%
+ \else
+ \def\Lettrine at RefString{\LettrineTestString}%
+ \fi
+ \sbox{\@tempboxa}{\LettrineFontHook
+ \fontsize{\L at height}{\L at height}\selectfont
+ \Lettrine at RefString}%
+ \@tempcnta=\ht\@tempboxa
+ \@tempcntb=\L at height
+ \MFPdiv{\the\@tempcntb}{\the\@tempcnta}\L at factor
}
% \end{macrocode}
+% \end{macro}
%
-% |\LettrineFontHook| enables to select another font for the
-% dropped capital. Its default definition is empty (the current
-% text font is used).
-%
+% \begin{macro}{\LettrineFont}
+% |\fontsize|’s argument providing the requested |\L at height| is
+% |\L at factor\L at height|.
% \begin{macrocode}
-\newcommand*{\LettrineFontHook}{}
\newcommand*{\LettrineFont}{%
\LettrineFontHook
\fontsize{\L at factor\L at height}{\L at factor\L at height}%
@@ -673,30 +682,46 @@
}
% \end{macrocode}
% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
%
% \changes{v0.9}{1998/03/13}{\cs{LettrineFontEPS} added.}
%
-% \begin{macro}{\LettrineFontEPS}
+% \changes{v2.21}{2018/08/28}{\cs{LettrineFontEPS} renamed as
+% \cs{LettrineImage}.}
+%
+% \begin{macro}{\LettrineImage}
% The following definition is for use with dropped capitals defined
% as images: EPS, PDF, JPG, PNG files (see examples in demo.tex).
% Its use requires the |graphicx| package to be loaded in the
% preamble with |\usepackage{graphicx}|. The required size is
% computed just as in the standard case, |\includegraphics|
-% prints the EPS file at this size.
+% prints the image at this size.
%
% \changes{v1.6}{2004/05/22}{Added \cs{LettrineFontHook}
% to \cs{LettrineFontEPS}. This is needed for color options.}
%
% \begin{macrocode}
-\newcommand*{\LettrineFontEPS}{%
+\newcommand*{\LettrineImage}{%
\LettrineFontHook\includegraphics[height=\L at height]%
}
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\setupL at lbox}
+% The next (internal) command computes the requested size for the
+% initial (letter or image) and prepares a box |\L at lbox| holding it.
+% \begin{macrocode}
+\def\setupL at lbox{%
+ \computeL at height
+ \ifL at image
+ \sbox{\L at lbox}{\LettrineImage{\l at initial}}%
+ \else
+ \compute at fontsize
+ \sbox{\L at lbox}{\LettrineFont \l at initial}%
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+%
% Set up keyval initializations.
%
% \begin{macrocode}
@@ -766,12 +791,11 @@
\ifLettrineSelfRef\L at selfreftrue\else\L at selfreffalse\fi
% \end{macrocode}
%
-% |\LettrineFont| and |\LettrineFontEPS| both rely on |\L at height|
-% which depends on |\L at tbox|, thus requiring prior execution of
-% |\Lettrine at height|. The content of |\L at tbox| depends on option
-% |realheight|, so we have to read |\lettrine|'s optional argument
-% and initialise the |\L at tbox| content now%
-% \footnote{Now means before eventually reading the config file.}.
+% The final initial size depends on the height of |\L at tbox|; the
+% content of |\L at tbox| depends on option |realheight|, so we have
+% to read |\lettrine|'s optional argument and initialise the
+% |\L at tbox| content now\footnote{Now means before eventually
+% reading the config file.}.
%
% \changes{v1.9}{2015/08/31}{Use the second mandatory
% argument of \cs{lettrine} or \cs{LettrineSecondString} (which
@@ -782,7 +806,7 @@
\setkeys{L}{#1}%
\sbox{\L at tbox}{\LettrineTextFont{\LettrineSecondString}}%
\ifL at realh
- \def\@tempa{#3}
+ \def\@tempa{#3}%
\ifx\@tempa\@empty
\PackageWarning{lettrine.sty}%
{Empty second argument,\MessageBreak
@@ -836,12 +860,15 @@
% \end{macrocode}
% As some parameters' values \lopt{findent}, \lopt{nindent} and
% \lopt{slope} ---which do not influence the initial’s size--- may
-% be given relative to |\LettrineWidth|, this has to be done again
-% after measuring the lettrine for |\LettrineWidth| to be set
-% properly.
+% be given relative to |\LettrineWidth|, the |\L at lbox| has to be
+% set up to evaluate |\LettrineWidth|.
+%
+% \changes{v2.21}{2018/08/28}{\lopt{findent} computation
+% relative to \cs{LettrineWidth} in \lopt{.cfl} files fixed;
+% thanks to Frank Mittelbach for raising the issue.}
+%
% \begin{macrocode}
- \Lettrine at height
- \sbox{\L at lbox}{\LettrineFont #2}%
+ \setupL at lbox
\setlength{\LettrineWidth}{\wd\L at lbox}%
\def\KV at prefix{KV at L@}%
\let\@tempc\relax
@@ -854,16 +881,10 @@
\fi
% \end{macrocode}
% Options and optional config file have be taken into account, we
-% can now save the first mandatory argument of |\lettrine| properly
-% scaled into |\L at lbox|. Depending on the boolean |image|,
-% |\LettrineFont| or |\LettrineFontEPS| is used.
+% can now finally save the first mandatory argument of |\lettrine|
+% properly scaled into |\L at lbox|.
% \begin{macrocode}
- \Lettrine at height
- \ifL at image
- \sbox{\L at lbox}{\LettrineFontEPS{#2}}%
- \else
- \sbox{\L at lbox}{\LettrineFont #2}%
- \fi
+ \setupL at lbox
% \end{macrocode}
%
% \changes{v1.65}{2014/09/04}{Measure and store the initial's
@@ -1024,6 +1045,7 @@
}
% \end{macrocode}
% \end{macro}
+%
% This ends the definition of |\lettrine|.
%
% Load a local config file if present in \LaTeX{}'s search path.
@@ -1111,6 +1133,6 @@
\endinput
%%% Local Variables:
-%%% fill-column: 70
+%%% fill-column: 72
%%% coding: utf-8
%%% End:
Modified: trunk/Master/texmf-dist/source/latex/lettrine/lettrine.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/lettrine/lettrine.ins 2018-08-30 19:35:06 UTC (rev 48512)
+++ trunk/Master/texmf-dist/source/latex/lettrine/lettrine.ins 2018-08-30 19:35:26 UTC (rev 48513)
@@ -41,7 +41,7 @@
This file is a generated file part of the lettrine package.
-----------------------------------------------------------
-For the copyright see the source file lettine.dtx.
+For the copyright see the source file `lettine.dtx'.
This file can be distributed and/or modified under the terms
of the LaTeX Project Public License either version 1.3c of this
Modified: trunk/Master/texmf-dist/tex/latex/lettrine/lettrine-2006-03-17.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lettrine/lettrine-2006-03-17.sty 2018-08-30 19:35:06 UTC (rev 48512)
+++ trunk/Master/texmf-dist/tex/latex/lettrine/lettrine-2006-03-17.sty 2018-08-30 19:35:26 UTC (rev 48513)
@@ -5,16 +5,20 @@
%%
%% For the copyright see the source file `lettrine.dtx'.
%%
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from lettrine.sty.
+%% This file can be distributed and/or modified under the terms
+%% of the LaTeX Project Public License either version 1.3c of this
+%% license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
-%% For distribution of the original source see the terms
-%% for copying and modification in the file lettrine.dtx.
+%% This work has the LPPL maintenance status "maintained".
%%
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
+%% The Current Maintainer of this work is Daniel Flipo.
+%%
+%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
+%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{lettrine.sty}
[2006/03/17 v1.6 (Daniel Flipo)]
Modified: trunk/Master/texmf-dist/tex/latex/lettrine/lettrine-2015-08-31.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lettrine/lettrine-2015-08-31.sty 2018-08-30 19:35:06 UTC (rev 48512)
+++ trunk/Master/texmf-dist/tex/latex/lettrine/lettrine-2015-08-31.sty 2018-08-30 19:35:26 UTC (rev 48513)
@@ -5,16 +5,20 @@
%%
%% For the copyright see the source file `lettrine.dtx'.
%%
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from lettrine.sty.
+%% This file can be distributed and/or modified under the terms
+%% of the LaTeX Project Public License either version 1.3c of this
+%% license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
-%% For distribution of the original source see the terms
-%% for copying and modification in the file lettrine.dtx.
+%% This work has the LPPL maintenance status "maintained".
%%
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
+%% The Current Maintainer of this work is Daniel Flipo.
+%%
+%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
+%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{lettrine.sty}
[2015/08/31 v1.9 (Daniel Flipo)]
Modified: trunk/Master/texmf-dist/tex/latex/lettrine/lettrine-2018-08-18.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lettrine/lettrine-2018-08-18.sty 2018-08-30 19:35:06 UTC (rev 48512)
+++ trunk/Master/texmf-dist/tex/latex/lettrine/lettrine-2018-08-18.sty 2018-08-30 19:35:26 UTC (rev 48513)
@@ -5,16 +5,20 @@
%%
%% For the copyright see the source file `lettrine.dtx'.
%%
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from lettrine.sty.
+%% This file can be distributed and/or modified under the terms
+%% of the LaTeX Project Public License either version 1.3c of this
+%% license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
-%% For distribution of the original source see the terms
-%% for copying and modification in the file lettrine.dtx.
+%% This work has the LPPL maintenance status "maintained".
%%
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
+%% The Current Maintainer of this work is Daniel Flipo.
+%%
+%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
+%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{lettrine.sty}
[2018/08/18 v2.1 (Daniel Flipo)]
Modified: trunk/Master/texmf-dist/tex/latex/lettrine/lettrine.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lettrine/lettrine.sty 2018-08-30 19:35:06 UTC (rev 48512)
+++ trunk/Master/texmf-dist/tex/latex/lettrine/lettrine.sty 2018-08-30 19:35:26 UTC (rev 48513)
@@ -9,7 +9,7 @@
%% This file is a generated file part of the lettrine package.
%% -----------------------------------------------------------
%%
-%% For the copyright see the source file lettine.dtx.
+%% For the copyright see the source file `lettine.dtx'.
%%
%% This file can be distributed and/or modified under the terms
%% of the LaTeX Project Public License either version 1.3c of this
@@ -27,7 +27,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2018-04-01]
\ProvidesFile{lettrine.sty}
- [2018-08-25 v2.2 (Daniel Flipo)]
+ [2018-08-28 v2.21 (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}
@@ -89,46 +89,54 @@
\newif\ifL at realh
\newif\ifL at selfref
\newcommand*{\LettrineTextFont}{\scshape}
-\newcommand*{\LettrineTestString}{EFTZ}
\newcommand*{\LettrineSecondString}{x}
-\def\Lettrine at height{%
- \setlength{\L at target@ht}{\ht\L at tbox}%
- \@tempdima=\baselineskip
- \setlength{\L at target@dp}{\value{L at lines}\@tempdima}%
- \ifnum\value{L at lines}>1
- \addtolength{\L at target@dp}{-\@tempdima}%
- \else
- \addtolength{\L at target@ht}{\L at target@dp}%
- \setlength{\L at target@dp}{0pt}%
- \fi
- \setlength{\L at target@tht}{\L at target@ht}%
- \addtolength{\L at target@tht}{\L at target@dp}%
- \setlength{\L at height}{\L at target@tht}%
- \addtolength{\L at height}{\L at oversize\L at target@tht}%
- \ifL at image
- \else
- \ifL at selfref
- \def\Lettrine at RefString{\l at refstring}%
- \else
- \def\Lettrine at RefString{\LettrineTestString}%
- \fi
- \sbox{\@tempboxa}{\LettrineFontHook
- \fontsize{\L at height}{\L at height}\selectfont
- \Lettrine at RefString}%
- \@tempcnta=\ht\@tempboxa
- \@tempcntb=\L at height
- \MFPdiv{\the\@tempcntb}{\the\@tempcnta}\L at factor
- \fi
+\newcommand*{\LettrineFontHook}{}
+\def\computeL at height{%
+ \setlength{\L at target@ht}{\ht\L at tbox}%
+ \@tempdima=\baselineskip
+ \setlength{\L at target@dp}{\value{L at lines}\@tempdima}%
+ \ifnum\value{L at lines}>1
+ \addtolength{\L at target@dp}{-\@tempdima}%
+ \else
+ \addtolength{\L at target@ht}{\L at target@dp}%
+ \setlength{\L at target@dp}{0pt}%
+ \fi
+ \setlength{\L at target@tht}{\L at target@ht}%
+ \addtolength{\L at target@tht}{\L at target@dp}%
+ \setlength{\L at height}{\L at target@tht}%
+ \addtolength{\L at height}{\L at oversize\L at target@tht}%
}
-\newcommand*{\LettrineFontHook}{}
+\newcommand*{\LettrineTestString}{EFTZ}
+\def\compute at fontsize{%
+ \ifL at selfref
+ \def\Lettrine at RefString{\l at refstring}%
+ \else
+ \def\Lettrine at RefString{\LettrineTestString}%
+ \fi
+ \sbox{\@tempboxa}{\LettrineFontHook
+ \fontsize{\L at height}{\L at height}\selectfont
+ \Lettrine at RefString}%
+ \@tempcnta=\ht\@tempboxa
+ \@tempcntb=\L at height
+ \MFPdiv{\the\@tempcntb}{\the\@tempcnta}\L at factor
+}
\newcommand*{\LettrineFont}{%
\LettrineFontHook
\fontsize{\L at factor\L at height}{\L at factor\L at height}%
\selectfont
}
-\newcommand*{\LettrineFontEPS}{%
+\newcommand*{\LettrineImage}{%
\LettrineFontHook\includegraphics[height=\L at height]%
}
+\def\setupL at lbox{%
+ \computeL at height
+ \ifL at image
+ \sbox{\L at lbox}{\LettrineImage{\l at initial}}%
+ \else
+ \compute at fontsize
+ \sbox{\L at lbox}{\LettrineFont \l at initial}%
+ \fi
+}
\define at key{L}{lines}{\setcounter{L at lines}{#1}}
\define at key{L}{depth}{\setcounter{L at depth}{#1}}
\define at key{L}{lhang}{\renewcommand*{\L at hang}{#1}}
@@ -165,7 +173,7 @@
\setkeys{L}{#1}%
\sbox{\L at tbox}{\LettrineTextFont{\LettrineSecondString}}%
\ifL at realh
- \def\@tempa{#3}
+ \def\@tempa{#3}%
\ifx\@tempa\@empty
\PackageWarning{lettrine.sty}%
{Empty second argument,\MessageBreak
@@ -195,8 +203,7 @@
\def\KV at prefix{KV at L@}%
\let\@tempc\relax
\expandafter\KV at do\l at LOKeys,\relax,
- \Lettrine at height
- \sbox{\L at lbox}{\LettrineFont #2}%
+ \setupL at lbox
\setlength{\LettrineWidth}{\wd\L at lbox}%
\def\KV at prefix{KV at L@}%
\let\@tempc\relax
@@ -203,12 +210,7 @@
\expandafter\KV at do\l at LOKeys,\relax,
\setkeys{L}{#1}%
\fi
- \Lettrine at height
- \ifL at image
- \sbox{\L at lbox}{\LettrineFontEPS{#2}}%
- \else
- \sbox{\L at lbox}{\LettrineFont #2}%
- \fi
+ \setupL at lbox
\setlength{\LettrineWidth}{\wd\L at lbox}%
\setlength{\LettrineHeight}{\ht\L at lbox}%
\setlength{\LettrineDepth}{\dp\L at lbox}%
More information about the tex-live-commits
mailing list