texlive[71627] Master/texmf-dist: lettrine (26jun24)
commits+karl at tug.org
commits+karl at tug.org
Wed Jun 26 22:36:33 CEST 2024
Revision: 71627
https://tug.org/svn/texlive?view=revision&revision=71627
Author: karl
Date: 2024-06-26 22:36:33 +0200 (Wed, 26 Jun 2024)
Log Message:
-----------
lettrine (26jun24)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/lettrine/lettrine-demo-arabic.pdf
trunk/Master/texmf-dist/doc/latex/lettrine/lettrine-demo-de.pdf
trunk/Master/texmf-dist/doc/latex/lettrine/lettrine-demo-fr.pdf
trunk/Master/texmf-dist/doc/latex/lettrine/lettrine-demo-fr.tex
trunk/Master/texmf-dist/doc/latex/lettrine/lettrine-demo-lua.pdf
trunk/Master/texmf-dist/doc/latex/lettrine/lettrine.pdf
trunk/Master/texmf-dist/source/latex/lettrine/lettrine.dtx
trunk/Master/texmf-dist/tex/latex/lettrine/lettrine.sty
Modified: trunk/Master/texmf-dist/doc/latex/lettrine/lettrine-demo-arabic.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/lettrine/lettrine-demo-de.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/lettrine/lettrine-demo-fr.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/lettrine/lettrine-demo-fr.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/lettrine/lettrine-demo-fr.tex 2024-06-26 08:00:08 UTC (rev 71626)
+++ trunk/Master/texmf-dist/doc/latex/lettrine/lettrine-demo-fr.tex 2024-06-26 20:36:33 UTC (rev 71627)
@@ -166,14 +166,16 @@
\vspace{.5\baselineskip}
\textit{Changement de police (ici Typocaps)
- et de couleur pour la lettrine :}\\
+ et de couleur pour la lettrine et sa suite :}\\
\verb+\renewcommand{\LettrineFontHook}{\Typocapsfamily\color{red}}+\\
-\verb+\lettrine[findent=.3em]{E}{n} plein marais...+
+\verb+\renewcommand{\LettrineTextFont}{\color{red}\scshape}+\\
+\verb+\lettrine[findent=.3em]{E}{n plein marais de la Souteyranne}+
{% Groupe (changement local de fonte)
\renewcommand{\LettrineFontHook}{\Typocapsfamily\color{red}}
+\renewcommand{\LettrineTextFont}{\color{red}\scshape}
-\lettrine[findent=.3em]{E}{n} plein marais de la Souteyranne, à quelques
+\lettrine[findent=.3em]{E}{n plein marais de la Souteyranne}, à quelques
kilomètres au nord d'Aigues-Mortes, se trouve la Tour Carbonnière.
Construite au XIII\ieme~siècle, elle contrôlait l'unique voie d'accès
terrestre de la ville fortifiée.
Modified: trunk/Master/texmf-dist/doc/latex/lettrine/lettrine-demo-lua.pdf
===================================================================
(Binary files differ)
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 2024-06-26 08:00:08 UTC (rev 71626)
+++ trunk/Master/texmf-dist/source/latex/lettrine/lettrine.dtx 2024-06-26 20:36:33 UTC (rev 71627)
@@ -107,7 +107,7 @@
\ProvidesFile{lettrine.dtx}
%</dtx>
%<*sty|dtx>
- [2024-01-20 v2.60 (Daniel Flipo)]
+ [2024-06-26 v2.61 (Daniel Flipo)]
%</sty|dtx>
% \fi
%
@@ -314,9 +314,6 @@
% \item |\LettrineImagefalse|,
% \item |\LettrineOnGridfalse|,
% \item |\LettrineRealHeightfalse|,
-% \item |\renewcommand*{\LettrineTextFont}{\scshape}|,
-% \item |\renewcommand*{\LettrineTestString}{EFTZ}|,
-% \item |\renewcommand*{\LettrineSecondString}{x}|,
% \item |\renewcommand{\DefaultOptionsFile}{optfile.cfl}|.
% \end{itemize}
%
@@ -336,6 +333,14 @@
% file will be overridden by the optional arguments eventually given
% to the |\lettrine| command.
%
+% More customisation possibilities are offered by the next four
+% commands:
+% \begin{itemize}
+% \item |\renewcommand*{\LettrineFontHook}{}|,
+% \item |\renewcommand*{\LettrineTextFont}{\scshape}|,
+% \item |\renewcommand*{\LettrineTestString}{EFTZ}|,
+% \item |\renewcommand*{\LettrineSecondString}{x}|,
+% \end{itemize}
% |\LettrineTextFont| sets the font used for the second argument
% of |\lettrine|, its default definition is
% |\newcommand{\LettrineTextFont}{\scshape}| (second argument in
@@ -376,6 +381,8 @@
% all initials in a (part of) document:
% |\renewcommand{\LettrineFontHook}{\color[gray]{0.5}}| \\
% will colour the initials following this command in grey.
+% A |\color| command can be added in |\LettrineTextHook| if the text
+% following the dropped cap requires the same or another colour.
%
% \changes{v1.3}{2002/08/23}{Correct the documentation to
% mention the cm-super fonts and the type1ec package by
@@ -452,6 +459,10 @@
% environments but does not work within `center’ environments
% except with option \texttt{[lines=1]}.
% \item |\lettrine| does not work within lists.
+% \item If |\lettrine| is used inside any environment, it is
+% \emph{mandatory} to end the paragraph starting with the dropped
+% capital \emph{inside} the environment; adding a |\par| command
+% before the end of environment usually fixes placement issues.
% \item The LaTeX |\raggedright| command doesn’t work well with the
% TeX |\parshape| command used internally by |\lettrine|.
% Please use the |\RaggedRight| command from the \pkg{ragged2e}
@@ -668,10 +679,10 @@
{
lines.code = \setcounter{L at lines}{#1} ,
depth.code = \setcounter{L at depth}{#1} ,
- lhang.code = \renewcommand*{\L at hang}{#1} ,
- loversize.code = \renewcommand*{\L at oversize}{#1} ,
- lraise.code = \renewcommand*{\L at raise}{#1} ,
- ante.code = \renewcommand*{\L at ante}{#1} ,
+ lhang.store = \L at hang ,
+ loversize.store = \L at oversize ,
+ lraise.store = \L at raise ,
+ ante.store = \L at ante ,
findent.code = \setlength{\L at Findent}{#1} ,
nindent.code = \setlength{\L at Nindent}{#1} ,
slope.code = \setlength{\L at slope}{#1} ,
@@ -1166,10 +1177,13 @@
% dropped cap, add a \cs{rule} to mimic its height above the baseline
% instead.}
%
+% \changes{v2.61}{2024/06/26}{Include the `ante’ box into the \cs{smash}
+% command in case it is shifted down.}
+%
% Write the dropped capital into the left margin, and wrap
% the rest of paragraph around it.
% \begin{macrocode}
- \llap{\mbox{\L at ante}\smash{\raisebox{\L at lraise}{\usebox{\L at lbox}}}%
+ \llap{\smash{\mbox{\L at ante}\raisebox{\L at lraise}{\usebox{\L at lbox}}}%
\ifL at grid\else\rule{0pt}{\L at ruleht}\fi
\hskip \the\L at Findent}%
\unhcopy\L at tbox\relax
Modified: trunk/Master/texmf-dist/tex/latex/lettrine/lettrine.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lettrine/lettrine.sty 2024-06-26 08:00:08 UTC (rev 71626)
+++ trunk/Master/texmf-dist/tex/latex/lettrine/lettrine.sty 2024-06-26 20:36:33 UTC (rev 71627)
@@ -11,7 +11,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesFile{lettrine.sty}
- [2024-01-20 v2.60 (Daniel Flipo)]
+ [2024-06-26 v2.61 (Daniel Flipo)]
\DeclareRelease{v1.6}{1999-03-03}{lettrine-2006-03-17.sty}
\DeclareRelease{v1.9}{2012-07-20}{lettrine-2015-08-31.sty}
@@ -96,10 +96,10 @@
{
lines.code = \setcounter{L at lines}{#1} ,
depth.code = \setcounter{L at depth}{#1} ,
- lhang.code = \renewcommand*{\L at hang}{#1} ,
- loversize.code = \renewcommand*{\L at oversize}{#1} ,
- lraise.code = \renewcommand*{\L at raise}{#1} ,
- ante.code = \renewcommand*{\L at ante}{#1} ,
+ lhang.store = \L at hang ,
+ loversize.store = \L at oversize ,
+ lraise.store = \L at raise ,
+ ante.store = \L at ante ,
findent.code = \setlength{\L at Findent}{#1} ,
nindent.code = \setlength{\L at Nindent}{#1} ,
slope.code = \setlength{\L at slope}{#1} ,
@@ -293,7 +293,7 @@
\fi
\noindent
\parshape=\L at parshape\relax
- \llap{\mbox{\L at ante}\smash{\raisebox{\L at lraise}{\usebox{\L at lbox}}}%
+ \llap{\smash{\mbox{\L at ante}\raisebox{\L at lraise}{\usebox{\L at lbox}}}%
\ifL at grid\else\rule{0pt}{\L at ruleht}\fi
\hskip \the\L at Findent}%
\unhcopy\L at tbox\relax
More information about the tex-live-commits
mailing list.