20 Feb
2009
20 Feb
'09
10:12 a.m.
* doc/Doxyfile.in,
* doc/doc.mk,
* doc/tutorial/tools/split_sample.sh,
* doc/tutorial/tutorial.tex: fix typo.
* doc/tutorial/Makefile.am: use $(srcdir) instead of $(top_srcdir).
* doc/tutorial/examples/examples.mk,
* doc/tutorial/figures/figures.mk,
* doc/tutorial/outputs/outputs.mk,
* doc/tutorial/samples/samples.mk: update.
* doc/tutorial/figures/tuto2_first_image-1.pbm: new figure.
* doc/tutorial/samples/ima2d-3.cc: fix missing include.
---
milena/ChangeLog | 20 +++++
milena/doc/Doxyfile.in | 2 +-
milena/doc/doc.mk | 2 +-
milena/doc/tutorial/Makefile.am | 22 +++---
milena/doc/tutorial/examples/examples.mk | 38 +++++-----
milena/doc/tutorial/figures/figures.mk | 45 ++++++------
.../doc/tutorial/figures/tuto2_first_image-1.pbm | 5 +
milena/doc/tutorial/outputs/outputs.mk | 74 +++++++++---------
milena/doc/tutorial/samples/ima2d-3.cc | 1 +
milena/doc/tutorial/samples/samples.mk | 78 ++++++++++----------
milena/doc/tutorial/tools/split_sample.sh | 2 +-
milena/doc/tutorial/tutorial.tex | 2 +-
12 files changed, 159 insertions(+), 132 deletions(-)
create mode 100644 milena/doc/tutorial/figures/tuto2_first_image-1.pbm
diff --git a/milena/ChangeLog b/milena/ChangeLog
index 1f48bac..fca5a56 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,3 +1,23 @@
+2009-02-20 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Fix doc generation.
+
+ * doc/Doxyfile.in,
+ * doc/doc.mk,
+ * doc/tutorial/tools/split_sample.sh,
+ * doc/tutorial/tutorial.tex: fix typo.
+
+ * doc/tutorial/Makefile.am: use $(srcdir) instead of $(top_srcdir).
+
+ * doc/tutorial/examples/examples.mk,
+ * doc/tutorial/figures/figures.mk,
+ * doc/tutorial/outputs/outputs.mk,
+ * doc/tutorial/samples/samples.mk: update.
+
+ * doc/tutorial/figures/tuto2_first_image-1.pbm: new figure.
+
+ * doc/tutorial/samples/ima2d-3.cc: fix missing include.
+
2009-02-19 Guillaume Lazzara <z(a)lrde.epita.fr>
Give access to the underlying transformation in fun::x2x:composed.
diff --git a/milena/doc/Doxyfile.in b/milena/doc/Doxyfile.in
index 448bc3d..cda47dc 100644
--- a/milena/doc/Doxyfile.in
+++ b/milena/doc/Doxyfile.in
@@ -92,7 +92,7 @@ EXCLUDE_SYMBOLS =
EXAMPLE_PATH = @top_srcdir@/milena/doc/tutorial/samples \
@top_builddir@/milena/doc/tutorial/samples \
@top_builddir@/milena/doc/tutorial/outputs \
- @top_builddir@/milena/doc/tutorial/outputs/split \
+ @top_builddir@/milena/doc/tutorial/outputs/splitted \
@top_srcdir@/milena/doc/tutorial/outputs
EXAMPLE_PATTERNS =
EXAMPLE_RECURSIVE = NO
diff --git a/milena/doc/doc.mk b/milena/doc/doc.mk
index 50aaefc..b41750d 100644
--- a/milena/doc/doc.mk
+++ b/milena/doc/doc.mk
@@ -11,6 +11,6 @@ SAMPLES_SRCDIR = $(TUTORIAL_SRCDIR)/samples
TUTORIAL_BUILDDIR = $(top_builddir)/milena/doc/tutorial
OUTPUTS_BUILDDIR = $(TUTORIAL_BUILDDIR)/outputs
-SPLIT_OUTPUTS_BUILDDIR = $(TUTORIAL_BUILDDIR)/outputs/split
+SPLITTED_OUTPUTS_BUILDDIR = $(TUTORIAL_BUILDDIR)/outputs/splitted
FIGURES_BUILDDIR = $(TUTORIAL_BUILDDIR)/figures
SAMPLES_BUILDDIR = $(TUTORIAL_BUILDDIR)/samples
diff --git a/milena/doc/tutorial/Makefile.am b/milena/doc/tutorial/Makefile.am
index 447dcbe..ceb4534 100644
--- a/milena/doc/tutorial/Makefile.am
+++ b/milena/doc/tutorial/Makefile.am
@@ -41,24 +41,24 @@ tutorial.tex \
tutorial.pdf
.PHONY: regen-dist
-regen-dist: $(top_srcdir)/headers.stamp
+regen-dist: $(srcdir)/headers.stamp
-$(top_srcdir)/milena/doc/tutorial/examples/examples.mk: $(top_srcdir)/headers.stamp
-$(top_srcdir)/milena/doc/tutorial/figures/figures.mk: $(top_srcdir)/headers.stamp
-$(top_srcdir)/milena/doc/tutorial/outputs/outputs.mk: $(top_srcdir)/headers.stamp
-$(top_srcdir)/milena/doc/tutorial/samples/samples.mk: $(top_srcdir)/headers.stamp
+$(srcdir)/examples/examples.mk: $(srcdir)/headers.stamp
+$(srcdir)/figures/figures.mk: $(srcdir)/headers.stamp
+$(srcdir)/outputs/outputs.mk: $(srcdir)/headers.stamp
+$(srcdir)/samples/samples.mk: $(srcdir)/headers.stamp
-EXTRA_DIST += $(top_srcdir)/headers.stamp
-$(top_srcdir)/headers.stamp: $(top_srcdir)/milena/doc/tutorial/generate_dist_files.sh
+EXTRA_DIST += $(srcdir)/headers.stamp
+$(srcdir)/headers.stamp: $(srcdir)/generate_dist_files.sh
@rm -f $@.tmp
@touch $@.tmp
cd $(srcdir) && ./generate_dist_files.sh
@mv -f $@.tmp $@
-include $(top_srcdir)/milena/doc/tutorial/examples/examples.mk
-include $(top_srcdir)/milena/doc/tutorial/figures/figures.mk
-include $(top_srcdir)/milena/doc/tutorial/outputs/outputs.mk
-include $(top_srcdir)/milena/doc/tutorial/samples/samples.mk
+include $(srcdir)/examples/examples.mk
+include $(srcdir)/figures/figures.mk
+include $(srcdir)/outputs/outputs.mk
+include $(srcdir)/samples/samples.mk
EXTRA_DIST += \
tools/sample_utils.hh \
diff --git a/milena/doc/tutorial/examples/examples.mk
b/milena/doc/tutorial/examples/examples.mk
index b6704dc..1ff49cc 100644
--- a/milena/doc/tutorial/examples/examples.mk
+++ b/milena/doc/tutorial/examples/examples.mk
@@ -1,29 +1,29 @@
## Generated by ../generate_dist_files, do not modify.
EXTRA_DIST += \
-examples/accu.cc \
-examples/box.cc \
examples/cpp_issue.cc \
-examples/examples.mk \
-examples/for_Z.cc \
+examples/sub_image.cc \
+examples/sub_image_if.cc \
+examples/p_vaccess.cc \
+examples/win_multiple.cc \
examples/image2d.cc \
-examples/image_flat.cc \
-examples/image_if.cc \
examples/image_plain.cc \
-examples/image_safe.cc \
+examples/p_run.cc \
+examples/proxy.cc \
examples/p_array.2.cc \
-examples/p_array.cc \
-examples/p_image.cc \
-examples/p_key.2.cc \
+examples/examples.mk \
+examples/for_Z.cc \
+examples/image_if.cc \
examples/p_key.cc \
-examples/p_line2d.cc \
examples/p_mutable_array_of.cc \
examples/p_queue.cc \
-examples/p_run.cc \
-examples/p_vaccess.cc \
-examples/proxy.cc \
-examples/sub_image.cc \
-examples/sub_image_if.cc \
-examples/vec.cc \
-examples/win_multiple.cc \
-examples/window.cc
+examples/image_flat.cc \
+examples/p_image.cc \
+examples/box.cc \
+examples/p_line2d.cc \
+examples/p_array.cc \
+examples/accu.cc \
+examples/p_key.2.cc \
+examples/window.cc \
+examples/image_safe.cc \
+examples/vec.cc
diff --git a/milena/doc/tutorial/figures/figures.mk
b/milena/doc/tutorial/figures/figures.mk
index 39793cc..400b2ff 100644
--- a/milena/doc/tutorial/figures/figures.mk
+++ b/milena/doc/tutorial/figures/figures.mk
@@ -1,32 +1,33 @@
## Generated by ../generate_dist_files, do not modify.
EXTRA_DIST += \
-figures/figures.mk \
-figures/fill-subdomain-1.pbm \
-figures/fill-subdomain-2.ppm \
-figures/fill-subdomain-3.ppm \
-figures/fill-subdomain-4.ppm \
-figures/fill-subimage-cfun-1.ppm \
-figures/ima2d-rot-1.ppm \
figures/ima2d-rot-2.ppm \
-figures/ima_save.pbm \
-figures/labeling-compute-1.pbm \
+figures/tuto3_rw_image-1.ppm \
+figures/logical-not-2.pbm \
+figures/fill-subdomain-2.ppm \
+figures/tuto4_genericity_and_algorithms-9.pgm \
figures/labeling-compute-2.ppm \
+figures/tuto4_genericity_and_algorithms-7.pgm \
+figures/tuto4_genericity_and_algorithms-5.ppm \
+figures/ima2d-rot-1.ppm \
+figures/fill-subdomain-3.ppm \
+figures/tuto4_genericity_and_algorithms-9.ppm \
figures/logical-not-1.pbm \
-figures/logical-not-2.pbm \
+figures/ima_save.pbm \
+figures/tuto2_first_image-1.pbm \
+figures/figures.mk \
+figures/fill-subimage-cfun-1.ppm \
+figures/fill-subdomain-4.ppm \
+figures/tuto4_genericity_and_algorithms-7.ppm \
+figures/tuto4_genericity_and_algorithms-6.ppm \
figures/logical-not-3.pbm \
-figures/tuto3_rw_image-1.ppm \
-figures/tuto3_rw_image-2.ppm \
-figures/tuto3_rw_image-3.ppm \
-figures/tuto4_genericity_and_algorithms-1.ppm \
-figures/tuto4_genericity_and_algorithms-2.ppm \
figures/tuto4_genericity_and_algorithms-3.pbm \
+figures/tuto4_genericity_and_algorithms-1.ppm \
+figures/tuto4_genericity_and_algorithms-8.ppm \
+figures/labeling-compute-1.pbm \
+figures/tuto3_rw_image-3.ppm \
figures/tuto4_genericity_and_algorithms-4.ppm \
-figures/tuto4_genericity_and_algorithms-5.ppm \
-figures/tuto4_genericity_and_algorithms-6.ppm \
-figures/tuto4_genericity_and_algorithms-7.pgm \
-figures/tuto4_genericity_and_algorithms-7.ppm \
figures/tuto4_genericity_and_algorithms-8.pgm \
-figures/tuto4_genericity_and_algorithms-8.ppm \
-figures/tuto4_genericity_and_algorithms-9.pgm \
-figures/tuto4_genericity_and_algorithms-9.ppm
+figures/tuto4_genericity_and_algorithms-2.ppm \
+figures/fill-subdomain-1.pbm \
+figures/tuto3_rw_image-2.ppm
diff --git a/milena/doc/tutorial/figures/tuto2_first_image-1.pbm
b/milena/doc/tutorial/figures/tuto2_first_image-1.pbm
new file mode 100644
index 0000000..03baef0
--- /dev/null
+++ b/milena/doc/tutorial/figures/tuto2_first_image-1.pbm
@@ -0,0 +1,5 @@
+P4
+# Generated by Milena 1.0 http://olena.lrde.epita.fr
+# EPITA Research and Development Laboratory (LRDE)
+21 13
+ÿÿøš»Ø«»š»š«»ššØÿÿøª«šªš«ššÿÿø
\ No newline at end of file
diff --git a/milena/doc/tutorial/outputs/outputs.mk
b/milena/doc/tutorial/outputs/outputs.mk
index cc0a31d..dfba0d6 100644
--- a/milena/doc/tutorial/outputs/outputs.mk
+++ b/milena/doc/tutorial/outputs/outputs.mk
@@ -1,54 +1,54 @@
## Generated by ../generate_dist_files, do not modify.
EXTRA_DIST += \
+outputs/win-create-1-display.txt \
+outputs/win-create-2.txt \
outputs/accu-right-instanciation.txt \
+outputs/ima2d-1.txt \
outputs/borderthickness.txt \
-outputs/box2d-bbox.txt \
-outputs/domain-display.txt \
-outputs/dpoint-1.txt \
-outputs/estim-sites.txt \
-outputs/extension-ignore.txt \
-outputs/fill-call-1.txt \
-outputs/fill-part-image.txt \
-outputs/fill-subdomain-shorter.txt \
-outputs/fill-subdomain.txt \
+outputs/ima-save.txt \
outputs/fill-subimage-cfun.txt \
-outputs/fill.txt \
+outputs/labeling-compute.txt \
+outputs/parray-display-1.txt \
+outputs/fill-subdomain-shorter.txt \
+outputs/dpoint-1.txt \
outputs/forall-piter.txt \
-outputs/fun-p2v-1.txt \
-outputs/graph-data.txt \
+outputs/predicate-1.txt \
+outputs/box2d-bbox.txt \
outputs/graph-iter.txt \
outputs/graph-output-1.txt \
-outputs/ima-has.txt \
-outputs/ima-save.txt \
+outputs/fill-call-1.txt \
+outputs/ima2d-rot.txt \
+outputs/paste-call-1.txt \
+outputs/fun-p2v-1.txt \
+outputs/estim-sites.txt \
+outputs/parray-append.txt \
+outputs/fill-subdomain.txt \
outputs/ima-size.txt \
-outputs/ima2d-1.txt \
-outputs/ima2d-2.txt \
-outputs/ima2d-3.txt \
-outputs/ima2d-4.txt \
-outputs/ima2d-5.txt \
+outputs/tuto2_first_image.txt \
+outputs/logical-not.txt \
+outputs/ima2d-display-output-2.txt \
+outputs/ima2d-decl-2.txt \
+outputs/paste.txt \
+outputs/outputs.mk \
outputs/ima2d-6-clone.txt \
outputs/ima2d-7.txt \
-outputs/ima2d-decl-2.txt \
+outputs/tuto3_rw_image.txt \
+outputs/parray-bbox.txt \
+outputs/domain-display.txt \
outputs/ima2d-display-1.txt \
+outputs/win-create-1.txt \
outputs/ima2d-display-2.txt \
outputs/ima2d-display-output-1.txt \
-outputs/ima2d-display-output-2.txt \
-outputs/ima2d-rot.txt \
-outputs/labeling-compute.txt \
-outputs/logical-not.txt \
+outputs/fill-part-image.txt \
+outputs/tuto4_genericity_and_algorithms.txt \
+outputs/ima-has.txt \
+outputs/ima2d-5.txt \
+outputs/ima2d-4.txt \
outputs/mln_var.txt \
-outputs/outputs.mk \
-outputs/parray-append.txt \
-outputs/parray-bbox.txt \
-outputs/parray-display-1.txt \
-outputs/paste-call-1.txt \
-outputs/paste.txt \
+outputs/fill.txt \
outputs/point-1.txt \
-outputs/predicate-1.txt \
-outputs/tuto2_first_image.txt \
-outputs/tuto3_rw_image.txt \
-outputs/tuto4_genericity_and_algorithms.txt \
-outputs/win-create-1-display.txt \
-outputs/win-create-1.txt \
-outputs/win-create-2.txt
+outputs/extension-ignore.txt \
+outputs/graph-data.txt \
+outputs/ima2d-2.txt \
+outputs/ima2d-3.txt
diff --git a/milena/doc/tutorial/samples/ima2d-3.cc
b/milena/doc/tutorial/samples/ima2d-3.cc
index 97d1ebf..62be1ba 100644
--- a/milena/doc/tutorial/samples/ima2d-3.cc
+++ b/milena/doc/tutorial/samples/ima2d-3.cc
@@ -1,6 +1,7 @@
#include <mln/core/image/image2d.hh>
#include <mln/core/alias/box2d.hh>
#include <mln/opt/at.hh>
+#include <mln/value/int_u8.hh>
int main()
{
diff --git a/milena/doc/tutorial/samples/samples.mk
b/milena/doc/tutorial/samples/samples.mk
index ad479aa..442eec6 100644
--- a/milena/doc/tutorial/samples/samples.mk
+++ b/milena/doc/tutorial/samples/samples.mk
@@ -1,54 +1,54 @@
## Generated by ../generate_dist_files, do not modify.
EXTRA_DIST += \
-samples/accu-right-instanciation.cc \
-samples/accu-wrong-instanciation.cc.raw \
-samples/borderthickness.cc \
-samples/box2d-bbox.cc \
-samples/domain-display.cc \
+samples/paste-call-1.cc \
samples/dpoint-1.cc \
-samples/estim-sites.cc \
-samples/extension-ignore.cc \
-samples/fill-call-1.cc \
-samples/fill-part-image.cc \
+samples/parray-append.cc \
samples/fill-proto.cc.raw \
-samples/fill-subdomain-shorter.cc \
-samples/fill-subdomain.cc \
-samples/fill-subimage-cfun.cc \
-samples/fill.cc \
-samples/forall-piter.cc \
-samples/fun-p2v-1.cc \
-samples/graph-data.cc \
+samples/ima2d-restricted-1.cc.raw \
samples/graph-iter.cc \
-samples/ima-has.cc \
-samples/ima-load.cc \
+samples/labeling-compute.cc \
+samples/ima2d-7.cc \
+samples/ima2d-restricted-2.cc.raw \
+samples/fill-subimage-cfun.cc \
samples/ima-save.cc \
+samples/point-1.cc \
+samples/box2d-bbox.cc \
+samples/forall-piter.cc \
samples/ima-size.cc \
-samples/ima2d-1.cc \
-samples/ima2d-2.cc \
-samples/ima2d-3.cc \
-samples/ima2d-4.cc \
+samples/borderthickness.cc \
+samples/Makefile.in \
+samples/ima-load.cc \
+samples/ima-has.cc \
+samples/win-create-1.cc \
+samples/samples.mk \
+samples/accu-wrong-instanciation.cc.raw \
+samples/accu-right-instanciation.cc \
samples/ima2d-5.cc \
-samples/ima2d-6-clone.cc \
-samples/ima2d-7.cc \
-samples/ima2d-restricted-1.cc.raw \
-samples/ima2d-restricted-2.cc.raw \
-samples/ima2d-restricted-3.cc.raw \
-samples/ima2d-rot.cc \
-samples/labeling-compute.cc \
-samples/logical-not.cc \
+samples/fill-subdomain.cc \
+samples/fill-subdomain-shorter.cc \
+samples/tuto3_rw_image.cc \
+samples/ima2d-2.cc \
+samples/extension-ignore.cc \
samples/Makefile.am \
-samples/Makefile.in \
-samples/mln_var.cc \
-samples/parray-append.cc \
samples/parray-bbox.cc \
-samples/paste-call-1.cc \
-samples/paste.cc \
-samples/point-1.cc \
+samples/graph-data.cc \
+samples/mln_var.cc \
+samples/ima2d-4.cc \
samples/predicate-1.cc \
-samples/samples.mk \
+samples/ima2d-3.cc \
samples/tuto2_first_image.cc \
-samples/tuto3_rw_image.cc \
+samples/ima2d-1.cc \
+samples/estim-sites.cc \
+samples/ima2d-6-clone.cc \
+samples/ima2d-restricted-3.cc.raw \
+samples/logical-not.cc \
+samples/fun-p2v-1.cc \
+samples/ima2d-rot.cc \
+samples/fill-part-image.cc \
+samples/domain-display.cc \
samples/tuto4_genericity_and_algorithms.cc \
-samples/win-create-1.cc \
+samples/paste.cc \
+samples/fill.cc \
+samples/fill-call-1.cc \
samples/win-create-2.cc
diff --git a/milena/doc/tutorial/tools/split_sample.sh
b/milena/doc/tutorial/tools/split_sample.sh
index 1a4d434..5c508fb 100755
--- a/milena/doc/tutorial/tools/split_sample.sh
+++ b/milena/doc/tutorial/tools/split_sample.sh
@@ -18,5 +18,5 @@ for begin in $begins; do
done
if [ $split ] && [ $i -gt 1 ]; then
- echo "* $1 has been split in $i files."
+ echo "* $1 has been splitted in $i files."
fi
diff --git a/milena/doc/tutorial/tutorial.tex b/milena/doc/tutorial/tutorial.tex
index 6dd2d0c..f610437 100644
--- a/milena/doc/tutorial/tutorial.tex
+++ b/milena/doc/tutorial/tutorial.tex
@@ -153,7 +153,7 @@ $$
\renewcommand{\doxycode}[2][1]{\lstinputlisting[frame=single]{samples/#2-#1.cc}}
\renewcommand{\doxyrawcode}[1]{\lstinputlisting[frame=single]{samples/#1.cc.raw}}
\renewcommand{\doxyoutput}[1]{\lstinputlisting[frame=single]{outputs/#1.txt}}
-\renewcommand{\doxymoutput}[2][1]{\lstinputlisting[frame=single]{outputs/split/#2-#1.txt}}
+\renewcommand{\doxymoutput}[2][1]{\lstinputlisting[frame=single]{outputs/splitted/#2-#1.txt}}
\renewcommand{\doxyfigure}[3][1]{%
\pgfimage[width=#3]{figures/#2-#1}%
\label{#1}%
--
1.5.6.5