Mercurial > hg > octave-lojdl > gnulib-hg

changeset 4771:ffc6ac581833

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge version-etc-2 back into version-etc: Better way to internationalize the "Written by ..." sentence.
author Bruno Haible <bruno@clisp.org>
date Mon, 06 Oct 2003 20:30:17 +0000
parents 6708dc21dacc
children 733f57f44f09
files lib/ChangeLog lib/long-options.c lib/long-options.h lib/version-etc.c lib/version-etc.h
diffstat 5 files changed, 173 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,27 @@
+2003-09-25  Jim Meyering  <jim@meyering.net>
+            Bruno Haible  <bruno@clisp.org>
+
+	This lets translators provide better translations for the
+	"Written by ..." part of --version output.
+	* version-etc.h: Include stdarg.h.
+	(version_etc_copyright): Declare as readonly.
+	(version_etc): Make this function variadic with a NULL-terminated list
+	of author name strings.
+	(version_etc_va): New declaration.
+	* version-etc.c: Include stdarg.h, stdlib.h.
+	(version_etc_copyright): Declare as readonly.
+	(version_etc_va): New function. Provide a different translatable string
+	for each possible number of authors < 10. Abbreviate when there are 10
+	authors or more.
+	(version_etc): Make this function variadic. Call version_etc_va.
+	Suggestion from Gary V. Vaughan.
+
+	* long-options.h (parse_long_options): Change prototype: the authors
+	string is moved to the end and becomes variadic.
+	* long-options.c: Include stdarg.h.
+	(parse_long_options): Make this function variadic, too.
+	Call version_etc_va, not version_etc.
+
 2003-10-06  Bruno Haible  <bruno@clisp.org>
 
 	* fatal-signal.h: New file, from GNU gettext.
--- a/lib/long-options.c
+++ b/lib/long-options.c
@@ -23,11 +23,13 @@
 # include <config.h>
 #endif
 
+/* Specification.  */
 #include "long-options.h"
 
+#include <stdarg.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <getopt.h>
-#include <stdlib.h>
 
 #include "version-etc.h"
 
@@ -47,8 +49,8 @@
 		    const char *command_name,
 		    const char *package,
 		    const char *version,
-		    const char *authors,
-		    void (*usage_func)())
+		    void (*usage_func)(),
+		    /* const char *author1, ...*/ ...)
 {
   int c;
   int saved_opterr;
@@ -67,8 +69,12 @@
 	  (*usage_func) (0);
 
 	case 'v':
-	  version_etc (stdout, command_name, package, version, authors);
-	  exit (0);
+	  {
+	    va_list authors;
+	    va_start (authors, usage_func);
+	    version_etc_va (stdout, command_name, package, version, authors);
+	    exit (0);
+	  }
 
 	default:
 	  /* Don't process any other long-named options.  */
--- a/lib/long-options.h
+++ b/lib/long-options.h
@@ -22,5 +22,5 @@
 			 const char *_command_name,
 			 const char *_package,
 			 const char *_version,
-			 const char *_authors,
-			 void (*_usage) (int));
+			 void (*_usage) (int),
+			 /* const char *author1, ...*/ ...);
--- a/lib/version-etc.c
+++ b/lib/version-etc.c
@@ -21,20 +21,136 @@
 # include <config.h>
 #endif
 
+/* Specification.  */
+#include "version-etc.h"
+
+#include <stdarg.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include "unlocked-io.h"
-#include "version-etc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
 /* Default copyright goes to the FSF. */
 
-char* version_etc_copyright =
+const char* version_etc_copyright =
   /* Do *not* mark this string for translation.  */
   "Copyright (C) 2003 Free Software Foundation, Inc.";
 
 
+/* Like version_etc, below, but with the NULL-terminated author list
+   provided via a variable of type va_list.  */
+void
+version_etc_va (FILE *stream,
+		const char *command_name, const char *package,
+		const char *version, va_list authors)
+{
+  unsigned int n_authors;
+
+  /* Count the number of authors.  */
+  {
+    va_list tmp_authors;
+
+#ifdef __va_copy
+    __va_copy (tmp_authors, authors);
+#else
+    tmp_authors = authors;
+#endif
+
+    n_authors = 0;
+    while (va_arg (tmp_authors, const char *) != NULL)
+      ++n_authors;
+  }
+
+  if (command_name)
+    fprintf (stream, "%s (%s) %s\n", command_name, package, version);
+  else
+    fprintf (stream, "%s %s\n", package, version);
+
+  switch (n_authors)
+    {
+    case 0:
+      /* The caller must provide at least one author name.  */
+      abort ();
+    case 1:
+      /* TRANSLATORS: %s denotes an author name.  */
+      vfprintf (stream, _("Written by %s.\n"), authors);
+      break;
+    case 2:
+      /* TRANSLATORS: Each %s denotes an author name.  */
+      vfprintf (stream, _("Written by %s and %s.\n"), authors);
+      break;
+    case 3:
+      /* TRANSLATORS: Each %s denotes an author name.  */
+      vfprintf (stream, _("Written by %s, %s, and %s.\n"), authors);
+      break;
+    case 4:
+      /* TRANSLATORS: Each %s denotes an author name.
+	 You can use line breaks, estimating that each author name occupies
+	 ca. 16 screen columns and that a screen line has ca. 80 columns.  */
+      vfprintf (stream, _("Written by %s, %s, %s,\nand %s.\n"), authors);
+      break;
+    case 5:
+      /* TRANSLATORS: Each %s denotes an author name.
+	 You can use line breaks, estimating that each author name occupies
+	 ca. 16 screen columns and that a screen line has ca. 80 columns.  */
+      vfprintf (stream, _("Written by %s, %s, %s,\n%s, and %s.\n"), authors);
+      break;
+    case 6:
+      /* TRANSLATORS: Each %s denotes an author name.
+	 You can use line breaks, estimating that each author name occupies
+	 ca. 16 screen columns and that a screen line has ca. 80 columns.  */
+      vfprintf (stream, _("Written by %s, %s, %s,\n%s, %s, and %s.\n"),
+		authors);
+      break;
+    case 7:
+      /* TRANSLATORS: Each %s denotes an author name.
+	 You can use line breaks, estimating that each author name occupies
+	 ca. 16 screen columns and that a screen line has ca. 80 columns.  */
+      vfprintf (stream, _("Written by %s, %s, %s,\n%s, %s, %s, and %s.\n"),
+		authors);
+      break;
+    case 8:
+      /* TRANSLATORS: Each %s denotes an author name.
+	 You can use line breaks, estimating that each author name occupies
+	 ca. 16 screen columns and that a screen line has ca. 80 columns.  */
+      vfprintf (stream, _("\
+Written by %s, %s, %s,\n%s, %s, %s, %s,\nand %s.\n"),
+		authors);
+      break;
+    case 9:
+      /* TRANSLATORS: Each %s denotes an author name.
+	 You can use line breaks, estimating that each author name occupies
+	 ca. 16 screen columns and that a screen line has ca. 80 columns.  */
+      vfprintf (stream, _("\
+Written by %s, %s, %s,\n%s, %s, %s, %s,\n%s, and %s.\n"),
+		authors);
+      break;
+    default:
+      /* 10 or more authors.  Use an abbreviation, since the human reader
+	 will probably not want to read the entire list anyway.  */
+      /* TRANSLATORS: Each %s denotes an author name.
+	 You can use line breaks, estimating that each author name occupies
+	 ca. 16 screen columns and that a screen line has ca. 80 columns.  */
+      vfprintf (stream, _("\
+Written by %s, %s, %s,\n%s, %s, %s, %s,\n%s, %s, and others.\n"),
+		authors);
+      break;
+    }
+  va_end (authors);
+  putc ('\n', stream);
+
+  fputs (version_etc_copyright, stream);
+  putc ('\n', stream);
+
+  fputs (_("\
+This is free software; see the source for copying conditions.  There is NO\n\
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"),
+	 stream);
+}
+
+
 /* Display the --version information the standard way.
 
    If COMMAND_NAME is NULL, the PACKAGE is asumed to be the name of
@@ -44,24 +160,17 @@
 
    or
 
-   COMMAND_NAME (PACKAGE) VERSION.  */
+   COMMAND_NAME (PACKAGE) VERSION.
+
+   The author names are passed as separate arguments, with an additional
+   NULL argument at the end.  */
 void
 version_etc (FILE *stream,
 	     const char *command_name, const char *package,
-	     const char *version, const char *authors)
+	     const char *version, /* const char *author1, ...*/ ...)
 {
-  if (command_name)
-    fprintf (stream, "%s (%s) %s\n", command_name, package, version);
-  else
-    fprintf (stream, "%s %s\n", package, version);
-  fprintf (stream, _("Written by %s.\n"), authors);
-  putc ('\n', stream);
+  va_list authors;
 
-  fputs (version_etc_copyright, stream);
-  putc ('\n', stream);
-
-  fputs (_("\
-This is free software; see the source for copying conditions.  There is NO\n\
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"),
-	 stream);
+  va_start (authors, version);
+  version_etc_va (stream, command_name, package, version, authors);
 }
--- a/lib/version-etc.h
+++ b/lib/version-etc.h
@@ -20,12 +20,18 @@
 #ifndef VERSION_ETC_H
 # define VERSION_ETC_H 1
 
+# include <stdarg.h>
 # include <stdio.h>
 
-extern char *version_etc_copyright;
+extern const char *version_etc_copyright;
 
-void version_etc (FILE *stream,
-		  const char *command_name, const char *package,
-		  const char *version, const char *authors);
+extern void version_etc_va (FILE *stream,
+			    const char *command_name, const char *package,
+			    const char *version, va_list authors);
+
+extern void version_etc (FILE *stream,
+			 const char *command_name, const char *package,
+			 const char *version,
+		         /* const char *author1, ...*/ ...);
 
 #endif /* VERSION_ETC_H */