--- trunk/t/3-normalize.t	2006/07/02 21:17:54	566
+++ trunk/t/3-normalize.t	2006/07/03 14:30:22	571
@@ -2,7 +2,7 @@
 
 use strict;
 
-use Test::More tests => 107;
+use Test::More tests => 112;
 use Test::Exception;
 use Cwd qw/abs_path/;
 use blib;
@@ -150,9 +150,10 @@
 	$eval_t = substr($eval_t,0,$max_eval_output) . '...' if (length($eval_t) > $max_eval_output);
 	$eval_t =~ s/\\/\\\\/gs;
 
-	my $v = eval "$t";
-	ok(! $@, $@ ? dump_error($@, $t) : "eval: $eval_t");
-	$v;
+	my @__ret;
+	eval "\@__ret = $t";
+	ok(! $@, $@ ? dump_error($@, $t) : "eval: $eval_t = " . dump(@__ret));
+	return \@__ret;
 }
 
 {
@@ -496,25 +497,25 @@
 		'split_rec_on',
 		{ '200' => [{ a => 'foo ; bar', b => 42, c => 'baz' }] },
 		qq{ split_rec_on('200','a', qr/\\s*;\\s*/, 1) },
-		'foo',
+		[ 'foo' ],
 	);
 	test_rule(
 		'split_rec_on',
 		{ '200' => [{ a => 'foo ; bar', b => 42, c => 'baz' }] },
 		qq{ split_rec_on('200','a', qr/\\s*;\\s*/, 2) },
-		'bar',
+		[ 'bar' ],
 	);
 	test_rule(
 		'split_rec_on no part',
 		{ '200' => [{ a => 'foo ; bar', b => 42, c => 'baz' }] },
-		q! split_rec_on('200','a', qr/\\s*;\\s*/) !,
+		qq{ split_rec_on('200','a', qr/\\s*;\\s*/) },
 		[ 'foo', 'bar' ],
 	);
 	test_rule(
 		'split_rec_on no record',
 		{},
 		qq{ split_rec_on('200','a', qr/\\s*;\\s*/) },
-		'',
+		[ '' ],
 	);
 
 	test_rec_rules(
@@ -543,5 +544,24 @@
 	ok(marc_leader(), 'marc_leader get');
 	diag "leader: ", dump(marc_leader()) if ($debug);
 	is_deeply(marc_leader(), { '06' => 42, 11 => 5 }, "marc_leader full");
+
+	_debug(2);
+	test_rule(
+		'rec1(000)',
+		{ '000' => [ 42 ]},
+		qq{ rec('000') },
+		[ 42 ],
+	);
+
+	test_rec_rules(
+		'marc_compose+split_rec_on',
+		{ '000' => [ 42 ]},
+		qq{
+			marc('001', rec('000') );
+		},
+		[
+			[ '001', ' ', ' ', 42, ]
+		],
+	);
 }