Merge previous changes, clean up margin note formatting.

PrimeManual.sty

@@ -89,6 +89,10 @@
 %#region
 	\RequirePackage{graphicx}
 	\RequirePackage{calc}
+	
+	\newcommand{\ig}[2][0.5in]{
+		\includegraphics[keepaspectratio,width=#1]{graphics/#2}
+	}
 %#endregion
 
 % Define custom title page.
@@ -109,11 +113,11 @@
 					% Move the rule graphic to 0.25 in from the left edge of the 
 					% paper and vertically centered on the heartbeat graphic.
 					\put(-\oddsidemargin-0.75in,10pt){
-						\includegraphics{graphics/prime_rule.pdf}
+						\includegraphics{graphics/title/prime_rule.pdf}
 					}
 					% The numbers here are just what looks good.
 					\put(100pt,0pt){
-						\includegraphics{graphics/prime_heartbeat.pdf}
+						\includegraphics{graphics/title/prime_heartbeat.pdf}
 					}
 				}
 				
@@ -137,14 +141,8 @@
 
 % Table formatting.
 %#region
-	%\renewcommand{\arraystretch}{1.5}
-	\RequirePackage{csvsimple}
-	\RequirePackage{longtable}
-	\RequirePackage{colortbl}
-	\RequirePackage{booktabs}
 	\RequirePackage{tabularray}
-
+	\RequirePackage{csvsimple-l3}
-	\newcommand{\bandedrows}{\rowcolors{2}{white}{gray!10}}
 %#endregion
 
 % Glossary formatting.
@@ -162,21 +160,14 @@
 % Margin Note formatting.
 %#region
 	\RequirePackage{marginnote}
-	% -38pt seems to be just the right vertical adjustment to align margin notes
-	% with the reference in the text.
-	%\renewcommand{\marginnotevadjust}{-38pt}
 	\renewcommand{\marginfont}{\small\color{PrimeBlue}}
 
-	% Title formatting for margin notes.
-	%\newcommand{\margintitle}[1]{\paragraph{\textbf{#1}}}
-
 	% Put a glossary definition in a margin note. 
 	% Optional parameter is vertical adjustment of the note.
 	\newcommand{\margindef}[2][0pt]{%
 		\index{\glsentryname{#2}}% Add a reference to this in the index.
 		\textbf{\gls{#2}}% This is the text that appears on the page.
 		\marginnote{% Create the margin note.
-			%\marginfont
 			\textsf{\textbf{
 				\Glsentryname{#2}:% Create the title of the margin note.
 			}}
@@ -189,18 +180,14 @@
 	\newcommand{\mnote}[2][0pt]{%
 		\footnotemark
 		\marginnote{
-			%\marginfont
 			\footnotemark[\value{footnote}]#2}[#1]
 	}
 
 	\RequirePackage[hypcap=true]{caption}
 	\newcommand{\marginfig}[2]{%
 		\marginnote{
-			%\marginfont
+			\captionsetup{type=figure}%
-			\captionsetup{type=figure}
+			{\centering\includegraphics{#1}\par}
-			\begin{center}
-				\includegraphics{#1}
-			\end{center}
 			\captionof{figure}{#2}
 		}
 	}
@@ -237,6 +224,7 @@
 	}
 	\newcommand{\lblTable}[2][]{
 		\textbf{\lblGeneral[#1]{#2}{\caption}{tbl}}
+		\smallskip
 	}
 	\newcommand{\lblFigure}[2][]{
 		\textbf{\lblGeneral[#1]{#2}{\caption}{fig}}