[HarfBuzz] harfbuzz-ng: Branch 'master'

[Behdad Esfahbod]

 test/test-ot-tag.c |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit 065fb38c9a338ddb095f2ec9e034fcc5a02167bd
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri May 13 23:04:46 2011 -0400

    [test/ot-tag] More tests

diff --git a/test/test-ot-tag.c b/test/test-ot-tag.c
index bae0af5..d440dbd 100644
--- a/test/test-ot-tag.c
+++ b/test/test-ot-tag.c
@@ -208,8 +208,17 @@ test_ot_tag_language (void)
 
   test_language_two_way ("ABC", "x-hbotabc");
   test_tag_from_language ("ABC", "asdf-asdf-wer-x-hbotabc-zxc");
+  test_tag_from_language ("ABC", "asdf-asdf-wer-x-hbotabc");
+  test_tag_from_language ("ABCD", "asdf-asdf-wer-x-hbotabcd");
 
   test_tag_from_language ("dflt", "asdf-asdf-wer-x-hbot-zxc");
+
+  /* Test that x-hbot overrides the base language */
+  test_tag_from_language ("ABC", "fa-x-hbotabc-zxc");
+  test_tag_from_language ("ABC", "fa-ir-x-hbotabc-zxc");
+  test_tag_from_language ("ABC", "zh-x-hbotabc-zxc");
+  test_tag_from_language ("ABC", "zh-cn-x-hbotabc-zxc");
+  test_tag_from_language ("ABC", "zh-xy-x-hbotabc-zxc");
 }
 
 int