Update CaseFolding.txt to Unicode 5.1.0

[fontconfig.git] / src / fcstr.c

diff --git a/src/fcstr.c b/src/fcstr.c
index 5faf5790f8ba4e9dd3f1522b0109f16a73e4e8f2..1e7b4662fc8c49add3691dca0185586855505ad9 100644 (file)
--- a/src/fcstr.c
+++ b/src/fcstr.c
@@ -26,6 +26,9 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <string.h>
+#ifdef _WIN32
+#include <windows.h>
+#endif
 
 FcChar8 *
 FcStrCopy (const FcChar8 *s)
@@ -320,6 +323,26 @@ FcStrContainsIgnoreBlanksAndCase (const FcChar8 *s1, const FcChar8 *s2)
     return 0;
 }
 
+static FcBool
+FcCharIsPunct (const FcChar8 c)
+{
+    if (c < '0')
+       return FcTrue;
+    if (c <= '9')
+       return FcFalse;
+    if (c < 'A')
+       return FcTrue;
+    if (c <= 'Z')
+       return FcFalse;
+    if (c < 'a')
+       return FcTrue;
+    if (c <= 'z')
+       return FcFalse;
+    if (c <= '~')
+       return FcTrue;
+    return FcFalse;
+}
+
 /*
  * Is the head of s1 equal to s2?
  */
@@ -359,6 +382,34 @@ FcStrContainsIgnoreCase (const FcChar8 *s1, const FcChar8 *s2)
     return 0;
 }
 
+/*
+ * Does s1 contain an instance of s2 on a word boundary (ignoring case)?
+ */
+
+const FcChar8 *
+FcStrContainsWord (const FcChar8 *s1, const FcChar8 *s2)
+{
+    FcBool  wordStart = FcTrue;
+    int            s1len = strlen ((char *) s1);
+    int            s2len = strlen ((char *) s2);
+       
+    while (s1len >= s2len)
+    {
+       if (wordStart && 
+           FcStrIsAtIgnoreCase (s1, s2) &&
+           (s1len == s2len || FcCharIsPunct (s1[s2len])))
+       {
+           return s1;
+       }
+       wordStart = FcFalse;
+       if (FcCharIsPunct (*s1))
+           wordStart = FcTrue;
+       s1++;
+       s1len--;
+    }
+    return 0;
+}
+
 const FcChar8 *
 FcStrStrIgnoreCase (const FcChar8 *s1, const FcChar8 *s2)
 {
@@ -830,27 +881,14 @@ FcStrBasename (const FcChar8 *file)
     return FcStrCopy (slash + 1);
 }
 
-FcChar8 *
-FcStrCanonFilename (const FcChar8 *s)
+static FcChar8 *
+FcStrCanonAbsoluteFilename (const FcChar8 *s)
 {
     FcChar8 *file;
     FcChar8 *f;
     const FcChar8 *slash;
     int size;
-    
-    if (*s != '/')
-    {
-       FcChar8 *full;
-       
-       FcChar8 cwd[FC_MAX_FILE_LEN + 2];
-       if (getcwd ((char *) cwd, FC_MAX_FILE_LEN) == NULL)
-           return NULL;
-       strcat ((char *) cwd, "/");
-       full = FcStrPlus (cwd, s);
-       file = FcStrCanonFilename (full);
-       FcStrFree (full);
-       return file;
-    }
+
     size = strlen ((char *) s) + 1;
     file = malloc (size);
     if (!file)
@@ -889,6 +927,74 @@ FcStrCanonFilename (const FcChar8 *s)
     }
     return file;
 }
+ 
+#ifdef _WIN32
+/*
+ * Convert '\\' to '/' , remove double '/' 
+ */
+static void
+FcConvertDosPath (char *str)
+{
+  size_t len = strlen (str);
+  char *p = str;
+  char *dest = str;
+  char *end = str + len;
+  char last = 0;
+  
+  while (p < end)
+    {
+      if (*p == '\\')
+       *p = '/';
+
+      if (*p != '/'
+         || last != '/')
+       {
+         *dest++ = *p;
+       }
+
+      last = *p;
+      p++;
+    }
+
+  *dest = 0;
+}
+#endif
+
+FcChar8 *
+FcStrCanonFilename (const FcChar8 *s)
+{
+#ifdef _WIN32
+    FcChar8 full[FC_MAX_FILE_LEN + 2];
+    FcChar8 basename[FC_MAX_FILE_LEN + 2];
+    int size = GetFullPathName (s, sizeof (full) -1,
+                               full,
+                               basename);
+
+    if (size == 0)
+       perror ("GetFullPathName");
+
+    FcConvertDosPath (full);
+    return FcStrCanonAbsoluteFilename (full);
+#else
+    if (s[0] == '/')
+       return FcStrCanonAbsoluteFilename (s);
+    else
+    {
+       FcChar8 *full;
+       FcChar8 *file;
+
+       FcChar8 cwd[FC_MAX_FILE_LEN + 2];
+       if (getcwd ((char *) cwd, FC_MAX_FILE_LEN) == NULL)
+           return NULL;
+       strcat ((char *) cwd, "/");
+       full = FcStrPlus (cwd, s);
+       file = FcStrCanonAbsoluteFilename (full);
+       FcStrFree (full);
+       return file;
+    }
+#endif
+}
+
 
 FcStrSet *
 FcStrSetCreate (void)
@@ -1051,3 +1157,6 @@ FcStrListDone (FcStrList *list)
     free (list);
 }
 
+#define __fcstr__
+#include "fcaliastail.h"
+#undef __fcstr__