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

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

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

	* scribo/primitive/extract/lines_h_pattern.hh,
	* scribo/primitive/extract/lines_v_pattern.hh: 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.

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

	* 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/content_in_doc.cc: Set output format to DebugWithImage.

	* scribo/io/img/save.hh: Do not subsample output image.

	* demo/viewer/main.cc: Move call to setLocale...
	* scribo/text/recognition.hh: ... Here.

	* demo/xml2doc/templates/pdf/line.xsl: Do not print lines with
	confidence < 60%.

	* scribo/core/line_info.hh: Add access to text confidence.

	* scribo/io/xml/internal/extended_page_xml_visitor.hh,
	* scribo/io/xml/internal/full_xml_visitor.hh: Save text confidence.

	* scribo/io/xml/load.hh: Load text confidence.

	* scribo/binarization/internal/singh_formula.hh,
	* scribo/binarization/internal/singh_functor.hh,
	* scribo/binarization/singh.hh,
	* src/binarization/singh.cc: New.

	* scribo/binarization/sauvola_ms.hh: Change area ranges.

	* 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: Fix test.

	* scribo/binarization/internal/local_threshold_core.hh,
	* scribo/binarization/internal/niblack_formula.hh,
	* scribo/binarization/internal/niblack_functor.hh,
	* scribo/binarization/internal/niblack_threshold_functor.hh,
	* scribo/binarization/internal/sauvola_functor.hh,
	* scribo/binarization/internal/sauvola_threshold_functor.hh,
	* scribo/binarization/internal/wolf_functor.hh,
	* scribo/binarization/niblack.hh,
	* scribo/binarization/wolf.hh: Restore original algorithms.

	* tests/binarization/Makefile.am,
	* tests/binarization/niblack.cc,
	* tests/binarization/niblack.ref.pbm,
	* tests/binarization/niblack_weven_hodd.ref.pbm,
	* tests/binarization/niblack_wodd_heven.ref.pbm,
	* tests/binarization/niblack_wodd_hodd.ref.pbm: Adjust test results.

	* scribo/binarization/internal/niblack_functor_fast.hh,
	* scribo/binarization/internal/wolf_functor_fast.hh,
	* scribo/binarization/niblack_fast.hh,
	* scribo/binarization/wolf_fast.hh,
	* tests/binarization/wolf.cc,
	* tests/binarization/wolf.ref.pbm,
	* tests/binarization/wolf_weven_hodd.ref.pbm,
	* tests/binarization/wolf_wodd_heven.ref.pbm,
	* tests/binarization/wolf_wodd_hodd.ref.pbm,
	* tests/binarization/niblack_fast.cc,
	* tests/binarization/niblack_fast.ref.pbm,
	* tests/binarization/niblack_fast_weven_hodd.ref.pbm,
	* tests/binarization/niblack_fast_wodd_heven.ref.pbm,
	* tests/binarization/niblack_fast_wodd_hodd.ref.pbm,
	* tests/binarization/wolf_fast.cc,
	* tests/binarization/wolf_fast.ref.pbm,
	* tests/binarization/wolf_fast_weven_hodd.ref.pbm,
	* tests/binarization/wolf_fast_wodd_heven.ref.pbm,
	* tests/binarization/wolf_fast_wodd_hodd.ref.pbm: New.

	* scribo/binarization/internal/local_threshold_core.hh: Add a
	missing include.

	* scribo/debug/logger.hh: Fix attributes initialization order.

	* scribo/text/paragraphs_closing.hh: Fix a warning related to an
	unused-variable.

	* scribo/scribo/binarization/internal/sauvola_ms_functor.hh,
	* scribo/scribo/binarization/sauvola_ms.hh,
	* scribo/scribo/binarization/sauvola_ms_split.hh,
	* scribo/scribo/toolchain/internal/text_in_doc_preprocess_functor.hh,
	* scribo/scribo/toolchain/text_in_doc_preprocess.hh: Make use of
	k2, k3 and k4 variables.

	* scribo/src/binarization/sauvola_ms.cc,
	* scribo/src/binarization/sauvola_ms_debug.cc,
	* scribo/src/binarization/sauvola_ms_fg.cc,
	* scribo/src/binarization/sauvola_ms_split.cc: Fix program
	arguments.

	* scribo/debug/logger.hh: Here.

	* scribo/binarization/internal/local_threshold_core.hh,
	* scribo/binarization/internal/sauvola_formula.hh,
	* scribo/binarization/sauvola_ms.hh: Make use of operator<< with
	debug::logger.

	* scribo/binarization/sauvola_ms.hh,
	* scribo/binarization/sauvola_ms_split.hh: Here.

	* src/binarization/kim.cc: Move code...
	* scribo/binarization/kim.hh: ... here.

	* tests/binarization/Makefile.am: Add new target.

	* tests/binarization/kim.cc,
	* tests/binarization/kim.ref.pbm,
	* tests/binarization/kim_weven_hodd.ref.pbm,
	* tests/binarization/kim_wodd_heven.ref.pbm,
	* tests/binarization/kim_wodd_hodd.ref.pbm: New.

	* scribo/binarization/sauvola_ms.hh: remove tests on window size.

	* scribo/canvas/integral_browsing.hh: Check window size.

	* scribo/estim/font_color.hh: Fix namespace ambiguities.

	* src/binarization/Makefile.am: Add kim as target.

	* src/binarization/kim.cc: Cleanup code.

	* src/binarization/niblack.cc: Fix reverse video.

	* src/binarization/sauvola_ms.cc: Handle several k values.