@@ -37,22 +37,15 @@ my %processor = (
3737 proc => sub {
3838 my ($template) = @_;
3939
40− my $slides = escape_for_haskell(slurp "ui/default/slides.js");
41− my $s5core = escape_for_haskell(slurp "ui/default/s5-core.css");
42− my $framing = escape_for_haskell(slurp "ui/default/framing.css");
43− my $pretty = escape_for_haskell(slurp "ui/default/pretty.css");
44− my $opera = escape_for_haskell(slurp "ui/default/opera.css");
45− my $outline = escape_for_haskell(slurp "ui/default/outline.css");
46− my $print = escape_for_haskell(slurp "ui/default/print.css");
47−
48− $template =~ s/\@slides\.js@/$slides/;
49− $template =~ s/\@s5-core\.css@/$s5core/;
50− $template =~ s/\@framing\.css@/$framing/;
51− $template =~ s/\@pretty\.css@/$pretty/;
52− $template =~ s/\@opera\.css@/$opera/;
53− $template =~ s/\@outline\.css@/$outline/;
54− $template =~ s/\@print\.css@/$print/;
55−
40+ my (@files) = qw(slides.js s5-core.css framing.css pretty.css
41+ opera.css outline.css print.css);
42+
43+ foreach my $file (@files) {
44+ my $replacement = escape_for_haskell(slurp "ui/default/$file");
45+ my $escapedfile = $file;
46+ $escapedfile =~ s/\./\\./g;
47+ $template =~ s/\@$escapedfile\@/$replacement/;
48+ }
5649 return $template;
5750 },
5851 },
@@ -79,15 +72,11 @@ my %processor = (
7972 proc => sub {
8073 my ($template) = @_;
8174
82− my $html = escape_for_haskell(slurp "headers/HtmlHeader");
83− my $latex = escape_for_haskell(slurp "headers/LaTeXHeader");
84− my $rtf = escape_for_haskell(slurp "headers/RTFHeader");
85− my $s5 = escape_for_haskell(slurp "headers/S5Header");
86−
87− $template =~ s/\@HtmlHeader@/$html/;
88− $template =~ s/\@LaTeXHeader@/$latex/;
89− $template =~ s/\@RTFHeader@/$rtf/;
90− $template =~ s/\@S5Header@/$s5/;
75+ my (@headers) = split(/\s/,`ls headers`);
76+ foreach my $header (@headers) {
77+ my ($replacement) = escape_for_haskell(slurp "headers/$header");
78+ $template =~ s/\@$header\@/$replacement/;
79+ }
9180
9281 return $template;
9382 },