- Improve wrap objects.

- Debug.

packages/Caption.sty

@@ -40,7 +40,7 @@
 	figure	.code:n		= {\str_set:Nn \l_MyCaption_type_str {figure}},
 
 	format	.cs_set_protected:Np	= \__MyCaption_format:,
-	format	.initial:n	= {\__MyCaption_format_default:},
+	format	.initial:n	= {},%{\__MyCaption_format_default:},
 
 	skip	.tl_set:N	= \l_MyCaption_skip_tl,
 	skip	.initial:n	= {\medskipamount},
@@ -63,7 +63,7 @@
 	% #1: Key-value options.
 	O{}
 	% #2: Label
-	m
+	>{\TrimSpaces}m
 	% #3: Caption
 	m
 }{
@@ -100,7 +100,7 @@
 
 \cs_new:Nn \__MyCaption_insert_caption:nn {
 	\setlength{\parskip}{\l_MyCaption_skip_tl}\par
-	\__MyCaption_format:
+	\__MyCaption_format_default: \__MyCaption_format:
 	\l_MyCaption_label_str{}~\l_MyCaption_number_str :~#2
 	\label{#1}
 	\par