Expand and harmonize color sets.

packages/Layout.sty

@@ -34,20 +34,21 @@
 
 % Redefine the commands geometry uses to draw the page frame to customize the
 % color.
-\renewcommand{\Gm@vrule}{\color{layoutColor}\vrule width 0.2pt height\textheight depth\z@}
-\renewcommand{\Gm@hrule}{\color{layoutColor}\hrule height 0.2pt depth\z@ width\textwidth}
-\renewcommand{\Gm@hruled}{\color{layoutColor}\hrule height\z@ depth0.2pt width\textwidth}
+\renewcommand{\Gm@vrule}{\color{layout}\vrule width 0.2pt height\textheight depth\z@}
+\renewcommand{\Gm@hrule}{\color{layout}\hrule height 0.2pt depth\z@ width\textwidth}
+\renewcommand{\Gm@hruled}{\color{layout}\hrule height\z@ depth0.2pt width\textwidth}
 
 % Suppress "Underfull \hbox" infos.
 \hbadness=10000
 
 \ifthenelse{\boolean{isDraft}}{
 	\geometry{showframe}
-	\hfuzz = 2.0pt
+	\hfuzz = 0.5pt
+	\vfuzz = 0.0pt
 }{
 	% Suppress small overfull infos.
 	\hfuzz = 6.0pt
-	\vfuzz = 0.0pt
+	\vfuzz = 8.0pt
 }
 
 \ifthenelse{\boolean{isElectronic}}{
@@ -63,15 +64,23 @@
 \providelength{\contentwidth}[\textwidth + \marparwidth]
 
 \RequirePackage[
+	debug,
 	balanced,
+	emergencystretch = 3em,
+	max-cost		= 25000,
+	widowpenalty	=  1000,
+	orphanpenalty	=  1000,
+	brokenpenalty	= 10000,
+	nobreak = keep,
 ]{lua-widow-control}
+
 \ifthenelse{\boolean{isDraft}}{
-	\lwcsetup{draft=false,showcolours=true}
+	\lwcsetup{showcolours=true,}
 }{}
 
 % Paragraph formatting.
 \setlength{\parindent}{0pt}
-\setlength{\parskip}{\medskipamount}
+\setlength{\parskip}{6pt plus 3pt minus 3pt}
 
 % Float Page Configuration
 \renewcommand{\topfraction}{0.9}	% max fraction of floats at top
@@ -130,9 +139,9 @@
 		\begin{SmartAdjustWidth}{-#2}{-#2 * \real{#4}}% adjustwidth(*)
 			\begin{minipage}{\linewidth}%{#2 * (#4 + 1) + \textwidth}%
 				\ifthenelse{\boolean{isDraft}}{%
-					{\color{layoutColor}\rule{\textwidth}{1pt}\zws}%
+					{\color{layout}\rule{\textwidth}{1pt}\zws}%
 					#5%
-					%{\color{layoutColor}\rule{\textwidth}{1pt}}%
+					%{\color{layout}\rule{\textwidth}{1pt}}%
 				}{%
 					#5%
 				}%