1.1 --- a/Makefile	Tue Mar 31 11:51:13 2009 +0800
     1.2 +++ b/Makefile	Wed Jul 22 18:56:58 2009 +0200
     1.3 @@ -14,7 +14,9 @@
     1.4  	   -o nodefault="<programlisting> <screen>" \
     1.5  	   -o untranslated="<programlisting> <screen>"
     1.6  TRANSLATE = PERLLIB=$(PO4A_LIB) $(PO4A_HOME)/po4a-translate -M UTF-8 \
     1.7 -	   -f docbook -o doctype=docbook \
     1.8 +	   -f docbook -o doctype=docbook -o includeexternal \
     1.9 +	   -o nodefault="<programlisting> <screen>" \
    1.10 +	   -o untranslated="<programlisting> <screen>" \
    1.11  	   -k 0
    1.12  
    1.13  #rev_id = $(shell hg parents --template '{node|short} ({date|isodate})')
    1.14 @@ -122,8 +124,6 @@
    1.15  ifneq "$(findstring $(LINGUA),$(PO_LANGUAGES))" ""
    1.16  	(cd po; \
    1.17  	$(UPDATEPO) -m ../en/00book.xml -p $(LINGUA).po; \
    1.18 -	cat $(LINGUA).po | sed 's/&emdash;/—/' > $(LINGUA).po.tmp; \
    1.19 -	mv $(LINGUA).po.tmp $(LINGUA).po \
    1.20  	)
    1.21  	$(MAKE) tidypo LINGUA=$(LINGUA)
    1.22  endif
    1.23 @@ -142,7 +142,7 @@
    1.24  $(LINGUA)/examples/.run:
    1.25  	(cd $(LINGUA)/examples; ./run-example -v -a)
    1.26  
    1.27 -build/$(LINGUA)/source/hgbook.xml: $(wildcard $(LINGUA)/*.xml) $(images) $(LINGUA)/examples/.run $(images)
    1.28 +build/$(LINGUA)/source/hgbook.xml: $(wildcard $(LINGUA)/*.xml) $(images) $(LINGUA)/examples/.run
    1.29  	mkdir -p build/$(LINGUA)/source/figs
    1.30  	cp $(LINGUA)/figs/*.png build/$(LINGUA)/source/figs
    1.31  	cp stylesheets/hgbook.css build/$(LINGUA)/source
    1.32 @@ -155,12 +155,14 @@
    1.33  build/en/source/hgbook.xml:
    1.34  	${MAKE} LINGUA=en $@
    1.35  
    1.36 -build/$(LINGUA)/source/hgbook.xml: build/en/source/hgbook.xml po/$(LINGUA).po $(images)
    1.37 +build/$(LINGUA)/source/hgbook.xml: $(wildcard en/*.xml) po/$(LINGUA).po $(images)
    1.38  	mkdir -p build/$(LINGUA)/source/figs
    1.39  	cp en/figs/*.png build/$(LINGUA)/source/figs
    1.40  	cp stylesheets/hgbook.css build/$(LINGUA)/source
    1.41 -	$(TRANSLATE) -m build/en/source/hgbook.xml.tmp -p po/$(LINGUA).po -l $@.tmp
    1.42 +	$(TRANSLATE) -m en/00book.xml -p po/$(LINGUA).po -l en/hgbook.xml.$(LINGUA)
    1.43 +	xmllint --nonet --noent --xinclude --postvalid --output $@.tmp en/hgbook.xml.$(LINGUA)
    1.44  	cat $@.tmp | sed 's/\$$rev_id\$$/${rev_id}/' > $@
    1.45 +	mv en/hgbook.xml.$(LINGUA) build/$(LINGUA)/source
    1.46  endif
    1.47  
    1.48  endif
    1.49 @@ -220,7 +222,7 @@
    1.50  
    1.51  build/$(LINGUA)/pdf/hgbook.pdf: build/$(LINGUA)/source/hgbook.xml stylesheets/fo.xsl stylesheets/$(LINGUA)/fo.xsl
    1.52  	mkdir -p build/$(LINGUA)/pdf
    1.53 -	java -classpath $(JAVA_SHARE)/saxon65.jar:$(JAVA_SHARE)/saxon65-dbxsl.jar:$(JAVA_SHARE)/xml-commons-resolver-1.2.jar:$(JAVA_SHARE) \
    1.54 +	java -classpath $(JAVA_LIB)/saxon65.jar:$(JAVA_LIB)/saxon65-dbxsl.jar:$(JAVA_LIB)/xml-commons-resolver-1.2.jar:$(JAVA_LIB) \
    1.55  	    com.icl.saxon.StyleSheet \
    1.56  	    -x org.apache.xml.resolver.tools.ResolvingXMLReader \
    1.57  	    -y org.apache.xml.resolver.tools.ResolvingXMLReader \