From cf94cb9b43dddafc6766277e65548a0a6409db41 Mon Sep 17 00:00:00 2001
From: Nigel Tao <nigeltao@golang.org>
Date: Fri, 7 Nov 2014 09:38:15 +1100
Subject: [PATCH] freetype/truetype: update the golden tests for Ubuntu 14.04's
 version of standard fonts like Deja Vu Sans Oblique.

LGTM=bsiegert
R=bsiegert
CC=golang-codereviews
https://codereview.appspot.com/164660043
---
 freetype/truetype/truetype_test.go  | 12 ++++++++----
 testdata/luximr.ttx                 |  2 +-
 testdata/luxirr.ttx                 |  2 +-
 testdata/luxisr.ttx                 |  2 +-
 testdata/make-other-hinting-txts.sh |  2 +-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/freetype/truetype/truetype_test.go b/freetype/truetype/truetype_test.go
index 765b3fb..9ef6ec8 100644
--- a/freetype/truetype/truetype_test.go
+++ b/freetype/truetype/truetype_test.go
@@ -104,6 +104,10 @@ func TestIndex(t *testing.T) {
 			'\u22c5': 385,
 			'中':      0,
 		},
+
+		// The x-etc test cases use those versions of the .ttf files provided
+		// by Ubuntu 14.04. See testdata/make-other-hinting-txts.sh for details.
+
 		"x-arial-bold": {
 			' ':      3,
 			'+':      14,
@@ -126,10 +130,10 @@ func TestIndex(t *testing.T) {
 			'Œ':      276,
 			'ω':      861,
 			'‡':      2571,
-			'⊕':      3109,
-			'fl':      4560,
-			'\ufb03': 4561,
-			'\ufffd': 4645,
+			'⊕':      3110,
+			'fl':      4728,
+			'\ufb03': 4729,
+			'\ufffd': 4813,
 			// TODO: '\U0001f640': ???,
 			'中': 0,
 		},
diff --git a/testdata/luximr.ttx b/testdata/luximr.ttx
index 5cc8949..e60ebca 100644
--- a/testdata/luximr.ttx
+++ b/testdata/luximr.ttx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="2.1">
+<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="2.4">
 
   <GlyphOrder>
     <!-- The 'id' attribute is only for humans; it is ignored when parsed. -->
diff --git a/testdata/luxirr.ttx b/testdata/luxirr.ttx
index 8b8e15e..27191d0 100644
--- a/testdata/luxirr.ttx
+++ b/testdata/luxirr.ttx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="2.1">
+<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="2.4">
 
   <GlyphOrder>
     <!-- The 'id' attribute is only for humans; it is ignored when parsed. -->
diff --git a/testdata/luxisr.ttx b/testdata/luxisr.ttx
index a1b2d26..98eea53 100644
--- a/testdata/luxisr.ttx
+++ b/testdata/luxisr.ttx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="2.1">
+<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="2.4">
 
   <GlyphOrder>
     <!-- The 'id' attribute is only for humans; it is ignored when parsed. -->
diff --git a/testdata/make-other-hinting-txts.sh b/testdata/make-other-hinting-txts.sh
index de165c3..afee131 100755
--- a/testdata/make-other-hinting-txts.sh
+++ b/testdata/make-other-hinting-txts.sh
@@ -5,7 +5,7 @@
 #
 # Run it from this directory (testdata).
 #
-# It has only been tested on an Ubuntu 12.04 system.
+# It has only been tested on an Ubuntu 14.04 system.
 
 set -e