Fix MML XSpec tests

Signed-off-by: Jarno Elovirta <[email protected]>

build_template.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns:dita="http://dita-ot.sourceforge.net">
-  
+
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-  
+
   <target name="docx.init">
     <property name="force-unique" value="true"/>
     <property name="docx.dir" location="${dita.plugin.com.elovirta.ooxml.dir}/docx"/>
@@ -21,26 +21,26 @@
       <available file="${env.PROGRAMFILES}\Inkscape\Inkscape.exe"/>
     </condition>
   </target>
-  
+
   <target name="dita2docx"
-          depends="docx.init,
-                   build-init,
-                   preprocess,
-                   docx.image-metadata,
-                   docx.svg2emf,
-                   docx.template,
-                   docx.merge,
-                   docx.convert,
-                   docx.package"/>
-  
+    depends="docx.init,
+             build-init,
+             preprocess,
+             docx.image-metadata,
+             docx.svg2emf,
+             docx.template,
+             docx.merge,
+             docx.convert,
+             docx.package"/>
+
   <target name="docx.image-metadata" description="Read image metadata">
     <pipeline message="Read image metadata." taskname="image-metadata" tempdir="${dita.temp.dir}">
       <module class="org.dita.dost.module.ImageMetadataModule">
         <param name="outputdir" location="${output.dir}"/>
       </module>
     </pipeline>
   </target>
-  
+
   <target name="docx.svg2emf" if="inkscape.exec" unless="docx.inkscape.skip">
     <mkdir dir="${dita.temp.dir}/docx/word/media"/>
     <for param="svg.file">
@@ -56,14 +56,14 @@
         <property name="emf.file" location="${dita.temp.dir}/docx/word/media/${svg.name}.emf"/>
         <echo taskname="inkscape">Converting @{svg.file} to ${emf.file}</echo>
         <exec executable="${inkscape.exec}" taskname="inkscape">
-          <arg value="-z" />
-          <arg value="--export-emf=${emf.file}" />
+          <arg value="-z"/>
+          <arg value="--export-emf=${emf.file}"/>
           <arg file="@{svg.file}"/>
         </exec>
       </sequential>
     </for>
   </target>
-  
+
   <target name="docx.template">
     <unzip src="${dotx.file}" dest="${dita.temp.dir}/dotx">
       <patternset>
@@ -75,121 +75,96 @@
       <fileset dir="${dita.temp.dir}/dotx"/>
     </copy>
   </target>
-  
+
   <target name="docx.merge">
     <dirname property="dita.temp.dir.fullpath" file="${dita.temp.dir}/dummy.file"/>
     <property name="topicmerge.xsl" location="${dita.plugin.org.dita.pdf2.dir}/xsl/common/topicmerge.xsl"/>
-    <pipeline message="topicmerge"
-              inputmap="${dita.temp.dir.fullpath}/${user.input.file}"
-              tempdir="${dita.temp.dir.fullpath}">
+    <pipeline message="topicmerge" inputmap="${dita.temp.dir.fullpath}/${user.input.file}"
+      tempdir="${dita.temp.dir.fullpath}">
       <module class="org.dita.dost.module.TopicMergeModule">
         <param name="output" location="${dita.temp.dir.fullpath}/${dita.map.filename.root}_MERGED.xml"/>
         <param name="style" location="${topicmerge.xsl}"/>
       </module>
     </pipeline>
   </target>
-  
-  <target name="docx.convert">  
+
+  <target name="docx.convert">
     <property name="image.dir" location="${user.input.dir}/.."/>
     <property name="clean.input.file" location="${dita.temp.dir.fullpath}/${dita.map.filename.root}_CLEANED.xml"/>
     <property name="document.flat.xsl" location="${docx.dir}/word/document.flat.xsl"/>
