Lots of changes.

packages/Graphics.sty

@@ -38,12 +38,12 @@
 	% Caption.
 	m
 }{%
-	\BigFloat[#1][#2][#3]{figure}{%
+	\begin{BigFloat}[figure][#1][#2][#3]%
 		\captionsetup{type=figure}%
 		\includegraphics[keepaspectratio,width=\linewidth]{#4}%
 		\Centering\captionof{figure}{#6}%\par
 		\label{fig:#5}%
-	}%
+	\end{BigFloat}%
 }
 
 \NewDocumentCommand{\doublebigfig}{%
@@ -64,17 +64,17 @@
 	% Second Graphic caption.
 	m
 }{%
-	\BigFloat[#1][p][#2]{figure}{%
+	\begin{BigFloat}[figure][#1][p][#2]%
 		\captionsetup{type=figure}%
 		\includegraphics[keepaspectratio,width=\textwidth]{#3}%
-		\Centering\captionof{figure}{#5}\par%
+		\Centering\captionof{figure}{#5}%
 		\label{fig:#4}
 		\bigskip
 		\captionsetup{type=figure}%
 		\includegraphics[keepaspectratio,width=\textwidth]{#6}%
-		\Centering\captionof{figure}{#8}\par%
+		\Centering\captionof{figure}{#8}%
 		\label{fig:#7}%
-	}%
+	\end{BigFloat}%
 }
 
 \RequirePackage{tabularray}
@@ -85,9 +85,26 @@
 ]
 
 \NewDocumentCommand{\twinfig}{%
-	O{\bigfloatoverhang} m >{\TrimSpaces}m m m >{\TrimSpaces}m m%
+	% Big Float overhang.
+	O{\bigfloatoverhang}
+	% Float placement.
+	O{htpb}
+	% BigFloat offset ratio.
+	O{\bigfloatoffsetratio}
+	% First graphic file.
+	m 
+	% First label.
+	>{\TrimSpaces}m 
+	% First caption.
+	m 
+	% Second graphic file.
+	m 
+	% Second label.
+	>{\TrimSpaces}m 
+	% Second caption.
+	m
 }{%
-	\BigFloat[#1]{table}{%
+	\begin{BigFloat}[generic][#1][#2][#3]%
 		\begin{tblr}{%
 			colspec	= {*{2}{Q[c,m,wd=\twinfigwidth]}},%
 			hlines	= {0pt},
@@ -109,22 +126,22 @@
 			\captionsetup{type=figure}%
 			\includegraphics[%
 				keepaspectratio,width=\twinfigwidth%
-			]{#2}%
-			\captionof{figure}{#4}%
-			\label{fig:#3}
+			]{#4}%
+			\captionof{figure}{#6}%
+			\label{fig:#5}
 			\vfill%
 			&%
 				\vfill
 				\captionsetup{type=figure}%
 				\includegraphics[%
 					keepaspectratio,width=\twinfigwidth%
-				]{#5}%
-				\captionof{figure}{#7}%
-				\label{fig:#6}
+				]{#7}%
+				\captionof{figure}{#9}%
+				\label{fig:#8}
 				\vfill%
 			\\%
 		\end{tblr}%
-	}%
+	\end{BigFloat}%
 }
 
 \NewDocumentCommand{\wrapfig}{