- Replace MarginNote package with Marginalia.

- Miscellaneous cleanup.

Graphics.sty

@@ -17,6 +17,19 @@
 	},
 }
 
+% Define a justification style that is ragged on the side toward the outside of
+% the page. I. e.
+\RequirePackage{changepage}
+%\RequirePackage{ifthen}
+\DeclareCaptionJustification{raggedoutside}{
+	\checkoddpage
+	\ifoddpage
+		\raggedright
+	\else
+		\raggedleft
+	\fi
+}
+
 \RequirePackage{calc}
 
 \RequirePackage{wrapfig2}
@@ -63,6 +76,21 @@
 }
 
 \newcommand{\wrapfig}[6][0in]{%
+	% Syntax:
+	% \wrapfig[
+	%	horizontal_offset
+	% ]{
+	%	graphic_file
+	% }{
+	%	alignment [l,r,i,o]
+	% }{
+	%	(width|height)=lengthvalue
+	% }{
+	%	label
+	% }{
+	%	caption
+	% }
+	%
 	\begin{wrapfigure}{#3}[#1]%
 		\captionsetup{type=figure}%
 		\capstart%