From d04dc9df1125315b8ef8adf2a4dbd930c72679c3 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Thu, 3 Jul 2014 14:01:44 -0400
Subject: [PATCH] [merge] Add preliminary support for BASE table

---
 Lib/fontTools/merge.py | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/Lib/fontTools/merge.py b/Lib/fontTools/merge.py
index d3112bd7b..1ce6fbb34 100644
--- a/Lib/fontTools/merge.py
+++ b/Lib/fontTools/merge.py
@@ -384,6 +384,10 @@ otTables.ScriptList.mergeMap = {
 	'ScriptCount': sum,
 	'ScriptRecord': lambda lst: sorted(sumLists(lst), key=lambda s: s.ScriptTag),
 }
+otTables.BaseScriptList.mergeMap = {
+	'BaseScriptCount': sum,
+	'BaseScriptRecord': lambda lst: sorted(sumLists(lst), key=lambda s: s.BaseScriptTag),
+}
 
 otTables.FeatureList.mergeMap = {
 	'FeatureCount': sum,
@@ -422,12 +426,23 @@ otTables.MarkGlyphSetsDef.mergeMap = {
 	'Coverage': sumLists,
 }
 
-otTables.GDEF.mergeMap = {
+otTables.Axis.mergeMap = {
 	'*': mergeObjects,
-	'Version': max,
 }
 
-otTables.GSUB.mergeMap = otTables.GPOS.mergeMap = {
+# XXX Fix BASE table merging
+otTables.BaseTagList.mergeMap = {
+	'BaseTagCount': sum,
+	'BaselineTag': sumLists,
+}
+
+otTables.GDEF.mergeMap = \
+otTables.GSUB.mergeMap = \
+otTables.GPOS.mergeMap = \
+otTables.BASE.mergeMap = \
+otTables.JSTF.mergeMap = \
+otTables.MATH.mergeMap = \
+{
 	'*': mergeObjects,
 	'Version': max,
 }