lettrine (31jul18)

git-svn-id: svn://tug.org/texlive/trunk@48321 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 26 insertions, 17 deletions

diff --git a/Master/texmf-dist/doc/latex/lettrine/demo-de.pdf b/Master/texmf-dist/doc/latex/lettrine/demo-de.pdf
index 3bfc83077d3..eb7a3c0579f 100644
--- a/Master/texmf-dist/doc/latex/lettrine/demo-de.pdf
+++ b/Master/texmf-dist/doc/latex/lettrine/demo-de.pdf
diff --git a/Master/texmf-dist/doc/latex/lettrine/demo.pdf b/Master/texmf-dist/doc/latex/lettrine/demo.pdf
index 1caefc12dde..13ca0ebe4e5 100644
--- a/Master/texmf-dist/doc/latex/lettrine/demo.pdf
+++ b/Master/texmf-dist/doc/latex/lettrine/demo.pdf
diff --git a/Master/texmf-dist/doc/latex/lettrine/lettrine.pdf b/Master/texmf-dist/doc/latex/lettrine/lettrine.pdf
index f360cd9cf91..fa47502e4fa 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 13b9b7990e0..dc110251129 100644
--- a/Master/texmf-dist/source/latex/lettrine/lettrine.dtx
+++ b/Master/texmf-dist/source/latex/lettrine/lettrine.dtx
@@ -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@height{%
    \ifvoid\L@tbox
      \sbox{\L@tbox}{\LettrineTextFont{\LettrineSecondString}}%
    \fi
-   \global\setlength{\L@target@ht}{\ht\L@tbox}%
+   \setlength{\L@target@ht}{\ht\L@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@target@dp}{\value{L@lines}\@tempdima}%
+   \setlength{\L@target@dp}{\value{L@lines}\@tempdima}%
    \ifnum\value{L@lines}>1
-     \global\addtolength{\L@target@dp}{-\@tempdima}%
+     \addtolength{\L@target@dp}{-\@tempdima}%
    \else
-     \global\addtolength{\L@target@ht}{\L@target@dp}%
-     \global\setlength{\L@target@dp}{0pt}%
+     \addtolength{\L@target@ht}{\L@target@dp}%
+     \setlength{\L@target@dp}{0pt}%
    \fi
-   \global\setlength{\L@target@tht}{\L@target@ht}%
-   \global\addtolength{\L@target@tht}{\L@target@dp}%
+   \setlength{\L@target@tht}{\L@target@ht}%
+   \addtolength{\L@target@tht}{\L@target@dp}%
+   \global\L@target@ht=\L@target@ht
+   \global\L@target@dp=\L@target@dp
+   \global\L@target@tht=\L@target@tht
    \setlength{\L@height}{\L@target@tht}%
    \addtolength{\L@height}{\L@oversize\L@target@tht}%
 }
diff --git a/Master/texmf-dist/tex/latex/lettrine/lettrine.sty b/Master/texmf-dist/tex/latex/lettrine/lettrine.sty
index 567b7fcaf16..518e600a1f4 100644
--- a/Master/texmf-dist/tex/latex/lettrine/lettrine.sty
+++ b/Master/texmf-dist/tex/latex/lettrine/lettrine.sty
@@ -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@tbox
      \sbox{\L@tbox}{\LettrineTextFont{\LettrineSecondString}}%
    \fi
-   \global\setlength{\L@target@ht}{\ht\L@tbox}%
+   \setlength{\L@target@ht}{\ht\L@tbox}%
    \@tempdima=\baselineskip
-   \global\setlength{\L@target@dp}{\value{L@lines}\@tempdima}%
+   \setlength{\L@target@dp}{\value{L@lines}\@tempdima}%
    \ifnum\value{L@lines}>1
-     \global\addtolength{\L@target@dp}{-\@tempdima}%
+     \addtolength{\L@target@dp}{-\@tempdima}%
    \else
-     \global\addtolength{\L@target@ht}{\L@target@dp}%
-     \global\setlength{\L@target@dp}{0pt}%
+     \addtolength{\L@target@ht}{\L@target@dp}%
+     \setlength{\L@target@dp}{0pt}%
    \fi
-   \global\setlength{\L@target@tht}{\L@target@ht}%
-   \global\addtolength{\L@target@tht}{\L@target@dp}%
+   \setlength{\L@target@tht}{\L@target@ht}%
+   \addtolength{\L@target@tht}{\L@target@dp}%
+   \global\L@target@ht=\L@target@ht
+   \global\L@target@dp=\L@target@dp
+   \global\L@target@tht=\L@target@tht
    \setlength{\L@height}{\L@target@tht}%
    \addtolength{\L@height}{\L@oversize\L@target@tht}%
 }