Update test files

pe-ro · pe-ro · commit b0d8be1a681f · 2016-04-14T11:23:52.000-04:00
diff --git a/tests/mei-CMN/altsym_ornaments.mei b/tests/mei-CMN/altsym_ornaments.mei
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="../../schemata/mei-all.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
-<?xml-model href="../../schemata/mei-all.rng" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
-<mei xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.music-encoding.org/ns/mei" meiversion="3.0.0">
+<?xml-model href="../../schemata/mei-CMN.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
+<?xml-model href="../../schemata/mei-CMN.rng" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<mei xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.music-encoding.org/ns/mei"
+    meiversion="3.0.0">
     <meiHead>
         <fileDesc>
             <titleStmt>
@@ -25,7 +26,7 @@
         <body>
             <mdiv>
                 <score>
-                    <scoreDef meter.count="4" meter.unit="4" >
+                    <scoreDef meter.count="4" meter.unit="4">
                         <symbolTable>
                             <symbolDef xml:id="alt_mordent">
                                 <!-- SMuFL ornamentMordentInverted -->
@@ -45,10 +46,7 @@
                             </symbolDef>
                         </symbolTable>
                         <staffGrp>
-                            <staffDef n="1"
-                                clef.line="2"
-                                clef.shape="G"
-                                lines="5"/>
+                            <staffDef n="1" clef.line="2" clef.shape="G" lines="5"/>
                         </staffGrp>
                     </scoreDef>
                     <section>
@@ -60,10 +58,12 @@
                                     <note pname="g" oct="4" dur="4"/>
                                     <note pname="c" oct="4" dur="4"/>
                                 </layer>
-                            </staff>                            
-                            <mordent form="norm" tstamp="1" altsym="#alt_mordent"/>
-                            <turn form="norm" tstamp="2" altsym="#alt_turn"/>                            
-                            <trill tstamp="4" altsym="#alt_trill"/>
+                            </staff>
+                            <!-- @altsym or @glyphname can be used to refer to a symbol -->
+                            <!-- @glyphname is the more direct method -->
+                            <mordent form="norm" tstamp="1" altsym="#alt_mordent" glyphnum="#xE56D"/>
+                            <turn form="norm" tstamp="2" altsym="#alt_turn" glyphnum="#xE569"/>
+                            <trill tstamp="4" altsym="#alt_trill" glyphnum="#xE584"/>
                         </measure>
                     </section>
                 </score>
diff --git a/tests/mei-all/mei2015_testing.mei b/tests/mei-all/mei2015_testing.mei
@@ -392,13 +392,13 @@
           <!-- relative line-height and letter-spacing values now permitted -->
           <rend rend="line-height(150%) letter-spacing(5%)" halign="center" fontsize="12">
             <lb/>
-            <rend rend="x-large">THE POEMS</rend>
+            <rend fontsize="x-large">THE POEMS</rend>
             <lb/>
-            <rend rend="small">OF</rend>
+            <rend fontsize="small">OF</rend>
             <lb/>
-            <rend rend="xx-large" color="red">ALGERNON CHARLES SWINBURNE</rend>
+            <rend fontsize="xx-large" color="red">ALGERNON CHARLES SWINBURNE</rend>
             <lb/>
-            <rend rend="large line-height(150%)">IN SIX VOLUMES</rend>
+            <rend fontsize="large" rend="line-height(150%)">IN SIX VOLUMES</rend>
           </rend>
         </title>
         <byline>
@@ -408,7 +408,7 @@
         </byline>
         <editor>Edited by John Doe</editor>
         <title>VOLUME I.<lb/>
-          <rend rend="x-large smcaps" color="red">POEMS AND BALLADS</rend></title>
+          <rend fontsize="x-large" rend="smcaps" color="red">POEMS AND BALLADS</rend></title>
         <title>FIRST SERIES</title>
         <imprint>
           <pubPlace>London</pubPlace> Printed for <name>E. Nutt</name>, at <pubPlace>Royal
@@ -445,10 +445,13 @@
             meter.unit="4" meter.sym="common" system.leftline="true">
             <symbolTable>
               <symbolDef xml:id="mySymbol1">
-                <curve startid="#n1" endid="#n2" lform="dotted" lwidth="0.2mm" curvedir="above"/>
-                <symbol altsym="#mySymbol1"/>
-                <graphic target="www.mySite.org/cuteGraphic.png" width="10px" height="11px"/>
+                <curve startid="#n1" endid="#n2" lform="dotted" lwidth="0.2mm" curvedir="above"
+                  bulge="2 50%"/>
+                <symbol altsym="#mySymbol2" startid="#n1"/>
+                <graphic target="www.mySite.org/cuteGraphic.png" width="10px" height="11px" ulx="0"
+                  uly="0"/>
               </symbolDef>
+              <symbolDef xml:id="mySymbol2"/>
             </symbolTable>
             <keySig pname="c" accid="s" mode="minor"/>
             <meterSig count="4" unit="4" sym="common"/>
