From 7a27214fcb96457a071c8a55b4ff2b59f5a43e58 Mon Sep 17 00:00:00 2001
From: Roozbeh Pournader <roozbeh@google.com>
Date: Thu, 19 Dec 2013 15:46:05 -0800
Subject: [PATCH] Added merging tables for 'name' and 'gasp'.

---
 Lib/fontTools/merge.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Lib/fontTools/merge.py b/Lib/fontTools/merge.py
index c74410845..b86bbd3d3 100644
--- a/Lib/fontTools/merge.py
+++ b/Lib/fontTools/merge.py
@@ -220,6 +220,17 @@ ttLib.getTableClass('vmtx').mergeMap = ttLib.getTableClass('hmtx').mergeMap = {
 	'metrics': sumDicts,
 }
 
+ttLib.getTableClass('gasp').mergeMap = {
+	'tableTag': equal,
+	'version': max,
+	'gaspRange': first, # FIXME? Appears irreconcilable
+}
+
+ttLib.getTableClass('name').mergeMap = {
+	'tableTag': equal,
+	'names': first, # FIXME? Does mixing name records make sense?
+}
+
 ttLib.getTableClass('loca').mergeMap = {
 	'*': recalculate,
 	'tableTag': equal,