31a956b · typeable/pandoc

git.iko.soy/typeable/pandoc

Changes to build process relating to r234.

+ Corrected dependencies in Makefiles to ensure that templates get filled when the relevant files are modified. + Changed template placeholders to @xxx@ instead of <xxx>, for consistency with our practice with the Cabal template. + Changed default font for RTF writer (this had been changed earlier, but in the target rather than the template!) git-svn-id: https://pandoc.googlecode.com/svn/trunk@235 788f1e2b-df1e-0410-8736-df70ead52e1b

commit31a956b65559ea669d5705e005ac3d6641d7518e authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> dateTue 19 Dec 2006, 22:00 (20 years ago) parent206c59a

7 files changed+30−31

compare with master

unifiedsplit

Makefile+2−3 src/headers/RTFHeader+1−1 src/templates/ASCIIMathML.hs+1−1 src/templates/DefaultHeaders.hs+4−4 src/templates/Makefile+3−3 src/templates/S5.hs+7−7 src/templates/fillTemplates.pl+12−12

Makefile+2−3

@@ -90,7 +90,6 @@ all: build-program

9090

9191.PHONY: templates

9292templates: $(SRCDIR)/templates

93−$(SRCDIR)/templates:

9493 $(MAKE) -C $(SRCDIR)/templates

9594

9695define generate-shell-script

@@ -120,7 +119,7 @@ $(CABAL): cabalize $(CABAL).in $(SRCDIR)/Main.hs

120119

121120.PHONY: configure

122121cleanup_files+=$(BUILDDIR) $(BUILDCONF) $(BUILDVARS)

123−configure: $(BUILDCONF)

122+configure: $(BUILDCONF) templates

124123$(BUILDCONF): $(CABAL)

125124 $(BUILDCMD) configure --prefix=$(PREFIX)

126125 # Make configuration time settings persistent (definitely a hack).

@@ -128,7 +127,7 @@ $(BUILDCONF): $(CABAL)

128127 @echo "DESTDIR?=$(DESTDIR)" >>$(BUILDVARS)

129128

130129.PHONY: build

131−build: templates configure

130+build: configure

132131 $(BUILDCMD) build

133132

134133.PHONY: build-exec

src/headers/RTFHeader+1−1

@@ -1,4 +1,4 @@

