* 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.

	* mln/morpho/skeleton_constrained.hh,
	* mln/topo/skeleton/is_simple_point.hh: Expect a double
	neighborhood.

	* mln/topo/is_simple_2d.hh: Add a fast implementation.

	* mln/core/point.hh: Fix point1d conversion.

	* mln/debug/draw_graph.hh: Don't write outside output image.

	* mln/win/multiple_size.hh: Avoid a warning.

Conflicts:
	scribo/scribo/text/paragraphs.hh: Renamed as extract_paragraphs.hh.

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

	* scribo/core/object_groups.hh,
	* scribo/debug/logger.hh,
	* scribo/estim/object_groups_mean_width.hh,
	* src/debug/show_paragraph_blocks.cc,
	* src/debug/show_text_lines.cc,
	* src/non_text_components.cc,
	* src/primitive/extract/alignments.cc,
	* scribo/text/extract_paragraphs_hdoc.hh: Fix namespace ambiguities.

	* scribo/core/object_links.hh: Remove useless find_root().

	* scribo/debug/bboxes_enlarged_image.hh,
	* scribo/debug/looks_like_a_text_line_image.hh: Update includes.

	* scribo/filter/images_in_paragraph.hh,
	* scribo/filter/paragraphs_bbox_overlap.hh,
	* scribo/filter/paragraphs_in_image.hh,
	* scribo/filter/separators_in_element.hh,
	* scribo/filter/separators_in_paragraph.hh,
	* scribo/io/img/internal/debug_img_visitor.hh,
	* scribo/io/img/internal/full_img_visitor.hh,
	* scribo/io/xml/internal/compute_text_colour.hh,
	* scribo/io/xml/internal/full_xml_visitor.hh,
	* scribo/io/xml/internal/page_xml_visitor.hh,
	* scribo/io/xml/internal/time_info.hh,
	* scribo/postprocessing/images_to_drop_capital.hh,
	* scribo/primitive/remove/separators.hh,
	* scribo/text/extract_paragraphs.hh,
	* scribo/text/paragraphs_closing.hh,
	* scribo/toolchain/internal/content_in_hdoc_functor.hh: Add
	missing includes.

	* scribo/io/xml/load.hh: Fix string conversions.

	* scribo/primitive/group/from_double_link.hh
	* scribo/primitive/link/with_several_left_links.hh
	* scribo/primitive/link/with_several_right_links.hh
	* src/afp/link.hh: Update according new API in
	object_groups/links.

	* src/text_in_picture.cc,
	* src/text_in_picture_neg.cc,
	* src/text_recognition_in_picture.cc: Update a routine name.

	* demo/viewer/viewer.cc,
	* demo/viewer/xml_widget.cc: Update tag names.

	* scribo/io/xml/internal/extended_page_xml_visitor.hh,
	* scribo/io/xml/save.hh: Save component outlines.

	* scribo/core/component_features_data.hh,
	* scribo/core/group_info.hh,
	* scribo/io/xml/internal/compute_text_colour.hh,
	* scribo/io/xml/internal/time_info.hh,
	* scribo/util/color_to_hex.hh,
	* scribo/util/component_precise_outline.hh: Add missing inline.

	* scribo/toolchain/internal/text_in_doc_preprocess_functor.hh: Add
	a missing include.

	* scribo/core/paragraph_set.hh: Add an overload of
	make::paragraph().

	* scribo/text/paragraphs.hh: Move...

	* scribo/text/extract_paragraphs.hh,
	* scribo/text/extract_paragraphs_hdoc.hh: ... here.

	* scribo/text/merging.hh: Remove holder() calls.

	* scribo/text/merging_hdoc.hh: New.

	* scribo/toolchain/internal/content_in_doc_functor.hh: Fix compilation.

	* scribo/toolchain/internal/content_in_hdoc_functor.hh: Make use
	of hdoc algorithms.

	* src/contest/DAE-2011/Makefile.am: New target.

	* src/contest/DAE-2011/content_in_doc_dae.cc: New.

	* scribo/toolchain/internal/content_in_doc_functor.hh,
	* src/Makefile.am,
	* src/contest/DAE-2011/content_in_hdoc_dae.cc: Here.