Merge request for 6502js

LICENSE.prism → LICENSE.code-input

@@ -1,8 +1,6 @@
-The prism.js (https://prismjs.com) code is licensed under the MIT license as follows:
+MIT License
 
-MIT LICENSE
-
-Copyright (c) 2012 Lea Verou
+Copyright (c) 2021 WebCoder49
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -11,14 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

LICENSE.highlightjs

@@ -0,0 +1,29 @@
+BSD 3-Clause License
+
+Copyright (c) 2006, Ivan Sagalaev.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

@@ -1,13 +1,17 @@
 # 6502js
-A JavaScript 6502 assembler and simulator which runs in a web browser, forked from: https://github.com/skilldrick/6502js
+A JavaScript 6502 assembler and simulator which runs in a web browser, forked from: https://github.com/ctyler/6502js (originally from https://github.com/skilldrick/6502js)
 
-Enhancements include a speed control (slider), load/save buttons, an 80x25 character memory-mapped terminal screen, and some basic ROM routines.
+The ctyler enhancements include a speed control (slider), load/save buttons, an 80x25 character memory-mapped terminal screen, and some basic ROM routines.
 
-A hosted copy is available at http://6502.cdot.systems - Click the "Notes" button and scroll through the text box at the bottom of the display for basic documentation, including links to some sample code. Some sample code to run within the emulator is available at https://github.com/ctyler/6502js-code
+This version also contains syntax highlighting utilizing Code Input (https://github.com/WebCoder49/code-input) and highlight.js (https://highlightjs.org/).
 
-This version contains experimental syntax highlighting utilizing Code Bedder (https://codebedder.com/) and Prism.js (https://prismjs.com/).
+The highlighter uses a slightly modified atom-one-dark theme and a homegrown asm6502 language adapted from the arm plugin (I think. I can't remember.)
+
+This fork further enhances the CSS to adjust the look and feel. This fork also makes several modifications to the assembler to add more directives and some simple expressions with working with labels.
+
+A hosted copy is available at http://programmingby.design/trial - Click the "Notes" button and scroll through the popup box for basic documentation, including links to some sample code. Some sample code to run within the emulator is available at https://github.com/ctyler/6502js-code
 
 The 6502js assembler and simulator is distributed under the terms of the GPL version 3; see the LICENSE file.
-The code-bedder (https://codebedder.com) code is licensed freely ("This library is free to use however you like.").
-The Prism.js library is distributed under the MIT license (see the LICENSE.prism file).
+The code-input (https://github.com/WebCoder49/code-input) code is licensed under MIT (see the LICENSE.code-input file).
+The highlight.js library is distributed under the BSD 3-Clause license (see the LICENSE.highlightjs file).