Update to latest font metric XML version to make tests work again.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@467691 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/test/resources/fonts/glb12.ttf.ansi.xml b/test/resources/fonts/glb12.ttf.ansi.xml
index 18cd2650ee158db42d317930c6c25b731c930664..b04b2bfbfe9a352e508b54c18e9aa55009c877a8 100644 (file)
--- a/test/resources/fonts/glb12.ttf.ansi.xml
+++ b/test/resources/fonts/glb12.ttf.ansi.xml
@@ -1,5 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<font-metrics type="TRUETYPE">
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!--
+
+Generated from glb12.ttf by Apache FOP's TTFReader
+
+$Id$
+
+-->
+<font-metrics metrics-version="2" type="TRUETYPE">
   <font-name>Gladiator,Bold</font-name>
   <embed/>
   <cap-height>691</cap-height>

diff --git a/test/resources/fonts/glb12.ttf.xml b/test/resources/fonts/glb12.ttf.xml
index 1621317041bcd8291acfa7bf30455dc222876992..2460bc7dd00fa945e301b3d922e41d8e896e672e 100644 (file)
--- a/test/resources/fonts/glb12.ttf.xml
+++ b/test/resources/fonts/glb12.ttf.xml
@@ -19,12 +19,14 @@
 
 Generated from glb12.ttf by Apache FOP's TTFReader
 
+$Id$
+
 -->
-<font-metrics type="TYPE0">
+<font-metrics metrics-version="2" type="TYPE0">
   <font-name>Gladiator,Bold</font-name>
   <embed/>
   <cap-height>691</cap-height>
-  <x-height>0</x-height>
+  <x-height>429</x-height>
   <ascender>765</ascender>
   <descender>-234</descender>
   <bbox>