Tweaked the formulation of emitting the rdf stuff in the CC part of the footer; doc previously built on Windows, but not on Linux until this checkin git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@124 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/build-tools/doctool/src/topics-htmls.xslt b/build-tools/doctool/src/topics-htmls.xslt index 6e3bc9f..e46b799 100644 --- a/build-tools/doctool/src/topics-htmls.xslt +++ b/build-tools/doctool/src/topics-htmls.xslt
@@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- edited with XMLSpy v2005 rel. 3 U (http://www.altova.com) by Bruce Johnson (private) --> -<xsl:stylesheet version="1.0" +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> <xsl:output method="html" /> <xsl:strip-space elements="*" /> @@ -15,7 +15,9 @@ <div id="side"> <div id="menu"> <div class="header item"> - <a href="http://code.google.com/webtoolkit/">Google Web Toolkit</a> + <a href="http://code.google.com/webtoolkit/"> + Google Web Toolkit + </a> </div> <div class="group"> <div class="item"> @@ -24,7 +26,8 @@ </a> </div> <div class="item"> - <a href="http://code.google.com/webtoolkit/gettingstarted.html"> + <a + href="http://code.google.com/webtoolkit/gettingstarted.html"> Getting Started Guide </a> </div> @@ -49,7 +52,7 @@ </xsl:element> <div class="group"> <div class="item"> - <a + <a href="http://code.google.com/webtoolkit/documentation/examples/"> Example Projects </a> @@ -57,7 +60,7 @@ <xsl:element name="div"> <xsl:attribute name="class"> <xsl:text>item</xsl:text> - <xsl:if + <xsl:if test="(contains(id, 'com.google.gwt.') and not(contains(id, 'com.google.gwt.doc.'))) or id = 'gwt'"> <xsl:text></xsl:text> <xsl:text>selected</xsl:text> @@ -84,10 +87,13 @@ </a> </div> <div class="item"> - <a href="http://googlewebtoolkit.blogspot.com/">Web Toolkit Blog</a> + <a href="http://googlewebtoolkit.blogspot.com/"> + Web Toolkit Blog + </a> </div> <div class="item"> - <a href="http://code.google.com/webtoolkit/thirdparty.html"> + <a + href="http://code.google.com/webtoolkit/thirdparty.html"> Third Party Tools </a> </div> @@ -97,7 +103,8 @@ </a> </div> <div class="item"> - <a href="http://groups.google.com/group/Google-Web-Toolkit"> + <a + href="http://groups.google.com/group/Google-Web-Toolkit"> Developer Forum </a> </div> @@ -107,7 +114,8 @@ <form action="http://www.google.com/search" method="get"> <div> <input name="domains" value="code.google.com" type="hidden" /> - <input name="sitesearch" value="code.google.com" type="hidden" /> + <input name="sitesearch" value="code.google.com" + type="hidden" /> <div class="header">Search this site:</div> <div class="input"> <input name="q" size="10" /> @@ -125,7 +133,8 @@ <div id="header"> <div id="logo"> <a href="http://code.google.com/"> - <img src="http://code.google.com/images/code_sm.png" alt="Google" /> + <img src="http://code.google.com/images/code_sm.png" + alt="Google" /> </a> </div> <!-- The title for the entire docset --> @@ -147,7 +156,9 @@ </span> > <span class="item"> - <a href="http://code.google.com/webtoolkit/">Google Web Toolkit</a> + <a href="http://code.google.com/webtoolkit/"> + Google Web Toolkit + </a> </span> > <!-- The topic location --> @@ -159,7 +170,7 @@ </xsl:template> <xsl:template name="emitPrevTopic"> <xsl:param name="start" /> - <xsl:variable name="prev" + <xsl:variable name="prev" select="$start/preceding-sibling::topic[position()=1]" /> <xsl:variable name="parentLastChild" select="$prev" /> <xsl:variable name="parent" select="$start/parent::topic" /> @@ -192,7 +203,8 @@ <xsl:choose> <xsl:when test="$start/topic"> <xsl:call-template name="emitDeepestPriorChild"> - <xsl:with-param name="start" select="$start/topic[position()=last()]" /> + <xsl:with-param name="start" + select="$start/topic[position()=last()]" /> </xsl:call-template> </xsl:when> <xsl:otherwise> @@ -205,9 +217,9 @@ <xsl:template name="emitNextTopic"> <xsl:param name="start" /> <xsl:variable name="child" select="$start/topic[position()=1]" /> - <xsl:variable name="next" + <xsl:variable name="next" select="$start/following-sibling::topic[position()=1]" /> - <xsl:variable name="parentNext" + <xsl:variable name="parentNext" select="$start/ancestor::topic[following-sibling::topic]/following-sibling::topic" /> <xsl:choose> <!-- if there's a first child, use it --> @@ -252,10 +264,11 @@ <xsl:value-of select="title" /> </xsl:if> </title> - <meta http-equiv="content-type" content="text/html; charset=utf-8" /> + <meta http-equiv="content-type" + content="text/html; charset=utf-8" /> <link href="../css/base.css" rel="stylesheet" type="text/css" /> <link href="./doc.css" rel="stylesheet" type="text/css" /> - <link href="../css/print.css" rel="stylesheet" media="print" + <link href="../css/print.css" rel="stylesheet" media="print" type="text/css" /> </head> <body> @@ -299,7 +312,8 @@ <li> <div class="heading"> <xsl:call-template name="makeLink"> - <xsl:with-param name="linkText" select="title/node()" /> + <xsl:with-param name="linkText" + select="title/node()" /> <xsl:with-param name="linkTarget" select="." /> </xsl:call-template> </div> @@ -349,47 +363,51 @@ </a> </span> - <div id="license" + <div id="license" style="text-align: center; margin: 1em 0em 1em 0em"> Except as otherwise - <a href="http://code.google.com/policies.html#restrictions"> + <a + href="http://code.google.com/policies.html#restrictions"> <xsl:text>noted</xsl:text> </a> <xsl:text>, the content of this  </xsl:text> <xsl:text>page is licensed under the  </xsl:text> - <a rel="license" + <a rel="license" href="http://creativecommons.org/licenses/by/2.5/"> - <xsl:text>Creative Commons Attribution 2.5 License</xsl:text> + <xsl:text> + Creative Commons Attribution 2.5 License + </xsl:text> </a> <xsl:text>.</xsl:text> - <xsl:comment> - <rdf:RDF xmlns="http://web.resource.org/cc/" - xmlns:dc="http://purl.org/dc/elements/1.1/" + <xsl:text disable-output-escaping="yes"><![CDATA[<!--]]></xsl:text> + <rdf:RDF xmlns="http://web.resource.org/cc/" + xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <Work rdf:about=""> - <license + <license rdf:resource="http://creativecommons.org/licenses/by/2.5/" /> </Work> - <License + <License rdf:about="http://creativecommons.org/licenses/by/2.5/"> - <permits + <permits rdf:resource="http://web.resource.org/cc/Reproduction" /> - <permits + <permits rdf:resource="http://web.resource.org/cc/Distribution" /> - <requires rdf:resource="http://web.resource.org/cc/Notice" /> - <requires + <requires + rdf:resource="http://web.resource.org/cc/Notice" /> + <requires rdf:resource="http://web.resource.org/cc/Attribution" /> - <permits + <permits rdf:resource="http://web.resource.org/cc/DerivativeWorks" /> </License> </rdf:RDF> - </xsl:comment> + <xsl:text disable-output-escaping="yes"><![CDATA[-->]]></xsl:text> </div> </div> <!-- analytics --> - <script src="https://ssl.google-analytics.com/urchin.js" + <script src="https://ssl.google-analytics.com/urchin.js" type="text/javascript" /> <script type="text/javascript"> _uacct="UA-18071-1"; _uanchor=1; urchinTracker(); @@ -403,7 +421,7 @@ </xsl:copy> </xsl:template> <xsl:template match="link"> - <xsl:variable name="testLinkBase" + <xsl:variable name="testLinkBase" select="substring-before(@ref, "#")" /> <xsl:variable name="linkBase"> <xsl:if test="string-length($testLinkBase) != 0"> @@ -416,7 +434,8 @@ <xsl:call-template name="makeLink"> <xsl:with-param name="linkRef" select="@ref" /> <xsl:with-param name="linkText" select="node()" /> - <xsl:with-param name="linkTarget" select="key('topicSearch', $linkBase)" /> + <xsl:with-param name="linkTarget" + select="key('topicSearch', $linkBase)" /> </xsl:call-template> </xsl:template> <xsl:template name="makeLink"> @@ -426,7 +445,7 @@ <xsl:param name="linkTarget" /> <xsl:choose> <xsl:when test="$linkTarget"> - <xsl:variable name="extra" + <xsl:variable name="extra" select="substring-after($linkRef, "#")" /> <xsl:element name="a"> <xsl:attribute name="href">