- Debugging.

- Move all \RequirePackages to commonincludes.def.

packages/Graphics.sty

@@ -3,12 +3,6 @@
 	Custom non-floating Graphics commands.
 }
 
-\RequirePackage{PrimeTeX/packages/Layout}
-
-\RequirePackage{calc}
-
-\RequirePackage{wrapstuff}
-
 \dim_const:Nn \c_Graphics_icon_dim {0.25in}
 
 \NewDocumentCommand{\IconSize}{}{\c_Graphics_icon_dim}
@@ -16,11 +10,9 @@
 \keys_define:nn{InlineGraphic}{
 	height	.dim_set:N	= \l_InlineGraphic_height_dim,
 	height	.initial:n	= {12pt},
-%	height	.default:n	= {12pt},
 
 	offset	.dim_set:N	= \l_InlineGraphic_offset_dim,
 	offset	.initial:n	= {-2pt},
-%	offset	.default:n	= {-2pt},
 }
 
 \NewDocumentCommand{\InlineGraphic}{
@@ -28,20 +20,20 @@
 	O{}
 	% Graphic file.
 	m
-}{%
+}{
 	\keys_set:nn{InlineGraphic}{#1}
 	\raisebox{\l_InlineGraphic_offset_dim}{
-		\includegraphics[%
-			keepaspectratio,height=12pt%\l_InlineGraphic_height_dim%
+		\includegraphics[
+			keepaspectratio,height=12pt
 		]{#2}
-	}%
+	}
 }
 
 \dim_const:Nn \c_ig_width_dim {0.5in}
 
 % Shorthand command for \includegraphics.
-\NewDocumentCommand{\ig}{O{width=\c_ig_width_dim} m}{%
-	\includegraphics[keepaspectratio,#1]{#2}%
+\NewDocumentCommand{\ig}{O{width=\c_ig_width_dim} m}{
+	\includegraphics[keepaspectratio,#1]{#2}
 }
 
 \dim_const:Nn \c_WrapFig_hoffset_dim {0in}
@@ -95,7 +87,8 @@
 		WrapFig:~#4,~
 		placement:~\l_WrapFig_placement_str,~
 		hoffset:~\dim_use:N \l_WrapFig_hoffset_dim,
-		passed_keys:~\l_WrapFig_passed_keys_str}
+		passed_keys:~\l_WrapFig_passed_keys_str
+	}
 	\expanded{\noexpand\begin{wrapstuff}[
 		\l_WrapFig_placement_str,
 		hoffset	= {\dim_use:N \l_WrapFig_hoffset_dim},