* doc/Makefile.am (TEXI2DVI_FLAGS): Add -I $(DOC_SRCDIR)/white_paper. ($(TECHNICAL_PDF), $(TUTORIAL_PDF)) ($(WHITE_PAPER_PDF), $(REF_GUIDE_PDF)): Reduce these rules to a list of extra dependencies and let the generic tex-to-html rule do the job. --- milena/ChangeLog | 11 +++++++++++ milena/doc/.gitignore | 31 +++++++++++-------------------- milena/doc/Makefile.am | 31 +++++++++++++++++-------------- 3 files changed, 39 insertions(+), 34 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 35aa08a..99345b1 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,14 @@ +2010-03-15 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + + Use texi2dvi to produce HTML from LaTeX. + + * doc/Makefile.am + (TEXI2DVI_FLAGS): Add -I $(DOC_SRCDIR)/white_paper. + ($(TECHNICAL_PDF), $(TUTORIAL_PDF)) + ($(WHITE_PAPER_PDF), $(REF_GUIDE_PDF)): + Reduce these rules to a list of extra dependencies and let the + generic tex-to-html rule do the job. + 2010-03-12 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; Split LaTeX-to-HTML rules to clear things up. diff --git a/milena/doc/.gitignore b/milena/doc/.gitignore index 9c55456..b187492 100644 --- a/milena/doc/.gitignore +++ b/milena/doc/.gitignore @@ -1,33 +1,24 @@ -/Doxyfile_devel /Doxyfile_user -/devel-refman -/devel-refman.pdf /user-refman /user-refman.pdf + +/Doxyfile_devel +/devel-refman +/devel-refman.pdf + /figures/*.png -/ref_guide/ref_guide.haux + /ref_guide/ref_guide.hh -/ref_guide/ref_guide.hh-e /ref_guide/ref_guide.html -/ref_guide/ref_guide.htoc /ref_guide/ref_guide.pdf -/technical/technical.haux -/technical/technical.hh -/technical/technical.hh-e + /technical/technical.html /technical/technical.pdf -/tutorial/tutorial.haux + /tutorial/tutorial.hh -/tutorial/tutorial.hh-e /tutorial/tutorial.html /tutorial/tutorial.pdf -/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_html/index.haux -/white_paper/white_paper_html/index.html -/white_paper/white_paper_html/index.html-e -/white_paper/white_paper_html/index.htoc -/white_paper/white_paper_html/index.image.tex + +/white_paper/figures/*.eps +/white_paper/white_paper.html /white_paper/white_paper.pdf diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 0d74098..3dc4bed 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -90,6 +90,9 @@ TEXI2DVI_FLAGS += \ -I $(DOC_SRCDIR) -I $(OUTPUTS_SRCDIR) -I $(SPLIT_OUTPUTS_SRCDIR) \ -I $(IMG_SRCDIR) -I $(SPLIT_EXAMPLES_SRCDIR) +# Illustrations of the white paper. +TEXI2DVI_FLAGS += -I $(DOC_SRCDIR)/white_paper + # Additional files for HeVeA compilations. DOC_PACKAGES = $(srcdir)/doxyfuns.sty $(srcdir)/milena.sty @@ -318,9 +321,10 @@ technical_dependencies = $(doc_dir)/figures.stamp ## Doyxgen documentation); remove its generation? Careful, ## technical/technical.html *is* probably required, though. +# Final product. TECHNICAL_HTML = $(technical_dir)/technical.html -$(TECHNICAL_HTML): $(technical_dir)/technical.tex $(technical_dependencies) - hevea -O -fix $(DOC_PACKAGES) $< -o $@ +# Extra dependencies. +$(TECHNICAL_HTML): $(technical_dependencies) dist_doc_DATA += $(TECHNICAL_HTML) @@ -396,9 +400,10 @@ tutorial_dependencies = \ # product is a directory, also refresh a timestamp (in the source # dir). +# Final product. TUTORIAL_HTML = $(tutorial_dir)/tutorial.html -$(TUTORIAL_HTML): $(tutorial_dir)/tutorial.tex $(tutorial_dependencies) - hevea -O -fix $(DOC_PACKAGES) $< -o $@ +# Extra dependencies. +$(TUTORIAL_HTML): $(tutorial_dependencies) dist_doc_DATA += $(TUTORIAL_HTML) @@ -482,15 +487,12 @@ white-paper: white-paper-pdf white-paper-html # product is a directory, also refresh a timestamp (in the source # dir). -# FIXME: Use texi2dvi/TeX4ht instead of plain hevea. -# FIXME: Why is WHITE_PAPER_HTML generated in a subdirectory? -WHITE_PAPER_HTML = $(white_paper_dir)/white_paper_html/index.html +# Final product. +WHITE_PAPER_HTML = $(white_paper_dir)/white_paper.html white-paper-html: $(WHITE_PAPER_HTML) -$(WHITE_PAPER_HTML): $(white_paper_dir)/white_paper.tex $(EPSS) - test -d $(white_paper_dir)/white_paper_html \ - || mkdir $(white_paper_dir)/white_paper_html - TEXINPUTS="$(DOC_SRCDIR):$(white_paper_dir):" hevea -O -fix $< -o $@ - $(doc_dir)/tools/clearbanner.sh $@ +$(WHITE_PAPER_HTML): $(EPSS) +# FIXME: Keep this pass? +# $(doc_dir)/tools/clearbanner.sh $@ WHITE_PAPER_PDF = $(white_paper_dir)/white_paper.pdf @@ -556,9 +558,10 @@ ref_guide_dependencies = \ # product is a directory, also refresh a timestamp (in the source # dir). +# Final product. REF_GUIDE_HTML = $(ref_guide_dir)/ref_guide.html -$(REF_GUIDE_HTML): $(ref_guide_dir)/ref_guide.tex $(ref_guide_dependencies) - hevea -O -fix $(DOC_PACKAGES) $< -o $@ +# Extra dependencies. +$(REF_GUIDE_HTML): $(ref_guide_dependencies) dist_doc_DATA += $(REF_GUIDE_HTML) -- 1.5.6.5