From 1687222e1b9e74c89cafbb5910e72d8ec7bfd40f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 31 Jul 2019 16:59:49 +0200 Subject: New upstream version 1.0.28 --- tools/sane-desc.c | 60 +++++++++++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) (limited to 'tools/sane-desc.c') diff --git a/tools/sane-desc.c b/tools/sane-desc.c index badc8ce..890e754 100644 --- a/tools/sane-desc.c +++ b/tools/sane-desc.c @@ -47,7 +47,7 @@ #define SANE_DESC_VERSION "3.5" -#define MAN_PAGE_LINK "http://www.sane-project.org/man/%s.5.html" +#define MAN_PAGE_LINK "man/%s.5.html" #define COLOR_MINIMAL "\"#B00000\"" #define COLOR_BASIC "\"#FF9000\"" #define COLOR_GOOD "\"#90B000\"" @@ -315,7 +315,7 @@ print_usage (char *program_name) printf ("Usage: %s [-s dir] [-m mode] [-d level] [-h] [-V]\n", program_name); printf (" -s|--search-dir dir " - "Specify the directory that contains .desc files \n" + "Specify the directory that contains .desc files\n" " " "(multiple directories can be concatenated by \":\")\n"); printf (" -m|--mode mode " @@ -2075,7 +2075,7 @@ xml_print_backends (void) printf ("\n"); if (be->version) - printf ("%s \n", clean_string (be->version)); + printf ("%s\n", clean_string (be->version)); else printf ("*none*\n"); @@ -2448,7 +2448,7 @@ html_backends_split_table (device_type dev_type) backend_entry *be = first_backend; SANE_Bool first = SANE_TRUE; - printf ("

Backends: \n"); + printf ("

Backends:\n"); while (be) /* print link list */ { type_entry *type = be->type; @@ -2463,7 +2463,7 @@ html_backends_split_table (device_type dev_type) if (found) { if (!first) - printf (", \n"); + printf (",\n"); first = SANE_FALSE; printf ("%s", html_generate_anchor_name (dev_type, be->name), be->name); @@ -2512,7 +2512,7 @@ html_backends_split_table (device_type dev_type) if (be->url && be->url->name) { url_entry *url = be->url; - printf ("Link(s): \n"); + printf ("Link(s):\n"); while (url) { if (url != be->url) @@ -2650,11 +2650,11 @@ html_mfgs_table (device_type dev_type) first_mfg_record = create_mfg_list (dev_type); mfg_record = first_mfg_record; - printf ("

Manufacturers: \n"); + printf ("

Manufacturers:\n"); while (mfg_record) { if (mfg_record != first_mfg_record) - printf (", \n"); + printf (",\n"); printf ("%s", html_generate_anchor_name (type_unknown, mfg_record->name), mfg_record->name); @@ -2675,7 +2675,7 @@ html_mfgs_table (device_type dev_type) if (mfg_record->url && mfg_record->url->name) { url_entry *url = mfg_record->url; - printf ("Link(s): \n"); + printf ("Link(s):\n"); while (url) { if (url != mfg_record->url) @@ -2786,7 +2786,7 @@ html_print_header (void) ("\n" "\n" "

