usp10: Factor out script ranges in an more expandable way.

dlls/usp10/shape.c

@@ -655,6 +655,8 @@ static const char* get_opentype_script(HDC hdc, SCRIPT_ANALYSIS *psa)
     switch (psa->eScript)
     {
         case Script_Arabic:
+        case Script_Persian:
+        case Script_Arabic_Numeric:
             return "arab";
         case Script_Syriac:
             return "syrc";
@@ -663,7 +665,6 @@ static const char* get_opentype_script(HDC hdc, SCRIPT_ANALYSIS *psa)
         case Script_Latin:
         case Script_Numeric:
         case Script_CR:
-        case Script_LF:
             return "latn";
     }
 
@@ -834,7 +835,9 @@ void SHAPE_ShapeArabicGlyphs(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WC
     INT dirR, dirL;
     int i;
 
-    if (psa->eScript != Script_Arabic)
+    if (psa->eScript != Script_Arabic &&
+        psa->eScript != Script_Persian &&
+        psa->eScript != Script_Arabic_Numeric)
         return;
 
     if (*pcGlyphs != cChars)

dlls/usp10/usp10_internal.h

@@ -19,13 +19,16 @@
  *
  */
 
-#define Script_Syriac  8
-#define Script_Hebrew  7
-#define Script_Arabic  6
 #define Script_Latin   1
-#define Script_Numeric 5
-#define Script_CR      22
-#define Script_LF      23
+#define Script_CR      2
+#define Script_Numeric 3
+#define Script_Control 4
+#define Script_Punctuation 5
+#define Script_Arabic  6
+#define Script_Arabic_Numeric  7
+#define Script_Hebrew  8
+#define Script_Syriac  9
+#define Script_Persian 10
 
 #define GLYPH_BLOCK_SHIFT 8
 #define GLYPH_BLOCK_SIZE  (1UL << GLYPH_BLOCK_SHIFT)