From b2fa8c7dd2a4ed11413caa20af66ee9987f84e16 Mon Sep 17 00:00:00 2001
From: fiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b>
Date: Thu, 29 Nov 2007 02:03:04 +0000
Subject: [PATCH] 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
---
ASCIIMathML.js => templates/ASCIIMathML.js | 0
templates/Makefile | 6 +++---
templates/fillTemplates.pl | 8 ++++----
{headers => templates/headers}/ConTeXtHeader | 0
{headers => templates/headers}/DocbookHeader | 0
{headers => templates/headers}/LaTeXHeader | 0
{headers => templates/headers}/RTFHeader | 0
{headers => templates/headers}/S5Header | 0
{ui => templates/ui}/default/blank.gif | Bin
{ui => templates/ui}/default/bodybg.gif | Bin
{ui => templates/ui}/default/framing.css | 0
{ui => templates/ui}/default/iepngfix.htc | 0
{ui => templates/ui}/default/opera.css | 0
{ui => templates/ui}/default/outline.css | 0
{ui => templates/ui}/default/pretty.css | 0
{ui => templates/ui}/default/print.css | 0
{ui => templates/ui}/default/s5-core.css | 0
{ui => templates/ui}/default/slides.css | 0
{ui => templates/ui}/default/slides.js | 0
19 files changed, 7 insertions(+), 7 deletions(-)
rename ASCIIMathML.js => templates/ASCIIMathML.js (100%)
rename {headers => templates/headers}/ConTeXtHeader (100%)
rename {headers => templates/headers}/DocbookHeader (100%)
rename {headers => templates/headers}/LaTeXHeader (100%)
rename {headers => templates/headers}/RTFHeader (100%)
rename {headers => templates/headers}/S5Header (100%)
rename {ui => templates/ui}/default/blank.gif (100%)
rename {ui => templates/ui}/default/bodybg.gif (100%)
rename {ui => templates/ui}/default/framing.css (100%)
rename {ui => templates/ui}/default/iepngfix.htc (100%)
rename {ui => templates/ui}/default/opera.css (100%)
rename {ui => templates/ui}/default/outline.css (100%)
rename {ui => templates/ui}/default/pretty.css (100%)
rename {ui => templates/ui}/default/print.css (100%)
rename {ui => templates/ui}/default/s5-core.css (100%)
rename {ui => templates/ui}/default/slides.css (100%)
rename {ui => templates/ui}/default/slides.js (100%)
diff --git a/ASCIIMathML.js b/templates/ASCIIMathML.js
similarity index 100%
rename from ASCIIMathML.js
rename to templates/ASCIIMathML.js
diff --git a/templates/Makefile b/templates/Makefile
index 9522666c5..db62173cf 100644
--- a/templates/Makefile
+++ b/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
diff --git a/templates/fillTemplates.pl b/templates/fillTemplates.pl
index 85e6eaa18..83c01a28e 100755
--- a/templates/fillTemplates.pl
+++ b/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/;
}
diff --git a/headers/ConTeXtHeader b/templates/headers/ConTeXtHeader
similarity index 100%
rename from headers/ConTeXtHeader
rename to templates/headers/ConTeXtHeader
diff --git a/headers/DocbookHeader b/templates/headers/DocbookHeader
similarity index 100%
rename from headers/DocbookHeader
rename to templates/headers/DocbookHeader
diff --git a/headers/LaTeXHeader b/templates/headers/LaTeXHeader
similarity index 100%
rename from headers/LaTeXHeader
rename to templates/headers/LaTeXHeader
diff --git a/headers/RTFHeader b/templates/headers/RTFHeader
similarity index 100%
rename from headers/RTFHeader
rename to templates/headers/RTFHeader
diff --git a/headers/S5Header b/templates/headers/S5Header
similarity index 100%
rename from headers/S5Header
rename to templates/headers/S5Header
diff --git a/ui/default/blank.gif b/templates/ui/default/blank.gif
similarity index 100%
rename from ui/default/blank.gif
rename to templates/ui/default/blank.gif
diff --git a/ui/default/bodybg.gif b/templates/ui/default/bodybg.gif
similarity index 100%
rename from ui/default/bodybg.gif
rename to templates/ui/default/bodybg.gif
diff --git a/ui/default/framing.css b/templates/ui/default/framing.css
similarity index 100%
rename from ui/default/framing.css
rename to templates/ui/default/framing.css
diff --git a/ui/default/iepngfix.htc b/templates/ui/default/iepngfix.htc
similarity index 100%
rename from ui/default/iepngfix.htc
rename to templates/ui/default/iepngfix.htc
diff --git a/ui/default/opera.css b/templates/ui/default/opera.css
similarity index 100%
rename from ui/default/opera.css
rename to templates/ui/default/opera.css
diff --git a/ui/default/outline.css b/templates/ui/default/outline.css
similarity index 100%
rename from ui/default/outline.css
rename to templates/ui/default/outline.css
diff --git a/ui/default/pretty.css b/templates/ui/default/pretty.css
similarity index 100%
rename from ui/default/pretty.css
rename to templates/ui/default/pretty.css
diff --git a/ui/default/print.css b/templates/ui/default/print.css
similarity index 100%
rename from ui/default/print.css
rename to templates/ui/default/print.css
diff --git a/ui/default/s5-core.css b/templates/ui/default/s5-core.css
similarity index 100%
rename from ui/default/s5-core.css
rename to templates/ui/default/s5-core.css
diff --git a/ui/default/slides.css b/templates/ui/default/slides.css
similarity index 100%
rename from ui/default/slides.css
rename to templates/ui/default/slides.css
diff --git a/ui/default/slides.js b/templates/ui/default/slides.js
similarity index 100%
rename from ui/default/slides.js
rename to templates/ui/default/slides.js