1. 31 Mar, 2010 40 commits
    • Roland Levillain's avatar
      Move LaTeX sources at the root of doc/; generate HTML in subdirs. · 5bb93504
      Roland Levillain authored
      	* doc/tutorial/tutorial.tex,
      	* doc/technical/technical.tex,
      	* doc/ref_guide/ref_guide.tex,
      	* doc/white_paper/white_paper.tex:
      	Move...
      	* doc/tutorial.tex,
      	* doc/technical.tex,
      	* doc/ref-guide.tex,
      	* doc/white-paper.tex:
      	...here.
      	* doc/graphicx.hva: New.
      	* doc/technical/figures/file_layout.pdf,
      	* doc/technical/figures/file_layout.png,
      	* doc/white_paper/figures/house.png,
      	* doc/white_paper/figures/house_rag.png,
      	* doc/white_paper/figures/house_wshed.png,
      	* doc/white_paper/figures/house_wshed_mean_colors.png:
      	Move...
      	* doc/figures/technical/file_layout.pdf,
      	* doc/figures/technical/file_layout.png,
      	* doc/figures/house.png,
      	* doc/figures/house_rag.png,
      	* doc/figures/house_wshed.png,
      	* doc/figures/house_wshed_mean_colors.png:
      	...here.
      	* doc/technical.tex: Adjust paths.
      	* doc/technical/designs/,
      	* doc/tutorial/designs/,
      	* doc/tutorial/doxyfile_tuto.local,
      	* doc/tutorial/image_types.txt,
      	* doc/tutorial/image_values.txt,
      	* doc/tutorial/images_tour.txt,
      	* doc/tutorial/slides.tex:
      	Rename as...
      	* doc/technical.old/designs/,
      	* doc/tutorial.old/design/,
      	* doc/tutorial.old/doxyfile_tuto.local,
      	* doc/tutorial.old/image_types.txt,
      	* doc/tutorial.old/image_values.txt,
      	* doc/tutorial.old/images_tour.txt,
      	* doc/tutorial.old/slides.tex:
      	...this.
      	* tutorial/headers.stamp: Remove.
      	* doc/Makefile.am (REFMAN_deps): Rename as...
      	(refman_dependencies): ...this.
      	Adjust paths.
      	($(srcdir)/user-refman.stamp, $(srcdir)/devel-refman.stamp):
      	Adjust.
      	(PNGS, EPSS): Remove.
      	(.png.eps): Remove rule.
      	(TECHNICAL_FIGURES, WHITE_PAPER_FIGURES): New.
      	(MORE_FIGURES): Add $(TECHNICAL_FIGURES) and
      	$(WHITE_PAPER_FIGURES).
      	(technical_dir, tutorial_dir, white_paper_dir, ref_guide_dir):
      	Remove.
      	(TECHNICAL, TUTORIAL, WHITE_PAPER, REF_GUIDE): New.
      	(TECHNICAL_PDF, TUTORIAL_PDF, WHITE_PAPER_PDF, REF_GUIDE_PDF)
      	(TUTORIAL_HH, REF_GUIDE_HH)
      	(EXTRA_DIST, MAINTAINERCLEANFILES): Adjust.
      	Remove (EPSS).
      	(EXTRA_DIST): Remove $(PNGS).
      	Add graphicx.hva.
      	(technical_dependencies)
      	(tutorial_dependencies)
      	(ref_guide_dependencies):
      	Rename as...
      	(TECHNICAL_deps)
      	(TUTORIAL_deps)
      	(REF_GUIDE_deps):
      	...this.
      	(TECHNICAL_deps): Add $(TECHNICAL_FIGURES).
      	(WHITE_PAPER_deps): New.
      	($(TECHNICAL_PDF))
      	($(TUTORIAL_PDF))
      	($(WHITE_PAPER_PDF))
      	($(REF_GUIDE_PDF)):
      	Adjust.
      	(TECHNICAL_HTML, TECHNICAL_HTML_OUTPUTS)
      	(TUTORIAL_HTML, TUTORIAL_HTML_OUTPUTS)
      	(WHITE_PAPER_HTML, WHITE_PAPER_HTML_OUTPUTS)
      	(REF_GUIDE_HTML, REF_GUIDE_HTML_OUTPUTS):
      	Remove.
      	(all-local): Depend on
      	$(srcdir)/$(TECHNICAL).stamp,
      	$(srcdir)/$(TUTORIAL).stamp,
      	$(srcdir)/$(WHITE_PAPER).stamp and
      	$(srcdir)/$(REF_GUIDE).stamp.
      	($(TECHNICAL_HTML).stamp)
      	($(TUTORIAL_HTML).stamp)
      	($(WHITE_PAPER_HTML).stamp)
      	($(REF_GUIDE_HTML).stamp):
      	Turn targets into...
      	($(srcdir)/$(TECHNICAL).stamp)
      	($(srcdir)/$(TUTORIAL).stamp)
      	($(srcdir)/$(WHITE_PAPER).stamp)
      	($(srcdir)/$(REF_GUIDE).stamp):
      	...this.
      	Adjust rules to generate outputs in a subdirectory.
      	($(TECHNICAL_HTML_OUTPUTS))
      	($(TUTORIAL_HTML_OUTPUTS))
      	($(WHITE_PAPER_HTML_OUTPUTS))
      	($(REF_GUIDE_HTML_OUTPUTS)):
      	Turn targets into...
      	($(srcdir)/$(TECHNICAL))
      	($(srcdir)/$(TUTORIAL))
      	($(srcdir)/$(WHITE_PAPER))
      	($(srcdir)/$(REF_GUIDE)):
      	...this.
      	Adjust.
      	($(TUTORIAL_HH)): Depend on $(srcdir)/$(TUTORIAL).stamp.
      	Adjust rule.
      	($(REF_GUIDE_HH)): Depend on (srcdir)/$(REF_GUIDE).stamp.
      	Adjust rule.
      	(dist_html_DATA): Remove.
      	(DATA_html_dirs): New.
      	(EXTRA_DIST): Add $(DATA_html_dirs).
      5bb93504
    • Roland Levillain's avatar
      Revert to HeVeA to generate HTML from LaTeX. · 5d5c643d
      Roland Levillain authored
      	* build-aux/tex.mk (TEXI2HTML): Disable flag `--tex4ht'.
      5d5c643d
    • Roland Levillain's avatar
      No longer generate doc/technical/technical.hh. · b59137ab
      Roland Levillain authored
      	* doc/Makefile.am (TECHNICAL_HH): Remove variable.
      	($(TECHNICAL_HH)): Remove rule.
      	(MAINTAINERCLEANFILES): Remove $(TECHNICAL_HH).
      b59137ab
    • Roland Levillain's avatar
      Fix the regeneration of files in doc/. · 15608e30
      Roland Levillain authored
      	* doc/Makefile.am (regen-am): No longer invoke
      	regen-pbm-figures-mk, regen-pgm-figures-mk nor
      	regen-ppm-figures-mk.
      15608e30
    • Roland Levillain's avatar
      Fix the Milena distribution. · cb0b4523
      Roland Levillain authored
      	* doc/Makefile.am (EXTRA_DIST): Remove $(TECHNICAL_HH).
      	* tests/transform/Makefile.am (check_PROGRAMS): Remove kht.
      	(kht_SOURCES): Remove.
      cb0b4523
    • Roland Levillain's avatar
      Do not distribute the developer (Doxygen) reference manual. · 4502becc
      Roland Levillain authored
      	* doc/Makefile.am (EXTRA_DIST): Remove
      	$(srcdir)/devel-refman.stamp.
      4502becc
    • Roland Levillain's avatar
      Fix the name of the developer (Doxygen) PDF reference manual. · fe084d58
      Roland Levillain authored
      	* doc/Makefile.am (DEVEL_REFMAN_PDF):
      	s/devel-refman-pdf/devel-refman.pdf/.
      fe084d58
    • Roland Levillain's avatar
      Use finer installation variables. · 5025e334
      Roland Levillain authored
      	* doc/Makefile.am (dist_doc_DATA): Remove variable.
      	(dist_html_DATA, dist_pdf_DATA): New variables.
      	(MAINTAINERCLEANFILES):
      	Remove $(TECHNICAL_HTML_OUTPUTS), $(TECHNICAL_PDF),
      	$(TUTORIAL_HTML_OUTPUTS), $(TUTORIAL_PDF),
      	$(WHITE_PAPER_HTML_OUTPUTS), $(WHITE_PAPER_PDF),
      	$(REF_GUIDE_HTML_OUTPUTS), $(REF_GUIDE_PDF) and
      	$(USER_REFMAN_PDF).
      	Add $(dist_html_DATA) and $(dist_pdf_DATA).
      5025e334
    • Roland Levillain's avatar
      Simplify doc/Makefile.am. · b6b3517c
      Roland Levillain authored
      	* doc/Makefile.am:
      	(DOC_SRCDIR, OUTPUTS_SRCDIR, SPLIT_OUTPUTS_SRCDIR, FIGURES_SRCDIR)
      	(EXAMPLES_SRCDIR, SPLIT_EXAMPLES_SRCDIR, IMG_SRCDIR, doc_dir):
      	Remove variables.
      	Adjust.
      b6b3517c
    • Roland Levillain's avatar
      doc/Makefile.am: Update FIXMEs. · 942c6a80
      Roland Levillain authored
      942c6a80
    • Roland Levillain's avatar
      422b78ec
    • Roland Levillain's avatar
      Remove Make aliases in the documentation. · e8f81c85
      Roland Levillain authored
      	* doc/Makefile.am (doc, doc-user, doc-devel)
      	(doc-pdf, doc-html, doc-devel-pdf, doc-devel-html)
      	(ref-doc, ref-doc-pdf, ref-doc-devel, ref-doc-devel-pdf)
      	(tutorial-pdf, white-paper-pdf, ref-guide-pdf)
      	(tutorial-html, white-paper-html, ref-guide-html):
      	Remove (phony) targets.
      	* Makefile.am (doc, tutorial): Likewise.
      e8f81c85
    • Roland Levillain's avatar
      Regen INSTALL using autoreconf. · defd5098
      Roland Levillain authored
      	* INSTALL: New.
      defd5098
    • Roland Levillain's avatar
      Move INSTALL's contents to README and HACKING. · 8116ef19
      Roland Levillain authored
      	* INSTALL: Remove this file and move its contents...
      	* README: ...here, and...
      	* HACKING: ...here (new file).
      8116ef19
    • Roland Levillain's avatar
      Regen documentation products. · 4faa18c9
      Roland Levillain authored
      	* doc/examples/split/ima2d-rot-1.cc.raw,
      	* doc/figures/fill-subdomain-2.ppm,
      	* doc/figures/fill-subdomain-3.ppm,
      	* doc/figures/labeling-compute-2.ppm,
      	* doc/figures/tuto3_colorize-2.ppm,
      	* doc/figures/tuto4_genericity_and_algorithms-1.ppm,
      	* doc/figures/tuto4_genericity_and_algorithms-5.ppm:
      	Regen
      	* doc/figures/tuto4_genericity_and_algorithms-7.pgm,
      	* doc/figures/tuto4_genericity_and_algorithms-7.ppm,
      	* doc/figures/tuto4_genericity_and_algorithms-8.pgm,
      	* doc/figures/tuto4_genericity_and_algorithms-8.ppm,
      	* doc/figures/tuto4_genericity_and_algorithms-9.pgm,
      	* doc/figures/tuto4_genericity_and_algorithms-9.ppm:
      	Delete.
      	* doc/outputs/ima-load.txt,
      	* doc/outputs/tuto3_first_routine.txt,
      	* doc/outputs/tuto4_image.txt:
      	New.
      4faa18c9
    • Roland Levillain's avatar
      Remove useless regen actions from bootstrap. · c0a26759
      Roland Levillain authored
      	* bootstrap (gen_doc_figures): Remove this function, and its uses
      	as well.
      c0a26759
    • Roland Levillain's avatar
      Have doc/gen-figures-mk generate more Makefile bits. · 2199e6c6
      Roland Levillain authored
      	* doc/gen-figures-mk: Generate Make variables PBM_FIGURES,
      	PGM_FIGURES and PPM_FIGURES in output.
      	* doc/figures.mk: Regen.
      	* doc/Makefile.am: No longer include $(srcdir)/pbm-figures.mk,
      	$(srcdir)/pgm-figures.mk nor $(srcdir)/ppm-figures.mk.
      	($(srcdir)/pbm-figures.mk, regen-pbm-figures-mk)
      	($(srcdir)/pgm-figures.mk, regen-pgm-figures-mk)
      	($(srcdir)/ppm-figures.mk, regen-ppm-figures-mk):
      	Remove rules.
      	(EXTRA_DIST): Add $(FIGURES).
      	Remove $(PBM_FIGURES), $(PGM_FIGURES) and $(PPM_FIGURES).
      	* doc/pbm-figures.mk,
      	* doc/pgm-figures.mk,
      	* doc/ppm-figures.mk:
      	Remove.
      2199e6c6
    • Roland Levillain's avatar
      Rework doc/gen-figures-mk a bit. · 390b0955
      Roland Levillain authored
      	* doc/gen-figures-mk (gen_var): New function.
      	Use to factor the emission of the Make variable at the end of the
      	output.
      	Aesthetic changes.
      390b0955
    • Roland Levillain's avatar
      Add options to boostrap. · c94f5179
      Roland Levillain authored
      	* bootstrap: Here.
      	(usage): New function.  Call it when invoked with option
      	`-h, --help'.
      	Regen files stored in the repository only if invoked with option
      	`-r, --regen'.
      c94f5179
    • Roland Levillain's avatar
      Distribute doc/gen-split-outputs-mk. · e5e506be
      Roland Levillain authored
      	* doc/Makefile.am (EXTRA_DIST): Add gen-split-outputs-mk.
      	Aesthetic changes.
      e5e506be
    • Roland Levillain's avatar
      d637b996
    • Roland Levillain's avatar
      Make a more portable use of mktemp. · 084fcc94
      Roland Levillain authored
      	* doc/gen-split-examples-mk,
      	* doc/gen-split-outputs-mk:
      	Here.
      084fcc94
    • Roland Levillain's avatar
      Sort inputs of generators to make them deterministic w.r.t. outputs. · 67c299f4
      Roland Levillain authored
      	* doc/gen-split-examples-mk,
      	* doc/gen-split-outputs-mk:
      	Here.
      	* doc/split-examples.mk: Regen.
      67c299f4
    • Roland Levillain's avatar
      bootstrap: Regen milena/doc/figures.mk. · 9196858a
      Roland Levillain authored
      9196858a
    • Roland Levillain's avatar
      Generate the list of figures in the documentation. · c0e0ae6f
      Roland Levillain authored
      	* doc/Makefile.am ($(srcdir)/figures.mk): New rule.
      	(regen-figures-mk): New phony target.
      	(regen-am): Invoke regen-figures-mk.
      	* doc/figures.mk: Regen.
      c0e0ae6f
    • Roland Levillain's avatar
      Add a script to generate doc/figures.mk. · 642d87ac
      Roland Levillain authored
      	* doc/gen-figures-mk: New script.
      	* doc/Makefile.am (EXTRA_DIST): Add gen-figures-mk.
      642d87ac
    • Roland Levillain's avatar
      Use a more uniform style in doc/figures.mk. · 2c4e1e1d
      Roland Levillain authored
      	* doc/figures.mk: Here.
      	Reorder items.
      2c4e1e1d
    • Roland Levillain's avatar
      Prepare doc examples for the automated generation of figures.mk. · b599cccf
      Roland Levillain authored
      	* doc/examples/ima2d-rot.cc (main): Pass a literal string as
      	second argument to doc::ppmsave to help gen-figures-mk.
      	* doc/examples/labeling-compute.cc (main): Have calls to
      	doc::ppmsave fit on a single line to help gen-figures-mk.
      b599cccf
    • Roland Levillain's avatar
      bootstrap: Various fixes. · 4ee83123
      Roland Levillain authored
      4ee83123
    • Roland Levillain's avatar
      Typo in doc/. · 9b894672
      Roland Levillain authored
      	* doc/examples/accu-right-instanciation.cc: Rename as...
      	* doc/examples/accu-right-instantiation.cc: ...this.
      	* doc/examples/accu-wrong-instanciation.cc.raw,
      	* doc/examples/split/accu-right-instanciation-1.cc.raw,
      	* doc/outputs/accu-right-instanciation.txt:
      	Likewise, rename as...
      	* doc/examples/accu-wrong-instantiation.cc.raw,
      	* doc/examples/split/accu-right-instantiation-1.cc.raw,
      	* doc/outputs/accu-right-instantiation.txt:
      	...these.
      	* doc/ref_guide/ref_guide.tex,
      	* doc/programs-examples.mk,
      	* doc/Makefile.am (MORE_EXAMPLES):
      	s/instanciation/instantiation/.
      	* doc/examples-outputs.mk,
      	* doc/examples.mk,
      	* doc/outputs.mk,
      	* doc/split-examples.mk:
      	Regen.
      9b894672
    • Roland Levillain's avatar
      Fix dependencies in doc/. · 6c5106c0
      Roland Levillain authored
      	* doc/Makefile.am (refman_dependencies):
      	Remove $(SPLIT_EXAMPLES) and $(SPLIT_OUTPUTS).
      	(technical_dependencies): Add $(TECHNICAL_EXAMPLES).
      	(tutorial_dependencies, ref_guide_dependencies):
      	Add $(EXAMPLES)	and $(OUTPUTS).
      6c5106c0
    • Roland Levillain's avatar
      Distribute non generated figures in the documentation. · fca54282
      Roland Levillain authored
      	* doc/Makefile.am (MORE_FIGURES): New variable.
      	Add figures/accu_image_morpher_big_picture.pdf.
      	(EXTRA_DIST): Add $(MORE_FIGURES).
      fca54282
    • Roland Levillain's avatar
      Distribute non generated examples in the documentation. · 55f2622b
      Roland Levillain authored
      	* doc/Makefile.am (TECHNICAL_EXAMPLES, MORE_EXAMPLES):
      	New variables.
      	(EXTRA_DIST): Add $(TECHNICAL_EXAMPLES) and $(MORE_EXAMPLES).
      55f2622b
    • Roland Levillain's avatar
      Have ``make maintainer-clean'' remove generated figures in doc/. · 2152dd03
      Roland Levillain authored
      	* doc/figures.mk
      	(EXTEND_FIGURES)
      	(FILL_FIGURES)
      	(FILL_SUBDOMAIN_FIGURES)
      	(FILL_IMAGEIF_CFUN_FIGURES)
      	(IMA2D_ROT_FIGURES)
      	(IMA_SAVE_FIGURES)
      	(LABELING_COMPUTE_FIGURES)
      	(LOGICAL_NOT_FIGURES)
      	(TUTO2_FIRST_IMAGE_FIGURES)
      	(TUTO3_COLORIZE_FIGURES)
      	(TUTO3_RW_IMAGE_FIGURES)
      	(TUTO4_GENERICITY_AND_ALGORITHMS_FIGURES):
      	New variables.
      	Use them to simplify rules.
      	(FIGURES): New variable.
      	* doc/Makefile.am (MAINTAINERCLEANFILES): Add $(FIGURES).
      2152dd03
    • Roland Levillain's avatar
    • Roland Levillain's avatar
      Generate the list of split outputs in the documentation. · ba6a3f88
      Roland Levillain authored
      	* doc/Makefile.am ($(srcdir)/split-outputs.mk): New rule.
      	(regen-split-outputs-mk): New (phony) target.
      	($(srcdir)/split-outputs.stamp): Remove rule.
      	(refman_dependencies)
      	(tutorial_dependencies)
      	(ref_guide_dependencies)
      	(EXTRA_DIST, MAINTAINERCLEANFILES):
      	Remove $(srcdir)/split-outputs.stamp
      	Add $(SPLIT_OUTPUTS).
      	(regen-am): Remake regen-split-outputs-mk.
      	* doc/gen-split-outputs-mk: New script.
      	Use it to generate...
      	* doc/split-outputs.mk: ...this (new) Make helper.
      ba6a3f88
    • Roland Levillain's avatar
      Prepare doc source files for the automation of output splitting. · a4d6bc84
      Roland Levillain authored
      	* doc/examples/tuto3/println.cc,
      	* doc/examples/tuto4/site_set_create.cc:
      	Use doc::begin_output and doc::end_output instead of hand-made
      	delimiters.
      a4d6bc84
    • Roland Levillain's avatar
      Have split_sample.sh announce the right number of output files. · 8293184f
      Roland Levillain authored
      	* doc/tools/split_sample.sh: Here.
      8293184f
    • Roland Levillain's avatar
      Fix programs in doc/examples/. · 6b0e5460
      Roland Levillain authored
      	* doc/examples/ima-save.cc: Add a FIXME.
      	* doc/examples/ima-load.cc: Likewise.
      	Avoid hard-coded paths.
      	* doc/examples/tuto4/image.cc: Make it compile.
      	* doc/img/small.pbm: New symbolic link to img/small.pbm.
      	* doc/examples/split/ima-load-1.cc.raw: Regen.
      	* doc/examples/fill-imageif-cfun.cc,
      	* figures.mk,
      	* ppm-figures.mk:
      	s/fill-subimage-cfun/fill-imageif-cfun/.
      6b0e5460
    • Roland Levillain's avatar
      bootstrap: Be terser. · 7fe9e76d
      Roland Levillain authored
      7fe9e76d