From 29edbe211d9140f11eee30a82580688e2aab60d6 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Fri, 13 Nov 2009 22:06:05 +0200
Subject: [PATCH 1/5] Update MathML MIME type to application/mathml+xml, add root-XML and
 acronym for it.

See http://www.w3.org/TR/MathML2/chapter7.html#id.7.1.3
---
 freedesktop.org.xml.in |   14 +++++++++-----
 tests/list             |    1 +
 tests/test.mml         |    2 ++
 3 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 tests/test.mml

diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
index 3c8b8af..8e753dd 100644
--- a/freedesktop.org.xml.in
+++ b/freedesktop.org.xml.in
@@ -127,6 +127,15 @@ command to generate the output files.
     </magic>
     <alias type="application/x-mathematica"/>
   </mime-type>
+  <mime-type type="application/mathml+xml">
+    <_comment>MathML document</_comment>
+    <acronym>MathML</acronym>
+    <expanded-acronym>Mathematical Markup Language</expanded-acronym>
+    <alias type="text/mathml"/>
+    <sub-class-of type="application/xml"/>
+    <glob pattern="*.mml"/>
+    <root-XML namespaceURI="http://www.w3.org/1998/Math/MathML" localName="math"/>
+  </mime-type>
   <mime-type type="application/mbox">
     <_comment>mailbox file</_comment>
     <generic-icon name="text-x-generic"/>
@@ -4197,11 +4206,6 @@ command to generate the output files.
     <_comment>help page</_comment>
     <sub-class-of type="text/plain"/>
   </mime-type>
-  <mime-type type="text/mathml">
-    <_comment>MathML document</_comment>
-    <sub-class-of type="application/xml"/>
-    <glob pattern="*.mml"/>
-  </mime-type>
   <mime-type type="text/plain">
     <_comment>plain text document</_comment>
     <magic priority="50">
diff --git a/tests/list b/tests/list
index 0c3a46b..31f2ea7 100644
--- a/tests/list
+++ b/tests/list
@@ -174,6 +174,7 @@ project.glade application/x-glade
 ISOcyr1.ent application/xml-external-parsed-entity ox
 # Copied from http://www.metalinker.org/samples/abiword-setup-2.4.6.exe.metalink
 test.metalink application/metalink+xml
+test.mml application/mathml+xml
 
 # Archives
 # Copied from http://bugs.freedesktop.org/show_bug.cgi?id=14909
diff --git a/tests/test.mml b/tests/test.mml
new file mode 100644
index 0000000..034e9b4
--- /dev/null
+++ b/tests/test.mml
@@ -0,0 +1,2 @@
+<!DOCTYPE math PUBLIC "-//W3C//DTD MathML 2.0//EN" "http://www.w3.org/Math/DTD/mathml2/mathml2.dtd">
+<math xmlns="http://www.w3.org/1998/Math/MathML"/>
-- 
1.6.2.5