usp10: Add Ogham script.

dlls/usp10/shape.c

@@ -672,6 +672,7 @@ static const ScriptShapeData ShapingData[] =
     {{ no_features, 0}, NULL, "vai ", "", NULL, NULL},
     {{ no_features, 0}, NULL, "cher", "", NULL, NULL},
     {{ no_features, 0}, NULL, "cans", "", NULL, NULL},
+    {{ no_features, 0}, NULL, "ogam", "", NULL, NULL},
 };
 
 static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph)

dlls/usp10/tests/usp10.c

@@ -165,6 +165,7 @@ static inline void _test_items_ok(LPCWSTR string, DWORD cchString,
 #define vai_tag MS_MAKE_TAG('v','a','i',' ')
 #define cher_tag MS_MAKE_TAG('c','h','e','r')
 #define cans_tag MS_MAKE_TAG('c','a','n','s')
+#define ogam_tag MS_MAKE_TAG('o','g','a','m')
 
 static void test_ScriptItemize( void )
 {
@@ -410,6 +411,12 @@ static void test_ScriptItemize( void )
     static const itemTest t401[2] = {{{0,0,0,0,0},0,0,0,0,cans_tag,FALSE},{{0,0,0,0,0},6,0,0,0,-1,FALSE}};
     static const itemTest t402[2] = {{{0,0,0,0,0},0,0,0,2,cans_tag,TRUE,{-1,1,1,1,-1}},{{0,0,0,0,0},6,0,0,0,-1,FALSE}};
 
+    /* Ogham */
+    static const WCHAR test41[] = {0x169b,0x1691,0x168c,0x1690,0x168b,0x169c};
+    static const itemTest t411[2] = {{{0,0,0,0,0},0,0,0,0,ogam_tag,FALSE},{{0,0,0,0,0},6,0,0,0,-1,FALSE}};
+    static const itemTest t412[4] = {{{0,0,0,0,0},0,1,1,1,ogam_tag,FALSE},{{0,0,0,0,0},1,0,0,2,ogam_tag,FALSE},{{0,0,0,0,0},5,1,1,1,ogam_tag,FALSE},{{0,0,0,0,0},6,0,0,0,-1,FALSE}};
+    static const int b412[2] = {1,1};
+
     SCRIPT_ITEM items[15];
     SCRIPT_CONTROL  Control;
     SCRIPT_STATE    State;
@@ -483,6 +490,7 @@ static void test_ScriptItemize( void )
     test_items_ok(test38,2,NULL,NULL,1,t381,FALSE,0);
     test_items_ok(test39,10,NULL,NULL,1,t391,FALSE,0);
     test_items_ok(test40,6,NULL,NULL,1,t401,FALSE,0);
+    test_items_ok(test41,6,NULL,NULL,1,t411,FALSE,0);
 
     State.uBidiLevel = 0;
     test_items_ok(test1,4,&Control,&State,1,t11,FALSE,0);
@@ -530,6 +538,7 @@ static void test_ScriptItemize( void )
     test_items_ok(test38,2,&Control,&State,1,t381,FALSE,0);
     test_items_ok(test39,10,&Control,&State,1,t391,FALSE,0);
     test_items_ok(test40,6,&Control,&State,1,t401,FALSE,0);
+    test_items_ok(test41,6,&Control,&State,1,t411,FALSE,0);
 
     State.uBidiLevel = 1;
     test_items_ok(test1,4,&Control,&State,1,t12,FALSE,0);
@@ -577,6 +586,7 @@ static void test_ScriptItemize( void )
     test_items_ok(test38,2,&Control,&State,1,t382,FALSE,0);
     test_items_ok(test39,10,&Control,&State,1,t392,FALSE,0);
     test_items_ok(test40,6,&Control,&State,1,t402,FALSE,0);
+    test_items_ok(test41,6,&Control,&State,3,t412,FALSE,b412);
 
     State.uBidiLevel = 1;
     Control.fMergeNeutralItems = TRUE;
@@ -625,6 +635,7 @@ static void test_ScriptItemize( void )
     test_items_ok(test38,2,&Control,&State,1,t382,FALSE,0);
     test_items_ok(test39,10,&Control,&State,1,t392,FALSE,0);
     test_items_ok(test40,6,&Control,&State,1,t402,FALSE,0);
+    test_items_ok(test41,6,&Control,&State,3,t412,FALSE,b412);
 }
 
 static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string,

dlls/usp10/usp10.c

@@ -122,6 +122,8 @@ static const scriptRange scriptRanges[] = {
     { Script_Cherokee,   0x13a0,  0x13ff,  0, 0},
     /* Canadian Aboriginal Syllabics: U+1400–U+167F */
     { Script_Canadian,   0x1400,  0x167f,  0, 0},
+    /* Ogham: U+1680–U+169F */
+    { Script_Ogham,      0x1680,  0x169f,  0, 0},
     /* Khmer: U+1780–U+17FF */
     { Script_Khmer,      0x1780,  0x17ff,  Script_Khmer_Numeric, 0},
     /* Mongolian: U+1800–U+18AF */
@@ -568,6 +570,10 @@ static const scriptData scriptInformation[] = {
      {0x5d, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0},
      MS_MAKE_TAG('c','a','n','s'),
      {'E','u','p','h','e','m','i','a'}},
+    {{Script_Ogham, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}},
+     {0, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+     MS_MAKE_TAG('o','g','a','m'),
+     {'S','e','g','o','e',' ','U','I',' ','S','y','m','b','o','l'}},
 };
 
 static const SCRIPT_PROPERTIES *script_props[] =
@@ -606,7 +612,8 @@ static const SCRIPT_PROPERTIES *script_props[] =
     &scriptInformation[62].props, &scriptInformation[63].props,
     &scriptInformation[64].props, &scriptInformation[65].props,
     &scriptInformation[66].props, &scriptInformation[67].props,
-    &scriptInformation[68].props, &scriptInformation[69].props
+    &scriptInformation[68].props, &scriptInformation[69].props,
+    &scriptInformation[70].props
 };
 
 typedef struct {

dlls/usp10/usp10_internal.h

@@ -101,6 +101,8 @@
 #define Script_Vai_Numeric 67
 #define Script_Cherokee 68
 #define Script_Canadian 69
+/* Unicode Chapter 14 */
+#define Script_Ogham 70
 
 #define GLYPH_BLOCK_SHIFT 8
 #define GLYPH_BLOCK_SIZE  (1UL << GLYPH_BLOCK_SHIFT)