[Olena-patches] last-svn-commit-42-g219aa14 Adapt HTML generation to TeX4ht.

* doc/Makefile.am (TECHNICAL_HTML_OUTPUTS, TUTORIAL_HTML_OUTPUTS) (WHITE_PAPER_HTML_OUTPUTS, REF_GUIDE_HTML_OUTPUTS): New variables. ($(TECHNICAL_HTML), $(TUTORIAL_HTML)) ($(WHITE_PAPER_HTML), $(REF_GUIDE_HTML)): Remove these targets. Superseded by... ($(TECHNICAL_HTML).stamp, $(TECHNICAL_HTML_OUTPUTS)) ($(TUTORIAL_HTML).stamp, $(TUTORIAL_HTML_OUTPUTS)) ($(WHITE_PAPER_HTML).stamp, $(WHITE_PAPER_HTML_OUTPUTS)) ($(REF_GUIDE_HTML).stamp, $(REF_GUIDE_HTML_OUTPUTS)): ...these (new) targets. (EXTRA_DIST, MAINTAINERCLEANFILES): Add $(TECHNICAL_HTML).stamp, ($(TUTORIAL_HTML).stamp, $(WHITE_PAPER_HTML).stamp and $(REF_GUIDE_HTML).stamp. (dist_doc_DATA, MAINTAINERCLEANFILES): Remove $(TECHNICAL_HTML), $(TUTORIAL_HTML), $(WHITE_PAPER_HTML) and $(REF_GUIDE_HTML). Add $(TECHNICAL_HTML_OUTPUTS), $(TUTORIAL_HTML_OUTPUTS), $(WHITE_PAPER_HTML_OUTPUTS) and $(REF_GUIDE_HTML_OUTPUTS). --- milena/ChangeLog | 25 +++++++++++ milena/doc/.gitignore | 14 ++++++- milena/doc/Makefile.am | 105 ++++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 131 insertions(+), 13 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 99345b1..9c6df10 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,30 @@ 2010-03-15 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Adapt HTML generation to TeX4ht. + + * doc/Makefile.am + (TECHNICAL_HTML_OUTPUTS, TUTORIAL_HTML_OUTPUTS) + (WHITE_PAPER_HTML_OUTPUTS, REF_GUIDE_HTML_OUTPUTS): + New variables. + ($(TECHNICAL_HTML), $(TUTORIAL_HTML)) + ($(WHITE_PAPER_HTML), $(REF_GUIDE_HTML)): + Remove these targets. + Superseded by... + ($(TECHNICAL_HTML).stamp, $(TECHNICAL_HTML_OUTPUTS)) + ($(TUTORIAL_HTML).stamp, $(TUTORIAL_HTML_OUTPUTS)) + ($(WHITE_PAPER_HTML).stamp, $(WHITE_PAPER_HTML_OUTPUTS)) + ($(REF_GUIDE_HTML).stamp, $(REF_GUIDE_HTML_OUTPUTS)): + ...these (new) targets. + (EXTRA_DIST, MAINTAINERCLEANFILES): Add $(TECHNICAL_HTML).stamp, + ($(TUTORIAL_HTML).stamp, $(WHITE_PAPER_HTML).stamp and + $(REF_GUIDE_HTML).stamp. + (dist_doc_DATA, MAINTAINERCLEANFILES): Remove $(TECHNICAL_HTML), + $(TUTORIAL_HTML), $(WHITE_PAPER_HTML) and $(REF_GUIDE_HTML). + Add $(TECHNICAL_HTML_OUTPUTS), $(TUTORIAL_HTML_OUTPUTS), + $(WHITE_PAPER_HTML_OUTPUTS) and $(REF_GUIDE_HTML_OUTPUTS). + +2010-03-15 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Use texi2dvi to produce HTML from LaTeX. * doc/Makefile.am diff --git a/milena/doc/.gitignore b/milena/doc/.gitignore index b187492..506bfa4 100644 --- a/milena/doc/.gitignore +++ b/milena/doc/.gitignore @@ -8,17 +8,29 @@ /figures/*.png +/ref_guide/ref_guide.css /ref_guide/ref_guide.hh /ref_guide/ref_guide.html /ref_guide/ref_guide.pdf +/ref_guide/ref_guide0x.png +/technical/technical.css /technical/technical.html /technical/technical.pdf +/tutorial/tutorial.css /tutorial/tutorial.hh /tutorial/tutorial.html /tutorial/tutorial.pdf -/white_paper/figures/*.eps +/white_paper/figures/house.eps +/white_paper/figures/house_rag.eps +/white_paper/figures/house_wshed.eps +/white_paper/figures/house_wshed_mean_colors.eps +/white_paper/white_paper.css /white_paper/white_paper.html /white_paper/white_paper.pdf +/white_paper/white_paper0x.png +/white_paper/white_paper1x.png +/white_paper/white_paper2x.png +/white_paper/white_paper3x.png diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 3dc4bed..17a26bf 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -323,10 +323,28 @@ technical_dependencies = $(doc_dir)/figures.stamp # Final product. TECHNICAL_HTML = $(technical_dir)/technical.html -# Extra dependencies. -$(TECHNICAL_HTML): $(technical_dependencies) +TECHNICAL_HTML_OUTPUTS = $(TECHNICAL_HTML) $(technical_dir)/technical.css + +EXTRA_DIST += $(TECHNICAL_HTML).stamp +MAINTAINERCLEANFILES += $(TECHNICAL_HTML).stamp +# HTML outputs contains several files (the HTML file itself, its CSS +# style sheet, possibly some images). Therefore, we cannot rely on a +# simple suffix rule to produce them. +$(TECHNICAL_HTML).stamp: $(technical_dir)/technical.tex $(technical_dependencies) + @rm -f $@.tmp + @touch $@.tmp + $(TEXI2HTML) $(TEXI2HTML_FLAGS) -o $(TECHNICAL_HTML) $< + @mv -f $@.tmp $@ + +$(TECHNICAL_HTML_OUTPUTS): $(TECHNICAL_HTML).stamp +## Recover from the removal of $@ + @if test -d $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi -dist_doc_DATA += $(TECHNICAL_HTML) +dist_doc_DATA += $(TECHNICAL_HTML_OUTPUTS) +MAINTAINERCLEANFILES += $(TECHNICAL_HTML_OUTPUTS) # Intermediate product for the various doc targets of the parent # directory. @@ -402,10 +420,28 @@ tutorial_dependencies = \ # Final product. TUTORIAL_HTML = $(tutorial_dir)/tutorial.html -# Extra dependencies. -$(TUTORIAL_HTML): $(tutorial_dependencies) +TUTORIAL_HTML_OUTPUTS = $(TUTORIAL_HTML) $(tutorial_dir)/tutorial.css + +EXTRA_DIST += $(TUTORIAL_HTML).stamp +MAINTAINERCLEANFILES += $(TUTORIAL_HTML).stamp +# HTML outputs contains several files (the HTML file itself, its CSS +# style sheet, possibly some images). Therefore, we cannot rely on a +# simple suffix rule to produce them. +$(TUTORIAL_HTML).stamp: $(tutorial_dir)/tutorial.tex $(tutorial_dependencies) + @rm -f $@.tmp + @touch $@.tmp + $(TEXI2HTML) $(TEXI2HTML_FLAGS) -o $(TUTORIAL_HTML) $< + @mv -f $@.tmp $@ + +$(TUTORIAL_HTML_OUTPUTS): $(TUTORIAL_HTML).stamp +## Recover from the removal of $@ + @if test -d $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi -dist_doc_DATA += $(TUTORIAL_HTML) +dist_doc_DATA += $(TUTORIAL_HTML_OUTPUTS) +MAINTAINERCLEANFILES += $(TUTORIAL_HTML_OUTPUTS) # Intermediate product for the various doc targets of the parent # directory. @@ -490,10 +526,34 @@ white-paper: white-paper-pdf white-paper-html # Final product. WHITE_PAPER_HTML = $(white_paper_dir)/white_paper.html white-paper-html: $(WHITE_PAPER_HTML) -$(WHITE_PAPER_HTML): $(EPSS) -# FIXME: Keep this pass? -# $(doc_dir)/tools/clearbanner.sh $@ +WHITE_PAPER_HTML_OUTPUTS = \ + $(WHITE_PAPER_HTML) \ + $(white_paper_dir)/white_paper.css \ + $(white_paper_dir)/white_paper0x.png \ + $(white_paper_dir)/white_paper1x.png \ + $(white_paper_dir)/white_paper2x.png \ + $(white_paper_dir)/white_paper3x.png + +EXTRA_DIST += $(WHITE_PAPER_HTML).stamp +MAINTAINERCLEANFILES += $(WHITE_PAPER_HTML).stamp +# HTML outputs contains several files (the HTML file itself, its CSS +# style sheet, possibly some images). Therefore, we cannot rely on a +# simple suffix rule to produce them. +$(WHITE_PAPER_HTML).stamp: $(white_paper_dir)/white_paper.tex $(EPSS) + @rm -f $@.tmp + @touch $@.tmp + $(TEXI2HTML) $(TEXI2HTML_FLAGS) -o $(WHITE_PAPER_HTML) $< + @mv -f $@.tmp $@ + +$(WHITE_PAPER_HTML_OUTPUTS): $(WHITE_PAPER_HTML).stamp +## Recover from the removal of $@ + @if test -d $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi +dist_doc_DATA += $(WHITE_PAPER_HTML_OUTPUTS) +MAINTAINERCLEANFILES += $(WHITE_PAPER_HTML_OUTPUTS) WHITE_PAPER_PDF = $(white_paper_dir)/white_paper.pdf white-paper-pdf: $(WHITE_PAPER_PDF) @@ -560,10 +620,31 @@ ref_guide_dependencies = \ # Final product. REF_GUIDE_HTML = $(ref_guide_dir)/ref_guide.html -# Extra dependencies. -$(REF_GUIDE_HTML): $(ref_guide_dependencies) +REF_GUIDE_HTML_OUTPUTS = \ + $(REF_GUIDE_HTML) \ + $(ref_guide_dir)/ref_guide.css \ + $(ref_guide_dir)/ref_guide0x.png + +EXTRA_DIST += $(REF_GUIDE_HTML).stamp +MAINTAINERCLEANFILES += $(REF_GUIDE_HTML).stamp +# HTML outputs contains several files (the HTML file itself, its CSS +# style sheet, possibly some images). Therefore, we cannot rely on a +# simple suffix rule to produce them. +$(REF_GUIDE_HTML).stamp: $(ref_guide_dir)/ref_guide.tex $(ref_guide_dependencies) + @rm -f $@.tmp + @touch $@.tmp + $(TEXI2HTML) $(TEXI2HTML_FLAGS) -o $(REF_GUIDE_HTML) $< + @mv -f $@.tmp $@ + +$(REF_GUIDE_HTML_OUTPUTS): $(REF_GUIDE_HTML).stamp +## Recover from the removal of $@ + @if test -d $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi -dist_doc_DATA += $(REF_GUIDE_HTML) +dist_doc_DATA += $(REF_GUIDE_HTML_OUTPUTS) +MAINTAINERCLEANFILES += $(REF_GUIDE_HTML_OUTPUTS) # Intermediate product for the various doc targets of the parent # directory. -- 1.5.6.5