\n" - " $\"SANE\"$ \n"); + " $\"SANE\"$ \n"); printf ("

%s

\n", title); printf ("

\n" "

\n"); printf ("%s\n", intro); @@ -2797,8 +2797,8 @@ html_print_header (void) "concerning each backend.

\n"); printf ("

If you have new information or corrections, please file a\n" - "bug report\n" - "with as many details as possible. Also please tell us if your scanner \n" + "bug report\n" + "with as many details as possible. Also please tell us if your scanner\n" "isn't mentioned in this list at all.

\n" "

For an explanation of the tables, see the\n" "legend.\n"); @@ -2812,9 +2812,9 @@ html_print_footer (void) printf ("

\n" - "SANE homepage\n" + "SANE homepage\n" "

\n" - "Contact\n" "

\n" "\n"); printf ("This page was last updated on %s by sane-desc %s from %s\n", asctime (localtime (¤t_time)), SANE_DESC_VERSION, PACKAGE_STRING); @@ -2834,8 +2834,8 @@ html_print_legend_backend (void) " available from their home sites.
" " NEW! means brand-new to the\n" " current release of SANE.
\n" - " UNMAINTAINED means that nobody maintains that backend. Expect no \n" - " new features or newly supported devices. You are welcome to take over \n" + " UNMAINTAINED means that nobody maintains that backend. Expect no\n" + " new features or newly supported devices. You are welcome to take over\n" " maintainership.\n" " \n"); } @@ -2902,7 +2902,7 @@ html_print_legend_status (void) { printf ("

Status:

\n" - "

Indicates how many of the features the device provides \n" + "

Indicates how many of the features the device provides\n" " are supported by SANE.\n" "

unsupported" " means the device is not supported at least by this backend. " @@ -2912,16 +2912,16 @@ html_print_legend_status (void) " device may be supported but couldn't be tested. Be very " " careful and report success/failure.\n" "

minimal means that the\n" - " device is detected and scans at least in one mode. But the quality \n" + " device is detected and scans at least in one mode. But the quality\n" " is bad or important features won't work.\n"); printf - ("

basic means it works at \n" + ("

basic means it works at\n" " least in the most important modes but quality is not perfect.\n" "

good means the device is usable \n" + ">good means the device is usable\n" " for day-to-day work. Some rather exotic features may be missing.\n" "
complete means the backends \n" + ">complete means the backends\n" " supports everything the device can do.\n" "

\n"); } @@ -3360,7 +3360,7 @@ print_usermap_header (void) "# device detection support for your OS\n" "#\n" "# If the scanner is supported by sane-backends, please mail the entry to\n" - "# the sane-devel mailing list (sane-devel@lists.alioth.debian.org).\n" + "# the sane-devel mailing list (sane-devel@alioth-lists.debian.net).\n" "#\n" ); @@ -3427,7 +3427,7 @@ print_db_header (void) "# device detection support for your OS\n" "#\n" "# If the scanner is supported by sane-backends, please mail the entry to\n" - "# the sane-devel mailing list (sane-devel@lists.alioth.debian.org).\n" + "# the sane-devel mailing list (sane-devel@alioth-lists.debian.net).\n" "#\n" ); } @@ -3451,7 +3451,7 @@ print_db (void) name = name->next; } printf ("\n"); - printf ("%s\t%s\t%s:%s\t%s\t\n", usbid->usb_vendor_id, + printf ("%s\t%s\t%s:%s\t%s\n", usbid->usb_vendor_id, usbid->usb_product_id, DEVOWNER, DEVGROUP, DEVMODE); usbid = usbid->next; } @@ -3491,7 +3491,7 @@ print_udev_header (void) "# device detection support for your OS\n" "#\n" "# If the scanner is supported by sane-backends, please mail the entry to\n" - "# the sane-devel mailing list (sane-devel@lists.alioth.debian.org).\n" + "# the sane-devel mailing list (sane-devel@alioth-lists.debian.net).\n" "#\n" ); } @@ -3679,7 +3679,7 @@ print_udevhwdb_header (void) "# device detection support for your OS\n" "#\n" "# If the scanner is supported by sane-backends, please mail the entry to\n" - "# the sane-devel mailing list (sane-devel@lists.alioth.debian.org).\n" + "# the sane-devel mailing list (sane-devel@alioth-lists.debian.net).\n" "#\n" ); } @@ -3782,8 +3782,8 @@ print_hwdb_header (void) "# device detection support for your OS\n" "#\n" "# If the scanner is supported by sane-backends, please mail the entry to\n" - "# the sane-devel mailing list (sane-devel@lists.alioth.debian.org).\n" - "#\n" + "# the sane-devel mailing list (sane-devel@alioth-lists.debian.net).\n" + "#" ); } @@ -3802,7 +3802,7 @@ print_hwdb (void) manufacturer_model_type * name = usbid->name; i = 0; - printf ("# "); + printf ("\n# "); while (name) { if ((name != usbid->name) && (i > 0)) @@ -3833,7 +3833,7 @@ print_hwdb (void) product_id[j] = toupper(product_id[j]); } - printf ("usb:v%sp%s*\n libsane_matched=yes\n\n", + printf ("usb:v%sp%s*\n libsane_matched=yes\n", vendor_id, product_id); free(vendor_id); -- cgit v1.2.3