1.1 --- a/en/Makefile	Tue Mar 06 21:55:48 2007 -0800
     1.2 +++ b/en/Makefile	Thu Mar 08 23:35:23 2007 -0800
     1.3 @@ -28,6 +28,7 @@
     1.4  	kdiff3.png \
     1.5  	metadata.svg \
     1.6  	mq-stack.svg \
     1.7 +	note.png \
     1.8  	revlog.svg \
     1.9  	snapshot.svg \
    1.10  	tour-history.svg \
    1.11 @@ -99,7 +100,11 @@
    1.12  pdf/hgbook.pdf: $(sources) $(image-pdf) examples
    1.13  	$(call pdf)
    1.14  
    1.15 -html: html/onepage/hgbook.html html/split/hgbook.html
    1.16 +html: onepage split
    1.17 +
    1.18 +onepage: html/onepage/hgbook.html
    1.19 +
    1.20 +split: html/split/hgbook.html
    1.21  
    1.22  # This is a horrible hack to work around the fact that the htlatex
    1.23  # command in tex4ht is itself a horrible hack.  I really don't want to
    1.24 @@ -115,37 +120,23 @@
    1.25  	head -3 $(shell which htlatex) >> $(dir $(1))/htlatex.book
    1.26  	echo 'echo status $$$$' >>  $(dir $(1))/htlatex.book
    1.27  	chmod 755 $(dir $(1))/htlatex.book
    1.28 -	TEXINPUTS=$(dir $(2)): $(dir $(1))/htlatex.book $(2) "xhtml,html4-uni,$(3)" " -cunihtf -utf8" "" "$(call latex-options,$(1))" || (rm -f $(1); exit 1)
    1.29 +	TEXINPUTS=$(dir $(2)): $(dir $(1))/htlatex.book $(2) "bookhtml,html4-uni,$(3)" " -cunihtf -utf8" "" "$(call latex-options,$(1))" || (rm -f $(1); exit 1)
    1.30  	cd $(dir $(1)) && tex4ht -f/$(basename $(notdir $(1))) -cvalidate -cunihtf
    1.31  	cd $(dir $(1)) && t4ht -f/$(basename $(notdir $(1)))
    1.32 -	perl -pi -e 's/&#x00([0-7][0-9a-f]);/chr(hex($$1))/egi' $(dir $(1))/*.html
    1.33 +	./fixhtml.py $(dir $(1))/*.html
    1.34  endef
    1.35  
    1.36  image-html := $(image-dot:%.dot=%.png) $(image-svg:%.svg=%.png) $(image-png)
    1.37  
    1.38 -html/onepage/hgbook.html: $(sources) $(image-html) examples
    1.39 +html/onepage/hgbook.html: $(sources) $(image-html) examples hgbook.css bookhtml.cfg
    1.40  	$(call htlatex,$@,$<)
    1.41  	cp $(image-sources:%.svg=%.png) $(dir $@)
    1.42 +	cp hgbook.css $(dir $@)
    1.43  
    1.44 -html/split/hgbook.html: $(sources) $(image-html) examples
    1.45 +html/split/hgbook.html: $(sources) $(image-html) examples hgbook.css bookhtml.cfg
    1.46  	$(call htlatex,$@,$<,2)
    1.47  	cp $(image-sources:%.svg=%.png) $(dir $@)
    1.48 -
    1.49 -beta: beta/pdf/hgbook.pdf beta/html/onepage/hgbook.html beta/html/split/hgbook.html
    1.50 -
    1.51 -beta/%.tex: %.tex
    1.52 -	./fblinks $(hg_id) $(dir $@) $<
    1.53 -
    1.54 -beta/pdf/hgbook.pdf: $(sources:%.tex=beta/%.tex) $(image-sources:%.svg=%.pdf) examples fblinks
    1.55 -	$(call pdf)
    1.56 -
    1.57 -beta/html/onepage/hgbook.html: $(sources:%.tex=beta/%.tex) $(image-sources:%.svg=%.png) examples
    1.58 -	$(call htlatex,$@,$<)
    1.59 -	cp $(image-sources:%.svg=%.png) $(dir $@)
    1.60 -
    1.61 -beta/html/split/hgbook.html: $(sources:%.tex=beta/%.tex) $(image-sources:%.svg=%.png) examples
    1.62 -	$(call htlatex,$@,$<,2)
    1.63 -	cp $(image-sources:%.svg=%.png) $(dir $@)
    1.64 +	cp hgbook.css $(dir $@)
    1.65  
    1.66  # Produce 90dpi PNGs for the web.
    1.67  
    1.68 @@ -178,7 +169,7 @@
    1.69  	echo -n $(hg_id) > build_id.tex
    1.70  
    1.71  clean:
    1.72 -	rm -rf beta html pdf \
    1.73 +	rm -rf html pdf \
    1.74  		$(image-dot:%.dot=%.pdf) \
    1.75  		$(image-dot:%.dot=%.png) \
    1.76  		$(image-svg:%.svg=%.pdf) \