* scribo/layout/internal/hist_info.hh,
	* scribo/layout/internal/node.hh,
	* scribo/layout/xy_cut.hh,
	* tests/layout/Makefile.am,
	* tests/layout/xy_cut.cc: New.

	* tests/Makefile.am: Add new subdir.

	* demo/demat/demat.pro,
	* demo/demat/demat.qrc,
	* demo/demat/src/doc_type.hh,
	* demo/demat/src/main.cc,
	* demo/demat/src/main_window.cc,
	* demo/demat/src/main_window.hh,
	* demo/demat/src/mln_widgets.cc,
	* demo/demat/src/preprocessing_task.hh,
	* demo/demat/src/process_args.hh,
	* demo/demat/src/runner.cc,
	* demo/demat/src/runner.hh,
	* demo/demat/ui/main_window.ui,
	* demo/review/Makefile.am,
	* demo/review/icons/document-open.png,
	* demo/review/icons/edit-find.png,
	* demo/review/icons/format-indent-more.png,
	* demo/review/icons/go-next.png,
	* demo/review/icons/image-x-generic.png,
	* demo/review/icons/list-add.png,
	* demo/review/icons/ocr.png,
	* demo/review/icons/text-x-generic.png,
	* demo/review/icons/view-refresh.png,
	* demo/review/icons/x-office-spreadsheet.png,
	* demo/review/mainwindow.ui,
	* demo/review/review.qrc,
	* demo/review/src/main.cc,
	* demo/review/src/mainwindow.cc,
	* demo/review/src/mainwindow.hh,
	* demo/shared/icons/Symbols-Delete-icon.png,
	* demo/shared/icons/accept-icon.png,
	* demo/shared/icons/close.gif,
	* demo/shared/icons/crop-icon.png,
	* demo/shared/icons/image-add-icon.png,
	* demo/shared/icons/image-edit-icon.png,
	* demo/shared/icons/image-multi-icon.png,
	* demo/shared/icons/image-next-icon.png,
	* demo/shared/icons/image-remove-icon.png,
	* demo/shared/icons/next-icon.png,
	* demo/shared/icons/olena_smaller.jpg,
	* demo/shared/icons/page-down-icon.png,
	* demo/shared/icons/page-search-icon.png,
	* demo/shared/icons/rotate_ccw.png,
	* demo/shared/icons/rotate_cw.png,
	* demo/shared/icons/search-add-icon.png,
	* demo/shared/icons/search-remove-icon.png,
	* demo/shared/shared.qrc,
	* demo/shared/src/bak/crop_item.cc,
	* demo/shared/src/bak/crop_item.hh,
	* demo/shared/src/bak/image_viewer.cc,
	* demo/shared/src/bak/image_viewer.hh,
	* demo/shared/src/bak/types.hh,
	* demo/shared/src/browse_widget.cc,
	* demo/shared/src/browse_widget.hh,
	* demo/shared/src/crop_item.cc,
	* demo/shared/src/crop_item.hh,
	* demo/shared/src/image_viewer.cc,
	* demo/shared/src/image_viewer.hh,
	* demo/shared/src/image_viewer.hxx,
	* demo/shared/src/internal.bak/interactive_scene.cc,
	* demo/shared/src/internal.bak/interactive_scene.hh,
	* demo/shared/src/internal.bak/selection_rectangle.cc,
	* demo/shared/src/internal.bak/selection_rectangle.hh,
	* demo/shared/src/internal/interactive_scene.cc,
	* demo/shared/src/internal/interactive_scene.hh,
	* demo/shared/src/internal/selection_rectangle.cc,
	* demo/shared/src/internal/selection_rectangle.hh,
	* demo/shared/src/to_mln_image.hh,
	* demo/shared/src/types.hh,
	* demo/shared/ui/browse_widget.ui,
	* demo/shared/ui/crop_widget.ui,
	* demo/shared/ui/image_viewer.ui,
	* demo/shared/ui/interactive_scene.cc,
	* demo/shared/ui/interactive_scene.hh,
	* demo/shared/ui/rotate_widget.ui,
	* demo/tip/gui.pro,
	* demo/tip/gui.qrc,
	* demo/tip/icons/next.png,
	* demo/tip/icons/ok.png,
	* demo/tip/icons/photos.png,
	* demo/tip/icons/prev.png,
	* demo/tip/icons/remove.png,
	* demo/tip/src/custom_delegate.cc,
	* demo/tip/src/custom_delegate.hh,
	* demo/tip/src/launch_dialog.cc,
	* demo/tip/src/launch_dialog.hh,
	* demo/tip/src/main.cc,
	* demo/tip/src/main_window.cc,
	* demo/tip/src/main_window.hh,
	* demo/tip/ui/launch_dialog.ui,
	* demo/tip/ui/main_window.ui,
	* demo/wizard/images/dematerialization.png,
	* demo/wizard/src/crop_page.cc,
	* demo/wizard/src/crop_page.hh,
	* demo/wizard/src/crop_widget.cc,
	* demo/wizard/src/crop_widget.hh,
	* demo/wizard/src/doc_type.hh,
	* demo/wizard/src/doc_type_page.cc,
	* demo/wizard/src/doc_type_page.hh,
	* demo/wizard/src/doc_type_widget.cc,
	* demo/wizard/src/doc_type_widget.hh,
	* demo/wizard/src/load_page.cc,
	* demo/wizard/src/load_page.hh,
	* demo/wizard/src/load_widget.cc,
	* demo/wizard/src/load_widget.hh,
	* demo/wizard/src/main.cc,
	* demo/wizard/src/main_window.cc,
	* demo/wizard/src/main_window.hh,
	* demo/wizard/src/mln_widgets.cc,
	* demo/wizard/src/preprocessing_page.cc,
	* demo/wizard/src/preprocessing_page.hh,
	* demo/wizard/src/preprocessing_task.hh,
	* demo/wizard/src/preprocessing_widget.cc,
	* demo/wizard/src/preprocessing_widget.hh,
	* demo/wizard/src/process_page.cc,
	* demo/wizard/src/process_page.hh,
	* demo/wizard/src/process_widget.cc,
	* demo/wizard/src/process_widget.hh,
	* demo/wizard/src/result_page.cc,
	* demo/wizard/src/result_page.hh,
	* demo/wizard/src/result_widget.cc,
	* demo/wizard/src/result_widget.hh,
	* demo/wizard/src/rotate_page.cc,
	* demo/wizard/src/rotate_page.hh,
	* demo/wizard/src/rotate_widget.cc,
	* demo/wizard/src/rotate_widget.hh,
	* demo/wizard/src/runner.cc,
	* demo/wizard/src/runner.hh,
	* demo/wizard/src/test.cc,
	* demo/wizard/ui/doc_type_widget.ui,
	* demo/wizard/ui/load_widget.ui,
	* demo/wizard/ui/main_window.ui,
	* demo/wizard/ui/preprocessing_widget.ui,
	* demo/wizard/wizard.pro,
	* demo/wizard/wizard.qrc: Remove.

	* demo/viewer/image_view.cc: Fix a warning;

	* demo/viewer/main.cc: Include sauvola_ms.hh to compile related
	global variables.

	* sandbox/ChangeLog,
	* sandbox/z/sauvola_ms_rv/dump_color_sign.cc,
	* sandbox/z/sauvola_ms_rv/img/001.pgm,
	* sandbox/z/sauvola_ms_rv/img/001_i.pgm,
	* sandbox/z/sauvola_ms_rv/img/002.pgm,
	* sandbox/z/sauvola_ms_rv/img/002_i.pgm,
	* sandbox/z/sauvola_ms_rv/img/003.pgm,
	* sandbox/z/sauvola_ms_rv/img/003_i.pgm,
	* sandbox/z/sauvola_ms_rv/img/004.pgm,
	* sandbox/z/sauvola_ms_rv/img/004_i.pgm,
	* sandbox/z/sauvola_ms_rv/img/005.pgm,
	* sandbox/z/sauvola_ms_rv/img/005_i.pgm,
	* sandbox/z/sauvola_ms_rv/img/006.pgm,
	* sandbox/z/sauvola_ms_rv/img/006_i.pgm,
	* sandbox/z/sauvola_ms_rv/img/007.pgm,
	* sandbox/z/sauvola_ms_rv/img/007_i.pgm,
	* sandbox/z/sauvola_ms_rv/img/008.pgm,
	* sandbox/z/sauvola_ms_rv/img/008_i.pgm,
	* sandbox/z/sauvola_ms_rv/img/009.pgm,
	* sandbox/z/sauvola_ms_rv/img/009_i.pgm,
	* sandbox/z/sauvola_ms_rv/img/010.pgm,
	* sandbox/z/sauvola_ms_rv/img/010_i.pgm,
	* sandbox/z/sauvola_ms_rv/img/011.pgm,
	* sandbox/z/sauvola_ms_rv/img/011_i.pgm,
	* sandbox/z/sauvola_ms_rv/img/012.pgm,
	* sandbox/z/sauvola_ms_rv/img/012_i.pgm,
	* sandbox/z/sauvola_ms_rv/img/013.pgm,
	* sandbox/z/sauvola_ms_rv/img/013_i.pgm,
	* sandbox/z/sauvola_ms_rv/img/014.pgm,
	* sandbox/z/sauvola_ms_rv/img/014_i.pgm,
	* sandbox/z/sauvola_ms_rv/img/015.pgm,
	* sandbox/z/sauvola_ms_rv/mp00082c_crop.pgm,
	* sandbox/z/sauvola_ms_rv/pbm_color_diff.cc,
	* sandbox/z/sauvola_ms_rv/pgm_color_diff.cc,
	* sandbox/z/sauvola_ms_rv/pgm_local_mean.cc,
	* sandbox/z/sauvola_ms_rv/ppm_influence_zone_geodesic.cc,
	* sandbox/z/sauvola_ms_rv/skewness.cc,
	* sandbox/z/sauvola_ms_rv/skewness/integral_browsing_rv.hh,
	* sandbox/z/sauvola_ms_rv/skewness/skewness2.cc: Remove.

	* scribo/io/xml/internal/page_xml_visitor.hh: Here.

	* tests/binarization/sauvola_ms.cc,
	* tests/binarization/sauvola_ms.ref.pbm,
	* tests/binarization/sauvola_ms_weven_hodd.ref.pbm,
	* tests/binarization/sauvola_ms_wodd_heven.ref.pbm,
	* tests/binarization/sauvola_ms_wodd_hodd.ref.pbm: Make use of
	reference files in test.

	* scribo/binarization/local_threshold.hh,
	* scribo/core/central_sites.hh,
	* scribo/debug/save_table_image.hh,
	* scribo/filter/object_groups_with_holes.hh,
	* scribo/fun/v2b/objects_large_filter.hh,
	* scribo/make/influence_zone_graph.hh,
	* scribo/postprocessing/fill_object_holes.hh: Fix namespace
	ambiguities.

	* scribo/toolchain/text_in_doc_preprocess.hh: Fix arguments.

	* scribo/toolchain/internal/text_in_doc_preprocess_functor.hh,
	* scribo/util/integral_sub_sum_sum2_functor.hh: Use namespace mln.

	* scribo/util/compute_sub_domains.hh,
	* scribo/util/integral_sum_sum2_functor.hh,
	* scribo/util/integral_sum_sum2_global_min_functor.hh,
	* src/contest/hdibco-2010/sauvola_ms_hdibco.cc: Add missing
	include.

	* scribo/io/img/save.hh: Use box2d constructor.

	* scribo/binarization/internal/niblack_functor_fast.hh,
	* scribo/binarization/internal/niblack_threshold_functor.hh,
	* scribo/binarization/internal/sauvola_functor.hh,
	* scribo/binarization/internal/sauvola_threshold_functor.hh,
	* scribo/binarization/internal/singh_functor.hh,
	* scribo/binarization/internal/wolf_functor_fast.hh,
	* scribo/binarization/sauvola_ms.hh,
	* scribo/util/init_integral_image.hh,
	* scribo/util/integral_sub_sum_sum2_functor.hh: Here.

	* tests/primitive/extract/Makefile.am: New targets.

	* tests/primitive/extract/lines_h_pattern.cc,
	* tests/primitive/extract/lines_h_pattern.ref.pbm,
	* tests/primitive/extract/lines_v_pattern.cc,
	* tests/primitive/extract/lines_v_pattern.ref.pbm: New.

	* scribo/primitive/extract/lines_h_pattern.hh,
	* scribo/primitive/extract/lines_v_pattern.hh: Here.

	* tests/primitive/extract/Makefile.am: New targets.

	* tests/primitive/extract/lines_h_discontinued.cc,
	* tests/primitive/extract/lines_v_discontinued.cc: New.

	* tests/img/lines_discontinued.pbm,
	* tests/primitive/extract/lines_discontinued.cc: New.

	* tests/primitive/extract/Makefile.am: Add new target.

	* src/content_in_hdoc.cc,
	* src/contest/hdlac-2011/content_in_hdoc_hdlac.cc,
	* src/non_text_components.cc,
	* src/text_in_doc_preprocess.cc: Here.

	* scribo/binarization/otsu_threshold.hh: Fix comparisons between
	different types.

	* scribo/io/xml/load.hh: Convert to float.

	* scribo/text/paragraphs_closing.hh,
	* scribo/text/recognition.hh,
	* src/afp/components.hh: Remove unused variables.

	* src/binarization/otsu.cc: Silent warning.

	* src/misc/morpho.cc: Check number of arguments.

	* src/binarization/Makefile.am,
	* src/contest/DAE-2011/Makefile.am,
	* src/contest/hdibco-2010/Makefile.am,
	* src/contest/hdlac-2011/Makefile.am,
	* src/postprocessing/Makefile.am,
	* src/primitive/remove/Makefile.am,
	* src/toolchain/nepomuk/Makefile.am,
	* src/util/Makefile.am,
	* tests/binarization/Makefile.am,
	* tests/convert/Makefile.am,
	* tests/core/Makefile.am,
	* tests/estim/Makefile.am,
	* tests/primitive/extract/Makefile.am,
	* tests/primitive/link/Makefile.am,
	* tests/toolchain/nepomuk/Makefile.am,
	* tests/util/Makefile.am:
	Here.

	* scribo.mk, tests/tests.mk (AM_CPPFLAGS): Move...
	* common.mk: ...here.

	* milena/tests/unit_test/unit-tests.mk,
	* scribo/tests/unit_test/unit-tests.mk:
	Regen.

	* common.mk: New.
	Include it...
	* scribo.mk,
	* tests/tests.mk:
	...here.
	* src/Makefile.am,
	* src/binarization/Makefile.am,
	* src/debug/Makefile.am,
	* src/filter/Makefile.am,
	* src/misc/Makefile.am,
	* src/multi_scale/Makefile.am,
	* src/preprocessing/Makefile.am,
	* src/primitive/extract/Makefile.am,
	* src/primitive/find/Makefile.am,
	* src/primitive/group/Makefile.am,
	* src/table/Makefile.am,
	* src/text/Makefile.am,
	* tests/filter/Makefile.am,
	* tests/preprocessing/Makefile.am,
	* tests/table/Makefile.am:
	Remove (now useless) `*_SOURCES' variables using
	sed -ri '/^(\s|#)*\S+_SOURCES\s*=\s*\S+.cc\s*$/d'.
	* tests/unit_test/build_unit_test.sh: No longer output `*_SOURCES'
	variables.
	* tests/unit_test/unit-tests.mk: Regen.

	* src/contest/DAE-2011/Makefile.am,
	* src/contest/Makefile.am,
	* src/contest/hdibco-2010/Makefile.am,
	* src/contest/hdlac-2011/Makefile.am,
	* src/postprocessing/Makefile.am,
	* tests/binarization/Makefile.am,
	* tests/convert/Makefile.am,
	* tests/core/Makefile.am,
	* tests/estim/Makefile.am,
	* tests/toolchain/nepomuk/Makefile.am:
	Here.

	* milena/mln/canvas/browsing/snake_fwd.hh,
	* milena/mln/canvas/browsing/snake_vert.hh,
	* scribo/scribo/debug/alignment_decision_image.hh,
	* scribo/scribo/debug/decision_image.hh,
	* scribo/scribo/debug/links_decision_image.hh:
	Here.

	* Makefile.am (LOCAL_RECURSIVE_TARGETS): Remove pretty-check.
	($(LOCAL_RECURSIVE_TARGETS)): Recurse in scribo/ too.
	(pretty-check): New target, recursing only in milena/.
	* milena/tests/tests-recursive.mk: Move...
	* build-aux/tests-recursive.mk: ...here.
	* milena/tests/tests.mk: Adjust.
	Remove old comments.
	* scribo/Makefile.am (tests): New target.
	(bin): Use common idioms.
	* scribo/tests/tests.mk: Include milena/tests/tests-recursive.mk.

	* scribo/text/paragraphs_closing.hh
	(internal::horizontal_CRLA, internal::vertical_CRLA):
	Replace empty bodies of loops with single `continue' statements as
	this is more explicit.

	* scribo/debug/alignment_decision_image.hh
	(alignment_decision_image)
	* scribo/debug/bboxes_enlarged_image.hh (bboxes_enlarged_image)
	* scribo/debug/decision_image.hh (decision_image)
	* scribo/debug/links_decision_image.hh (links_decision_image)
	* scribo/debug/links_image.hh (links_image)
	* scribo/debug/looks_like_a_text_line_image.hh
	(looks_like_a_text_line_image):
	Fix the type of the value to be returned by theses functions.

	* scribo/io/text_boxes/save.hh,
	* scribo/primitive/extract/components.hh,
	* scribo/primitive/link/with_single_right_link.hh,
	* scribo/text/recognition.hh,
	* scribo/toolchain/content_in_doc.hh,
	* scribo/toolchain/content_in_hdoc.hh,
	* scribo/toolchain/text_in_doc.hh,
	* scribo/toolchain/text_in_doc_preprocess.hh,
	* scribo/toolchain/text_in_picture.hh:
	Do not provide default arguments twice.

	* src/binarization/niblack.cc,
	* src/binarization/otsu.cc,
	* src/binarization/sauvola.cc,
	* src/binarization/sauvola_ms.cc,
	* src/binarization/wolf.cc: Here.

	* src/binarization/sauvola_ms.cc: Add negate option.

	* src/binarization/sauvola_ms_debug.cc: Fix invalid k parameter
	value.