1.1 --- a/Makefile	Tue Mar 31 09:25:14 2009 +0800
     1.2 +++ b/Makefile	Tue Mar 31 11:04:18 2009 +0800
     1.3 @@ -3,18 +3,18 @@
     1.4  #
     1.5  include Makefile.vars
     1.6  
     1.7 -FORMATS=html html-single pdf
     1.8 +FORMATS=html html-single pdf epub
     1.9  
    1.10  PO_LANGUAGES := zh
    1.11  DBK_LANGUAGES := en
    1.12  LANGUAGES := $(DBK_LANGUAGES) $(PO_LANGUAGES)
    1.13  
    1.14  UPDATEPO = PERLLIB=$(PO4A_LIB) $(PO4A_HOME)/po4a-updatepo -M UTF-8 \
    1.15 -	   -f docbook -o doctype='docbook' -o includeexternal \
    1.16 -	   -o nodefault='<programlisting> <screen>' \
    1.17 -	   -o untranslated='<programlisting> <screen>'
    1.18 +	   -f docbook -o doctype=docbook -o includeexternal \
    1.19 +	   -o nodefault="<programlisting> <screen>" \
    1.20 +	   -o untranslated="<programlisting> <screen>"
    1.21  TRANSLATE = PERLLIB=$(PO4A_LIB) $(PO4A_HOME)/po4a-translate -M UTF-8 \
    1.22 -	   -f docbook -o doctype='docbook' \
    1.23 +	   -f docbook -o doctype=docbook \
    1.24  	   -k 0
    1.25  
    1.26  #rev_id = $(shell hg parents --template '{node|short} ({date|isodate})')
    1.27 @@ -43,6 +43,7 @@
    1.28  	en/figs/wdir-pre-branch.png
    1.29  
    1.30  help:
    1.31 +	@echo "  make epub         [LINGUA=en|zh|...]"
    1.32  	@echo "  make html         [LINGUA=en|zh|...]"
    1.33  	@echo "  make html-single  [LINGUA=en|zh|...]"
    1.34  	@echo "  make pdf          [LINGUA=en|zh|...]"
    1.35 @@ -119,7 +120,11 @@
    1.36  else
    1.37  updatepo:
    1.38  ifneq "$(findstring $(LINGUA),$(PO_LANGUAGES))" ""
    1.39 -	(cd po && $(UPDATEPO) -m ../en/00book.xml -p $(LINGUA).po)
    1.40 +	(cd po; \
    1.41 +	$(UPDATEPO) -m ../en/00book.xml -p $(LINGUA).po; \
    1.42 +	cat $(LINGUA).po | sed 's/&emdash;/—/' > $(LINGUA).po.tmp; \
    1.43 +	mv $(LINGUA).po.tmp $(LINGUA).po \
    1.44 +	)
    1.45  	$(MAKE) tidypo LINGUA=$(LINGUA)
    1.46  endif
    1.47  endif
    1.48 @@ -140,6 +145,7 @@
    1.49  build/$(LINGUA)/source/hgbook.xml: $(wildcard $(LINGUA)/*.xml) $(images) $(LINGUA)/examples/.run $(images)
    1.50  	mkdir -p build/$(LINGUA)/source/figs
    1.51  	cp $(LINGUA)/figs/*.png build/$(LINGUA)/source/figs
    1.52 +	cp stylesheets/hgbook.css build/$(LINGUA)/source
    1.53  	(cd $(LINGUA); xmllint --nonet --noent --xinclude --postvalid --output ../$@.tmp 00book.xml)
    1.54  	cat $@.tmp | sed 's/\$$rev_id\$$/${rev_id}/' > $@
    1.55  else
    1.56 @@ -152,6 +158,7 @@
    1.57  build/$(LINGUA)/source/hgbook.xml: build/en/source/hgbook.xml po/$(LINGUA).po $(images)
    1.58  	mkdir -p build/$(LINGUA)/source/figs
    1.59  	cp en/figs/*.png build/$(LINGUA)/source/figs
    1.60 +	cp stylesheets/hgbook.css build/$(LINGUA)/source
    1.61  	$(TRANSLATE) -m build/en/source/hgbook.xml -p po/$(LINGUA).po -l $@.tmp
    1.62  	cat $@.tmp | sed 's/\$$rev_id\$$/${rev_id}/' > $@
    1.63  endif
    1.64 @@ -159,6 +166,19 @@
    1.65  endif
    1.66  
    1.67  ifndef LINGUA
    1.68 +epub:
    1.69 +	for l in $(LANGUAGES); do \
    1.70 +	    $(MAKE) $@ LINGUA=$$l; \
    1.71 +	done
    1.72 +else
    1.73 +epub: build/$(LINGUA)/epub/hgbook.epub
    1.74 +
    1.75 +build/$(LINGUA)/epub/hgbook.epub: build/$(LINGUA)/source/hgbook.xml
    1.76 +	mkdir -p build/$(LINGUA)/epub
    1.77 +	(cd build/$(LINGUA)/source; $(DB2EPUB) -c hgbook.css -v hgbook.xml; mv hgbook.epub ../epub)
    1.78 +endif
    1.79 +
    1.80 +ifndef LINGUA
    1.81  html:
    1.82  	for l in $(LANGUAGES); do \
    1.83  	    $(MAKE) $@ LINGUA=$$l; \