diff --git a/_config.yml b/_config.yml index 37a987bf0..928b5b6aa 100644 --- a/_config.yml +++ b/_config.yml @@ -12,6 +12,9 @@ url: "http://www.pcjs.org" # "http://jeffpar.github.io" or "http://www.pcjs.org twitter_username: jeffpar github_username: jeffpar +left_brace: "{" +right_brace: "}" + # Build settings exclude: ["index.html", "**/index.html", "logs", "node_modules", "**/c64", "src", "**/src", "**/static", "tmp", "videos", "web"] diff --git a/_includes/machine-engines.html b/_includes/machine-engines.html index 7c4e1a317..c55626f5b 100644 --- a/_includes/machine-engines.html +++ b/_includes/machine-engines.html @@ -10,11 +10,7 @@ {% else %} {% assign machine_template = machine.template %} {% endunless %} - {% unless machine.state %} - {% assign machine_state = '' %} - {% else %} - {% assign machine_state = machine.state %} - {% endunless %} + {% capture machine_parms %}{{ site.left_brace }}state:"{{ machine.state }}",autoMount:{{ machine.automount|jsonify }}{{ site.right_brace }}{% endcapture %} {% if site.pcjs.compiled == true and machine.uncompiled != true %} {% capture machine_script %}{% endcapture %} {% unless machine_scripts contains machine_script %} @@ -38,5 +34,5 @@ {% capture machine_template %}{{ site.baseurl }}/modules/{{ machine.type | remove:'-dbg' }}js/templates/components.xsl{% endcapture %} {% endif %} {% endif %} - + {% endfor %} diff --git a/devices/pc/keyboard/keyboard-minimal.xml b/devices/pc/keyboard/keyboard-minimal.xml index c967db9b6..f3ba3ddf6 100644 --- a/devices/pc/keyboard/keyboard-minimal.xml +++ b/devices/pc/keyboard/keyboard-minimal.xml @@ -1,7 +1,6 @@ ESC - CTRL-C F1 F10 diff --git a/devices/pc/machine/README.md b/devices/pc/machine/README.md index 89ce1d98c..95c9f15a7 100644 --- a/devices/pc/machine/README.md +++ b/devices/pc/machine/README.md @@ -37,8 +37,13 @@ Machines from our [IBM PC Application Archive](/apps/pc/): And here are some machines from our [IBM PC Disk Archive](/disks/pc/): -* [CP/M-86 v1.1B](/disks/pc/cpm/1.1b/) +* [PC-DOS 1.00](/disks/pc/dos/ibm/1.00/) +* [PC-DOS 1.10](/disks/pc/dos/ibm/1.10/) +* [Multitasking MS-DOS 4.00](/disks/pc/dos/microsoft/4.0M/) * [IBM Diagnostics v2.20](/disks/pc/diags/ibm/2.20/) +* [IBM OS/2 1.0](/disks/pc/os2/ibm/1.0/) +* [OS/2 1.0 Debugger Boot Disk](/disks/pc/os2/misc/1.0/debugger/) +* [CP/M-86 v1.1B](/disks/pc/cpm/1.1b/) * [Infocom Zork I](/disks/pc/games/infocom/zork1/) --- diff --git a/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml b/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml index af1ab3c8b..81c0a74f3 100644 --- a/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml +++ b/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml @@ -3,16 +3,16 @@ - +