Menu
▾
▴
x3d-commits
|
From: <bru...@us...> - 2011-10-01 15:27:00
|
Revision: 9467
http://x3d.svn.sourceforge.net/x3d/?rev=9467&view=rev
Author: brutzman
Date: 2011-10-01 15:26:54 +0000 (Sat, 01 Oct 2011)
Log Message:
-----------
improved presentation of key, line breaks for first lines
Modified Paths:
--------------
www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
Modified: www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
===================================================================
--- www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2011-10-01 05:22:16 UTC (rev 9466)
+++ www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2011-10-01 15:26:54 UTC (rev 9467)
@@ -78,6 +78,8 @@
<!-- <xsl:with-param name="list" select="."/> -->
</xsl:call-template>
+ <!-- line break after XML header line -->
+ <xsl:text> </xsl:text>
<xsl:text disable-output-escaping="yes"><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
]]></xsl:text>
<!-- <html xmlns="http://www.w3.org/1999/xhtml">
@@ -89,6 +91,7 @@
<xsl:text>Generated using XSLT processor: </xsl:text>
<xsl:value-of select="system-property('xsl:vendor')"/>
</xsl:comment>
+ <xsl:text> </xsl:text>
<html>
<head>
<title>
@@ -178,12 +181,17 @@
</div>
<!-- build color key as XML comment -->
- <p>
- <xsl:text> <!-- Tag color codes (X3D, XML terminology): </xsl:text>
+ <p style="text-align:center; background-color:lightgrey">
+ <xsl:text> </xsl:text>
+ <span style="color:lightgrey"><!--</span>
+ <xsl:text> </xsl:text>
+ <xsl:text>Tag color codes (using both X3D and XML terminology): </xsl:text>
+ <xsl:text disable-output-escaping="yes">&#160;&#160;&#160;</xsl:text> <!-- -->
+ <xsl:text> </xsl:text>
<xsl:text><</xsl:text>
<span class="element">
- <xsl:text>Node</xsl:text>
+ <xsl:text>X3dNode</xsl:text>
</span>
<xsl:if test="//*[@DEF]">
<span class="idName">
@@ -204,10 +212,14 @@
<xsl:text>value</xsl:text>
</span>
<xsl:text>'/> </xsl:text>
+ <xsl:text> </xsl:text>
+
+ <xsl:text> matches </xsl:text>
+ <xsl:text> </xsl:text>
<xsl:text><</xsl:text>
<span class="element">
- <xsl:text>Element</xsl:text>
+ <xsl:text>XmlElement</xsl:text>
</span>
<xsl:if test="//*[@DEF]">
<span class="idName">
@@ -262,7 +274,9 @@
</span>
<xsl:text>></xsl:text>
</xsl:if>
- <xsl:text> --> </xsl:text>
+ <xsl:text> </xsl:text>
+ <span style="color:lightgrey"> --></span>
+ <xsl:text> </xsl:text>
</p>
</body>
<!-- </xsl:element> </html> -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2011-10-01 17:25:47
|
Revision: 9474
http://x3d.svn.sourceforge.net/x3d/?rev=9474&view=rev
Author: brutzman
Date: 2011-10-01 17:25:40 +0000 (Sat, 01 Oct 2011)
Log Message:
-----------
color key output, better internal indication of XSLT generators
Modified Paths:
--------------
www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
Modified: www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
===================================================================
--- www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2011-10-01 17:05:33 UTC (rev 9473)
+++ www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2011-10-01 17:25:40 UTC (rev 9474)
@@ -86,12 +86,6 @@
<xsl:element name="html">
<xsl:attribute name="xmlns">http://www.w3.org/1999/xhtml</xsl:attribute>
-->
- <xsl:comment>
- <!-- insert informative comment regarding what XSLT engine was used to generate the results -->
- <xsl:text>Generated using XSLT processor: </xsl:text>
- <xsl:value-of select="system-property('xsl:vendor')"/>
- </xsl:comment>
- <xsl:text> </xsl:text>
<html>
<head>
<title>
@@ -126,6 +120,8 @@
b.warning {color: #CC5500}
b.error {color: #CC0000}]]>
</style>
+
+ <meta name="generator" content="XSLT processor {system-property('xsl:vendor')}"/>
<meta name="generator" content="http://www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt"/>
<meta name="generator" content="http://x3d.svn.sourceforge.net/viewvc/*checkout*/x3d/www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt"/>
<link rel="shortcut icon" href="http://www.web3d.org/x3d/content/icons/X3DtextIcon16.png" title="X3D" />
@@ -185,8 +181,8 @@
<xsl:text> </xsl:text>
<span style="color:lightgrey"><!--</span>
<xsl:text> </xsl:text>
- <xsl:text>Tag color codes (using both X3D and XML terminology): </xsl:text>
- <xsl:text disable-output-escaping="yes">&#160;&#160;&#160;</xsl:text> <!-- -->
+ <xsl:text>Color key: </xsl:text>
+ <xsl:comment>(matching X3D and XML terminology) </xsl:comment>
<xsl:text> </xsl:text>
<xsl:text><</xsl:text>
@@ -240,9 +236,10 @@
<xsl:text>value</xsl:text>
</span>
<xsl:text>'/> </xsl:text>
-
- <!-- ends node, begin Prototype -->
+
+ <!-- done with node key, begin Prototype key -->
<xsl:if test="//*[contains(local-name(),'Proto')]">
+ <xsl:text disable-output-escaping="yes">&#160;&#160;&#160;</xsl:text> <!-- -->
<xsl:text> <</xsl:text>
<span class="prototype">
<xsl:text>Prototype</xsl:text>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
![http://www.web3d.org/x3d/content/icons/X3DtextIcon16.png"](http://www.web3d.org/x3d/content/icons/X3DtextIcon16.png"){kind=link}
|
From: <bru...@us...> - 2012-01-12 04:09:52
|
Revision: 10185
http://x3d.svn.sourceforge.net/x3d/?rev=10185&view=rev
Author: brutzman
Date: 2012-01-12 04:09:45 +0000 (Thu, 12 Jan 2012)
Log Message:
-----------
handle https, sftp, ./ as linkable urls
Modified Paths:
--------------
www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
Modified: www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
===================================================================
--- www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-01-11 20:57:26 UTC (rev 10184)
+++ www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-01-12 04:09:45 UTC (rev 10185)
@@ -1456,7 +1456,7 @@
((local-name(..)='meta' and local-name()='content' and (../@name='identifier' or ../@name='url' or ../@name='license' or ../@name='example' or ../@name='title' or ../@name='reference' or ../@name='requires' or ../@name='drawing' or ../@name='image' or ../@name='map' or ../@name='chart' or ../@name='movie' or ../@name='MovingImage' or ../@name='photo' or ../@name='photograph' or ../@name='diagram' or ../@name='javadoc' or contains(../@name,'permission'))) and not(contains(normalize-space(.),' '))) or
((local-name(..)='field' or local-name(..)='fieldValue') and (contains(../@name, 'Url') or contains(../@name, 'url')) and (local-name() = 'value')) or
((local-name(..)='field' or local-name(..)='ProtoDeclare' or local-name(..)='ExternProtoDeclare') and (local-name()='documentation')) or
- (contains(.,'http://') or contains(.,'https://'))">
+ (contains(.,'http://') or contains(.,'https://') or contains(.,'sftp://') or contains(.,'mailto:') or contains(.,'./'))">
<!-- (starts-with(normalize-space(.),'http://') or starts-with(normalize-space(.),'https://'))"> -->
<!-- <xsl:if test="local-name(..)='Script'">
<xsl:message> <xsl:text>... found Script parent, attribute </xsl:text>
@@ -1499,6 +1499,54 @@
<xsl:with-param name="insertBreaks"><xsl:text>false</xsl:text></xsl:with-param>
</xsl:call-template>
</xsl:when>
+ <xsl:when test="contains(.,'sftp://')">
+ <xsl:text> </xsl:text>
+ <xsl:value-of select="substring-before(.,'sftp://')"/>
+ <xsl:call-template name="URL-ize-MFString-elements">
+ <xsl:with-param name="list" select="normalize-space(substring-after(.,substring-before(.,'sftp://')))"/>
+ <xsl:with-param name="urlsOnly"><xsl:text>true</xsl:text></xsl:with-param>
+ <xsl:with-param name="insertBreaks"><xsl:text>false</xsl:text></xsl:with-param>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:when test="contains(.,'mailto:')">
+ <xsl:text> </xsl:text>
+ <xsl:value-of select="substring-before(.,'mailto:')"/>
+ <xsl:call-template name="URL-ize-MFString-elements">
+ <xsl:with-param name="list" select="substring-after(.,substring-before(.,'mailto:'))"/>
+ <xsl:with-param name="urlsOnly"><xsl:text>true</xsl:text></xsl:with-param>
+ <xsl:with-param name="insertBreaks"><xsl:text>false</xsl:text></xsl:with-param>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:when test="contains(.,'../')">
+ <xsl:text> </xsl:text>
+ <xsl:value-of select="substring-before(.,'../')"/>
+ <xsl:element name="a">
+ <xsl:attribute name="href">
+ <xsl:value-of select="substring-after(.,substring-before(.,'../'))"/>
+ </xsl:attribute>
+ <!-- for meta links, staying in frame (rather than external target) works better for multiframe archive collections
+ <xsl:attribute name="target">
+ <xsl:text>_blank</xsl:text>
+ </xsl:attribute>
+ -->
+ <xsl:value-of select="substring-after(.,substring-before(.,'../'))"/>
+ </xsl:element>
+ </xsl:when>
+ <xsl:when test="contains(.,'./')">
+ <xsl:text> </xsl:text>
+ <xsl:value-of select="substring-before(.,'./')"/>
+ <xsl:element name="a">
+ <xsl:attribute name="href">
+ <xsl:value-of select="substring-after(.,substring-before(.,'./'))"/>
+ </xsl:attribute>
+ <!-- for meta links, staying in frame (rather than external target) works better for multiframe archive collections
+ <xsl:attribute name="target">
+ <xsl:text>_blank</xsl:text>
+ </xsl:attribute>
+ -->
+ <xsl:value-of select="substring-after(.,substring-before(.,'./'))"/>
+ </xsl:element>
+ </xsl:when>
<xsl:otherwise>
<xsl:element name="a">
<xsl:attribute name="href">
@@ -1809,33 +1857,35 @@
<xsl:variable name="restURLs" select="substring-after($wlist,' ')"/>
<!-- debug: <xsl:text> $restURLs=[</xsl:text><xsl:value-of select="$restURLs" disable-output-escaping="yes"/><xsl:text>] </xsl:text> -->
<xsl:choose>
- <xsl:when test="($urlsOnly='true') and not(contains($nextURL,'http://')) and not(contains($nextURL,'ftp://'))">
+ <xsl:when test="($urlsOnly='true') and not(contains($nextURL,'http://')) and not(contains($nextURL,'https://'))
+ and not(contains($nextURL,'sftp://')) and not(contains($nextURL,'mailto:'))
+ and not(contains($nextURL,'./'))">
<!-- merely output text -->
<xsl:value-of disable-output-escaping="yes" select="$nextURL"/>
<xsl:text> </xsl:text>
</xsl:when>
- <!-- handle ftp:// but only if it precedes http:// -->
- <xsl:when test="($urlsOnly='true') and (contains($nextURL,'ftp://')) and not(contains(substring-before($nextURL,'ftp://'),'http://'))">
- <!-- ftp:// found next -->
- <xsl:value-of disable-output-escaping="yes" select="substring-before($nextURL,'ftp://')"/>
+ <!-- handle sftp:// but only if it precedes http:// -->
+ <xsl:when test="($urlsOnly='true') and (contains($nextURL,'sftp://')) and not(contains(substring-before($nextURL,'sftp://'),'http://'))">
+ <!-- sftp:// found next -->
+ <xsl:value-of disable-output-escaping="yes" select="substring-before($nextURL,'sftp://')"/>
<xsl:if test="$insertBreaks='true'">
<xsl:text disable-output-escaping="yes"><br /></xsl:text>
</xsl:if>
<xsl:element name="a">
<xsl:attribute name="href">
- <xsl:text>ftp://</xsl:text>
- <xsl:value-of select="normalize-space(substring-after($nextURL,'ftp://'))"/>
+ <xsl:text>sftp://</xsl:text>
+ <xsl:value-of select="normalize-space(substring-after($nextURL,'sftp://'))"/>
</xsl:attribute>
- <xsl:text>ftp://</xsl:text>
- <xsl:value-of select="normalize-space(substring-after($nextURL,'ftp://'))"/>
+ <xsl:text>sftp://</xsl:text>
+ <xsl:value-of select="normalize-space(substring-after($nextURL,'sftp://'))"/>
</xsl:element>
<xsl:text> </xsl:text>
- <xsl:if test="($insertBreaks='true') and not(starts-with(normalize-space($restURLs),'ftp://')) and not(starts-with(normalize-space($restURLs),'http://'))">
+ <xsl:if test="($insertBreaks='true') and not(starts-with(normalize-space($restURLs),'sftp://')) and not(starts-with(normalize-space($restURLs),'http://'))">
<xsl:text disable-output-escaping="yes"><br /></xsl:text>
</xsl:if>
</xsl:when>
- <!-- handle http:// but only if it precedes ftp:// -->
- <xsl:when test="($urlsOnly='true')">
+ <!-- handle http:// -->
+ <xsl:when test="($urlsOnly='true') and (contains($nextURL,'http://'))">
<!-- http:// found next -->
<xsl:value-of disable-output-escaping="yes" select="substring-before($nextURL,'http://')"/>
<xsl:if test="$insertBreaks='true'">
@@ -1850,10 +1900,30 @@
<xsl:value-of select="normalize-space(substring-after($nextURL,'http://'))"/>
</xsl:element>
<xsl:text> </xsl:text>
- <xsl:if test="($insertBreaks='true') and not(starts-with(normalize-space($restURLs),'ftp://')) and not(starts-with(normalize-space($restURLs),'http://'))">
+ <xsl:if test="($insertBreaks='true') and not(starts-with(normalize-space($restURLs),'sftp://')) and not(starts-with(normalize-space($restURLs),'http://'))">
<xsl:text disable-output-escaping="yes"><br /></xsl:text>
</xsl:if>
</xsl:when>
+ <!-- handle https:// -->
+ <xsl:when test="($urlsOnly='true') and (contains($nextURL,'https://'))">
+ <!-- https:// found next -->
+ <xsl:value-of disable-output-escaping="yes" select="substring-before($nextURL,'https://')"/>
+ <xsl:if test="$insertBreaks='true'">
+ <xsl:text disable-output-escaping="yes"><br /></xsl:text>
+ </xsl:if>
+ <xsl:element name="a">
+ <xsl:attribute name="href">
+ <xsl:text>https://</xsl:text>
+ <xsl:value-of select="normalize-space(substring-after($nextURL,'https://'))"/>
+ </xsl:attribute>
+ <xsl:text>https://</xsl:text>
+ <xsl:value-of select="normalize-space(substring-after($nextURL,'https://'))"/>
+ </xsl:element>
+ <xsl:text> </xsl:text>
+ <xsl:if test="($insertBreaks='true') and not(starts-with(normalize-space($restURLs),'sftp://')) and not(starts-with(normalize-space($restURLs),'http://'))">
+ <xsl:text disable-output-escaping="yes"><br /></xsl:text>
+ </xsl:if>
+ </xsl:when>
<xsl:otherwise> <!-- ($urlsOnly='false') -->
<!-- output URL-ized nextURL -->
<xsl:text>"</xsl:text>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2012-02-06 03:14:12
|
Revision: 10358
http://x3d.svn.sourceforge.net/x3d/?rev=10358&view=rev
Author: brutzman
Date: 2012-02-06 03:14:06 +0000 (Mon, 06 Feb 2012)
Log Message:
-----------
linkify any path
Modified Paths:
--------------
www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
Modified: www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
===================================================================
--- www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-02-06 03:09:21 UTC (rev 10357)
+++ www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-02-06 03:14:06 UTC (rev 10358)
@@ -1456,7 +1456,7 @@
((local-name(..)='meta' and local-name()='content' and (../@name='identifier' or ../@name='url' or ../@name='license' or ../@name='example' or ../@name='title' or ../@name='reference' or ../@name='requires' or ../@name='drawing' or ../@name='image' or ../@name='map' or ../@name='chart' or ../@name='movie' or ../@name='MovingImage' or ../@name='photo' or ../@name='photograph' or ../@name='diagram' or ../@name='javadoc' or contains(../@name,'permission'))) and not(contains(normalize-space(.),' '))) or
((local-name(..)='field' or local-name(..)='fieldValue') and (contains(../@name, 'Url') or contains(../@name, 'url')) and (local-name() = 'value')) or
((local-name(..)='field' or local-name(..)='ProtoDeclare' or local-name(..)='ExternProtoDeclare') and (local-name()='documentation')) or
- (contains(.,'http://') or contains(.,'https://') or contains(.,'sftp://') or contains(.,'mailto:') or contains(.,'./'))">
+ (contains(.,'http://') or contains(.,'https://') or contains(.,'sftp://') or contains(.,'mailto:') or contains(.,'./') or contains(.,'/'))">
<!-- (starts-with(normalize-space(.),'http://') or starts-with(normalize-space(.),'https://'))"> -->
<!-- <xsl:if test="local-name(..)='Script'">
<xsl:message> <xsl:text>... found Script parent, attribute </xsl:text>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2012-04-17 06:34:02
|
Revision: 10825
http://x3d.svn.sourceforge.net/x3d/?rev=10825&view=rev
Author: brutzman
Date: 2012-04-17 06:33:51 +0000 (Tue, 17 Apr 2012)
Log Message:
-----------
do not url-ize meta content starting with * character (used for default values)
Modified Paths:
--------------
www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
Modified: www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
===================================================================
--- www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-04-17 04:30:35 UTC (rev 10824)
+++ www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-04-17 06:33:51 UTC (rev 10825)
@@ -19,7 +19,7 @@
<!-- xmlns:saxon="http://icl.com/saxon" saxon:trace="true" -->
<!--
-Copyright (c) 1995-2010 held by the author(s). All rights reserved.
+Copyright (c) 1995-2012 held by the author(s). All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
@@ -58,6 +58,8 @@
xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
xmlns:saxon="http://icl.com/saxon" saxon:trace="no">
<xsl:import href="X3dExtrusionToSvgViaXslt1.1.xslt"/>
+ <!-- if provided, $baseURL should end with / -->
+ <xsl:param name="baseURL"><xsl:text></xsl:text></xsl:param>
<xsl:param name="linkImages"><xsl:text>false</xsl:text></xsl:param>
<xsl:strip-space elements="*"/>
@@ -1453,7 +1455,7 @@
</xsl:when>
<!-- tokenize and make single/multiple url references into actual <a href=""> links -->
<xsl:when test=" (local-name()='url' or contains(local-name(), 'Url')) or
- ((local-name(..)='meta' and local-name()='content' and (../@name='identifier' or ../@name='url' or ../@name='license' or ../@name='example' or ../@name='title' or ../@name='reference' or ../@name='requires' or ../@name='drawing' or ../@name='image' or ../@name='Image' or ../@name='map' or ../@name='chart' or ../@name='movie' or ../@name='MovingImage' or ../@name='photo' or ../@name='photograph' or ../@name='diagram' or ../@name='javadoc' or contains(../@name,'permission'))) and not(contains(normalize-space(.),' '))) or
+ ((local-name(..)='meta' and local-name()='content' and (../@name='identifier' or ../@name='url' or ../@name='license' or ../@name='example' or ../@name='title' or ../@name='reference' or ../@name='requires' or ../@name='drawing' or ../@name='image' or ../@name='Image' or ../@name='map' or ../@name='chart' or ../@name='movie' or ../@name='MovingImage' or ../@name='photo' or ../@name='photograph' or ../@name='diagram' or ../@name='javadoc' or contains(../@name,'permission'))) and not(contains(normalize-space(.),' ')) and not(starts-with(normalize-space(.),'*'))) or
((local-name(..)='field' or local-name(..)='fieldValue') and (contains(../@name, 'Url') or contains(../@name, 'url')) and (local-name() = 'value')) or
((local-name(..)='field' or local-name(..)='ProtoDeclare' or local-name(..)='ExternProtoDeclare') and (local-name()='documentation')) or
(contains(.,'http://') or contains(.,'https://') or contains(.,'sftp://') or contains(.,'mailto:') or contains(.,'./') or contains(.,'/'))">
@@ -1860,9 +1862,33 @@
<xsl:when test="($urlsOnly='true') and not(contains($nextURL,'http://')) and not(contains($nextURL,'https://'))
and not(contains($nextURL,'sftp://')) and not(contains($nextURL,'mailto:'))
and not(contains($nextURL,'./'))">
- <!-- merely output text -->
- <xsl:value-of disable-output-escaping="yes" select="$nextURL"/>
- <xsl:text> </xsl:text>
+ <!-- if baseURL provided then insert it into link, otherwise merely output text -->
+ <xsl:choose>
+ <xsl:when test="string-length($baseURL) > 0">
+
+ <xsl:text> </xsl:text>
+ <xsl:if test="$insertBreaks='true'">
+ <xsl:text disable-output-escaping="yes"><br /></xsl:text>
+ </xsl:if>
+ <xsl:element name="a">
+ <xsl:attribute name="href">
+ <xsl:value-of disable-output-escaping="yes" select="$baseURL"/>
+ <!-- $baseURL should end with / -->
+ <xsl:value-of disable-output-escaping="yes" select="$nextURL"/>
+ </xsl:attribute>
+ <xsl:text>http://</xsl:text>
+ <xsl:value-of select="normalize-space(substring-after($nextURL,'http://'))"/>
+ </xsl:element>
+ <xsl:text> </xsl:text>
+ <xsl:if test="($insertBreaks='true') and not(starts-with(normalize-space($restURLs),'sftp://')) and not(starts-with(normalize-space($restURLs),'http://'))">
+ <xsl:text disable-output-escaping="yes"><br /></xsl:text>
+ </xsl:if>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of disable-output-escaping="yes" select="$nextURL"/>
+ <xsl:text> </xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:when>
<!-- handle sftp:// but only if it precedes http:// -->
<xsl:when test="($urlsOnly='true') and (contains($nextURL,'sftp://')) and not(contains(substring-before($nextURL,'sftp://'),'http://'))">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2012-04-17 07:13:59
|
Revision: 10826
http://x3d.svn.sourceforge.net/x3d/?rev=10826&view=rev
Author: brutzman
Date: 2012-04-17 07:13:48 +0000 (Tue, 17 Apr 2012)
Log Message:
-----------
do not url-ize default values
Modified Paths:
--------------
www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
Modified: www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
===================================================================
--- www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-04-17 06:33:51 UTC (rev 10825)
+++ www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-04-17 07:13:48 UTC (rev 10826)
@@ -1455,7 +1455,7 @@
</xsl:when>
<!-- tokenize and make single/multiple url references into actual <a href=""> links -->
<xsl:when test=" (local-name()='url' or contains(local-name(), 'Url')) or
- ((local-name(..)='meta' and local-name()='content' and (../@name='identifier' or ../@name='url' or ../@name='license' or ../@name='example' or ../@name='title' or ../@name='reference' or ../@name='requires' or ../@name='drawing' or ../@name='image' or ../@name='Image' or ../@name='map' or ../@name='chart' or ../@name='movie' or ../@name='MovingImage' or ../@name='photo' or ../@name='photograph' or ../@name='diagram' or ../@name='javadoc' or contains(../@name,'permission'))) and not(contains(normalize-space(.),' ')) and not(starts-with(normalize-space(.),'*'))) or
+ ((local-name(..)='meta' and local-name()='content' and (../@name='identifier' or ../@name='url' or ../@name='license' or ../@name='example' or ../@name='title' or ../@name='reference' or ../@name='requires' or ../@name='drawing' or ../@name='image' or ../@name='Image' or ../@name='map' or ../@name='chart' or ../@name='movie' or ../@name='MovingImage' or ../@name='photo' or ../@name='photograph' or ../@name='diagram' or ../@name='javadoc' or contains(../@name,'permission')) and not(contains(normalize-space(.),' ')))) or
((local-name(..)='field' or local-name(..)='fieldValue') and (contains(../@name, 'Url') or contains(../@name, 'url')) and (local-name() = 'value')) or
((local-name(..)='field' or local-name(..)='ProtoDeclare' or local-name(..)='ExternProtoDeclare') and (local-name()='documentation')) or
(contains(.,'http://') or contains(.,'https://') or contains(.,'sftp://') or contains(.,'mailto:') or contains(.,'./') or contains(.,'/'))">
@@ -1469,6 +1469,13 @@
</xsl:if>
-->
<xsl:choose>
+ <xsl:when test="starts-with(normalize-space(.),'*')">
+ <!-- *default example values* -->
+ <xsl:text> </xsl:text>
+ <span class="value">
+ <xsl:value-of select="."/>
+ </span>
+ </xsl:when>
<xsl:when test="starts-with(normalize-space(.),'ecmascript') or starts-with(normalize-space(.),'javascript')">
<xsl:text> </xsl:text>
<xsl:element name="pre">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2012-04-17 07:24:12
|
Revision: 10827
http://x3d.svn.sourceforge.net/x3d/?rev=10827&view=rev
Author: brutzman
Date: 2012-04-17 07:24:01 +0000 (Tue, 17 Apr 2012)
Log Message:
-----------
handle ftp://
Modified Paths:
--------------
www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
Modified: www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
===================================================================
--- www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-04-17 07:13:48 UTC (rev 10826)
+++ www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-04-17 07:24:01 UTC (rev 10827)
@@ -1458,7 +1458,7 @@
((local-name(..)='meta' and local-name()='content' and (../@name='identifier' or ../@name='url' or ../@name='license' or ../@name='example' or ../@name='title' or ../@name='reference' or ../@name='requires' or ../@name='drawing' or ../@name='image' or ../@name='Image' or ../@name='map' or ../@name='chart' or ../@name='movie' or ../@name='MovingImage' or ../@name='photo' or ../@name='photograph' or ../@name='diagram' or ../@name='javadoc' or contains(../@name,'permission')) and not(contains(normalize-space(.),' ')))) or
((local-name(..)='field' or local-name(..)='fieldValue') and (contains(../@name, 'Url') or contains(../@name, 'url')) and (local-name() = 'value')) or
((local-name(..)='field' or local-name(..)='ProtoDeclare' or local-name(..)='ExternProtoDeclare') and (local-name()='documentation')) or
- (contains(.,'http://') or contains(.,'https://') or contains(.,'sftp://') or contains(.,'mailto:') or contains(.,'./') or contains(.,'/'))">
+ (contains(.,'http://') or contains(.,'https://') or contains(.,'ftp://') or contains(.,'sftp://') or contains(.,'mailto:') or contains(.,'./') or contains(.,'/'))">
<!-- (starts-with(normalize-space(.),'http://') or starts-with(normalize-space(.),'https://'))"> -->
<!-- <xsl:if test="local-name(..)='Script'">
<xsl:message> <xsl:text>... found Script parent, attribute </xsl:text>
@@ -1508,6 +1508,7 @@
<xsl:with-param name="insertBreaks"><xsl:text>false</xsl:text></xsl:with-param>
</xsl:call-template>
</xsl:when>
+ <!-- check sftp before ftp -->
<xsl:when test="contains(.,'sftp://')">
<xsl:text> </xsl:text>
<xsl:value-of select="substring-before(.,'sftp://')"/>
@@ -1517,6 +1518,15 @@
<xsl:with-param name="insertBreaks"><xsl:text>false</xsl:text></xsl:with-param>
</xsl:call-template>
</xsl:when>
+ <xsl:when test="contains(.,'ftp://')">
+ <xsl:text> </xsl:text>
+ <xsl:value-of select="substring-before(.,'ftp://')"/>
+ <xsl:call-template name="URL-ize-MFString-elements">
+ <xsl:with-param name="list" select="normalize-space(substring-after(.,substring-before(.,'ftp://')))"/>
+ <xsl:with-param name="urlsOnly"><xsl:text>true</xsl:text></xsl:with-param>
+ <xsl:with-param name="insertBreaks"><xsl:text>false</xsl:text></xsl:with-param>
+ </xsl:call-template>
+ </xsl:when>
<xsl:when test="contains(.,'mailto:')">
<xsl:text> </xsl:text>
<xsl:value-of select="substring-before(.,'mailto:')"/>
@@ -1868,11 +1878,10 @@
<xsl:choose>
<xsl:when test="($urlsOnly='true') and not(contains($nextURL,'http://')) and not(contains($nextURL,'https://'))
and not(contains($nextURL,'sftp://')) and not(contains($nextURL,'mailto:'))
- and not(contains($nextURL,'./'))">
+ and not(contains($nextURL, 'ftp://')) and not(contains($nextURL,'./'))">
<!-- if baseURL provided then insert it into link, otherwise merely output text -->
<xsl:choose>
<xsl:when test="string-length($baseURL) > 0">
-
<xsl:text> </xsl:text>
<xsl:if test="$insertBreaks='true'">
<xsl:text disable-output-escaping="yes"><br /></xsl:text>
@@ -1887,7 +1896,7 @@
<xsl:value-of select="normalize-space(substring-after($nextURL,'http://'))"/>
</xsl:element>
<xsl:text> </xsl:text>
- <xsl:if test="($insertBreaks='true') and not(starts-with(normalize-space($restURLs),'sftp://')) and not(starts-with(normalize-space($restURLs),'http://'))">
+ <xsl:if test="($insertBreaks='true') and not(starts-with(normalize-space($restURLs),'ftp://')) and not(starts-with(normalize-space($restURLs),'sftp://')) and not(starts-with(normalize-space($restURLs),'http://'))">
<xsl:text disable-output-escaping="yes"><br /></xsl:text>
</xsl:if>
</xsl:when>
@@ -1917,6 +1926,26 @@
<xsl:text disable-output-escaping="yes"><br /></xsl:text>
</xsl:if>
</xsl:when>
+ <!-- handle ftp:// but only if it precedes http:// and follows sftp:// -->
+ <xsl:when test="($urlsOnly='true') and (contains($nextURL,'ftp://')) and not(contains(substring-before($nextURL,'ftp://'),'http://'))">
+ <!-- ftp:// found next -->
+ <xsl:value-of disable-output-escaping="yes" select="substring-before($nextURL,'ftp://')"/>
+ <xsl:if test="$insertBreaks='true'">
+ <xsl:text disable-output-escaping="yes"><br /></xsl:text>
+ </xsl:if>
+ <xsl:element name="a">
+ <xsl:attribute name="href">
+ <xsl:text>ftp://</xsl:text>
+ <xsl:value-of select="normalize-space(substring-after($nextURL,'ftp://'))"/>
+ </xsl:attribute>
+ <xsl:text>ftp://</xsl:text>
+ <xsl:value-of select="normalize-space(substring-after($nextURL,'ftp://'))"/>
+ </xsl:element>
+ <xsl:text> </xsl:text>
+ <xsl:if test="($insertBreaks='true') and not(starts-with(normalize-space($restURLs),'ftp://')) and not(starts-with(normalize-space($restURLs),'http://'))">
+ <xsl:text disable-output-escaping="yes"><br /></xsl:text>
+ </xsl:if>
+ </xsl:when>
<!-- handle http:// -->
<xsl:when test="($urlsOnly='true') and (contains($nextURL,'http://'))">
<!-- http:// found next -->
@@ -1933,7 +1962,7 @@
<xsl:value-of select="normalize-space(substring-after($nextURL,'http://'))"/>
</xsl:element>
<xsl:text> </xsl:text>
- <xsl:if test="($insertBreaks='true') and not(starts-with(normalize-space($restURLs),'sftp://')) and not(starts-with(normalize-space($restURLs),'http://'))">
+ <xsl:if test="($insertBreaks='true') and not(starts-with(normalize-space($restURLs),'ftp://')) and not(starts-with(normalize-space($restURLs),'http://'))">
<xsl:text disable-output-escaping="yes"><br /></xsl:text>
</xsl:if>
</xsl:when>
@@ -1953,7 +1982,7 @@
<xsl:value-of select="normalize-space(substring-after($nextURL,'https://'))"/>
</xsl:element>
<xsl:text> </xsl:text>
- <xsl:if test="($insertBreaks='true') and not(starts-with(normalize-space($restURLs),'sftp://')) and not(starts-with(normalize-space($restURLs),'http://'))">
+ <xsl:if test="($insertBreaks='true') and not(starts-with(normalize-space($restURLs),'ftp://')) and not(starts-with(normalize-space($restURLs),'http://'))">
<xsl:text disable-output-escaping="yes"><br /></xsl:text>
</xsl:if>
</xsl:when>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2012-04-17 15:45:07
|
Revision: 10835
http://x3d.svn.sourceforge.net/x3d/?rev=10835&view=rev
Author: brutzman
Date: 2012-04-17 15:44:56 +0000 (Tue, 17 Apr 2012)
Log Message:
-----------
fix typo
Modified Paths:
--------------
www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
Modified: www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
===================================================================
--- www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-04-17 15:30:22 UTC (rev 10834)
+++ www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-04-17 15:44:56 UTC (rev 10835)
@@ -1881,7 +1881,7 @@
and not(contains($nextURL, 'ftp://')) and not(contains($nextURL,'./'))">
<!-- if baseUrlAvailable is false then merely provide text, otherwise output style the output into link -->
<xsl:choose>
- <xsl:when test="($baseUrlAvailable='true)">
+ <xsl:when test="($baseUrlAvailable='true')">
<xsl:text> </xsl:text>
<xsl:if test="$insertBreaks='true'">
<xsl:text disable-output-escaping="yes"><br /></xsl:text>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2012-04-17 15:52:39
|
Revision: 10836
http://x3d.svn.sourceforge.net/x3d/?rev=10836&view=rev
Author: brutzman
Date: 2012-04-17 15:52:29 +0000 (Tue, 17 Apr 2012)
Log Message:
-----------
debug statement
Modified Paths:
--------------
www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
Modified: www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
===================================================================
--- www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-04-17 15:44:56 UTC (rev 10835)
+++ www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-04-17 15:52:29 UTC (rev 10836)
@@ -69,11 +69,15 @@
<xsl:template match="/">
<!-- DEBUG
- <xsl:message>
+ <xsl:comment>
<xsl:text>$linkImages=</xsl:text>
<xsl:value-of select="$linkImages"/>
- </xsl:message>
+ </xsl:comment>
-->
+ <xsl:comment>
+ <xsl:text>$baseUrlAvailable=</xsl:text>
+ <xsl:value-of select="$baseUrlAvailable"/>
+ </xsl:comment>
<!-- first produce supporting SVG figures -->
<xsl:call-template name="produce-SVG-figures">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2012-04-17 15:54:18
|
Revision: 10834
http://x3d.svn.sourceforge.net/x3d/?rev=10834&view=rev
Author: brutzman
Date: 2012-04-17 15:30:22 +0000 (Tue, 17 Apr 2012)
Log Message:
-----------
parameter option to omit url links for local files
Modified Paths:
--------------
www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
Modified: www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
===================================================================
--- www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-04-17 13:06:15 UTC (rev 10833)
+++ www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-04-17 15:30:22 UTC (rev 10834)
@@ -58,8 +58,8 @@
xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
xmlns:saxon="http://icl.com/saxon" saxon:trace="no">
<xsl:import href="X3dExtrusionToSvgViaXslt1.1.xslt"/>
- <!-- if provided, $baseURL should end with / -->
- <xsl:param name="baseURL"><xsl:text></xsl:text></xsl:param>
+ <!-- $baseUrlAvailable false means that stylesheet is being used by servlet or else styled results won't be in original directory -->
+ <xsl:param name="baseUrlAvailable"><xsl:text>true</xsl:text></xsl:param>
<xsl:param name="linkImages"><xsl:text>false</xsl:text></xsl:param>
<xsl:strip-space elements="*"/>
@@ -1879,21 +1879,18 @@
<xsl:when test="($urlsOnly='true') and not(contains($nextURL,'http://')) and not(contains($nextURL,'https://'))
and not(contains($nextURL,'sftp://')) and not(contains($nextURL,'mailto:'))
and not(contains($nextURL, 'ftp://')) and not(contains($nextURL,'./'))">
- <!-- if baseURL provided then insert it into link, otherwise merely output text -->
+ <!-- if baseUrlAvailable is false then merely provide text, otherwise output style the output into link -->
<xsl:choose>
- <xsl:when test="string-length($baseURL) > 0">
+ <xsl:when test="($baseUrlAvailable='true)">
<xsl:text> </xsl:text>
<xsl:if test="$insertBreaks='true'">
<xsl:text disable-output-escaping="yes"><br /></xsl:text>
</xsl:if>
<xsl:element name="a">
<xsl:attribute name="href">
- <xsl:value-of disable-output-escaping="yes" select="$baseURL"/>
- <!-- $baseURL should end with / -->
<xsl:value-of disable-output-escaping="yes" select="$nextURL"/>
</xsl:attribute>
- <xsl:text>http://</xsl:text>
- <xsl:value-of select="normalize-space(substring-after($nextURL,'http://'))"/>
+ <xsl:value-of select="$nextURL"/>
</xsl:element>
<xsl:text> </xsl:text>
<xsl:if test="($insertBreaks='true') and not(starts-with(normalize-space($restURLs),'ftp://')) and not(starts-with(normalize-space($restURLs),'sftp://')) and not(starts-with(normalize-space($restURLs),'http://'))">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2012-06-06 01:45:33
|
Revision: 10910
http://x3d.svn.sourceforge.net/x3d/?rev=10910&view=rev
Author: brutzman
Date: 2012-06-06 01:45:27 +0000 (Wed, 06 Jun 2012)
Log Message:
-----------
improved title attribute tooltips
Modified Paths:
--------------
www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
Modified: www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
===================================================================
--- www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-06-06 01:45:16 UTC (rev 10909)
+++ www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-06-06 01:45:27 UTC (rev 10910)
@@ -1256,10 +1256,10 @@
<xsl:attribute name="title">
<xsl:choose>
<xsl:when test="//ProtoDeclare[@name=$value]">
- <xsl:text>go to the defining ProtoDeclare</xsl:text>
+ <xsl:text>go to the defining ProtoDeclare for this prototype instance</xsl:text>
</xsl:when>
<xsl:when test="//ExternProtoDeclare[@name=$value]">
- <xsl:text>go to the defining ExternProtoDeclare</xsl:text>
+ <xsl:text>go to the defining ExternProtoDeclare for this prototype instance</xsl:text>
</xsl:when>
</xsl:choose>
</xsl:attribute>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2012-06-06 06:51:18
|
Revision: 10913
http://x3d.svn.sourceforge.net/x3d/?rev=10913&view=rev
Author: brutzman
Date: 2012-06-06 06:51:11 +0000 (Wed, 06 Jun 2012)
Log Message:
-----------
added numerous tooltips
Modified Paths:
--------------
www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
Modified: www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
===================================================================
--- www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-06-06 06:40:35 UTC (rev 10912)
+++ www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-06-06 06:51:11 UTC (rev 10913)
@@ -270,6 +270,19 @@
<span style="color:lightgrey"> --></span>
<xsl:text> </xsl:text>
</p>
+ <p style="text-align:center; background-color:white">
+ <xsl:text> </xsl:text>
+ <span style="color:white"><!--</span>
+ <xsl:text> </xsl:text>
+ Additional information about X3D scenes:
+ <a href="http://www.web3d.org/x3d/content/examples/X3dResources.html">X3D Resources</a>,
+ <a href="http://www.web3d.org/x3d/content/examples/X3dSceneAuthoringHints.html">X3D Scene Authoring Hints</a>
+ and
+ <a href="http://www.web3d.org/x3d/content/X3dTooltips.html">X3D Tooltips</a>
+ <xsl:text> </xsl:text>
+ <span style="color:white">--></span>
+ <xsl:text> </xsl:text>
+ </p>
</body>
<!-- </xsl:element> </html> -->
</html>
@@ -647,9 +660,106 @@
<xsl:choose>
<!-- handle specially ordered cases first -->
<xsl:when test="local-name()='meta'">
- <xsl:apply-templates select="@name" />
- <xsl:apply-templates select="@content" />
- <xsl:apply-templates select="@*[local-name()!='name' and local-name()!='content']" />
+ <xsl:element name="span">
+ <xsl:attribute name="title">
+ <xsl:choose>
+ <!-- also used in X3D-Edit X3DSchemaData.java -->
+ <xsl:when test="(@name = 'title')">
+ <xsl:text>meta title provides file name for this resource</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'accessRights')">
+ <xsl:text>meta accessRights defines permission required to access resource or security status</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'contributor')">
+ <xsl:text>meta contributor provides name of individual contributing to this resource</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'created')">
+ <xsl:text>meta created provides date of initial version</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'creator')">
+ <xsl:text>meta creator provides name of original author</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'description')">
+ <xsl:text>meta description provides summary overview describing this resource</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'drawing')">
+ <xsl:text>meta drawing provides name or reference link to a supporting drawing or sketch file</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'error')">
+ <xsl:text>meta error defines information about an error or known problem that can prevent proper operation</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'generator')">
+ <xsl:text>meta generator provides name of authoring tool or translation tool producing this scene</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'hint')">
+ <xsl:text>meta hint provides a user hint about resource features or operation</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'identifier')">
+ <xsl:text>meta identifier provides the unique Uniform Resource Identifier (URI) or url address for this resource</xsl:text>
+ </xsl:when>
+ <xsl:when test="(lower-case(@name) = 'image')">
+ <xsl:text>meta image provides name or reference link to supporting image file</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'info')">
+ <xsl:text>meta info provides additional information of interest</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'license')">
+ <xsl:text>meta license provides software license link or information</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'modified')">
+ <xsl:text>meta modified provides date of modified version</xsl:text>
+ </xsl:when>
+ <xsl:when test="(lower-case(@name) = 'movingimage')">
+ <xsl:text>meta MovingImage provides </xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'photo')">
+ <xsl:text>meta photo provides name or reference link to supporting photograph"</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'reference')">
+ <xsl:text>meta reference provides name or reference link to supporting reference</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'requires')">
+ <xsl:text>meta requires provides prerequisites for operation or viewing</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'rights')">
+ <xsl:text>meta rights provides intellectual property rights</xsl:text>
+ </xsl:when>
+ <xsl:when test="(lower-case(@name) = 'sound')">
+ <xsl:text>meta Sound provides name or reference link to supporting sound file</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'subject')">
+ <xsl:text>meta subjectprovides search-index subject keywords, key phrases, or classification codes</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = '')">
+ <xsl:text>meta provides </xsl:text>
+ </xsl:when>
+ <xsl:when test="(lower-case(@name) = 'text')">
+ <xsl:text>meta Text provides name or reference link to supporting sound file</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'title')">
+ <xsl:text>meta title provides file name for this resource</xsl:text>
+ </xsl:when>
+ <xsl:when test="(lower-case(@name) = 'todo')">
+ <xsl:text>TODO action item "to do" that still needs to be performed</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'translator')">
+ <xsl:text>meta translator provides name of person performing translation from another format or language</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'translated')">
+ <xsl:text>meta translated provides date of translation from another format or language</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'version')">
+ <xsl:text>meta version provides current version number or ID of this resource</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'warning')">
+ <xsl:text>meta warning provides warning information about a known problem that impedes proper operation</xsl:text>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:attribute>
+ <xsl:apply-templates select="@name" />
+ <xsl:apply-templates select="@content" />
+ <xsl:apply-templates select="@*[local-name()!='name' and local-name()!='content']" />
+ </xsl:element>
</xsl:when>
<xsl:when test="starts-with(local-name(),'Metadata')">
<!-- debug: <xsl:message>// process Metadata node</xsl:message> -->
@@ -658,10 +768,12 @@
<xsl:apply-templates select="@containerField" />
</xsl:when>
<xsl:when test="local-name()='ROUTE'">
- <xsl:apply-templates select="@fromNode"/>
- <xsl:apply-templates select="@fromField"/>
- <xsl:apply-templates select="@toNode"/>
- <xsl:apply-templates select="@toField"/>
+ <span title="ROUTE connects fields between nodes to enable event passing">
+ <xsl:apply-templates select="@fromNode"/>
+ <xsl:apply-templates select="@fromField"/>
+ <xsl:apply-templates select="@toNode"/>
+ <xsl:apply-templates select="@toField"/>
+ </span>
</xsl:when>
<xsl:when test="local-name()='ElevationGrid' or local-name()='GeoElevationGrid'">
<xsl:apply-templates select="@DEF | @USE "/>
@@ -675,13 +787,17 @@
<xsl:apply-templates select="@*[contains(local-name(), 'Index')]"/>
</xsl:when>
<xsl:when test="local-name()='IMPORT'">
- <xsl:apply-templates select="@InlineDEF"/>
- <xsl:apply-templates select="@exportedDEF"/>
- <xsl:apply-templates select="@AS"/>
+ <span title="IMPORT provides ROUTE access to a node that is EXPORTed by an Inline scene">
+ <xsl:apply-templates select="@InlineDEF"/>
+ <xsl:apply-templates select="@exportedDEF"/>
+ <xsl:apply-templates select="@AS"/>
+ </span>
</xsl:when>
<xsl:when test="local-name()='EXPORT'">
+ <span title="EXPORT exposes a local node for ROUTEing when the current Scene is Inlined by an external world">
<xsl:apply-templates select="@localDEF"/>
<xsl:apply-templates select="@AS"/>
+ </span>
</xsl:when>
<xsl:when test="contains(local-name(),'Proto')">
<xsl:apply-templates select="@name"/>
@@ -1169,12 +1285,13 @@
</xsl:when>
<xsl:when test="(local-name(..)='X3D' and local-name()='noNamespaceSchemaLocation')">
<!-- xmlns:xsd attribute typically not seen, so insert it into pretty-print HTML -->
- <xsl:if test="not(../@xsd)"> <!-- not(../@xmlns:xsd) and -->
- <span class="attribute">
- <xsl:text>xmlns:xsd</xsl:text>
- </span>
- <!-- note formatting is to avoid HTML space within linked quoted reference -->
- <xsl:text>='</xsl:text><xsl:element name="a">
+ <span title="XML namespace for X3D Graphics schema validation">
+ <xsl:if test="not(../@xsd)"> <!-- not(../@xmlns:xsd) and -->
+ <span class="attribute">
+ <xsl:text>xmlns:xsd</xsl:text>
+ </span>
+ <!-- note formatting is to avoid HTML space within linked quoted reference -->
+ <xsl:text>='</xsl:text><xsl:element name="a">
<xsl:attribute name="href">
<xsl:text>http://www.w3.org/2001/XMLSchema-instance</xsl:text>
</xsl:attribute>
@@ -1182,10 +1299,11 @@
<xsl:text>_blank</xsl:text>
</xsl:attribute>
<xsl:text>http://www.w3.org/2001/XMLSchema-instance</xsl:text></xsl:element><xsl:text>' </xsl:text>
- </xsl:if>
- <span class="attribute">
- <xsl:text>xsd:</xsl:text>
- <xsl:value-of select="local-name()"/>
+ </xsl:if>
+ <span class="attribute">
+ <xsl:text>xsd:</xsl:text>
+ <xsl:value-of select="local-name()"/>
+ </span>
</span>
</xsl:when>
<xsl:otherwise>
@@ -1202,7 +1320,7 @@
<xsl:comment>no value, no action</xsl:comment>
</xsl:when>
<xsl:when test="local-name()='DEF'">
- <span class="idName">
+ <span class="idName" title="DEF name is a unique ID for a given node">
<xsl:value-of select="."/>
</span>
</xsl:when>
@@ -1232,22 +1350,22 @@
</xsl:choose>
</xsl:when>
<xsl:when test="local-name(..)='meta' and ../@name='warning'">
- <b class="warning">
+ <b class="warning" title="meta warning about known problem that still allows proper operation">
<xsl:value-of select="."/>
</b>
</xsl:when>
<xsl:when test="local-name(..)='meta' and ../@name='error'">
- <b class="error">
+ <b class="error" title="meta error or known problem that can prevent proper operation">
<xsl:value-of select="."/>
</b>
</xsl:when>
<xsl:when test="(local-name(..)='meta' and local-name()='content') and (../@name='description')">
- <span class="plain">
+ <span class="plain" title="meta description provides summary overview describing this resource">
<xsl:value-of select="."/>
</span>
</xsl:when>
<xsl:when test="((local-name(..)='field' or local-name(..)='fieldValue') and local-name()='appinfo')">
- <span class="gray">
+ <span class="gray" title="appinfo provides simple application information, usable as a tooltip description">
<xsl:value-of select="."/>
</span>
</xsl:when>
@@ -1283,29 +1401,31 @@
</xsl:element>
</xsl:when>
<xsl:when test="(local-name(..)='connect' and local-name()='nodeField')">
- <span class="prototype">
+ <span class="prototype" title="connect interface events to this field in given node">
<xsl:value-of select="."></xsl:value-of>
</span>
</xsl:when>
<xsl:when test="(local-name(..)='connect' and local-name()='protoField')">
- <xsl:text disable-output-escaping="yes"><span class="prototype"></xsl:text>
- <xsl:element name="a">
- <xsl:attribute name="title">
- <xsl:text>go to the protoField definition</xsl:text>
- </xsl:attribute>
- <xsl:attribute name="href">
- <!-- build correct bookmark link for protoField name -->
- <xsl:text>#</xsl:text>
- <xsl:value-of select="//ProtoDeclare/@name"/>
- <xsl:text>ProtoField_</xsl:text>
- <xsl:value-of select="."/>
- </xsl:attribute>
- <xsl:attribute name="class">
- <xsl:text>prototype</xsl:text>
- </xsl:attribute>
- <xsl:value-of select="."></xsl:value-of>
- </xsl:element>
- <xsl:text disable-output-escaping="yes"></span></xsl:text>
+ <span title="field interface connecting events into the prototype interior">
+ <xsl:text disable-output-escaping="yes"><span class="prototype"></xsl:text>
+ <xsl:element name="a">
+ <xsl:attribute name="title">
+ <xsl:text>go to the protoField definition</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute name="href">
+ <!-- build correct bookmark link for protoField name -->
+ <xsl:text>#</xsl:text>
+ <xsl:value-of select="//ProtoDeclare/@name"/>
+ <xsl:text>ProtoField_</xsl:text>
+ <xsl:value-of select="."/>
+ </xsl:attribute>
+ <xsl:attribute name="class">
+ <xsl:text>prototype</xsl:text>
+ </xsl:attribute>
+ <xsl:value-of select="."></xsl:value-of>
+ </xsl:element>
+ <xsl:text disable-output-escaping="yes"></span></xsl:text>
+ </span>
</xsl:when>
<xsl:when test="(contains(local-name(..),'Proto') or starts-with(local-name(..),'field')) and local-name()='name'">
<span class="prototype">
@@ -1462,11 +1582,11 @@
<xsl:variable name="prefixProse" select="substring-before(.,'http://')"/>
<xsl:variable name="containedUrl" select="substring-after (.,$prefixProse)"/>
<!-- <xsl:message>
- <xsl:text>$prefixProse=</xsl:text>
- <xsl:value-of select="$prefixProse"/>
- <xsl:text>, $containedUrl=</xsl:text>
- <xsl:value-of select="$containedUrl"/>
- </xsl:message> -->
+ <xsl:text>$prefixProse=</xsl:text>
+ <xsl:value-of select="$prefixProse"/>
+ <xsl:text>, $containedUrl=</xsl:text>
+ <xsl:value-of select="$containedUrl"/>
+ </xsl:message> -->
<xsl:if test="($prefixProse!='')">
<span class="value">
<xsl:value-of select="$prefixProse"/>
@@ -1617,6 +1737,9 @@
</xsl:when>
<xsl:when test="local-name(..)='meta' and local-name()='content' and (../@name='mail' or ../@name='email' or ../@name='e-mail' or ../@name='contact') and contains(.,'@')">
<xsl:element name="a">
+ <xsl:attribute name="title">
+ <xsl:text>select to send mail</xsl:text>
+ </xsl:attribute>
<xsl:attribute name="href">
<xsl:if test="not(starts-with(normalize-space(.),'mailto:'))">
<xsl:text>mailto:</xsl:text>
@@ -1632,6 +1755,9 @@
<xsl:when test="(local-name(..)='X3D' and local-name()='noNamespaceSchemaLocation')">
<span class="value">
<xsl:element name="a">
+ <xsl:attribute name="title">
+ <xsl:text>XML namespace for X3D Graphics schema validation</xsl:text>
+ </xsl:attribute>
<xsl:attribute name="href">
<xsl:value-of select="."/>
</xsl:attribute>
@@ -1708,7 +1834,7 @@
<xsl:when test="starts-with(normalize-space(.),'Additional authoring resources for meta-tags: ')">
<!-- break to new line if needed -->
<xsl:if test="position() > 1"><xsl:text disable-output-escaping="yes"><br /></xsl:text></xsl:if>
- <code><xsl:text><!-- </xsl:text>
+ <code title="XML comment providing additional resource information"><xsl:text><!-- </xsl:text>
<xsl:call-template name="URL-ize-MFString-elements">
<xsl:with-param name="list" select="."/>
<xsl:with-param name="urlsOnly"><xsl:text>true</xsl:text></xsl:with-param>
@@ -1728,14 +1854,15 @@
<!-- ****** XML processing-instruction ****** -->
<xsl:template match="processing-instruction()">
- <xsl:text><-- </xsl:text><xsl:value-of select="."/><xsl:text> --> </xsl:text>
+ <span title="XML processing instruction, hidden as a comment"><xsl:text><-- </xsl:text><xsl:value-of select="."/><xsl:text> --> </xsl:text></span>
</xsl:template>
<xsl:template name="ID-link-index">
<!-- output bookmark index: ExternProtoDeclare, ProtoDeclare, DEF -->
<xsl:if test="boolean((//*[@DEF]) | (//*[local-name()='ProtoDeclare']) | (//*[local-name()='ExternProtoDeclare']) | (//Viewpoint))">
<xsl:text disable-output-escaping="yes"><br /></xsl:text>
- <xsl:text> <!-- </xsl:text>
+ <!-- hidden comment characters for compatible copy/paste -->
+ <span style="color:white"><xsl:text> <!-- </xsl:text></span>
<div class="center">
<hr style="width:100%"/>
<xsl:if test="//*[local-name()='ExternProtoDeclare']">
@@ -1887,7 +2014,8 @@
<xsl:text> </xsl:text>
<hr style="width:100%"/>
</div>
- <xsl:text> --> </xsl:text>
+ <!-- hidden comment characters for compatible copy/paste -->
+ <span style="color:white"><xsl:text> --> </xsl:text></span>
</xsl:if>
</xsl:template>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2012-06-06 08:41:43
|
Revision: 10915
http://x3d.svn.sourceforge.net/x3d/?rev=10915&view=rev
Author: brutzman
Date: 2012-06-06 08:41:32 +0000 (Wed, 06 Jun 2012)
Log Message:
-----------
tweak tooltips
Modified Paths:
--------------
www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
Modified: www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
===================================================================
--- www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-06-06 06:51:52 UTC (rev 10914)
+++ www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-06-06 08:41:32 UTC (rev 10915)
@@ -698,7 +698,7 @@
<xsl:text>meta identifier provides the unique Uniform Resource Identifier (URI) or url address for this resource</xsl:text>
</xsl:when>
<xsl:when test="(lower-case(@name) = 'image')">
- <xsl:text>meta image provides name or reference link to supporting image file</xsl:text>
+ <xsl:text>meta image provides name or reference link to a supporting image file</xsl:text>
</xsl:when>
<xsl:when test="(@name = 'info')">
<xsl:text>meta info provides additional information of interest</xsl:text>
@@ -713,10 +713,10 @@
<xsl:text>meta MovingImage provides </xsl:text>
</xsl:when>
<xsl:when test="(@name = 'photo')">
- <xsl:text>meta photo provides name or reference link to supporting photograph"</xsl:text>
+ <xsl:text>meta photo provides name or reference link to a supporting photograph"</xsl:text>
</xsl:when>
<xsl:when test="(@name = 'reference')">
- <xsl:text>meta reference provides name or reference link to supporting reference</xsl:text>
+ <xsl:text>meta reference provides name or reference link to a supporting resource</xsl:text>
</xsl:when>
<xsl:when test="(@name = 'requires')">
<xsl:text>meta requires provides prerequisites for operation or viewing</xsl:text>
@@ -725,16 +725,16 @@
<xsl:text>meta rights provides intellectual property rights</xsl:text>
</xsl:when>
<xsl:when test="(lower-case(@name) = 'sound')">
- <xsl:text>meta Sound provides name or reference link to supporting sound file</xsl:text>
+ <xsl:text>meta Sound provides name or reference link to a supporting sound file</xsl:text>
</xsl:when>
<xsl:when test="(@name = 'subject')">
- <xsl:text>meta subjectprovides search-index subject keywords, key phrases, or classification codes</xsl:text>
+ <xsl:text>meta subject provides search-index subject keywords, key phrases, or classification codes</xsl:text>
</xsl:when>
<xsl:when test="(@name = '')">
<xsl:text>meta provides </xsl:text>
</xsl:when>
<xsl:when test="(lower-case(@name) = 'text')">
- <xsl:text>meta Text provides name or reference link to supporting sound file</xsl:text>
+ <xsl:text>meta Text provides name or reference link to a supporting text file</xsl:text>
</xsl:when>
<xsl:when test="(@name = 'title')">
<xsl:text>meta title provides file name for this resource</xsl:text>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2012-06-06 18:25:27
|
Revision: 10918
http://x3d.svn.sourceforge.net/x3d/?rev=10918&view=rev
Author: brutzman
Date: 2012-06-06 18:25:18 +0000 (Wed, 06 Jun 2012)
Log Message:
-----------
improved approach to node tooltips
Modified Paths:
--------------
www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
Modified: www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
===================================================================
--- www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-06-06 09:22:00 UTC (rev 10917)
+++ www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-06-06 18:25:18 UTC (rev 10918)
@@ -293,6 +293,7 @@
-->
</xsl:template>
+ <!-- process all elements/nodes -->
<xsl:template match="*" >
<!-- break to new line if needed -->
<xsl:if test="(position() > 1) and not(local-name() ='X3D')"><xsl:text disable-output-escaping="yes"><br /></xsl:text></xsl:if>
@@ -461,134 +462,251 @@
<xsl:value-of select="$containsTextData"/>
</xsl:message>
-->
- <xsl:choose>
- <!-- check for existence of children -->
- <xsl:when test="boolean(* | comment() ) or (local-name()='Script') or $containsTextData">
- <!-- open tag for current element, which is a parent -->
- <xsl:text><</xsl:text>
- <xsl:call-template name="style-element-name" />
- <!-- handle namespace declaration(s) if X3D element -->
- <xsl:if test="local-name()='X3D'">
- <!-- dissatisfying debug of namespace attributes: only default-namespace and noNamespaceSchemaLocation attributes seem to be visible
- <xsl:message>
- <xsl:text>>X3D</xsl:text>
- <xsl:for-each select="@xmlns:*">
- <xsl:text> xmlns:</xsl:text>
- <xsl:value-of select="local-name()"/>
- <xsl:text>='</xsl:text>
- <xsl:value-of select="."/>
- <xsl:text>'</xsl:text>
- </xsl:for-each>
- <xsl:for-each select="@*[not(starts-with(local-name(),'xsd:'))]">
- <xsl:for-each select="@*">
- <xsl:text> </xsl:text>
- <xsl:value-of select="local-name()"/>
- <xsl:text>='</xsl:text>
- <xsl:value-of select="."/>
- <xsl:text>'</xsl:text>
- </xsl:for-each>
- <xsl:text>/<</xsl:text>
- <xsl:if test="ds:*">
- <xsl:text> [ds: namespace elements found]</xsl:text>
+
+ <!-- tooltips for each node -->
+ <xsl:element name="span">
+ <xsl:choose>
+ <xsl:when test="local-name()='meta'">
+ <xsl:attribute name="title">
+ <xsl:choose>
+ <!-- also used in X3D-Edit X3DSchemaData.java -->
+ <xsl:when test="(@name = 'title')">
+ <xsl:text>meta 'title' provides file name for this resource</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'accessRights')">
+ <xsl:text>meta 'accessRights' defines permission required to access resource or security status</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'contributor')">
+ <xsl:text>meta 'contributor' provides name of individual contributing to this resource</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'created')">
+ <xsl:text>meta 'created' provides date of initial version</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'creator')">
+ <xsl:text>meta 'creator' provides name of original author</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'description')">
+ <xsl:text>meta 'description' provides summary overview describing this resource</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'drawing')">
+ <xsl:text>meta 'drawing' provides name or reference link to a supporting drawing or sketch file</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'error')">
+ <xsl:text>meta 'error' defines information about an error or known problem that can prevent proper operation</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'generator')">
+ <xsl:text>meta 'generator' provides name of authoring tool or translation tool producing this scene</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'hint')">
+ <xsl:text>meta 'hint' provides a user hint about resource features or operation</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'identifier')">
+ <xsl:text>meta 'identifier' provides the unique Uniform Resource Identifier (URI) or url address for this resource</xsl:text>
+ </xsl:when>
+ <xsl:when test="(lower-case(@name) = 'image')">
+ <xsl:text>meta 'image' provides name or reference link to a supporting image file</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'info')">
+ <xsl:text>meta 'info' provides additional information of interest</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'license')">
+ <xsl:text>meta 'license' provides software license link or information</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'modified')">
+ <xsl:text>meta 'modified' provides date of modified version</xsl:text>
+ </xsl:when>
+ <xsl:when test="(lower-case(@name) = 'movingimage')">
+ <xsl:text>meta 'MovingImage' provides </xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'photo')">
+ <xsl:text>meta 'photo' provides name or reference link to a supporting photograph"</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'reference')">
+ <xsl:text>meta 'reference' provides name or reference link to a supporting resource</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'requires')">
+ <xsl:text>meta 'requires' provides prerequisites for operation or viewing</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'rights')">
+ <xsl:text>meta 'rights' defines intellectual property rights (IPR) for this scene</xsl:text>
+ </xsl:when>
+ <xsl:when test="(lower-case(@name) = 'sound')">
+ <xsl:text>meta 'Sound' provides name or reference link to a supporting sound file</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'subject')">
+ <xsl:text>meta 'subject' provides search-index subject keywords, key phrases, or classification codes</xsl:text>
+ </xsl:when>
+ <xsl:when test="(lower-case(@name) = 'text')">
+ <xsl:text>meta 'Text' provides name or reference link to a supporting text file</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'title')">
+ <xsl:text>meta 'title' provides file name for this resource</xsl:text>
+ </xsl:when>
+ <xsl:when test="(lower-case(@name) = 'todo')">
+ <xsl:text>meta 'TODO' action item (to do) that still needs to be performed</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'translator')">
+ <xsl:text>meta 'translator' provides name of person performing translation from another format or language</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'translated')">
+ <xsl:text>meta 'translated' provides date of translation from another format or language</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'version')">
+ <xsl:text>meta 'version' provides current version number or ID of this resource</xsl:text>
+ </xsl:when>
+ <xsl:when test="(@name = 'warning')">
+ <xsl:text>meta 'warning' provides warning information about a known problem that impedes proper operation</xsl:text>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:attribute>
+ </xsl:when>
+ <xsl:when test="local-name()='ROUTE'">
+ <xsl:attribute name="title">
+ <xsl:text>ROUTE connects fields between nodes to enable event passing</xsl:text>
+ </xsl:attribute>
+ </xsl:when>
+ <xsl:when test="local-name()='IMPORT'">
+ <xsl:attribute name="title">
+ <xsl:text>IMPORT provides ROUTE access to a node that is EXPORTed by an Inline scene</xsl:text>
+ </xsl:attribute>
+ </xsl:when>
+ <xsl:when test="local-name()='EXPORT'">
+ <xsl:attribute name="title">
+ <xsl:text>EXPORT exposes a local node for ROUTEing when the current Scene is Inlined by an external world</xsl:text>
+ </xsl:attribute>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <!-- check for existence of children -->
+ <xsl:when test="boolean(* | comment() ) or (local-name()='Script') or $containsTextData">
+ <!-- open tag for current element, which is a parent -->
+ <xsl:text><</xsl:text>
+ <xsl:call-template name="style-element-name" />
+ <!-- handle namespace declaration(s) if X3D element -->
+ <xsl:if test="local-name()='X3D'">
+ <!-- dissatisfying debug of namespace attributes: only default-namespace and noNamespaceSchemaLocation attributes seem to be visible
+ <xsl:message>
+ <xsl:text>>X3D</xsl:text>
+ <xsl:for-each select="@xmlns:*">
+ <xsl:text> xmlns:</xsl:text>
+ <xsl:value-of select="local-name()"/>
+ <xsl:text>='</xsl:text>
+ <xsl:value-of select="."/>
+ <xsl:text>'</xsl:text>
+ </xsl:for-each>
+ <xsl:for-each select="@*[not(starts-with(local-name(),'xsd:'))]">
+ <xsl:for-each select="@*">
+ <xsl:text> </xsl:text>
+ <xsl:value-of select="local-name()"/>
+ <xsl:text>='</xsl:text>
+ <xsl:value-of select="."/>
+ <xsl:text>'</xsl:text>
+ </xsl:for-each>
+ <xsl:text>/<</xsl:text>
+ <xsl:if test="ds:*">
+ <xsl:text> [ds: namespace elements found]</xsl:text>
+ </xsl:if>
+ <xsl:if test="*/@ds:*">
+ <xsl:text> [ds: namespace attributes found]</xsl:text>
+ </xsl:if>
+ </xsl:message>
+ -->
+ <xsl:if test="ds:* | (*/@ds:*)">
+ <!-- xmlns:ds="http://www.w3.org/2000/09/xmldsig#" -->
+ <span class="attribute">
+ <xsl:text>xmlns:ds</xsl:text>
+ </span>
+ <!-- note formatting is to avoid HTML space within linked quoted reference -->
+ <xsl:text>='</xsl:text><xsl:element name="a">
+ <xsl:attribute name="href">
+ <xsl:text>http://www.w3.org/2000/09/xmldsig#</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute name="target">
+ <xsl:text>_blank</xsl:text>
+ </xsl:attribute>
+ <xsl:text>http://www.w3.org/2000/09/xmldsig#</xsl:text></xsl:element><xsl:text>' </xsl:text>
</xsl:if>
- <xsl:if test="*/@ds:*">
- <xsl:text> [ds: namespace attributes found]</xsl:text>
- </xsl:if>
- </xsl:message>
- -->
- <xsl:if test="ds:* | (*/@ds:*)">
- <!-- xmlns:ds="http://www.w3.org/2000/09/xmldsig#" -->
- <span class="attribute">
- <xsl:text>xmlns:ds</xsl:text>
- </span>
- <!-- note formatting is to avoid HTML space within linked quoted reference -->
- <xsl:text>='</xsl:text><xsl:element name="a">
- <xsl:attribute name="href">
- <xsl:text>http://www.w3.org/2000/09/xmldsig#</xsl:text>
- </xsl:attribute>
- <xsl:attribute name="target">
- <xsl:text>_blank</xsl:text>
- </xsl:attribute>
- <xsl:text>http://www.w3.org/2000/09/xmldsig#</xsl:text></xsl:element><xsl:text>' </xsl:text>
</xsl:if>
- </xsl:if>
- <!-- handle attribute(s) if any -->
- <xsl:call-template name="process-attributes-in-order" />
- <!-- finish initial tag of pair -->
- <xsl:text>> </xsl:text>
-
- <xsl:if test="(local-name() ='Scene')">
- <!-- DEBUG statements are here so that they are included in X3D Validator servlet output excerpt:
- <xsl:comment>
- <xsl:text>$linkImages=</xsl:text>
- <xsl:value-of select="$linkImages"/>
- </xsl:comment>
- <xsl:comment>
- <xsl:text>$baseUrlAvailable=</xsl:text>
- <xsl:value-of select="$baseUrlAvailable"/>
- </xsl:comment>
- -->
- </xsl:if>
+ <!-- handle attribute(s) if any -->
+ <xsl:call-template name="process-attributes-in-order" />
+ <!-- finish initial tag of pair -->
+ <xsl:text>> </xsl:text>
- <!-- indent children -->
- <div class="indent">
- <xsl:apply-templates select="* | comment()" />
- <xsl:choose>
- <!-- Script node: output script source, preserve CDATA delimiters around contained code -->
- <xsl:when test="local-name()='Script' and normalize-space(.) and (not (normalize-space(.)='' or normalize-space(.)=' '))">
- <xsl:text disable-output-escaping="yes"><br /></xsl:text>
- <xsl:text> </xsl:text>
- <!-- eliminate/restore left margin so that CDATA script code has maximum page width -->
- <xsl:for-each select="ancestor::*">
- <xsl:text disable-output-escaping="yes"></div class="indent"></xsl:text>
+ <xsl:if test="(local-name() ='Scene')">
+ <!-- DEBUG statements are here so that they are included in X3D Validator servlet output excerpt:
+ <xsl:comment>
+ <xsl:text>$linkImages=</xsl:text>
+ <xsl:value-of select="$linkImages"/>
+ </xsl:comment>
+ <xsl:comment>
+ <xsl:text>$baseUrlAvailable=</xsl:text>
+ <xsl:value-of select="$baseUrlAvailable"/>
+ </xsl:comment>
+ -->
+ </xsl:if>
+
+ <!-- indent children -->
+ <div class="indent">
+ <xsl:apply-templates select="* | comment()" />
+ <xsl:choose>
+ <!-- Script node: output script source, preserve CDATA delimiters around contained code -->
+ <xsl:when test="local-name()='Script' and normalize-space(.) and (not (normalize-space(.)='' or normalize-space(.)=' '))">
+ <xsl:text disable-output-escaping="yes"><br /></xsl:text>
<xsl:text> </xsl:text>
- </xsl:for-each>
- <code><b><xsl:text><![CDATA[</xsl:text></b></code>
- <xsl:text> </xsl:text>
- <pre>
- <xsl:for-each select="text()">
- <xsl:choose>
- <xsl:when test="(normalize-space(.)='' or normalize-space(.)=' ') and preceding::field"></xsl:when><!--<xsl:text>// stripped LF before field </xsl:text> -->
- <xsl:when test="(normalize-space(.)='' or normalize-space(.)=' ') and following::field"></xsl:when><!--<xsl:text>// stripped LF after field </xsl:text> -->
- <!-- usable text found, need to convert '<' to < -->
- <xsl:otherwise>
- <xsl:call-template name="escape-lessthan-characters">
- <xsl:with-param name="inputString" select="."/>
- </xsl:call-template>
- </xsl:otherwise>
- </xsl:choose>
+ <!-- eliminate/restore left margin so that CDATA script code has maximum page width -->
+ <xsl:for-each select="ancestor::*">
+ <xsl:text disable-output-escaping="yes"></div class="indent"></xsl:text>
+ <xsl:text> </xsl:text>
</xsl:for-each>
- </pre>
- <code><b><xsl:text>]]></xsl:text></b></code>
- <xsl:text> </xsl:text>
- <!-- eliminate/restore left margin so that CDATA script code has maximum page width -->
- <xsl:for-each select="ancestor::*">
- <xsl:text disable-output-escaping="yes"><div class="indent"></xsl:text>
+ <code><b><xsl:text><![CDATA[</xsl:text></b></code>
<xsl:text> </xsl:text>
- </xsl:for-each>
- </xsl:when>
- <!-- DS nodes -->
- <xsl:when test="($dsNode) and ($containsTextData) and not(*)">
- <code><xsl:value-of select="."/></code>
- </xsl:when>
- </xsl:choose>
- </div>
- <!-- close tag for this element -->
- <xsl:text></</xsl:text>
- <xsl:call-template name="style-element-name" />
- <xsl:text>> </xsl:text>
- </xsl:when>
- <xsl:otherwise>
- <!-- single tag, no children -->
- <xsl:text><</xsl:text>
- <xsl:call-template name="style-element-name" />
- <!-- handle attribute(s) if any -->
- <xsl:call-template name="process-attributes-in-order" />
+ <pre>
+ <xsl:for-each select="text()">
+ <xsl:choose>
+ <xsl:when test="(normalize-space(.)='' or normalize-space(.)=' ') and preceding::field"></xsl:when><!--<xsl:text>// stripped LF before field </xsl:text> -->
+ <xsl:when test="(normalize-space(.)='' or normalize-space(.)=' ') and following::field"></xsl:when><!--<xsl:text>// stripped LF after field </xsl:text> -->
+ <!-- usable text found, need to convert '<' to < -->
+ <xsl:otherwise>
+ <xsl:call-template name="escape-lessthan-characters">
+ <xsl:with-param name="inputString" select="."/>
+ </xsl:call-template>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
+ </pre>
+ <code><b><xsl:text>]]></xsl:text></b></code>
+ <xsl:text> </xsl:text>
+ <!-- eliminate/restore left margin so that CDATA script code has maximum page width -->
+ <xsl:for-each select="ancestor::*">
+ <xsl:text disable-output-escaping="yes"><div class="indent"></xsl:text>
+ <xsl:text> </xsl:text>
+ </xsl:for-each>
+ </xsl:when>
+ <!-- DS nodes -->
+ <xsl:when test="($dsNode) and ($containsTextData) and not(*)">
+ <code><xsl:value-of select="."/></code>
+ </xsl:when>
+ </xsl:choose>
+ </div>
+ <!-- close tag for this element -->
+ <xsl:text></</xsl:text>
+ <xsl:call-template name="style-element-name" />
+ <xsl:text>> </xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <!-- single tag, no children -->
+ <xsl:text><</xsl:text>
+ <xsl:call-template name="style-element-name" />
+ <!-- handle attribute(s) if any -->
+ <xsl:call-template name="process-attributes-in-order" />
- <!-- finish singleton tag -->
- <xsl:text>/> </xsl:text>
- </xsl:otherwise>
- </xsl:choose>
+ <!-- finish singleton tag -->
+ <xsl:text>/> </xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ <!-- end of span for title tooltip -->
+ </xsl:element>
<!-- <xsl:if test="last() > position()"><xsl:text disable-output-escaping="yes"><br /></xsl:text></xsl:if> -->
<!-- element complete, insert index (after head tag prior to Scene tag, or after final X3D) or else break -->
<xsl:if test="local-name()='head' or local-name()='X3D'">
@@ -660,106 +778,9 @@
<xsl:choose>
<!-- handle specially ordered cases first -->
<xsl:when test="local-name()='meta'">
- <xsl:element name="span">
- <xsl:attribute name="title">
- <xsl:choose>
- <!-- also used in X3D-Edit X3DSchemaData.java -->
- <xsl:when test="(@name = 'title')">
- <xsl:text>meta title provides file name for this resource</xsl:text>
- </xsl:when>
- <xsl:when test="(@name = 'accessRights')">
- <xsl:text>meta accessRights defines permission required to access resource or security status</xsl:text>
- </xsl:when>
- <xsl:when test="(@name = 'contributor')">
- <xsl:text>meta contributor provides name of individual contributing to this resource</xsl:text>
- </xsl:when>
- <xsl:when test="(@name = 'created')">
- <xsl:text>meta created provides date of initial version</xsl:text>
- </xsl:when>
- <xsl:when test="(@name = 'creator')">
- <xsl:text>meta creator provides name of original author</xsl:text>
- </xsl:when>
- <xsl:when test="(@name = 'description')">
- <xsl:text>meta description provides summary overview describing this resource</xsl:text>
- </xsl:when>
- <xsl:when test="(@name = 'drawing')">
- <xsl:text>meta drawing provides name or reference link to a supporting drawing or sketch file</xsl:text>
- </xsl:when>
- <xsl:when test="(@name = 'error')">
- <xsl:text>meta error defines information about an error or known problem that can prevent proper operation</xsl:text>
- </xsl:when>
- <xsl:when test="(@name = 'generator')">
- <xsl:text>meta generator provides name of authoring tool or translation tool producing this scene</xsl:text>
- </xsl:when>
- <xsl:when test="(@name = 'hint')">
- <xsl:text>meta hint provides a user hint about resource features or operation</xsl:text>
- </xsl:when>
- <xsl:when test="(@name = 'identifier')">
- <xsl:text>meta identifier provides the unique Uniform Resource Identifier (URI) or url address for this resource</xsl:text>
- </xsl:when>
- <xsl:when test="(lower-case(@name) = 'image')">
- <xsl:text>meta image provides name or reference link to a supporting image file</xsl:text>
- </xsl:when>
- <xsl:when test="(@name = 'info')">
- <xsl:text>meta info provides additional information of interest</xsl:text>
- </xsl:when>
- <xsl:when test="(@name = 'license')">
- <xsl:text>meta license provides software license link or information</xsl:text>
- </xsl:when>
- <xsl:when test="(@name = 'modified')">
- <xsl:text>meta modified provides date of modified version</xsl:text>
- </xsl:when>
- <xsl:when test="(lower-case(@name) = 'movingimage')">
- <xsl:text>meta MovingImage provides </xsl:text>
- </xsl:when>
- <xsl:when test="(@name = 'photo')">
- <xsl:text>meta photo provides name or reference link to a supporting photograph"</xsl:text>
- </xsl:when>
- <xsl:when test="(@name = 'reference')">
- <xsl:text>meta reference provides name or reference link to a supporting resource</xsl:text>
- </xsl:when>
- <xsl:when test="(@name = 'requires')">
- <xsl:text>meta requires provides prerequisites for operation or viewing</xsl:text>
- </xsl:when>
- <xsl:when test="(@name = 'rights')">
- <xsl:text>meta rights provides intellectual property rights</xsl:text>
- </xsl:when>
- <xsl:when test="(lower-case(@name) = 'sound')">
- <xsl:text>meta Sound provides name or reference link to a supporting sound file</xsl:text>
- </xsl:when>
- <xsl:when test="(@name = 'subject')">
- <xsl:text>meta subject provides search-index subject keywords, key phrases, or classification codes</xsl:text>
- </xsl:when>
- <xsl:when test="(@name = '')">
- <xsl:text>meta provides </xsl:text>
- </xsl:when>
- <xsl:when test="(lower-case(@name) = 'text')">
- <xsl:text>meta Text provides name or reference link to a supporting text file</xsl:text>
- </xsl:when>
- <xsl:when test="(@name = 'title')">
- <xsl:text>meta title provides file name for this resource</xsl:text>
- </xsl:when>
- <xsl:when test="(lower-case(@name) = 'todo')">
- <xsl:text>TODO action item "to do" that still needs to be performed</xsl:text>
- </xsl:when>
- <xsl:when test="(@name = 'translator')">
- <xsl:text>meta translator provides name of person performing translation from another format or language</xsl:text>
- </xsl:when>
- <xsl:when test="(@name = 'translated')">
- <xsl:text>meta translated provides date of translation from another format or language</xsl:text>
- </xsl:when>
- <xsl:when test="(@name = 'version')">
- <xsl:text>meta version provides current version number or ID of this resource</xsl:text>
- </xsl:when>
- <xsl:when test="(@name = 'warning')">
- <xsl:text>meta warning provides warning information about a known problem that impedes proper operation</xsl:text>
- </xsl:when>
- </xsl:choose>
- </xsl:attribute>
- <xsl:apply-templates select="@name" />
- <xsl:apply-templates select="@content" />
- <xsl:apply-templates select="@*[local-name()!='name' and local-name()!='content']" />
- </xsl:element>
+ <xsl:apply-templates select="@name" />
+ <xsl:apply-templates select="@content" />
+ <xsl:apply-templates select="@*[local-name()!='name' and local-name()!='content']" />
</xsl:when>
<xsl:when test="starts-with(local-name(),'Metadata')">
<!-- debug: <xsl:message>// process Metadata node</xsl:message> -->
@@ -768,12 +789,10 @@
<xsl:apply-templates select="@containerField" />
</xsl:when>
<xsl:when test="local-name()='ROUTE'">
- <span title="ROUTE connects fields between nodes to enable event passing">
- <xsl:apply-templates select="@fromNode"/>
- <xsl:apply-templates select="@fromField"/>
- <xsl:apply-templates select="@toNode"/>
- <xsl:apply-templates select="@toField"/>
- </span>
+ <xsl:apply-templates select="@fromNode"/>
+ <xsl:apply-templates select="@fromField"/>
+ <xsl:apply-templates select="@toNode"/>
+ <xsl:apply-templates select="@toField"/>
</xsl:when>
<xsl:when test="local-name()='ElevationGrid' or local-name()='GeoElevationGrid'">
<xsl:apply-templates select="@DEF | @USE "/>
@@ -787,17 +806,13 @@
<xsl:apply-templates select="@*[contains(local-name(), 'Index')]"/>
</xsl:when>
<xsl:when test="local-name()='IMPORT'">
- <span title="IMPORT provides ROUTE access to a node that is EXPORTed by an Inline scene">
- <xsl:apply-templates select="@InlineDEF"/>
- <xsl:apply-templates select="@exportedDEF"/>
- <xsl:apply-templates select="@AS"/>
- </span>
+ <xsl:apply-templates select="@InlineDEF"/>
+ <xsl:apply-templates select="@exportedDEF"/>
+ <xsl:apply-templates select="@AS"/>
</xsl:when>
<xsl:when test="local-name()='EXPORT'">
- <span title="EXPORT exposes a local node for ROUTEing when the current Scene is Inlined by an external world">
<xsl:apply-templates select="@localDEF"/>
<xsl:apply-templates select="@AS"/>
- </span>
</xsl:when>
<xsl:when test="contains(local-name(),'Proto')">
<xsl:apply-templates select="@name"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2012-06-06 22:40:16
|
Revision: 10921
http://x3d.svn.sourceforge.net/x3d/?rev=10921&view=rev
Author: brutzman
Date: 2012-06-06 22:40:10 +0000 (Wed, 06 Jun 2012)
Log Message:
-----------
omit duplicative tooltips
Modified Paths:
--------------
www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
Modified: www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
===================================================================
--- www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-06-06 22:34:25 UTC (rev 10920)
+++ www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-06-06 22:40:10 UTC (rev 10921)
@@ -1365,17 +1365,17 @@
</xsl:choose>
</xsl:when>
<xsl:when test="local-name(..)='meta' and ../@name='warning'">
- <b class="warning" title="meta warning about known problem that still allows proper operation">
+ <b class="warning">
<xsl:value-of select="."/>
</b>
</xsl:when>
<xsl:when test="local-name(..)='meta' and ../@name='error'">
- <b class="error" title="meta error or known problem that can prevent proper operation">
+ <b class="error">
<xsl:value-of select="."/>
</b>
</xsl:when>
<xsl:when test="(local-name(..)='meta' and local-name()='content') and (../@name='description')">
- <span class="plain" title="meta description provides summary overview describing this resource">
+ <span class="plain">
<xsl:value-of select="."/>
</span>
</xsl:when>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2012-06-10 01:32:59
|
Revision: 10956
http://x3d.svn.sourceforge.net/x3d/?rev=10956&view=rev
Author: brutzman
Date: 2012-06-10 01:32:52 +0000 (Sun, 10 Jun 2012)
Log Message:
-----------
various tooltip improvements
Modified Paths:
--------------
www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
Modified: www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
===================================================================
--- www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-06-09 21:18:20 UTC (rev 10955)
+++ www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-06-10 01:32:52 UTC (rev 10956)
@@ -55,6 +55,7 @@
<xsl:stylesheet version="1.1"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns="http://www.w3.org/TR/xhtml1/strict"
+ xmlns:fn="http://www.w3.org/2005/xpath-functions"
xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
xmlns:saxon="http://icl.com/saxon" saxon:trace="no">
<xsl:import href="X3dExtrusionToSvgViaXslt1.1.xslt"/>
@@ -114,12 +115,16 @@
span.route {color: red}
b.warning {color: #CC5500}
b.error {color: #CC0000}
-
-span.X3D {title: "X3D is the top-most XML element for an Extensible 3D (X3D) Graphics file">
-
]]>
</style>
+<!--
+span.X3D {title: 'X3D is the top-most XML element for an Extensible 3D (X3D) Graphics file';}
+span.head {title: 'head can contain component, unit, and author-defined metadata (meta) tags';}
+span.component {title: 'component indicates needed scene functionality above the given X3D profile';}
+span.unit {title: 'unit defines scene scaling factors for length, angle, mass or force";}
+-->
+
<meta name="generator" content="XSLT processor {system-property('xsl:vendor')}"/>
<meta name="generator" content="http://www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt"/>
<meta name="generator" content="http://x3d.svn.sourceforge.net/viewvc/*checkout*/x3d/www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt"/>
@@ -129,8 +134,9 @@
<xsl:choose>
<xsl:when test="//X3D/@version='3.0'">
<!-- final DOCTYPE: -->
- <pre><?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE X3D PUBLIC "ISO//Web3D//DTD X3D 3.0//EN" "<a href="http://www.web3d.org/specifications/x3d-3.0.dtd">http://www.web3d.org/specifications/x3d-3.0.dtd</a>"></pre>
+ <code title="XML declaration"><?xml version="1.0" encoding="UTF-8"?></code>
+ <br />
+ <code title="Document Type Declaration (DTD) for X3D validation"><!DOCTYPE X3D PUBLIC "ISO//Web3D//DTD X3D 3.0//EN" "<a href="http://www.web3d.org/specifications/x3d-3.0.dtd">http://www.web3d.org/specifications/x3d-3.0.dtd</a>"></code>
<xsl:text> </xsl:text>
<!-- transitional DOCTYPE:
<!DOCTYPE X3D PUBLIC "http://www.web3d.org/specifications/x3d-3.0.dtd" "file:///www.web3d.org/specifications/x3d-3.0.dtd">
@@ -138,8 +144,9 @@
</xsl:when>
<xsl:when test="//X3D/@version='3.1'">
<!-- final DOCTYPE: -->
- <pre><?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE X3D PUBLIC "ISO//Web3D//DTD X3D 3.1//EN" "<a href="http://www.web3d.org/specifications/x3d-3.1.dtd">http://www.web3d.org/specifications/x3d-3.1.dtd</a>"></pre>
+ <code title="XML declaration"><?xml version="1.0" encoding="UTF-8"?></code>
+ <br />
+ <code title="Document Type Declaration (DTD) for X3D validation"><!DOCTYPE X3D PUBLIC "ISO//Web3D//DTD X3D 3.1//EN" "<a href="http://www.web3d.org/specifications/x3d-3.1.dtd">http://www.web3d.org/specifications/x3d-3.1.dtd</a>"></code>
<xsl:text> </xsl:text>
<!-- transitional DOCTYPE:
<!DOCTYPE X3D PUBLIC "http://www.web3d.org/specifications/x3d-3.1.dtd" "file:///www.web3d.org/specifications/x3d-3.1.dtd">
@@ -147,23 +154,27 @@
</xsl:when>
<xsl:when test="//X3D/@version='3.2'">
<!-- final DOCTYPE: -->
- <pre><?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE X3D PUBLIC "ISO//Web3D//DTD X3D 3.2//EN" "<a href="http://www.web3d.org/specifications/x3d-3.2.dtd">http://www.web3d.org/specifications/x3d-3.2.dtd</a>"></pre>
+ <code title="XML declaration"><?xml version="1.0" encoding="UTF-8"?></code>
+ <br />
+ <code title="Document Type Declaration (DTD) for X3D validation"><!DOCTYPE X3D PUBLIC "ISO//Web3D//DTD X3D 3.2//EN" "<a href="http://www.web3d.org/specifications/x3d-3.2.dtd">http://www.web3d.org/specifications/x3d-3.2.dtd</a>"></code>
<xsl:text> </xsl:text>
<!-- no transitional DOCTYPE for v3.2 -->
</xsl:when>
<xsl:when test="//X3D/@version='3.3'">
<!-- final DOCTYPE: -->
- <pre><?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE X3D PUBLIC "ISO//Web3D//DTD X3D 3.3//EN" "<a href="http://www.web3d.org/specifications/x3d-3.3.dtd">http://www.web3d.org/specifications/x3d-3.3.dtd</a>"></pre>
+ <code title="XML declaration"><?xml version="1.0" encoding="UTF-8"?></code>
+ <br />
+ <code title="Document Type Declaration (DTD) for X3D validation"><!DOCTYPE X3D PUBLIC "ISO//Web3D//DTD X3D 3.3//EN" "<a href="http://www.web3d.org/specifications/x3d-3.3.dtd">http://www.web3d.org/specifications/x3d-3.3.dtd</a>"></code>
<xsl:text> </xsl:text>
<!-- no transitional DOCTYPE for v3.3 -->
</xsl:when>
<xsl:otherwise>
- <xsl:message>Unrecognized X3D version found, using DOCTYPE v3.3</xsl:message>
+ <xsl:message>No recognized X3D version found, using DOCTYPE v3.3</xsl:message>
+ <xsl:comment>No recognized X3D version found, using DOCTYPE v3.3</xsl:comment>
<!-- final DOCTYPE: -->
- <pre><?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE X3D PUBLIC "ISO//Web3D//DTD X3D 3.3//EN" "<a href="http://www.web3d.org/specifications/x3d-3.3.dtd">http://www.web3d.org/specifications/x3d-3.3.dtd</a>"></pre>
+ <code title="XML declaration"><?xml version="1.0" encoding="UTF-8"?></code>
+ <br />
+ <code title="Document Type Declaration (DTD) for X3D validation"><!DOCTYPE X3D PUBLIC "ISO//Web3D//DTD X3D 3.3//EN" "<a href="http://www.web3d.org/specifications/x3d-3.3.dtd">http://www.web3d.org/specifications/x3d-3.3.dtd</a>"></code>
<xsl:text> </xsl:text>
<!-- transitional DOCTYPE:
<!DOCTYPE X3D PUBLIC "http://www.web3d.org/specifications/x3d-3.0.dtd" "file:///www.web3d.org/specifications/x3d-3.0.dtd">
@@ -300,7 +311,7 @@
<!-- process all elements/nodes -->
<xsl:template match="*" >
<!-- break to new line if needed -->
- <xsl:if test="(position() > 1) and not(local-name() ='X3D')"><xsl:text disable-output-escaping="yes"><br /></xsl:text></xsl:if>
+ <xsl:if test="(position() > 1) and not(local-name() ='X3D')"><xsl:text disable-output-escaping="yes"><br /> </xsl:text></xsl:if>
<xsl:if test="@DEF or local-name()='ProtoDeclare' or local-name()='ExternProtoDeclare' or (local-name(..)='ProtoInterface' and local-name()='field') or local-name()='ROUTE' or local-name()='Viewpoint'">
<!-- add bookmarks -->
<xsl:element name="a">
@@ -464,16 +475,19 @@
<xsl:text>, </xsl:text>
<xsl:text>$containsTextData=</xsl:text>
<xsl:value-of select="$containsTextData"/>
+ <xsl:text>, </xsl:text>
+ <xsl:text>#children=</xsl:text>
+ <xsl:value-of select="count(*)"/>
</xsl:message>
-->
<!-- tooltips for each node -->
<xsl:element name="span">
+ <!-- apply tooltips for each node -->
<xsl:choose>
<xsl:when test="local-name()='X3D'">
<xsl:attribute name="title">
- <xsl:text>span.</xsl:text>
- <xsl:value-of select="local-name()"/>
+ <xsl:text>X3D is the top-most XML element for an Extensible 3D (X3D) Graphics file</xsl:text>
</xsl:attribute>
</xsl:when>
<xsl:when test="local-name()='head'">
@@ -528,7 +542,7 @@
<xsl:when test="(@name = 'identifier')">
<xsl:text>meta 'identifier' provides the unique Uniform Resource Identifier (URI) or url address for this resource</xsl:text>
</xsl:when>
- <xsl:when test="(lower-case(@name) = 'image')">
+ <xsl:when test="(fn:lower-case(@name) = 'image')">
<xsl:text>meta 'image' provides name or reference link to a supporting image file</xsl:text>
</xsl:when>
<xsl:when test="(@name = 'info')">
@@ -540,7 +554,7 @@
<xsl:when test="(@name = 'modified')">
<xsl:text>meta 'modified' provides date of modified version</xsl:text>
</xsl:when>
- <xsl:when test="(lower-case(@name) = 'movingimage')">
+ <xsl:when test="(fn:lower-case(@name) = 'movingimage')">
<xsl:text>meta 'MovingImage' provides </xsl:text>
</xsl:when>
<xsl:when test="(@name = 'photo')">
@@ -555,19 +569,19 @@
<xsl:when test="(@name = 'rights')">
<xsl:text>meta 'rights' defines intellectual property rights (IPR) for this scene</xsl:text>
</xsl:when>
- <xsl:when test="(lower-case(@name) = 'sound')">
+ <xsl:when test="(fn:lower-case(@name) = 'sound')">
<xsl:text>meta 'Sound' provides name or reference link to a supporting sound file</xsl:text>
</xsl:when>
<xsl:when test="(@name = 'subject')">
<xsl:text>meta 'subject' provides search-index subject keywords, key phrases, or classification codes</xsl:text>
</xsl:when>
- <xsl:when test="(lower-case(@name) = 'text')">
+ <xsl:when test="(fn:lower-case(@name) = 'text')">
<xsl:text>meta 'Text' provides name or reference link to a supporting text file</xsl:text>
</xsl:when>
<xsl:when test="(@name = 'title')">
<xsl:text>meta 'title' provides file name for this resource</xsl:text>
</xsl:when>
- <xsl:when test="(lower-case(@name) = 'todo')">
+ <xsl:when test="(fn:lower-case(@name) = 'todo')">
<xsl:text>meta 'TODO' action item (to do) that still needs to be performed</xsl:text>
</xsl:when>
<xsl:when test="(@name = 'translator')">
@@ -582,9 +596,17 @@
<xsl:when test="(@name = 'warning')">
<xsl:text>meta 'warning' provides warning information about a known problem that impedes proper operation</xsl:text>
</xsl:when>
+ <xsl:otherwise>
+ <xsl:text>author-defined metadata</xsl:text>
+ </xsl:otherwise>
</xsl:choose>
</xsl:attribute>
</xsl:when>
+ <xsl:when test="local-name()='Scene'">
+ <xsl:attribute name="title">
+ <xsl:text>Scene is the root node that contains an X3D scene graph</xsl:text>
+ </xsl:attribute>
+ </xsl:when>
<xsl:when test="local-name()='ROUTE'">
<xsl:attribute name="title">
<xsl:text>ROUTE connects fields between nodes to enable event passing</xsl:text>
@@ -602,7 +624,7 @@
</xsl:when>
<xsl:when test="local-name()='Shape'">
<xsl:attribute name="title">
- <xsl:text>Shape contains Appearance and corresonding geometry</xsl:text>
+ <xsl:text>Shape contains geometry and corresponding (optional) Appearance</xsl:text>
</xsl:attribute>
</xsl:when>
<xsl:when test="local-name()='Appearance'">
@@ -650,6 +672,12 @@
<xsl:text>Transform translates, orients and scales child geometry within the local world coordinate system</xsl:text>
</xsl:attribute>
</xsl:when>
+ <!-- otherwise preclude displaying parent-element tooltip on children by clearing it -->
+ <xsl:otherwise>
+ <xsl:attribute name="title">
+ <xsl:text></xsl:text>
+ </xsl:attribute>
+ </xsl:otherwise>
</xsl:choose>
<xsl:choose>
@@ -708,8 +736,8 @@
<!-- finish initial tag of pair -->
<xsl:text>> </xsl:text>
+ <!-- DEBUG statements are for use in X3D Validator servlet output excerpt:
<xsl:if test="(local-name() ='Scene')">
- <!-- DEBUG statements are here so that they are included in X3D Validator servlet output excerpt:
<xsl:comment>
<xsl:text>$linkImages=</xsl:text>
<xsl:value-of select="$linkImages"/>
@@ -718,8 +746,8 @@
<xsl:text>$baseUrlAvailable=</xsl:text>
<xsl:value-of select="$baseUrlAvailable"/>
</xsl:comment>
+ </xsl:if>
-->
- </xsl:if>
<!-- indent children -->
<div class="indent">
@@ -1375,7 +1403,7 @@
</xsl:when>
<xsl:when test="(local-name(..)='X3D' and local-name()='noNamespaceSchemaLocation')">
<!-- xmlns:xsd attribute typically not seen, so insert it into pretty-print HTML -->
- <span title="XML namespace for X3D Graphics schema validation">
+ <span title="XML namespace for XML Schema validation">
<xsl:if test="not(../@xsd)"> <!-- not(../@xmlns:xsd) and -->
<span class="attribute">
<xsl:text>xmlns:xsd</xsl:text>
@@ -1390,6 +1418,9 @@
</xsl:attribute>
<xsl:text>http://www.w3.org/2001/XMLSchema-instance</xsl:text></xsl:element><xsl:text>' </xsl:text>
</xsl:if>
+ </span>
+ <!-- now finish with encountered attribute -->
+ <span title="XML namespace for X3D Graphics schema validation">
<span class="attribute">
<xsl:text>xsd:</xsl:text>
<xsl:value-of select="local-name()"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2012-06-10 04:55:39
|
Revision: 10958
http://x3d.svn.sourceforge.net/x3d/?rev=10958&view=rev
Author: brutzman
Date: 2012-06-10 04:55:33 +0000 (Sun, 10 Jun 2012)
Log Message:
-----------
various tooltip additions and editorial improvements
Modified Paths:
--------------
www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
Modified: www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
===================================================================
--- www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-06-10 04:53:11 UTC (rev 10957)
+++ www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-06-10 04:55:33 UTC (rev 10958)
@@ -480,34 +480,21 @@
<xsl:value-of select="count(*)"/>
</xsl:message>
-->
-
- <!-- tooltips for each node -->
- <xsl:element name="span">
- <!-- apply tooltips for each node -->
+ <xsl:variable name="elementTooltip">
<xsl:choose>
<xsl:when test="local-name()='X3D'">
- <xsl:attribute name="title">
- <xsl:text>X3D is the top-most XML element for an Extensible 3D (X3D) Graphics file</xsl:text>
- </xsl:attribute>
+ <xsl:text>X3D is the top-most XML element for an Extensible 3D (X3D) Graphics file</xsl:text>
</xsl:when>
<xsl:when test="local-name()='head'">
- <xsl:attribute name="title">
- <xsl:text>head can contain component, unit, and author-defined metadata (meta) tags</xsl:text>
- </xsl:attribute>
+ <xsl:text>head can contain component, unit, and author-defined metadata (meta) tags</xsl:text>
</xsl:when>
<xsl:when test="local-name()='component'">
- <xsl:attribute name="title">
- <xsl:text>component indicates needed scene functionality above the given X3D profile</xsl:text>
- </xsl:attribute>
+ <xsl:text>component indicates needed scene functionality above the given X3D profile</xsl:text>
</xsl:when>
- <xsl:when test="local-name()='unit'">
- <xsl:attribute name="title">
- <xsl:text>unit defines scene scaling factors for length, angle, mass or force</xsl:text>
- </xsl:attribute>
+ <xsl:when test="local-name()='unit'"><xsl:text>unit defines scene scaling factors for length, angle, mass or force</xsl:text>
</xsl:when>
<xsl:when test="local-name()='meta'">
- <xsl:attribute name="title">
- <xsl:choose>
+ <xsl:choose>
<!-- also used in X3D-Edit X3DSchemaData.java -->
<xsl:when test="(@name = 'title')">
<xsl:text>meta 'title' provides file name for this resource</xsl:text>
@@ -600,89 +587,168 @@
<xsl:text>author-defined metadata</xsl:text>
</xsl:otherwise>
</xsl:choose>
- </xsl:attribute>
</xsl:when>
<xsl:when test="local-name()='Scene'">
- <xsl:attribute name="title">
- <xsl:text>Scene is the root node that contains an X3D scene graph</xsl:text>
- </xsl:attribute>
+ <xsl:text>Scene is the root node that contains an X3D scene graph</xsl:text>
</xsl:when>
<xsl:when test="local-name()='ROUTE'">
- <xsl:attribute name="title">
- <xsl:text>ROUTE connects fields between nodes to enable event passing</xsl:text>
- </xsl:attribute>
+ <xsl:text>ROUTE connects fields between nodes to enable event passing</xsl:text>
</xsl:when>
<xsl:when test="local-name()='IMPORT'">
- <xsl:attribute name="title">
- <xsl:text>IMPORT provides ROUTE access to a node that is EXPORTed by an Inline scene</xsl:text>
- </xsl:attribute>
+ <xsl:text>IMPORT provides ROUTE access to a node that is EXPORTed by an Inline scene</xsl:text>
</xsl:when>
<xsl:when test="local-name()='EXPORT'">
- <xsl:attribute name="title">
- <xsl:text>EXPORT exposes a local node for ROUTEing when the current Scene is Inlined by an external world</xsl:text>
- </xsl:attribute>
+ <xsl:text>EXPORT exposes a local node for ROUTEing when the current Scene is Inlined by an external world</xsl:text>
</xsl:when>
<xsl:when test="local-name()='Shape'">
- <xsl:attribute name="title">
- <xsl:text>Shape contains geometry and corresponding (optional) Appearance</xsl:text>
- </xsl:attribute>
+ <xsl:text>Shape contains geometry and corresponding (optional) Appearance</xsl:text>
</xsl:when>
<xsl:when test="local-name()='Appearance'">
- <xsl:attribute name="title">
- <xsl:text>Appearance specifies visual properties of geometry by containing Material, Texture and TextureTransform nodes</xsl:text>
- </xsl:attribute>
+ <xsl:text>Appearance specifies visual properties of geometry by containing Material, Texture and TextureTransform nodes</xsl:text>
</xsl:when>
<xsl:when test="local-name()='Material'">
- <xsl:attribute name="title">
- <xsl:text>Material specifies surface rendering properties for associated geometry</xsl:text>
- </xsl:attribute>
+ <xsl:text>Material specifies surface rendering properties for associated geometry</xsl:text>
</xsl:when>
<xsl:when test="local-name()='TwoSidedMaterial'">
- <xsl:attribute name="title">
- <xsl:text>TwoSidedMaterial specifies surface rendering properties for associated geometry, for outer (front) and inner (back) sides of polygons</xsl:text>
- </xsl:attribute>
+ <xsl:text>TwoSidedMaterial specifies surface rendering properties for associated geometry, for outer (front) and inner (back) sides of polygons</xsl:text>
</xsl:when>
+ <xsl:when test="local-name()='ImageTexture'">
+ <xsl:text>ImageTexture maps a 2D-image file onto a geometric shape</xsl:text>
+ </xsl:when>
+ <xsl:when test="local-name()='MovieTexture'">
+ <xsl:text>MovieTexture applies a 2D movie image to surface geometry, or provides audio for a Sound node</xsl:text>
+ </xsl:when>
+ <xsl:when test="local-name()='PixelTexture'">
+ <xsl:text>PixelTexture creates a 2D-image texture map using a numeric array of pixel values</xsl:text>
+ </xsl:when>
+ <xsl:when test="local-name()='Viewpoint'">
+ <xsl:text>Viewpoint provides a specific location and direction where the user may view the scene</xsl:text>
+ </xsl:when>
+ <xsl:when test="local-name()='NavigationInfo'">
+ <xsl:text>NavigationInfo describes the viewing model and physical characteristics of the viewer's avatar</xsl:text>
+ </xsl:when>
+ <xsl:when test="(local-name()='Background') or (local-name()='TextureBackground')">
+ <xsl:value-of select="local-name()"/>
+ <xsl:text> simulates ground and sky, using vertical arrays of wraparound color values or backdrop textures on all six sides</xsl:text>
+ </xsl:when>
<xsl:when test="local-name()='Anchor'">
- <xsl:attribute name="title">
- <xsl:text>Selecting Anchored geometry loads content specified by the url field</xsl:text>
- </xsl:attribute>
+ <xsl:text>Selecting Anchored geometry loads content specified by the url field</xsl:text>
</xsl:when>
<xsl:when test="local-name()='Billboard'">
- <xsl:attribute name="title">
- <xsl:text>Billboard content faces the user, rotating about the specified axis</xsl:text>
- </xsl:attribute>
+ <xsl:text>Billboard content faces the user, rotating about the specified axis</xsl:text>
</xsl:when>
<xsl:when test="local-name()='Collision'">
- <xsl:attribute name="title">
- <xsl:text>Collision detects camera-to-object contact using current view and NavigationInfo avatarSize</xsl:text>
- </xsl:attribute>
+ <xsl:text>Collision detects camera-to-object contact using current view and NavigationInfo avatarSize</xsl:text>
</xsl:when>
- <xsl:when test="local-name()='Group'">
- <xsl:attribute name="title">
- <xsl:text>Group is a Grouping node that can contain most nodes</xsl:text>
- </xsl:attribute>
+ <xsl:when test="local-name()='Inline'">
+ <xsl:text>Inline is a Grouping node that can load nodes from another X3D scene via url</xsl:text>
</xsl:when>
<xsl:when test="local-name()='Group'">
- <xsl:attribute name="title">
- <xsl:text>Group is a Grouping node that can contain most nodes</xsl:text>
- </xsl:attribute>
+ <xsl:text>Group is a Grouping node that can contain most nodes</xsl:text>
</xsl:when>
+ <xsl:when test="local-name()='StaticGroup'">
+ <xsl:text>StaticGroup is a Grouping node whose children do not change, send events, receive events, or include re-USE-able content.</xsl:text>
+ </xsl:when>
+ <xsl:when test="local-name()='LOD'">
+ <xsl:text>LOD (Level Of Detail) uses camera-to-object distance to switch among contained child levels</xsl:text>
+ </xsl:when>
+ <xsl:when test="local-name()='Switch'">
+ <xsl:text>Switch is a Grouping node that only renders one (or zero) child at a time</xsl:text>
+ </xsl:when>
<xsl:when test="local-name()='Transform'">
- <xsl:attribute name="title">
- <xsl:text>Transform translates, orients and scales child geometry within the local world coordinate system</xsl:text>
- </xsl:attribute>
+ <xsl:text>Transform translates, orients and scales child geometry within the local world coordinate system</xsl:text>
</xsl:when>
- <!-- otherwise preclude displaying parent-element tooltip on children by clearing it -->
- <xsl:otherwise>
- <xsl:attribute name="title">
- <xsl:text></xsl:text>
- </xsl:attribute>
- </xsl:otherwise>
+ <xsl:when test="(local-name()='Box') or (local-name()='Cone') or (local-name()='Cylinder') or (local-name()='Sphere') or (local-name()='Text')">
+ <xsl:value-of select="local-name()"/>
+ <xsl:text> is a geometry primitive node</xsl:text>
+ </xsl:when>
+ <xsl:when test="contains(local-name(),'LineSet') or contains(local-name(),'FaceSet') or contains(local-name(),'Triangle') or contains(local-name(),'Quad') or (local-name()='ElevationGrid') or (local-name()='Extrusion') or (local-name()='PointSet')">
+ <xsl:value-of select="local-name()"/>
+ <xsl:text> is a geometry node</xsl:text>
+ </xsl:when>
+ <xsl:when test="(local-name()='FontStyle')">
+ <xsl:text>FontStyle defines the size, family, justification, and other styles used by Text nodes</xsl:text>
+ </xsl:when>
+ <xsl:when test="(local-name()='Coordinate') or (local-name()='CoordinateDouble')">
+ <xsl:value-of select="local-name()"/>
+ <xsl:text> defines a set of 3D coordinate triplet values</xsl:text>
+ </xsl:when>
+ <xsl:when test="(local-name()='Color')">
+ <xsl:text>Color defines a set of color triplet values</xsl:text>
+ </xsl:when>
+ <xsl:when test="(local-name()='ColorRGBA')">
+ <xsl:text>ColorRGBA defines a set of color 4-tuple values</xsl:text>
+ </xsl:when>
+ <xsl:when test="(local-name()='Normal')">
+ <xsl:text>Normal defines a set of 3D surface-normal vectors</xsl:text>
+ </xsl:when>
+ <xsl:when test="contains(local-name(),'Interpolator')">
+ <xsl:text>Interpolator nodes output event values</xsl:text>
+ </xsl:when>
+ <xsl:when test="contains(local-name(),'Sequencer')">
+ <xsl:text>Sequencer nodes output event values</xsl:text>
+ </xsl:when>
+ <xsl:when test="local-name()='BooleanFilter'">
+ <xsl:text>BooleanFilter selectively passes true, false or negated events</xsl:text>
+ </xsl:when>
+ <xsl:when test="local-name()='BooleanTrigger'">
+ <xsl:text>BooleanTrigger converts time events to boolean true events</xsl:text>
+ </xsl:when>
+ <xsl:when test="local-name()='IntegerTrigger'">
+ <xsl:text>IntegerTrigger converts boolean true or time input events to an integer value</xsl:text>
+ </xsl:when>
+ <xsl:when test="local-name()='TimeTrigger'">
+ <xsl:text>TimeTrigger converts boolean true events to time events</xsl:text>
+ </xsl:when>
+ <xsl:when test="local-name()='TimeSensor'">
+ <xsl:text>TimeSensor continuously generates events as time passes</xsl:text>
+ </xsl:when>
+ <xsl:when test="local-name()='TouchSensor'">
+ <xsl:text>TouchSensor tracks location & state of the pointing device, and detects when user points at geometry</xsl:text>
+ </xsl:when>
+ <xsl:when test="local-name()='AudioClip'">
+ <xsl:text>AudioClip provides audio data used by Sound nodes</xsl:text>
+ </xsl:when>
+ <xsl:when test="local-name()='Sound'">
+ <xsl:text>Sound controls an AudioClip or MovieTexture for sound playback</xsl:text>
+ </xsl:when>
+ <xsl:when test="local-name()='WorldInfo'">
+ <xsl:text>WorldInfo contains persistent documentation information about the 3D world</xsl:text>
+ </xsl:when>
+ <xsl:when test="starts-with(local-name(),'CAD')">
+ <xsl:value-of select="local-name()"/>
+ <xsl:text> is a Computer-Aided Design (CAD) node</xsl:text>
+ </xsl:when>
+ <xsl:when test="contains(local-name(),'Espdu') or contains(local-name(),'Pdu')">
+ <xsl:value-of select="local-name()"/>
+ <xsl:text> is a networked Distributed Interactive Simulation (DIS) node</xsl:text>
+ </xsl:when>
+ <xsl:when test="starts-with(local-name(),'Geo')">
+ <xsl:value-of select="local-name()"/>
+ <xsl:text> is a geographic node</xsl:text>
+ </xsl:when>
+ <xsl:when test="starts-with(local-name(),'HAnim')">
+ <xsl:value-of select="local-name()"/>
+ <xsl:text> is a Humanoid Animation (H-Anim) node</xsl:text>
+ </xsl:when>
+ <xsl:when test="starts-with(local-name(),'NURBS')">
+ <xsl:value-of select="local-name()"/>
+ <xsl:text> is a Non Uniform Rational B-Spline (NURBS) node</xsl:text>
+ </xsl:when>
</xsl:choose>
-
+ </xsl:variable>
+
+ <!-- tooltips for each node -->
+ <xsl:element name="span">
+ <!-- apply tooltips for each node -->
<xsl:choose>
<!-- check for existence of children -->
<xsl:when test="boolean(* | comment() ) or (local-name()='Script') or $containsTextData">
+ <xsl:if test="string-length($elementTooltip) > 0">
+ <xsl:text disable-output-escaping="yes"><span title="</xsl:text>
+ <xsl:value-of select="$elementTooltip"/>
+ <xsl:text disable-output-escaping="yes">"></xsl:text>
+ </xsl:if>
<!-- open tag for current element, which is a parent -->
<xsl:text><</xsl:text>
<xsl:call-template name="style-element-name" />
@@ -735,6 +801,9 @@
<xsl:call-template name="process-attributes-in-order" />
<!-- finish initial tag of pair -->
<xsl:text>> </xsl:text>
+ <xsl:if test="string-length($elementTooltip) > 0">
+ <xsl:text disable-output-escaping="yes"></span></xsl:text>
+ </xsl:if>
<!-- DEBUG statements are for use in X3D Validator servlet output excerpt:
<xsl:if test="(local-name() ='Scene')">
@@ -793,12 +862,25 @@
</xsl:choose>
</div>
<!-- close tag for this element -->
+ <xsl:if test="string-length($elementTooltip) > 0">
+ <xsl:text disable-output-escaping="yes"><span title="</xsl:text>
+ <xsl:value-of select="$elementTooltip"/>
+ <xsl:text disable-output-escaping="yes">"></xsl:text>
+ </xsl:if>
<xsl:text></</xsl:text>
<xsl:call-template name="style-element-name" />
<xsl:text>> </xsl:text>
+ <xsl:if test="string-length($elementTooltip) > 0">
+ <xsl:text disable-output-escaping="yes"></span></xsl:text>
+ </xsl:if>
</xsl:when>
<xsl:otherwise>
<!-- single tag, no children -->
+ <xsl:if test="string-length($elementTooltip) > 0">
+ <xsl:text disable-output-escaping="yes"><span title="</xsl:text>
+ <xsl:value-of select="$elementTooltip"/>
+ <xsl:text disable-output-escaping="yes">"></xsl:text>
+ </xsl:if>
<xsl:text><</xsl:text>
<xsl:call-template name="style-element-name" />
<!-- handle attribute(s) if any -->
@@ -806,6 +888,9 @@
<!-- finish singleton tag -->
<xsl:text>/> </xsl:text>
+ <xsl:if test="string-length($elementTooltip) > 0">
+ <xsl:text disable-output-escaping="yes"></span></xsl:text>
+ </xsl:if>
</xsl:otherwise>
</xsl:choose>
<!-- end of span for title tooltip -->
@@ -1382,6 +1467,35 @@
not(contains(local-name(),'set_')) and
not(contains(local-name(),'_changed')) and
." >
+ <xsl:variable name="attributeTooltip">
+ <xsl:choose>
+ <xsl:when test="(local-name(..)='X3D') and (local-name()='profile')">
+ <xsl:choose>
+ <xsl:when test="(.='Core')">
+ <xsl:text>X3D Core Profile is minimalist, must add components to gain node support</xsl:text>
+ </xsl:when>
+ <xsl:when test="(.='Interchange')">
+ <xsl:text>X3D Interchange Profile supports simple geometry and animation</xsl:text>
+ </xsl:when>
+ <xsl:when test="(.='Interactive')">
+ <xsl:text>X3D Interactive Profile supports Interchange geometry and animation, plus basic user interaction</xsl:text>
+ </xsl:when>
+ <xsl:when test="(.='Interactive')">
+ <xsl:text>X3D Interactive Profile supports most nodes, similar to VRML97</xsl:text>
+ </xsl:when>
+ <xsl:when test="(.='CADInterchange')">
+ <xsl:text>X3D CADInterchange Profile supports Interchange geometry and animation, plus CAD structural nodes</xsl:text>
+ </xsl:when>
+ <xsl:when test="(.='Full')">
+ <xsl:text>X3D Full Profile supports all nodes and components</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>unrecognized profile, erroneous profile value!</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:variable>
<!-- good attribute found, output it -->
<xsl:choose>
<!-- break to new line prior to each of Background url fields -->
@@ -1394,7 +1508,12 @@
</xsl:choose>
<!-- save value as variable $value for later use in constraint pattern matching -->
<xsl:variable name="value" select="."/>
- <!-- style attribute name, as appropriate -->
+ <!-- style attribute name and add tooltip, as appropriate -->
+ <xsl:if test="string-length($attributeTooltip) > 0">
+ <xsl:text disable-output-escaping="yes"><span title="</xsl:text>
+ <xsl:value-of select="$attributeTooltip"/>
+ <xsl:text disable-output-escaping="yes">"></xsl:text>
+ </xsl:if>
<xsl:choose>
<xsl:when test="(local-name(..)='field' and (local-name()='appinfo' or local-name()='description'))">
<span class="gray">
@@ -1937,6 +2056,9 @@
</xsl:otherwise>
</xsl:choose>
<xsl:text>'</xsl:text>
+ <xsl:if test="string-length($attributeTooltip) > 0">
+ <xsl:text disable-output-escaping="yes"></span></xsl:text>
+ </xsl:if>
<!-- end if filtering of default attribute values -->
</xsl:if>
</xsl:template>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2012-06-10 17:05:41
|
Revision: 10966
http://x3d.svn.sourceforge.net/x3d/?rev=10966&view=rev
Author: brutzman
Date: 2012-06-10 17:05:35 +0000 (Sun, 10 Jun 2012)
Log Message:
-----------
various tooltip additions and editorial improvements
Modified Paths:
--------------
www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
Modified: www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
===================================================================
--- www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-06-10 16:40:16 UTC (rev 10965)
+++ www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-06-10 17:05:35 UTC (rev 10966)
@@ -290,10 +290,10 @@
<span style="color:white"><!--</span>
<xsl:text> </xsl:text>
Additional help information about X3D scenes:
- <a href="http://www.web3d.org/x3d/content/examples/X3dResources.html">X3D Resources</a>,
- <a href="http://www.web3d.org/x3d/content/examples/X3dSceneAuthoringHints.html">X3D Scene Authoring Hints</a>
+ <a href="http://www.web3d.org/x3d/content/examples/X3dResources.html" title="Numerous resources that support X3D">X3D Resources</a>,
+ <a href="http://www.web3d.org/x3d/content/examples/X3dSceneAuthoringHints.html" title="Style guidelines, authoring tips and best practices">X3D Scene Authoring Hints</a>
and
- <a href="http://www.web3d.org/x3d/content/X3dTooltips.html">X3D Tooltips</a>
+ <a href="http://www.web3d.org/x3d/content/X3dTooltips.html" title="Summary descriptions and authoring hints for each X3D node (element) and field (attribute)">X3D Tooltips</a>
<xsl:text> </xsl:text>
<span style="color:white">--></span>
<xsl:text> </xsl:text>
@@ -735,6 +735,31 @@
<xsl:value-of select="local-name()"/>
<xsl:text> is a Non Uniform Rational B-Spline (NURBS) node</xsl:text>
</xsl:when>
+ <xsl:when test="local-name()='ProtoDeclare'">
+ <xsl:text>ProtoDeclare is a Prototype declaration, defining a new node made up of other node(s)</xsl:text>
+ </xsl:when>
+ <xsl:when test="local-name()='ExternProtoDeclare'">
+ <xsl:text>ExternProtoDeclare refers to a ProtoDeclare node declaration provided in another file</xsl:text>
+ </xsl:when>
+ <xsl:when test="local-name()='field'">
+ <xsl:text>A field element defines an interface attribute or node</xsl:text>
+ <xsl:if test="(local-name(..)='Script') or (local-name(..)='ProtoDeclare') or (local-name(..)='ExternProtoDeclare')">
+ <xsl:text> for a parent </xsl:text>
+ <xsl:value-of select="local-name(..)"/>
+ </xsl:if>
+ </xsl:when>
+ <xsl:when test="local-name()='ProtoInstance'">
+ <xsl:text>ProtoInstance creates an instance of a locally or externally declared prototype node</xsl:text>
+ </xsl:when>
+ <xsl:when test="local-name()='fieldValue'">
+ <xsl:text>A fieldValue element is used to re-initialize a default field value in a ProtoInstance</xsl:text>
+ </xsl:when>
+ <xsl:when test="local-name()='IS'">
+ <xsl:text>IS connects ProtoDeclare interface fields to node fields inside ProtoDeclare definitions</xsl:text>
+ </xsl:when>
+ <xsl:when test="local-name()='connect'">
+ <xsl:text>connect tags define each ProtoDeclare field connection within ProtoDeclare definitions</xsl:text>
+ </xsl:when>
</xsl:choose>
</xsl:variable>
@@ -1494,6 +1519,12 @@
</xsl:otherwise>
</xsl:choose>
</xsl:when>
+ <xsl:when test="(local-name(..)='X3D' and local-name()='noNamespaceSchemaLocation')">
+ <xsl:text>XML namespace for X3D Graphics schema validation</xsl:text>
+ </xsl:when>
+ <xsl:when test="(local-name()='url') or contains(local-name(),'Url')">
+ <xsl:text>relative or absolute file-resource addresses, evaluated in order until retrieval succeeds</xsl:text>
+ </xsl:when>
</xsl:choose>
</xsl:variable>
<!-- good attribute found, output it -->
@@ -2019,7 +2050,7 @@
<!-- <xsl:message><xsl:text>svgFilename=</xsl:text><xsl:value-of select="$svgFilename"/></xsl:message> -->
<xsl:element name="a">
<xsl:attribute name="title">
- <xsl:text>SVG image of Extrusion crossSection</xsl:text>
+ <xsl:text>Extrusion crossSection shown as Scalable Vector Graphics (SVG) plot</xsl:text>
</xsl:attribute>
<xsl:attribute name="href">
<xsl:text>_svg/</xsl:text>
@@ -2192,7 +2223,9 @@
<xsl:text> </xsl:text>
<xsl:element name="a">
<xsl:attribute name="title">
- <xsl:text>go to this node</xsl:text>
+ <xsl:text>go to this </xsl:text>
+ <xsl:value-of select="local-name()"/>
+ <xsl:text> node</xsl:text>
</xsl:attribute>
<xsl:attribute name="href">
<xsl:text>#</xsl:text>
@@ -2237,7 +2270,9 @@
</xsl:variable>
<xsl:element name="a">
<xsl:attribute name="title">
- <xsl:text>go to this node</xsl:text>
+ <xsl:text>go to this </xsl:text>
+ <xsl:value-of select="local-name()"/>
+ <xsl:text> node</xsl:text>
</xsl:attribute>
<xsl:attribute name="href">
<xsl:text>#</xsl:text>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2012-06-10 17:28:11
|
Revision: 10967
http://x3d.svn.sourceforge.net/x3d/?rev=10967&view=rev
Author: brutzman
Date: 2012-06-10 17:28:04 +0000 (Sun, 10 Jun 2012)
Log Message:
-----------
various tooltip additions and editorial improvements
Modified Paths:
--------------
www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
Modified: www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
===================================================================
--- www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-06-10 17:05:35 UTC (rev 10966)
+++ www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-06-10 17:28:04 UTC (rev 10967)
@@ -290,7 +290,7 @@
<span style="color:white"><!--</span>
<xsl:text> </xsl:text>
Additional help information about X3D scenes:
- <a href="http://www.web3d.org/x3d/content/examples/X3dResources.html" title="Numerous resources that support X3D">X3D Resources</a>,
+ <a href="http://www.web3d.org/x3d/content/examples/X3dResources.html" title="Numerous resources that support X3D graphics">X3D Resources</a>,
<a href="http://www.web3d.org/x3d/content/examples/X3dSceneAuthoringHints.html" title="Style guidelines, authoring tips and best practices">X3D Scene Authoring Hints</a>
and
<a href="http://www.web3d.org/x3d/content/X3dTooltips.html" title="Summary descriptions and authoring hints for each X3D node (element) and field (attribute)">X3D Tooltips</a>
@@ -682,11 +682,29 @@
<xsl:when test="(local-name()='Normal')">
<xsl:text>Normal defines a set of 3D surface-normal vectors</xsl:text>
</xsl:when>
+ <xsl:when test="(local-name()='DirectionalLight')">
+ <xsl:text>DirectionalLight creates parallel light rays to illuminate geometric shapes</xsl:text>
+ </xsl:when>
+ <xsl:when test="(local-name()='PointLight')">
+ <xsl:text>PointLight is a single light source that illuminates outwards in all directions</xsl:text>
+ </xsl:when>
+ <xsl:when test="(local-name()='SpotLight')">
+ <xsl:text>SpotLight is a light source that illuminates geometry within a conical beam</xsl:text>
+ </xsl:when>
<xsl:when test="contains(local-name(),'Interpolator')">
- <xsl:text>Interpolator nodes output event values</xsl:text>
+ <xsl:text>Interpolator nodes output event values using piecewise-linear function definitions</xsl:text>
</xsl:when>
+ <xsl:when test="contains(local-name(),'Chaser')">
+ <xsl:text>Chaser nodes output event values that progressively change from initial value to destination value</xsl:text>
+ </xsl:when>
+ <xsl:when test="contains(local-name(),'Damper')">
+ <xsl:text>Damper nodes output event values that progressively change from initial value to destination value</xsl:text>
+ </xsl:when>
+ <xsl:when test="contains(local-name(),'2D') and not(contains(local-name(),'Nurbs'))">
+ <xsl:text>2D geometry node</xsl:text>
+ </xsl:when>
<xsl:when test="contains(local-name(),'Sequencer')">
- <xsl:text>Sequencer nodes output event values</xsl:text>
+ <xsl:text>Sequencer nodes output discrete event values</xsl:text>
</xsl:when>
<xsl:when test="local-name()='BooleanFilter'">
<xsl:text>BooleanFilter selectively passes true, false or negated events</xsl:text>
@@ -706,6 +724,9 @@
<xsl:when test="local-name()='TouchSensor'">
<xsl:text>TouchSensor tracks location & state of the pointing device, and detects when user points at geometry</xsl:text>
</xsl:when>
+ <xsl:when test="contains(local-name(),'Sensor')">
+ <xsl:text>Sensor nodes convert user interaction into events</xsl:text>
+ </xsl:when>
<xsl:when test="local-name()='AudioClip'">
<xsl:text>AudioClip provides audio data used by Sound nodes</xsl:text>
</xsl:when>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2012-06-10 17:42:22
|
Revision: 10969
http://x3d.svn.sourceforge.net/x3d/?rev=10969&view=rev
Author: brutzman
Date: 2012-06-10 17:42:16 +0000 (Sun, 10 Jun 2012)
Log Message:
-----------
fix Immersive profile tooltip, better url tooltip
Modified Paths:
--------------
www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
Modified: www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
===================================================================
--- www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-06-10 17:28:54 UTC (rev 10968)
+++ www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-06-10 17:42:16 UTC (rev 10969)
@@ -1526,8 +1526,8 @@
<xsl:when test="(.='Interactive')">
<xsl:text>X3D Interactive Profile supports Interchange geometry and animation, plus basic user interaction</xsl:text>
</xsl:when>
- <xsl:when test="(.='Interactive')">
- <xsl:text>X3D Interactive Profile supports most nodes, similar to VRML97</xsl:text>
+ <xsl:when test="(.='Immersive')">
+ <xsl:text>X3D Immersive Profile supports most nodes, similar to VRML97</xsl:text>
</xsl:when>
<xsl:when test="(.='CADInterchange')">
<xsl:text>X3D CADInterchange Profile supports Interchange geometry and animation, plus CAD structural nodes</xsl:text>
@@ -1544,7 +1544,7 @@
<xsl:text>XML namespace for X3D Graphics schema validation</xsl:text>
</xsl:when>
<xsl:when test="(local-name()='url') or contains(local-name(),'Url')">
- <xsl:text>relative or absolute file-resource addresses, evaluated in order until retrieval succeeds</xsl:text>
+ <xsl:text>uniform resource locator (url) list of relative or absolute file addresses, evaluated in order until retrieval succeeds</xsl:text>
</xsl:when>
</xsl:choose>
</xsl:variable>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2012-06-11 04:30:29
|
Revision: 10982
http://x3d.svn.sourceforge.net/x3d/?rev=10982&view=rev
Author: brutzman
Date: 2012-06-11 04:30:23 +0000 (Mon, 11 Jun 2012)
Log Message:
-----------
corrected capitalization
Modified Paths:
--------------
www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
Modified: www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
===================================================================
--- www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-06-11 04:27:15 UTC (rev 10981)
+++ www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-06-11 04:30:23 UTC (rev 10982)
@@ -604,7 +604,7 @@
<xsl:text>Shape contains geometry and corresponding (optional) Appearance</xsl:text>
</xsl:when>
<xsl:when test="local-name()='Appearance'">
- <xsl:text>Appearance specifies visual properties of geometry by containing Material, Texture and TextureTransform nodes</xsl:text>
+ <xsl:text>Appearance specifies visual properties of geometry by containing Material, texture and TextureTransform nodes</xsl:text>
</xsl:when>
<xsl:when test="local-name()='Material'">
<xsl:text>Material specifies surface rendering properties for associated geometry</xsl:text>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2012-06-11 19:15:23
|
Revision: 10986
http://x3d.svn.sourceforge.net/x3d/?rev=10986&view=rev
Author: brutzman
Date: 2012-06-11 19:15:16 +0000 (Mon, 11 Jun 2012)
Log Message:
-----------
improved tooltips and url link formatting
Modified Paths:
--------------
www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
Modified: www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
===================================================================
--- www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-06-11 19:14:47 UTC (rev 10985)
+++ www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-06-11 19:15:16 UTC (rev 10986)
@@ -784,8 +784,8 @@
</xsl:choose>
</xsl:variable>
- <!-- tooltips for each node -->
- <xsl:element name="span">
+ <!-- tooltips for each node
+ <xsl:element name="span"> -->
<!-- apply tooltips for each node -->
<xsl:choose>
<!-- check for existence of children -->
@@ -939,8 +939,8 @@
</xsl:if>
</xsl:otherwise>
</xsl:choose>
- <!-- end of span for title tooltip -->
- </xsl:element>
+ <!-- end of span for title tooltip
+ </xsl:element> -->
<!-- <xsl:if test="last() > position()"><xsl:text disable-output-escaping="yes"><br /></xsl:text></xsl:if> -->
<!-- element complete, insert index (after head tag prior to Scene tag, or after final X3D) or else break -->
<xsl:if test="local-name()='head' or local-name()='X3D'">
@@ -1544,8 +1544,16 @@
<xsl:text>XML namespace for X3D Graphics schema validation</xsl:text>
</xsl:when>
<xsl:when test="(local-name()='url') or contains(local-name(),'Url')">
- <xsl:text>uniform resource locator (url) list of relative or absolute file addresses, evaluated in order until retrieval succeeds</xsl:text>
+ <xsl:text>uniform resource locator (url) list of relative or absolute file addresses, performed in order until resource retrieval succeeds</xsl:text>
</xsl:when>
+ <xsl:when test="((local-name(..)='ProtoDeclare' or local-name(..)='ExternProtoDeclare' or local-name(..)='field' or local-name(..)='fieldValue') and local-name()='documentation')">
+ <xsl:text>documentation url providing further information for this </xsl:text>
+ <xsl:value-of select="local-name(..)"/>
+ </xsl:when>
+ <xsl:when test="((local-name(..)='ProtoDeclare' or local-name(..)='ExternProtoDeclare' or local-name(..)='field' or local-name(..)='fieldValue') and local-name()='appinfo')">
+ <xsl:text>application information for this </xsl:text>
+ <xsl:value-of select="local-name(..)"/>
+ </xsl:when>
</xsl:choose>
</xsl:variable>
<!-- good attribute found, output it -->
@@ -1567,7 +1575,7 @@
<xsl:text disable-output-escaping="yes">"></xsl:text>
</xsl:if>
<xsl:choose>
- <xsl:when test="(local-name(..)='field' and (local-name()='appinfo' or local-name()='description'))">
+ <xsl:when test="((local-name(..)='ProtoDeclare' or local-name(..)='ExternProtoDeclare' or local-name(..)='field' or local-name(..)='fieldValue') and (local-name()='appinfo' or local-name()='description'))">
<span class="gray">
<xsl:value-of select="local-name()"/>
</span>
@@ -1657,7 +1665,7 @@
</span>
</xsl:when>
<xsl:when test="((local-name(..)='field' or local-name(..)='fieldValue') and local-name()='appinfo')">
- <span class="gray" title="appinfo provides simple application information, usable as a tooltip description">
+ <span class="gray">
<xsl:value-of select="."/>
</span>
</xsl:when>
@@ -1924,6 +1932,14 @@
<xsl:value-of select="."/>
</xsl:element>
</xsl:when>
+ <xsl:when test="$isUrlField">
+ <xsl:text> </xsl:text>
+ <xsl:call-template name="URL-ize-MFString-elements">
+ <xsl:with-param name="list" select="."/>
+ <xsl:with-param name="urlsOnly"><xsl:value-of select="$isUrlField"/></xsl:with-param>
+ <xsl:with-param name="insertBreaks"><xsl:text>false</xsl:text></xsl:with-param>
+ </xsl:call-template>
+ </xsl:when>
<xsl:when test="contains(.,'"')">
<xsl:text> </xsl:text>
<xsl:call-template name="URL-ize-MFString-elements">
@@ -2154,7 +2170,7 @@
<!-- ****** XML processing-instruction ****** -->
<xsl:template match="processing-instruction()">
- <span title="XML processing instruction, hidden as a comment"><xsl:text><-- </xsl:text><xsl:value-of select="."/><xsl:text> --> </xsl:text></span>
+ <span title="XML processing instruction, hidden as a comment"><code><xsl:text><-- </xsl:text></code><xsl:value-of select="."/><code><xsl:text> --> </xsl:text></code></span>
</xsl:template>
<xsl:template name="ID-link-index">
@@ -2367,9 +2383,11 @@
<xsl:choose>
<xsl:when test="($baseUrlAvailable='true')">
<xsl:text> </xsl:text>
- <xsl:if test="$insertBreaks='true'">
+ <!--
+ <xsl:if test="($insertBreaks='true') and not($urlsOnly)">
<xsl:text disable-output-escaping="yes"><br /></xsl:text>
</xsl:if>
+ -->
<xsl:element name="a">
<xsl:attribute name="href">
<xsl:value-of disable-output-escaping="yes" select="$nextURL"/>
@@ -2377,7 +2395,7 @@
<xsl:value-of select="$nextURL"/>
</xsl:element>
<xsl:text> </xsl:text>
- <xsl:if test="($insertBreaks='true') and not(starts-with(normalize-space($restURLs),'ftp://')) and not(starts-with(normalize-space($restURLs),'sftp://')) and not(starts-with(normalize-space($restURLs),'http://'))">
+ <xsl:if test="($insertBreaks='true') and not($urlsOnly) and not(starts-with(normalize-space($restURLs),'ftp://')) and not(starts-with(normalize-space($restURLs),'sftp://')) and not(starts-with(normalize-space($restURLs),'http://'))">
<xsl:text disable-output-escaping="yes"><br /></xsl:text>
</xsl:if>
</xsl:when>
@@ -2391,7 +2409,7 @@
<xsl:when test="($urlsOnly='true') and (contains($nextURL,'sftp://')) and not(contains(substring-before($nextURL,'sftp://'),'http://'))">
<!-- sftp:// found next -->
<xsl:value-of disable-output-escaping="yes" select="substring-before($nextURL,'sftp://')"/>
- <xsl:if test="$insertBreaks='true'">
+ <xsl:if test="($insertBreaks='true') and not($urlsOnly)">
<xsl:text disable-output-escaping="yes"><br /></xsl:text>
</xsl:if>
<xsl:element name="a">
@@ -2403,7 +2421,7 @@
<xsl:value-of select="normalize-space(substring-after($nextURL,'sftp://'))"/>
</xsl:element>
<xsl:text> </xsl:text>
- <xsl:if test="($insertBreaks='true') and not(starts-with(normalize-space($restURLs),'sftp://')) and not(starts-with(normalize-space($restURLs),'http://'))">
+ <xsl:if test="($insertBreaks='true') and not($urlsOnly) and not(starts-with(normalize-space($restURLs),'sftp://')) and not(starts-with(normalize-space($restURLs),'http://'))">
<xsl:text disable-output-escaping="yes"><br /></xsl:text>
</xsl:if>
</xsl:when>
@@ -2411,7 +2429,7 @@
<xsl:when test="($urlsOnly='true') and (contains($nextURL,'ftp://')) and not(contains(substring-before($nextURL,'ftp://'),'http://'))">
<!-- ftp:// found next -->
<xsl:value-of disable-output-escaping="yes" select="substring-before($nextURL,'ftp://')"/>
- <xsl:if test="$insertBreaks='true'">
+ <xsl:if test="($insertBreaks='true') and not($urlsOnly)">
<xsl:text disable-output-escaping="yes"><br /></xsl:text>
</xsl:if>
<xsl:element name="a">
@@ -2423,7 +2441,7 @@
<xsl:value-of select="normalize-space(substring-after($nextURL,'ftp://'))"/>
</xsl:element>
<xsl:text> </xsl:text>
- <xsl:if test="($insertBreaks='true') and not(starts-with(normalize-space($restURLs),'ftp://')) and not(starts-with(normalize-space($restURLs),'http://'))">
+ <xsl:if test="($insertBreaks='true') and not($urlsOnly) and not(starts-with(normalize-space($restURLs),'ftp://')) and not(starts-with(normalize-space($restURLs),'http://'))">
<xsl:text disable-output-escaping="yes"><br /></xsl:text>
</xsl:if>
</xsl:when>
@@ -2431,7 +2449,7 @@
<xsl:when test="($urlsOnly='true') and (contains($nextURL,'http://'))">
<!-- http:// found next -->
<xsl:value-of disable-output-escaping="yes" select="substring-before($nextURL,'http://')"/>
- <xsl:if test="$insertBreaks='true'">
+ <xsl:if test="($insertBreaks='true') and not($urlsOnly)">
<xsl:text disable-output-escaping="yes"><br /></xsl:text>
</xsl:if>
<xsl:element name="a">
@@ -2443,7 +2461,7 @@
<xsl:value-of select="normalize-space(substring-after($nextURL,'http://'))"/>
</xsl:element>
<xsl:text> </xsl:text>
- <xsl:if test="($insertBreaks='true') and not(starts-with(normalize-space($restURLs),'ftp://')) and not(starts-with(normalize-space($restURLs),'http://'))">
+ <xsl:if test="($insertBreaks='true') and not($urlsOnly) and not(starts-with(normalize-space($restURLs),'ftp://')) and not(starts-with(normalize-space($restURLs),'http://'))">
<xsl:text disable-output-escaping="yes"><br /></xsl:text>
</xsl:if>
</xsl:when>
@@ -2451,7 +2469,7 @@
<xsl:when test="($urlsOnly='true') and (contains($nextURL,'https://'))">
<!-- https:// found next -->
<xsl:value-of disable-output-escaping="yes" select="substring-before($nextURL,'https://')"/>
- <xsl:if test="$insertBreaks='true'">
+ <xsl:if test="($insertBreaks='true') and not($urlsOnly)">
<xsl:text disable-output-escaping="yes"><br /></xsl:text>
</xsl:if>
<xsl:element name="a">
@@ -2463,7 +2481,7 @@
<xsl:value-of select="normalize-space(substring-after($nextURL,'https://'))"/>
</xsl:element>
<xsl:text> </xsl:text>
- <xsl:if test="($insertBreaks='true') and not(starts-with(normalize-space($restURLs),'ftp://')) and not(starts-with(normalize-space($restURLs),'http://'))">
+ <xsl:if test="($insertBreaks='true') and not($urlsOnly) and not(starts-with(normalize-space($restURLs),'ftp://')) and not(starts-with(normalize-space($restURLs),'http://'))">
<xsl:text disable-output-escaping="yes"><br /></xsl:text>
</xsl:if>
</xsl:when>
@@ -2482,7 +2500,7 @@
</xsl:when>
<xsl:otherwise>
<!-- output URL-ized nextURL -->
- <xsl:if test="($insertBreaks='true')">
+ <xsl:if test="($insertBreaks='true') and not($urlsOnly)">
<xsl:text disable-output-escaping="yes"><br /></xsl:text>
</xsl:if>
<xsl:if test="$urlsOnly='true'">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2012-06-13 14:19:20
|
Revision: 11003
http://x3d.svn.sourceforge.net/x3d/?rev=11003&view=rev
Author: brutzman
Date: 2012-06-13 14:19:08 +0000 (Wed, 13 Jun 2012)
Log Message:
-----------
fix node references
Modified Paths:
--------------
www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
Modified: www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
===================================================================
--- www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-06-13 14:07:40 UTC (rev 11002)
+++ www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-06-13 14:19:08 UTC (rev 11003)
@@ -736,16 +736,16 @@
<xsl:when test="local-name()='WorldInfo'">
<xsl:text>WorldInfo contains persistent documentation information about the 3D world</xsl:text>
</xsl:when>
- <xsl:when test="CADAssembly">
+ <xsl:when test="local-name()='CADAssembly'">
<xsl:text>CADAssembly holds a set of Computer-Aided Design (CAD) assemblies or parts grouped together. CADAssembly is a Grouping node that can contain CADAssembly, CADFace or CADPart nodes.</xsl:text>
</xsl:when>
- <xsl:when test="CADFace">
+ <xsl:when test="local-name()='CADFace'">
<xsl:text>CADFace holds the geometry representing a face in a Computer-Aided Design (CAD) part. CADFace is a Grouping node that can contain a Shape or LOD node.</xsl:text>
</xsl:when>
- <xsl:when test="CADLayer">
+ <xsl:when test="local-name()='CADLayer'">
<xsl:text>CADLayer nodes define a hierarchy that shows layer structure for a Computer-Aided Design (CAD) model. CADLayer is a Grouping node that can contain most nodes.</xsl:text>
</xsl:when>
- <xsl:when test="">
+ <xsl:when test="local-name()='CADPart'">
<xsl:text>CADPart defines both coordinate-system location and the faces that constitute a part in a Computer-Aided Design (CAD) model. CADPart is a Grouping node that can contain CADFace nodes.</xsl:text>
</xsl:when>
<xsl:when test="contains(local-name(),'Espdu') or contains(local-name(),'Pdu')">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2012-06-13 14:50:09
|
Revision: 11005
http://x3d.svn.sourceforge.net/x3d/?rev=11005&view=rev
Author: brutzman
Date: 2012-06-13 14:49:58 +0000 (Wed, 13 Jun 2012)
Log Message:
-----------
component name, level tooltip
Modified Paths:
--------------
www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
Modified: www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
===================================================================
--- www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-06-13 14:46:26 UTC (rev 11004)
+++ www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-06-13 14:49:58 UTC (rev 11005)
@@ -489,7 +489,7 @@
<xsl:text>head can contain component, unit, and author-defined metadata (meta) tags</xsl:text>
</xsl:when>
<xsl:when test="local-name()='component'">
- <xsl:text>X3D component and level indicate any additional scene functionality needed above the given X3D profile</xsl:text>
+ <xsl:text>X3D component name and level indicate any additional scene functionality needed above the given X3D profile</xsl:text>
</xsl:when>
<xsl:when test="local-name()='unit'"><xsl:text>unit defines scene scaling factors for length, angle, mass, or force</xsl:text>
</xsl:when>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2012-06-25 05:37:13
|
Revision: 11047
http://x3d.svn.sourceforge.net/x3d/?rev=11047&view=rev
Author: brutzman
Date: 2012-06-25 05:37:03 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
refined CAD tooltips
Modified Paths:
--------------
www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
Modified: www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt
===================================================================
--- www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-06-25 05:36:32 UTC (rev 11046)
+++ www.web3d.org/x3d/stylesheets/X3dToXhtml.xslt 2012-06-25 05:37:03 UTC (rev 11047)
@@ -736,18 +736,18 @@
<xsl:when test="local-name()='WorldInfo'">
<xsl:text>WorldInfo contains persistent documentation information about the 3D world</xsl:text>
</xsl:when>
- <xsl:when test="local-name()='CADAssembly'">
- <xsl:text>CADAssembly holds a set of Computer-Aided Design (CAD) assemblies or parts grouped together. CADAssembly is a Grouping node that can contain CADAssembly, CADFace or CADPart nodes.</xsl:text>
- </xsl:when>
- <xsl:when test="local-name()='CADFace'">
- <xsl:text>CADFace holds the geometry representing a face in a Computer-Aided Design (CAD) part. CADFace is a Grouping node that can contain a Shape or LOD node.</xsl:text>
- </xsl:when>
<xsl:when test="local-name()='CADLayer'">
<xsl:text>CADLayer nodes define a hierarchy that shows layer structure for a Computer-Aided Design (CAD) model. CADLayer is a Grouping node that can contain most nodes.</xsl:text>
</xsl:when>
+ <xsl:when test="local-name()='CADAssembly'">
+ <xsl:text>CADAssembly holds a set of Computer-Aided Design (CAD) assemblies or parts grouped together. CADAssembly is a Grouping node that can contain CADAssembly (subassembly), CADPart or CADFace nodes.</xsl:text>
+ </xsl:when>
<xsl:when test="local-name()='CADPart'">
- <xsl:text>CADPart defines both coordinate-system location and the faces that constitute a part in a Computer-Aided Design (CAD) model. CADPart is a Grouping node that can contain CADFace nodes.</xsl:text>
+ <xsl:text>CADPart is an atomic part that defines both coordinate-system location and the faces that constitute a part in a Computer-Aided Design (CAD) model. CADPart contains CADFace nodes.</xsl:text>
</xsl:when>
+ <xsl:when test="local-name()='CADFace'">
+ <xsl:text>CADFace holds the geometry representing a face in a Computer-Aided Design (CAD) part. CADFace can only contain a single Shape, LOD or Transform node (with containerField='shape') Hint: only zero or one Shape child can be active at one time.</xsl:text>
+ </xsl:when>
<xsl:when test="contains(local-name(),'Espdu') or contains(local-name(),'Pdu')">
<xsl:value-of select="local-name()"/>
<xsl:text> is a networked Distributed Interactive Simulation (DIS) node</xsl:text>
@@ -2360,6 +2360,13 @@
<xsl:variable name="nextURL"> <!-- nextCandidateUrl token, anyway -->
<xsl:value-of select="substring-before($wlist,' ')"/>
</xsl:variable>
+ <xsl:variable name="nextURLunquoted">
+ <xsl:value-of select="normalize-space(translate($nextURL,'"',''))"/>
+ </xsl:variable>
+ <xsl:variable name="quoted">
+ <xsl:value-of select="contains($nextURL,'"')"/>
+ </xsl:variable>
+ <!-- debug: --><xsl:comment><xsl:text>$quoted=</xsl:text><xsl:value-of select="$quoted"/></xsl:comment>
<!-- don't force " substitution when working with plain text -->
<!-- <value-of select="translate(substring-before($wlist,' '),'"','')"/> -->
<!-- <xsl:choose>
@@ -2396,12 +2403,18 @@
<xsl:text disable-output-escaping="yes"><br /></xsl:text>
</xsl:if>
-->
+ <xsl:if test="($quoted='true')">
+ <xsl:text>"</xsl:text>
+ </xsl:if>
<xsl:element name="a">
<xsl:attribute name="href">
- <xsl:value-of disable-output-escaping="yes" select="$nextURL"/>
+ <xsl:value-of disable-output-escaping="yes" select="$nextURLunquoted"/>
</xsl:attribute>
- <xsl:value-of select="$nextURL"/>
+ <xsl:value-of select="$nextURLunquoted"/>
</xsl:element>
+ <xsl:if test="($quoted='true')">
+ <xsl:text>"</xsl:text>
+ </xsl:if>
<xsl:text> </xsl:text>
<xsl:if test="($insertBreaks='true') and not($urlsOnly) and not(starts-with(normalize-space($restURLs),'ftp://')) and not(starts-with(normalize-space($restURLs),'sftp://')) and not(starts-with(normalize-space($restURLs),'http://'))">
<xsl:text disable-output-escaping="yes"><br /></xsl:text>
@@ -2416,18 +2429,21 @@
<!-- handle sftp:// but only if it precedes http:// -->
<xsl:when test="($urlsOnly='true') and (contains($nextURL,'sftp://')) and not(contains(substring-before($nextURL,'sftp://'),'http://'))">
<!-- sftp:// found next -->
- <xsl:value-of disable-output-escaping="yes" select="substring-before($nextURL,'sftp://')"/>
<xsl:if test="($insertBreaks='true') and not($urlsOnly)">
<xsl:text disable-output-escaping="yes"><br /></xsl:text>
</xsl:if>
+ <xsl:value-of disable-output-escaping="yes" select="substring-before($nextURL,'sftp://')"/>
<xsl:element name="a">
<xsl:attribute name="href">
<xsl:text>sftp://</xsl:text>
- <xsl:value-of select="normalize-space(substring-after($nextURL,'sftp://'))"/>
+ <xsl:value-of select="normalize-space(substring-after($nextURLunquoted,'sftp://'))"/>
</xsl:attribute>
<xsl:text>sftp://</xsl:text>
- <xsl:value-of select="normalize-space(substring-after($nextURL,'sftp://'))"/>
+ <xsl:value-of select="normalize-space(substring-after($nextURLunquoted,'sftp://'))"/>
</xsl:element>
+ <xsl:if test="($quoted='true')">
+ <xsl:text>"</xsl:text>
+ </xsl:if>
<xsl:text> </xsl:text>
<xsl:if test="($insertBreaks='true') and not($urlsOnly) and not(starts-with(normalize-space($restURLs),'sftp://')) and not(starts-with(normalize-space($restURLs),'http://'))">
<xsl:text disable-output-escaping="yes"><br /></xsl:text>
@@ -2436,18 +2452,21 @@
<!-- handle ftp:// but only if it precedes http:// and follows sftp:// -->
<xsl:when test="($urlsOnly='true') and (contains($nextURL,'ftp://')) and not(contains(substring-before($nextURL,'ftp://'),'http://'))">
<!-- ftp:// found next -->
- <xsl:value-of disable-output-escaping="yes" select="substring-before($nextURL,'ftp://')"/>
<xsl:if test="($insertBreaks='true') and not($urlsOnly)">
<xsl:text disable-output-escaping="yes"><br /></xsl:text>
</xsl:if>
+ <xsl:value-of disable-output-escaping="yes" select="substring-before($nextURL,'ftp://')"/>
<xsl:element name="a">
<xsl:attribute name="href">
<xsl:text>ftp://</xsl:text>
- <xsl:value-of select="normalize-space(substring-after($nextURL,'ftp://'))"/>
+ <xsl:value-of select="normalize-space(substring-after($nextURLunquoted,'ftp://'))"/>
</xsl:attribute>
<xsl:text>ftp://</xsl:text>
- <xsl:value-of select="normalize-space(substring-after($nextURL,'ftp://'))"/>
+ <xsl:value-of select="normalize-space(substring-after($nextURLunquoted,'ftp://'))"/>
</xsl:element>
+ <xsl:if test="($quoted='true')">
+ <xsl:text>"</xsl:text>
+ </xsl:if>
<xsl:text> </xsl:text>
<xsl:if test="($insertBreaks='true') and not($urlsOnly) and not(starts-with(normalize-space($restURLs),'ftp://')) and not(starts-with(normalize-space($restURLs),'http://'))">
<xsl:text disable-output-escaping="yes"><br /></xsl:text>
@@ -2456,18 +2475,21 @@
<!-- handle http:// -->
<xsl:when test="($urlsOnly='true') and (contains($nextURL,'http://'))">
<!-- http:// found next -->
- <xsl:value-of disable-output-escaping="yes" select="substring-before($nextURL,'http://')"/>
<xsl:if test="($insertBreaks='true') and not($urlsOnly)">
<xsl:text disable-output-escaping="yes"><br /></xsl:text>
</xsl:if>
+ <xsl:value-of disable-output-escaping="yes" select="substring-before($nextURL,'http://')"/>
<xsl:element name="a">
<xsl:attribute name="href">
<xsl:text>http://</xsl:text>
- <xsl:value-of select="normalize-space(substring-after($nextURL,'http://'))"/>
+ <xsl:value-of select="normalize-space(substring-after($nextURLunquoted,'http://'))"/>
</xsl:attribute>
<xsl:text>http://</xsl:text>
- <xsl:value-of select="normalize-space(substring-after($nextURL,'http://'))"/>
+ <xsl:value-of select="normalize-space(substring-after($nextURLunquoted,'http://'))"/>
</xsl:element>
+ <xsl:if test="($quoted='true')">
+ <xsl:text>"</xsl:text>
+ </xsl:if>
<xsl:text> </xsl:text>
<xsl:if test="($insertBreaks='true') and not($urlsOnly) and not(starts-with(normalize-space($restURLs),'ftp://')) and not(starts-with(normalize-space($restURLs),'http://'))">
<xsl:text disable-output-escaping="yes"><br /></xsl:text>
@@ -2476,29 +2498,36 @@
<!-- handle https:// -->
<xsl:when test="($urlsOnly='true') and (contains($nextURL,'https://'))">
<!-- https:// found next -->
- <xsl:value-of disable-output-escaping="yes" select="substring-before($nextURL,'https://')"/>
<xsl:if test="($insertBreaks='true') and not($urlsOnly)">
<xsl:text disable-output-escaping="yes"><br /></xsl:text>
</xsl:if>
+ <xsl:value-of disable-output-escaping="yes" select="substring-before($nextURL,'https://')"/>
<xsl:element name="a">
<xsl:attribute name="href">
<xsl:text>https://</xsl:text>
- <xsl:value-of select="normalize-space(substring-after($nextURL,'https://'))"/>
+ <xsl:value-of select="normalize-space(substring-after($nextURLunquoted,'https://'))"/>
</xsl:attribute>
<xsl:text>https://</xsl:text>
- <xsl:value-of select="normalize-space(substring-after($nextURL,'https://'))"/>
+ <xsl:value-of select="normalize-space(substring-after($nextURLunquoted,'https://'))"/>
</xsl:element>
+ <xsl:if test="($quoted='true')">
+ <xsl:text>"</xsl:text>
+ </xsl:if>
<xsl:text> </xsl:text>
<xsl:if test="($insertBreaks='true') and not($urlsOnly) and not(starts-with(normalize-space($restURLs),'ftp://')) and not(starts-with(normalize-space($restURLs),'http://'))">
<xsl:text disable-output-escaping="yes"><br /></xsl:text>
</xsl:if>
</xsl:when>
<xsl:when test="($baseUrlAvailable='false') and not(contains($nextURL,'://'))">
- <xsl:text>"</xsl:text>
+ <xsl:if test="($quoted='true')">
+ <xsl:text>"</xsl:text>
+ </xsl:if>
<span class="value">
- <xsl:value-of select="normalize-space(translate($nextURL,'"',''))"/>
+ <xsl:value-of select="normalize-space($nextURLunquoted)"/>
</span>
- <xsl:text>"</xsl:text>
+ <xsl:if test="($quoted='true')">
+ <xsl:text>"</xsl:text>
+ </xsl:if>
<xsl:text> </xsl:text>
</xsl:when>
<xsl:when test="($urlsOnly='false') and not(contains($nextURL,'://')) and not(contains($nextURL,'mailto:'))">
@@ -2511,16 +2540,16 @@
<xsl:if test="($insertBreaks='true') and not($urlsOnly)">
<xsl:text disable-output-escaping="yes"><br /></xsl:text>
</xsl:if>
- <xsl:if test="$urlsOnly='true'">
+ <xsl:if test="($quoted='true')">
<xsl:text>"</xsl:text>
</xsl:if>
<xsl:element name="a">
<xsl:attribute name="href">
- <xsl:value-of select="normalize-space(translate($nextURL,'"',''))"/>
+ <xsl:value-of select="$nextURLunquoted"/>
</xsl:attribute>
- <xsl:value-of select="normalize-space(translate($nextURL,'"',''))"/>
+ <xsl:value-of select="$nextURLunquoted"/>
</xsl:element>
- <xsl:if test="$urlsOnly='true'">
+ <xsl:if test="($quoted='true')">
<xsl:text>"</xsl:text>
</xsl:if>
<xsl:text> </xsl:text>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X