From aa3b94db0af4bd57bc75dce02bac95186bbe798e Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Mon, 26 Dec 2016 16:36:38 -0500
Subject: [PATCH] [mtiLib] Fix mti/gpospairglyph test

---
 Lib/fontTools/mtiLib/__init__.py                     |  3 ++-
 Lib/fontTools/mtiLib/mti_test.py                     |  2 +-
 .../mtiLib/testdata/mti/gpospairglyph.ttx.GPOS       | 12 ------------
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/Lib/fontTools/mtiLib/__init__.py b/Lib/fontTools/mtiLib/__init__.py
index c39557fb4..1335d374c 100644
--- a/Lib/fontTools/mtiLib/__init__.py
+++ b/Lib/fontTools/mtiLib/__init__.py
@@ -286,7 +286,8 @@ def parsePair(self, lines, font, _lookupMap=None):
 				values2 = values1[glyph2]
 				pair = ot.PairValueRecord()
 				pair.SecondGlyph = glyph2
-				pair.Value1,pair.Value2 = values2
+				pair.Value1 = values2[0]
+				pair.Value2 = values2[1] if self.ValueFormat2 else None
 				records.append(pair)
 			pairset.PairValueCount = len(pairset.PairValueRecord)
 			self.PairSet.append(pairset)
diff --git a/Lib/fontTools/mtiLib/mti_test.py b/Lib/fontTools/mtiLib/mti_test.py
index 40a933a22..3851c602b 100644
--- a/Lib/fontTools/mtiLib/mti_test.py
+++ b/Lib/fontTools/mtiLib/mti_test.py
@@ -37,7 +37,7 @@ class BuilderTest(unittest.TestCase):
 	    #'mti/gposkernset',
 	    'mti/gposmarktobase',
 	    #'mti/gpospairclass',
-	    #'mti/gpospairglyph',
+	    'mti/gpospairglyph',
 	    'mti/gpossingle',
 	    'mti/mark-to-ligature',
 	),
diff --git a/Lib/fontTools/mtiLib/testdata/mti/gpospairglyph.ttx.GPOS b/Lib/fontTools/mtiLib/testdata/mti/gpospairglyph.ttx.GPOS
index 998578e2e..2da19013b 100644
--- a/Lib/fontTools/mtiLib/testdata/mti/gpospairglyph.ttx.GPOS
+++ b/Lib/fontTools/mtiLib/testdata/mti/gpospairglyph.ttx.GPOS
@@ -27,7 +27,6 @@
           <PairValueRecord index="0">
             <SecondGlyph value="V"/>
             <Value1 XAdvance="-50"/>
-            <Value2/>
           </PairValueRecord>
         </PairSet>
         <PairSet index="1">
@@ -35,7 +34,6 @@
           <PairValueRecord index="0">
             <SecondGlyph value="V"/>
             <Value1 XAdvance="-10"/>
-            <Value2/>
           </PairValueRecord>
         </PairSet>
         <PairSet index="2">
@@ -43,7 +41,6 @@
           <PairValueRecord index="0">
             <SecondGlyph value="V"/>
             <Value1 XAdvance="-10"/>
-            <Value2/>
           </PairValueRecord>
         </PairSet>
         <PairSet index="3">
@@ -51,7 +48,6 @@
           <PairValueRecord index="0">
             <SecondGlyph value="V"/>
             <Value1 XAdvance="-50"/>
-            <Value2/>
           </PairValueRecord>
         </PairSet>
         <PairSet index="4">
@@ -59,7 +55,6 @@
           <PairValueRecord index="0">
             <SecondGlyph value="V"/>
             <Value1 XAdvance="-10"/>
-            <Value2/>
           </PairValueRecord>
         </PairSet>
         <PairSet index="5">
@@ -67,22 +62,18 @@
           <PairValueRecord index="0">
             <SecondGlyph value="a"/>
             <Value1 XAdvance="-35"/>
-            <Value2/>
           </PairValueRecord>
           <PairValueRecord index="1">
             <SecondGlyph value="acircumflex"/>
             <Value1 XAdvance="-35"/>
-            <Value2/>
           </PairValueRecord>
           <PairValueRecord index="2">
             <SecondGlyph value="aacute"/>
             <Value1 XAdvance="-35"/>
-            <Value2/>
           </PairValueRecord>
           <PairValueRecord index="3">
             <SecondGlyph value="agrave"/>
             <Value1 XAdvance="-35"/>
-            <Value2/>
           </PairValueRecord>
         </PairSet>
         <PairSet index="6">
@@ -90,7 +81,6 @@
           <PairValueRecord index="0">
             <SecondGlyph value="V"/>
             <Value1 XAdvance="-50"/>
-            <Value2/>
           </PairValueRecord>
         </PairSet>
         <PairSet index="7">
@@ -98,7 +88,6 @@
           <PairValueRecord index="0">
             <SecondGlyph value="V"/>
             <Value1 XAdvance="-50"/>
-            <Value2/>
           </PairValueRecord>
         </PairSet>
         <PairSet index="8">
@@ -106,7 +95,6 @@
           <PairValueRecord index="0">
             <SecondGlyph value="V"/>
             <Value1 XAdvance="-10"/>
-            <Value2/>
           </PairValueRecord>
         </PairSet>
       </PairPos>