diff options
Diffstat (limited to 'Master/texmf-dist')
| -rw-r--r-- | Master/texmf-dist/doc/latex/lettrine/lettrine-demo-arabic.pdf | bin | 13371 -> 13371 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/lettrine/lettrine-demo-de.pdf | bin | 128252 -> 128252 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/lettrine/lettrine-demo-fr.pdf | bin | 168279 -> 168395 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/lettrine/lettrine-demo-fr.tex | 8 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/lettrine/lettrine-demo-lua.pdf | bin | 73166 -> 73164 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/lettrine/lettrine.pdf | bin | 131712 -> 138232 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/lettrine/lettrine.dtx | 32 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/lettrine/lettrine.sty | 12 |
8 files changed, 34 insertions, 18 deletions
diff --git a/Master/texmf-dist/doc/latex/lettrine/lettrine-demo-arabic.pdf b/Master/texmf-dist/doc/latex/lettrine/lettrine-demo-arabic.pdf Binary files differindex b2e843d1b74..d9df92737ee 100644 --- a/Master/texmf-dist/doc/latex/lettrine/lettrine-demo-arabic.pdf +++ b/Master/texmf-dist/doc/latex/lettrine/lettrine-demo-arabic.pdf diff --git a/Master/texmf-dist/doc/latex/lettrine/lettrine-demo-de.pdf b/Master/texmf-dist/doc/latex/lettrine/lettrine-demo-de.pdf Binary files differindex f8c0fc77c28..eb043940200 100644 --- a/Master/texmf-dist/doc/latex/lettrine/lettrine-demo-de.pdf +++ b/Master/texmf-dist/doc/latex/lettrine/lettrine-demo-de.pdf diff --git a/Master/texmf-dist/doc/latex/lettrine/lettrine-demo-fr.pdf b/Master/texmf-dist/doc/latex/lettrine/lettrine-demo-fr.pdf Binary files differindex f85a80ef420..7e51b439440 100644 --- a/Master/texmf-dist/doc/latex/lettrine/lettrine-demo-fr.pdf +++ b/Master/texmf-dist/doc/latex/lettrine/lettrine-demo-fr.pdf diff --git a/Master/texmf-dist/doc/latex/lettrine/lettrine-demo-fr.tex b/Master/texmf-dist/doc/latex/lettrine/lettrine-demo-fr.tex index d49d889089a..8ffa8dbdeb8 100644 --- a/Master/texmf-dist/doc/latex/lettrine/lettrine-demo-fr.tex +++ b/Master/texmf-dist/doc/latex/lettrine/lettrine-demo-fr.tex @@ -166,14 +166,16 @@ la reliait au château de Treillan distant de quelques kilomètres à peine. \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. diff --git a/Master/texmf-dist/doc/latex/lettrine/lettrine-demo-lua.pdf b/Master/texmf-dist/doc/latex/lettrine/lettrine-demo-lua.pdf Binary files differindex a0c3aa3bdc7..20ec7e21867 100644 --- a/Master/texmf-dist/doc/latex/lettrine/lettrine-demo-lua.pdf +++ b/Master/texmf-dist/doc/latex/lettrine/lettrine-demo-lua.pdf diff --git a/Master/texmf-dist/doc/latex/lettrine/lettrine.pdf b/Master/texmf-dist/doc/latex/lettrine/lettrine.pdf Binary files differindex 2866dec763c..ddca3c74cdf 100644 --- a/Master/texmf-dist/doc/latex/lettrine/lettrine.pdf +++ b/Master/texmf-dist/doc/latex/lettrine/lettrine.pdf diff --git a/Master/texmf-dist/source/latex/lettrine/lettrine.dtx b/Master/texmf-dist/source/latex/lettrine/lettrine.dtx index c4bf9472c53..e6df6e3b70c 100644 --- a/Master/texmf-dist/source/latex/lettrine/lettrine.dtx +++ b/Master/texmf-dist/source/latex/lettrine/lettrine.dtx @@ -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@lines}{#1} , depth.code = \setcounter{L@depth}{#1} , - lhang.code = \renewcommand*{\L@hang}{#1} , - loversize.code = \renewcommand*{\L@oversize}{#1} , - lraise.code = \renewcommand*{\L@raise}{#1} , - ante.code = \renewcommand*{\L@ante}{#1} , + lhang.store = \L@hang , + loversize.store = \L@oversize , + lraise.store = \L@raise , + ante.store = \L@ante , findent.code = \setlength{\L@Findent}{#1} , nindent.code = \setlength{\L@Nindent}{#1} , slope.code = \setlength{\L@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@ante}\smash{\raisebox{\L@lraise}{\usebox{\L@lbox}}}% + \llap{\smash{\mbox{\L@ante}\raisebox{\L@lraise}{\usebox{\L@lbox}}}% \ifL@grid\else\rule{0pt}{\L@ruleht}\fi \hskip \the\L@Findent}% \unhcopy\L@tbox\relax diff --git a/Master/texmf-dist/tex/latex/lettrine/lettrine.sty b/Master/texmf-dist/tex/latex/lettrine/lettrine.sty index b508a930299..21aa3290e51 100644 --- a/Master/texmf-dist/tex/latex/lettrine/lettrine.sty +++ b/Master/texmf-dist/tex/latex/lettrine/lettrine.sty @@ -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@lines}{#1} , depth.code = \setcounter{L@depth}{#1} , - lhang.code = \renewcommand*{\L@hang}{#1} , - loversize.code = \renewcommand*{\L@oversize}{#1} , - lraise.code = \renewcommand*{\L@raise}{#1} , - ante.code = \renewcommand*{\L@ante}{#1} , + lhang.store = \L@hang , + loversize.store = \L@oversize , + lraise.store = \L@raise , + ante.store = \L@ante , findent.code = \setlength{\L@Findent}{#1} , nindent.code = \setlength{\L@Nindent}{#1} , slope.code = \setlength{\L@slope}{#1} , @@ -293,7 +293,7 @@ \fi \noindent \parshape=\L@parshape\relax - \llap{\mbox{\L@ante}\smash{\raisebox{\L@lraise}{\usebox{\L@lbox}}}% + \llap{\smash{\mbox{\L@ante}\raisebox{\L@lraise}{\usebox{\L@lbox}}}% \ifL@grid\else\rule{0pt}{\L@ruleht}\fi \hskip \the\L@Findent}% \unhcopy\L@tbox\relax |