--- trunk/t/3-normalize.t	2006/07/04 11:08:43	579
+++ trunk/t/3-normalize.t	2006/08/23 14:29:43	616
@@ -2,7 +2,7 @@
 
 use strict;
 
-use Test::More tests => 147;
+use Test::More tests => 153;
 use Test::Exception;
 use Cwd qw/abs_path/;
 use blib;
@@ -479,6 +479,22 @@
 		],
 	);
 
+	test_rec_rules(
+		'marc_compose with + subfields',
+		{ '200' => [{ a => 'foo ; bar', b => 42, c => 'baz' }] },
+		qq{
+			marc_compose('900',
+				'a', rec(200,'a'),
+				'+', prefix(" * ", rec(200,'c')),
+				'b', rec(200,'b'),
+				'+', prefix(" : ", rec(200,'c')),
+			);
+		},
+		[
+			[ '900', ' ', ' ', 'a', 'foo ; bar * baz', 'b', '42 : baz' ]
+		],
+	);
+
 	#
 	# test rules
 	#
@@ -628,5 +644,25 @@
 		);
 		$i++;
 	}
+
+	test_rec_rules(
+		'marc_original_order',
+		{
+			'200' => [ {
+				a => [ 'a1', 'a2' ], b => [ 'b1', 'b2' ], c => [ 'c1', 'c2' ],
+				subfields => [ qw/a 0 b 0 a 1 b 1 c 0 c 1/ ],
+			}, {
+				a => [ 'a3', 'a4', 'a5' ], b => 'b3', c => 'c3',
+				subfields => [ qw/a 0 a 1 b 0 c 0 a 2/ ],
+			} ],
+		},
+		qq{
+			marc_original_order(900,200);
+		},
+		[
+			[ '900', ' ', ' ', 'a', 'a1', 'b', 'b1', 'a', 'a2', 'b', 'b2', 'c', 'c1', 'c', 'c2', ],
+			[ '900', ' ', ' ', 'a', 'a3', 'a', 'a4', 'b', 'b3', 'c', 'c3', 'a', 'a5', ],
+		],
+	);
 }