- Debugging.

- Move all \RequirePackages to commonincludes.def.

packages/Layout.sty

@@ -12,22 +12,6 @@
 	\setlength{#1}{#2}%
 }
 
-\RequirePackage{microtype}
-
-% Page Layout
-\RequirePackage[
-	letterpaper,
-	width			= 4.75in,	% 342pt,
-	height			= 8.0in,	% 576pt,
-	left			= 1.5in,	% 108pt,
-	top 			= 1.5in,	% 108pt,
-	head			= 12pt,		% 1/6in
-	headsep			= 24pt,		% 1/3in
-	marginparwidth	= 1.75in,	% 126pt,
-	marginparsep	= 12pt,		% 1/6in
-	footskip		= 0.5in,	% 36pt,
-]{geometry}
-
 % Redefine the commands geometry uses to draw the page frame to customize the
 % color.
 \renewcommand{\Gm@vrule}{\color{layout}\vrule width 0.2pt height\textheight depth\z@}
@@ -37,8 +21,6 @@
 % Suppress "Underfull \hbox" infos.
 \hbadness=10000
 
-\RequirePackage{ifthen}
-
 \ifthenelse{\boolean{isDraft}}{
 	\geometry{showframe}
 	\hfuzz = 0.5pt
@@ -49,19 +31,27 @@
 	\vfuzz = 8.0pt
 }
 
+\geometry{
+	letterpaper,
+	width			= 4.75in,	% 342pt,
+	height			= 8.0in,	% 576pt,
+	left			= 1.5in,	% 108pt,
+	top 			= 1.5in,	% 108pt,
+	head			= 12pt,		% 1/6in
+	headsep			= 24pt,		% 1/3in
+	marginparwidth	= 1.75in,	% 126pt,
+	marginparsep	= 12pt,		% 1/6in
+	footskip		= 0.5in,	% 36pt,
+}
+
 \ifthenelse{\boolean{isElectronic}}{
 %	\geometry{}
 }{
 	\geometry{twoside}
 }
 
-\RequirePackage{calc}
-\RequirePackage[strict]{changepage}
-
-\ProvideLength{\marparwidth}[\marginparsep + \marginparwidth]
-\ProvideLength{\contentwidth}[\textwidth + \marparwidth]
-
-\RequirePackage[
+% Lua-Widow-Control Setup.
+\lwcsetup{
 	%debug,
 	balanced,
 	emergencystretch = 3em,
@@ -70,7 +60,10 @@
 	orphanpenalty	=  1000,
 	brokenpenalty	= 10000,
 	nobreak = keep,
-]{lua-widow-control}
+}
+
+\ProvideLength{\marparwidth}[\marginparsep + \marginparwidth]
+\ProvideLength{\contentwidth}[\textwidth + \marparwidth]
 
 \ifthenelse{\boolean{isDraft}}{
 	\lwcsetup{showcolours=true,}