--- burst.pl	2001/05/08 23:03:03	1.14
+++ burst.pl	2001/09/18 12:50:15	1.21
@@ -135,45 +135,53 @@
 
 my $pack = 0;
 my @pack_additional;	# additional files to pack (pictures, logos...)
+my %nesttag = init_nesttag();
 
 ##############################################################################
 ## 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;
 
-# read parameters from infos.txt and put them in @PARAM
-if (open(INFOS, $infos)) {
-	print STDERR "--- Reading parameters file $infos ---\n";
-	local(@file);
-	@file = <INFOS>;
-#	@PARAM = ();	# don't reset param, use @ARGV
+##############################################################################
+sub parse_infos {
+	my @file=@_;
 	do {
 		if ($file[0] && $file[0] =~ /^[^#\n\r]/) {
 			$file[0] =~ s/\n//;    # remove UNIX \n 
 			$file[0] =~ s/\r//;    # remove WINDOWS \r    
-			$file[0] =~ s/ *= */=/;
-			push @PARAM,$file[0];
+			my ($var,$value) = split(/ *= */,$file[0],2);
+			$value=~s/'/\\'/g;
+			$cmd="\$$var = \'$value\';";
+			if (defined($value)) {
+				eval($cmd) || warn "problem with eval of: $cmd";
+			} else {
+				die "no value defined for $var";
+			}
 			print STDERR "$file[0]\n";
 		}
 	} while (shift(@file));
 }
-## @PARAM is now a table with the user preferences for his presentation
+##############################################################################
 
-## process arguments
-## each preset variable is now re-attributed using the user preferences
-foreach (@PARAM) {
-	my ($var,$value) = split(/ *= */,$_,2);
-	$value=~s/'/\\'/g;
-	$cmd="\$$var = \'$value\';";
-	if ($value) {
-		eval($cmd) || die "problem with eval of: $cmd";
-	} else {
-		die "no value defined for $var";
-	}
+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";
+	@file = <INFOS>;
+	parse_infos(@file);
+}
+
+# try to read local infos.txt for template
+if (-f "$template/$infos" && open(INFOS,"$template/$infos")) {
+	print STDERR "--- Reading template parameters file $template/$infos ---\n";
+	@file = <INFOS>;
+	parse_infos(@file);
+	close(INFOS);
 }
 
+## @PARAM is now a table with the user preferences for his presentation
+
 ## use charset
 
 if ($charset) {
@@ -381,11 +389,12 @@
 		author => $author,
 		authorUrl => $authorUrl,
 		author2 => $author2,
-		authorUrl2 => $authorUrl2,
+		author2Url => $author2Url,
 
 		date => $date,
 
-		toc => $loc_toc,
+		toc_title => $loc_toc,
+		template_dir => "$template/",
 	);
 
 }
@@ -402,6 +411,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); 
@@ -418,6 +428,7 @@
 	my ($title,$subtitle,$nr) = @_;
 	$title =~ s/\r//ig;      # remove the windows CR+LF 
 	$title =~ s/<[^>]+>//g;
+	$subtitle =~ s/<[^>]+>//g;
 
 	if (! $title) {
 		return 1;
@@ -515,11 +526,13 @@
 	$content =~ s/<\/body>//i; # remove if any
 	$content =~ s/<\/html>//i; # remove if any
 
-	$status = sprintf "Slide %2d: %s %s\n", $nr, $title, $subtitle;
+	$status = sprintf "Slide %2d: %s %s", $nr, $title, $subtitle;
 	$status =~ s/<[^>]+>//g;
-	print STDERR $status;
+	$status =~ s/[\n\r]+/ /g;
+	print STDERR "$status\n";
 
-	&verify_html($content);    # check the html
+	&verify_html($content);		# check the html
+	&check_tags($content);		# check open and closed tags
 
 	## write to the slide
 	open(SLIDE, ">slide$nr.html") || die "can't save slide$nr.html: $!";
@@ -578,17 +591,19 @@
 		toc_link => $toc_link,
 		next_link => $next_link,
 		prev_title => $prev_title,
+		toc_title => $loc_toc,
 		next_title => $next_title,
 
 		author => $author,
 		authorUrl => $authorUrl,
 		author2 => $author2,
-		authorUrl2 => $authorUrl2,
+		author2Url => $author2Url,
 
 		date => $date,
 
 		slide_html => $slide_html,
 
+		template_dir => "$template/",
 	);
 
 	my $page;
@@ -597,8 +612,14 @@
 	} else {
 		$page= new Text::FastTemplate key => 'title';
 	}
-	print SLIDE $page->output( \%page_data );
-	extract_files($page->output( \%page_data )) if ($pack);
+
+	if ($pack) {
+		$page_data{template_dir}='';
+		print SLIDE extract_files($page->output( \%page_data ));
+	} else {
+		print SLIDE $page->output( \%page_data );
+	}
+
 	close(SLIDE);
 	return 0;
 }
@@ -684,7 +705,7 @@
 	my $pcnt_done=int($nr*100/$total);
 	my $pcnt_left=100-$pcnt_done;
 
