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

	* src/util/Makefile.am,
	* src/util/component_precise_outline.cc: New.

	* scribo/toolchain/internal/content_in_hdoc_functor.hh: Remove
	debug.

	* src/content_in_hdoc.cc: Disable debug.

	* src/contest/DAE-2011/Makefile.am,
	* src/contest/Makefile.am,
	* src/contest/hdlac-2011/Makefile.am: New targets.

	* src/contest/DAE-2011/content_in_hdoc_dae.cc,
	* src/contest/hdlac-2011/content_in_hdoc_hdlac.cc: New.

	* scribo/io/xml/internal/page_xml_visitor.hh: Fix duplicate ids.

	* scribo/toolchain/internal/content_in_hdoc_functor.hh: Remove
	debug and disable OCR.

	* scribo/util/component_precise_outline.hh: Remove debug.

	* scribo/primitive/extract/lines_h_thick_and_thin.hh,
	* scribo/primitive/remove/separators.hh: Initialize border.

	* scribo/core/component_info.hh,
	* scribo/core/component_set.hh,
	* scribo/core/line_info.hh,
	* scribo/draw/line_components.hh: Remove holder data. Prevented
	the containers from being freed.

	* scribo/io/img/internal/debug_img_visitor.hh,
	* scribo/io/img/internal/full_img_visitor.hh,
	* scribo/io/img/save.hh,
	* scribo/io/xml/internal/page_xml_visitor.hh,
	* scribo/io/xml/save.hh,
	* scribo/primitive/extract/lines_h_thick_and_thin.hh,
	* scribo/primitive/remove/separators.hh,
	* scribo/text/merging.hh,
	* scribo/text/paragraphs.hh,
	* scribo/text/paragraphs_closing.hh,
	* scribo/toolchain/internal/content_in_hdoc_functor.hh: Update
	code in order to make holder data useless.

	* mln/convert/from_to.hxx,
	* mln/util/object_id.hh: Here.

	* scribo/io/xml/internal/print_image_coords.hh,
	* scribo/io/xml/internal/print_page_preambule.hh: Fix typos.

	* scribo/io/xml/internal/time_info.hh: New.

	* scribo/core/tag/component.hh: New tag.

	* scribo/postprocessing/images_to_drop_capital.hh: New routine.

	* scribo/io/img/internal/debug_img_visitor.hh,
	* scribo/io/img/internal/full_img_visitor.hh,
	* scribo/io/xml/internal/page_xml_visitor.hh: Here.

	* scribo/core/paragraph_info.hh: Here.

	* scribo/core/tag/paragraph.hh: Introduce paragraph tags.

	* scribo/filter/paragraphs_in_borders.hh,
	* scribo/filter/separators_in_borders.hh,
	* scribo/filter/separators_vert_in_borders.hh: New.

	* 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: Improve filtering.

	* scribo/toolchain/internal/content_in_hdoc_functor.hh: Make use
	of new filters.