From ab38cf674658fbdde5732171b218fddaaccecbf9 Mon Sep 17 00:00:00 2001
From: David Corbett <corbett.dav@northeastern.edu>
Date: Sat, 10 Oct 2020 14:21:20 -0400
Subject: [PATCH] Map hy-arevmda to 'HYE ' instead of HYE0

---
 src/gen-tag-table.py   | 3 +++
 src/hb-ot-tag-table.hh | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/src/gen-tag-table.py b/src/gen-tag-table.py
index cfeb85c67..3ce871204 100755
--- a/src/gen-tag-table.py
+++ b/src/gen-tag-table.py
@@ -686,6 +686,8 @@ ot.add_language ('und-fonnapa', 'APPH')
 ot.remove_language_ot ('IRT')
 ot.add_language ('ga-Latg', 'IRT')
 
+ot.add_language ('hy-arevmda', 'HYE')
+
 ot.remove_language_ot ('KGE')
 ot.add_language ('und-Geok', 'KGE')
 
@@ -809,6 +811,7 @@ disambiguation = {
 	'ECR': 'crj',
 	'HAL': 'cfm',
 	'HND': 'hnd',
+	'HYE': 'hyw',
 	'KIS': 'kqs',
 	'KUI': 'uki',
 	'LRC': 'bqi',
diff --git a/src/hb-ot-tag-table.hh b/src/hb-ot-tag-table.hh
index 94445daed..f784a21c1 100644
--- a/src/hb-ot-tag-table.hh
+++ b/src/hb-ot-tag-table.hh
@@ -1090,6 +1090,13 @@ hb_ot_tags_from_complex_language (const char   *lang_str,
     *count = 1;
     return true;
   }
+  if (subtag_matches (lang_str, limit, "-arevmda"))
+  {
+    /* Armenian; Western Armenian (retired code) */
+    tags[0] = HB_TAG('H','Y','E',' ');  /* Armenian */
+    *count = 1;
+    return true;
+  }
   if (subtag_matches (lang_str, limit, "-provenc"))
   {
     /* Occitan (post 1500); Provençal */