31a956b · typeable/pandoc

Makefile+2−3

compare with master

unifiedsplit

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

90

91.PHONY: templates

92templates: $(SRCDIR)/templates

93−$(SRCDIR)/templates:

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

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

95

94

96define generate-shell-script

95define generate-shell-script

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

120

119

121.PHONY: configure

120.PHONY: configure

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

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

123−configure: $(BUILDCONF)

122+configure: $(BUILDCONF) templates

124$(BUILDCONF): $(CABAL)

123$(BUILDCONF): $(CABAL)

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

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

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

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

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

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

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

129

128

130.PHONY: build

129.PHONY: build

131−build: templates configure

130+build: configure

132 $(BUILDCMD) build

131 $(BUILDCMD) build

133

132

134.PHONY: build-exec

133.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;}}

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

3\widowctrl\hyphauto

4

src/templates/ASCIIMathML.hs+1−1

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

4

5-- | String containing Pandoc.ASCIIMathML javascript.

6asciiMathMLScript :: 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 (

8import Text.Pandoc.Writers.S5

9

10defaultLaTeXHeader :: String

11−defaultLaTeXHeader = "<LaTeXHeader>"

11+defaultLaTeXHeader = "@LaTeXHeader@"

12

13defaultHtmlHeader :: String

14−defaultHtmlHeader = "<HtmlHeader>"

14+defaultHtmlHeader = "@HtmlHeader@"

15

16defaultS5Header :: String

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

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

18

19defaultRTFHeader :: String

20−defaultRTFHeader = "<RTFHeader>"

20+defaultRTFHeader = "@RTFHeader@"

src/templates/Makefile+3−3

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

6

7all: $(TARGETS)

8

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

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

10 perl $(PROCESSOR) $@ $(VPATH)

11

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

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

13 perl $(PROCESSOR) $@ $(VPATH)

14

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

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

16 perl $(PROCESSOR) $@ $(VPATH)

src/templates/S5.hs+7−7

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

14import Text.Pandoc.Definition

15

16s5Javascript :: String

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

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

18

19s5CoreCSS :: String

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

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

21

22s5FramingCSS :: String

23−s5FramingCSS = "<framing.css>"

23+s5FramingCSS = "@framing.css@"

24

25s5PrettyCSS :: String

26−s5PrettyCSS = "<pretty.css>"

26+s5PrettyCSS = "@pretty.css@"

27

28s5OperaCSS :: String

29−s5OperaCSS = "<opera.css>"

29+s5OperaCSS = "@opera.css@"

30

31s5OutlineCSS :: String

32−s5OutlineCSS = "<outline.css>"

32+s5OutlineCSS = "@outline.css@"

33

34s5PrintCSS :: String

35−s5PrintCSS = "<print.css>"

35+s5PrintCSS = "@print.css@"

36

37s5CSS :: String

38s5CSS = "<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 = (

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

48+ $template =~ s/\@slides\.js@/$slides/;

49− $template =~ s/<s5-core\.css>/$s5core/;

49+ $template =~ s/\@s5-core\.css@/$s5core/;

50− $template =~ s/<framing\.css>/$framing/;

50+ $template =~ s/\@framing\.css@/$framing/;

51− $template =~ s/<pretty\.css>/$pretty/;

51+ $template =~ s/\@pretty\.css@/$pretty/;

52− $template =~ s/<opera\.css>/$opera/;

52+ $template =~ s/\@opera\.css@/$opera/;

53− $template =~ s/<outline\.css>/$outline/;

53+ $template =~ s/\@outline\.css@/$outline/;

54− $template =~ s/<print\.css>/$print/;

54+ $template =~ s/\@print\.css@/$print/;

55

56 return $template;

57 },

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

68 " released under the GPL\\nSee ".

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

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

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

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

72

73 return $template;

74 },

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

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

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

86

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

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

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

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

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

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

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

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

91

92 return $template;

93 },