From 0814dcfc0f8712aaea389dcbe69cfdc8d5f8bca1 Mon Sep 17 00:00:00 2001
From: Henrik Tidefelt <tiddeweb@gmail.com>
Date: Fri, 15 Jan 2016 23:07:55 +0100
Subject: [PATCH] Update constructor-of linking to work with new toc.xml

---
 doc/parts/algo-tol/formats/html.xsl     | 53 ---------------------------------
 doc/parts/namespace-toc/formats/toc.xsl | 24 +++++++++++++++
 doc/parts/state-types/index.sxml        |  2 +-
 doc/parts/types/formats/html.xsl        | 18 +++++++----
 doc/parts/types/index.sxml              |  2 +-
 5 files changed, 38 insertions(+), 61 deletions(-)

diff --git a/doc/parts/algo-tol/formats/html.xsl b/doc/parts/algo-tol/formats/html.xsl
index 393cb86d..e3dd61ec 100644
--- a/doc/parts/algo-tol/formats/html.xsl
+++ b/doc/parts/algo-tol/formats/html.xsl
@@ -105,57 +105,4 @@
   </html>
 </xsl:template>
 
-<xsl:template match="system-binding[@identifier]">
-	<h4>
-		<xsl:element name="a">
-			<xsl:attribute name="name"><xsl:value-of select="@identifier" /></xsl:attribute>
-			<xsl:value-of select="@identifier" />
-		</xsl:element>
-	</h4>
-	<xsl:apply-templates />
-</xsl:template>
-
-<xsl:template match="system-binding[@identifier]/function">
- 	<xsl:apply-templates select="case"/>
-</xsl:template>
-
-<xsl:template match="system-binding[@identifier]/function/case[@constructor-of]">
-	<h4 class="plain">
-		<b>Case</b>  
- 		<xsl:apply-templates select="arguments"/>→ <typename><xsl:value-of select="@constructor-of" /></typename>
-	</h4>
- 	<xsl:apply-templates select="dynamic-references"/>
- 	<xsl:apply-templates select="description"/>
-</xsl:template>
-
-<xsl:template match="function/case/arguments/arg[@identifier]">
-	<xsl:call-template name="name-to-argument"><xsl:with-param name="name"><xsl:value-of select="@identifier" /></xsl:with-param></xsl:call-template>
-	<xsl:apply-templates select="default"/>
-	<xsl:apply-templates select="type"/>
-	<xsl:text> </xsl:text>
-</xsl:template>
-<xsl:template match="function/case/arguments/arg[not(@identifier)]">
-	<xsl:apply-templates select="default"/>
-	<xsl:apply-templates select="type"/>
-	<xsl:text> </xsl:text>
-</xsl:template>
-<xsl:template match="function/case/arguments/arg/default">:<xsl:apply-templates /></xsl:template>
-<xsl:template match="function/case/arguments/arg/type"><xsl:text>::</xsl:text><xsl:apply-templates /></xsl:template>
-
-<xsl:template match="dynamic-references[not(dynvar)]">
-	<div class="p"><b>Dynamic references:</b><xsl:text> </xsl:text><em>none</em></div>
-</xsl:template>
-<xsl:template match="dynamic-references[dynvar]">
-	<div class="p"><b>Dynamic references:</b><xsl:text> </xsl:text>
-		<xsl:apply-templates />
-	</div>
-</xsl:template>
-
-<xsl:template match="system-binding[@identifier]/hot">
-	<div class="p"><b>Hot value</b></div>
-	<div class="p">Spawns states of type <xsl:apply-templates select="constructor-of" />.</div>
-</xsl:template>
-
-
-
 </xsl:stylesheet>
diff --git a/doc/parts/namespace-toc/formats/toc.xsl b/doc/parts/namespace-toc/formats/toc.xsl
index 80cb699e..915adbb9 100644
--- a/doc/parts/namespace-toc/formats/toc.xsl
+++ b/doc/parts/namespace-toc/formats/toc.xsl
@@ -83,6 +83,18 @@
     <xsl:attribute name="kind">value</xsl:attribute>
     <xsl:attribute name="name"><xsl:value-of select="@name" /></xsl:attribute>
     <xsl:element name="summary"><xsl:copy-of select="summary/node()" /></xsl:element>
+    <xsl:if test="function/case/@constructor-of">
+      <xsl:for-each select="function/case[@constructor-of]">
+        <xsl:element name="constructor-of">
+          <xsl:element name="named-type">
+            <xsl:attribute name="name"><xsl:value-of select="@constructor-of" /></xsl:attribute>
+          </xsl:element>
+        </xsl:element>
+      </xsl:for-each>
+    </xsl:if>
+    <xsl:if test="hot/constructor-of">
+      <xsl:element name="hot"><xsl:copy-of select="hot/constructor-of" /></xsl:element>
+    </xsl:if>
   </xsl:element>
 </xsl:template>
 
