From c21f361ca20d4b2c9172968ebe56d243f32a3439 Mon Sep 17 00:00:00 2001 From: Jeff Parsons Date: Wed, 6 Jan 2016 18:00:50 -0800 Subject: [PATCH] Updated the built-in Node web server to deal with the modified blog structure --- _config.yml | 2 +- apps/pc/1981/visicalc/manifest.xml | 2 +- apps/pc/1982/esuite/manifest.xml | 2 +- apps/pc/1985/rogue/manifest.xml | 2 +- apps/pc/1987/thinktank/manifest.xml | 2 +- apps/pc/1988/moria/manifest.xml | 2 +- apps/pc/1992/moria/manifest.xml | 2 +- devices/c1p/machine/32kb/machine.xml | 2 +- .../c1p/machine/8kb/all/debugger/machine.xml | 2 +- devices/c1p/machine/8kb/array/machine.xml | 2 +- .../machine/8kb/large/debugger/machine.xml | 2 +- devices/c1p/machine/8kb/large/machine.xml | 2 +- devices/c1p/machine/8kb/small/machine.xml | 2 +- .../5150/cga/384kb/softkbd/machine.xml | 2 +- .../5150/cga/64kb/donkey/debugger/machine.xml | 2 +- .../machine/5150/cga/64kb/donkey/machine.xml | 2 +- .../machine/5150/cga/64kb/softkbd/machine.xml | 2 +- devices/pc/machine/5150/dual/64kb/machine.xml | 2 +- .../5150/mda/64kb/debugger/machine.xml | 2 +- devices/pc/machine/5150/mda/64kb/machine.xml | 2 +- .../machine/5150/mda/64kb/softkbd/machine.xml | 2 +- .../machine/5160/cga/256kb/array/machine.xml | 2 +- .../5160/cga/256kb/demo/debugger/machine.xml | 2 +- .../machine/5160/cga/256kb/demo/machine.xml | 2 +- .../5160/cga/256kb/softkbd/machine.xml | 2 +- .../machine/5160/cga/256kb/win101/README.md | 2 +- .../cga/256kb/win101/debugger/machine.xml | 2 +- .../machine/5160/cga/256kb/win101/machine.xml | 2 +- .../5160/cga/256kb/win101/softkbd/machine.xml | 2 +- .../5160/cga/512kb/win101/softkbd/machine.xml | 2 +- .../5160/cga/640kb/debugger/machine.xml | 2 +- .../5160/cga/640kb/dos400m/machine.xml | 2 +- devices/pc/machine/5160/cga/640kb/machine.xml | 2 +- .../5160/ega/256kb/debugger/machine.xml | 2 +- .../machine/5160/ega/640kb/array/machine.xml | 2 +- .../5160/ega/640kb/debugger/machine.xml | 2 +- devices/pc/machine/5160/ega/640kb/machine.xml | 2 +- .../ega/640kb/win101/debugger/machine.xml | 2 +- .../machine/5160/ega/640kb/win101/machine.md | 2 +- .../machine/5160/ega/640kb/win101/machine.xml | 2 +- .../5160/mda/256kb/debugger/machine.xml | 2 +- .../mda/256kb/fake188/debugger/machine.xml | 2 +- .../5160/mda/256kb/fake188/machine.xml | 2 +- devices/pc/machine/5160/mda/256kb/machine.xml | 2 +- .../machine/5160/mda/64kb/softkbd/machine.xml | 2 +- .../machine/5170/ega/1152kb/rev1/machine.xml | 2 +- .../ega/1152kb/rev3/backtrack/machine.xml | 2 +- .../machine/5170/ega/1152kb/rev3/machine.xml | 2 +- .../machine/5170/ega/640kb/rev1/machine.xml | 2 +- .../machine/5170/ega/640kb/rev1/manifest.xml | 2 +- .../compaq/deskpro386/ega/2048kb/machine.xml | 2 +- .../deskpro386/other/2048kb/machine.xml | 2 +- .../compaq/deskpro386/vga/2048kb/machine.xml | 2 +- .../compaq/deskpro386/vga/4096kb/machine.xml | 2 +- disks/pc/apps/lotus/123/1.0a/manifest.xml | 2 +- .../pc/apps/microsoft/chart/2.02/manifest.xml | 2 +- .../apps/microsoft/winword/2.0c/manifest.xml | 2 +- disks/pc/apps/microsoft/word/3.0/manifest.xml | 2 +- disks/pc/apps/microsoft/word/3.1/manifest.xml | 2 +- disks/pc/apps/microsoft/word/5.0/manifest.xml | 2 +- disks/pc/cpm/1.1b/machine.xml | 2 +- disks/pc/cpm/1.1b/manifest.xml | 2 +- disks/pc/diags/ibm/2.20/machine.xml | 2 +- disks/pc/diags/ibm/2.20/manifest.xml | 2 +- disks/pc/dos/compaq/3.10/manifest.xml | 2 +- disks/pc/dos/compaq/3.31/manifest.xml | 2 +- disks/pc/dos/ibm/1.00/machine.xml | 2 +- disks/pc/dos/ibm/1.00/manifest.xml | 2 +- disks/pc/dos/ibm/1.10/machine.xml | 2 +- disks/pc/dos/ibm/1.10/manifest.xml | 2 +- disks/pc/dos/ibm/2.00/manifest.xml | 2 +- disks/pc/dos/ibm/2.10/manifest.xml | 2 +- disks/pc/dos/ibm/3.00/manifest.xml | 2 +- disks/pc/dos/ibm/3.10/manifest.xml | 2 +- disks/pc/dos/ibm/3.20/manifest.xml | 2 +- disks/pc/dos/ibm/3.30/manifest.xml | 2 +- disks/pc/dos/ibm/4.00/manifest.xml | 2 +- disks/pc/dos/ibm/5.00/manifest.xml | 2 +- disks/pc/dos/ibm/6.10/manifest.xml | 2 +- disks/pc/dos/ibm/7.00/manifest.xml | 2 +- disks/pc/dos/microsoft/1.25/manifest.xml | 2 +- disks/pc/dos/microsoft/2.00/manifest.xml | 2 +- disks/pc/dos/microsoft/3.20/manifest.xml | 2 +- disks/pc/dos/microsoft/3.21/manifest.xml | 2 +- disks/pc/dos/microsoft/3.30/manifest.xml | 2 +- disks/pc/dos/microsoft/3.31/manifest.xml | 2 +- disks/pc/dos/microsoft/4.00/machine.xml | 2 +- disks/pc/dos/microsoft/4.00/manifest.xml | 2 +- disks/pc/dos/microsoft/4.01/720K/manifest.xml | 2 +- disks/pc/dos/microsoft/4.01/machine.xml | 2 +- disks/pc/dos/microsoft/4.01/manifest.xml | 2 +- disks/pc/dos/microsoft/4.0M/manifest.xml | 2 +- disks/pc/dos/microsoft/5.00/manifest.xml | 2 +- disks/pc/dos/microsoft/6.00/manifest.xml | 2 +- disks/pc/dos/microsoft/6.20/manifest.xml | 2 +- disks/pc/dos/microsoft/6.22/manifest.xml | 2 +- disks/pc/games/infocom/hhiker/manifest.xml | 2 +- disks/pc/games/infocom/machine-debug.xml | 2 +- disks/pc/games/infocom/machine.xml | 2 +- disks/pc/games/infocom/planet/manifest.xml | 2 +- .../games/infocom/zork1/debugger/machine.xml | 2 +- disks/pc/games/infocom/zork1/manifest.xml | 2 +- disks/pc/games/infocom/zork2/manifest.xml | 2 +- disks/pc/games/infocom/zork3/manifest.xml | 2 +- .../pc/games/microsoft/adventure/machine.xml | 2 +- .../pc/games/microsoft/adventure/manifest.xml | 2 +- .../pc/games/microsoft/flightsim/manifest.xml | 2 +- disks/pc/minix/1.1/manifest.xml | 2 +- disks/pc/os2/ibm/1.0/machine.xml | 2 +- disks/pc/os2/ibm/1.0/manifest.xml | 2 +- disks/pc/os2/ibm/1.1/manifest.xml | 2 +- disks/pc/os2/ibm/1.3/manifest.xml | 2 +- disks/pc/os2/microsoft/1.0/manifest.xml | 2 +- disks/pc/os2/misc/1.0/debugger/machine.xml | 2 +- disks/pc/os2/misc/manifest.xml | 2 +- .../tools/borland/pascal/3.00b/manifest.xml | 2 +- .../tools/borland/pascal/3.01a/manifest.xml | 2 +- disks/pc/tools/microsoft/basic/manifest.xml | 2 +- disks/pc/tools/microsoft/c/4.00/manifest.xml | 2 +- .../pc/tools/microsoft/masm/4.00/manifest.xml | 2 +- .../tools/microsoft/mouse/5.00/manifest.xml | 2 +- .../tools/microsoft/os2/sdk/1.02/manifest.xml | 2 +- .../microsoft/windows/sdk/1.01/manifest.xml | 2 +- .../microsoft/windows/sdk/1.03/manifest.xml | 2 +- .../microsoft/windows/sdk/1.04/manifest.xml | 2 +- .../microsoft/windows/sdk/2.03/manifest.xml | 2 +- .../microsoft/windows/sdk/3.00/manifest.xml | 2 +- disks/pc/unix/ibm/pcix/1.0/manifest.xml | 2 +- .../unix/microport/system-v/2.3/manifest.xml | 2 +- disks/pc/windows/1.01/manifest.xml | 2 +- disks/pc/windows/1.03/manifest.xml | 2 +- disks/pc/windows/1.03a/manifest.xml | 2 +- disks/pc/windows/1.04/manifest.xml | 2 +- disks/pc/windows/2.01/manifest.xml | 2 +- disks/pc/windows/2.03/manifest.xml | 2 +- disks/pc/windows/3.00/720K/manifest.xml | 2 +- disks/pc/windows/3.00/manifest.xml | 2 +- disks/pc/windows/3.11/manifest.xml | 2 +- disks/pc/windows/win95/4.00.950/manifest.xml | 2 +- disks/pc/windows/wincomm/manifest.xml | 2 +- disks/pc/xenix/sco/8086/2.1.3/manifest.xml | 2 +- modules/htmlout/lib/htmlout.js | 202 +++++++++++------- modules/markout/lib/markout.js | 16 +- package.json | 2 +- .../demos/machine-debugger.xml | 2 +- .../Graphics_for_the_IBM_PC/demos/machine.xml | 2 +- pubs/pc/programming/manifest.xml | 2 +- .../reference/ibm/5150/techref/manifest.xml | 2 +- .../reference/ibm/5160/techref/manifest.xml | 2 +- pubs/pc/reference/ibm/5170/setup/manifest.xml | 2 +- .../reference/ibm/5170/techref/manifest.xml | 2 +- pubs/pc/reference/ibm/ega/manifest.xml | 2 +- pubs/pc/reference/ibm/ps2/manifest.xml | 2 +- pubs/pc/reference/intel/80286/manifest.xml | 2 +- pubs/pc/software/os2/sdk10/manifest.xml | 2 +- pubs/pc/software/windows/sdk20/manifest.xml | 2 +- 156 files changed, 293 insertions(+), 233 deletions(-) diff --git a/_config.yml b/_config.yml index 7a405a9ff..2da7a61fa 100644 --- a/_config.yml +++ b/_config.yml @@ -24,7 +24,7 @@ kramdown: pcjs: domain: pcjs.org # whereas site.url is used for linking purposes, site.pcjs.domain is used for display purposes - version: 1.20.3 # IMPORTANT: keep pcjs.version in sync with package.json:version + version: 1.20.4 # IMPORTANT: keep pcjs.version in sync with package.json:version compiled: true # by default, the compiled pcjs.version scripts will be used (eg, pc.js or pc-dbg.js) pc_scripts: # if pcjs.compiled is false, the following scripts will be included instead, in the order listed - /modules/shared/lib/defines.js diff --git a/apps/pc/1981/visicalc/manifest.xml b/apps/pc/1981/visicalc/manifest.xml index 537fcda72..624ad9f50 100644 --- a/apps/pc/1981/visicalc/manifest.xml +++ b/apps/pc/1981/visicalc/manifest.xml @@ -1,5 +1,5 @@ - + VisiCalc diff --git a/apps/pc/1982/esuite/manifest.xml b/apps/pc/1982/esuite/manifest.xml index 6256a522b..02099fe33 100644 --- a/apps/pc/1982/esuite/manifest.xml +++ b/apps/pc/1982/esuite/manifest.xml @@ -1,5 +1,5 @@ - + Executive Suite diff --git a/apps/pc/1985/rogue/manifest.xml b/apps/pc/1985/rogue/manifest.xml index e004f20c0..34df2be30 100644 --- a/apps/pc/1985/rogue/manifest.xml +++ b/apps/pc/1985/rogue/manifest.xml @@ -1,5 +1,5 @@ - + Rogue diff --git a/apps/pc/1987/thinktank/manifest.xml b/apps/pc/1987/thinktank/manifest.xml index 381d7f07e..c3fd31d05 100644 --- a/apps/pc/1987/thinktank/manifest.xml +++ b/apps/pc/1987/thinktank/manifest.xml @@ -1,5 +1,5 @@ - + ThinkTank 2.41NP diff --git a/apps/pc/1988/moria/manifest.xml b/apps/pc/1988/moria/manifest.xml index 2b624eaa6..1a126fa5d 100644 --- a/apps/pc/1988/moria/manifest.xml +++ b/apps/pc/1988/moria/manifest.xml @@ -1,5 +1,5 @@ - + The Dungeons of Moria 4.872 diff --git a/apps/pc/1992/moria/manifest.xml b/apps/pc/1992/moria/manifest.xml index d98184e45..5b8566bfb 100644 --- a/apps/pc/1992/moria/manifest.xml +++ b/apps/pc/1992/moria/manifest.xml @@ -1,5 +1,5 @@ - + The Dungeons of Moria 5.5 diff --git a/devices/c1p/machine/32kb/machine.xml b/devices/c1p/machine/32kb/machine.xml index 206d0f239..d941486a1 100644 --- a/devices/c1p/machine/32kb/machine.xml +++ b/devices/c1p/machine/32kb/machine.xml @@ -1,5 +1,5 @@ - + OSI Challenger 1P (32Kb) with Disk Support diff --git a/devices/c1p/machine/8kb/all/debugger/machine.xml b/devices/c1p/machine/8kb/all/debugger/machine.xml index f1f2b13af..837a816f4 100644 --- a/devices/c1p/machine/8kb/all/debugger/machine.xml +++ b/devices/c1p/machine/8kb/all/debugger/machine.xml @@ -1,5 +1,5 @@ - + OSI Challenger 1P (8Kb, Additional Software) diff --git a/devices/c1p/machine/8kb/array/machine.xml b/devices/c1p/machine/8kb/array/machine.xml index f49ba07a5..ba55cc690 100644 --- a/devices/c1p/machine/8kb/array/machine.xml +++ b/devices/c1p/machine/8kb/array/machine.xml @@ -1,5 +1,5 @@ - + Challenger 1P (8Kb) "Server Array" diff --git a/devices/c1p/machine/8kb/large/debugger/machine.xml b/devices/c1p/machine/8kb/large/debugger/machine.xml index e7f752c81..3eb39bc21 100644 --- a/devices/c1p/machine/8kb/large/debugger/machine.xml +++ b/devices/c1p/machine/8kb/large/debugger/machine.xml @@ -1,5 +1,5 @@ - + OSI Challenger 1P (8Kb) with Debugger diff --git a/devices/c1p/machine/8kb/large/machine.xml b/devices/c1p/machine/8kb/large/machine.xml index c8390ee85..7bce5c54b 100644 --- a/devices/c1p/machine/8kb/large/machine.xml +++ b/devices/c1p/machine/8kb/large/machine.xml @@ -1,5 +1,5 @@ - + OSI Challenger 1P (circa 1978) diff --git a/devices/c1p/machine/8kb/small/machine.xml b/devices/c1p/machine/8kb/small/machine.xml index 72d914480..6ff14475f 100644 --- a/devices/c1p/machine/8kb/small/machine.xml +++ b/devices/c1p/machine/8kb/small/machine.xml @@ -1,5 +1,5 @@ - + diff --git a/devices/pc/machine/5150/cga/384kb/softkbd/machine.xml b/devices/pc/machine/5150/cga/384kb/softkbd/machine.xml index d46c6d4eb..d3cb62906 100644 --- a/devices/pc/machine/5150/cga/384kb/softkbd/machine.xml +++ b/devices/pc/machine/5150/cga/384kb/softkbd/machine.xml @@ -1,5 +1,5 @@ - + IBM PC (Model 5150), CGA, 384K diff --git a/devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.xml b/devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.xml index ef1fe6b00..12209b16d 100644 --- a/devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.xml +++ b/devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.xml @@ -1,5 +1,5 @@ - + IBM PC (Model 5150), CGA, 64K diff --git a/devices/pc/machine/5150/cga/64kb/donkey/machine.xml b/devices/pc/machine/5150/cga/64kb/donkey/machine.xml index 92dcf3066..badab684d 100644 --- a/devices/pc/machine/5150/cga/64kb/donkey/machine.xml +++ b/devices/pc/machine/5150/cga/64kb/donkey/machine.xml @@ -1,5 +1,5 @@ - + IBM PC (Model 5150), CGA, 64K diff --git a/devices/pc/machine/5150/cga/64kb/softkbd/machine.xml b/devices/pc/machine/5150/cga/64kb/softkbd/machine.xml index 841c5f516..be7205f85 100644 --- a/devices/pc/machine/5150/cga/64kb/softkbd/machine.xml +++ b/devices/pc/machine/5150/cga/64kb/softkbd/machine.xml @@ -1,5 +1,5 @@ - + IBM PC (Model 5150), CGA, 64K diff --git a/devices/pc/machine/5150/dual/64kb/machine.xml b/devices/pc/machine/5150/dual/64kb/machine.xml index 58672fb81..cc3303e84 100644 --- a/devices/pc/machine/5150/dual/64kb/machine.xml +++ b/devices/pc/machine/5150/dual/64kb/machine.xml @@ -1,5 +1,5 @@ - + IBM PC (Model 5150) with Dual Display diff --git a/devices/pc/machine/5150/mda/64kb/debugger/machine.xml b/devices/pc/machine/5150/mda/64kb/debugger/machine.xml index 27bcf4a9f..0bb467744 100644 --- a/devices/pc/machine/5150/mda/64kb/debugger/machine.xml +++ b/devices/pc/machine/5150/mda/64kb/debugger/machine.xml @@ -1,5 +1,5 @@ - + IBM PC Model 5150 with Monochrome Display diff --git a/devices/pc/machine/5150/mda/64kb/machine.xml b/devices/pc/machine/5150/mda/64kb/machine.xml index 519779906..a9dd5213d 100644 --- a/devices/pc/machine/5150/mda/64kb/machine.xml +++ b/devices/pc/machine/5150/mda/64kb/machine.xml @@ -1,5 +1,5 @@ - + IBM PC (Model 5150) with Monochrome Display diff --git a/devices/pc/machine/5150/mda/64kb/softkbd/machine.xml b/devices/pc/machine/5150/mda/64kb/softkbd/machine.xml index 006961819..f054439d9 100644 --- a/devices/pc/machine/5150/mda/64kb/softkbd/machine.xml +++ b/devices/pc/machine/5150/mda/64kb/softkbd/machine.xml @@ -1,5 +1,5 @@ - + IBM PC (Model 5150), MDA, 64K diff --git a/devices/pc/machine/5160/cga/256kb/array/machine.xml b/devices/pc/machine/5160/cga/256kb/array/machine.xml index eb4daa912..f5df3f756 100644 --- a/devices/pc/machine/5160/cga/256kb/array/machine.xml +++ b/devices/pc/machine/5160/cga/256kb/array/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), CGA, 256K, 10Mb Drive diff --git a/devices/pc/machine/5160/cga/256kb/demo/debugger/machine.xml b/devices/pc/machine/5160/cga/256kb/demo/debugger/machine.xml index 149d814ed..ec49290f8 100644 --- a/devices/pc/machine/5160/cga/256kb/demo/debugger/machine.xml +++ b/devices/pc/machine/5160/cga/256kb/demo/debugger/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), CGA, 256Kb, 10Mb Drive diff --git a/devices/pc/machine/5160/cga/256kb/demo/machine.xml b/devices/pc/machine/5160/cga/256kb/demo/machine.xml index 4f4d7b1ca..7807f82ad 100644 --- a/devices/pc/machine/5160/cga/256kb/demo/machine.xml +++ b/devices/pc/machine/5160/cga/256kb/demo/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), CGA, 256Kb, 10Mb Drive diff --git a/devices/pc/machine/5160/cga/256kb/softkbd/machine.xml b/devices/pc/machine/5160/cga/256kb/softkbd/machine.xml index a463a7da5..a9d20aaa0 100644 --- a/devices/pc/machine/5160/cga/256kb/softkbd/machine.xml +++ b/devices/pc/machine/5160/cga/256kb/softkbd/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), CGA, 256K, 10Mb Drive diff --git a/devices/pc/machine/5160/cga/256kb/win101/README.md b/devices/pc/machine/5160/cga/256kb/win101/README.md index 7bd1a6d0c..fd1246be3 100644 --- a/devices/pc/machine/5160/cga/256kb/win101/README.md +++ b/devices/pc/machine/5160/cga/256kb/win101/README.md @@ -1,6 +1,6 @@ --- layout: page -title: "IBM PC XT (Model 5160) with Color Display, 256Kb, Windows 1.01" +title: "IBM PC XT (Model 5160, 256Kb) Windows 1.01 with CGA Display" permalink: /devices/pc/machine/5160/cga/256kb/win101/ machines: - type: pc diff --git a/devices/pc/machine/5160/cga/256kb/win101/debugger/machine.xml b/devices/pc/machine/5160/cga/256kb/win101/debugger/machine.xml index 04279a040..c226e36a2 100644 --- a/devices/pc/machine/5160/cga/256kb/win101/debugger/machine.xml +++ b/devices/pc/machine/5160/cga/256kb/win101/debugger/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160) running Windows v1.01 diff --git a/devices/pc/machine/5160/cga/256kb/win101/machine.xml b/devices/pc/machine/5160/cga/256kb/win101/machine.xml index ecfd39c4c..0ed5735c3 100644 --- a/devices/pc/machine/5160/cga/256kb/win101/machine.xml +++ b/devices/pc/machine/5160/cga/256kb/win101/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160) running Windows v1.01 diff --git a/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.xml b/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.xml index c10779113..5c1d44a3f 100644 --- a/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.xml +++ b/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), CGA, 256K, WIN101 diff --git a/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.xml b/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.xml index 7f5ec9075..b6035f514 100644 --- a/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.xml +++ b/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), CGA, 512K, WIN101 diff --git a/devices/pc/machine/5160/cga/640kb/debugger/machine.xml b/devices/pc/machine/5160/cga/640kb/debugger/machine.xml index 99df59998..7aa320f5c 100644 --- a/devices/pc/machine/5160/cga/640kb/debugger/machine.xml +++ b/devices/pc/machine/5160/cga/640kb/debugger/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), CGA, 640K, 10Mb Drive diff --git a/devices/pc/machine/5160/cga/640kb/dos400m/machine.xml b/devices/pc/machine/5160/cga/640kb/dos400m/machine.xml index 7b0333462..9d6e7775e 100644 --- a/devices/pc/machine/5160/cga/640kb/dos400m/machine.xml +++ b/devices/pc/machine/5160/cga/640kb/dos400m/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), CGA, 640K, 10Mb Drive diff --git a/devices/pc/machine/5160/cga/640kb/machine.xml b/devices/pc/machine/5160/cga/640kb/machine.xml index c03366769..3966b0c7c 100644 --- a/devices/pc/machine/5160/cga/640kb/machine.xml +++ b/devices/pc/machine/5160/cga/640kb/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), CGA, 640K, 10Mb Drive diff --git a/devices/pc/machine/5160/ega/256kb/debugger/machine.xml b/devices/pc/machine/5160/ega/256kb/debugger/machine.xml index e925d03e7..4d99c7709 100644 --- a/devices/pc/machine/5160/ega/256kb/debugger/machine.xml +++ b/devices/pc/machine/5160/ega/256kb/debugger/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), 64K EGA, 256K RAM, 10Mb Hard Drive diff --git a/devices/pc/machine/5160/ega/640kb/array/machine.xml b/devices/pc/machine/5160/ega/640kb/array/machine.xml index 13f64a2b4..aba15843e 100644 --- a/devices/pc/machine/5160/ega/640kb/array/machine.xml +++ b/devices/pc/machine/5160/ega/640kb/array/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT, 128K EGA, 640K RAM, 10Mb Hard Drive diff --git a/devices/pc/machine/5160/ega/640kb/debugger/machine.xml b/devices/pc/machine/5160/ega/640kb/debugger/machine.xml index 53e6faddc..ccefe26b6 100644 --- a/devices/pc/machine/5160/ega/640kb/debugger/machine.xml +++ b/devices/pc/machine/5160/ega/640kb/debugger/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT, 128K EGA, 640K RAM, 10Mb Hard Drive diff --git a/devices/pc/machine/5160/ega/640kb/machine.xml b/devices/pc/machine/5160/ega/640kb/machine.xml index ec18855fd..7094c8143 100644 --- a/devices/pc/machine/5160/ega/640kb/machine.xml +++ b/devices/pc/machine/5160/ega/640kb/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT, 128K EGA, 640K RAM, 10Mb Hard Drive diff --git a/devices/pc/machine/5160/ega/640kb/win101/debugger/machine.xml b/devices/pc/machine/5160/ega/640kb/win101/debugger/machine.xml index dabfb24d7..4ec3ae450 100644 --- a/devices/pc/machine/5160/ega/640kb/win101/debugger/machine.xml +++ b/devices/pc/machine/5160/ega/640kb/win101/debugger/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT, 128K EGA, 640K RAM, 10Mb Hard Drive diff --git a/devices/pc/machine/5160/ega/640kb/win101/machine.md b/devices/pc/machine/5160/ega/640kb/win101/machine.md index 80d5da8c3..a0c91d03a 100644 --- a/devices/pc/machine/5160/ega/640kb/win101/machine.md +++ b/devices/pc/machine/5160/ega/640kb/win101/machine.md @@ -1,6 +1,6 @@ --- layout: page -title: "IBM PC XT (Model 5160) with EGA Display, 640Kb, Windows 1.01" +title: "IBM PC XT (Model 5160, 640Kb) Windows 1.01 with EGA Display" permalink: /devices/pc/machine/5160/ega/640kb/win101/ machines: - type: pc diff --git a/devices/pc/machine/5160/ega/640kb/win101/machine.xml b/devices/pc/machine/5160/ega/640kb/win101/machine.xml index 21c80fa97..8e9aa4419 100644 --- a/devices/pc/machine/5160/ega/640kb/win101/machine.xml +++ b/devices/pc/machine/5160/ega/640kb/win101/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT, 128K EGA, 640K RAM, 10Mb Hard Drive diff --git a/devices/pc/machine/5160/mda/256kb/debugger/machine.xml b/devices/pc/machine/5160/mda/256kb/debugger/machine.xml index ebc349b0c..30d92199c 100644 --- a/devices/pc/machine/5160/mda/256kb/debugger/machine.xml +++ b/devices/pc/machine/5160/mda/256kb/debugger/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), MDA, 256Kb, 10Mb Drive diff --git a/devices/pc/machine/5160/mda/256kb/fake188/debugger/machine.xml b/devices/pc/machine/5160/mda/256kb/fake188/debugger/machine.xml index 64c390608..beaf94463 100644 --- a/devices/pc/machine/5160/mda/256kb/fake188/debugger/machine.xml +++ b/devices/pc/machine/5160/mda/256kb/fake188/debugger/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), MDA, 256Kb, 10Mb Drive diff --git a/devices/pc/machine/5160/mda/256kb/fake188/machine.xml b/devices/pc/machine/5160/mda/256kb/fake188/machine.xml index af6d795bb..eb65238c1 100644 --- a/devices/pc/machine/5160/mda/256kb/fake188/machine.xml +++ b/devices/pc/machine/5160/mda/256kb/fake188/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), MDA, 256Kb, 10Mb Drive diff --git a/devices/pc/machine/5160/mda/256kb/machine.xml b/devices/pc/machine/5160/mda/256kb/machine.xml index 59c511147..d27451b5d 100644 --- a/devices/pc/machine/5160/mda/256kb/machine.xml +++ b/devices/pc/machine/5160/mda/256kb/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), MDA, 256Kb, 10Mb Drive diff --git a/devices/pc/machine/5160/mda/64kb/softkbd/machine.xml b/devices/pc/machine/5160/mda/64kb/softkbd/machine.xml index c006f03a7..9a4822739 100644 --- a/devices/pc/machine/5160/mda/64kb/softkbd/machine.xml +++ b/devices/pc/machine/5160/mda/64kb/softkbd/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), MDA, 64K, 10Mb Drive diff --git a/devices/pc/machine/5170/ega/1152kb/rev1/machine.xml b/devices/pc/machine/5170/ega/1152kb/rev1/machine.xml index 28ec00820..3e83b1e88 100644 --- a/devices/pc/machine/5170/ega/1152kb/rev1/machine.xml +++ b/devices/pc/machine/5170/ega/1152kb/rev1/machine.xml @@ -1,5 +1,5 @@ - + IBM PC AT (6Mhz), 128Kb EGA, 1152Kb RAM, 20Mb Hard Disk diff --git a/devices/pc/machine/5170/ega/1152kb/rev3/backtrack/machine.xml b/devices/pc/machine/5170/ega/1152kb/rev3/backtrack/machine.xml index df3be8ba9..ffca1470e 100644 --- a/devices/pc/machine/5170/ega/1152kb/rev3/backtrack/machine.xml +++ b/devices/pc/machine/5170/ega/1152kb/rev3/backtrack/machine.xml @@ -1,5 +1,5 @@ - + IBM PC AT (8Mhz), 128Kb EGA, 1152Kb RAM, 20Mb Hard Disk diff --git a/devices/pc/machine/5170/ega/1152kb/rev3/machine.xml b/devices/pc/machine/5170/ega/1152kb/rev3/machine.xml index e8eb07691..ff5934f3d 100644 --- a/devices/pc/machine/5170/ega/1152kb/rev3/machine.xml +++ b/devices/pc/machine/5170/ega/1152kb/rev3/machine.xml @@ -1,5 +1,5 @@ - + IBM PC AT (8Mhz), 128Kb EGA, 1152Kb RAM, 20Mb Hard Disk diff --git a/devices/pc/machine/5170/ega/640kb/rev1/machine.xml b/devices/pc/machine/5170/ega/640kb/rev1/machine.xml index cdc024c9a..3e2ff953b 100644 --- a/devices/pc/machine/5170/ega/640kb/rev1/machine.xml +++ b/devices/pc/machine/5170/ega/640kb/rev1/machine.xml @@ -1,5 +1,5 @@ - + IBM PC AT, 128K EGA, 640K RAM diff --git a/devices/pc/machine/5170/ega/640kb/rev1/manifest.xml b/devices/pc/machine/5170/ega/640kb/rev1/manifest.xml index f16ebab8f..19cdf40b5 100644 --- a/devices/pc/machine/5170/ega/640kb/rev1/manifest.xml +++ b/devices/pc/machine/5170/ega/640kb/rev1/manifest.xml @@ -1,5 +1,5 @@ - + IBM PC AT References diff --git a/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml b/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml index a8b0bff42..af1ab3c8b 100644 --- a/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml +++ b/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml @@ -1,5 +1,5 @@ - + diff --git a/devices/pc/machine/compaq/deskpro386/other/2048kb/machine.xml b/devices/pc/machine/compaq/deskpro386/other/2048kb/machine.xml index 2f4670131..9a7889557 100644 --- a/devices/pc/machine/compaq/deskpro386/other/2048kb/machine.xml +++ b/devices/pc/machine/compaq/deskpro386/other/2048kb/machine.xml @@ -1,5 +1,5 @@ - + diff --git a/devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.xml b/devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.xml index ebfdb018c..3c19911d0 100644 --- a/devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.xml +++ b/devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.xml @@ -1,5 +1,5 @@ - + diff --git a/devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.xml b/devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.xml index a68fb689b..97e893d43 100644 --- a/devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.xml +++ b/devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.xml @@ -1,5 +1,5 @@ - + diff --git a/disks/pc/apps/lotus/123/1.0a/manifest.xml b/disks/pc/apps/lotus/123/1.0a/manifest.xml index 1d946dd26..2c5b569ad 100644 --- a/disks/pc/apps/lotus/123/1.0a/manifest.xml +++ b/disks/pc/apps/lotus/123/1.0a/manifest.xml @@ -1,5 +1,5 @@ - + 1-2-3 1.0a diff --git a/disks/pc/apps/microsoft/chart/2.02/manifest.xml b/disks/pc/apps/microsoft/chart/2.02/manifest.xml index d3e4f1438..9e3cd697e 100644 --- a/disks/pc/apps/microsoft/chart/2.02/manifest.xml +++ b/disks/pc/apps/microsoft/chart/2.02/manifest.xml @@ -1,5 +1,5 @@ - + Microsoft Chart 2.02 diff --git a/disks/pc/apps/microsoft/winword/2.0c/manifest.xml b/disks/pc/apps/microsoft/winword/2.0c/manifest.xml index 6ecf418e7..6576075c2 100644 --- a/disks/pc/apps/microsoft/winword/2.0c/manifest.xml +++ b/disks/pc/apps/microsoft/winword/2.0c/manifest.xml @@ -1,5 +1,5 @@ - + Word for Windows 2.0c diff --git a/disks/pc/apps/microsoft/word/3.0/manifest.xml b/disks/pc/apps/microsoft/word/3.0/manifest.xml index 86b17b205..47052f0f8 100644 --- a/disks/pc/apps/microsoft/word/3.0/manifest.xml +++ b/disks/pc/apps/microsoft/word/3.0/manifest.xml @@ -1,5 +1,5 @@ - + MS Word 3.0 diff --git a/disks/pc/apps/microsoft/word/3.1/manifest.xml b/disks/pc/apps/microsoft/word/3.1/manifest.xml index e10e76001..8c70ca750 100644 --- a/disks/pc/apps/microsoft/word/3.1/manifest.xml +++ b/disks/pc/apps/microsoft/word/3.1/manifest.xml @@ -1,5 +1,5 @@ - + MS Word 3.1 diff --git a/disks/pc/apps/microsoft/word/5.0/manifest.xml b/disks/pc/apps/microsoft/word/5.0/manifest.xml index c6a06adc9..434ebba4e 100644 --- a/disks/pc/apps/microsoft/word/5.0/manifest.xml +++ b/disks/pc/apps/microsoft/word/5.0/manifest.xml @@ -1,5 +1,5 @@ - + MS Word 5.0 diff --git a/disks/pc/cpm/1.1b/machine.xml b/disks/pc/cpm/1.1b/machine.xml index e251b4e46..acd14f84c 100644 --- a/disks/pc/cpm/1.1b/machine.xml +++ b/disks/pc/cpm/1.1b/machine.xml @@ -1,5 +1,5 @@ - + IBM PC (Model 5150) running CP/M-86 diff --git a/disks/pc/cpm/1.1b/manifest.xml b/disks/pc/cpm/1.1b/manifest.xml index 41c5e170d..0fef1c857 100644 --- a/disks/pc/cpm/1.1b/manifest.xml +++ b/disks/pc/cpm/1.1b/manifest.xml @@ -1,5 +1,5 @@ - + CP/M-86 1.1B diff --git a/disks/pc/diags/ibm/2.20/machine.xml b/disks/pc/diags/ibm/2.20/machine.xml index 27ed6ae5b..b20081611 100644 --- a/disks/pc/diags/ibm/2.20/machine.xml +++ b/disks/pc/diags/ibm/2.20/machine.xml @@ -1,5 +1,5 @@ - + IBM PC (Model 5150) running IBM Advanced Diagnostics 2.20 diff --git a/disks/pc/diags/ibm/2.20/manifest.xml b/disks/pc/diags/ibm/2.20/manifest.xml index 4715b2e58..8fa2f7921 100644 --- a/disks/pc/diags/ibm/2.20/manifest.xml +++ b/disks/pc/diags/ibm/2.20/manifest.xml @@ -1,5 +1,5 @@ - + IBM Advanced Diagnostics 2.20 diff --git a/disks/pc/dos/compaq/3.10/manifest.xml b/disks/pc/dos/compaq/3.10/manifest.xml index a61c07a76..f43969b7d 100644 --- a/disks/pc/dos/compaq/3.10/manifest.xml +++ b/disks/pc/dos/compaq/3.10/manifest.xml @@ -1,5 +1,5 @@ - + MS-DOS 3.10 diff --git a/disks/pc/dos/compaq/3.31/manifest.xml b/disks/pc/dos/compaq/3.31/manifest.xml index 719be5fd9..202f3e6b8 100644 --- a/disks/pc/dos/compaq/3.31/manifest.xml +++ b/disks/pc/dos/compaq/3.31/manifest.xml @@ -1,5 +1,5 @@ - + MS-DOS 3.31 diff --git a/disks/pc/dos/ibm/1.00/machine.xml b/disks/pc/dos/ibm/1.00/machine.xml index bdc3c596c..66394d7c7 100644 --- a/disks/pc/dos/ibm/1.00/machine.xml +++ b/disks/pc/dos/ibm/1.00/machine.xml @@ -1,5 +1,5 @@ - + IBM PC (Model 5150) with Monochrome Display diff --git a/disks/pc/dos/ibm/1.00/manifest.xml b/disks/pc/dos/ibm/1.00/manifest.xml index 0726c08c3..ff947b828 100644 --- a/disks/pc/dos/ibm/1.00/manifest.xml +++ b/disks/pc/dos/ibm/1.00/manifest.xml @@ -1,5 +1,5 @@ - + PC-DOS 1.00 diff --git a/disks/pc/dos/ibm/1.10/machine.xml b/disks/pc/dos/ibm/1.10/machine.xml index 4bcc6ba67..100465142 100644 --- a/disks/pc/dos/ibm/1.10/machine.xml +++ b/disks/pc/dos/ibm/1.10/machine.xml @@ -1,5 +1,5 @@ - + IBM PC (Model 5150) with Monochrome Display diff --git a/disks/pc/dos/ibm/1.10/manifest.xml b/disks/pc/dos/ibm/1.10/manifest.xml index 8cf422825..d945526b5 100644 --- a/disks/pc/dos/ibm/1.10/manifest.xml +++ b/disks/pc/dos/ibm/1.10/manifest.xml @@ -1,5 +1,5 @@ - + PC-DOS 1.10 diff --git a/disks/pc/dos/ibm/2.00/manifest.xml b/disks/pc/dos/ibm/2.00/manifest.xml index 3ce76e957..bf4ec8425 100644 --- a/disks/pc/dos/ibm/2.00/manifest.xml +++ b/disks/pc/dos/ibm/2.00/manifest.xml @@ -1,5 +1,5 @@ - + PC-DOS 2.00 diff --git a/disks/pc/dos/ibm/2.10/manifest.xml b/disks/pc/dos/ibm/2.10/manifest.xml index dfd31cfc7..b275e426a 100644 --- a/disks/pc/dos/ibm/2.10/manifest.xml +++ b/disks/pc/dos/ibm/2.10/manifest.xml @@ -1,5 +1,5 @@ - + PC-DOS 2.10 diff --git a/disks/pc/dos/ibm/3.00/manifest.xml b/disks/pc/dos/ibm/3.00/manifest.xml index 0ddfb75ed..c5b844cfa 100644 --- a/disks/pc/dos/ibm/3.00/manifest.xml +++ b/disks/pc/dos/ibm/3.00/manifest.xml @@ -1,5 +1,5 @@ - + PC-DOS 3.00 diff --git a/disks/pc/dos/ibm/3.10/manifest.xml b/disks/pc/dos/ibm/3.10/manifest.xml index a798b124b..a59d14364 100644 --- a/disks/pc/dos/ibm/3.10/manifest.xml +++ b/disks/pc/dos/ibm/3.10/manifest.xml @@ -1,5 +1,5 @@ - + PC-DOS 3.10 diff --git a/disks/pc/dos/ibm/3.20/manifest.xml b/disks/pc/dos/ibm/3.20/manifest.xml index 0e9ea3fa7..32f163ddd 100644 --- a/disks/pc/dos/ibm/3.20/manifest.xml +++ b/disks/pc/dos/ibm/3.20/manifest.xml @@ -1,5 +1,5 @@ - + PC-DOS 3.20 diff --git a/disks/pc/dos/ibm/3.30/manifest.xml b/disks/pc/dos/ibm/3.30/manifest.xml index 22a6481f5..5f07d2304 100644 --- a/disks/pc/dos/ibm/3.30/manifest.xml +++ b/disks/pc/dos/ibm/3.30/manifest.xml @@ -1,5 +1,5 @@ - + PC-DOS 3.30 diff --git a/disks/pc/dos/ibm/4.00/manifest.xml b/disks/pc/dos/ibm/4.00/manifest.xml index 0a5b15fe0..abde0005f 100644 --- a/disks/pc/dos/ibm/4.00/manifest.xml +++ b/disks/pc/dos/ibm/4.00/manifest.xml @@ -1,5 +1,5 @@ - + PC-DOS 4.00 diff --git a/disks/pc/dos/ibm/5.00/manifest.xml b/disks/pc/dos/ibm/5.00/manifest.xml index d4e605ad1..161669365 100644 --- a/disks/pc/dos/ibm/5.00/manifest.xml +++ b/disks/pc/dos/ibm/5.00/manifest.xml @@ -1,5 +1,5 @@ - + PC-DOS 5.00 diff --git a/disks/pc/dos/ibm/6.10/manifest.xml b/disks/pc/dos/ibm/6.10/manifest.xml index 9f4a731b2..9bc4ba928 100644 --- a/disks/pc/dos/ibm/6.10/manifest.xml +++ b/disks/pc/dos/ibm/6.10/manifest.xml @@ -1,5 +1,5 @@ - + PC-DOS 6.10 diff --git a/disks/pc/dos/ibm/7.00/manifest.xml b/disks/pc/dos/ibm/7.00/manifest.xml index 1143d695d..60e43f1c6 100644 --- a/disks/pc/dos/ibm/7.00/manifest.xml +++ b/disks/pc/dos/ibm/7.00/manifest.xml @@ -1,5 +1,5 @@ - + PC-DOS 7.00 diff --git a/disks/pc/dos/microsoft/1.25/manifest.xml b/disks/pc/dos/microsoft/1.25/manifest.xml index 9a7dea5f7..3b019bce0 100644 --- a/disks/pc/dos/microsoft/1.25/manifest.xml +++ b/disks/pc/dos/microsoft/1.25/manifest.xml @@ -1,5 +1,5 @@ - + MS-DOS 1.25 diff --git a/disks/pc/dos/microsoft/2.00/manifest.xml b/disks/pc/dos/microsoft/2.00/manifest.xml index 40ea82af3..23f40a0be 100644 --- a/disks/pc/dos/microsoft/2.00/manifest.xml +++ b/disks/pc/dos/microsoft/2.00/manifest.xml @@ -1,5 +1,5 @@ - + MS-DOS 2.00 diff --git a/disks/pc/dos/microsoft/3.20/manifest.xml b/disks/pc/dos/microsoft/3.20/manifest.xml index ee4b26762..364feb8e7 100644 --- a/disks/pc/dos/microsoft/3.20/manifest.xml +++ b/disks/pc/dos/microsoft/3.20/manifest.xml @@ -1,5 +1,5 @@ - + MS-DOS 3.20 diff --git a/disks/pc/dos/microsoft/3.21/manifest.xml b/disks/pc/dos/microsoft/3.21/manifest.xml index ac5180c7a..c9a8ebb35 100644 --- a/disks/pc/dos/microsoft/3.21/manifest.xml +++ b/disks/pc/dos/microsoft/3.21/manifest.xml @@ -1,5 +1,5 @@ - + MS-DOS 3.21 diff --git a/disks/pc/dos/microsoft/3.30/manifest.xml b/disks/pc/dos/microsoft/3.30/manifest.xml index 2eb7ff954..059ac4261 100644 --- a/disks/pc/dos/microsoft/3.30/manifest.xml +++ b/disks/pc/dos/microsoft/3.30/manifest.xml @@ -1,5 +1,5 @@ - + MS-DOS 3.30 diff --git a/disks/pc/dos/microsoft/3.31/manifest.xml b/disks/pc/dos/microsoft/3.31/manifest.xml index 8dcfb982d..c1720be8d 100644 --- a/disks/pc/dos/microsoft/3.31/manifest.xml +++ b/disks/pc/dos/microsoft/3.31/manifest.xml @@ -1,5 +1,5 @@ - + MS-DOS 3.31 diff --git a/disks/pc/dos/microsoft/4.00/machine.xml b/disks/pc/dos/microsoft/4.00/machine.xml index 72428f230..a40431f97 100644 --- a/disks/pc/dos/microsoft/4.00/machine.xml +++ b/disks/pc/dos/microsoft/4.00/machine.xml @@ -1,5 +1,5 @@ - + IBM PC AT, 128K EGA, 640K RAM diff --git a/disks/pc/dos/microsoft/4.00/manifest.xml b/disks/pc/dos/microsoft/4.00/manifest.xml index d3c9a6d2e..585c0a916 100644 --- a/disks/pc/dos/microsoft/4.00/manifest.xml +++ b/disks/pc/dos/microsoft/4.00/manifest.xml @@ -1,5 +1,5 @@ - + MS-DOS 4.00 diff --git a/disks/pc/dos/microsoft/4.01/720K/manifest.xml b/disks/pc/dos/microsoft/4.01/720K/manifest.xml index 017eb7282..ebad882f2 100644 --- a/disks/pc/dos/microsoft/4.01/720K/manifest.xml +++ b/disks/pc/dos/microsoft/4.01/720K/manifest.xml @@ -1,5 +1,5 @@ - + MS-DOS 4.01 diff --git a/disks/pc/dos/microsoft/4.01/machine.xml b/disks/pc/dos/microsoft/4.01/machine.xml index b67c612b9..f6b503477 100644 --- a/disks/pc/dos/microsoft/4.01/machine.xml +++ b/disks/pc/dos/microsoft/4.01/machine.xml @@ -1,5 +1,5 @@ - + IBM PC AT, 128K EGA, 640K RAM diff --git a/disks/pc/dos/microsoft/4.01/manifest.xml b/disks/pc/dos/microsoft/4.01/manifest.xml index aa6ca155d..ebe8453ee 100644 --- a/disks/pc/dos/microsoft/4.01/manifest.xml +++ b/disks/pc/dos/microsoft/4.01/manifest.xml @@ -1,5 +1,5 @@ - + MS-DOS 4.01 diff --git a/disks/pc/dos/microsoft/4.0M/manifest.xml b/disks/pc/dos/microsoft/4.0M/manifest.xml index e8c807e9c..b5c6b876f 100644 --- a/disks/pc/dos/microsoft/4.0M/manifest.xml +++ b/disks/pc/dos/microsoft/4.0M/manifest.xml @@ -1,5 +1,5 @@ - + MS-DOS 4.0M diff --git a/disks/pc/dos/microsoft/5.00/manifest.xml b/disks/pc/dos/microsoft/5.00/manifest.xml index 990253735..dafde5587 100644 --- a/disks/pc/dos/microsoft/5.00/manifest.xml +++ b/disks/pc/dos/microsoft/5.00/manifest.xml @@ -1,5 +1,5 @@ - + MS-DOS 5.00 diff --git a/disks/pc/dos/microsoft/6.00/manifest.xml b/disks/pc/dos/microsoft/6.00/manifest.xml index fa2e45f3b..7a36a030c 100644 --- a/disks/pc/dos/microsoft/6.00/manifest.xml +++ b/disks/pc/dos/microsoft/6.00/manifest.xml @@ -1,5 +1,5 @@ - + MS-DOS 6.00 diff --git a/disks/pc/dos/microsoft/6.20/manifest.xml b/disks/pc/dos/microsoft/6.20/manifest.xml index 2f9a0b192..5aa5f9741 100644 --- a/disks/pc/dos/microsoft/6.20/manifest.xml +++ b/disks/pc/dos/microsoft/6.20/manifest.xml @@ -1,5 +1,5 @@ - + MS-DOS 6.20 diff --git a/disks/pc/dos/microsoft/6.22/manifest.xml b/disks/pc/dos/microsoft/6.22/manifest.xml index 62540448d..9436b5fd3 100644 --- a/disks/pc/dos/microsoft/6.22/manifest.xml +++ b/disks/pc/dos/microsoft/6.22/manifest.xml @@ -1,5 +1,5 @@ - + MS-DOS 6.22 diff --git a/disks/pc/games/infocom/hhiker/manifest.xml b/disks/pc/games/infocom/hhiker/manifest.xml index bf1a7cf82..a06665146 100644 --- a/disks/pc/games/infocom/hhiker/manifest.xml +++ b/disks/pc/games/infocom/hhiker/manifest.xml @@ -1,5 +1,5 @@ - + The Hitchhiker's Guide to the Galaxy diff --git a/disks/pc/games/infocom/machine-debug.xml b/disks/pc/games/infocom/machine-debug.xml index c333f88d5..6f05071ed 100644 --- a/disks/pc/games/infocom/machine-debug.xml +++ b/disks/pc/games/infocom/machine-debug.xml @@ -1,5 +1,5 @@ - + IBM PC Model 5150 (CGA, 64K) diff --git a/disks/pc/games/infocom/machine.xml b/disks/pc/games/infocom/machine.xml index 4a7a9b0ad..6ae8fb6e5 100644 --- a/disks/pc/games/infocom/machine.xml +++ b/disks/pc/games/infocom/machine.xml @@ -1,5 +1,5 @@ - + IBM PC Model 5150 (CGA, 64K) diff --git a/disks/pc/games/infocom/planet/manifest.xml b/disks/pc/games/infocom/planet/manifest.xml index 3fd6319aa..4c14305d0 100644 --- a/disks/pc/games/infocom/planet/manifest.xml +++ b/disks/pc/games/infocom/planet/manifest.xml @@ -1,5 +1,5 @@ - + Planetfall diff --git a/disks/pc/games/infocom/zork1/debugger/machine.xml b/disks/pc/games/infocom/zork1/debugger/machine.xml index 5004cccea..1f41f90cf 100644 --- a/disks/pc/games/infocom/zork1/debugger/machine.xml +++ b/disks/pc/games/infocom/zork1/debugger/machine.xml @@ -1,5 +1,5 @@ - + Zork I (IBM PC Model 5150) diff --git a/disks/pc/games/infocom/zork1/manifest.xml b/disks/pc/games/infocom/zork1/manifest.xml index 77e4df45f..5382f7e85 100644 --- a/disks/pc/games/infocom/zork1/manifest.xml +++ b/disks/pc/games/infocom/zork1/manifest.xml @@ -1,5 +1,5 @@ - + Zork I diff --git a/disks/pc/games/infocom/zork2/manifest.xml b/disks/pc/games/infocom/zork2/manifest.xml index e6fb3cde2..e3de30d57 100644 --- a/disks/pc/games/infocom/zork2/manifest.xml +++ b/disks/pc/games/infocom/zork2/manifest.xml @@ -1,5 +1,5 @@ - + Zork II diff --git a/disks/pc/games/infocom/zork3/manifest.xml b/disks/pc/games/infocom/zork3/manifest.xml index b0f4dc125..d9a1b85a3 100644 --- a/disks/pc/games/infocom/zork3/manifest.xml +++ b/disks/pc/games/infocom/zork3/manifest.xml @@ -1,5 +1,5 @@ - + Zork III diff --git a/disks/pc/games/microsoft/adventure/machine.xml b/disks/pc/games/microsoft/adventure/machine.xml index a7f8ce03c..0424079eb 100644 --- a/disks/pc/games/microsoft/adventure/machine.xml +++ b/disks/pc/games/microsoft/adventure/machine.xml @@ -1,5 +1,5 @@ - + IBM PC (Model 5150) running Microsoft Adventure diff --git a/disks/pc/games/microsoft/adventure/manifest.xml b/disks/pc/games/microsoft/adventure/manifest.xml index ba00cdc55..be2137520 100644 --- a/disks/pc/games/microsoft/adventure/manifest.xml +++ b/disks/pc/games/microsoft/adventure/manifest.xml @@ -1,5 +1,5 @@ - + Microsoft Adventure 1.00 diff --git a/disks/pc/games/microsoft/flightsim/manifest.xml b/disks/pc/games/microsoft/flightsim/manifest.xml index 3166e85ab..cfc100129 100644 --- a/disks/pc/games/microsoft/flightsim/manifest.xml +++ b/disks/pc/games/microsoft/flightsim/manifest.xml @@ -1,5 +1,5 @@ - + Microsoft Flight Simulator diff --git a/disks/pc/minix/1.1/manifest.xml b/disks/pc/minix/1.1/manifest.xml index 830cac432..b9cfa56b5 100644 --- a/disks/pc/minix/1.1/manifest.xml +++ b/disks/pc/minix/1.1/manifest.xml @@ -1,5 +1,5 @@ - + MINIX 1.1 diff --git a/disks/pc/os2/ibm/1.0/machine.xml b/disks/pc/os2/ibm/1.0/machine.xml index d748e6288..90f69d2d4 100644 --- a/disks/pc/os2/ibm/1.0/machine.xml +++ b/disks/pc/os2/ibm/1.0/machine.xml @@ -1,5 +1,5 @@ - + IBM PC AT (8Mhz), 128Kb EGA, 2Mb RAM, 20Mb Hard Disk diff --git a/disks/pc/os2/ibm/1.0/manifest.xml b/disks/pc/os2/ibm/1.0/manifest.xml index 6a57faaa1..5edf1db96 100644 --- a/disks/pc/os2/ibm/1.0/manifest.xml +++ b/disks/pc/os2/ibm/1.0/manifest.xml @@ -1,5 +1,5 @@ - + IBM OS/2 1.0 diff --git a/disks/pc/os2/ibm/1.1/manifest.xml b/disks/pc/os2/ibm/1.1/manifest.xml index c54caad66..e0258a294 100644 --- a/disks/pc/os2/ibm/1.1/manifest.xml +++ b/disks/pc/os2/ibm/1.1/manifest.xml @@ -1,5 +1,5 @@ - + IBM OS/2 1.1 diff --git a/disks/pc/os2/ibm/1.3/manifest.xml b/disks/pc/os2/ibm/1.3/manifest.xml index fad7c92b0..6e58f0861 100644 --- a/disks/pc/os2/ibm/1.3/manifest.xml +++ b/disks/pc/os2/ibm/1.3/manifest.xml @@ -1,5 +1,5 @@ - + IBM OS/2 1.3 diff --git a/disks/pc/os2/microsoft/1.0/manifest.xml b/disks/pc/os2/microsoft/1.0/manifest.xml index 0aa7b2943..9183e9c6e 100644 --- a/disks/pc/os2/microsoft/1.0/manifest.xml +++ b/disks/pc/os2/microsoft/1.0/manifest.xml @@ -1,5 +1,5 @@ - + MS OS/2 1.0 diff --git a/disks/pc/os2/misc/1.0/debugger/machine.xml b/disks/pc/os2/misc/1.0/debugger/machine.xml index 60baedac9..fcb8a1079 100644 --- a/disks/pc/os2/misc/1.0/debugger/machine.xml +++ b/disks/pc/os2/misc/1.0/debugger/machine.xml @@ -1,5 +1,5 @@ - + IBM PC AT (8Mhz), 128Kb EGA, 1152Kb RAM, 20Mb Hard Disk diff --git a/disks/pc/os2/misc/manifest.xml b/disks/pc/os2/misc/manifest.xml index 81faaf88b..6837562a8 100644 --- a/disks/pc/os2/misc/manifest.xml +++ b/disks/pc/os2/misc/manifest.xml @@ -1,5 +1,5 @@ - + OS/2 Miscellaneous Disks diff --git a/disks/pc/tools/borland/pascal/3.00b/manifest.xml b/disks/pc/tools/borland/pascal/3.00b/manifest.xml index bc09adc62..a9f7a19ec 100644 --- a/disks/pc/tools/borland/pascal/3.00b/manifest.xml +++ b/disks/pc/tools/borland/pascal/3.00b/manifest.xml @@ -1,5 +1,5 @@ - + Borland Turbo Pascal diff --git a/disks/pc/tools/borland/pascal/3.01a/manifest.xml b/disks/pc/tools/borland/pascal/3.01a/manifest.xml index 9aa3df6e2..8cb35ecb5 100644 --- a/disks/pc/tools/borland/pascal/3.01a/manifest.xml +++ b/disks/pc/tools/borland/pascal/3.01a/manifest.xml @@ -1,5 +1,5 @@ - + Borland Turbo Pascal diff --git a/disks/pc/tools/microsoft/basic/manifest.xml b/disks/pc/tools/microsoft/basic/manifest.xml index a6cdc5aa5..82cda87e2 100644 --- a/disks/pc/tools/microsoft/basic/manifest.xml +++ b/disks/pc/tools/microsoft/basic/manifest.xml @@ -1,5 +1,5 @@ - + MS BASIC diff --git a/disks/pc/tools/microsoft/c/4.00/manifest.xml b/disks/pc/tools/microsoft/c/4.00/manifest.xml index d61583d96..dfff74419 100644 --- a/disks/pc/tools/microsoft/c/4.00/manifest.xml +++ b/disks/pc/tools/microsoft/c/4.00/manifest.xml @@ -1,5 +1,5 @@ - + Microsoft C Compiler 4.00 diff --git a/disks/pc/tools/microsoft/masm/4.00/manifest.xml b/disks/pc/tools/microsoft/masm/4.00/manifest.xml index 667c07478..98a82f8a9 100644 --- a/disks/pc/tools/microsoft/masm/4.00/manifest.xml +++ b/disks/pc/tools/microsoft/masm/4.00/manifest.xml @@ -1,5 +1,5 @@ - + Microsoft Macro Assember Tool diff --git a/disks/pc/tools/microsoft/mouse/5.00/manifest.xml b/disks/pc/tools/microsoft/mouse/5.00/manifest.xml index 04298ac76..e7e42bbd6 100644 --- a/disks/pc/tools/microsoft/mouse/5.00/manifest.xml +++ b/disks/pc/tools/microsoft/mouse/5.00/manifest.xml @@ -1,5 +1,5 @@ - + MS Mouse 5.00 diff --git a/disks/pc/tools/microsoft/os2/sdk/1.02/manifest.xml b/disks/pc/tools/microsoft/os2/sdk/1.02/manifest.xml index 64bdd0876..7b0c225ca 100644 --- a/disks/pc/tools/microsoft/os2/sdk/1.02/manifest.xml +++ b/disks/pc/tools/microsoft/os2/sdk/1.02/manifest.xml @@ -1,5 +1,5 @@ - + MS OS/2 SDK 1.02 diff --git a/disks/pc/tools/microsoft/windows/sdk/1.01/manifest.xml b/disks/pc/tools/microsoft/windows/sdk/1.01/manifest.xml index c64fcf4ce..1e1bea807 100644 --- a/disks/pc/tools/microsoft/windows/sdk/1.01/manifest.xml +++ b/disks/pc/tools/microsoft/windows/sdk/1.01/manifest.xml @@ -1,5 +1,5 @@ - + Windows 1.01 SDK diff --git a/disks/pc/tools/microsoft/windows/sdk/1.03/manifest.xml b/disks/pc/tools/microsoft/windows/sdk/1.03/manifest.xml index a854ba8b3..ba2e73071 100644 --- a/disks/pc/tools/microsoft/windows/sdk/1.03/manifest.xml +++ b/disks/pc/tools/microsoft/windows/sdk/1.03/manifest.xml @@ -1,5 +1,5 @@ - + Windows 1.03 SDK diff --git a/disks/pc/tools/microsoft/windows/sdk/1.04/manifest.xml b/disks/pc/tools/microsoft/windows/sdk/1.04/manifest.xml index ab6188128..f4e59377d 100644 --- a/disks/pc/tools/microsoft/windows/sdk/1.04/manifest.xml +++ b/disks/pc/tools/microsoft/windows/sdk/1.04/manifest.xml @@ -1,5 +1,5 @@ - + Windows 1.04 SDK os2museum.com diff --git a/disks/pc/tools/microsoft/windows/sdk/2.03/manifest.xml b/disks/pc/tools/microsoft/windows/sdk/2.03/manifest.xml index 19f37385c..1a40f4952 100644 --- a/disks/pc/tools/microsoft/windows/sdk/2.03/manifest.xml +++ b/disks/pc/tools/microsoft/windows/sdk/2.03/manifest.xml @@ -1,5 +1,5 @@ - + Windows 2.03 SDK os2museum.com diff --git a/disks/pc/tools/microsoft/windows/sdk/3.00/manifest.xml b/disks/pc/tools/microsoft/windows/sdk/3.00/manifest.xml index c8685b8c8..7d3993d85 100644 --- a/disks/pc/tools/microsoft/windows/sdk/3.00/manifest.xml +++ b/disks/pc/tools/microsoft/windows/sdk/3.00/manifest.xml @@ -1,5 +1,5 @@ - + Windows 3.0 SDK diff --git a/disks/pc/unix/ibm/pcix/1.0/manifest.xml b/disks/pc/unix/ibm/pcix/1.0/manifest.xml index 4c9e55eb9..0a6983d17 100644 --- a/disks/pc/unix/ibm/pcix/1.0/manifest.xml +++ b/disks/pc/unix/ibm/pcix/1.0/manifest.xml @@ -1,5 +1,5 @@ - + PC/IX 1.0 diff --git a/disks/pc/unix/microport/system-v/2.3/manifest.xml b/disks/pc/unix/microport/system-v/2.3/manifest.xml index 4360af165..4151109e9 100644 --- a/disks/pc/unix/microport/system-v/2.3/manifest.xml +++ b/disks/pc/unix/microport/system-v/2.3/manifest.xml @@ -1,5 +1,5 @@ - + Microport's AT&T UNIX System V-AT 2.3 (5ยจ) diff --git a/disks/pc/windows/1.01/manifest.xml b/disks/pc/windows/1.01/manifest.xml index 0b7aa3518..ba00ec5af 100644 --- a/disks/pc/windows/1.01/manifest.xml +++ b/disks/pc/windows/1.01/manifest.xml @@ -1,5 +1,5 @@ - + Microsoft Windows 1.01 diff --git a/disks/pc/windows/1.03/manifest.xml b/disks/pc/windows/1.03/manifest.xml index 341e06ef9..2b9c1acc8 100644 --- a/disks/pc/windows/1.03/manifest.xml +++ b/disks/pc/windows/1.03/manifest.xml @@ -1,5 +1,5 @@ - + Microsoft Windows 1.03 diff --git a/disks/pc/windows/1.03a/manifest.xml b/disks/pc/windows/1.03a/manifest.xml index d9c5f39d4..4f670f8c2 100644 --- a/disks/pc/windows/1.03a/manifest.xml +++ b/disks/pc/windows/1.03a/manifest.xml @@ -1,5 +1,5 @@ - + Microsoft Windows 1.03a diff --git a/disks/pc/windows/1.04/manifest.xml b/disks/pc/windows/1.04/manifest.xml index 98fdbc095..9f023fc96 100644 --- a/disks/pc/windows/1.04/manifest.xml +++ b/disks/pc/windows/1.04/manifest.xml @@ -1,5 +1,5 @@ - + Microsoft Windows 1.04 os2museum.com diff --git a/disks/pc/windows/2.01/manifest.xml b/disks/pc/windows/2.01/manifest.xml index 632a2dd3a..da69223a9 100644 --- a/disks/pc/windows/2.01/manifest.xml +++ b/disks/pc/windows/2.01/manifest.xml @@ -1,5 +1,5 @@ - + Microsoft Windows 2.01 diff --git a/disks/pc/windows/2.03/manifest.xml b/disks/pc/windows/2.03/manifest.xml index 6d851546b..e0e60f0e6 100644 --- a/disks/pc/windows/2.03/manifest.xml +++ b/disks/pc/windows/2.03/manifest.xml @@ -1,5 +1,5 @@ - + Microsoft Windows 2.03 os2museum.com diff --git a/disks/pc/windows/3.00/720K/manifest.xml b/disks/pc/windows/3.00/720K/manifest.xml index 880688ed0..a6b46e16a 100644 --- a/disks/pc/windows/3.00/720K/manifest.xml +++ b/disks/pc/windows/3.00/720K/manifest.xml @@ -1,5 +1,5 @@ - + Microsoft Windows 3.00 diff --git a/disks/pc/windows/3.00/manifest.xml b/disks/pc/windows/3.00/manifest.xml index 5566c5824..8f24911cf 100644 --- a/disks/pc/windows/3.00/manifest.xml +++ b/disks/pc/windows/3.00/manifest.xml @@ -1,5 +1,5 @@ - + Microsoft Windows 3.00 diff --git a/disks/pc/windows/3.11/manifest.xml b/disks/pc/windows/3.11/manifest.xml index bf8a4f3dd..ef9a5dc40 100644 --- a/disks/pc/windows/3.11/manifest.xml +++ b/disks/pc/windows/3.11/manifest.xml @@ -1,5 +1,5 @@ - + Windows for Workgroups 3.11 diff --git a/disks/pc/windows/win95/4.00.950/manifest.xml b/disks/pc/windows/win95/4.00.950/manifest.xml index 148f6d9cd..8b6eeb505 100644 --- a/disks/pc/windows/win95/4.00.950/manifest.xml +++ b/disks/pc/windows/win95/4.00.950/manifest.xml @@ -1,5 +1,5 @@ - + Windows 95 (RTM) 4.00.950 diff --git a/disks/pc/windows/wincomm/manifest.xml b/disks/pc/windows/wincomm/manifest.xml index c812f74eb..028e8bb3a 100644 --- a/disks/pc/windows/wincomm/manifest.xml +++ b/disks/pc/windows/wincomm/manifest.xml @@ -1,5 +1,5 @@ - + Windows COMM Driver (Source) diff --git a/disks/pc/xenix/sco/8086/2.1.3/manifest.xml b/disks/pc/xenix/sco/8086/2.1.3/manifest.xml index f83ec8290..495590837 100644 --- a/disks/pc/xenix/sco/8086/2.1.3/manifest.xml +++ b/disks/pc/xenix/sco/8086/2.1.3/manifest.xml @@ -1,5 +1,5 @@ - + SCO Xenix 8086 Operating System v2.1.3 diff --git a/modules/htmlout/lib/htmlout.js b/modules/htmlout/lib/htmlout.js index 2e35b6777..2453f2862 100644 --- a/modules/htmlout/lib/htmlout.js +++ b/modules/htmlout/lib/htmlout.js @@ -244,30 +244,41 @@ var asFilesNonServed = [ "web.config" // Azure/IISNode-specific ]; -var nBlogExcerpts = 20; +/* + * Maximum blog entries increased from 20 to 100 for the new blog format. + */ +var nBlogExcerpts = 100; /** * HTMLOut() * - * Load (building or rebuilding as needed) a default HTML document ("index.html") - * for the specified directory (which corresponds to req.path). sFile is the name - * of a specific template file to start with, but in most cases, callers will pass - * null, which means we'll fall back to sTemplateFile. + * Load (building or rebuilding as needed) a default HTML document (eg, "index.html") + * for the specified directory (which corresponds to req.path). sTemplateFile is the name + * of a specific template file to start with, but in most cases, callers will pass null, + * which means we'll fall back to sTemplateFile. * * @constructor - * @param {string} sDir is a fully-qualified web server directory - * @param {string|null} sFile is an optional template path (relative to sDir) + * @param {string} sPath is a fully-qualified web server directory or file + * @param {string|null} sFile is an optional template path (relative to sPath) * @param {boolean} fRebuild (this overrides the module's normal fRebuild setting) * @param {Object} req * @param {function(Error,string)} done */ -function HTMLOut(sDir, sFile, fRebuild, req, done) +function HTMLOut(sPath, sFile, fRebuild, req, done) { - this.sDir = sDir; + var i; + this.sPath = sPath; + this.sDir = sPath.replace("/blog", "/_posts"); + this.sFile = sReadMeFile; + this.sExt = ((i = this.sPath.lastIndexOf('.')) > 0? this.sPath.substr(i+1) : "").toLowerCase(); + if (this.sExt == "md") { + this.sFile = path.basename(this.sDir); + this.sDir = path.dirname(this.sDir); + } - this.sFile = (sFile? path.join(sDir, sFile) : path.join(sServerRoot, sTemplateFile)); + this.sTemplateFile = (sFile? path.join(this.sDir, sFile) : path.join(sServerRoot, sTemplateFile)); - HTMLOut.logDebug('HTMLOut("' + sDir + '", "' + this.sFile + '", ' + fRebuild + ')'); + HTMLOut.logDebug('HTMLOut("' + this.sPath + '", "' + this.sTemplateFile + '", ' + fRebuild + ')'); this.fDebug = (fServerDebug || net.hasParm(net.GORT_COMMAND, net.GORT_DEBUG, req)) && !net.hasParm(net.GORT_COMMAND, net.GORT_RELEASE, req); this.fRebuild = fRebuild; @@ -299,7 +310,7 @@ function HTMLOut(sDir, sFile, fRebuild, req, done) * that we would never want to cache. */ if (!fCache || fServerDebug || net.hasParm(net.GORT_COMMAND, null, req) || net.hasParm(net.REVEAL_COMMAND, null, req)) { - this.loadFile(this.sFile, true); + this.loadFile(this.sTemplateFile, true); return; } @@ -307,11 +318,15 @@ function HTMLOut(sDir, sFile, fRebuild, req, done) * Set the name of the default file (eg, "index.html") we will use to cache the template * after all tokens have been replaced. */ - this.sCacheFile = path.join(sDir, sDefaultFile); + if (this.sExt == "md") { + this.sCacheFile = this.sPath.replace(".md", ".html"); + } else { + this.sCacheFile = path.join(this.sDir, sDefaultFile); + } if (this.fRebuild) { HTMLOut.logDebug("HTMLOut(): rebuilding " + this.sCacheFile); - this.loadFile(this.sFile, true); + this.loadFile(this.sTemplateFile, true); return; } @@ -322,15 +337,15 @@ function HTMLOut(sDir, sFile, fRebuild, req, done) var obj = this; fs.stat(this.sCacheFile, function doneStatCacheFile(err, statsIndex) { if (err) { - obj.loadFile(obj.sFile, true); + obj.loadFile(obj.sTemplateFile, true); } else { - fs.stat(obj.sFile, function doneStatTemplateFile(err, statsTemplate) { + fs.stat(obj.sTemplateFile, function doneStatTemplateFile(err, statsTemplate) { if (!err && statsIndex.mtime.getTime() < statsTemplate.mtime.getTime()) { /* * Since the template has a new timestamp, we're going to load and process it * as a template (so set fTemplate = true); */ - obj.loadFile(obj.sFile, true); + obj.loadFile(obj.sTemplateFile, true); } else { /* * If the specified template file can't be accessed, we can either report that as @@ -548,7 +563,11 @@ HTMLOut.filter = function(req, res, next) * NOTE: To minimize unnecessary redirects, the getDirList() function should always (try to) generate URLs for * folders with trailing slashes. */ - if (asNonDirectories.indexOf(sBaseName) < 0) { + var sDir = sPath; + if (sBaseExt == "md") { + sDir = sDir.replace("/blog", "/_posts"); + } + else if (asNonDirectories.indexOf(sBaseName) < 0) { if (sTrailingChar != '/') { HTMLOut.logDebug('HTMLOut.filter("' + sBaseName + '"): passing static file request to next()'); next(); @@ -556,16 +575,16 @@ HTMLOut.filter = function(req, res, next) } } - fs.stat(sPath, function doneStatDirFilter(err, stats) { + fs.stat(sDir, function doneStatDirFilter(err, stats) { if (err) { HTMLOut.logError(err); // res.status(404).send(err.message); } else { var fDir = stats.isDirectory(); - HTMLOut.logDebug('HTMLOut.filter(): isDirectory("' + sPath + '"): ' + fDir); + HTMLOut.logDebug('HTMLOut.filter(): isDirectory("' + sDir + '"): ' + fDir); - if (fDir) { + if (fDir || sBaseExt == "md") { new HTMLOut(sPath, null, fRebuild, req, function doneHTMLOutFilter(err, sData) { if (err) { HTMLOut.logError(err); @@ -993,12 +1012,18 @@ HTMLOut.prototype.getPCPath = function(sToken, sIndent, aParms) HTMLOut.prototype.getDirList = function(sToken, sIndent, aParms) { var obj = this; + fs.readdir(this.sDir, function doneReadDirList(err, asFiles) { if (err) { obj.aTokens[sToken] = HTMLOut.logError(err); } else { var sList = ""; + /* + * We only want a parent directory entry if we're processing a file rather than a directory. + */ + if (obj.sExt) asFiles = []; + /* * We add an entry for the parent directory; when we call path.join() with obj.req.path, * the ".." will be replaced by the actual path to the parent, and if there is no parent @@ -1145,13 +1170,24 @@ HTMLOut.prototype.getYear = function(sToken, sIndent, aParms) HTMLOut.prototype.getBlog = function(sToken, sIndent, aParms) { var obj = this; - if (this.sDir.match(/[\/\\]blog/)) { - var sPath = path.join(this.sDir, "**/README.md"); + + if (this.sExt == "md") return false; + + if (this.sPath.match(/[\/\\]blog/)) { + /* + * The original blog structure created for the Node web server organized posts within + * date-based subdirectories under "/blog", but the new blog structure for GitHub Pages is + * date-based filenames within a single "_posts" directory. + */ + + var sDir = path.join(this.sDir, "*.md"); + // var sDir = path.join(this.sDir, "**/README.md"); + /* * WARNING: On Azure, this.sDir will contain backslashes instead of slashes, which means * you'd also expect the results from glob() to contain backslashes as well -- but they don't. * - * For example, sPath on Azure is typically: + * For example, sDir on Azure is typically: * * D:\home\site\wwwroot\blog\**\README.md * @@ -1163,20 +1199,20 @@ HTMLOut.prototype.getBlog = function(sToken, sIndent, aParms) * However, it would be VERY unwise to rely on that behavior. Let's continue to operate in a * path-separator-agnostic mode, like passing any URL we form from these paths through encodeURL(). */ - glob(sPath, {nosort: true}, function doneGlobForBlog(err, asPaths) { - asPaths.sort(function(a, b) {return a < b? 1 : -1;}); + glob(sDir, {nosort: true}, function doneGlobForBlog(err, asDirs) { + asDirs.sort(function(a, b) {return a < b? 1 : -1;}); /* * Sorting the list of blog files now was all well and good, except that there's * no guarantee the readFile() callbacks will return in the same order we issue them. * - * To deal with that, we turn asPaths into aExcerpts: an array of objects (instead of + * To deal with that, we turn asDirs into aExcerpts: an array of objects (instead of * strings) that can hold the excerpts. We'll plug the excerpts into aExcerpts as they * come in, and then we'll assemble them all at the end. * * We also take this opportunity to cap the number of (most recent) excerpts. */ var i; - var cExcerpts = Math.min(asPaths.length, nBlogExcerpts); + var cExcerpts = Math.min(asDirs.length, nBlogExcerpts); var aExcerpts = new Array(cExcerpts); var cExcerptsRemaining = aExcerpts.length; for (i = 0; i < cExcerpts; i++) { @@ -1186,31 +1222,44 @@ HTMLOut.prototype.getBlog = function(sToken, sIndent, aParms) * then we can presume that there's a README.md in the requested directory, meaning * this is probably a "leaf" folder of the blog "tree", and so it's that README.md we * should display, not these excerpts -- so set the excerpt count to zero and bail. - */ - if (path.dirname(asPaths[i]).length - obj.sDir.length <= 0) { + * + * NOTE: This is no longer a valid assumption with the new blog structure for GitHub Pages. + * + if (path.dirname(asDirs[i]).length - obj.sDir.length <= 0) { cExcerptsRemaining = 0; break; } - aExcerpts[i] = {path: asPaths[i], excerpt: ""}; + */ + aExcerpts[i] = {dir: asDirs[i], excerpt: ""}; } if (cExcerptsRemaining) { for (i = 0; i < aExcerpts.length; i++) { (function(iPath) { - var sFile = aExcerpts[iPath].path; - fs.readFile(sFile, {encoding: "utf8"}, function doneReadFileForBlog(err, s) { + var sFile = aExcerpts[iPath].dir; + fs.readFile(sFile, {encoding: "utf8"}, function doneReadFileForBlog(err, sPost) { if (err) { aExcerpts[iPath].excerpt = HTMLOut.logError(err); } else { - s = s.replace(/\r\n/g, "\n"); - var cch = s.indexOf("\n\n"); - cch = s.indexOf("\n\n", cch+2); + sPost = sPost.replace(/\r\n/g, "\n"); + + /* + * Remove any Front Matter from the top of the post, after extracting the title. + */ + var aFM = sPost.match(/^---[\s\S]*?\stitle:\s*['"]?(.*?)['"]?\s*\n[\s\S]*?---\s*/); + if (aFM) sPost = aFM[1] + "\n---\n\n" + sPost.substr(aFM[0].length); + + var cch = sPost.indexOf("\n\n"); + cch = sPost.indexOf("\n\n", cch+2); if (cch >= 0) { - s = s.substr(0, cch+2); + sPost = sPost.substr(0, cch+2); /* * I believe path.dirname() always removes any trailing slash, and since * these are directories, we definitely want a trailing slash on the URL. */ - var sURL = path.dirname(sFile.substr(obj.sDir.length)) + "/"; + // var sURL = path.dirname(sFile.substr(obj.sDir.length)) + "/"; + + var sURL = "/blog/" + path.basename(sFile); + /* * I would like to annotate the excerpt with date information, which we can * derive from sFile, which should be in one of two forms: @@ -1222,14 +1271,17 @@ HTMLOut.prototype.getBlog = function(sToken, sIndent, aParms) * We adhere to those forms because, when sorted, they produce a chronological listing. */ var asParts = sFile.match(/[\/\\](\d\d\d\d)[\/\\](\d\d)[\/\\]?(\d*)/); + if (!asParts) { + asParts = sFile.match(/[\/\\](\d\d\d\d)-(\d+)-(\d+)-/) + } if (asParts) { var iYear = parseInt(asParts[1], 10); var iMonth = parseInt(asParts[2], 10) - 1; var iDay = asParts[3]? parseInt(asParts[3], 10) : 1; var sDate = usr.formatDate(asParts[3]? "F j, Y" : "F Y", new Date(iYear, iMonth, iDay)); - s = s.replace(/^([^\n]*\n[^\n]*\n)/, '$1

