* Makefile.am: Add a rule to create a valid Portfile.

	* distrib/macports/Portfile.in: New.

	* tests/unit_test/Makefile.am (COND_TESTS):
	Add cond_tests_magickxx, cond_tests_magickxx_qt and
	cond_tests_magickxx_tesseract.
	Remove cond_tests_qt_tesseract_tiff.
	* tests/unit_test/cond_tests_magickxx,
	* tests/unit_test/cond_tests_magickxx_qt,
	* tests/unit_test/cond_tests_magickxx_tesseract:
	New.
	* tests/unit_test/cond_tests_qt_tesseract_tiff: Remove (empty)
	file.
	* tests/unit_test/cond_tests_magickxx_tesseract_tiff: Add
	scribo/toolchain/content_in_doc.hh.
	* tests/unit_test/cond_tests_qt: Remove
	scribo/io/xml/internal/full_xml_visitor.hh and
	scribo/io/xml/load.hh.
	* tests/unit_test/cond_tests_tesseract_tiff: Remove.
	scribo/toolchain/content_in_doc.hh.
	* tests/unit_test/cond_tests_magickxx_qt_tesseract_tiff:
	Remove empty line.
	* tests/unit_test/unit-tests.mk: Regen.

	* src/contest/DAE-2011/Makefile.am
	(content_in_hdoc_dae_CPPFLAGS, content_in_doc_dae_CPPFLAGS)
	* src/contest/hdlac-2011/Makefile.am
	(content_in_hdoc_hdlac_CPPFLAGS):
	Add $(MAGICKXX_CPPFLAGS).
	* src/debug/Makefile.am
	(noinst_PROGRAMS): Move show_lines_boldness...
	(noinst_PROGRAMS) [HAVE_MAGICKXX, HAVE_TESSERACT]: ...here.
	(show_lines_boldness_SOURCES): Remove.
	(show_lines_boldness_SOURCES)
	(show_lines_boldness_CPPFLAGS)
	(show_lines_boldness_LDFLAGS)
	[HAVE_MAGICKXX, HAVE_TESSERACT]: New.
	(show_text_lines_CPPFLAGS)
	(show_text_lines_wo_seps_CPPFLAGS)
	[HAVE_MAGICKXX, HAVE_QT, HAVE_TESSERACT]:
	Add $(TESSERACT_CPPFLAGS).

	* doc/Doxyfile.in: Enable source code parsing and listing. Fix
	include directories.

	* doc/ref-guide.tex,
	* doc/technical.tex: Use .sty files as input files instead of
	packages.

	* doc/tutorial.tex: Use .sty files as input files instead of
	packages. Fix references.

	* mln/core/concept/object.hh: Fix copyright.

	* mln/accu/take.hh,
	* mln/border/mirror.hh: Here.

	* scribo/debug/option_check.hh,
	* scribo/debug/option_parser.hh: Add missing includes.

	* scribo/estim/components_features.hh: Add preconditions.

	* mln/draw/site_set.hh: Remove call to exact().

	* mln/morpho/skeleton_constrained.hh: Add a missing const in fast
	implementation.

	* mln/topo/is_simple_2d.hh: Add a comment.

	* mln/topo/skeleton/is_simple_point.hh: Fix a wrong neighborhood
	type.

	* tests/topo/skeleton/is_simple_point.cc: Fix compilation.

	* src/primitive/Makefile.am: Add a missing subdir.

	* tests/primitive/extract/Makefile.am (EXTRA_DIST): Fix invalid
	file names.

	* headers.mk,
	* tests/unit_test/unit-tests.mk: Here.

	* headers.mk,
	* tests/unit_test/unit-tests.mk: Here.

	* mln/core/image/image1d.hh,
	* mln/core/image/image2d.hh,
	* mln/core/image/image3d.hh: Here.

	* mln/core/image/image3d.hh,
	* mln/core/internal/box_impl.hh,
	* mln/core/site_set/box.hh,
	* mln/debug/slices_2d.hh,
	* mln/geom/all.hh,
	* mln/geom/size3d.hh,
	* mln/linear/gaussian.hh,
	* mln/linear/gaussian/impl.hh,
	* mln/make/box3d.hh,
	* mln/make/image.hh,
	* mln/make/image3d.hh,
	* mln/registration/icp.hh,
	* tests/core/alias/box3d.cc,
	* tests/core/image/image3d.cc,
	* tests/geom/Makefile.am,
	* tests/io/pbms/load.cc,
	* tests/io/pgms/load.cc,
	* tests/io/ppms/load.cc: Rename nslices to nslis.

	* mln/geom/nslices.hh,
	* tests/geom/nslices.cc: Rename as...

	* mln/geom/nslis.hh,
	* tests/geom/nslis.cc: ...this.

	* demo/viewer/common.hh: Add new values in enum.

	* demo/viewer/viewer.cc: Bind XML tag to enum value.

	* scribo/debug/option_check.hh,
	* scribo/debug/option_parser.hh: New.

	* src/binarization/sauvola.cc,
	* src/binarization/sauvola_ms.cc,
	* src/binarization/sauvola_ms_fg.cc,
	* src/binarization/sauvola_ms_split.cc,
	* src/content_in_doc.cc,
	* src/pbm_text_in_doc.cc,
	* src/text_in_doc_preprocess.cc,
	* src/text_in_picture.cc,
	* src/text_in_picture_neg.cc,
	* src/text_recognition_in_picture.cc: Use the new option parser.

	* scribo/core/group_info.hh,
	* scribo/core/object_groups.hh: Add merge method.

	* scribo/draw/groups_bboxes.hh: Only consider valid groups.

	* scribo/estim/components_features.hh,
	* scribo/primitive/extract/separators_nonvisible.hh,
	* scribo/subsampling/bilinear.hh,
	* scribo/text/extract_paragraphs.hh,
	* scribo/text/merging.hh: Remove debug output.

	* scribo/primitive/group/apply.hh,
	* scribo/primitive/regroup/from_single_left_link.hh,
	* scribo/primitive/regroup/from_single_left_link_wrt_h_ratio.hh:
	Fix invalid result.

	* scribo/toolchain/internal/content_in_doc_functor.hh: Remove comments.

	* scribo/toolchain/internal/text_in_picture_functor.hh: New.

	* scribo/toolchain/content_in_doc.hh,
	* scribo/toolchain/internal/text_in_doc_functor.hh,
	* scribo/toolchain/text_in_doc.hh,
	* scribo/toolchain/text_in_doc_preprocess.hh: Add verbose mode.

	* scribo/toolchain/text_in_picture.hh: Make use of the new
	functor.

	* scribo/util/component_precise_outline.hh: Fix an include.

	* scribo/src/contest/hdlac-2011/content_in_hdoc_hdlac.cc: Fix parameters.

	* scribo/core/paragraph_info.hh: Update delta baseline.

	* scribo/primitive/extract/non_text.hh: Fill extension.

	* scribo/util/component_precise_outline.hh: Adjust extension.

	* demo/viewer/main.cc: Add a missing include.

	* demo/viewer/viewer.cc,
	* demo/xml2doc/templates/html/main.xsl,
	* demo/xml2doc/templates/html/main_base64.xsl,
	* demo/xml2doc/templates/pdf/line.xsl,
	* scribo/io/xml/internal/extended_page_xml_visitor.hh,
	* scribo/io/xml/internal/full_xml_visitor.hh,
	* scribo/io/xml/load.hh: Update tag names.

	* headers.mk,
	* tests/unit_test/unit-tests.mk: Here.

	* scribo/util/component_outline.hh: Remove.

	* scribo/util/component_precise_outline.hh: Add options.

	* scribo/tests/util/Makefile.am: Fix targets.

	* scribo/tests/util/component_outline.cc: Remove.

	* scribo/tests/util/component_precise_outline.cc: New.

	* scribo/estim/components_features.hh,
	* scribo/estim/internal/compute_skeleton.hh: Here.

	* tests/labeling/blobs_and_compute.cc,
	* tests/morpho/skeleton_constrained.cc: Here.