@@ -145,6 +157,18 @@
     <xsl:attribute name="kind">value</xsl:attribute>
     <xsl:attribute name="name"><xsl:value-of select="@name" /></xsl:attribute>
     <xsl:element name="summary"><xsl:copy-of select="summary/node()" /></xsl:element>
+    <xsl:if test="function/case/@constructor-of">
+      <xsl:for-each select="function/case[@constructor-of]">
+        <xsl:element name="constructor-of">
+          <xsl:element name="named-type">
+            <xsl:attribute name="name"><xsl:value-of select="@constructor-of" /></xsl:attribute>
+          </xsl:element>
+        </xsl:element>
+      </xsl:for-each>
+    </xsl:if>
+    <xsl:if test="hot/constructor-of">
+      <xsl:element name="hot"><xsl:copy-of select="hot/constructor-of" /></xsl:element>
+    </xsl:if>
   </xsl:element>
 </xsl:template>
 
diff --git a/doc/parts/state-types/index.sxml b/doc/parts/state-types/index.sxml
index 7f9f0b05..cd678b59 100644
--- a/doc/parts/state-types/index.sxml
+++ b/doc/parts/state-types/index.sxml
@@ -37,7 +37,7 @@
 	<!--#include virtual="streams.sxml" -->
 	<!--#include virtual="misc.sxml" -->
 	<external>
-		<!--#include virtual="../bindings/functions.sxml" -->
+    <!--#include virtual="^/toc.xml" -->
 		<!--#include virtual="../syntax/operators.sxml" -->
 	</external>
 </book>
diff --git a/doc/parts/types/formats/html.xsl b/doc/parts/types/formats/html.xsl
index c8698e19..5b971aad 100644
--- a/doc/parts/types/formats/html.xsl
+++ b/doc/parts/types/formats/html.xsl
@@ -164,14 +164,17 @@
 					</td>
 				</tr>
 			</xsl:if>
-			<xsl:if test="/book/external//system-binding/function/case[@constructor-of=$self] | construction/binding">
+			<xsl:if test="/book/external/toc/bindings/binding[constructor-of/named-type/@name=$self] | construction/binding">
 				<tr>
 					<th class="horiz">See also:</th>
 					<td>
 						<xsl:apply-templates select="construction/binding" />
-						<xsl:for-each select="/book/external//system-binding/function/case[@constructor-of=$self]">
+						<xsl:for-each select="/book/external/toc/bindings/binding[constructor-of/named-type/@name=$self]">
 							<xsl:text>  </xsl:text>
-							<xsl:call-template name="name-to-linked-value"><xsl:with-param name="name"><xsl:value-of select="../../@identifier" /></xsl:with-param></xsl:call-template>
+							<xsl:call-template name="name-to-linked-value">
+								<xsl:with-param name="namespace"><xsl:value-of select="@namespace" /></xsl:with-param>
+								<xsl:with-param name="name"><xsl:value-of select="@name" /></xsl:with-param>
+							</xsl:call-template>
 						</xsl:for-each>
 					</td>
 				</tr>
@@ -261,7 +264,7 @@
 				<th class="horiz">Defined as:</th>
 				<td><xsl:apply-templates select="definition"/></td>
 			</tr>
-			<xsl:if test="see-also or /book/external//system-binding/function/case[@constructor-of=$self]">
+			<xsl:if test="see-also or /book/external/toc/bindings/binding[constructor-of/named-type/@name=$self]">
 				<tr>
 					<th class="horiz">See also:</th>
 					<td>
@@ -271,9 +274,12 @@
 								<xsl:apply-templates select="."/>
 							</span>
 						</xsl:for-each>
-						<xsl:for-each select="/book/external//system-binding/function/case[@constructor-of=$self]">
+						<xsl:for-each select="/book/external/toc/bindings/binding[constructor-of/named-type/@name=$self]">
 							<xsl:text>  </xsl:text>
-							<xsl:call-template name="name-to-linked-value"><xsl:with-param name="name"><xsl:value-of select="../../@identifier" /></xsl:with-param></xsl:call-template>
+							<xsl:call-template name="name-to-linked-value">
+								<xsl:with-param name="namespace"><xsl:value-of select="@namespace" /></xsl:with-param>
+								<xsl:with-param name="name"><xsl:value-of select="@name" /></xsl:with-param>
+							</xsl:call-template>
 						</xsl:for-each>
 					</td>
 				</tr>
diff --git a/doc/parts/types/index.sxml b/doc/parts/types/index.sxml
index 6c035cbc..b22687ad 100644
--- a/doc/parts/types/index.sxml
+++ b/doc/parts/types/index.sxml
@@ -46,7 +46,7 @@
 	<!--#include virtual="graphics-3d.sxml" -->
 	<!--#include virtual="composite.sxml" -->
 	<external>
-		<!--#include virtual="../bindings/functions.sxml" -->
+    <!--#include virtual="^/toc.xml" -->
 		<!--#include virtual="../syntax/operators.sxml" -->
 	</external>
 </book>
-- 
2.11.4.GIT