--- burst.pl	2001/05/11 14:17:27	1.16
+++ burst.pl	2001/05/11 22:04:54	1.17
@@ -139,10 +139,6 @@
 ##############################################################################
 ## reading user input from $infos
 ##
-@PARAM = @ARGV; # we keep this for backward compatibility with an old version
-                # of the slidemaker tool
-                #when the parameters were in Makefile or make.bat
-
 my @file;
 
 ##############################################################################
@@ -166,6 +162,8 @@
 }
 ##############################################################################
 
+parse_infos(@ARGV);	# backward compatibility and for pack
+
 # read parameters from infos.txt and put them in @PARAM
 if (open(INFOS, $infos)) {
 	print STDERR "--- Reading parameters file $infos ---\n";
@@ -395,7 +393,7 @@
 		date => $date,
 
 		toc_title => $loc_toc,
-		template => $template,
+		template_dir => "$template/",
 	);
 
 }
@@ -412,6 +410,7 @@
 	$overview_data{toc_entries} = [ @toc_entries ];
 
 	my $page= new Text::FastTemplate key => 'overview';
+	$page_data{template_dir}='' if ($pack);
 	print FOO $page->output( \%overview_data );
 
 	close(FOO); 
@@ -600,7 +599,7 @@
 
 		slide_html => $slide_html,
 
-		template => $template,
+		template_dir => "$template/",
 	);
 
 	my $page;
@@ -609,6 +608,7 @@
 	} else {
 		$page= new Text::FastTemplate key => 'title';
 	}
+	$page_data{template_dir}='' if ($pack);
 	print SLIDE $page->output( \%page_data );
 	extract_files($page->output( \%page_data )) if ($pack);
 	close(SLIDE);
@@ -732,8 +732,8 @@
 
 sub extract_files {
 	my $tmp = $_[0];
-	while ($tmp =~ s/<a\s+href="*([^"\s]+)"*//ism ||
-		$tmp =~ s/<img\s+src="*([^"\s]+)"*//ism) {
+	while ($tmp =~ s/href="*([^"\s]+)"*//ism ||
+		$tmp =~ s/src="*([^"\s]+)"*//ism) {
 		if ("$1" !~ m/[hf]t?tp:/ && -f "$1" && !grep(/$1/,@pack_additional)) {
 			push @pack_additional,$1;
 		}