texlive[50847] Master/texmf-dist: lettrine (7apr19)
commits+karl at tug.org
commits+karl at tug.org
Sun Apr 7 23:26:50 CEST 2019
Revision: 50847
http://tug.org/svn/texlive?view=revision&revision=50847
Author: karl
Date: 2019-04-07 23:26:50 +0200 (Sun, 07 Apr 2019)
Log Message:
-----------
lettrine (7apr19)
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.cfg
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 2019-04-07 21:26:37 UTC (rev 50846)
+++ trunk/Master/texmf-dist/doc/latex/lettrine/demo.tex 2019-04-07 21:26:50 UTC (rev 50847)
@@ -239,8 +239,8 @@
d'utiliser le booléen \texttt{image}, exemple :
\begin{otherlanguage}{german}
+\renewcommand{\LettrineTextFont}{\relax}
\fontfamily{yfrak}\selectfont\Large
-\renewcommand{\LettrineTextFont}{\relax}
\lettrine[image=true,lhang=.2, loversize=.25, findent=0.1em]
{W}{er} reitet so spät durch Nacht und Wind?\\
Es ist der Vater mit seinem Kind;\\
@@ -256,26 +256,27 @@
de \verb+graphicx.sty+).
\begin{verbatim}
-{\selectlanguage{german}
-\fontfamily{yfrak}\selectfont\Large
-\renewcommand{\LettrineTextFont}{\relax}
-\lettrine[image=true,lhang=.2, loversize=.25, findent=0.1em]
-{W}{er} reitet so spät durch Nacht und Wind?\\
-Es ist der Vater mit seinem Kind;\\
-Er hat den Knaben wohl in dem Arm,\\
-Er faßt ihn sicher, er hält ihn warm.\par}
+\begin{otherlanguage}{german}
+ \fontfamily{yfrak}\selectfont\Large
+ \renewcommand{\LettrineTextFont}{\relax}
+ \lettrine[image=true,lhang=.2, loversize=.25, findent=0.1em]
+ {W}{er} reitet so spät durch Nacht und Wind?\\
+ Es ist der Vater mit seinem Kind;\\
+ Er hat den Knaben wohl in dem Arm,\\
+ Er faßt ihn sicher, er hält ihn warm.\par
+\end{otherlanguage}
\end{verbatim}
Cet exemple fait appel aux fichiers suivants :
\begin{itemize}
-\item \verb+graphicx.sty+ (extension standard \LaTeXe{}),
-\item \verb+blackletter1+ de Thorsten~\textsc{Bronger} (disponible sur CTAN),
+\item \texttt{graphicx.sty} (extension standard \LaTeXe{}),
+\item \texttt{blackletter1} de Thorsten~\textsc{Bronger} (disponible sur CTAN),
\item les fontes gothiques « Fraktur » de Yannis~\textsc{Haralambous} type\,1
- \verb+yfrak.pfb+ disponibles sur CTAN).
+ \texttt{yfrak.pfb} disponibles sur CTAN).
\end{itemize}
L'initiale gothique « W » utilisée dans
-cet exemple a été créée par \MP{} (fichier \verb+W.pdf+ ci-joint)
-à partir du source \MF{} \verb+yinitW.mf+ de Yannis grâce aux précieuses
+cet exemple a été créée par \MP{} (fichier \texttt{W.pdf} ci-joint)
+à partir du source \MF{} \texttt{yinitW.mf} de Yannis grâce aux précieuses
indications de Denis~\textsc{Roegel} que je remercie bien vivement.
\vspace{.5\baselineskip}
@@ -284,11 +285,16 @@
pour la lettrine et par exemple une des polices OpenType UnifrakturMaguntia
pour le texte, voir \url{http://unifraktur.sourceforge.net/maguntia.html}.
+Le codage est identique à ceci près que l’option \texttt{image=true} est
+supprimée et l’appel à la police \texttt{yfrak} remplacé par :\\
+\verb+\setmainfont{UnifrakturMaguntia19}\Large+\\
+\verb+\renewcommand{\LettrineFontHook}{\setmainfont{Yinit}}+
+
\vfill
\begin{flushright}
Daniel \textsc{Flipo}\\
\texttt{daniel.flipo at free.fr}\\
- août 2018.
+ avril 2019.
\end{flushright}
\end{document}
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 2019-04-07 21:26:37 UTC (rev 50846)
+++ trunk/Master/texmf-dist/source/latex/lettrine/lettrine.dtx 2019-04-07 21:26:50 UTC (rev 50847)
@@ -1,6 +1,5 @@
+% \CheckSum{650}
%
-% \CheckSum{611}
-%
% \iffalse meta-comment
%
% Copyright © 1999-2018 Daniel Flipo.
@@ -27,12 +26,12 @@
\ProvidesFile{lettrine.dtx}
%</dtx>
%<*!cfg>
- [2018-08-28 v2.21 (Daniel Flipo)]
+ [2019-04-06 v2.22 (Daniel Flipo)]
%</!cfg>
%
% Lettrine package for LaTeX version 2e
%
-% Copyright © 1999-2018 by Daniel Flipo
+% Copyright © 1999-2019 by Daniel Flipo
%
% Please report errors to: daniel (dot) flipo (at) free (dot) fr
%
@@ -97,12 +96,12 @@
% in the books
% \begin{itemize}
% \item ``Lexique des règles typographiques en usage à
-% l'Imprimerie nationale'' troisième édition (1994),
+% l’Imprimerie nationale’’ troisième édition (1994),
% ISBN-2-11-081075-0,
-% \item ``Mise en page et impression'' Yves~Perrousseaux,
+% \item ``Mise en page et impression’’ Yves~Perrousseaux,
% ISBN-2-911220-01-3.
% \end{itemize}
-% The parameters can be set using David Carlisle's
+% The parameters can be set using David Carlisle’s
% \texttt{keyval.sty} syntax:
% \begin{itemize}
% \item \lopt{lines=}\meta{integer} sets how many lines the
@@ -115,14 +114,14 @@
% be reserved under the baseline, this is meant for dropped
% capital with positive depth, like Q (default=0);
% \item \lopt{lhang=}\meta{decimal} ($0\le|lhang|\le1$) sets
-% how much of the dropped capital's width should hang into
+% how much of the dropped capital’s width should hang into
% the margin (default=0);
% \item \lopt{loversize=}\meta{decimal} ($-1<\lopt{loversize}\le1$)
-% enlarges the dropped capital's height: with
+% enlarges the dropped capital’s height: with
% \lopt{loversize=0.1} its height is enlarged by 10\% so
-% that it raises above the top paragraph's line (default=0);
+% that it raises above the top paragraph’s line (default=0);
% \item \lopt{lraise=}\meta{decimal} does not affect the dropped
-% capital's height, but moves it up (if positive),
+% capital’s height, but moves it up (if positive),
% down (if negative); useful with capitals like |J| or |Q|
% which have a positive depth, (default=0);
% \item \lopt{findent=}\meta{dimen} (positive or negative)
@@ -158,7 +157,7 @@
% renamed as |\LettrineImage|.
%
% \changes{v1.8}{2015/02/06}{Added two keyval options:
-% `grid' (true/false) and `novskip' to override \cs{DiscardVskip}.}
+% `grid’ (true/false) and `novskip’ to override \cs{DiscardVskip}.}
%
% \item \lopt{grid=true} (new to version 1.8) will force
% the vertical skip added above the paragraph starting with
@@ -176,9 +175,9 @@
% exceeds |\DiscardVskip|.
% Consider enlarging |novskip| (or |\DiscardVskip|) to
% prevent small vertical skips from being rounded up to
-% |\baselineskip| when using the `grid' option.
+% |\baselineskip| when using the `grid’ option.
%
-% \changes{v1.9}{2015/08/31}{New keyval option: `realheight'
+% \changes{v1.9}{2015/08/31}{New keyval option: `realheight’
% (true/false) and new global flag \cs{ifLettrineRealHeight}.}
%
% \item \lopt{realheight=true} (new to version 1.9) will
@@ -190,9 +189,9 @@
% customisable string |\LettrineSecondString| instead of
% the real argument. For backward compatibility, option
% \lopt{realheight} defaults to \lopt{false} and
-% |\LettrineSecondString| to `x'.
+% |\LettrineSecondString| to `x’.
%
-% You probably don't need this option if you choose to
+% You probably don’t need this option if you choose to
% typeset the second mandatory argument of |\lettrine| in
% small caps (the default). If you change
% |\LettrineTextFont| to |\relax| or |\upshape|, consider
@@ -199,8 +198,8 @@
% these two examples:
% \begin{description}
% \item |\lettrine{H}{ello}| you probably would like the
-% top of the `H' to be aligned with the top of the `ll'
-% rather than with the top of the `e', adding option
+% top of the `H’ to be aligned with the top of the `ll’
+% rather than with the top of the `e’, adding option
% |realheight| does the trick:
% |\lettrine[realheight]{H}{ello}|.\par
% Global variants : |\LettrineRealHeighttrue| or (without
@@ -208,8 +207,8 @@
% |\renewcommand*{\LettrineSecondString}{l}|.
% \item |\lettrine{L}{a misère}| option
% \lopt{realheight=true} would align with the top
-% of the `L' with the top of the grave accent, the
-% default is probably better (top of the `L' aligned with
+% of the `L’ with the top of the grave accent, the
+% default is probably better (top of the `L’ aligned with
% the top of the non accented letters).
% \end{description}
%
@@ -250,7 +249,7 @@
% \file{demo.tex} to see the possible usage of these parameters.
%
% \changes{v1.9}{2015/08/31}{New customisable string
-% \cs{LettrineSecondString} to tune the initial's height.}
+% \cs{LettrineSecondString} to tune the initial’s height.}
%
% The default settings can be customized either in a config file
% \file{lettrine.cfg} (for a global usage), or on a per document
@@ -301,7 +300,7 @@
% $|loversize|=0$ and $|lines|\ge 2$). When \lopt{lines=1},
% size is computed as if \lopt{lines} was~2.\\
% A hook |\LettrineFontHook| is provided to change the font
-% used for the dropped capital, syntax follows \LaTeX{}'s
+% used for the dropped capital, syntax follows \LaTeX{}’s
% low-level font interface (see \LaTeX{} Companion, p.187--192),
% the |\selectfont| command is issued by |\LettrineFont|:\\
% |\renewcommand{\LettrineFontHook}{\fontfamily{ppl}|\ignorespaces
@@ -352,20 +351,20 @@
% \vspace{\baselineskip}
% \textbf{Known issues:}
% \begin{itemize}
-% \item nothing is done to prevent page-breaking in a paragraph
+% \item Nothing is done to prevent page-breaking in a paragraph
% starting with a dropped capital; when it happens to hang
-% into the footer, page-breaking has to be done manually;
-% \item |\lettrine| works within `quote' `quotation', `abstract'
-% environments but does not work within `center' environments
-% (except with option \texttt{[lines=1]});
-% \item |\lettrine| does not work within lists;
-% \item if a \emph{list} has to be included in a paragraph starting
-% with |\lettrine|, it is necessary to add the command
+% into the footer, page-breaking has to be done manually.
+% \item |\lettrine| works within `quote’ `quotation’, `abstract’
+% environments but does not work within `center’ environments
+% except with option \texttt{[lines=1]}.
+% \item |\lettrine| does not work within lists.
+% \item If a \emph{list} has to be included in a paragraph starting
+% with |\lettrine|, it is necessary to add the command
% |\parshape=0| just after the end of the list (starting a new
% paragraph just before or just after the list works too).
-% Remember that `quote', `quotation', `abstract' environments
+% Remember that `quote’, `quotation’, `abstract’ environments
% are implemented as \emph{lists} in \LaTeX{}.
-% \item if you are facing some slight height inaccuracy for a
+% \item If you are facing some slight height inaccuracy for a
% dropped capital, you can try option \lopt{refstring};
% this option is meant for fancy (unaccented) initials.
% Informations about targeted and effective initial’s
@@ -408,7 +407,7 @@
\DeclareRelease{v1.6}{1999-03-03}{lettrine-2006-03-17.sty}
\DeclareRelease{v1.9}{2012-07-20}{lettrine-2015-08-31.sty}
\DeclareRelease{v2.0}{2018-07-21}{lettrine-2018-08-18.sty}
- \DeclareCurrentRelease{}{2018-08-18}
+ \DeclareCurrentRelease{}{2019-03-30}
\else
\PackageWarning{lettrine}{Your LaTeX kernel is too old to provide
access\MessageBreak to former versions of the lettrine package.%
@@ -440,9 +439,9 @@
% compatibility with previous releases.}
%
% \changes{v2.1}{2018/08/14}{Newif \cs{ifLettrineVone} and
-% new option `Vone' (removed in v2.2, rollback prefered).}
+% new option `Vone’ (removed in v2.2, rollback prefered).}
%
-% \changes{v2.1}{2018/08/14}{New option `refstring' and newif
+% \changes{v2.1}{2018/08/14}{New option `refstring’ and newif
% \cs{ifLettrineSelfRef}.}
%
% \begin{macrocode}
@@ -467,7 +466,7 @@
\newif\ifLettrineSelfRef
% \end{macrocode}
%
-% Then let's define the necessary internal counters, lengths,
+% Then let’s define the necessary internal counters, lengths,
% and commands.
%
% \changes{v1.6}{2004/05/22}{Added newif \cs{ifL at image}.}
@@ -561,7 +560,7 @@
% \draw[<->] (1,3.4) -- (1,3.9);
% \node[left] at (1,3.7) {ht};
% \end{tikzpicture}
-% \caption{Initial's targeted dimensions ($\mbox{\cs{lines}}=4$)}
+% \caption{Initial’s targeted dimensions ($\mbox{\cs{lines}}=4$)}
% \label{fig:target}
% \end{figure}
%
@@ -624,12 +623,12 @@
% 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
+% `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
+% \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}
@@ -650,6 +649,9 @@
% \changes{v2.1}{2018/08/14}{Computation of \cs{L at factor} for
% \cs{fontsize} done by the minifp package.}
%
+% \changes{v2.22}{2018/09/14}{Warn if \cs{fontsize} computation fails
+% due to division by 0.}
+%
% 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).
@@ -665,8 +667,14 @@
\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
+ \ifnum\@tempcnta=0
+ \PackageWarning{lettrine}{Unable to compute \protect\fontsize!%
+ \MessageBreak \protect\LettrineTestString\space empty? reported}
+ \def\L at factor{1}%
+ \else
+ \@tempcntb=\L at height
+ \MFPdiv{\the\@tempcntb}{\the\@tempcnta}\L at factor
+ \fi
}
% \end{macrocode}
% \end{macro}
@@ -752,7 +760,7 @@
% |\LettrineOptionsFor{A}{slope=0.6em, findent=-1em, nindent=0.6em}|\\
% creates an internal command (|\l at A-keys| in this example),
% which expands to the options given as second argument of
-% |\LettrineOptionsFor| for letter `A'.
+% |\LettrineOptionsFor| for letter `A’.
%
% \begin{macrocode}
\newcommand*{\LettrineOptionsFor}[2]{\@namedef{l@#1-keys}{#2}}
@@ -760,7 +768,7 @@
% \end{macro}
%
% \begin{macro}{\lettrine}
-% Now let's define |\lettrine|.
+% Now let’s define |\lettrine|.
%
% \begin{macrocode}
\def\lettrine{\@ifnextchar[\@lettrine{\@lettrine[]}}
@@ -793,14 +801,14 @@
%
% 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
+% 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
-% defaults to `x') to compute \cs{L at height}. This is controlled by
-% the `realheight' flag.}
+% defaults to `x’) to compute \cs{L at height}. This is controlled by
+% the `realheight’ flag.}
%
% \begin{macrocode}
\setkeys{L}{#1}%
@@ -858,7 +866,7 @@
\let\@tempc\relax
\expandafter\KV at do\l at LOKeys,\relax,
% \end{macrocode}
-% As some parameters' values \lopt{findent}, \lopt{nindent} and
+% 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|, the |\L at lbox| has to be
% set up to evaluate |\LettrineWidth|.
@@ -887,7 +895,7 @@
\setupL at lbox
% \end{macrocode}
%
-% \changes{v1.65}{2014/09/04}{Measure and store the initial's
+% \changes{v1.65}{2014/09/04}{Measure and store the initial’s
% final dimensions.}
% Store the initial’s final dimensions,
% \begin{macrocode}
@@ -912,7 +920,7 @@
\MessageBreak reported}%
\endgroup
% \end{macrocode}
-% and reset |\L at tbox|'s content (mandatory in case
+% and reset |\L at tbox|’s content (mandatory in case
% \lopt{realheight=false}):
%
% \changes{v1.6}{2004/05/22}{Add braces around \#3 to allow
@@ -928,12 +936,12 @@
% We use |\L at first| to compute the amount of space to be skipped.
%
% \changes{v0.9}{1998/02/23}{Calculations of length
-% \cs{L at first} changed. Do not `vskip' small lengths ($<$0.2pt),
+% \cs{L at first} changed. Do not `vskip’ small lengths ($<$0.2pt),
% they are just rounding errors.}
%
% \changes{v1.8}{2015/02/06}{The 0.2pt limit for discarded
% vskips is now customisable through \cs{DiscardVskip} and option
-% `novskip'.}
+% `novskip’.}
%
% \changes{v1.2}{2002/03/13}{\cs{baselineskip} may be a
% rubber length, we convert it to a dimen.}
@@ -958,7 +966,7 @@
% \begin{macrocode}
\ifdim\L at first>\L at novskip
% \end{macrocode}
-% When the \lopt{grid} option is \lopt{true}, let's round up
+% When the \lopt{grid} option is \lopt{true}, let’s round up
% |\L at first| to the next integer number of |\baselineskip|.
% \begin{macrocode}
\ifL at grid
@@ -977,7 +985,7 @@
% \end{macrocode}
% Again, we (mis)use the length |\L at first| to compute the width of
% the text eventually coming before the dropped capital. It is
-% reset later on to hold the first line's length.
+% reset later on to hold the first line’s length.
% \begin{macrocode}
\setlength{\L at Pindent}{\wd\L at lbox}%
\addtolength{\L at Pindent}{-\L at hang\wd\L at lbox}%
@@ -987,7 +995,7 @@
\setlength{\L at first}{\linewidth}%
\addtolength{\L at first}{-\L at Pindent}%
% \end{macrocode}
-% Now let's compute |\L at Nindent| and |\L at next| for the next lines.
+% Now let’s compute |\L at Nindent| and |\L at next| for the next lines.
% \begin{macrocode}
\addtolength{\L at Nindent}{\L at Pindent}%
\setlength{\L at next}{\linewidth}%
@@ -999,19 +1007,21 @@
% quotation, abstract environments\dots{} but do not change
% \cs{linewidth} which is set by these environments.}
%
-% \changes{v1.4}{2002/10/26}{\cs{lettrine} still didn't
+% \changes{v1.4}{2002/10/26}{\cs{lettrine} still didn’t
% work properly in quote, quotation, abstract environments,
% pointed out by Matthias C.\ Schmidt. \cs{rightmargin} was added
% too early to \cs{L at Nindent}, thus making \cs{\L at next} too short
% by \cs{rightmargin}.}
%
+% \changes{v2.22}{2019/04/04}{\cs{@totalleftmargin} is the correct
+% indentation for quote, quotation and abstract environments.}
+%
% This is for quotation, quote, abstract\dots{} environments:
% |\linewidth| is set by these environments, all we have to do
-% is to shift our text left by |\rightmargin| (amount of space
-% locally added to |\leftmargin| in these environments).
+% is to shift our text left by |\@totalleftmargin|.
% \begin{macrocode}
- \addtolength{\L at Pindent}{\rightmargin}%
- \addtolength{\L at Nindent}{\rightmargin}%
+ \addtolength{\L at Pindent}{\@totalleftmargin}%
+ \addtolength{\L at Nindent}{\@totalleftmargin}%
% \end{macrocode}
% Now, set up the shape of the new paragraph (designed by
% |\parshape|).
@@ -1029,7 +1039,7 @@
\addtolength{\L at Nindent}{\L at slope}%
\addtolength{\L at next}{-\L at slope}%
\advance\@tempcnta\@ne}%
- \edef\L at parshape{\L at parshape \rightmargin \the\linewidth}%
+ \edef\L at parshape{\L at parshape \@totalleftmargin \the\linewidth}%
\noindent
\parshape=\L at parshape\relax
% \end{macrocode}
@@ -1042,13 +1052,34 @@
\smash{\llap{\mbox{\L at ante}\raisebox{\L at lraise}{\usebox{\L at lbox}}%
\hskip \the\L at Findent}}%
\usebox{\L at tbox}%
+% \end{macrocode}
+%
+%\changes{v2.22}{2019/03/30}{\cs{parshape} reset added in lists.}
+%
+% A |\parshape| reset is required in abstract, quote and quotation
+% environments beginning with |\lettrine| and spreading over several
+% paragraphs. When the list ends, |\parshape| returns to~|0|.
+% \begin{macrocode}
+ \ifnum\@listdepth>0 \Lreset at listparshape \fi
}
% \end{macrocode}
% \end{macro}
+% This ends the definition of |\lettrine|; |\Lreset at listparshape|
+% adds the parshape reset to the first occurence of |\everypar|
+% following the |\lettrine| command.
+% \begin{macrocode}
+\newtoks\Llist at everypar
+\def\Lreset at listparshape{%
+ \let\Lnew at everypar\everypar
+ \Llist at everypar=\expandafter{\the\everypar}%
+ \Lnew at everypar={\the\Llist at everypar
+ \parshape=\@ne \@totalleftmargin \linewidth \relax
+ \let\everypar\Llist at everypar
+ }%
+}
+% \end{macrocode}
%
-% This ends the definition of |\lettrine|.
-%
-% Load a local config file if present in \LaTeX{}'s search path.
+% Load a local config file if present in \LaTeX{}’s search path.
% \begin{macrocode}
\InputIfFileExists{lettrine.cfg}
{\typeout{Loading lettrine.cfg}}
@@ -1070,7 +1101,7 @@
%% code, copy this file to your working directory and customize the
%% copy as you like.
%%
-%% Uncomment any of these lines and change the parameters' values
+%% Uncomment any of these lines and change the parameters’ values
%% to fit your needs (see lettrine.dtx).
%%
%%\setcounter{DefaultLines}{2}
Modified: trunk/Master/texmf-dist/source/latex/lettrine/lettrine.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/lettrine/lettrine.ins 2019-04-07 21:26:37 UTC (rev 50846)
+++ trunk/Master/texmf-dist/source/latex/lettrine/lettrine.ins 2019-04-07 21:26:50 UTC (rev 50847)
@@ -1,5 +1,5 @@
%%
-%% Copyright (C) 1999-2018 Daniel Flipo.
+%% Copyright (C) 1999-2019 Daniel Flipo.
%%
%% This file will generate fast loadable files and documentation
%% driver files from the doc files in this package when run through
Modified: trunk/Master/texmf-dist/tex/latex/lettrine/lettrine.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lettrine/lettrine.cfg 2019-04-07 21:26:37 UTC (rev 50846)
+++ trunk/Master/texmf-dist/tex/latex/lettrine/lettrine.cfg 2019-04-07 21:26:50 UTC (rev 50847)
@@ -4,7 +4,7 @@
%% code, copy this file to your working directory and customize the
%% copy as you like.
%%
-%% Uncomment any of these lines and change the parameters' values
+%% Uncomment any of these lines and change the parameters’ values
%% to fit your needs (see lettrine.dtx).
%%
%%\setcounter{DefaultLines}{2}
Modified: trunk/Master/texmf-dist/tex/latex/lettrine/lettrine.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lettrine/lettrine.sty 2019-04-07 21:26:37 UTC (rev 50846)
+++ trunk/Master/texmf-dist/tex/latex/lettrine/lettrine.sty 2019-04-07 21:26:50 UTC (rev 50847)
@@ -27,12 +27,12 @@
%%
\NeedsTeXFormat{LaTeX2e}[2018-04-01]
\ProvidesFile{lettrine.sty}
- [2018-08-28 v2.21 (Daniel Flipo)]
+ [2019-04-06 v2.22 (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}
\DeclareRelease{v2.0}{2018-07-21}{lettrine-2018-08-18.sty}
- \DeclareCurrentRelease{}{2018-08-18}
+ \DeclareCurrentRelease{}{2019-03-30}
\else
\PackageWarning{lettrine}{Your LaTeX kernel is too old to provide
access\MessageBreak to former versions of the lettrine package.%
@@ -117,8 +117,14 @@
\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
+ \ifnum\@tempcnta=0
+ \PackageWarning{lettrine}{Unable to compute \protect\fontsize!%
+ \MessageBreak \protect\LettrineTestString\space empty? reported}
+ \def\L at factor{1}%
+ \else
+ \@tempcntb=\L at height
+ \MFPdiv{\the\@tempcntb}{\the\@tempcnta}\L at factor
+ \fi
}
\newcommand*{\LettrineFont}{%
\LettrineFontHook
@@ -259,8 +265,8 @@
\addtolength{\L at Nindent}{\L at Pindent}%
\setlength{\L at next}{\linewidth}%
\addtolength{\L at next}{-\L at Nindent}%
- \addtolength{\L at Pindent}{\rightmargin}%
- \addtolength{\L at Nindent}{\rightmargin}%
+ \addtolength{\L at Pindent}{\@totalleftmargin}%
+ \addtolength{\L at Nindent}{\@totalleftmargin}%
\addtocounter{L at lines}{1}%
\addtocounter{L at lines}{\value{L at depth}}%
\def\L at parshape{\c at L@lines \the\L at Pindent \the\L at first}%
@@ -270,13 +276,23 @@
\addtolength{\L at Nindent}{\L at slope}%
\addtolength{\L at next}{-\L at slope}%
\advance\@tempcnta\@ne}%
- \edef\L at parshape{\L at parshape \rightmargin \the\linewidth}%
+ \edef\L at parshape{\L at parshape \@totalleftmargin \the\linewidth}%
\noindent
\parshape=\L at parshape\relax
\smash{\llap{\mbox{\L at ante}\raisebox{\L at lraise}{\usebox{\L at lbox}}%
\hskip \the\L at Findent}}%
\usebox{\L at tbox}%
+ \ifnum\@listdepth>0 \Lreset at listparshape \fi
}
+\newtoks\Llist at everypar
+\def\Lreset at listparshape{%
+ \let\Lnew at everypar\everypar
+ \Llist at everypar=\expandafter{\the\everypar}%
+ \Lnew at everypar={\the\Llist at everypar
+ \parshape=\@ne \@totalleftmargin \linewidth \relax
+ \let\everypar\Llist at everypar
+ }%
+}
\InputIfFileExists{lettrine.cfg}
{\typeout{Loading lettrine.cfg}}
{\typeout{lettrine.cfg not found, using default values}}
More information about the tex-live-commits
mailing list