7cd9db0 · typeable/pandoc

Makefile+3−4

compare with master

unifiedsplit

@@ -353,10 +353,9 @@ $(web_dest)/: $(MAIN) html

353 cp $(web_src)/*.css $(web_dest)/; \

354 sed -e 's#@PREFIX@#$(PREFIX)#g' $(osx_src)/Welcome | \

355 $(make_page) > $(web_dest)/osx-notes.html; \

356− sed -e '/^ --.*/d' changelog | \

356+ sed -e '/^ --.*/d' -e 's#^# #g' changelog | \

357− sed -e 's#^# #g' | \

358 sed -e 's/ $pandoc (.*$/## \1/g' | \

357 sed -e 's/ $pandoc (.*$/## \1/g' | \

359− $(make_page) > $(web_dest)/history.html; \

358+ $(make_page) -T "Pandoc changelog" > $(web_dest)/changelog.html; \

360 $(make_page) README > $(web_dest)/README.html; \

359 $(make_page) README > $(web_dest)/README.html; \

361 $(make_page) INSTALL > $(web_dest)/INSTALL.html; \

360 $(make_page) INSTALL > $(web_dest)/INSTALL.html; \

362 sed -e 's/@TARBALL_NAME@/$(tarball_name)/g' $(web_src)/index.txt | \

361 sed -e 's/@TARBALL_NAME@/$(tarball_name)/g' $(web_src)/index.txt | \

@@ -371,7 +370,7 @@ $(web_dest)/: $(MAIN) html

371 cp $(web_src)/header.html $(web_dest)/ ; \

370 cp $(web_src)/header.html $(web_dest)/ ; \

372 cp $(web_src)/footer.html $(web_dest)/ ; \

371 cp $(web_src)/footer.html $(web_dest)/ ; \

373 sh $(web_src)/mkdemos.sh $(web_dest) $(abspath .) | \

372 sh $(web_src)/mkdemos.sh $(web_dest) $(abspath .) | \

374− $(make_page) > $(web_dest)/demos.html; \

373+ $(make_page) > $(web_dest)/examples.html; \

375 ) || { rm -rf $(web_dest); exit 1; }

374 ) || { rm -rf $(web_dest); exit 1; }

376

375

377.PHONY: distclean clean

376.PHONY: distclean clean

web/header.html+2−6

@@ -1,14 +1,10 @@

1−<div id="header">

2−<h1><a href="index.html">Pandoc</a></h1>

3−</div>

4−

5<div id="sidebar">

1<div id="sidebar">

6<ul>

2<ul>

7<li><a href="index.html" title="Home page">Home</a></li>

3<li><a href="index.html" title="Home page">Home</a></li>

8<li><a href="README.html" title="Pandoc documentation">README</a></li>

4<li><a href="README.html" title="Pandoc documentation">README</a></li>

9−<li><a href="demos.html" title="Pandoc demos">Demos</a></li>

5+<li><a href="examples.html" title="Pandoc demos">Examples</a></li>

10<li><a href="doc/index.html" title="API documentation for Pandoc libraries">API</a></li>

6<li><a href="doc/index.html" title="API documentation for Pandoc libraries">API</a></li>

11−<li><a href="history.html" title="Pandoc's changelog">History</a></li>

7+<li><a href="changelog.html" title="Pandoc's changelog">History</a></li>

12</ul>

8</ul>

13</div>

9</div>

14<div id="main" class="withleftmenu">

10<div id="main" class="withleftmenu">

web/main.css+2−2

@@ -117,7 +117,7 @@ dt {

117 color:#336666;

118 padding-left:2em;

119 margin-bottom:0;

120− width: 6em;

120+ width: 7em;

121}

122#sidebar li {

123 font-family: verdana;

@@ -146,7 +146,7 @@ dt {

146 border-left: 1px solid gray;

147}

148#main.withleftmenu {

149− margin-left: 8em;

149+ margin-left: 9em;

150}

151

152div.clear { clear: both;

web/mkdemos.sh+14−14

@@ -1,5 +1,5 @@

1#!/bin/sh -e

2−# creates demo page for pandoc

2+# creates example page for pandoc

3# argument #1 is the destination directory

4# argument #2 is the directory containing pandoc, html2markdown, markdown2pdf

5

@@ -8,27 +8,27 @@ PROGPATH=$2

8

9NEWLINE='

10'

11−DEMOS='pandoc README -o demo0.html

11+EXAMPLES='pandoc README -o example0.html

12−pandoc -s -S README -o demo0.html

12+pandoc -s -S README -o example0.html

13−pandoc -s -S -c main.css -B header.html -A footer.html README -o demo0.html

13+pandoc -s -S -c main.css -B header.html -A footer.html README -o example0.html

14−pandoc -s README -o demo0.tex

14+pandoc -s README -o example0.tex

15−pandoc -s README.tex -o demo0.txt

15+pandoc -s README.tex -o example0.txt

16−pandoc -s -w rst README -o demo0.txt

16+pandoc -s -w rst README -o example0.txt

17−pandoc -s README -o demo0.rtf

17+pandoc -s README -o example0.rtf

18−pandoc -s -m -i -w s5 S5DEMO -o demo0.html

18+pandoc -s -m -i -w s5 S5DEMO -o example0.html

19−html2markdown http://www.gnu.org/software/make/ -o demo0.txt

19+html2markdown http://www.gnu.org/software/make/ -o example0.txt

20−markdown2pdf README -o demo0.pdf

20+markdown2pdf README -o example0.pdf

21−markdown2pdf -C myheader.tex README -o demo0.pdf'

21+markdown2pdf -C myheader.tex README -o example0.pdf'

22

23oldifs=$IFS

24IFS=$NEWLINE

25−set -- $DEMOS

25+set -- $EXAMPLES

26IFS=$oldifs

27

28cd $DEST

29PATH=$PROGPATH:$PATH

30

31−echo '% Pandoc demos

31+echo '% Pandoc examples

32

33To see the output created by each of the commands below,

34click on the name of the output file: