upgrade gettext-h module to gettext-0.15

[Bruno Haible]

Hi,

I also upgraded the gettext-h module to gettext-0.15. It contains a
few added functions for retrieving the translations of messages with
context.


2006-07-22  Bruno Haible  <address@hidden>

        * gettext.h: Update to GNU gettext-0.15.

*** gettext.h   14 May 2005 06:03:58 -0000      1.6
--- gettext.h   22 Jul 2006 13:26:23 -0000
***************
*** 1,5 ****
  /* Convenience header for conditional use of GNU <libintl.h>.
!    Copyright (C) 1995-1998, 2000-2002, 2004 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
--- 1,5 ----
  /* Convenience header for conditional use of GNU <libintl.h>.
!    Copyright (C) 1995-1998, 2000-2002, 2004-2006 Free Software Foundation, 
Inc.
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
***************
*** 75,78 ****
--- 75,242 ----
     initializer for static 'char[]' or 'const char[]' variables.  */
  #define gettext_noop(String) String
  
+ /* The separator between msgctxt and msgid in a .mo file.  */
+ #define GETTEXT_CONTEXT_GLUE "\004"
+ 
+ /* Pseudo function calls, taking a MSGCTXT and a MSGID instead of just a
+    MSGID.  MSGCTXT and MSGID must be string literals.  MSGCTXT should be
+    short and rarely need to change.
+    The letter 'p' stands for 'particular' or 'special'.  */
+ #define pgettext(Msgctxt, Msgid) \
+   pgettext_aux (NULL, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES)
+ #define dpgettext(Domainname, Msgctxt, Msgid) \
+   pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, 
LC_MESSAGES)
+ #define dcpgettext(Domainname, Msgctxt, Msgid, Category) \
+   pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, 
Category)
+ #define npgettext(Msgctxt, Msgid, MsgidPlural, N) \
+   npgettext_aux (NULL, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, 
MsgidPlural, N, LC_MESSAGES)
+ #define dnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N) \
+   npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, 
MsgidPlural, N, LC_MESSAGES)
+ #define dcnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N, Category) \
+   npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, 
MsgidPlural, N, Category)
+ 
+ #ifdef __GNUC__
+ __inline
+ #else
+ #ifdef __cplusplus
+ inline
+ #endif
+ #endif
+ static const char *
+ pgettext_aux (const char *domain,
+             const char *msg_ctxt_id, const char *msgid,
+             int category)
+ {
+   const char *translation = dcgettext (domain, msg_ctxt_id, category);
+   if (translation == msg_ctxt_id)
+     return msgid;
+   else
+     return translation;
+ }
+ 
+ #ifdef __GNUC__
+ __inline
+ #else
+ #ifdef __cplusplus
+ inline
+ #endif
+ #endif
+ static const char *
+ npgettext_aux (const char *domain,
+              const char *msg_ctxt_id, const char *msgid,
+              const char *msgid_plural, unsigned long int n,
+              int category)
+ {
+   const char *translation =
+     dcngettext (domain, msg_ctxt_id, msgid_plural, n, category);
+   if (translation == msg_ctxt_id || translation == msgid_plural)
+     return (n == 1 ? msgid : msgid_plural);
+   else
+     return translation;
+ }
+ 
+ /* The same thing extended for non-constant arguments.  Here MSGCTXT and MSGID
+    can be arbitrary expressions.  But for string literals these macros are
+    less efficient than those above.  */
+ 
+ #include <string.h>
+ 
+ #define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS \
+   (__GNUC__ >= 3 || defined __cplusplus)
+ 
+ #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+ #include <stdlib.h>
+ #endif
+ 
+ #define pgettext_expr(Msgctxt, Msgid) \
+   dcpgettext_expr (NULL, Msgctxt, Msgid, LC_MESSAGES)
+ #define dpgettext_expr(Domainname, Msgctxt, Msgid) \
+   dcpgettext_expr (Domainname, Msgctxt, Msgid, LC_MESSAGES)
+ 
+ #ifdef __GNUC__
+ __inline
+ #else
+ #ifdef __cplusplus
+ inline
+ #endif
+ #endif
+ static const char *
+ dcpgettext_expr (const char *domain,
+                const char *msgctxt, const char *msgid,
+                int category)
+ {
+   size_t msgctxt_len = strlen (msgctxt) + 1;
+   size_t msgid_len = strlen (msgid) + 1;
+   const char *translation;
+ #if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+   char msg_ctxt_id[msgctxt_len + msgid_len];
+ #else
+   char buf[1024];
+   char *msg_ctxt_id =
+     (msgctxt_len + msgid_len <= sizeof (buf)
+      ? buf
+      : (char *) malloc (msgctxt_len + msgid_len));
+   if (msg_ctxt_id != NULL)
+ #endif
+     {
+       memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
+       msg_ctxt_id[msgctxt_len - 1] = '\004';
+       memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
+       translation = dcgettext (domain, msg_ctxt_id, category);
+ #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+       if (msg_ctxt_id != buf)
+       free (msg_ctxt_id);
+ #endif
+       if (translation != msg_ctxt_id)
+       return translation;
+     }
+   return msgid;
+ }
+ 
+ #define npgettext_expr(Msgctxt, Msgid, MsgidPlural, N) \
+   dcnpgettext_expr (NULL, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES)
+ #define dnpgettext_expr(Domainname, Msgctxt, Msgid, MsgidPlural, N) \
+   dcnpgettext_expr (Domainname, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES)
+ 
+ #ifdef __GNUC__
+ __inline
+ #else
+ #ifdef __cplusplus
+ inline
+ #endif
+ #endif
+ static const char *
+ dcnpgettext_expr (const char *domain,
+                 const char *msgctxt, const char *msgid,
+                 const char *msgid_plural, unsigned long int n,
+                 int category)
+ {
+   size_t msgctxt_len = strlen (msgctxt) + 1;
+   size_t msgid_len = strlen (msgid) + 1;
+   const char *translation;
+ #if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+   char msg_ctxt_id[msgctxt_len + msgid_len];
+ #else
+   char buf[1024];
+   char *msg_ctxt_id =
+     (msgctxt_len + msgid_len <= sizeof (buf)
+      ? buf
+      : (char *) malloc (msgctxt_len + msgid_len));
+   if (msg_ctxt_id != NULL)
+ #endif
+     {
+       memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
+       msg_ctxt_id[msgctxt_len - 1] = '\004';
+       memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
+       translation = dcngettext (domain, msg_ctxt_id, msgid_plural, n, 
category);
+ #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+       if (msg_ctxt_id != buf)
+       free (msg_ctxt_id);
+ #endif
+       if (!(translation == msg_ctxt_id || translation == msgid_plural))
+       return translation;
+     }
+   return (n == 1 ? msgid : msgid_plural);
+ }
+ 
  #endif /* _LIBGETTEXT_H */