-    <xslt style="${document.flat.xsl}"
-          in="${dita.temp.dir.fullpath}/${dita.map.filename.root}_MERGED.xml"
-          out="${clean.input.file}"
-          force="true">
+    <xslt style="${document.flat.xsl}" in="${dita.temp.dir.fullpath}/${dita.map.filename.root}_MERGED.xml"
+      out="${clean.input.file}" force="true">
       <dita:extension id="dita.conductor.docx.param" behavior="org.dita.dost.platform.InsertAction"/>
       <xmlcatalog refid="dita.catalog"/>
     </xslt>
-    
+
     <makeurl property="dotx.dir.uri" file="${dita.temp.dir}/dotx"/>
-    <makeurl property="user.input.dir.url" file="${user.input.dir}"/>    
+    <makeurl property="user.input.dir.url" file="${user.input.dir}"/>
 
     <property name="core.xsl" location="${docx.dir}/docProps/core.xsl"/>
-    <xslt style="${core.xsl}"
-          in="${clean.input.file}"
-          out="${dita.temp.dir}/docx/docProps/core.xml"
-          force="true">
+    <xslt style="${core.xsl}" in="${clean.input.file}" out="${dita.temp.dir}/docx/docProps/core.xml" force="true">
       <dita:extension id="dita.conductor.docx.param" behavior="org.dita.dost.platform.InsertAction"/>
       <xmlcatalog refid="dita.catalog"/>
     </xslt>
     <property name="custom.xsl" location="${docx.dir}/docProps/custom.xsl"/>
-    <xslt style="${custom.xsl}"
-          in="${clean.input.file}"
-          out="${dita.temp.dir}/docx/docProps/custom.xml"
-          force="true">
+    <xslt style="${custom.xsl}" in="${clean.input.file}" out="${dita.temp.dir}/docx/docProps/custom.xml" force="true">
       <dita:extension id="dita.conductor.docx.param" behavior="org.dita.dost.platform.InsertAction"/>
       <xmlcatalog refid="dita.catalog"/>
     </xslt>
 
     <property name="document.xsl" location="${docx.dir}/word/document.xsl"/>
-    <xslt style="${document.xsl}"
-          in="${clean.input.file}"
-          out="${dita.temp.dir}/docx/word/document.xml"
-          force="true">
+    <xslt style="${document.xsl}" in="${clean.input.file}" out="${dita.temp.dir}/docx/word/document.xml" force="true">
       <param name="image.dir" expression="${image.dir}"/>
       <param name="template.dir" expression="${dotx.dir.uri}"/>
       <param name="input.dir.url" expression="${user.input.dir.url}"/>
       <dita:extension id="dita.conductor.docx.param" behavior="org.dita.dost.platform.InsertAction"/>
       <xmlcatalog refid="dita.catalog"/>
     </xslt>
     <property name="comments.xsl" location="${docx.dir}/word/comments.xsl"/>
-    <xslt style="${comments.xsl}"
-          in="${clean.input.file}"
-          out="${dita.temp.dir}/docx/word/comments.xml"
-          force="true">
+    <xslt style="${comments.xsl}" in="${clean.input.file}" out="${dita.temp.dir}/docx/word/comments.xml" force="true">
       <param name="template.dir" expression="${dotx.dir.uri}"/>
       <dita:extension id="dita.conductor.docx.param" behavior="org.dita.dost.platform.InsertAction"/>
       <xmlcatalog refid="dita.catalog"/>
     </xslt>
     <property name="numbering.xsl" location="${docx.dir}/word/numbering.xsl"/>
-    <xslt style="${numbering.xsl}"
-          in="${clean.input.file}"
-          out="${dita.temp.dir}/docx/word/numbering.xml"
-          force="true">
+    <xslt style="${numbering.xsl}" in="${clean.input.file}" out="${dita.temp.dir}/docx/word/numbering.xml" force="true">
       <param name="template.dir" expression="${dotx.dir.uri}"/>
       <dita:extension id="dita.conductor.docx.param" behavior="org.dita.dost.platform.InsertAction"/>
       <xmlcatalog refid="dita.catalog"/>
     </xslt>
     <property name="footnotes.xsl" location="${docx.dir}/word/footnotes.xsl"/>
