From aafc81408820654e20459468d1b5d772ab105365 Mon Sep 17 00:00:00 2001
From: Josh Hadley <johadley@adobe.com>
Date: Fri, 5 Mar 2021 08:47:33 -0800
Subject: [PATCH] [varlib] Add VarLibCFFHintTypeMergeError

---
 Lib/fontTools/varLib/errors.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/Lib/fontTools/varLib/errors.py b/Lib/fontTools/varLib/errors.py
index b73f1886a..94d929d24 100644
--- a/Lib/fontTools/varLib/errors.py
+++ b/Lib/fontTools/varLib/errors.py
@@ -24,7 +24,7 @@ class VarLibCFFDictMergeError(VarLibMergeError):
 
 
 class VarLibCFFPointTypeMergeError(VarLibMergeError):
-    """Raised when a CFF glyph cannot be merged."""
+    """Raised when a CFF glyph cannot be merged because of point type differences."""
 
     def __init__(self, point_type, pt_index, m_index, default_type, glyph_name):
         error_msg = (
@@ -35,5 +35,17 @@ class VarLibCFFPointTypeMergeError(VarLibMergeError):
         self.args = (error_msg,)
 
 
+class VarLibCFFHintTypeMergeError(VarLibMergeError):
+    """Raised when a CFF glyph cannot be merged because of hint type differences."""
+
+    def __init__(self, hint_type, cmd_index, m_index, default_type, glyph_name):
+        error_msg = (
+            f"Glyph '{glyph_name}': '{hint_type}' at index {cmd_index} in "
+            f"master index {m_index} differs from the default font hint type "
+            f"'{default_type}'"
+        )
+        self.args = (error_msg,)
+
+
 class VariationModelError(VarLibError):
     """Raised when a variation model is faulty."""