Merge branch 'next-release'

docs/pcx86/examples/components.css

@@ -32,10 +32,10 @@
     line-height: 19px;
     vertical-align: middle;
     float: left;
-    font-family: "Lucida Console", monospace;
+    font-family: Monaco, "Lucida Console", monospace;
 }
 .pcjs-controls textarea {
-    font-family: Monaco, monospace;
+    font-family: Monaco, "Lucida Console", monospace;
     font-size: x-small;
 }
 .pcjs-fieldset {
@@ -44,14 +44,14 @@
     padding: 0;
 }
 .pcjs-flag {
-    font-family: "Lucida Console", monospace;
+    font-family: Monaco, "Lucida Console", monospace;
     font-size: small;
     text-align: center;
     line-height: 19px;
     vertical-align: middle;
 }
 .pcjs-register {
-    font-family: "Lucida Console", monospace;
+    font-family: Monaco, "Lucida Console", monospace;
     font-size: small;
     text-align: center;
     line-height: 19px;

docs/pcx86/examples/components.xsl

@@ -13,11 +13,11 @@
 	<xsl:variable name="CSSCLASS">pcjs</xsl:variable>
 	<xsl:variable name="APPCLASS">pcx86</xsl:variable>
 	<xsl:variable name="APPNAME">PCx86</xsl:variable>
-	<xsl:variable name="APPVERSION">1.24.0</xsl:variable>
+	<xsl:variable name="APPVERSION">1.30.0</xsl:variable>
 	<xsl:variable name="SITEHOST">www.pcjs.org</xsl:variable>
 
 	<xsl:template name="componentStyles">
-		<link rel="stylesheet" type="text/css" href="/versions/pcx86/1.24.0/components.css"/>
+		<link rel="stylesheet" type="text/css" href="/versions/pcx86/1.30.0/components.css"/>
 	</xsl:template>
 
 	<xsl:template name="componentScripts">
@@ -578,6 +578,12 @@
 				<xsl:otherwise>null</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
+		<xsl:variable name="resetAddr">
+			<xsl:choose>
+				<xsl:when test="@resetAddr"><xsl:value-of select="@resetAddr"/></xsl:when>
+				<xsl:otherwise>0</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
 		<xsl:variable name="csStart">
 			<xsl:choose>
 				<xsl:when test="@csstart"><xsl:value-of select="@csstart"/></xsl:when>
@@ -602,7 +608,7 @@
 		<xsl:call-template name="component">
 			<xsl:with-param name="machine" select="$machine"/>
 			<xsl:with-param name="class" select="'cpu'"/>
-			<xsl:with-param name="parms">,model:'<xsl:value-of select="$model"/>',stepping:'<xsl:value-of select="$stepping"/>',fpu:<xsl:value-of select="$fpu"/>,cycles:<xsl:value-of select="$cycles"/>,multiplier:<xsl:value-of select="$multiplier"/>,autoStart:<xsl:value-of select="$autoStart"/>,csStart:<xsl:value-of select="$csStart"/>,csInterval:<xsl:value-of select="$csInterval"/>,csStop:<xsl:value-of select="$csStop"/></xsl:with-param>
+			<xsl:with-param name="parms">,model:'<xsl:value-of select="$model"/>',stepping:'<xsl:value-of select="$stepping"/>',fpu:<xsl:value-of select="$fpu"/>,cycles:<xsl:value-of select="$cycles"/>,multiplier:<xsl:value-of select="$multiplier"/>,autoStart:<xsl:value-of select="$autoStart"/>,resetAddr:<xsl:value-of select="$resetAddr"/>,csStart:<xsl:value-of select="$csStart"/>,csInterval:<xsl:value-of select="$csInterval"/>,csStop:<xsl:value-of select="$csStop"/></xsl:with-param>
 		</xsl:call-template>
 	</xsl:template>
 
@@ -696,6 +702,27 @@
 		</xsl:call-template>
 	</xsl:template>
 
+	<xsl:template match="device[@ref]">
+		<xsl:param name="machine" select="''"/>
+		<xsl:variable name="componentFile"><xsl:value-of select="$rootDir"/><xsl:value-of select="@ref"/></xsl:variable>
+		<xsl:apply-templates select="document($componentFile)/device"><xsl:with-param name="machine" select="$machine"/></xsl:apply-templates>
+	</xsl:template>
+
+	<xsl:template match="device[not(@ref)]">
+		<xsl:param name="machine" select="''"/>
+		<xsl:variable name="name">
+			<xsl:choose>
+				<xsl:when test="@name"><xsl:value-of select="@name"/></xsl:when>
+				<xsl:otherwise/>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:call-template name="component">
+			<xsl:with-param name="machine" select="$machine"/>
+			<xsl:with-param name="class">device</xsl:with-param>
+			<xsl:with-param name="parms">,name:'<xsl:value-of select="$name"/>'</xsl:with-param>
+		</xsl:call-template>
+	</xsl:template>
+
 	<xsl:template match="keyboard[@ref]">
 		<xsl:param name="machine" select="''"/>
 		<xsl:variable name="componentFile"><xsl:value-of select="$rootDir"/><xsl:value-of select="@ref"/></xsl:variable>
@@ -1155,6 +1182,12 @@
 
 	<xsl:template match="debugger[not(@ref)]">
 		<xsl:param name="machine" select="''"/>
+		<xsl:variable name="base">
+			<xsl:choose>
+				<xsl:when test="@base"><xsl:value-of select="@base"/></xsl:when>
+				<xsl:otherwise>16</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
 		<xsl:variable name="commands">
 			<xsl:choose>
 				<xsl:when test="@commands"><xsl:value-of select="@commands"/></xsl:when>
@@ -1170,7 +1203,7 @@
 		<xsl:call-template name="component">
 			<xsl:with-param name="machine" select="$machine"/>
 			<xsl:with-param name="class">debugger</xsl:with-param>
-			<xsl:with-param name="parms">,commands:'<xsl:value-of select="$commands"/>',messages:'<xsl:value-of select="$messages"/>'</xsl:with-param>
+			<xsl:with-param name="parms">,base:<xsl:value-of select="$base"/>,commands:'<xsl:value-of select="$commands"/>',messages:'<xsl:value-of select="$messages"/>'</xsl:with-param>
 		</xsl:call-template>
 	</xsl:template>