X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Funictype%2Fbidi_byname.c;h=d150f4dde6716f12172096a406ecb3a6d5b90ede;hb=d59013190eb71a562203341f13c108365bfd8e74;hp=6126b95e14f76af9ede576fb532767a1daea0f01;hpb=1a22d910adea20751cc5649b224574d07ba72815;p=gnulib.git

diff --git a/lib/unictype/bidi_byname.c b/lib/unictype/bidi_byname.c
index 6126b95e1..d150f4dde 100644
--- a/lib/unictype/bidi_byname.c
+++ b/lib/unictype/bidi_byname.c
@@ -1,5 +1,5 @@
 /* Bidi categories of Unicode characters.
-   Copyright (C) 2002, 2006, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006, 2011 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
@@ -21,74 +21,74 @@
 #include "unictype.h"
 
 int
-uc_bidi_category_byname (const char *category_name)
+uc_bidi_class_byname (const char *bidi_class_name)
 {
-  switch (category_name[0])
+  switch (bidi_class_name[0])
     {
     case 'A':
-      switch (category_name[1])
+      switch (bidi_class_name[1])
         {
         case 'L':
-          if (category_name[2] == '\0')
+          if (bidi_class_name[2] == '\0')
             return UC_BIDI_AL;
           break;
         case 'N':
-          if (category_name[2] == '\0')
+          if (bidi_class_name[2] == '\0')
             return UC_BIDI_AN;
           break;
         }
       break;
     case 'B':
-      switch (category_name[1])
+      switch (bidi_class_name[1])
         {
         case '\0':
           return UC_BIDI_B;
         case 'N':
-          if (category_name[2] == '\0')
+          if (bidi_class_name[2] == '\0')
             return UC_BIDI_BN;
           break;
         }
       break;
     case 'C':
-      switch (category_name[1])
+      switch (bidi_class_name[1])
         {
         case 'S':
-          if (category_name[2] == '\0')
+          if (bidi_class_name[2] == '\0')
             return UC_BIDI_CS;
           break;
         }
       break;
     case 'E':
-      switch (category_name[1])
+      switch (bidi_class_name[1])
         {
         case 'N':
-          if (category_name[2] == '\0')
+          if (bidi_class_name[2] == '\0')
             return UC_BIDI_EN;
           break;
         case 'S':
-          if (category_name[2] == '\0')
+          if (bidi_class_name[2] == '\0')
             return UC_BIDI_ES;
           break;
         case 'T':
-          if (category_name[2] == '\0')
+          if (bidi_class_name[2] == '\0')
             return UC_BIDI_ET;
           break;
         }
       break;
     case 'L':
-      switch (category_name[1])
+      switch (bidi_class_name[1])
         {
         case '\0':
           return UC_BIDI_L;
         case 'R':
-          switch (category_name[2])
+          switch (bidi_class_name[2])
             {
             case 'E':
-              if (category_name[3] == '\0')
+              if (bidi_class_name[3] == '\0')
                 return UC_BIDI_LRE;
               break;
             case 'O':
-              if (category_name[3] == '\0')
+              if (bidi_class_name[3] == '\0')
                 return UC_BIDI_LRO;
               break;
             }
@@ -96,13 +96,13 @@ uc_bidi_category_byname (const char *category_name)
         }
       break;
     case 'N':
-      switch (category_name[1])
+      switch (bidi_class_name[1])
         {
         case 'S':
-          switch (category_name[2])
+          switch (bidi_class_name[2])
             {
             case 'M':
-              if (category_name[3] == '\0')
+              if (bidi_class_name[3] == '\0')
                 return UC_BIDI_NSM;
               break;
             }
@@ -110,22 +110,22 @@ uc_bidi_category_byname (const char *category_name)
         }
       break;
     case 'O':
-      switch (category_name[1])
+      switch (bidi_class_name[1])
         {
         case 'N':
-          if (category_name[2] == '\0')
+          if (bidi_class_name[2] == '\0')
             return UC_BIDI_ON;
           break;
         }
       break;
     case 'P':
-      switch (category_name[1])
+      switch (bidi_class_name[1])
         {
         case 'D':
-          switch (category_name[2])
+          switch (bidi_class_name[2])
             {
             case 'F':
-              if (category_name[3] == '\0')
+              if (bidi_class_name[3] == '\0')
                 return UC_BIDI_PDF;
               break;
             }
@@ -133,19 +133,19 @@ uc_bidi_category_byname (const char *category_name)
         }
       break;
     case 'R':
-      switch (category_name[1])
+      switch (bidi_class_name[1])
         {
         case '\0':
           return UC_BIDI_R;
         case 'L':
-          switch (category_name[2])
+          switch (bidi_class_name[2])
             {
             case 'E':
-              if (category_name[3] == '\0')
+              if (bidi_class_name[3] == '\0')
                 return UC_BIDI_RLE;
               break;
             case 'O':
-              if (category_name[3] == '\0')
+              if (bidi_class_name[3] == '\0')
                 return UC_BIDI_RLO;
               break;
             }
@@ -153,19 +153,25 @@ uc_bidi_category_byname (const char *category_name)
         }
       break;
     case 'S':
-      if (category_name[1] == '\0')
+      if (bidi_class_name[1] == '\0')
         return UC_BIDI_S;
       break;
     case 'W':
-      switch (category_name[1])
+      switch (bidi_class_name[1])
         {
         case 'S':
-          if (category_name[2] == '\0')
+          if (bidi_class_name[2] == '\0')
             return UC_BIDI_WS;
           break;
         }
       break;
     }
-  /* Invalid category name.  */
+  /* Invalid bidi class name.  */
   return -1;
 }
+
+int
+uc_bidi_category_byname (const char *category_name)
+{
+  return uc_bidi_class_byname (category_name);
+}