Continue work on Chapter 4.

MarginNotes.sty

@@ -13,7 +13,7 @@
 		\index{\glsentryname{#2}}% Add a reference to this in the index.
 		\textbf{#3{#2}}% This is the text that appears on the page.
 		\marginnote{% Create the margin note.
-			\textsf{\textbf{%
+			{\sbfamily\textbf{%
 				\Glsentryname{#2}:% Create the title of the margin note.
 			}}%
 			\glsdesc*{#2}% Create the text of the margin note.
@@ -38,7 +38,7 @@
 	\RequirePackage{changepage}
 	\RequirePackage{ifthen}
 
-	\newcommand{\mfig}[5][0pt]{%
+	\newcommand{\marginfig}[5][0pt]{%
 		% This strut ensures that the margin figure is counted as part of the 
 		% following paragraph and is vertically aligned with it.
 		\strut% 
@@ -57,15 +57,9 @@
 					justification = raggedleft,%
 				}%
 			}%
-			{\centering#5{#2}\par}%
-			\captionof{figure}{#4}%
-			\label{fig:#3}%
+			{\centering\includegraphics[keepaspectratio,#3]{#2}\par}%
+			\captionof{figure}{#5}%
+			\label{fig:#4}%
 		}[#1]%
 	}
-	\newcommand{\marginfig}[4][0pt]{%
-		\mfig[#1]{#2}{#3}{#4}{\includegraphics}%
-	}
-	\newcommand{\marginfigw}[5][0pt]{%
-		\mfig[#1]{#2}{#3}{#4}{\includegraphics[keepaspectratio,width=#5]}%
-	}
 %#endregion