1−{\rtf1\ansi\deff0{\fonttbl{\f0 Times New Roman;}{\f1 Courier;}}

1+{\rtf1\ansi\deff0{\fonttbl{\f0 \fswiss Helvetica;}{\f1 Courier;}}

22{\colortbl;\red255\green0\blue0;\red0\green0\blue255;}

33\widowctrl\hyphauto

src/templates/ASCIIMathML.hs+1−1

@@ -4,4 +4,4 @@ module Text.Pandoc.ASCIIMathML ( asciiMathMLScript ) where

55-- | String containing Pandoc.ASCIIMathML javascript.

66asciiMathMLScript :: String

7−asciiMathMLScript = "<script type=\"text/javascript\">\n<ASCIIMathML.js></script>\n"

7+asciiMathMLScript = "<script type=\"text/javascript\">\n@ASCIIMathML.js@</script>\n"

src/templates/DefaultHeaders.hs+4−4

@@ -8,13 +8,13 @@ module Text.Pandoc.Writers.DefaultHeaders (

88import Text.Pandoc.Writers.S5

1010defaultLaTeXHeader :: String

11−defaultLaTeXHeader = "<LaTeXHeader>"

11+defaultLaTeXHeader = "@LaTeXHeader@"

1212

1313defaultHtmlHeader :: String

14−defaultHtmlHeader = "<HtmlHeader>"

14+defaultHtmlHeader = "@HtmlHeader@"

1515

1616defaultS5Header :: String

17−defaultS5Header = "<S5Header>" ++ s5CSS ++ s5Javascript

17+defaultS5Header = "@S5Header@" ++ s5CSS ++ s5Javascript

1818

1919defaultRTFHeader :: String

20−defaultRTFHeader = "<RTFHeader>"

20+defaultRTFHeader = "@RTFHeader@"

src/templates/Makefile+3−3

@@ -6,11 +6,11 @@ TARGETS := Text/Pandoc/ASCIIMathML.hs \

77all: $(TARGETS)

9−Text/Pandoc/ASCIIMathML.hs: ASCIIMathML.hs $(PROCESSOR) $(VPATH)/ASCIIMathML.js

9+Text/Pandoc/ASCIIMathML.hs: ASCIIMathML.hs $(PROCESSOR) $(VPATH)/ASCIIMathML.js

1010 perl $(PROCESSOR) $@ $(VPATH)

1111

12−Text/Pandoc/Writers/S5.hs: S5.hs $(PROCESSOR) $(VPATH)/headers/*

12+Text/Pandoc/Writers/S5.hs: S5.hs $(PROCESSOR) $(VPATH)/ui/default/*

1313 perl $(PROCESSOR) $@ $(VPATH)

1414

15−Text/Pandoc/Writers/DefaultHeaders.hs: DefaultHeaders.hs $(PROCESSOR) $(VPATH)/ui/default/*

15+Text/Pandoc/Writers/DefaultHeaders.hs: DefaultHeaders.hs $(PROCESSOR) $(VPATH)/headers/*

1616 perl $(PROCESSOR) $@ $(VPATH)

src/templates/S5.hs+7−7

@@ -14,25 +14,25 @@ import Text.Pandoc.Writers.HTML ( writeHtml )

1414import Text.Pandoc.Definition

1515

1616s5Javascript :: String

17−s5Javascript = "<script type=\"text/javascript\">\n<slides.js></script>\n"

17+s5Javascript = "<script type=\"text/javascript\">\n@slides.js@</script>\n"

1818

1919s5CoreCSS :: String

20−s5CoreCSS = "<s5-core.css>"

20+s5CoreCSS = "@s5-core.css@"

2121

2222s5FramingCSS :: String

23−s5FramingCSS = "<framing.css>"

23+s5FramingCSS = "@framing.css@"

2424

2525s5PrettyCSS :: String

26−s5PrettyCSS = "<pretty.css>"

26+s5PrettyCSS = "@pretty.css@"

2727

2828s5OperaCSS :: String

29−s5OperaCSS = "<opera.css>"

29+s5OperaCSS = "@opera.css@"

3030

3131s5OutlineCSS :: String

32−s5OutlineCSS = "<outline.css>"

32+s5OutlineCSS = "@outline.css@"

3333

3434s5PrintCSS :: String

35−s5PrintCSS = "<print.css>"

35+s5PrintCSS = "@print.css@"

3636

3737s5CSS :: String

3838s5CSS = "<style type=\"text/css\" media=\"projection\" id=\"slideProj\">\n" ++ s5CoreCSS ++ "\n" ++ s5FramingCSS ++ "\n" ++ s5PrettyCSS ++ "\n</style>\n<style type=\"text/css\" media=\"projection\" id=\"operaFix\">\n" ++ s5OperaCSS ++ "\n</style>\n<style type=\"text/css\" media=\"screen\" id=\"outlineStyle\">\n" ++ s5OutlineCSS ++ "\n</style>\n<style type=\"text/css\" media=\"print\" id=\"slidePrint\">\n" ++ s5PrintCSS ++ "\n</style>\n"

src/templates/fillTemplates.pl+12−12

@@ -45,13 +45,13 @@ my %processor = (

4545 my $outline = escape_for_haskell(slurp "ui/default/outline.css");

4646 my $print = escape_for_haskell(slurp "ui/default/print.css");

4747

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/;

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/;

5555

5656 return $template;

5757 },

@@ -68,7 +68,7 @@ my %processor = (

6868 " released under the GPL\\nSee ".

6969 "http://www1.chapman.edu/~jipsen/mathml/asciimath.html/ ";

7070 $script =~ s/\/\*.*?\*\//\/\*$acknowledgements\*\//g; # strip comments

71− $template =~ s/<ASCIIMathML\.js>/$script/;

71+ $template =~ s/\@ASCIIMathML\.js@/$script/;

7272

7373 return $template;

7474 },

@@ -84,10 +84,10 @@ my %processor = (

8484 my $rtf = escape_for_haskell(slurp "headers/RTFHeader");

8585 my $s5 = escape_for_haskell(slurp "headers/S5Header");

8686

87− $template =~ s/<HtmlHeader>/$html/;

88− $template =~ s/<LaTeXHeader>/$latex/;

89− $template =~ s/<RTFHeader>/$rtf/;

90− $template =~ s/<S5Header>/$s5/;

87+ $template =~ s/\@HtmlHeader@/$html/;

88+ $template =~ s/\@LaTeXHeader@/$latex/;

89+ $template =~ s/\@RTFHeader@/$rtf/;

90+ $template =~ s/\@S5Header@/$s5/;

9191

9292 return $template;

9393 },