Fix #235526: Update musicxml to 3.1

musescore · Sep 27, 2017 · 70f3ca7 · 70f3ca7
1 parent 6eb58d5
commit 70f3ca7
Show file tree

Hide file tree

Showing 8 changed files with 1,082 additions and 643 deletions.
diff --git a/mscore/aboutmusicxmlbox.ui b/mscore/aboutmusicxmlbox.ui
diff --git a/mscore/exportxml.cpp b/mscore/exportxml.cpp
@@ -5024,8 +5024,8 @@ void ExportMusicXml::write(QIODevice* dev)
       xml.setDevice(dev);
       xml.setCodec("UTF-8");
       xml << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
-      xml << "<!DOCTYPE score-partwise PUBLIC \"-//Recordare//DTD MusicXML 3.0 Partwise//EN\" \"http://www.musicxml.org/dtds/partwise.dtd\">\n";
-      xml.stag("score-partwise");
+      xml << "<!DOCTYPE score-partwise PUBLIC \"-//Recordare//DTD MusicXML 3.1 Partwise//EN\" \"http://www.musicxml.org/dtds/partwise.dtd\">\n";
+      xml.stag("score-partwise version=\"3.1\"");
 
       const MeasureBase* measure = _score->measures()->first();
       work(measure);

diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp
@@ -3627,10 +3627,14 @@ AboutMusicXMLBoxDialog::AboutMusicXMLBoxDialog()
       setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint);
       label->setText(QString("<span style=\"font-size:10pt;\">%1<br/></span>")
                      .arg(tr(   "MusicXML is an open file format for exchanging digital sheet music,\n"
-                                "supported by many applications. MusicXML is copyright &copy; MakeMusic, Inc.\n"
-                                "All rights reserved. For more information, see: %1MusicXML.com%2.")
-                          .arg("<a href=\"http://www.musicxml.com\">")
-                          .arg("</a>")
+                                "supported by many applications.\n"
+                                "Copyright © 2004-2017 the Contributors to the MusicXML\n"
+                                "Specification, published by the W3C Music Notation Community\n"
+                                "Group under the W3C Community Contributor License Agreement\n"
+                                "(CLA):\n%1\n"
+                                "A human-readable summary is available:\n%2")
+                          .arg( "\n&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"https://www.w3.org/community/about/agreements/cla/\">https://www.w3.org/community/about/agreements/cla/</a>\n",
+                                "\n&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"https://www.w3.org/community/about/agreements/cla-deed/\">https://www.w3.org/community/about/agreements/cla-deed/</a>\n")
                           .replace("\n","<br/>")));
       }
 

diff --git a/mscore/musescore.qrc b/mscore/musescore.qrc
@@ -65,7 +65,6 @@
         <file>data/icons/frame-fretboard.svg</file>
         <file>data/icons/measure.svg</file>
         <file>data/icons/object-select.svg</file>
-        <file>schema/license.html</file>
         <file>schema/musicxml.xsd</file>
         <file>schema/xlink.xsd</file>
         <file>schema/xml.xsd</file>

diff --git a/mscore/schema/license.html b/mscore/schema/license.html