* tests/binarization/sauvola.ref.pbm,
	* tests/binarization/sauvola_ms.ref.pbm:
	Update reference outputs.

	* tests/data.hh.in: Here.

	* tests/binarization/Makefile.am (MOSTLYCLEANFILES): New.
	Add res.pbm.

	* tests/Makefile.am (EXTRA_DIST): Add img/comp_on_borders.pbm,
	img/multi_scale.png, img/phillip.pbm, img/several_objects.pgm,
	img/single_object.pbm and img/the_valleys.pbm.
	Aesthetic changes.

	* demo/xml2doc/templates/html/css.css,
	* demo/xml2doc/templates/html/main.xsl,
	* demo/xml2doc/templates/html/main_base64.xsl: Add new CSS rules.

	* demo/viewer/icons/olena_smaller.jpg,
	* demo/viewer/viewer.qrc: Change icon location.

	* scribo/text/paragraphs_closing.hh: Avoid a warning.

	* src/content_in_doc.cc: Fix a parameter description.

	* src/debug/show_lines_boldness.cc,
	* src/debug/show_text_lines.cc,
	* src/debug/show_text_lines_wo_seps.cc: Remove useless includes.

	* src/scribo-cli.in: Pass arguments correctly.

	* demo/viewer/Makefile.am: Add missing distributed files.

	* src/contest/DAE-2011/Makefile.am,
	* src/contest/hdlac-2011/Makefile.am,
	* src/debug/Makefile.am: Fix dependencies.

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

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

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

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

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

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