aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--web/Makefile12
-rw-r--r--web/index.txt9
-rwxr-xr-xweb/mkdemos.sh8
3 files changed, 20 insertions, 9 deletions
diff --git a/web/Makefile b/web/Makefile
index 644ce61db..d37568b1b 100644
--- a/web/Makefile
+++ b/web/Makefile
@@ -1,11 +1,17 @@
-all: index.html osx-notes.html README.html INSTALL.html features.html changelog.html examples.html
-
+ALL := index.html osx-notes.html README.html INSTALL.html features.html changelog.html examples.html
PANDOC_PATH ?= $(dir $(shell which pandoc))
MAKEPAGE = $(PANDOC_PATH)/pandoc -s -S -B header.html -A footer.html -H css
PANDOC_DEPS = header.html footer.html css
+all : $(ALL)
+
+.PHONY: clean
+clean:
+ for file in $(ALL); do rm $$file; done; \
+ rm -r example*;
+
examples.txt : $(PANDOC_DEPS) mkdemos.sh
- ./mkdemos.sh . $$PANDOC_PATH > $@
+ ./mkdemos.sh . $(PANDOC_PATH) > $@
%.html : %.txt $(PANDOC_DEPS)
$(MAKEPAGE) $< > $@
diff --git a/web/index.txt b/web/index.txt
index 7313a18ac..e8f1b5667 100644
--- a/web/index.txt
+++ b/web/index.txt
@@ -47,9 +47,12 @@ which are not included in the Windows binary package.
[Cygwin]: http://www.cygwin.com/
"Cygwin - a linux-like environment for Windows"
-**Debian packages:** Pandoc will be available soon in the Debian unstable
-package repository, thanks to the efforts of Recai Oktaş. Watch this
-space for details.
+**Debian linux package:** [`pandoc_0.3_i386.deb`] (thanks to Recai Oktaş).
+To install, download the file and type:
+
+ sudo dpkg -i pandoc_0.3_i386.deb
+
+[`pandoc_0.3_i386.deb`]: http://people.debian.org/~roktas/packages/pandoc_0.3_i386.deb
**Repository:** Pandoc has a publicly accesible subversion repository
at Google Code (<http://code.google.com/p/pandoc>). To check out the
diff --git a/web/mkdemos.sh b/web/mkdemos.sh
index 19c17053f..3e2ad2d2b 100755
--- a/web/mkdemos.sh
+++ b/web/mkdemos.sh
@@ -25,7 +25,9 @@ pandoc -s README -o example0.rtf
S5 HTML slide show (all in one file):
pandoc -s -m -i -w s5 S5DEMO -o example0.html
Docbook XML:
-pandoc -s -w docbook README -o example0.db
+pandoc -s -S -w docbook README -o example0.db
+Chunked XHTML via Docbook and the third-party `xmlto` tool:
+xmlto xhtml example(-1).db -o example0/
Converting a web page to markdown:
html2markdown http://www.gnu.org/software/make/ -o example0.txt
From markdown to PDF:
@@ -49,9 +51,9 @@ click on the name of the output file:
num=0
while [ $# -gt 0 ]; do
description="$1"
- command="$2"
+ lastnum=$num
num=$(($num + 1))
- command=$(echo $command | sed -e "s/0/$num/")
+ command=$(echo $2 | sed -e "s/0/$num/" -e "s/(-1)/$lastnum/")
firstpart=$(echo $command | sed -e 's/\(.*\) [^ ]* -o.*/\1/')
input=$(echo $command | sed -e 's/.* \([^ ]*\) -o.*/\1/')
output=$(echo $command | sed -e 's/.*-o \(.*\)/\1/')