From ede5a2aae42ff502be35d800e97271cf0bdc889b Mon Sep 17 00:00:00 2001
From: Hans Hagen <pragma@wxs.nl>
Date: Fri, 27 Dec 2019 17:59:09 +0100
Subject: 2019-12-27 16:45:00

---
 tex/context/base/mkiv/strc-flt.mkvi | 39 +++++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 15 deletions(-)

(limited to 'tex/context/base/mkiv/strc-flt.mkvi')

diff --git a/tex/context/base/mkiv/strc-flt.mkvi b/tex/context/base/mkiv/strc-flt.mkvi
index 584cf915f..d6a6723d7 100644
--- a/tex/context/base/mkiv/strc-flt.mkvi
+++ b/tex/context/base/mkiv/strc-flt.mkvi
@@ -418,25 +418,34 @@
    \noindent
    \gdef\lastcaptiontag{\strut\thecurrentfloatnumber}% was xdef ... needs checking
    \begingroup
-     \usefloatcaptionstyleandcolor\c!style\c!color
-     \clf_doifelselisthastitle{\currentfloat}\numexpr\currentfloatnumber\relax
-       \donothing
-       \emptyfloatcaptiontrue
-     \ifnofloatnumber
-     \else
-       \hbox{\usefloatcaptionstyleandcolor\c!headstyle\c!headcolor\thecurrentfloatnumber}%
-       \ifnofloatcaption \else \ifemptyfloatcaption \else
-         \doifelsenothing{\floatcaptionparameter\c!spaceinbetween}
-           {\floatcaptionparameter\c!headseparator\relax
-            \scratchskip\floatcaptionparameter\c!distance\relax
-            \dotfskip\scratchskip\emergencystretch.5\scratchskip}
-           {\blank[\floatcaptionparameter\c!spaceinbetween]}%
-       \fi \fi
-     \fi
      \ifnofloatcaption
        \global\d_strc_floats_caption_height\zeropoint
        \global\d_strc_floats_caption_depth \zeropoint
      \else
+       \usefloatcaptionstyleandcolor\c!style\c!color
+       \clf_doifelselisthastitle{\currentfloat}\numexpr\currentfloatnumber\relax
+         \donothing
+         \emptyfloatcaptiontrue
+       \ifnofloatnumber \else \ifnofloatcaption \else
+         \ifemptyfloatcaption
+           \hbox{\usefloatcaptionstyleandcolor\c!headstyle\c!headcolor\thecurrentfloatnumber}%
+         \else
+           \doifelsenothing{\floatcaptionparameter\c!spaceinbetween}
+             {\scratchskip\floatcaptionparameter\c!distance\relax
+              \setbox\scratchbox\hbox
+                {\usefloatcaptionstyleandcolor\c!headstyle\c!headcolor
+                 \thecurrentfloatnumber
+                 \floatcaptionparameter\c!headseparator
+                 \dotfskip\scratchskip}%
+              \doifelse{\floatcaptionparameter\c!hang}\v!yes
+                 {\leftskip\wd\scratchbox
+                  \llap{\box\scratchbox}}
+                 {\unhbox\scratchbox}%
+               \emergencystretch.5\scratchskip}
+             {\hbox{\usefloatcaptionstyleandcolor\c!headstyle\c!headcolor\thecurrentfloatnumber}%
+              \blank[\floatcaptionparameter\c!spaceinbetween]}%
+         \fi
+       \fi \fi
        \usefloatcaptionstyleandcolor\c!textstyle\c!textcolor
        \global\d_strc_floats_caption_height\strutheight
        \global\d_strc_floats_caption_depth \strutdepth
-- 
cgit v1.2.3