1.1 --- a/en/Makefile	Thu Mar 26 22:00:32 2009 -0700
     1.2 +++ b/en/Makefile	Thu Mar 26 22:00:53 2009 -0700
     1.3 @@ -1,28 +1,6 @@
     1.4  # This makefile requires GNU make.
     1.5  
     1.6 -image-sources := \
     1.7 -	feature-branches.dot \
     1.8 -	filelog.svg \
     1.9 -	kdiff3.png \
    1.10 -	metadata.svg \
    1.11 -	mq-stack.svg \
    1.12 -	note.png \
    1.13 -	revlog.svg \
    1.14 -	snapshot.svg \
    1.15 -	tour-history.svg \
    1.16 -	tour-merge-conflict.svg \
    1.17 -	tour-merge-merge.svg \
    1.18 -	tour-merge-pull.svg \
    1.19 -	tour-merge-sep-repos.svg \
    1.20 -	undo-manual.dot \
    1.21 -	undo-manual-merge.dot \
    1.22 -	undo-non-tip.dot \
    1.23 -	undo-simple.dot \
    1.24 -	wdir.svg \
    1.25 -	wdir-after-commit.svg \
    1.26 -	wdir-branch.svg \
    1.27 -	wdir-merge.svg \
    1.28 -	wdir-pre-branch.svg
    1.29 +image-sources := $(wildcard figs/*.dot figs/*.png figs/*.svg)
    1.30  
    1.31  xml-src-files := \
    1.32  	00book.xml \
    1.33 @@ -33,7 +11,14 @@
    1.34  image-svg := $(filter %.svg,$(image-sources))
    1.35  image-png := $(filter %.png,$(image-sources))
    1.36  
    1.37 -image-html := $(image-dot:%.dot=%.png) $(image-svg:%.svg=%.png) $(image-png)
    1.38 +obj-web := html
    1.39 +obj-websup := $(obj-web)/support
    1.40 +obj-web-read := $(obj-web)/read
    1.41 +
    1.42 +image-web := \
    1.43 +	$(image-dot:%.dot=$(obj-web-read)/%.png) \
    1.44 +	$(image-svg:%.svg=$(obj-web-read)/%.png) \
    1.45 +	$(image-png:%=$(obj-web-read)/%)
    1.46  
    1.47  example-sources-by-name := \
    1.48  	backout \
    1.49 @@ -71,9 +56,6 @@
    1.50  	$(example-sources-by-name:%=examples/%) \
    1.51  	$(wildcard examples/ch*/*)
    1.52  
    1.53 -obj-web := html
    1.54 -obj-websup := html/support
    1.55 -
    1.56  extras-web-base := \
    1.57  	$(obj-web)/index.html \
    1.58  	$(obj-web)/robots.txt \
    1.59 @@ -135,14 +117,16 @@
    1.60  
    1.61  web: ../xsl/system-xsl websup html
    1.62  
    1.63 -html: ../xsl/system-xsl $(xml-src-files) valid
    1.64 -	xsltproc $(xsltproc-opts) -o html/read/x ../xsl/chunk-stylesheet.xsl 00book.xml
    1.65 -	for i in html/read/*.html; do \
    1.66 +html: $(obj-web-read)/index.html
    1.67 +
    1.68 +$(obj-web-read)/index.html: ../xsl/system-xsl .validated-00book.xml
    1.69 +	xsltproc $(xsltproc-opts) -o $(obj-web-read)/x ../xsl/chunk-stylesheet.xsl 00book.xml
    1.70 +	for i in $(obj-web-read)/*.html; do \
    1.71  	  gzip -9 -c $$i > $$i.gz; \
    1.72  	done
    1.73  
    1.74 -websup: $(extras-web)
    1.75 -	mkdir -p $(obj-websup)/figs
    1.76 +websup: $(extras-web) $(image-web)
    1.77 +	mkdir -p $(obj-websup)/figs $(obj-web-read)/figs
    1.78  	cp ../xsl/system-xsl/images/*.png $(obj-websup)/figs
    1.79  	cp -f ../web/icons/*.png $(obj-websup)/figs
    1.80  
    1.81 @@ -159,12 +143,23 @@
    1.82  
    1.83  # Produce 90dpi PNGs for the web.
    1.84  
    1.85 -%.png: %.svg fixsvg
    1.86 +$(obj-web-read)/figs/%.png: $(obj-web-read)/figs/%.svg fixsvg
    1.87 +	mkdir -p $(dir $@)
    1.88  	./fixsvg $<
    1.89  	inkscape -D -e $@ $<-tmp.svg
    1.90  	rm $<-tmp.svg
    1.91  
    1.92 -%.svg: %.dot
    1.93 +$(obj-web-read)/figs/%.png: figs/%.svg fixsvg
    1.94 +	mkdir -p $(dir $@)
    1.95 +	./fixsvg $<
    1.96 +	inkscape -D -e $@ $<-tmp.svg
    1.97 +	rm $<-tmp.svg
    1.98 +
    1.99 +$(obj-web-read)/figs/%.png: figs/%.png
   1.100 +	cp $< $@
   1.101 +
   1.102 +$(obj-web-read)/figs/%.svg: figs/%.dot
   1.103 +	mkdir -p $(dir $@)
   1.104  	dot -Tsvg -o $@ $<
   1.105  
   1.106  examples: $(example-prereqs) examples/.run

     2.1 --- a/en/appA-cmdref.xml	Thu Mar 26 22:00:32 2009 -0700
     2.2 +++ b/en/appA-cmdref.xml	Thu Mar 26 22:00:53 2009 -0700
     2.3 @@ -1,6 +1,7 @@
     2.4  <!-- vim: set filetype=docbkxml shiftwidth=2 autoindent expandtab tw=77 : -->
     2.5  
     2.6  <appendix id="cmdref">
     2.7 +  <?dbhtml filename="command-reference.html"?>
     2.8  <title>Command reference</title>
     2.9  
    2.10  <para id="x_653">\cmdref{add}{add files at the next commit}
    2.11 @@ -20,7 +21,7 @@
    2.12  
    2.13  <sect2>
    2.14  <title>Options</title>
    2.15 -
    2.16 +x
    2.17  <para id="x_657">\loptref{diff}{nodates}</para>
    2.18  
    2.19  <para id="x_658">Omit date and time information when printing diff headers.</para>

     3.1 --- a/en/ch01-tour-basic.xml	Thu Mar 26 22:00:32 2009 -0700
     3.2 +++ b/en/ch01-tour-basic.xml	Thu Mar 26 22:00:53 2009 -0700
     3.3 @@ -258,7 +258,7 @@
     3.4        <title>Graphical history of the <filename
     3.5  	  class="directory">hello</filename> repository</title>
     3.6        <mediaobject>
     3.7 -	<imageobject><imagedata fileref="tour-history"/></imageobject>
     3.8 +	<imageobject><imagedata fileref="figs/tour-history.png"/></imageobject>
     3.9  	<textobject><phrase>XXX add text</phrase></textobject>
    3.10        </mediaobject>
    3.11      </figure>

     4.1 --- a/en/ch02-tour-merge.xml	Thu Mar 26 22:00:32 2009 -0700
     4.2 +++ b/en/ch02-tour-merge.xml	Thu Mar 26 22:00:53 2009 -0700
     4.3 @@ -48,7 +48,7 @@
     4.4  	  class="directory">my-new-hello</filename>
     4.5  	repositories</title>
     4.6        <mediaobject>
     4.7 -	<imageobject><imagedata fileref="tour-merge-sep-repos"/></imageobject>
     4.8 +	<imageobject><imagedata fileref="figs/tour-merge-sep-repos.png"/></imageobject>
     4.9  	<textobject><phrase>XXX add text</phrase></textobject>
    4.10        </mediaobject>
    4.11      </figure>
    4.12 @@ -77,7 +77,7 @@
    4.13  	    class="directory">my-new-hello</filename></title>
    4.14  	<mediaobject>
    4.15  	  <imageobject>
    4.16 -	    <imagedata fileref="tour-merge-pull"/>
    4.17 +	    <imagedata fileref="figs/tour-merge-pull.png"/>
    4.18  	  </imageobject>
    4.19  	  <textobject><phrase>XXX add text</phrase></textobject>
    4.20  	</mediaobject>
    4.21 @@ -124,7 +124,7 @@
    4.22  	  following commit</title>
    4.23  	<mediaobject>
    4.24  	  <imageobject>
    4.25 -	    <imagedata fileref="tour-merge-merge"/>
    4.26 +	    <imagedata fileref="figs/tour-merge-merge.png"/>
    4.27  	  </imageobject>
    4.28  	  <textobject><phrase>XXX add text</phrase></textobject>
    4.29  	</mediaobject>
    4.30 @@ -179,7 +179,7 @@
    4.31      <figure id="fig:tour-merge:conflict">
    4.32        <title>Conflicting changes to a document</title>
    4.33        <mediaobject>
    4.34 -	<imageobject><imagedata fileref="tour-merge-conflict"/></imageobject>
    4.35 +	<imageobject><imagedata fileref="figs/tour-merge-conflict.png"/></imageobject>
    4.36  	<textobject><phrase>XXX add text</phrase></textobject>
    4.37        </mediaobject>
    4.38      </figure>
    4.39 @@ -249,7 +249,7 @@
    4.40  	  file</title>
    4.41  	<mediaobject>
    4.42  	  <imageobject>
    4.43 -	    <imagedata fileref="kdiff3"/></imageobject>
    4.44 +	    <imagedata fileref="figs/kdiff3.png"/></imageobject>
    4.45  	  <textobject>
    4.46  	    <phrase>XXX add text</phrase>
    4.47  	  </textobject>

     5.1 --- a/en/ch03-concepts.xml	Thu Mar 26 22:00:32 2009 -0700
     5.2 +++ b/en/ch03-concepts.xml	Thu Mar 26 22:00:53 2009 -0700
     5.3 @@ -53,7 +53,7 @@
     5.4  	<title>Relationships between files in working directory and
     5.5  	  filelogs in repository</title>
     5.6  	<mediaobject>
     5.7 -	  <imageobject><imagedata fileref="filelog"/></imageobject>
     5.8 +	  <imageobject><imagedata fileref="figs/filelog.png"/></imageobject>
     5.9  	  <textobject><phrase>XXX add text</phrase></textobject>
    5.10  	</mediaobject>
    5.11        </figure>
    5.12 @@ -102,7 +102,7 @@
    5.13        <figure id="fig:concepts:metadata">
    5.14  	<title>Metadata relationships</title>
    5.15  	<mediaobject>
    5.16 -	  <imageobject><imagedata fileref="metadata"/></imageobject>
    5.17 +	  <imageobject><imagedata fileref="figs/metadata.png"/></imageobject>
    5.18  	  <textobject><phrase>XXX add text</phrase></textobject>
    5.19  	</mediaobject>
    5.20        </figure>
    5.21 @@ -187,7 +187,7 @@
    5.22        <figure id="fig:concepts:snapshot">
    5.23  	<title>Snapshot of a revlog, with incremental deltas</title>
    5.24  	<mediaobject>
    5.25 -	  <imageobject><imagedata fileref="snapshot"/></imageobject>
    5.26 +	  <imageobject><imagedata fileref="figs/snapshot.png"/></imageobject>
    5.27  	  <textobject><phrase>XXX add text</phrase></textobject>
    5.28  	</mediaobject>
    5.29        </figure>
    5.30 @@ -291,7 +291,7 @@
    5.31      <figure id="fig:concepts:revlog">
    5.32        <title>The conceptual structure of a revlog</title>
    5.33        <mediaobject>
    5.34 -	<imageobject><imagedata fileref="revlog"/></imageobject>
    5.35 +	<imageobject><imagedata fileref="figs/revlog.png"/></imageobject>
    5.36  	<textobject><phrase>XXX add text</phrase></textobject>
    5.37        </mediaobject>
    5.38      </figure>
    5.39 @@ -342,7 +342,7 @@
    5.40        <figure id="fig:concepts:wdir">
    5.41  	<title>The working directory can have two parents</title>
    5.42  	<mediaobject>
    5.43 -	  <imageobject><imagedata fileref="wdir"/></imageobject>
    5.44 +	  <imageobject><imagedata fileref="figs/wdir.png"/></imageobject>
    5.45  	  <textobject><phrase>XXX add text</phrase></textobject>
    5.46  	</mediaobject>
    5.47        </figure>
    5.48 @@ -357,7 +357,7 @@
    5.49  	<title>The working directory gains new parents after a
    5.50  	  commit</title>
    5.51  	<mediaobject>
    5.52 -	  <imageobject><imagedata fileref="wdir-after-commit"/></imageobject>
    5.53 +	  <imageobject><imagedata fileref="figs/wdir-after-commit.png"/></imageobject>
    5.54  	  <textobject><phrase>XXX add text</phrase></textobject>
    5.55  	</mediaobject>
    5.56        </figure>
    5.57 @@ -398,7 +398,7 @@
    5.58  	<title>The working directory, updated to an older
    5.59  	  changeset</title>
    5.60  	<mediaobject>
    5.61 -	  <imageobject><imagedata fileref="wdir-pre-branch"/></imageobject>
    5.62 +	  <imageobject><imagedata fileref="figs/wdir-pre-branch.png"/></imageobject>
    5.63  	  <textobject><phrase>XXX add text</phrase></textobject>
    5.64  	</mediaobject>
    5.65        </figure>
    5.66 @@ -418,7 +418,7 @@
    5.67  	<title>After a commit made while synced to an older
    5.68  	  changeset</title>
    5.69  	<mediaobject>
    5.70 -	  <imageobject><imagedata fileref="wdir-branch"/></imageobject>
    5.71 +	  <imageobject><imagedata fileref="figs/wdir-branch.png"/></imageobject>
    5.72  	  <textobject><phrase>XXX add text</phrase></textobject>
    5.73  	</mediaobject>
    5.74        </figure>
    5.75 @@ -460,7 +460,7 @@
    5.76  	<title>Merging two heads</title>
    5.77  	<mediaobject>
    5.78  	  <imageobject>
    5.79 -	    <imagedata fileref="wdir-merge"/>
    5.80 +	    <imagedata fileref="figs/wdir-merge.png"/>
    5.81  	  </imageobject>
    5.82  	  <textobject><phrase>XXX add text</phrase></textobject>
    5.83  	</mediaobject>

     6.1 --- a/en/ch05-collab.xml	Thu Mar 26 22:00:32 2009 -0700
     6.2 +++ b/en/ch05-collab.xml	Thu Mar 26 22:00:53 2009 -0700
     6.3 @@ -272,7 +272,7 @@
     6.4        <figure id="fig:collab:feature-branches">
     6.5  	<title>Feature branches</title>
     6.6  	<mediaobject>
     6.7 -	  <imageobject><imagedata fileref="feature-branches"/></imageobject>
     6.8 +	  <imageobject><imagedata fileref="figs/feature-branches.png"/></imageobject>
     6.9  	  <textobject><phrase>XXX add text</phrase></textobject>
    6.10  	</mediaobject>
    6.11        </figure>

     7.1 --- a/en/ch08-undo.xml	Thu Mar 26 22:00:32 2009 -0700
     7.2 +++ b/en/ch08-undo.xml	Thu Mar 26 22:00:53 2009 -0700
     7.3 @@ -361,7 +361,7 @@
     7.4  	<title>Backing out a change using the <command
     7.5  	    role="hg-cmd">hg backout</command> command</title>
     7.6  	<mediaobject>
     7.7 -	  <imageobject><imagedata fileref="undo-simple"/></imageobject>
     7.8 +	  <imageobject><imagedata fileref="figs/undo-simple.png"/></imageobject>
     7.9  	  <textobject><phrase>XXX add text</phrase></textobject>
    7.10  	</mediaobject>
    7.11        </figure>
    7.12 @@ -408,7 +408,7 @@
    7.13  	<title>Automated backout of a non-tip change using the
    7.14  	  <command role="hg-cmd">hg backout</command> command</title>
    7.15  	<mediaobject>
    7.16 -	  <imageobject><imagedata fileref="undo-non-tip"/></imageobject>
    7.17 +	  <imageobject><imagedata fileref="figs/undo-non-tip.png"/></imageobject>
    7.18  	  <textobject><phrase>XXX add text</phrase></textobject>
    7.19  	</mediaobject>
    7.20        </figure>
    7.21 @@ -473,7 +473,7 @@
    7.22  	<title>Backing out a change using the <command
    7.23  	    role="hg-cmd">hg backout</command> command</title>
    7.24  	<mediaobject>
    7.25 -	  <imageobject><imagedata fileref="undo-manual"/></imageobject>
    7.26 +	  <imageobject><imagedata fileref="figs/undo-manual.png"/></imageobject>
    7.27  	  <textobject><phrase>XXX add text</phrase></textobject>
    7.28  	</mediaobject>
    7.29        </figure>
    7.30 @@ -511,7 +511,7 @@
    7.31        <figure id="fig:undo:backout-manual-merge">
    7.32  	<title>Manually merging a backout change</title>
    7.33  	<mediaobject>
    7.34 -	  <imageobject><imagedata fileref="undo-manual-merge"/></imageobject>
    7.35 +	  <imageobject><imagedata fileref="figs/undo-manual-merge.png"/></imageobject>
    7.36  	  <textobject><phrase>XXX add text</phrase></textobject>
    7.37  	</mediaobject>
    7.38        </figure>

     8.1 --- a/en/ch11-mq.xml	Thu Mar 26 22:00:32 2009 -0700
     8.2 +++ b/en/ch11-mq.xml	Thu Mar 26 22:00:53 2009 -0700
     8.3 @@ -408,7 +408,7 @@
     8.4  	<title>Applied and unapplied patches in the MQ patch
     8.5  	  stack</title>
     8.6  	<mediaobject>
     8.7 -	  <imageobject><imagedata fileref="mq-stack"/></imageobject>
     8.8 +	  <imageobject><imagedata fileref="figs/mq-stack.png"/></imageobject>
     8.9  	  <textobject><phrase>XXX add text</phrase></textobject>
    8.10  	</mediaobject>
    8.11        </figure>