From 5f6a7c6790baa7e524de5b5bf71a29ea757378f6 Mon Sep 17 00:00:00 2001
From: Hans Hagen <pragma@wxs.nl>
Date: Sun, 12 May 2019 19:57:39 +0200
Subject: 2019-05-12 19:16:00

---
 tex/context/base/mkiv/strc-flt.mkvi | 102 ++++++++++++++++++++++++++++--------
 1 file changed, 79 insertions(+), 23 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 02f6fd753..2af60b41d 100644
--- a/tex/context/base/mkiv/strc-flt.mkvi
+++ b/tex/context/base/mkiv/strc-flt.mkvi
@@ -312,30 +312,86 @@
 \let\floatcaptionsuffix\empty % an optional suffix
 \let\floatcaptionnumber\empty % a logical counter
 
-% the split is needed when for instance the float goes into
-% a multi page field and the list of figs becomes larger than
-% one page: cycle between 'only flush when object ref ok'
-% and 'one/many page fig list'; see "uguide finometer"
+% For a while these were placeholders:
 %
-% potential sync bug with sectionblocks, see uguide.tex
-
-% begin of todo
-
-\unexpanded\def\placefloatcaption{\dodoubleempty\strc_floats_place_caption}
-\unexpanded\def\setfloatcaption  {\dodoubleempty\strc_floats_set_caption}
-
-\def\strc_floats_place_caption[#tag][#reference]#caption{[not supported]}
-\def\strc_floats_set_caption  [#tag][#reference]#caption{[not supported]}
-
-\unexpanded\def\placefloatcaptiontext     [#tag]{[not suported yet]}
-\unexpanded\def\placefloatcaptionnumber   [#tag]{[not suported yet]}
-\unexpanded\def\placefloatcaptionreference[#tag]{[not suported yet]}
-
-\let\placefloatlabel         \placefloatcaption
-\let\placefloatlabeltext     \placefloatcaptiontext
-\let\placefloatlabelreference\placefloatcaptionreference
-
-% end of todo
+%D \starttyping
+%D \unexpanded\def\placefloatcaption{\dodoubleempty\strc_floats_place_caption}
+%D \unexpanded\def\setfloatcaption  {\dodoubleempty\strc_floats_set_caption}
+%D
+%D \def\strc_floats_place_caption[#tag][#reference]#caption{[not supported]}
+%D \def\strc_floats_set_caption  [#tag][#reference]#caption{[not supported]}
+%D
+%D \unexpanded\def\placefloatcaptiontext     [#tag]{[not suported yet]}
+%D \unexpanded\def\placefloatcaptionnumber   [#tag]{[not suported yet]}
+%D \unexpanded\def\placefloatcaptionreference[#tag]{[not suported yet]}
+%D \stoptyping
+%D
+%D because in \MKII\ we had:
+%D
+%D \starttyping
+%D \let\placefloatlabel         \placefloatcaption
+%D \let\placefloatlabeltext     \placefloatcaptiontext
+%D \let\placefloatlabelreference\placefloatcaptionreference
+%D \stoptyping
+%D
+%D But as it was never advertised we don't provide it in \MKIV. However, at some
+%D point HvdM wanted this:
+%D
+%D \starttyping
+%D \placefigure                     {labeltext-1}  {\externalfigure[figure-1]}
+%D \placefloatcaption[figure][title={labeltext-2}]  \externalfigure[figure-2]
+%D \placefigure                     {labeltext-3}  {\externalfigure[figure-3]}
+%D \stoptyping
+%D
+%D So there you have it:
+
+\unexpanded\def\placefloatcaption
+  {\dotripleempty\strc_floats_place_caption}
+
+\def\strc_floats_place_caption[#category][#settings][#userdata]%
+  {\ifsecondargument
+     % we need at least a category and title
+     \dontleavehmode
+     \bgroup
+     \edef\currentfloat{#category}%
+     \let\currentfloatcaption\currentfloat
+     \resetfloatcaptionparameter\c!reference
+     \resetfloatcaptionparameter\c!title
+     \resetfloatcaptionparameter\c!marking
+     \resetfloatcaptionparameter\c!list
+     \resetfloatcaptionparameter\c!bookmark
+     \setupcurrentfloatcaption[#settings]%
+     \edef\currentfloatcounter{\namedcounterparameter\currentfloat\s!name}%
+     \iftrialtypesetting\strc_counters_save\currentfloatcounter\fi
+     \strc_counters_increment\currentfloatcounter
+     \strc_counters_register_component
+       \s!float
+       \setupcurrentfloatcaption
+       \floatcaptionparameter
+       \detokenizedfloatcaptionparameter
+       \relax
+       \relax
+       \relax
+       [\s!name=\currentfloat,
+        \s!counter=\currentfloatcounter,%
+        \s!hascaption=\v!yes,%
+        \s!hasnumber=\v!yes,%
+        \s!hastitle=\v!yes]%
+       [#userdata]%
+     \glet\previousfloatnumber    \m_strc_counters_last_registered_index
+     \glet\currentfloatnumber     \m_strc_counters_last_registered_index
+     \glet\currentfloatattribute  \m_strc_counters_last_registered_attribute
+     \glet\currentfloatsynchronize\m_strc_counters_last_registered_synchronize
+     %
+   % \iflocation
+   %    \attribute\destinationattribute\currentfloatattribute\relax
+   % \fi
+     \currentfloatsynchronize
+     \strc_floats_make_complete_caption
+     %
+     \iftrialtypesetting\strc_counters_restore\currentfloatcounter\fi
+     \egroup
+   \fi}
 
 \newbox  \b_strc_floats_caption
 \newbox  \b_strc_floats_content
-- 
cgit v1.2.3