- Improve wrap objects.

- Debug.

packages/Floats.sty

@@ -10,8 +10,8 @@
 
 \floatstyle{plain}
 \newfloat{generic}{htpb}{lgf}
-%\floatplacement{figure}{htpb}
-%\floatplacement{table}{htpb}
+\floatplacement{figure}{htpb}
+\floatplacement{table}{htpb}
 
 % Function for converting clists generated by multichoice keys into strings.
 \NewDocumentCommand{\clist_use_default:Nnnn}{
@@ -134,14 +134,11 @@
 	\clist_use_default:Nnnn \l_CenterFig_placement_str
 		{\l_Float_placement_clist}
 		{\c_Float_placement_clist}
-	%\ExpEnvOption
 	\expanded{\noexpand\begin{figure}[\l_CenterFig_placement_str]}
 		\begin{MyCaption}{fig:#4}{#5}
 			\Centering
 			\includegraphics[keepaspectratio,#1]{#3}
 		\end{MyCaption}
-		% \caption{#5}
-		% \label{fig:#4}
 	\end{figure}
 \group_end: }
 
@@ -197,12 +194,9 @@
 		placement:e	= \l_Float_placement_clist,
 		offset		= \l_BigFloat_offset_fp,
 	]
-		%\captionsetup{type=figure}
 		\begin{MyCaption}{fig:#3}{#4}
 			\includegraphics[keepaspectratio,width=\linewidth]{#2}
 		\end{MyCaption}
-		% \Centering\captionof{figure}{#4}
-		% \label{fig:#3}
 	\end{BigFloat}
 \group_end: }
 
@@ -279,6 +273,8 @@
 
 \ProvideLength{\TwinFigWidth}[\dim_use:N \c_TwinFig_width_dim]
 
+\fp_new:N \l_TwinFig_valign_offset_fp
+
 \keys_define:nn {} {
 	TwinFig		.inherit:n	= {BigFloat},
 }
@@ -315,7 +311,6 @@
 	% The following is a hack to keep the figure counter from incrementing by 4
 	% instead of 2. Replace it with a proper solution if you find one.
 	\addtocounter{figure}{-2}
-
 	\keys_set:nn{TwinFig}{#1}
 	\begin{BigFloat}[
 		type		= {figure},
@@ -324,7 +319,8 @@
 		offset		= \l_BigFloat_offset_fp,
 	]
 		\begin{tblr}{
-			colspec	= {*{2}{Q[c,wd=\l_TwinFig_width_dim]}},
+			colspec	= {*{2}{Q[c,wd=\l_TwinFig_width_dim,]}},
+			cells	= {font=\mdseries},
 			rows:e	= {\l_TwinFig_valign_str},
 			hlines	= {0pt},
 			hborder{1-Z} = {
@@ -340,27 +336,21 @@
 				rightspace	= \l_TwinFig_space_dim,
 			},
 		}
-			\vfill
-			%\captionsetup{type=figure}
 			\begin{MyCaption}{fig:#3}{#4}
 				\includegraphics[
-					keepaspectratio,width=\l_TwinFig_width_dim
+					keepaspectratio,
+					align	= c,
+					width	= \l_TwinFig_width_dim,
 				]{#2}
 			\end{MyCaption}
-			% \captionof{figure}{#4}
-			% \label{fig:#3}
-			\vfill
 			&
-				\vfill
-				% \captionsetup{type=figure}
-				\begin{MyCaption}{fig:#6}{#7}
-					\includegraphics[
-						keepaspectratio,width=\l_TwinFig_width_dim
-					]{#5}
-				\end{MyCaption}
-				% \captionof{figure}{#7}
-				% \label{fig:#6}
-				\vfill
+			\begin{MyCaption}{fig:#6}{#7}
+				\includegraphics[
+					keepaspectratio,
+					align	= c,
+					width	= \l_TwinFig_width_dim,
+				]{#5}
+			\end{MyCaption}
 			\\
 		\end{tblr}
 	\end{BigFloat}