--- burst.pl 2001/05/08 07:51:54 1.11 +++ burst.pl 2001/05/11 14:17:27 1.16 @@ -53,7 +53,7 @@ ## ## show debug output -my $debug=1; +my $debug=0; ## default DOCTYPE added on the slides $doctype = ''; @@ -133,6 +133,9 @@ my %page_data; my %overview_data; +my $pack = 0; +my @pack_additional; # additional files to pack (pictures, logos...) + ############################################################################## ## reading user input from $infos ## @@ -140,38 +143,46 @@ # of the slidemaker tool #when the parameters were in Makefile or make.bat -# read parameters from infos.txt and put them in @PARAM -if (open(INFOS, $infos)) { - print STDOUT "--- Reading parameters file $infos ---\n"; - local(@file,$counter); - $counter = 0; - @file = ; - @PARAM = (); +my @file; + +############################################################################## +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/ *= */=/; - $PARAM[$counter++] = $file[0]; - print "$file[0]\n"; + 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"; - } +# read parameters from infos.txt and put them in @PARAM +if (open(INFOS, $infos)) { + print STDERR "--- Reading parameters file $infos ---\n"; + @file = ; + 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 = ; + parse_infos(@file); + close(INFOS); +} + +## @PARAM is now a table with the user preferences for his presentation + ## use charset if ($charset) { @@ -180,6 +191,7 @@ $http_equiv=''; } + ############################################################################## ## read the raw html presentation ## @@ -189,6 +201,7 @@ $/ = undef; open(ALL, $all) || die "Error: Cannot open file: $all"; my $buf = ; +$buf =~ s/\r//g; # remove WINDOWS \r close(ALL); $/ = $sep; @@ -196,6 +209,14 @@ ## they do not need to show up on the slides $buf =~ s///sgo; +## if $pack is set, output name of css (for inclusion in archive), but +## reset $cssStandard only to filename (without path) + +if ($pack) { + push @pack_additional,$cssStandard; + $cssStandard =~ s/^.*\/([^\/]+)$/$1/g; +} + ## the slidemaker tool assumes that each slide is self contained between 2 sets of h1 tags ## if not it will generate a rather weird output ## split using and as separator (ignores attributes!) @@ -215,7 +236,7 @@ ############################################################################## ## processing the slides -print STDOUT "\n--- Processing $total slides ---\n"; +print STDERR "\n--- Processing $total slides ---\n"; ## generate the header table of content of the presentation ## which is also the first page of the talk @@ -232,6 +253,7 @@ Text::FastTemplate->preload( [ { file => 'slide.html', key => 'slide' }, { file => 'overview.html', key => 'overview' }, + { file => 'title.html', key => 'title' }, ]); ## unroll relative anchors (#something) into links with slides @@ -243,7 +265,7 @@ my $tmp = $table[($i*2)].$table[($i*2)+1]; while ($tmp =~ s,,,i) { $anchor_on_slide{$1}=($i+1); - print "\tslide ",($i+1)," anchor: $1\n" if ($debug); + print STDERR "\tslide ",($i+1)," anchor: $1\n" if ($debug); } } @@ -322,8 +344,10 @@ ## and would not work on all platforms (ie would fail on Joe's laptop) &generateTOC; +## print additional files to pack +print STDOUT join("\n",@pack_additional) if ($pack); -print STDOUT "--- Finished ---\n"; +print STDERR "--- Finished ---\n"; exit 0; ## ## end of the slidemaker main program @@ -337,6 +361,7 @@ { ## open the file to write to open(FOO, ">$_[0].html") || die "can't open $_[0].html: $!"; + push @pack_additional,"$_[0].html" if ($pack); ## the style sheet used in the table of content is $stylelink = ""; @@ -369,7 +394,8 @@ date => $date, - toc => $loc_toc, + toc_title => $loc_toc, + template => $template, ); } @@ -501,12 +527,13 @@ $status = sprintf "Slide %2d: %s %s\n", $nr, $title, $subtitle; $status =~ s/<[^>]+>//g; - print STDOUT $status; + print STDERR $status; &verify_html($content); # check the html ## write to the slide open(SLIDE, ">slide$nr.html") || die "can't save slide$nr.html: $!"; + push @pack_additional,"slide$nr.html" if ($pack); my $toc_link = "$overview\.html"; @@ -531,6 +558,12 @@ my $slide_html=make_progress_bar($nr,$total); + # undefine body if no content is found (so that template can show + # only title and sub-title + if ($content !~ m/\S/g) { + undef $content; + } + %page_data = ( doctype => $doctype, talkTitle => $talkTitle, @@ -555,6 +588,7 @@ toc_link => $toc_link, next_link => $next_link, prev_title => $prev_title, + toc_title => $loc_toc, next_title => $next_title, author => $author, @@ -566,11 +600,17 @@ slide_html => $slide_html, + template => $template, ); - my $page= new Text::FastTemplate key => 'slide'; + my $page; + if ($content) { + $page= new Text::FastTemplate key => 'slide'; + } else { + $page= new Text::FastTemplate key => 'title'; + } print SLIDE $page->output( \%page_data ); - + extract_files($page->output( \%page_data )) if ($pack); close(SLIDE); return 0; } @@ -618,8 +658,8 @@ if ($_[0] =~ /]*)>/im) { if (!($1 =~ /ALT=/im)) { - print STDOUT "WARNING: without ALT\n"; - print STDOUT " \n" ; + print STDERR "WARNING: without ALT\n"; + print STDERR " \n" ; } } } @@ -656,7 +696,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=" "; my $t="$nr of $total"; if ($pcnt_done > 50) { @@ -664,7 +704,14 @@ } else { $r=$t; } - $html='
'.$l.''.$r.'
'; + $html=''; + if ($pcnt_done != 0) { + $html.=''; + } + if ($pcnt_left != 0) { + $html.=''; + } + $html.='
'.$l.''.$r.'
'; } else { $html="$loc_slide $nr $loc_of $total"; } @@ -673,9 +720,22 @@ } ############################################################################## -# make slide progress bar +# remove anchors from html (for titles) sub remove_anchor { my $tmp = $_[0]; $tmp =~ s/(.*)]*>(.*)<\/A>(.*)/$1$2$3/ig; return $tmp; } + +############################################################################## +# extract files referenced in presentation + +sub extract_files { + my $tmp = $_[0]; + while ($tmp =~ s/