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

	* scribo/primitive/identify.hh: identify non-text components
	type according criterions.

	* demo/viewer/common.hh,
	* demo/viewer/image_region.cc,
	* demo/viewer/key_widget.cc,
	* demo/viewer/step_widget.cc,
	* demo/viewer/viewer.cc,
	* demo/viewer/viewer.hh,
	* demo/viewer/xml_widget.cc: Get rid of the paragraph node and
	consider text_region as a paragraph.

	* scribo/core/document.hh: Add support for paragraphs.

	* scribo/core/macros.hh: Add new macro for_all_paragraph_lines.

	* scribo/core/line_links.hh,
	* scribo/core/paragraph_info.hh,
	* scribo/core/paragraph_set.hh: New. New structures.

	* scribo/filter/line_links_x_height.hh,
	* scribo/text/link_lines.hh: New. New routine.

	* scribo/core/component_info.hh: Initialize type_ attribute.

	* scribo/core/line_info.hh: Rename accumulators.

	* scribo/debug/usage.hh: Update copyright.

	* scribo/toolchain/internal/text_in_doc_functor.hh: Initialize
	input_cleaned local variable.

	* tests/toolchain/nepomuk/text_extraction.cc: Support both
	Tesseract 2 and 3.

	* mln/value/equiv.hh: Return values by copy.

	* demo/review/ui/mainwindow.ui: Move...
	* demo/review/mainwindow.ui: ... here.

	* demo/review/src/mainwindow.cc,
	* demo/review/src/mainwindow.hh: Fix includes.

	* demo/review/Makefile.am,
	* demo/viewer/Makefile.am,
	* demo/xml2doc/Makefile.am: Do not distribute generated files.

	* src/binarization/sauvola.cc: Initialize ImageMagick.

	* src/binarization/sauvola_ms.cc: Fix maximum argument count.

	* Makefile.am: Add EXTRA_DIST.

	* demo/viewer/Makefile.am: Add a missing distributed header.

	* lrde-upload.sh: Here.

	* demo/viewer/Makefile.am,
	* demo/viewer/demodir.hh.in: Update demodir replacement.

	* demo/viewer/browser_widget.cc,
	* demo/viewer/browser_widget.hh: Add a new method.

	* demo/viewer/runner.cc,
	* demo/viewer/runner.hh,
	* demo/viewer/step_widget.cc,
	* demo/viewer/step_widget.hh,
	* demo/viewer/viewer.cc,
	* demo/viewer/viewer.hh: Introduce "export as" functionality.

	* demo/review/Makefile.am,
	* demo/viewer/Makefile.am (EXTRA_DIST): Add new files.

	* demo/viewer/demodir.hh.in: New.

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

	* scribo/toolchain/internal/content_in_doc_functor.hh,
	* scribo/toolchain/internal/text_in_doc_functor.hh: Fix guards.

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

	* demo/xml2doc/templates/pdf/line.xsl: Use temporary hack to
	improve document rendering.

	* demo/viewer/Makefile.am: Add new files.

	* demo/viewer/main.cc: Initialize libMagick++.

	* demo/viewer/step_widget.cc,
	* demo/viewer/step_widget.hh: Improve interface.

	* demo/viewer/viewer.cc,
	* demo/viewer/viewer.hh,
	* demo/viewer/viewer.hxx: Handle calls to the DIA toolchain.

	* demo/viewer/preprocess.cc,
	* demo/viewer/preprocess.hh,
	* demo/viewer/process.cc,
	* demo/viewer/process.hh,
	* demo/viewer/runner.cc,
	* demo/viewer/runner.hh: New.

	* demo/viewer/README,
	* demo/viewer/browser_widget.cc,
	* demo/viewer/browser_widget.hh,
	* demo/viewer/common.hh,
	* demo/viewer/help_dialog.cc,
	* demo/viewer/help_dialog.hh,
	* demo/viewer/image_region.cc,
	* demo/viewer/image_region.hh,
	* demo/viewer/image_region.hxx,
	* demo/viewer/image_scene.cc,
	* demo/viewer/image_scene.hh,
	* demo/viewer/image_view.cc,
	* demo/viewer/image_view.hh,
	* demo/viewer/image_widget.cc,
	* demo/viewer/image_widget.hh,
	* demo/viewer/key_widget.cc,
	* demo/viewer/key_widget.hh,
	* demo/viewer/main.cc,
	* demo/viewer/xml_widget.cc,
	* demo/viewer/xml_widget.hh: Here.

	* demo/viewer/config.cc,
	* demo/viewer/config.hh,
	* demo/viewer/defs.hh,
	* demo/viewer/general_options.cc,
	* demo/viewer/general_options.hh,
	* demo/viewer/general_options.ui,
	* demo/viewer/option_widget.cc,
	* demo/viewer/option_widget.hh,
	* demo/viewer/preferences_dialog.cc,
	* demo/viewer/preferences_dialog.hh,
	* demo/viewer/preferences_dialog.ui,
	* demo/viewer/toolchain_options.cc,
	* demo/viewer/toolchain_options.hh,
	* demo/viewer/toolchain_options.ui: New.

	* scribo/text/recognition.hh: Add comments.

	* src/debug/show_links_single_right.cc: Fix an invalid
	incrementation.

	* src/Makefile.am: Add Magickxx flags for pbm_text_in_doc.

	* src/binarization/sauvola_ms.cc,
	* src/text_in_doc_preprocess.cc,
	* src/text_in_picture_neg.cc,
	* src/text_recognition_in_picture.cc: Initialize LibMagick++.

	* scribo/src/content_in_doc.cc,
	* scribo/src/pbm_text_in_doc.cc: Here.

	* scribo/toolchain/internal/content_in_doc_functor.hh,
	* scribo/toolchain/internal/text_in_doc_functor.hh,
	* scribo/toolchain/internal/text_in_doc_preprocess_functor.hh,
	* scribo/toolchain/internal/toolchain_functor.hh: New.

	* scribo/toolchain/text_in_doc.hh,
	* scribo/toolchain/text_in_doc_preprocess.hh: Make use of the
	functors.

	* scribo/binarization/internal/first_pass_functor.hh,
	* scribo/binarization/sauvola_ms.hh,
	* scribo/core/component_info.hh,
	* scribo/core/init_integral_image.hh,
	* scribo/core/tag/component.hh,
	* scribo/core/tag/line.hh,
	* scribo/io/xml/save.hh,
	* scribo/make/debug_filename.hh,
	* scribo/preprocessing/deskew.hh,
	* scribo/preprocessing/split_bg_fg.hh,
	* scribo/primitive/extract/separators_nonvisible.hh,
	* scribo/primitive/link/internal/dmax_default.hh,
	* scribo/primitive/link/internal/dmax_width_and_height.hh,
	* scribo/primitive/link/internal/dmax_width_only.hh,
	* scribo/text/merging.hh,
	* scribo/text/recognition.hh: Here.

	* mln/canvas/browsing/depth_first_search.hh,
	* mln/debug/filename.hh,
	* mln/debug/quiet.hh,
	* mln/labeling/colorize.hh,
	* mln/math/pi.hh: Add missing MLN_WO_GLOBAL_VARS guards.

	* demo/xml2doc/image_crop.cc,
	* demo/xml2doc/image_crop.hh,
	* demo/xml2doc/loader.cc,
	* demo/xml2doc/loader.hh,
	* demo/xml2doc/xml_transform.cc,
	* demo/xml2doc/xml_transform.hh: Here.

	* demo/xml2doc/main.cc: Implement the effective code of
	xml_transform.sh. Guaranties that the xsl files will be always
	accessible.

	* demo/xml2doc/templates/ooconvert: Move...
	* demo/xml2doc/templates/bin/ooconvert: ... here.

	* demo/xml2doc/templates/xml_transform.sh: Remove.