texlive[48321] Master/texmf-dist: lettrine (31jul18)
commits+karl at tug.org
commits+karl at tug.org
Tue Jul 31 22:54:22 CEST 2018
Revision: 48321
http://tug.org/svn/texlive?view=revision&revision=48321
Author: karl
Date: 2018-07-31 22:54:22 +0200 (Tue, 31 Jul 2018)
Log Message:
-----------
lettrine (31jul18)
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/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/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/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-07-31 20:54:05 UTC (rev 48320)
+++ trunk/Master/texmf-dist/source/latex/lettrine/lettrine.dtx 2018-07-31 20:54:22 UTC (rev 48321)
@@ -1,5 +1,5 @@
%
-% \CheckSum{596}
+% \CheckSum{598}
%
% \iffalse meta-comment
%
@@ -27,7 +27,7 @@
\ProvidesFile{lettrine.dtx}
%</dtx>
%<*!cfg>
- [2018/07/21 v2.0 (Daniel Flipo)]
+ [2018/07/31 v2.01 (Daniel Flipo)]
%</!cfg>
%
% Lettrine package for LaTeX version 2e
@@ -498,26 +498,32 @@
% \changes{v2.0}{2018/07/21}{Store targeted dimensions of the
% dropped capital (ht, dp, tht) for further use.}
%
+% \changes{v2.01}{2018/07/31}{Faulty code \cs{global}\cs{setlength}
+% removed. Thanks to Ulrike Fischer for providing the patch.}
+%
% \begin{macrocode}
\def\Lettrine at height{%
\ifvoid\L at tbox
\sbox{\L at tbox}{\LettrineTextFont{\LettrineSecondString}}%
\fi
- \global\setlength{\L at target@ht}{\ht\L at tbox}%
+ \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
- \global\setlength{\L at target@dp}{\value{L at lines}\@tempdima}%
+ \setlength{\L at target@dp}{\value{L at lines}\@tempdima}%
\ifnum\value{L at lines}>1
- \global\addtolength{\L at target@dp}{-\@tempdima}%
+ \addtolength{\L at target@dp}{-\@tempdima}%
\else
- \global\addtolength{\L at target@ht}{\L at target@dp}%
- \global\setlength{\L at target@dp}{0pt}%
+ \addtolength{\L at target@ht}{\L at target@dp}%
+ \setlength{\L at target@dp}{0pt}%
\fi
- \global\setlength{\L at target@tht}{\L at target@ht}%
- \global\addtolength{\L at target@tht}{\L at target@dp}%
+ \setlength{\L at target@tht}{\L at target@ht}%
+ \addtolength{\L at target@tht}{\L at target@dp}%
+ \global\L at target@ht=\L at target@ht
+ \global\L at target@dp=\L at target@dp
+ \global\L at target@tht=\L at target@tht
\setlength{\L at height}{\L at target@tht}%
\addtolength{\L at height}{\L at oversize\L at target@tht}%
}
Modified: trunk/Master/texmf-dist/tex/latex/lettrine/lettrine.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lettrine/lettrine.sty 2018-07-31 20:54:05 UTC (rev 48320)
+++ trunk/Master/texmf-dist/tex/latex/lettrine/lettrine.sty 2018-07-31 20:54:22 UTC (rev 48321)
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{lettrine.sty}
- [2018/07/21 v2.0 (Daniel Flipo)]
+ [2018/07/31 v2.01 (Daniel Flipo)]
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\RequirePackage{keyval}
\newcounter{DefaultLines}
@@ -75,17 +75,20 @@
\ifvoid\L at tbox
\sbox{\L at tbox}{\LettrineTextFont{\LettrineSecondString}}%
\fi
- \global\setlength{\L at target@ht}{\ht\L at tbox}%
+ \setlength{\L at target@ht}{\ht\L at tbox}%
\@tempdima=\baselineskip
- \global\setlength{\L at target@dp}{\value{L at lines}\@tempdima}%
+ \setlength{\L at target@dp}{\value{L at lines}\@tempdima}%
\ifnum\value{L at lines}>1
- \global\addtolength{\L at target@dp}{-\@tempdima}%
+ \addtolength{\L at target@dp}{-\@tempdima}%
\else
- \global\addtolength{\L at target@ht}{\L at target@dp}%
- \global\setlength{\L at target@dp}{0pt}%
+ \addtolength{\L at target@ht}{\L at target@dp}%
+ \setlength{\L at target@dp}{0pt}%
\fi
- \global\setlength{\L at target@tht}{\L at target@ht}%
- \global\addtolength{\L at target@tht}{\L at target@dp}%
+ \setlength{\L at target@tht}{\L at target@ht}%
+ \addtolength{\L at target@tht}{\L at target@dp}%
+ \global\L at target@ht=\L at target@ht
+ \global\L at target@dp=\L at target@dp
+ \global\L at target@tht=\L at target@tht
\setlength{\L at height}{\L at target@tht}%
\addtolength{\L at height}{\L at oversize\L at target@tht}%
}
More information about the tex-live-commits
mailing list