Merge pull request #1938 from justvanrossum/meta-comment

[ttLib.table._m_e_t_a] if data happens to be ascii, emit comment in TTX
fonttools · May 11, 2020 · a53bb37 · a53bb37
2 parents b81d139 + 0dc0222
commit a53bb37
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/Lib/fontTools/ttLib/tables/_m_e_t_a.py b/Lib/fontTools/ttLib/tables/_m_e_t_a.py
@@ -85,7 +85,11 @@ def toXML(self, writer, ttFont):
             else:
                 writer.begintag("hexdata", tag=tag)
                 writer.newline()
-                writer.dumphex(self.data[tag])
+                data = self.data[tag]
+                if min(data) >= 0x20 and max(data) <= 0x7E:
+                    writer.comment("ascii: " + data.decode("ascii"))
+                    writer.newline()
+                writer.dumphex(data)
                 writer.endtag("hexdata")
                 writer.newline()
 

diff --git a/Tests/ttLib/tables/_m_e_t_a_test.py b/Tests/ttLib/tables/_m_e_t_a_test.py
@@ -58,6 +58,19 @@ def test_toXML(self):
             '</hexdata>'
         ], [line.strip() for line in xml.splitlines()][1:])
 
+    def test_toXML_ascii_data(self):
+        table = table__m_e_t_a()
+        table.data["TEST"] = b"Hello!"
+        writer = XMLWriter(BytesIO())
+        table.toXML(writer, {"meta": table})
+        xml = writer.file.getvalue().decode("utf-8")
+        self.assertEqual([
+            '<hexdata tag="TEST">',
+                '<!-- ascii: Hello! -->',
+                '48656c6c 6f21',
+            '</hexdata>'
+        ], [line.strip() for line in xml.splitlines()][1:])
+
     def test_fromXML(self):
         table = table__m_e_t_a()
         for name, attrs, content in parseXML(