Refine table formatting.

packages/Layout.sty

@@ -5,7 +5,7 @@
 \let\CheckCommand\providecommand
 % Suppress "Underfull \hbox" infos.
 \hbadness=10000
-% Suppress small overfill infos.
+% Suppress small overfull infos.
 \hfuzz = 6.0pt
 \vfuzz = 0.0pt
 
@@ -86,28 +86,27 @@
 \newlength{\bigfloatoverhang}
 \setlength{\bigfloatoverhang}{0.81in}
 
-\NewDocumentCommand{\bigfloat}{O{\bigfloatoverhang} m m +m}{%
+\providecommand{\adjwidthtype}{}
+
+\NewDocumentCommand{\bigfloat}{
+	O{\bigfloatoverhang} m m +m O{\bigfloatoffset}
+}{%
+	\ifthenelse{\boolean{isElectronic}}{%
+		\bfloat{#1}{#2}{#3}{#4}{#5}{adjustwidth}%
+	}{%
+		\bfloat{#1}{#2}{#3}{#4}{#5}{adjustwidth*}%
+	}%
+}
+
+\NewDocumentCommand{\bfloat}{m m m +m m m}{
 	\begin{#2}[#3]%
-		\ifthenelse{\boolean{isElectronic}}{%
-			% adjustwidth adjusts all pages the same.
-			\begin{adjustwidth}{-#1+\bigfloatoffset}{-#1-\bigfloatoffset}%
-				\begin{minipage}{#1 * 2 + \textwidth}%
-					\ifthenelse{\boolean{isDraft}}{%
-						\rule{\textwidth}{1pt}\zws%
-					}{}%
-					#4%
-				\end{minipage}%
-			\end{adjustwidth}%
-		}{%
-			% adjustwidth* accounts for twosided document.
-			\begin{adjustwidth*}{-#1+\bigfloatoffset}{-#1-\bigfloatoffset}%
-				\begin{minipage}{#1 * 2 + \textwidth}%
-					\ifthenelse{\boolean{isDraft}}{%
-						\rule{\textwidth}{1pt}\zws%
-					}{}%
-					#4%
-				\end{minipage}%
-			\end{adjustwidth*}%
-		}%
+		\begin{#6}{-#1+#5}{-#1-#5}%
+			\begin{minipage}{#1 * 2 + \textwidth}%
+				\ifthenelse{\boolean{isDraft}}{%
+					\rule{\textwidth}{1pt}\zws%
+				}{}%
+				#4%
+			\end{minipage}%
+		\end{#6}%
 	\end{#2}%
 }