- Fix WrapBoxout.

- Migrate from wrapfig2 to wrapstuff.
- Miscellaneous improvements.

packages/Marginalia.sty

@@ -9,9 +9,9 @@
 	ysep	= {\parskip},
 	ysep page bottom = {
 		- 1in	% Top gutter
-		+ \paperheight 
-		- \voffset 
-		- \topmargin 
+		+ \paperheight
+		- \voffset
+		- \topmargin
 		- \headheight
 		- \headsep
 		- \textheight
@@ -29,7 +29,7 @@
 	}
 }
 
-% Put a glossary definition in a margin paragraph. 
+% Put a glossary definition in a margin paragraph.
 \NewDocumentCommand{\mdef}{O{} m m}{%
 	\index{\glsentryname{#2}}% Add a reference to this in the index.
 	\strong{#3{#2}}% This is the text that appears on the page.
@@ -64,7 +64,7 @@
 \NewDocumentCommand{\marginfig}{O{} m m +m}{%
 	% Syntax:
 	% \marginfig[
-	%	(width|height)=lengthvalue, or any other optional \includegraphics 
+	%	(width|height)=lengthvalue, or any other optional \includegraphics
 	%		parameters
 	% ]{
 	%	graphic_file_name
@@ -74,17 +74,21 @@
 	%	caption
 	% }
 	%
-	% This strut ensures that the margin figure is counted as part of the 
+	% This strut ensures that the margin figure is counted as part of the
 	% following paragraph and is vertically aligned with it.
-	\strut% 
+	\strut%
 	\marginalia{%
 		\MarginHyperSetup%
-		\captionsetup{%
-			type = figure,%
-			justification = RaggedOutside,%
-		}%
-		\Centering\includegraphics[keepaspectratio,#1]{#2}\par%
-		\noindent\captionof{figure}{#4}%
-		\label{fig:#3}%
+		% \captionsetup{%
+		% 	type = figure,%
+		% 	justification = RaggedOutside,%
+		% }%
+		\begin{MyCaption}[
+			format={\RaggedOutside\small\color{caption}}
+		]{fig:#3}{#4}
+			\Centering\includegraphics[keepaspectratio,#1]{#2}%
+		\end{MyCaption}
+		% \noindent\captionof{figure}{#4}%
+		% \label{fig:#3}%
 	}%
 }