-    <xslt style="${footnotes.xsl}"
-          in="${clean.input.file}"
-          out="${dita.temp.dir}/docx/word/footnotes.xml"
-          force="true">
+    <xslt style="${footnotes.xsl}" in="${clean.input.file}" out="${dita.temp.dir}/docx/word/footnotes.xml" force="true">
       <param name="template.dir" expression="${dotx.dir.uri}"/>
       <dita:extension id="dita.conductor.docx.param" behavior="org.dita.dost.platform.InsertAction"/>
       <xmlcatalog refid="dita.catalog"/>
     </xslt>
     <property name="document.xml.xsl" location="${docx.dir}/word/_rels/document.xml.xsl"/>
-    <xslt style="${document.xml.xsl}"
-          in="${clean.input.file}"
-          out="${dita.temp.dir}/docx/word/_rels/document.xml.rels"
-          force="true">
+    <xslt style="${document.xml.xsl}" in="${clean.input.file}" out="${dita.temp.dir}/docx/word/_rels/document.xml.rels"
+      force="true">
       <param name="template.dir" expression="${dotx.dir.uri}"/>
       <dita:extension id="dita.conductor.docx.param" behavior="org.dita.dost.platform.InsertAction"/>
       <xmlcatalog refid="dita.catalog"/>
     </xslt>
     <makeurl property="clean.input.file.uri" file="${clean.input.file}"/>
-    <xslt style="${docx.dir}/[Content_Types].xsl"
-          in="${dita.temp.dir}/dotx/[Content_Types].xml"
-          out="${dita.temp.dir}/docx/[Content_Types].xml"
-          force="true">
+    <xslt style="${docx.dir}/[Content_Types].xsl" in="${dita.temp.dir}/dotx/[Content_Types].xml"
+      out="${dita.temp.dir}/docx/[Content_Types].xml" force="true">
       <param name="input.uri" expression="${clean.input.file.uri}"/>
       <dita:extension id="dita.conductor.docx.param" behavior="org.dita.dost.platform.InsertAction"/>
       <xmlcatalog refid="dita.catalog"/>
     </xslt>
   </target>
-    
+
   <target name="docx.package" depends="docx.package.media">
     <condition property="outputFile.extension" value="docm" else="docx">
-      <matches  string="${dotx.file}" pattern="\.dotm$"/>
+      <matches string="${dotx.file}" pattern="\.dotm$"/>
     </condition>
     <property name="outputFile" location="${dita.map.output.dir}/${dita.map.filename.root}.${outputFile.extension}"/>
     <delete file="${outputFile}"/>
     <zip zipfile="${outputFile}">
       <fileset dir="${dita.temp.dir}/docx"/>
     </zip>
   </target>
-  
+
   <target name="docx.package.media" unless="media.skip">
     <!--copy todir="${dita.temp.dir}/docx/word/media">
       <fileset dir="${user.input.dir}/" includesfile="${dita.temp.dir}/${imagefile}">
@@ -207,5 +182,5 @@
       </fileset>
     </delete>
   </target>
-    
+
 </project>

test/document.mml.xspec

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <x:description xmlns:mml="http://www.w3.org/1998/Math/MathML"
   xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math"
-  xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
-  xmlns:ooxml="com.elovirta.ooxml" xmlns:x="http://www.jenitennison.com/xslt/xspec"
-  stylesheet="document.mml.xsl">
+  xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:ooxml="com.elovirta.ooxml"
+  xmlns:x="http://www.jenitennison.com/xslt/xspec" stylesheet="document.mml.xsl">
   <x:import href="testsuite/test.xspec"/>
   <x:scenario label="3 × input_x">
     <x:context select="*">
@@ -4616,8 +4615,7 @@
       </m:oMath>
     </x:expect>
   </x:scenario>
-  <x:scenario
-    label="C R = O S + w S ref_screen_ratio × X screen Y screen h S 2 × ref_screen_ratio × Z screen + 1">
+  <x:scenario label="C R = O S + w S ref_screen_ratio × X screen Y screen h S 2 × ref_screen_ratio × Z screen + 1">
     <x:context select="*">
       <mml:math>
         <mml:msub>
