diff --git a/ChangeLog b/ChangeLog index 87b94c8d5..535505411 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ +2008-05-27 m. allan noah + * frontend/scanimage.c: add %n for newline to -f option + 2008-05-26 Jonathan Bravo Lopez - * po/sane-backends.es.po: added spanish translation about status strings. + * po/sane-backends.es.po: added spanish translation about status strings * po/Makefile.in: added backend/sane_strstatus.c to SRC_FILES section. 2008-05-26 Rene Rebe diff --git a/doc/scanimage.man b/doc/scanimage.man index 7eaa3cb90..685cf10b1 100644 --- a/doc/scanimage.man +++ b/doc/scanimage.man @@ -137,9 +137,9 @@ option works similar to but requires a format string. .B scanimage replaces the placeholders -.B %d %v %m %t %i -with the device name, vendor name, model name, scanner type and an index -number respectively. The command +.B %d %v %m %t %i %n +with the device name, vendor name, model name, scanner type, an index +number and newline respectively. The command .PP .RS .B scanimage -f diff --git a/frontend/scanimage.c b/frontend/scanimage.c index 449911dfa..7ac433168 100644 --- a/frontend/scanimage.c +++ b/frontend/scanimage.c @@ -1776,6 +1776,10 @@ main (int argc, char **argv) int_arg = i; ftype = 'i'; break; + case 'n': + text_arg = "\n"; + ftype = *percent = 's'; + break; case '%': ftype = 0; break;