Merge branch 'master' into gh-pages

.vscode/launch.json

@@ -614,11 +614,22 @@
       }
     },
     {
-      "name": "PC.js Playground",
-      "type": "chrome",
+      "name": "PC.js compaq386",
+      "type": "node",
       "request": "launch",
-      "url": "http://localhost:4000/tools/pc/#playground",
-      "webRoot": "${workspaceFolder}",
+      "program": "${workspaceFolder}/tools/pc/pc.js",
+      "args": [
+        "disks/msdos",
+        "--sys=compaq",
+        "--ver=3.31",
+        "--target=40M"
+      ],
+      "cwd": "${workspaceFolder}/tools/pc",
+      "stopOnEntry": false,
+      "console": "integratedTerminal",
+      "outFiles": [
+        "${workspaceFolder}/none/**/*.js"
+      ],
       "presentation": {
         "hidden": false,
         "group": "machines",
@@ -764,15 +775,26 @@
       }
     },
     {
-      "name": "PC.js compaq386",
+      "name": "PC.js playground",
+      "type": "chrome",
+      "request": "launch",
+      "url": "http://localhost:4000/tools/pc/#playground",
+      "webRoot": "${workspaceFolder}",
+      "presentation": {
+        "hidden": false,
+        "group": "machines",
+        "order": 15
+      }
+    },
+    {
+      "name": "PC.js scp",
       "type": "node",
       "request": "launch",
       "program": "${workspaceFolder}/tools/pc/pc.js",
       "args": [
-        "disks/msdos",
-        "--sys=compaq",
-        "--ver=3.31",
-        "--target=40M"
+        "scp.json",
+        "--debug",
+        "--halt"
       ],
       "cwd": "${workspaceFolder}/tools/pc",
       "stopOnEntry": false,
@@ -2034,9 +2056,8 @@
       "request": "launch",
       "program": "${workspaceFolder}/tools/diskimage/diskimage.js",
       "args": [
-        "arcs/nesttest.zip",
-        "--extract",
-        "--overwrite"
+        "zips/imd120.zip",
+        "--verbose"
       ],
       "cwd": "${workspaceFolder}/disks/tmp",
       "stopOnEntry": false,

.vscode/settings.json

@@ -65,7 +65,7 @@
   "files.autoGuessEncoding": true,
   "scss.validate": false,
   "task.allowAutomaticTasks": "on",
-  "explorer.sortOrder": "type",
+  "explorer.sortOrder": "default",
   "cSpell.words": [
     "Aabs",
     "Aabsx",
@@ -313,6 +313,7 @@
     "BLOS",
     "blueviolet",
     "Blumenthal",
+    "Bname",
     "Bnnn",
     "bobo",
     "bootable",
@@ -535,6 +536,7 @@
     "CONSZ",
     "contenteditable",
     "Contig",
+    "convdisk",
     "convrom",
     "COPR",
     "coreutils",
@@ -565,6 +567,7 @@
     "CRESET",
     "CRGAP",
     "CRHSIZE",
+    "Cromemco",
     "CROSSREF",
     "CRTC",
     "CRTCMASKS",
@@ -639,6 +642,7 @@
     "datebytes",
     "datelib",
     "daughterboard",
+    "davidw",
     "dbase",
     "dbcc",
     "DBCS",
@@ -2431,7 +2435,9 @@
     "SALC",
     "SAMP",
     "sandybrown",
+    "savedata",
     "saveimage",
+    "saveroot",
     "sayin",
     "SBBA",
     "SBBAX",
@@ -2601,6 +2607,7 @@
     "SOJL",
     "SOJLE",
     "SOJN",
+    "somelabel",
     "SOSE",
     "SOSG",
     "SOSGE",
@@ -3088,6 +3095,7 @@
     "XMIT",
     "XMLHTTP",
     "Xnnn",
+    "xnnnn",
     "xnzvc",
     "XOFF",
     "XOR'ing",

LICENSE.txt

@@ -6,7 +6,7 @@ and website <https://www.pcjs.org>, excluding all programs, images and
 documentation produced by other parties and which have been included in PCjs
 solely for archival/demonstration purposes.
 
-Copyright (c) 2012-2023 Jeff Parsons
+Copyright (c) 2012-2024 Jeff Parsons
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -35,10 +35,10 @@ under the terms of an [MIT License](/LICENSE.txt).
 
 You are required to include the following links and copyright notice:
 
-> [PCjs](https://www.pcjs.org) © 2012-2023 [Jeff Parsons](https://github.com/jeffpar)
+> [PCjs](https://www.pcjs.org) © 2012-2024 [Jeff Parsons](https://github.com/jeffpar)
 
 in every copy or modified version of this work, and to display that notice on every web page or computer that it runs on.
 
 ### Copyright
 
-All PCjs content (including source code, blog posts, and website design) © 2012-2023 [Jeff Parsons](https://github.com/jeffpar)
+All PCjs content (including source code, blog posts, and website design) © 2012-2024 [Jeff Parsons](https://github.com/jeffpar)

_includes/machine.html

@@ -291,7 +291,7 @@ <h3>{{ machine_name }}</h3>
     <div class="pcjs-copyright">
   {%- assign machine_name = machine_data.name | default: "PCjs Machines" %}
   {%- assign machine_version = machine_data.version | default: machine_data.shared.version | default: "1.00" %}
-      <a href="{{ '/' | absolute_url }}" target="_blank">{{ machine_name }}</a> v{{ machine_version }} © 2012-2023 <a href="{{ site.github.owner_url }}" target="_blank">Jeff Parsons</a>
+      <a href="{{ '/' | absolute_url }}" target="_blank">{{ machine_name }}</a> v{{ machine_version }} © 2012-2024 <a href="{{ site.github.owner_url }}" target="_blank">Jeff Parsons</a>
     </div>
   </div>
 </div>

_layouts/default.html

@@ -11,7 +11,7 @@
               |__/
   -->
 {% comment %}
-  PCjs website © 2012-2023 by Jeff Parsons (@jeffpar)
+  PCjs website © 2012-2024 by Jeff Parsons (@jeffpar)
   ASCII art from http://patorjk.com/software/taag/#p=display&f=Big&t=PCjs
 {% endcomment %}
 {% include web/head.html %}

about/README.md

@@ -52,7 +52,7 @@ All published portions are free for redistribution and/or modification under the
 
 You are required to include the following links and copyright notice:
 
-> [PCjs](https://www.pcjs.org) © 2012-2023 [Jeff Parsons](https://github.com/jeffpar)
+> [PCjs](https://www.pcjs.org) © 2012-2024 [Jeff Parsons](https://github.com/jeffpar)
 
 in every copy or modified version of this work, and to display that notice on every web page or computer that it runs on.
 

blog/_posts/2016/2016-12-30-out-with-the-old-in-with-ecmascript-2015.md

@@ -148,7 +148,7 @@ process that a web browser would perform, and then connects *stdin* and *stdout*
 Here's a sample run, from a macOS Terminal window:
 
     PDPjs v2.20
-    Copyright © 2012-2023 Jeff Parsons <[email protected]>
+    Copyright © 2012-2024 Jeff Parsons <[email protected]>
     License: MIT <https://www.pcjs.org/LICENSE.txt>
     Portions adapted from the PDP-11/70 Emulator by Paul Nankervis <http://skn.noip.me/pdp11/pdp11.html>
     PC11: Loaded tape "BOOTSTRAP-16KB" (28 bytes)

blog/_posts/2017/2017-07-03-fantasyland.md

@@ -122,7 +122,7 @@ exactly what I've done "below the fold".
 ### Transcript of the EGATEST Build Process (as of July 3, 2017)
 
     PCx86 v1.35.2
-    Copyright © 2012-2017 Jeff Parsons <[email protected]>
+    Copyright © 2012-2024 Jeff Parsons <[email protected]>
     License: MIT <https://www.pcjs.org/LICENSE.txt>
     Loading /machines/pcx86/ibm/5160/rom/hdc/IBM-XEBEC-1982.json5.......
     Loading /machines/pcx86/ibm/5160/rom/basic/BASIC110.json5.......

blog/_posts/2023/2023-07-15-running-dos-software-from-the-command-line.md

@@ -88,7 +88,7 @@ Now let's dive into a much more interesting example.  Imagine we have a small co
 
     $ pc.js --commands
     pc.js v3.00
-    Copyright © 2012-2023 Jeff Parsons <[email protected]>
+    Copyright © 2012-2024 Jeff Parsons <[email protected]>
     Options: --commands
     [Type help for list of commands, CTRL-C to terminate]
     >> fetch https://harddisks.pcjs.org/pcx86/10mb/MSDOS330-C400.json disks/msdos

blog/_posts/2023/2023-08-10-building-dos-compatible-hard-disks.md

@@ -23,7 +23,7 @@ If you want a small collection of DOS files to start with, `pc.js` can fetch tho
 
     $ pc.js --commands
     pc.js v3.00
-    Copyright © 2012-2023 Jeff Parsons <[email protected]>
+    Copyright © 2012-2024 Jeff Parsons <[email protected]>
     Options: --commands
     [Type help for list of commands, CTRL-C to terminate]
     >> fetch https://harddisks.pcjs.org/pcx86/10mb/MSDOS330-C400.json disks/msdos

gulpfile.js

@@ -1,7 +1,7 @@
 /**
  * @fileoverview Gulp file for pcjs.org
  * @author Jeff Parsons <[email protected]>
- * @copyright © 2012-2023 Jeff Parsons
+ * @copyright © 2012-2024 Jeff Parsons
  * @license MIT <https://www.pcjs.org/LICENSE.txt>
  *
  * This file is part of PCjs, a computer emulation software project at <https://www.pcjs.org>.
@@ -371,9 +371,9 @@ gulp.task("copyright", function(done) {
      * it would also be nice if we could avoid rewriting ANY file that contains no matches, because Gulp's default behavior
      * seems to be rewrite EVERYTHING, at least when we're doing these sorts of "in place" operations.
      */
-    return gulp.src(["gulpfile.js", "machines/**/*.js", "software/**/*.js", "tools/**/*.js", "**/*.md", "_layouts/*.html"], {base: baseDir})
+    return gulp.src(["gulpfile.js", "LICENSE.txt", "_includes/machine.html", "machines/**/*.{js,css,xsl}", "software/**/*.js", "tools/**/*.js", "**/*.md", "_layouts/*.html"], {base: baseDir})
         .pipe(gulpReplace(/(Copyright[ \S]+?)( Jeff Parsons)( +201\d-)[0-9]+/gi, '$1$3' + pkg.year + '$2', {skipBinary: true}))
-        .pipe(gulpReplace(/(Copyright|\u00A9)( +201\d-)[0-9]+(.*?Jeff Parsons|.*?twitter_username)/gi, '$1$2' + pkg.year + '$3', {skipBinary: true}))
+        .pipe(gulpReplace(/(Copyright|\u00A9|\(c\))( +201\d-)[0-9]+(.*?Jeff Parsons|.*?twitter_username)/gi, '$1$2' + pkg.year + '$3', {skipBinary: true}))
         .pipe(gulp.dest(baseDir));
 });
 

machines/arcade/invaders/modules/v3/ports.js

@@ -1,7 +1,7 @@
 /**
  * @fileoverview Implements Space Invaders I/O ports
  * @author Jeff Parsons <[email protected]>
- * @copyright © 2012-2023 Jeff Parsons
+ * @copyright © 2012-2024 Jeff Parsons
  * @license MIT <https://www.pcjs.org/LICENSE.txt>
  *
  * This file is part of PCjs, a computer emulation software project at <https://www.pcjs.org>.

machines/arcade/invaders/modules/v3/video.js

@@ -1,7 +1,7 @@
 /**
  * @fileoverview Implements Space Invaders video hardware
  * @author Jeff Parsons <[email protected]>
- * @copyright © 2012-2023 Jeff Parsons
+ * @copyright © 2012-2024 Jeff Parsons
  * @license MIT <https://www.pcjs.org/LICENSE.txt>
  *
  * This file is part of PCjs, a computer emulation software project at <https://www.pcjs.org>.