Don't create the full name twice (<rdar://problem/23144358>)

[thirdparty/cups.git] / locale / po2strings.c

diff --git a/locale/po2strings.c b/locale/po2strings.c
index 75335bab026f7d832e112de9918d2b47297b1f9c..88f0ef8016c097e66344e8b46241baee2b92f608 100644 (file)
--- a/locale/po2strings.c
+++ b/locale/po2strings.c
@@ -1,15 +1,15 @@
 /*
- * "$Id: po2strings.c 6921 2007-09-06 13:38:37Z mike $"
+ * "$Id$"
  *
- *   Convert a GNU gettext .po file to an Apple .strings file.
+ * Convert a GNU gettext .po file to an Apple .strings file.
  *
- *   Copyright 2007-2012 by Apple Inc.
+ * Copyright 2007-2015 by Apple Inc.
  *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file.  If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Usage:
  *
@@ -18,10 +18,6 @@
  * Compile with:
  *
  *   gcc -o po2strings po2strings.c `cups-config --libs`
- *
- * Contents:
- *
- *   main() - Convert .po file to .strings.
  */
 
 #include <cups/cups-private.h>
@@ -53,6 +49,9 @@
  * characters like newline and the double quote character.
  */
 
+static char    *normalize_string(const char *idstr, char *buffer, size_t bufsize);
+
+
 /*
  *   main() - Convert .po file to .strings.
  */
@@ -70,8 +69,9 @@ main(int  argc,                               /* I - Number of command-line args */
                        *ptr,           /* Pointer into buffer */
                        *temp,          /* New string */
                        *msgid,         /* msgid string */
-                       *msgstr;        /* msgstr string */
-  int                  length;         /* Length of combined strings */
+                       *msgstr,        /* msgstr string */
+                       normalized[8192];/* Normalized msgid string */
+  size_t               length;         /* Length of combined strings */
   int                  use_msgid;      /* Use msgid strings for msgstr? */
 
 
@@ -194,8 +194,7 @@ main(int  argc,                             /* I - Number of command-line args */
         if (msgid && msgstr)
        {
          if (*msgid)
-            cupsFilePrintf(strings, "\"%s\" = \"%s\";\n", msgid,
-                          (use_msgid || !*msgstr) ? msgid : msgstr);
+            cupsFilePrintf(strings, "\"%s\" = \"%s\";\n", msgid, normalize_string((use_msgid || !*msgstr) ? msgid : msgstr, normalized, sizeof(normalized)));
        }
 
        if (msgid)
@@ -215,7 +214,7 @@ main(int  argc,                             /* I - Number of command-line args */
 
         size_t ptrlen = strlen(ptr);   /* Length of string */
 
-       length = (int)strlen(msgstr ? msgstr : msgid);
+       length = strlen(msgstr ? msgstr : msgid);
 
        if ((temp = realloc(msgstr ? msgstr : msgid,
                            length + ptrlen + 1)) == NULL)
@@ -274,8 +273,7 @@ main(int  argc,                             /* I - Number of command-line args */
   if (msgid && msgstr)
   {
     if (*msgid)
-      cupsFilePrintf(strings, "\"%s\" = \"%s\";\n", msgid,
-                    (use_msgid || !*msgstr) ? msgid : msgstr);
+      cupsFilePrintf(strings, "\"%s\" = \"%s\";\n", msgid, normalize_string((use_msgid || !*msgstr) ? msgid : msgstr, normalized, sizeof(normalized)));
   }
 
   if (msgid)
@@ -292,5 +290,79 @@ main(int  argc,                            /* I - Number of command-line args */
 
 
 /*
- * End of "$Id: po2strings.c 6921 2007-09-06 13:38:37Z mike $".
+ * 'normalize_string()' - Normalize a msgid string.
+ *
+ * This function converts ASCII ellipsis and double quotes to their Unicode
+ * counterparts.
+ */
+
+static char *                          /* O - Normalized string */
+normalize_string(const char *idstr,    /* I - msgid string */
+                 char       *buffer,   /* I - Normalized string buffer */
+                 size_t     bufsize)   /* I - Size of string buffer */
+{
+  char *bufptr = buffer,               /* Pointer into buffer */
+       *bufend = buffer + bufsize - 3; /* End of buffer */
+  int  quote = 0,                      /* Quote direction */
+       html = 0;                       /* HTML text */
+
+
+  while (*idstr && bufptr < bufend)
+  {
+    if (!strncmp(idstr, "<A ", 3))
+      html = 1;
+    else if (html && *idstr == '>')
+      html = 0;
+
+    if (*idstr == '.' && idstr[1] == '.' && idstr[2] == '.')
+    {
+     /*
+      * Convert ... to Unicode ellipsis...
+      */
+
+      *bufptr++ = (char)0xE2;
+      *bufptr++ = (char)0x80;
+      *bufptr++ = (char)0xA6;
+      idstr += 2;
+    }
+    else if (!html && *idstr == '\\' && idstr[1] == '\"' && (quote || strchr(idstr + 2, '\"') != NULL))
+    {
+      if (quote)
+      {
+       /*
+        * Convert \" to Unicode right (curley) double quote.
+        */
+
+       *bufptr++ = (char)0xE2;
+       *bufptr++ = (char)0x80;
+       *bufptr++ = (char)0x9D;
+      }
+      else
+      {
+       /*
+        * Convert \" to Unicode left (curley) double quote.
+        */
+
+       *bufptr++ = (char)0xE2;
+       *bufptr++ = (char)0x80;
+       *bufptr++ = (char)0x9C;
+      }
+
+      quote = !quote;
+      idstr ++;
+    }
+    else
+      *bufptr++ = *idstr;
+
+    idstr ++;
+  }
+
+  *bufptr = '\0';
+
+  return (buffer);
+}
+
+
+/*
+ * End of "$Id$".
  */