walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Thai] Fix SARA AM handling 

Oops, thinko.
This commit is contained in:
Behdad Esfahbod 2012-07-23 14:04:42 -04:00
parent 42848453bf
commit 093cd58326
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/hb-ot-shape-complex-misc.cc
View File

@ -151,8 +151,8 @@ _hb_ot_shape_complex_setup_masks_thai (hb_ot_map_t *map HB_UNUSED,
* Nikhahit: U+0E4D U+0ECD * Nikhahit: U+0E4D U+0ECD
* *
* Testing shows that Uniscribe reorder the following marks: * Testing shows that Uniscribe reorder the following marks:
* Thai: <0E31..0E37,0E47..0E4E> * Thai: <0E31,0E34..0E37,0E47..0E4E>
* Lao: <0EB1..0EB7,0EC7..0ECE> * Lao: <0EB1,0EB4..0EB7,0EC7..0ECE>
* *
* Note how the Lao versions are the same as Thai + 0x80. * Note how the Lao versions are the same as Thai + 0x80.
*/ */
@ -162,7 +162,7 @@ _hb_ot_shape_complex_setup_masks_thai (hb_ot_map_t *map HB_UNUSED,
#define IS_SARA_AM(x) (((x) & ~0x0080) == 0x0E33) #define IS_SARA_AM(x) (((x) & ~0x0080) == 0x0E33)
#define NIKHAHIT_FROM_SARA_AM(x) ((x) - 0xE33 + 0xE4D) #define NIKHAHIT_FROM_SARA_AM(x) ((x) - 0xE33 + 0xE4D)
#define SARA_AA_FROM_SARA_AM(x) ((x) - 1) #define SARA_AA_FROM_SARA_AM(x) ((x) - 1)
#define IS_TONE_MARK(x) (hb_in_ranges<hb_codepoint_t> ((x) & ~0x0080, 0x0E31, 0x0E37, 0x0E47, 0x0E4E)) #define IS_TONE_MARK(x) (hb_in_ranges<hb_codepoint_t> ((x) & ~0x0080, 0x0E34, 0x0E37, 0x0E47, 0x0E4E, 0x0E31, 0x0E31))
buffer->clear_output (); buffer->clear_output ();
unsigned int count = buffer->len; unsigned int count = buffer->len;

4
src/hb-private.hh
View File

@ -730,9 +730,9 @@ hb_in_range (T u, T lo, T hi)
} }
template <typename T> static inline bool template <typename T> static inline bool
hb_in_ranges (T u, T lo1, T hi1, T lo2, T hi2) hb_in_ranges (T u, T lo1, T hi1, T lo2, T hi2, T lo3, T hi3)
{ {
return hb_in_range (u, lo1, hi1) || hb_in_range (u, lo2, hi2); return hb_in_range (u, lo1, hi1) || hb_in_range (u, lo2, hi2) || hb_in_range (u, lo3, hi3);
} }