Merge branch 'master' into gh-pages

_posts/2017-06-15-adventures-in-archiving.md

@@ -12,7 +12,7 @@ machines:
         path: /disks/pcx86/dos/ibm/1.00/PCDOS100.json
       B:
         path: /apps/pcx86/1983/adventmath/ADVENTMATH100.json
-    autoType: 8-10-81\\rb:\\ra:basica castle\\r
+    autoType: 8-10-81\rb:\ra:basica castle\r
 ---
 
 In October 1983, IBM released a game called "Adventures in Math", which apparently tried to make mathematics as

apps/pcx86/1981/visicalc/README.md

@@ -12,7 +12,7 @@ machines:
         path: /disks/pcx86/dos/ibm/1.00/PCDOS100.json
       B:
         path: /apps/pcx86/1981/visicalc/VISICALC1981.json
-    autoType: 8-10-81\\rb:\\rvc\\r
+    autoType: 8-10-81\rb:\rvc\r
 ---
 
 VisiCalc (1981)

apps/pcx86/1982/ratbas/README.md

@@ -4,14 +4,14 @@ title: "RatBas (1982)"
 permalink: /apps/pcx86/1982/ratbas/
 machines:
   - type: pcx86
-    id: ibm5150
+    id: ibm5150-ratbas
     config: /devices/pcx86/machine/5150/cga/256kb/machine.xml
     autoMount:
       A:
         path: /disks/pcx86/dos/ibm/1.10/PCDOS110.json
       B:
         path: /apps/pcx86/1982/ratbas/RATBAS213.json
-    autoType: \\r\\rb:\\rrt\\r\\xff\\xf0test;\\r
+    autoType: \r\rb:\rrt\r\xff\xf0test;\r
 ---
 
 RatBas (1982)
@@ -30,7 +30,7 @@ We have archived it as [RatBas 2.13](#directory-listing-of-ratbas-213).  It has
 the machine below, which is running [PC-DOS 1.10](/disks/pcx86/dos/ibm/1.10/), the most recent version of PC-DOS
 at the time of this RatBas release.
 
-{% include machine.html id="ibm5150" %}
+{% include machine.html id="ibm5150-ratbas" %}
 
 Directory Listing of RatBas 2.13
 --------------------------------

apps/pcx86/1983/adventmath/README.md

@@ -11,7 +11,7 @@ machines:
         path: /disks/pcx86/dos/ibm/1.00/PCDOS100.json
       B:
         path: /apps/pcx86/1983/adventmath/ADVENTMATH100.json
-    autoType: 8-10-81\\rb:\\ra:basica castle\\r
+    autoType: 8-10-81\rb:\ra:basica castle\r
 ---
 
 Adventures in Math (1983)
@@ -186,7 +186,7 @@ have been tested with PC-DOS 2.00 on a 64Kb machine, but perhaps it wasn't.
 
 The machine on this page is configured with the following "autoType" sequence:
  
-	autoType: 8-10-81\\rb:\\ra:basica castle\\r
+	autoType: 8-10-81\rb:\ra:basica castle\r
 
 which translates to:
 

devices/pcx86/machine/5150/cga/256kb/machine.xml

@@ -2,13 +2,17 @@
 <?xml-stylesheet type="text/xsl" href="/versions/pcx86/1.35.0/machine.xsl"?>
 <machine id="ibm5150" type="pcx86" border="1" pos="center" background="white">
 	<name pos="center">IBM PC (Model 5150), CGA, 256K</name>
-	<computer id="pc-cga-256k" name="IBM PC" resume="1"/>
+	<computer id="pc-cga-256k" name="IBM PC"/>
-	<cpu id="cpu8088" model="8088"/>
 	<ram id="ramLow" addr="0x00000" test="false" comment="no memory test"/>
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pcx86/rom/5150/basic/BASIC100.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pcx86/rom/5150/1981-04-24/PCBIOS-REV1.json"/>
 	<video ref="/devices/pcx86/video/ibm/cga/ibm-cga.xml"/>
 	<fdc ref="/disks/pcx86/compiled/library.xml"/>
+	<cpu id="cpu8088" model="8088" autostart="true" pos="left" padLeft="8px" padBottom="8px">
+		<control type="button" binding="run">Run</control>
+		<control type="button" binding="reset">Reset</control>
+		<control type="button" binding="setSpeed">Speed</control>
+	</cpu>
 	<keyboard ref="/devices/pcx86/keyboard/us83-buttons-minimal.xml"/>
 	<chipset id="chipset" model="5150" sw1="01001001" sw2="10011000"/>
 </machine>

versions/pdpjs/1.35.0/components.xsl

@@ -12,7 +12,7 @@
 
 	<xsl:variable name="MACHINETYPE">pc</xsl:variable>
 	<xsl:variable name="CSSCLASS">pcjs</xsl:variable>
-	<xsl:variable name="APPCLASS">pdp10</xsl:variable>
+	<xsl:variable name="APPCLASS">pdp11</xsl:variable>
 	<xsl:variable name="APPNAME">PDPjs</xsl:variable>
 	<xsl:variable name="APPVERSION">1.35.0</xsl:variable>
 	<xsl:variable name="SITEHOST">www.pcjs.org</xsl:variable>