Refactoring Boxouts.

packages/Graphics.sty

@@ -25,7 +25,7 @@
 }
 
 \NewDocumentCommand{\bigfig}{O{\bigfloatoverhang} m >{\TrimSpaces}m m}{%
-	\bigfloat[#1]{figure}{htpb}{%
+	\BigFloat[#1]{figure}{%
 		\captionsetup{type=figure}%
 		\includegraphics[keepaspectratio,width=\textwidth]{#2}%
 		\Centering\captionof{figure}{#4}\par%
@@ -34,18 +34,33 @@
 }
 
 \NewDocumentCommand{\doublebigfig}{%
-	O{\bigfloatoverhang} m >{\TrimSpaces}m m m >{\TrimSpaces}m m%
+	% BigFloat overhang.
+	O{\bigfloatoverhang}
+	% BigFloat offet.
+	O{\bigfloatoffset}
+	% First graphic filename.
+	m
+	% First graphic label.
+	>{\TrimSpaces}m
+	% First graphic caption.
+	m
+	% Second graphic filename.
+	m
+	% Second graphic label.
+	>{\TrimSpaces}m
+	% Second Graphic caption.
+	m
 }{%
-	\bigfloat[#1]{figure}{p}{%
+	\BigFloat[#1][p][#2]{figure}{%
 		\captionsetup{type=figure}%
-		\includegraphics[keepaspectratio,width=\textwidth]{#2}%
-		\Centering\captionof{figure}{#4}\par%
-		\label{fig:#3}
+		\includegraphics[keepaspectratio,width=\textwidth]{#3}%
+		\Centering\captionof{figure}{#5}\par%
+		\label{fig:#4}
 		\bigskip
 		\captionsetup{type=figure}%
-		\includegraphics[keepaspectratio,width=\textwidth]{#5}%
-		\Centering\captionof{figure}{#7}\par%
-		\label{fig:#6}%
+		\includegraphics[keepaspectratio,width=\textwidth]{#6}%
+		\Centering\captionof{figure}{#8}\par%
+		\label{fig:#7}%
 	}%
 }
 
@@ -59,7 +74,7 @@
 \NewDocumentCommand{\twinfig}{%
 	O{\bigfloatoverhang} m >{\TrimSpaces}m m m >{\TrimSpaces}m m%
 }{%
-	\bigfloat[#1]{table}{htpb}{%
+	\BigFloat[#1]{table}{%
 		\begin{tblr}{%
 			colspec	= {%
 				*{2}{Q[c,m,wd=\twinfigwidth]}%
@@ -101,32 +116,28 @@
 	}%
 }
 
-\NewDocumentCommand{\wrapfig}{%
-	O{0in} m m m >{\TrimSpaces}m m%
+\NewDocumentCommand{\wrapfig}{
+	% alignment [l,r,i,o]
+	O{O}
+	% horizontal_offset
+	O{\marparwidth}
+	% graphic_file
+	m
+	% (width|height)=lengthvalue
+	O{}
+	% label
+	>{\TrimSpaces}m
+	% caption
+	m%
 }{%
-	% Syntax:
-	% \wrapfig[%
-	%	horizontal_offset
-	% ]{
-	%	graphic_file
-	% }{
-	%	alignment [l,r,i,o]
-	% }{
-	%	(width|height)=lengthvalue
-	% }{
-	%	label
-	% }{
-	%	caption
-	% }
-	%
-	\begin{wrapfigure}{#3}[#1]%
+	\begin{wrapfigure}{#1}[#2]%
 		\captionsetup{type=figure}%
 		\capstart%
 		\includegraphics[%
 			keepaspectratio,%
 			#4%
-		]{#2}%
+		]{#3}%
 		\Centering\captionof{figure}{#6}%
 		\label{fig:#5}%
 	\end{wrapfigure}%
-}
+}