@@ -7641,8 +7639,7 @@
       </m:oMath>
     </x:expect>
   </x:scenario>
-  <x:scenario
-    label="N j , k = 1 n × exp ⁡ i × π × k + 1 2 × j - 2 × n + 1 2 n , 0 ≤ k &lt; n 0 ≤ j &lt; 2 × n">
+  <x:scenario label="N j , k = 1 n × exp ⁡ i × π × k + 1 2 × j - 2 × n + 1 2 n , 0 ≤ k &lt; n 0 ≤ j &lt; 2 × n">
     <x:context select="*">
       <mml:math>
         <mml:msub>
@@ -10117,8 +10114,7 @@
       </m:oMath>
     </x:expect>
   </x:scenario>
-  <x:scenario
-    label="panner_gain_Y mdu = pan_Y panner_target_Y panner_target_Z object_position_Y mdu">
+  <x:scenario label="panner_gain_Y mdu = pan_Y panner_target_Y panner_target_Z object_position_Y mdu">
     <x:context select="*">
       <mml:math>
         <mml:mi>panner_gain_Y</mml:mi>
@@ -10244,8 +10240,7 @@
       </m:oMath>
     </x:expect>
   </x:scenario>
-  <x:scenario
-    label="panner_gain_X mdu = pan_X panner_target_X panner_target_Y panner_target_Z object_position_X mdu">
+  <x:scenario label="panner_gain_X mdu = pan_X panner_target_X panner_target_Y panner_target_Z object_position_X mdu">
     <x:context select="*">
       <mml:math>
         <mml:mi>panner_gain_X</mml:mi>
@@ -11369,8 +11364,7 @@
       </m:oMath>
     </x:expect>
   </x:scenario>
-  <x:scenario
-    label="panner_gain_X s x = pan_X panner_target_X panner_target_Y panner_target_Z vsource_X s x">
+  <x:scenario label="panner_gain_X s x = pan_X panner_target_X panner_target_Y panner_target_Z vsource_X s x">
     <x:context select="*">
       <mml:math>
         <mml:mi>panner_gain_X</mml:mi>
@@ -12766,8 +12760,7 @@
       </m:oMath>
     </x:expect>
   </x:scenario>
-  <x:scenario
-    label="weight_X s x mdu = weight vsource_X s x object_position_X mdu object_size_X_lb mdu">
+  <x:scenario label="weight_X s x mdu = weight vsource_X s x object_position_X mdu object_size_X_lb mdu">
     <x:context select="*">
       <mml:math>
         <mml:mi>weight_X</mml:mi>
@@ -13012,8 +13005,7 @@
       </m:oMath>
     </x:expect>
   </x:scenario>
-  <x:scenario
-    label="weight_Y s y mdu = weight vsource_Y s y object_position_Y mdu object_size_Y_lb mdu">
+  <x:scenario label="weight_Y s y mdu = weight vsource_Y s y object_position_Y mdu object_size_Y_lb mdu">
     <x:context select="*">
       <mml:math>
         <mml:mi>weight_Y</mml:mi>
@@ -13258,8 +13250,7 @@
       </m:oMath>
     </x:expect>
   </x:scenario>
-  <x:scenario
-    label="weight_Z s z mdu = weight vsource_Z s z max flr object_position_Z mdu object_size_Z_lb mdu">
+  <x:scenario label="weight_Z s z mdu = weight vsource_Z s z max flr object_position_Z mdu object_size_Z_lb mdu">
     <x:context select="*">
       <mml:math>
         <mml:mi>weight_Z</mml:mi>

test/testsuite/test.xspec

@@ -1331,7 +1331,7 @@
       </m:oMath>
     </x:expect>
   </x:scenario>
-  <x:scenario label="mfencedAdelims6">
+  <x:scenario label="mfencedAdelims6" pending="Disabled because XSpec implementation fails on close curly brace">
     <x:context href="Presentation/GeneralLayout/mfenced/mfencedAdelims6.mml" select="*"/>
     <x:expect label="" select="*">
       <m:oMath>