diff --git a/build.xml b/build.xml index 9309d0071de94426a14582dfd948a67bf74d3eb2..93ae9068183029f1c9577dc76bde015ec5ad6b30 100644 --- a/build.xml +++ b/build.xml @@ -1425,8 +1425,8 @@ ignoreSetupDownloadErrors=true dest="${stylesheet.dir}/X3dToX3dvClassicVrmlEncoding.xslt" verbose="true" ignoreerrors="${ignoreSetupDownloadErrors}"/> <get src="${x3d.sourceforge.site}/x3d/stylesheets/X3dExtrusionCrossSectionToSvg.xslt" dest="${stylesheet.dir}/X3dExtrusionCrossSectionToSvg.xslt" verbose="true" ignoreerrors="${ignoreSetupDownloadErrors}"/> - <get src="${x3d.sourceforge.site}/x3d/stylesheets/X3dToX3dom.xslt" - dest="${stylesheet.dir}/X3dToX3dom.xslt" verbose="true" ignoreerrors="${ignoreSetupDownloadErrors}"/> + <get src="${x3d.sourceforge.site}/x3d/stylesheets/X3dToX3domX_ITE.xslt" + dest="${stylesheet.dir}/X3dToX3domX_ITE.xslt" verbose="true" ignoreerrors="${ignoreSetupDownloadErrors}"/> <mkdir dir="${c14n.dir}"/> <get src="${x3d.sourceforge.site}/x3d/tools/canonical/dist/lib/${c14n.jar}" @@ -1676,25 +1676,25 @@ ignoreSetupDownloadErrors=true <arg value="-o:HelloWorld.html"/> <arg value="-xsl:${stylesheet.dir}/X3dToXhtml.xslt"/> </java> - <echo message="Convert HelloWorld.x3d to HelloWorldX_ITE.html using X3dToX3dom.xslt stylesheet"/> + <echo message="Convert HelloWorld.x3d to HelloWorldX_ITE.html using X3dToX3domX_ITE.xslt stylesheet"/> <java classname="net.sf.saxon.Transform" classpath="${saxon.classpath}" fork="${fork}"> <arg value="-warnings:recover"/> <!-- recover after writing a warning message --> <!-- <arg value="-t"/> saxon version and timing information --> <arg value="-s:HelloWorld.x3d"/> <arg value="-o:HelloWorldX_ITE.html"/> - <arg value="-xsl:${stylesheet.dir}/X3dToX3dom.xslt"/> + <arg value="-xsl:${stylesheet.dir}/X3dToX3domX_ITE.xslt"/> <arg value="player=X_ITE"/> <arg value="suffix=X_ITE"/> <arg value="urlScene=HelloWorld.x3d"/> <arg value="extension=html"/> </java> - <echo message="Convert HelloWorld.x3d to HelloWorldX3dom.xhtml using X3dToX3dom.xslt stylesheet"/> + <echo message="Convert HelloWorld.x3d to HelloWorldX3dom.xhtml using X3dToX3domX_ITE.xslt stylesheet"/> <java classname="net.sf.saxon.Transform" classpath="${saxon.classpath}" fork="${fork}"> <arg value="-warnings:recover"/> <!-- recover after writing a warning message --> <!-- <arg value="-t"/> saxon version and timing information --> <arg value="-s:HelloWorld.x3d"/> <arg value="-o:HelloWorldX3dom.xhtml"/> - <arg value="-xsl:${stylesheet.dir}/X3dToX3dom.xslt"/> + <arg value="-xsl:${stylesheet.dir}/X3dToX3domX_ITE.xslt"/> </java> <echo message="Convert HelloWorld.x3d to HelloWorld.wrl using X3dToVrml97.xslt stylesheet"/> <java classname="net.sf.saxon.Transform" classpath="${saxon.classpath}" fork="${fork}"> @@ -1861,25 +1861,25 @@ ignoreSetupDownloadErrors=true <arg value="-o:newScene.html"/> <arg value="-xsl:${stylesheet.dir}/X3dToXhtml.xslt"/> </java> - <echo message="Convert newScene.x3d to newSceneX_ITE.html using X3dToX3dom.xslt stylesheet in X_ITE mode"/> + <echo message="Convert newScene.x3d to newSceneX_ITE.html using X3dToX3domX_ITE.xslt stylesheet in X_ITE mode"/> <java classname="net.sf.saxon.Transform" classpath="${saxon.classpath}" fork="${fork}"> <arg value="-warnings:recover"/> <!-- recover after writing a warning message --> <!-- <arg value="-t"/> saxon version and timing information --> <arg value="-s:newScene.x3d"/> <arg value="-o:newSceneX_ITE.html"/> - <arg value="-xsl:${stylesheet.dir}/X3dToX3dom.xslt"/> + <arg value="-xsl:${stylesheet.dir}/X3dToX3domX_ITE.xslt"/> <arg value="player=X_ITE"/> <arg value="suffix=X_ITE"/> <arg value="urlScene=newScene.x3d"/> <arg value="extension=html"/> </java> - <echo message="Convert newScene.x3d to newSceneX3dom.xhtml using X3dToX3dom.xslt stylesheet in default mode"/> + <echo message="Convert newScene.x3d to newSceneX3dom.xhtml using X3dToX3domX_ITE.xslt stylesheet in default mode"/> <java classname="net.sf.saxon.Transform" classpath="${saxon.classpath}" fork="${fork}"> <arg value="-warnings:recover"/> <!-- recover after writing a warning message --> <!-- <arg value="-t"/> saxon version and timing information --> <arg value="-s:newScene.x3d"/> <arg value="-o:newSceneX3dom.xhtml"/> - <arg value="-xsl:${stylesheet.dir}/X3dToX3dom.xslt"/> + <arg value="-xsl:${stylesheet.dir}/X3dToX3domX_ITE.xslt"/> </java> <echo message="Convert newScene.x3d to newScene.wrl using X3dToVrml97.xslt regular stylesheet"/> <java classname="net.sf.saxon.Transform" classpath="${saxon.classpath}" fork="${fork}"> @@ -2481,11 +2481,11 @@ ignoreSetupDownloadErrors=true <mapper dir="." type="glob" from="*.x3d" to="*X3dom.xhtml"/> <sequential> <!-- process individual files here. show full path to facilitate user loading, editing of reported files --> - <echo>${archive.path}/${relative.path1}/${relative.path2}/${name.short}.x3d processing with X3dToX3dom stylesheet:</echo> + <echo>${archive.path}/${relative.path1}/${relative.path2}/${name.short}.x3d processing with X3dToX3domX_ITE stylesheet:</echo> <echo>${archive.path}/${relative.path1}/${relative.path2}/${name.short}X3dom.xhtml</echo> <!-- Saxon11 is locally defined macro --> <Saxon11 scene="${relative.path1}/${relative.path2}/${name.short}" - stylesheet="${stylesheet.dir}/X3dToX3dom" + stylesheet="${stylesheet.dir}/X3dToX3domX_ITE" parameterPair1="player=X3DOM" suffix="X3dom" extension="xhtml" @@ -2544,10 +2544,10 @@ ignoreSetupDownloadErrors=true <mapper dir="." type="glob" from="*.x3d" to="*X_ITE.html"/> <sequential> <!-- process individual files here. show full path to facilitate user loading, editing of reported files --> - <echo>${archive.path}/${relative.path1}/${relative.path2}/${name.short}.x3d processing with X3dToX3dom(X_ITE) stylesheet: ${name.short}X_ITE.html</echo> + <echo>${archive.path}/${relative.path1}/${relative.path2}/${name.short}.x3d processing with X3dToX3domX_ITE stylesheet: ${name.short}X_ITE.html</echo> <!-- Saxon11 is locally defined macro --> <Saxon11 scene="${relative.path1}/${relative.path2}/${name.short}" - stylesheet="${stylesheet.dir}/X3dToX3dom" + stylesheet="${stylesheet.dir}/X3dToX3domX_ITE" parameterPair1="player=X_ITE" parameterPair2="urlScene=${name.short}.x3d" suffix="X_ITE"