* src/preprocessing/Makefile.am,
	* src/text/Makefile.am,
	* src/Makefile.am: Update.

	* src/multi_scale/Makefile.am,
	* src/multi_scale/find_lines.cc
	* src/text/pbm_recognition.cc
	* src/text/recognition.cc
	* src/text_in_article_preprocess.cc
	* src/text_in_doc.cc
	* src/text_in_doc_ppm.cc
	* src/text_in_photo.cc
	* src/text_in_photo_invert.cc
	* src/text_in_photo_pbm_fast.cc
	* src/text_in_photo_ppm.cc
	* test.cc: Remove. Deprecated.

	* src/text_in_article_pbm.cc: Rename as...
	* src/pbm_text_in_doc.cc: ... this. Make use of the new toolchain
	routines.

	* src/text/pbm_lines_recognition.cc,
	* src/text_in_doc_preprocess.cc: New.

	* src/text_in_photo_fast.cc: Rename as...
	* src/text_in_picture.cc: ... this.

	* src/preprocessing/subsample.cc: Make use of io::magick.

	* primitive/extract/lines_h_pattern.hh,
	* primitive/extract/lines_v_pattern.hh: Use reconstruction
	algorithm.

	* primitive/extract/lines_pattern.hh: Add a fast implementation.

	* preprocessing/deskew.hh,
	* preprocessing/deskew_crop.hh: New.

	* preprocessing/unskew.hh: Remove. Deprecated.

	* tests/preprocessing/unskew.cc: Rename as...
	* tests/preprocessing/deskew.cc: ... this.

	* tests/preprocessing/Makefile.am: Update.

	* tests/img/text_to_group.pgm: New test image.

	* preprocessing/crop.hh,
	* preprocessing/crop_without_localization.hh: new routines.

	* tests/preprocessing/Makefile.am,
	* tests/preprocessing/crop.cc,
	* tests/preprocessing/crop_without_localization.cc: Associated
	tests.

	* core/object_groups.hh: Fix an invalid size.

	* debug/save_bboxes_image.hh,
	* filter/object_links_non_aligned_simple.hh,
	* primitive/group/from_single_link.hh,
	* subsampling/bilinear.hh,
	* text/merging.hh,
	* upsampling/bs2x.hh: Fix namespace ambiguities.

	* primitive/group/from_double_link.hh: Fix comment.

	* primitive/internal/find_root.hh: Fix guards.

	* primitive/link/with_single_right_link_dmax_ratio.hh: Add a
	missing include.

	* primitive/remove/separators.hh: Improve computation time.

	* preprocessing/rotate_90.hh: Add a fixme.

	* core/line_info.hh: Add a new attribute 'text'.

	* text/recognition.hh: Store results in the line_info structure.

	* binarization/internal/first_pass_functor.hh,
	* binarization/sauvola_ms.hh,
	* binarization/sauvola_threshold_image.hh: Add debug outputs if
	SCRIBO_SAUVOLA_DEBUG flag is set.

	* binarization/sauvola_ms_split.hh: Remove lambda argument.

	* binarization/sauvola_threshold_image_debug.hh: Add the threshold
	image as debug output.

	* src/binarization/Makefile.am: Add sauvola_ms_debug.
	* src/binarization/sauvola_ms_debug.cc: New.

	* src/binarization/fg_sauvola_ms.cc,
	* src/binarization/pgm_sauvola_ms.cc,
	* src/binarization/ppm_fg_sauvola_ms.cc,
	* src/binarization/ppm_sauvola_ms.cc,
	* src/binarization/ppm_sauvola_ms_split.cc,
	* src/binarization/sauvola_debug.cc,
	* src/binarization/sauvola_ms.cc,
	* src/binarization/sauvola_ms_split.cc: Make compile again.

	* src/text_in_article_preprocess.cc: Fix use of program
	arguments.

	* core/line_set.hh,
	* text/clean.hh,
	* text/merging.hh: Fix compilation.

	* text/recognition.hh: Update output format.

	* scribo/src/Makefile.am: Add a new target.

	* scribo/src/text_in_article_preprocess.cc: New.

	* scribo/src/text_in_article_pbm.cc: Add optional cropping and
	makes the debug optionnal.

	* scribo/text/clean.hh: Improve cleanup.

	* scribo/text/recognition.hh: Remove last '\n' in Tesseract's
	output.

	* src/text_in_article_pbm.cc: Update call to text::recognition.

	* text/clean.hh: Resize text lines according to their x_height.

	* text/extract_lines.hh: Update call to extract::components.

	* text/merging.hh: Remove Debug.

	* text/recognition.hh: Update call to text::clean and do
	recognition only on lines considered as text.

	* subsampling/bilinear.hh,
	* upsampling/bs2x.hh: New.

	* scribo/primitive/extract/horizontal_separators.hh,
	* scribo/primitive/extract/separators.hh,
	* scribo/primitive/extract/vertical_separators.hh,
	* scribo/primitive/remove/separators.hh: New.

	* README: New.

	* milena/sandbox/lazzara/afp/photos/gui/gui.pro,
	* milena/sandbox/lazzara/afp/photos/gui/gui.qrc,
	* milena/sandbox/lazzara/afp/photos/gui/icons/next.png,
	* milena/sandbox/lazzara/afp/photos/gui/icons/ok.png,
	* milena/sandbox/lazzara/afp/photos/gui/icons/photos.png,
	* milena/sandbox/lazzara/afp/photos/gui/icons/prev.png,
	* milena/sandbox/lazzara/afp/photos/gui/icons/remove.png,
	* milena/sandbox/lazzara/afp/photos/gui/src/custom_delegate.cc,
	* milena/sandbox/lazzara/afp/photos/gui/src/custom_delegate.hh,
	* milena/sandbox/lazzara/afp/photos/gui/src/launch_dialog.cc,
	* milena/sandbox/lazzara/afp/photos/gui/src/launch_dialog.hh,
	* milena/sandbox/lazzara/afp/photos/gui/src/main.cc,
	* milena/sandbox/lazzara/afp/photos/gui/src/main_window.cc,
	* milena/sandbox/lazzara/afp/photos/gui/src/main_window.hh,
	* milena/sandbox/lazzara/afp/photos/gui/ui/launch_dialog.ui,
	* milena/sandbox/lazzara/afp/photos/gui/ui/main_window.ui: Move...

	* scribo/demo/tip/gui.pro,
	* scribo/demo/tip/gui.qrc,
	* scribo/demo/tip/icons/next.png,
	* scribo/demo/tip/icons/ok.png,
	* scribo/demo/tip/icons/photos.png,
	* scribo/demo/tip/icons/prev.png,
	* scribo/demo/tip/icons/remove.png,
	* scribo/demo/tip/src/custom_delegate.cc,
	* scribo/demo/tip/src/custom_delegate.hh,
	* scribo/demo/tip/src/launch_dialog.cc,
	* scribo/demo/tip/src/launch_dialog.hh,
	* scribo/demo/tip/src/main.cc,
	* scribo/demo/tip/src/main_window.cc,
	* scribo/demo/tip/src/main_window.hh,
	* scribo/demo/tip/ui/launch_dialog.ui,
	* scribo/demo/tip/ui/main_window.ui: ... here.

	* core/concept/dmax_functor.hh,
	* primitive/link/internal/dmax_default.hh,
	* primitive/link/internal/dmax_functor_base.hh,
	* primitive/link/internal/dmax_width_and_height.hh,
	* primitive/link/internal/dmax_width_only.hh: New.

	* primitive/link/internal/link_single_dmax_ratio_base.hh,
	* primitive/link/with_single_left_link_dmax_ratio.hh,
	* primitive/link/with_single_right_link_dmax_ratio.hh: Make use of
	the new functors.

	* binarization/sauvola_ms.hh,
	* binarization/sauvola_threshold_image_debug.hh: Update prototypes.

	* primitive/internal/rd.hh,
	* primitive/group/apply.hh,
	* debug/save_bboxes_image.hh: Add missing mln:: namespace prefix.

	* filter/objects_large.hh: Split into a routine and a functor.

	* fun/v2b/objects_large_filter.hh: New.

	* io/xml/save_text_lines.hh: Save line type.

	* table/internal/repair_lines.hh,
	* table/internal/align_lines.hh,
	* make/text.hh: Update macro name.

	* core/erase_objects.hh,
	* primitive/extract/lines_discontinued.hh,
	* primitive/extract/lines_h_discontinued.hh,
	* primitive/extract/lines_h_pattern.hh,
	* primitive/extract/lines_h_single.hh,
	* primitive/extract/lines_h_thick.hh,
	* primitive/extract/lines_thick.hh,
	* primitive/extract/lines_v_discontinued.hh,
	* primitive/extract/lines_v_single.hh,
	* primitive/extract/lines_v_thick.hh,
	* primitive/group/from_graph.hh,
	* primitive/internal/find_graph_link.hh,
	* primitive/link/with_graph.hh,
	* primitive/link/with_several_graphes.hh,
	* primitive/link/with_several_left_links.hh,
	* primitive/link/with_several_right_links.hh,
	* table/erase.hh,
	* table/extract.hh: Remove any references to object_image.

	* table/internal/connect_lines.hh: use
	influence_zone_geodesic_saturated

	* filter/objects_small.hh: Duplicate component set.

	* primitive/internal/all.hh,
	* primitive/extract/all.hh,
	* filter/all.hh,
	* core/all.hh: Remove non existing includes.

	* core/macros.hh: New macro.

	* core/line_info.hh: Fix stats.

	* filter/object_links_non_aligned.hh,
	* filter/object_links_non_h_aligned.hh,
	* filter/object_links_non_v_aligned.hh: Removed.

	* lazzara/afp/photos/gui/src/main_window.cc,
	* lazzara/afp/photos/gui/src/main_window.hh: Add shortcuts to
	navigate quickly.

	* lazzara/afp/photos/gui/src/main_window.cc,
	* lazzara/afp/photos/gui/src/main_window.hh: Add support for more
	image format and handle directories with no image.

	* lazzara/afp/photos/gui/src/launch_dialog.cc,
	* lazzara/afp/photos/gui/src/launch_dialog.hh,
	* lazzara/afp/photos/gui/src/main_window.cc,
	* lazzara/afp/photos/gui/src/main_window.hh,
	* lazzara/afp/photos/gui/ui/launch_dialog.ui: Improve options menu
	and progress dialog.

	* lazzara/afp/photos/gui/gui.pro,
	* lazzara/afp/photos/gui/gui.qrc,
	* lazzara/afp/photos/gui/icons/next.png,
	* lazzara/afp/photos/gui/icons/ok.png,
	* lazzara/afp/photos/gui/icons/photos.png,
	* lazzara/afp/photos/gui/icons/prev.png,
	* lazzara/afp/photos/gui/icons/remove.png,
	* lazzara/afp/photos/gui/src/custom_delegate.cc,
	* lazzara/afp/photos/gui/src/custom_delegate.hh,
	* lazzara/afp/photos/gui/src/launch_dialog.cc,
	* lazzara/afp/photos/gui/src/launch_dialog.hh,
	* lazzara/afp/photos/gui/src/main.cc,
	* lazzara/afp/photos/gui/src/main_window.cc,
	* lazzara/afp/photos/gui/src/main_window.hh,
	* lazzara/afp/photos/gui/ui/launch_dialog.ui,
	* lazzara/afp/photos/gui/ui/main_window.ui: New files. GUI meant
	to display the results of text finding in pictures.

	* demo/wizard/src/crop_widget.cc,
	* demo/wizard/src/main.cc,
	* demo/wizard/src/main_window.cc,
	* demo/wizard/src/main_window.hh,
	* demo/wizard/src/preprocessing_widget.cc,
	* demo/wizard/src/process_page.cc,
	* 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/runner.cc,
	* demo/wizard/ui/preprocessing_widget.ui,
	* demo/wizard/wizard.pro: Add support for text recognition and
	display results.

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

	* 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/ui/image_viewer.ui: Update according the needs of
	this new demo.

	* filter/object_links_bottom_aligned.hh,
	* filter/object_links_center_aligned.hh,
	* filter/object_links_left_aligned.hh,
	* filter/object_links_non_aligned_simple.hh,
	* filter/object_links_right_aligned.hh,
	* filter/object_links_top_aligned.hh: Use anchor::Type.

	* filter/internal/alignment_angle.hh,
	* filter/internal/component_aligned.hh: New.

	* core/object_groups.hh: Add more preconditions.

	* filter/object_groups_small.hh: Call duplicate().

	* core/object_links.hh: New init() member.

	* filter/object_groups_v_thickness.hh,
	* filter/object_groups_with_holes.hh,
	* primitive/group/from_double_link.hh,
	* primitive/link/internal/link_functor_base.hh,
	* primitive/link/merge_double_link.hh,
	* src/afp/link.hh,
	* src/afp/regroup.hh: Call init() on object_links instances.

	* primitive/internal/init_link_array.hh: Remove.

	* scribo/binarization/internal/first_pass_functor.hh,
	* scribo/binarization/local_threshold.hh,
	* scribo/binarization/sauvola.hh,
	* scribo/binarization/sauvola_ms.hh,
	* scribo/binarization/sauvola_ms_split.hh,
	* scribo/binarization/sauvola_threshold_image.hh,
	* scribo/canvas/integral_browsing.hh: Add more parameters to
	Sauvola routines.

	* scribo/binarization/sauvola_threshold_image_debug.hh: New. New
	overload providing debug outputs.

	* scribo/debug/usage.hh: Remove a parameter.

	* scribo/src/binarization/Makefile.am,
	* scribo/src/binarization/pgm_global_threshold_auto.cc,
	* scribo/src/binarization/pgm_sauvola.cc,
	* scribo/src/binarization/pgm_sauvola_ms.cc,
	* scribo/src/binarization/ppm_fg_sauvola_ms.cc,
	* scribo/src/binarization/ppm_sauvola.cc,
	* scribo/src/binarization/ppm_sauvola_ms.cc,
	* scribo/src/binarization/ppm_sauvola_ms_split.cc: Add new
          program arguments.

	* scribo/src/binarization/fg_sauvola_ms.cc,
        * scribo/src/binarization/sauvola.cc,
        * scribo/src/binarization/sauvola_ms.cc,
        * scribo/src/binarization/sauvola_ms_split.cc,
	* scribo/src/binarization/sauvola_debug.cc: New.

	* src/Makefile.am: Add ImageMagick CPPFLAGS and LDFLAGS.

	* src/text_in_photo_ppm_fast.cc: Rename as...
	* src/text_in_photo_fast.cc: ... this. Use ImageMagick to load images.

	* demo/wizard/src/crop_widget.cc,
	* demo/wizard/src/main.cc,
	* demo/wizard/src/main_window.cc,
	* demo/wizard/src/main_window.hh,
	* demo/wizard/src/preprocessing_widget.cc,
	* demo/wizard/src/process_page.cc,
	* 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/runner.cc,
	* demo/wizard/ui/preprocessing_widget.ui,
	* demo/wizard/wizard.pro: Add support for text recognition and
	display results.

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

	* 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/ui/image_viewer.ui: Update according the needs of
	this new demo.

	* binarization/sauvola_ms.hh: Fix compilation issues on MacOS X.

	* core/component_set.hh: Add labeled_image_() member.

	* debug/save_bboxes_image.hh: Add a missing include.

	* preprocessing/split_bg_fg.hh,
	* primitive/extract/components.hh: Fix namespace ambiguities.

	* src/text_in_article.cc: Rename as...
	* src/text_in_article_pbm.cc: ... this.

	* src/Makefile.am: Update source file names.

	* mln/fun/v2v/qt_rgb_to_int_u.hh: New.

	* tests/fun/v2v/Makefile.am,
	* tests/fun/v2v/qt_rgb_to_int_u.cc: New test.