' + sDate + '

\n\n'); + sPost = sPost.replace(/^([^\n]*\n[^\n]*\n)/, '$1

' + sDate + '

\n\n'); } - aExcerpts[iPath].excerpt = s + "[Read more](" + sURL + ")..."; + aExcerpts[iPath].excerpt = sPost + "[Read more](" + sURL + ")..."; } else { aExcerpts[iPath].excerpt = "Can't parse " + sFile; } @@ -1263,15 +1315,15 @@ HTMLOut.prototype.getBlog = function(sToken, sIndent, aParms) * getBlog() gets first crack; if we're in a blog folder, it will display the appropriate blog entries. * If getBlog() declines the request, we move on to getManifestXML(), because we have some folders where * there's BOTH a manifest and a README, such as /apps/pc/1981/visicalc, and we want the manifest to take - * priority. getManifestXML() will, in turn, pass the request on to getReadMe(), which will, in turn, + * priority. getManifestXML() will, in turn, pass the request on to getMarkdownFile(), which will, in turn, * pass the request on to getMachineXML(). * * If getMachineXML() declines as well, then getRandomString() is called, which is kinda useless, but better * than nothing (well, maybe). * - * Some wrinkles have been added to the above: getManifestXML() can alternatively call getMachineXML() - * with a specific machine XML file, which would have had the potential to bypass getReadMe() altogether, so - * getMachineXML() may now call getReadMe() -- which must NOT call getMachineXML() back whenever that happens. + * Some wrinkles have been added to the above: getManifestXML() can alternatively call getMachineXML() with a + * specific machine XML file, which would have had the potential to bypass getMarkdownFile() altogether, so + * getMachineXML() may now call getMarkdownFile() -- which must NOT call getMachineXML() back whenever that happens. * * @this {HTMLOut} * @param {string} sToken @@ -1400,7 +1452,7 @@ HTMLOut.prototype.getMachineXML = function(sToken, sIndent, aParms, sXMLFile, sS s = m.convertMD(" ").trim(); obj.processMachines(m.getMachines(), function doneProcessXMLMachines() { - obj.getReadMe(sToken, sIndent, aParms, s, true); + obj.getMarkdownFile(obj.sFile, sToken, sIndent, aParms, s, true); }); return; } @@ -1424,11 +1476,11 @@ HTMLOut.prototype.getMachineXML = function(sToken, sIndent, aParms, sXMLFile, sS */ /* - * If we were called from getManifestXML(), then let's fallback to getReadMe() instead. + * If we were called from getManifestXML(), then let's fallback to getMarkdownFile() instead. */ s = obj.getRandomString(sIndent); if (fFromManifest) { - obj.getReadMe(sToken, sIndent, aParms, s); + obj.getMarkdownFile(obj.sFile, sToken, sIndent, aParms, s); return; } @@ -1610,41 +1662,43 @@ HTMLOut.prototype.getManifestXML = function(sToken, sIndent, aParms) /* * If we're still here, then there was either a problem reading the manifest XSL file, * or the manifest XML file didn't contain a machine reference. For now, we fall back to - * getReadMe(). + * getMarkdownFile(). */ - obj.getReadMe(sToken, sIndent, aParms); + obj.getMarkdownFile(obj.sFile, sToken, sIndent, aParms); }); return; } } /* * If we're still here, then there was either a problem reading the manifest XML file, or it didn't - * contain a recognized stylesheet. For now, we fall back to getReadMe(). + * contain a recognized stylesheet. For now, we fall back to getMarkdownFile(). */ - obj.getReadMe(sToken, sIndent, aParms); + obj.getMarkdownFile(obj.sFile, sToken, sIndent, aParms); }); }; /** - * getReadMe(sToken, sIndent, aParms, sPrevious, fMachineXML) + * getMarkdownFile(sFile, sToken, sIndent, aParms, sPrevious, fMachineXML) * - * If a "README.md" exists in the current directory, open it, convert it, and prepare for replacement. + * If sFile exists in the current directory, open it, convert it, and prepare for replacement. * * @this {HTMLOut} - * @param {string} sToken + * @param {string} sFile + * @param {string} [sToken] * @param {string} [sIndent] * @param {Array.} [aParms] - * @param {string|null} [sPrevious] is text, if any, that should precede the README.md + * @param {string|null} [sPrevious] is text, if any, that should precede the file * @param {boolean} [fMachineXML] true if a machine.xml file has already been processed by the caller */ -HTMLOut.prototype.getReadMe = function(sToken, sIndent, aParms, sPrevious, fMachineXML) +HTMLOut.prototype.getMarkdownFile = function(sFile, sToken, sIndent, aParms, sPrevious, fMachineXML) { var obj = this; - var sFile = path.join(this.sDir, sReadMeFile); - HTMLOut.logConsole('HTMLOut.getReadMe("' + sFile + '")'); + sFile = path.join(this.sDir, sFile); - fs.readFile(sFile, {encoding: "utf8"}, function doneReadMeFile(err, s) { + HTMLOut.logConsole('HTMLOut.getMarkdownFile("' + sFile + '")'); + + fs.readFile(sFile, {encoding: "utf8"}, function doneMarkdownFile(err, s) { if (err) { /* * Instead of displaying a cryptic error message inside our beautiful HTML template, eg: @@ -1657,19 +1711,21 @@ HTMLOut.prototype.getReadMe = function(sToken, sIndent, aParms, sPrevious, fMach * * we now try some fallbacks, like checking for a "machine.xml" -- but only if sPrevious is not defined. */ - if (sPrevious !== undefined) { // this means we were called from getMachineXML(), so it's the end of road - obj.aTokens[sToken] = sPrevious; - obj.replaceTokens(); - } else { - obj.getMachineXML(sToken, sIndent); // we don't pass along aParms, because those are for Markdown files only + if (sToken) { + if (sPrevious !== undefined) { // this means getMachineXML() called us, so it's the end of road + obj.aTokens[sToken] = sPrevious; + obj.replaceTokens(); + } else { + obj.getMachineXML(sToken, sIndent); // we don't pass along aParms, because those are for Markdown files only + } } } else { - var m = new MarkOut(s, sIndent, obj.req, aParms, obj.fDebug, fMachineXML); + var m = new MarkOut(s, sIndent, obj.req, aParms, obj.fDebug, fMachineXML, obj.sExt == "md"); s = m.convertMD(" ").trim(); /* * If the Markdown document begins with a heading, stuff that into the tag; * it would be cleaner if this replacement could be performed by getTitle(), but unfortunately, - * getTitle() is called long before any README.md is opened. + * getTitle() is called long before we're called. */ var match = s.match(/^\s*<h([0-9])[^>]*>(.*?)<\/h\1>/); if (match) { @@ -1679,13 +1735,13 @@ HTMLOut.prototype.getReadMe = function(sToken, sIndent, aParms, sPrevious, fMach obj.sHTML = obj.sHTML.replace(/(<title[^>]*>)([^\|]*)\|[^<]*(<\/title>)/, "$1$2| " + sTitle + "$3"); } /* - * We need to query the MarkOut object for any machine definitions that the current "readme" + * We need to query the MarkOut object for any machine definitions that the current Markdown * document contained and give them to processMachines(), so that any associated scripts can * be added to the current page. * * However, processMachines() may need to search the file system for the appropriate scripts, - * and since that may not finish immediately, we defer updating the "readme" token until the - * processMachines() callback has been called. This insures that the HTML page will not be + * and since that may not finish immediately, we defer updating the Markdown token, if any, until + * the processMachines() callback has been called. This insures that the HTML page will not be * delivered until all associated scripts for all machine definitions have been added. * * Note that if we ever decide to support more than one Markdown document (or "readme" token) @@ -1693,9 +1749,11 @@ HTMLOut.prototype.getReadMe = function(sToken, sIndent, aParms, sPrevious, fMach * any duplicates from that array, and then call processMachines() at some later point, after * all tokens have been replaced. */ - obj.processMachines(m.getMachines(), function doneProcessReadMeMachines() { - obj.aTokens[sToken] = sPrevious? (sPrevious + sIndent + s) : s; - obj.replaceTokens(); + obj.processMachines(m.getMachines(), function doneProcessMachines() { + if (sToken) { + obj.aTokens[sToken] = sPrevious? (sPrevious + sIndent + s) : s; + obj.replaceTokens(); + } }); } }); diff --git a/modules/markout/lib/markout.js b/modules/markout/lib/markout.js index 83a92dc7e..d142699de 100644 --- a/modules/markout/lib/markout.js +++ b/modules/markout/lib/markout.js @@ -96,8 +96,9 @@ var sDefaultFile = "./README.md"; * @param {Array.<string>|null} [aParms] is an array of overrides to use (see below) * @param {boolean} [fDebug] turns on debugging features (eg, debug comments, special URL encodings, etc) * @param {boolean} [fMachineXML] true if a machine.xml file has already been processed by the caller + * @param {boolean} [fAutoHeading] true to automatically generate a page heading */ -function MarkOut(sMD, sIndent, req, aParms, fDebug, fMachineXML) +function MarkOut(sMD, sIndent, req, aParms, fDebug, fMachineXML, fAutoHeading) { this.sMD = sMD; this.sIndent = (sIndent || ""); @@ -111,6 +112,7 @@ function MarkOut(sMD, sIndent, req, aParms, fDebug, fMachineXML) } this.fDebug = fDebug; this.fMachineXML = fMachineXML; + this.fAutoHeading = fAutoHeading; this.sHTML = null; this.aIDs = []; // this keeps track of auto-generated ID attributes for page elements, to insure uniqueness this.aMachines = []; // this keeps track of embedded machines on the page @@ -387,13 +389,13 @@ MarkOut.prototype.convertMD = function(sIndent) } } /* - * If a "title" element existed in the Front Matter, then you can enable this code to - * auto-generate a top-level heading with the same value. - * - * aMatch = aMatch[1].match(/title:\s*(.*?)\s*?\n/); - * if (aMatch) sMD = aMatch[1] + "\n---\n\n" + sMD; + * If a "title" element existed in the Front Matter, this code auto-generates a top-level + * heading with the same value. */ - + if (this.fAutoHeading) { + aMatch = aMatch[1].match(/title:\s*(.*?)\s*?\n/); + if (aMatch) sMD = aMatch[1] + "\n---\n\n" + sMD; + } } } diff --git a/package.json b/package.json index 00e324a59..188a7d441 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pcjs", - "version": "1.20.3", + "version": "1.20.4", "description": "Node-enabled version of PCjs", "engine": "node ^0.12.7", "main": "server.js", diff --git a/pubs/pc/programming/Graphics_for_the_IBM_PC/demos/machine-debugger.xml b/pubs/pc/programming/Graphics_for_the_IBM_PC/demos/machine-debugger.xml index 05c08103b..3f2178227 100644 --- a/pubs/pc/programming/Graphics_for_the_IBM_PC/demos/machine-debugger.xml +++ b/pubs/pc/programming/Graphics_for_the_IBM_PC/demos/machine-debugger.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.3/machine.xsl"?> +<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.4/machine.xsl"?> <machine id="ibm5160" class="pc" border="1" width="980px" pos="center" background="#FAEBD7"> <name pos="center">IBM PC XT (Model 5160), CGA, 256Kb, 10Mb Drive</name> <computer id="xt-cga-256k" name="IBM PC XT" resume="1"/> diff --git a/pubs/pc/programming/Graphics_for_the_IBM_PC/demos/machine.xml b/pubs/pc/programming/Graphics_for_the_IBM_PC/demos/machine.xml index 47b0c9ef1..885bc40db 100644 --- a/pubs/pc/programming/Graphics_for_the_IBM_PC/demos/machine.xml +++ b/pubs/pc/programming/Graphics_for_the_IBM_PC/demos/machine.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.3/machine.xsl"?> +<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.4/machine.xsl"?> <machine id="ibm5160" class="pc" border="1" width="980px" pos="center" background="#FAEBD7"> <name pos="center">IBM PC XT (Model 5160), CGA, 256Kb, 10Mb Drive</name> <computer id="xt-cga-256k" name="IBM PC XT"/> diff --git a/pubs/pc/programming/manifest.xml b/pubs/pc/programming/manifest.xml index f0d69d7ef..19614f4a3 100644 --- a/pubs/pc/programming/manifest.xml +++ b/pubs/pc/programming/manifest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.3/manifest.xsl"?> +<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.4/manifest.xsl"?> <manifest type="document"> <title>PC Programming Guides diff --git a/pubs/pc/reference/ibm/5150/techref/manifest.xml b/pubs/pc/reference/ibm/5150/techref/manifest.xml index 92c7e2676..872e20bc7 100644 --- a/pubs/pc/reference/ibm/5150/techref/manifest.xml +++ b/pubs/pc/reference/ibm/5150/techref/manifest.xml @@ -1,5 +1,5 @@ - + IBM 5150 Manuals minuszerodegrees.net diff --git a/pubs/pc/reference/ibm/5160/techref/manifest.xml b/pubs/pc/reference/ibm/5160/techref/manifest.xml index 92c5ab00c..f5f0bbc8b 100644 --- a/pubs/pc/reference/ibm/5160/techref/manifest.xml +++ b/pubs/pc/reference/ibm/5160/techref/manifest.xml @@ -1,5 +1,5 @@ - + IBM 5160 Technical Reference (April 1983) retroarchive.org diff --git a/pubs/pc/reference/ibm/5170/setup/manifest.xml b/pubs/pc/reference/ibm/5170/setup/manifest.xml index e7eb91151..44b9dec1e 100644 --- a/pubs/pc/reference/ibm/5170/setup/manifest.xml +++ b/pubs/pc/reference/ibm/5170/setup/manifest.xml @@ -1,5 +1,5 @@ - + IBM 5170 Installation and Setup (March 1984) minuszerodegrees.net diff --git a/pubs/pc/reference/ibm/5170/techref/manifest.xml b/pubs/pc/reference/ibm/5170/techref/manifest.xml index 45cb05873..24ad5e890 100644 --- a/pubs/pc/reference/ibm/5170/techref/manifest.xml +++ b/pubs/pc/reference/ibm/5170/techref/manifest.xml @@ -1,5 +1,5 @@ - + IBM 5170 Technical Reference minuszerodegrees.net diff --git a/pubs/pc/reference/ibm/ega/manifest.xml b/pubs/pc/reference/ibm/ega/manifest.xml index 368314600..d8cc2b402 100644 --- a/pubs/pc/reference/ibm/ega/manifest.xml +++ b/pubs/pc/reference/ibm/ega/manifest.xml @@ -1,5 +1,5 @@ - + IBM Enhanced Graphics Adapter minuszerodegrees.net diff --git a/pubs/pc/reference/ibm/ps2/manifest.xml b/pubs/pc/reference/ibm/ps2/manifest.xml index 1eb61003a..df9493e50 100644 --- a/pubs/pc/reference/ibm/ps2/manifest.xml +++ b/pubs/pc/reference/ibm/ps2/manifest.xml @@ -1,5 +1,5 @@ - + PS/2 Technical Reference diff --git a/pubs/pc/reference/intel/80286/manifest.xml b/pubs/pc/reference/intel/80286/manifest.xml index 16de68fbd..9b6c88ffa 100644 --- a/pubs/pc/reference/intel/80286/manifest.xml +++ b/pubs/pc/reference/intel/80286/manifest.xml @@ -1,5 +1,5 @@ - + Intel 80286 References diff --git a/pubs/pc/software/os2/sdk10/manifest.xml b/pubs/pc/software/os2/sdk10/manifest.xml index 690535417..cdcee7398 100644 --- a/pubs/pc/software/os2/sdk10/manifest.xml +++ b/pubs/pc/software/os2/sdk10/manifest.xml @@ -1,5 +1,5 @@ - + OS/2 1.0 Programmer's Toolkit 1.0 diff --git a/pubs/pc/software/windows/sdk20/manifest.xml b/pubs/pc/software/windows/sdk20/manifest.xml index b6f838348..16b543bac 100644 --- a/pubs/pc/software/windows/sdk20/manifest.xml +++ b/pubs/pc/software/windows/sdk20/manifest.xml @@ -1,5 +1,5 @@ - + Microsoft Windows Software Development Kit 2.0