-	if ($progress_bar) {
+	if ($progress_bar && uc($progress_bar) ne "NO") {
 		my $l=$r="&nbsp;";
 		my $t="$nr of $total";
 		if ($pcnt_done > 50) {
@@ -692,7 +713,14 @@
 		} else {
 			$r=$t;
 		}
-		$html='<table border="0" width="50%" cellpadding="0" cellspacing="0" align="right"><tr><td width="'.$pcnt_done.'%" class="pcnt-done">'.$l.'</td><td width="'.$pcnt_left.'%" class="pcnt-left">'.$r.'</td></tr></table>';
+		$html='<table border="0" width="50%" cellpadding="0" cellspacing="0" align="right"><tr>';
+		if ($pcnt_done != 0) {
+			$html.='<td width="'.$pcnt_done.'%" class="pcnt-done">'.$l.'</td>';
+		}
+		if ($pcnt_left != 0) {
+			$html.='<td width="'.$pcnt_left.'%" class="pcnt-left">'.$r.'</td>';
+		}
+		$html.='</tr></table>';
 	} else {
 		$html="$loc_slide $nr $loc_of $total";
 	}
@@ -709,14 +737,129 @@
 }
 
 ##############################################################################
-# extract files referenced in presentation
+# extract files referenced in presentation and remove dirs from slide html
 
 sub extract_files {
-	my $tmp = $_[0];
-	while ($tmp =~ s/<a\s+href="*([^"\s]+)"*//ism ||
-		$tmp =~ s/<img\s+src="*([^"\s]+)"*//ism) {
+	my $tmp = $slide = $_[0];
+	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;
+			my $file=$1;
+			push @pack_additional,$file;
+			if ($file =~ m,^(.+)/([^/]+),) {
+				my ($d,$f) = ($1,$2);
+				$slide =~ s,${d}/${f},${f},g;
+			}
+		}
+	}
+	return $slide;
+}
+
+##############################################################################
+# check tags in slide
+# based on code from hindent 1.1.2 by Paul Balyoz <pab@domtools.com>
+
+sub init_nesttag {
+# Tags that require their own end tag <TAG>...</TAG> we will nest them
+# properly:   (WARNING, you must use lower-case here)
+# All other tags (not on this list) will be ignored for indenting purposes.
+return (
+	'html' => 1,
+	'head' => 1,
+	'body' => 1,
+	'title' => 1,
+
+	'a' => 1,
+
+	'table' => 1,
+	'tr' => 1,
+	'th' => 1,
+	'td' => 1,
+
+	'form' => 1,
+	'select' => 1,
+	'textarea' => 1,
+
+#	'p' => 1,      Don't do this one because many people use <P> but not </P>
+	'ul' => 1,
+	'ol' => 1,
+	'dl' => 1,
+	'blockquote' => 1,
+	'center' => 1,
+	'div' => 1,
+
+	'font' => 1,
+	'pre' => 1,
+	'tt' => 1,
+	'i' => 1,
+	'b' => 1,
+	'u' => 1,
+	'strike' => 1,
+	'big' => 1,
+	'small' => 1,
+	'sub' => 1,
+	'sup' => 1,
+	'em' => 1,
+	'strong' => 1,
+	'dfn' => 1,
+	'code' => 1,
+	'samp' => 1,
+	'kbd' => 1,
+	'var' => 1,
+	'cite' => 1,
+
+	'h1' => 1,
+	'h2' => 1,
+	'h3' => 1,
+	'h4' => 1,
+	'h5' => 1,
+	'h6' => 1,
+
+	'applet' => 1,
+
+	'map' => 1,
+
+	'frameset' => 1,
+	'noframes' => 1,
+);
+}
+
+sub check_tags {
+	my $tmp = $_[0];
+	my @tagstack;
+	my $level=0;
+
+	while ($tmp =~ /<(.*?)>/gsm) {
+		my $tag=$1; $tag=~s/\s.+//g;
+		# if regular tag, push it on stack; if end-tag, pop it off stack.
+		# but don't do any of this if it's not a special "nesting" tag!
+		if ($tag !~ m,^/,) {
+			if ($nesttag{lc($tag)}) {
+				push @tagstack,$tag;
+				$level++;		# remember how much for later
+			}
+		} else {
+			$tag =~ s,^/,,;		# convert this end-tag to a begin-tag
+			$tag = lc($tag);
+			if ($nesttag{lc($tag)}) {
+				# throw away tags until we find a match
+				if ($#tagstack > -1) {
+					while ($tag ne lc(pop @tagstack)) {
+						$level--;	# we threw away extra tags
+						last if $#tagstack <= 0;
+					}
+					$level--;	# we threw away extra tags
+					if ($level < 0) {
+						print STDERR "WARNING: more end than begin tags around </$tag> !\n";
+					}
+				}
+			}
 		}
 	}
+
+	if ($level > 0) {
+		print STDERR "WARNING: level=$level, ", $#tagstack+1," tags left on stack after done parsing!  Specifically:\n<",join("> <",@tagstack),">\n";
+	}
+
 }
+