Moved ASCIIMathML.js, headers, and ui into templates.

Adjusted templates/Makefile and fillTemplates.pl as needed.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1106 788f1e2b-df1e-0410-8736-df70ead52e1b

templates/Makefile

@@ -6,13 +6,13 @@ TARGETS   := Text/Pandoc/ASCIIMathML.hs \
 
 all: $(TARGETS)
 
-Text/Pandoc/ASCIIMathML.hs: ASCIIMathML.hs $(PROCESSOR) $(VPATH)/ASCIIMathML.js
+Text/Pandoc/ASCIIMathML.hs: ASCIIMathML.hs $(PROCESSOR) ASCIIMathML.js
 	perl $(PROCESSOR) $@ $(VPATH)
 
-Text/Pandoc/Writers/S5.hs: S5.hs $(PROCESSOR) $(VPATH)/ui/default/*
+Text/Pandoc/Writers/S5.hs: S5.hs $(PROCESSOR) ui/default/*
 	perl $(PROCESSOR) $@ $(VPATH)
 
-Text/Pandoc/Writers/DefaultHeaders.hs: DefaultHeaders.hs $(PROCESSOR) $(VPATH)/headers/*
+Text/Pandoc/Writers/DefaultHeaders.hs: DefaultHeaders.hs $(PROCESSOR) headers/*
 	perl $(PROCESSOR) $@ $(VPATH)
 
 .PHONY: clean

templates/fillTemplates.pl

@@ -41,7 +41,7 @@ my %processor = (
                          opera.css outline.css print.css);
 
         foreach my $file (@files) {
-	        my $replacement = escape_for_haskell(slurp "ui/default/$file");
+	        my $replacement = escape_for_haskell(slurp "templates/ui/default/$file");
             my $escapedfile = $file;
             $escapedfile =~ s/\./\\./g;
             $template =~ s/\@$escapedfile\@/$replacement/;
@@ -55,7 +55,7 @@ my %processor = (
 	proc     => sub {
 	    my ($template) = @_;
 
-	    my $script = escape_for_haskell(slurp "ASCIIMathML.js"); 
+	    my $script = escape_for_haskell(slurp "templates/ASCIIMathML.js"); 
 	    my $acknowledgements =
 		" ASCIIMathML.js - copyright Peter Jipsen,".
 		" released under the GPL\\nSee ".
@@ -72,9 +72,9 @@ my %processor = (
 	proc     => sub {
 	    my ($template) = @_;
 
-        my (@headers) = split(/\s/,`ls headers`);
+        my (@headers) = split(/\s/,`ls templates/headers`);
         foreach my $header (@headers) {
-           my ($replacement) = escape_for_haskell(slurp "headers/$header");
+           my ($replacement) = escape_for_haskell(slurp "templates/headers/$header");
            $template =~ s/\@$header\@/$replacement/;
         }