Merge branch 'hotfix/gh586'

latex3 · Jun 24, 2021 · 700e435 · 700e435
2 parents cfba034 + f3ad5f0
commit 700e435
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 4 deletions.
diff --git a/required/firstaid/changes.txt b/required/firstaid/changes.txt
@@ -15,7 +15,8 @@
 
 	* latex2e-first-aid-for-external-files.dtx:
 	ulem doesn't handle \hspace gracefully now that it is calc aware.
-	varwidth needs an additional \unskip when unraveling a vertical list.
+	varwidth needs an additional \unskip when unraveling a vertical list
+	(but only if that skip is 0pt)
 
 2021-03-15  Frank Mittelbach  <Frank.Mittelbach@latex-project.org>
 

diff --git a/required/firstaid/latex2e-first-aid-for-external-files.dtx b/required/firstaid/latex2e-first-aid-for-external-files.dtx
@@ -591,7 +591,7 @@
      {%
 \def\@vwid@sift{%
   \skip@\lastskip\unskip
-  \unskip                         % <---- the first aid here
+  \ifdim\lastskip=\z@\unskip\fi   % <---- the first aid here (not just unskip)
   \dimen@\lastkern\unkern
   \count@\lastpenalty\unpenalty
   \setbox\z@\lastbox

diff --git a/required/firstaid/testfiles/firstaid-ulem-varwidth.lvt b/required/firstaid/testfiles/firstaid-ulem-varwidth.lvt
@@ -16,6 +16,9 @@
 
 \uline{{\hspace{1cm}}}
 
+\bigskip
+
+
 \setbox0\hbox{%
   x
   \begin{varwidth}[t]{10cm}
@@ -24,7 +27,21 @@
   x
 }
 
-\typeout{same baseline please: \the\ht0 + \the\dp0}
+\typeout{same baseline please: \the\ht0 \space + \the\dp0}
+
+\unhbox0  % visual check only
+
+\bigskip
+
+\setbox0\hbox{%
+\fbox{\begin{varwidth}[t]{3cm}
+some text
+\par
+\vskip-\baselineskip\vbox{\hbox{\strut}}%
+\end{varwidth}}%
+}
+
+\typeout{shoule not contain extra empty line: \the\ht0 \space + \the\dp0}
 
 \unhbox0  % visual check only
 

diff --git a/required/firstaid/testfiles/firstaid-ulem-varwidth.tlg b/required/firstaid/testfiles/firstaid-ulem-varwidth.tlg
@@ -1,6 +1,7 @@
 This is a generated file for the l3build validation system.
 Don't change this file in any respect.
 no error please:
-same baseline please: 6.94444pt+ 0.0pt
+same baseline please: 6.94444pt + 0.0pt
+shoule not contain extra empty line: 9.55078pt + 7.00003pt
 [1
 ] (firstaid-ulem-varwidth.aux)