Update the Debian packaging for mdk-doc-1.3.0.

3 files changed, 167 insertions, 432 deletions

diff --git a/debian/changelog b/debian/changelog
index 2338467..82138cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mdk-doc (1.2.11-2) UNRELEASED; urgency=medium
+mdk-doc (1.3.0-1) UNRELEASED; urgency=medium
 
   * Fix the doc-base autopkgtest: debhelper 13.3.3 changed
     the names of the installed doc-base files. Add an explicit
@@ -7,6 +7,7 @@ mdk-doc (1.2.11-2) UNRELEASED; urgency=medium
   * Add the year 2021 to my debian/* copyright notice.
   * Explicitly declare dh-sequence-single-binary as a virtual build
     dependency.
+  * New upstream release, update the patches.
 
  -- Peter Pentchev <roam@debian.org>  Thu, 30 Dec 2021 19:38:41 +0200
 
diff --git a/debian/patches/img-path.patch b/debian/patches/img-path.patch
index 649632b..d5bf9f3 100644
--- a/debian/patches/img-path.patch
+++ b/debian/patches/img-path.patch
@@ -1,7 +1,7 @@
 Description: Fix the paths to the images.
 Forwarded: not-needed
 Author: Peter Pentchev <roam@ringlet.net>
-Last-Update: 2016-01-17
+Last-Update: 2021-12-30
 
 --- a/doc/mdk_gmixvm.texi
 +++ b/doc/mdk_gmixvm.texi
@@ -14,8 +14,8 @@ Last-Update: 2016-01-17
  @end ifinfo
  
  @ifhtml
--@image{../img/ss_mix, 400pt}
-+@image{img/ss_mix, 400pt}
+-@image{img/ss_mix, 400pt}
++@image{/usr/share/doc/mdk-doc/html/img/ss_mix, 400pt}
  @end ifhtml
  
  Apart from the menu and status bars, we can distinguish two zones (or
@@ -23,8 +23,8 @@ Last-Update: 2016-01-17
  Here is an screenshot showing how @code{gmixvm} looks like when running
  with a couple of detached windows:
  
--@image{../img/ss_split, 420pt}
-+@image{img/ss_split, 420pt}
+-@image{img/ss_split, 420pt}
++@image{/usr/share/doc/mdk-doc/html/img/ss_split, 420pt}
  
  @end ifhtml
  
@@ -32,8 +32,8 @@ Last-Update: 2016-01-17
  @ifhtml
  The next figure shows the enter word dialog.
  
--@image{../img/ss_worddlg, 250pt}
-+@image{img/ss_worddlg, 250pt}
+-@image{img/ss_worddlg, 250pt}
++@image{/usr/share/doc/mdk-doc/html/img/ss_worddlg, 250pt}
  
  @end ifhtml
  
@@ -41,8 +41,8 @@ Last-Update: 2016-01-17
  the currently loaded MIX file.
  
  @ifhtml
--@image{../img/ss_mixal, 400pt}
-+@image{img/ss_mixal, 400pt}
+-@image{img/ss_mixal, 400pt}
++@image{/usr/share/doc/mdk-doc/html/img/ss_mixal, 400pt}
  @end ifhtml
  
  The information is presented in four columns. The first column
@@ -50,8 +50,8 @@ Last-Update: 2016-01-17
  
  @ifhtml
  
--@image{../img/ss_devices, 400pt}
-+@image{img/ss_devices, 400pt}
+-@image{img/ss_devices, 400pt}
++@image{/usr/share/doc/mdk-doc/html/img/ss_devices, 400pt}
  
  @end ifhtml
  
@@ -59,8 +59,8 @@ Last-Update: 2016-01-17
  
  @ifhtml
  
--@image{../img/ss_symbols, 250pt}
-+@image{img/ss_symbols, 250pt}
+-@image{img/ss_symbols, 250pt}
++@image{/usr/share/doc/mdk-doc/html/img/ss_symbols, 250pt}
  
  @end ifhtml
  
@@ -68,8 +68,8 @@ Last-Update: 2016-01-17
  the contents of MIX binary block devices.
  
  @ifhtml
--@image{../img/ss_devform, 250pt}
-+@image{img/ss_devform, 250pt}
+-@image{img/ss_devform, 250pt}
++@image{/usr/share/doc/mdk-doc/html/img/ss_devform, 250pt}
  @end ifhtml
  
  The available formats are decimal (e.g. @w{-1234}) and MIX word
@@ -77,8 +77,8 @@ Last-Update: 2016-01-17
  stored (@file{~/.mdk} is the default location).
  
  @ifhtml
--@image{../img/ss_devdir, 250pt}
-+@image{img/ss_devdir, 250pt}
+-@image{img/ss_devdir, 250pt}
++@image{/usr/share/doc/mdk-doc/html/img/ss_devdir, 250pt}
  @end ifhtml
  
  You can also specify the devices directory using the @code{mixvm}
@@ -86,8 +86,8 @@ Last-Update: 2016-01-17
  for editing and compiling MIXAL source files.
  
  @ifhtml
--@image{../img/ss_extprog, 250pt}
-+@image{img/ss_extprog, 250pt}
+-@image{img/ss_extprog, 250pt}
++@image{/usr/share/doc/mdk-doc/html/img/ss_extprog, 250pt}
  @end ifhtml
  
  The commands are specified as template strings, where the control
diff --git a/debian/patches/typos.patch b/debian/patches/typos.patch
index faa5751..42537bb 100644
--- a/debian/patches/typos.patch
+++ b/debian/patches/typos.patch
@@ -1,9 +1,9 @@
 Description: Correct some typographical and grammatical errors.
-  At least two typos in the intl/ directory were left as-is, since
-  this seems to be imported libintl source code.
+ At least two typos in the intl/ directory were left as-is, since
+ this seems to be imported libintl source code.
 Forwarded: not-yet
 Author: Peter Pentchev <roam@ringlet.net>
-Last-Update: 2019-01-23
+Last-Update: 2021-12-30
 
 --- a/ChangeLog.2
 +++ b/ChangeLog.2
@@ -84,7 +84,7 @@ Last-Update: 2019-01-23
   - User Option: -disable-gui
 --- a/NEWS
 +++ b/NEWS
-@@ -142,7 +142,7 @@
+@@ -148,7 +148,7 @@
     - cbpo help string corrected (thanks to Michael Vernov).
     - I1 and I2 in mixvm swapped to their correct position (closes #15746).
     - Obsolete CFLAGS for Darwin removed.
@@ -104,216 +104,28 @@ Last-Update: 2019-01-23
       his MIXAL package.
  
     * Ryan Schmidt, Agustin Navarro (<anp@cantv.net>), Ying-Chieh Liao
---- a/doc/MIX.DOC
-+++ b/doc/MIX.DOC
-@@ -44,7 +44,7 @@
- it can be used to hold information shifted to the right out of rA.  The index
- registers rI1, rI2, rI3, rI4, rI5, and rI6 are used primarily for counting and
- for referencing variable memory addresses.  The J-register always hold the
--address of the instruction following the preceding ``JUMP'' intruction, and it
-+address of the instruction following the preceding ``JUMP'' instruction, and it
- is primarily used in connection with subroutines.
-     Besides thesee registers, MIX contains
-     
-@@ -124,7 +124,7 @@
-     If I is zero, the ``,I'' is omitted.  If F is the -normal- F-specification
- for this particular operator, the ``(F)'' need not be written.  The normal F-
- specification for almost all operators is (0:5), representing a whole word.
--If a different F is standard, it will be mentioned explicity when we discuss
-+If a different F is standard, it will be mentioned explicitly when we discuss
- a particular operator.
- 
- ...
---- a/doc/mdk_gmixvm.texi
-+++ b/doc/mdk_gmixvm.texi
-@@ -298,7 +298,7 @@
- @deffn Debug Symbols...
- Opens a dialog showing the list of symbols defined in the currently
- loaded MIX program. The font used to display this list can be
--customised using the meny entry @code{@w{Settings->Change font->Symbol
-+customised using the menu entry @code{@w{Settings->Change font->Symbol
- list}}.
- 
- @ifhtml
-@@ -325,7 +325,7 @@
- 
- @deffn Settings @w{Change font}
- Lets you change the font used in the various @code{gmixv} widgets
--(i.e. commad prompt, command log, Virtual machine, Source, Devices and
-+(i.e. command prompt, command log, Virtual machine, Source, Devices and
- Symbol list). There is also an entry (@code{All}) to change all fonts
- at once.
- @end deffn
---- a/doc/mdk_mixguile.texi
-+++ b/doc/mdk_mixguile.texi
-@@ -288,7 +288,7 @@
- 
- @defun mix-add-break-hook hook
- @defunx mix-add-cond-break hook
--Add a hook funtion to be executed when an explicit (resp. conditional)
-+Add a hook function to be executed when an explicit (resp. conditional)
- breakpoint is encountered during program execution. @var{hook} is a
- function taking two arguments: the source line number where the hook has
- occurred, and the current program counter value. The following code
---- a/doc/mdk_tut.texi
-+++ b/doc/mdk_tut.texi
-@@ -397,7 +397,7 @@
- operations: they are used to store a subfield of a register
- into a memory location. Here, MOD represents the subfield of the memory
- cell that is to be overwritten with bytes from a register. These bytes
--are taken beginning by the rightmost side of the register.
-+are taken starting with the rightmost side of the register.
- 
- @ftable @code
- @item STA
-@@ -826,7 +826,7 @@
- @comment  node-name,  next,  previous,  up
- @subsubsection Execution times
- 
--@cindex exection time
-+@cindex execution time
- @cindex time
- 
- When writing MIXAL programs (or any kind of programs, for that
 --- a/misc/mixal-mode.el
 +++ b/misc/mixal-mode.el
-@@ -162,7 +162,7 @@
- ; (makunbound 'mixal-operation-codes-alist)
- 
- (defun mixal-add-operation-code (op-code group full-name C-byte F-byte description execution-time)
--  "Add an operation code to the list that contains information about possible op code's."
-+  "Add an operation code to the list that contains information about possible opcodes."
-   (setq mixal-operation-codes-alist (cons (list op-code group full-name C-byte F-byte
- 						description execution-time)
- 					  mixal-operation-codes-alist )))
-@@ -188,7 +188,7 @@
-  "Put in rI1 the contents of cell no. M.
- Uses a + when there is no sign in subfield. Subfield is left padded with
- zeros to make a word. Index registers only have 2 bytes and a sign, Trying
--to set anything more that that will result in undefined behavior."
-+to set anything more than that will result in undefined behavior."
-  2)
- 
- (mixal-add-operation-code
-@@ -196,7 +196,7 @@
-  "Put in rI2 the contents of cell no. M.
- Uses a + when there is no sign in subfield. Subfield is left padded with
- zeros to make a word. Index registers only have 2 bytes and a sign, Trying
--to set anything more that that will result in undefined behavior."
-+to set anything more than that will result in undefined behavior."
-  2)
- 
- (mixal-add-operation-code
-@@ -204,7 +204,7 @@
-  "Put in rI3 the contents of cell no. M.
- Uses a + when there is no sign in subfield. Subfield is left padded with
- zeros to make a word. Index registers only have 2 bytes and a sign, Trying
--to set anything more that that will result in undefined behavior."
-+to set anything more than that will result in undefined behavior."
-  2)
- 
- (mixal-add-operation-code
-@@ -212,7 +212,7 @@
-  "Put in rI4 the contents of cell no. M.
- Uses a + when there is no sign in subfield. Subfield is left padded with
- zeros to make a word. Index registers only have 2 bytes and a sign, Trying
--to set anything more that that will result in undefined behavior."
-+to set anything more than that will result in undefined behavior."
-  2)
- 
- (mixal-add-operation-code
-@@ -220,7 +220,7 @@
-  "Put in rI5 the contents of cell no. M.
- Uses a + when there is no sign in subfield. Subfield is left padded with
- zeros to make a word. Index registers only have 2 bytes and a sign, Trying
--to set anything more that that will result in undefined behavior."
-+to set anything more than that will result in undefined behavior."
-  2)
- 
- (mixal-add-operation-code
-@@ -228,7 +228,7 @@
-  "Put in rI6 the contents of cell no. M.
- Uses a + when there is no sign in subfield. Subfield is left padded with
- zeros to make a word. Index registers only have 2 bytes and a sign, Trying
--to set anything more that that will result in undefined behavior."
-+to set anything more than that will result in undefined behavior."
-  2)
- 
- (mixal-add-operation-code
-@@ -250,7 +250,7 @@
-  "Put in rI1 the contents of cell no. M, with opposite sign.
- Uses a + when there is no sign in subfield, otherwise use the opposite sign.
- Subfield is left padded with zeros to make a word. Index registers only
--have 2 bytes and a sign, Trying to set anything more that that will result
-+have 2 bytes and a sign, Trying to set anything more than that will result
- in undefined behavior."
-  2)
- 
-@@ -259,7 +259,7 @@
-  "Put in rI2 the contents of cell no. M, with opposite sign.
- Uses a + when there is no sign in subfield, otherwise use the opposite sign.
- Subfield is left padded with zeros to make a word. Index registers only
--have 2 bytes and a sign, Trying to set anything more that that will result
-+have 2 bytes and a sign, Trying to set anything more than that will result
- in undefined behavior."
-  2)
- 
-@@ -268,7 +268,7 @@
-  "Put in rI3 the contents of cell no. M, with opposite sign.
- Uses a + when there is no sign in subfield, otherwise use the opposite sign.
- Subfield is left padded with zeros to make a word. Index registers only
--have 2 bytes and a sign, Trying to set anything more that that will result
-+have 2 bytes and a sign, Trying to set anything more than that will result
- in undefined behavior."
-  2)
- 
-@@ -277,7 +277,7 @@
-  "Put in rI4 the contents of cell no. M, with opposite sign.
- Uses a + when there is no sign in subfield, otherwise use the opposite sign.
- Subfield is left padded with zeros to make a word. Index registers only
--have 2 bytes and a sign, Trying to set anything more that that will result
-+have 2 bytes and a sign, Trying to set anything more than that will result
- in undefined behavior."
-  2)
- 
-@@ -286,7 +286,7 @@
-  "Put in rI5 the contents of cell no. M, with opposite sign.
- Uses a + when there is no sign in subfield, otherwise use the opposite sign.
- Subfield is left padded with zeros to make a word. Index registers only
--have 2 bytes and a sign, Trying to set anything more that that will result
-+have 2 bytes and a sign, Trying to set anything more than that will result
- in undefined behavior."
-  2)
- 
-@@ -295,7 +295,7 @@
-  "Put in rI6 the contents of cell no. M, with opposite sign.
- Uses a + when there is no sign in subfield, otherwise use the opposite sign.
- Subfield is left padded with zeros to make a word. Index registers only
--have 2 bytes and a sign, Trying to set anything more that that will result
-+have 2 bytes and a sign, Trying to set anything more than that will result
- in undefined behavior."
-  2)
- 
-@@ -304,7 +304,7 @@
-  "Store in cell Nr. M the contents of rA.
+@@ -253,7 +253,7 @@
+          "Store in cell Nr. M the contents of rA.
  The modification of the operation code represents the subfield of the
  memory cell that is to be overwritten with bytes from a register. These
 -bytes are taken beginning by the rightmost side of the register. The
 +bytes are taken starting with the rightmost side of the register. The
  sign of the memory cell is not changed, unless it is part of the subfield."
-  2)
+          2)
  
-@@ -313,7 +313,7 @@
-  "Store in cell Nr. M the contents of rX.
+@@ -261,7 +261,7 @@
+          "Store in cell Nr. M the contents of rX.
  The modification of the operation code represents the subfield of the
  memory cell that is to be overwritten with bytes from a register. These
 -bytes are taken beginning by the rightmost side of the register. The
 +bytes are taken starting with the rightmost side of the register. The
  sign of the memory cell is not changed, unless it is part of the subfield."
-  2)
+          2)
  
-@@ -322,7 +322,7 @@
-  "Store in cell Nr. M the contents of rI1.
+@@ -269,7 +269,7 @@
+          "Store in cell Nr. M the contents of rI1.
  The modification of the operation code represents the subfield of the
  memory cell that is to be overwritten with bytes from a register. These
 -bytes are taken beginning by the rightmost side of the register. The
@@ -321,8 +133,8 @@ Last-Update: 2019-01-23
  sign of the memory cell is not changed, unless it is part of the subfield.
  Because index registers only have 2 bytes and a sign, the rest of the bytes
  are assumed to be 0."
-@@ -333,7 +333,7 @@
-  "Store in cell Nr. M the contents of rI2.
+@@ -279,7 +279,7 @@
+          "Store in cell Nr. M the contents of rI2.
  The modification of the operation code represents the subfield of the
  memory cell that is to be overwritten with bytes from a register. These
 -bytes are taken beginning by the rightmost side of the register. The
@@ -330,8 +142,8 @@ Last-Update: 2019-01-23
  sign of the memory cell is not changed, unless it is part of the subfield.
  Because index registers only have 2 bytes and a sign, the rest of the bytes
  are assumed to be 0."
-@@ -344,7 +344,7 @@
-  "Store in cell Nr. M the contents of rI3.
+@@ -289,7 +289,7 @@
+          "Store in cell Nr. M the contents of rI3.
  The modification of the operation code represents the subfield of the
  memory cell that is to be overwritten with bytes from a register. These
 -bytes are taken beginning by the rightmost side of the register. The
@@ -339,8 +151,8 @@ Last-Update: 2019-01-23
  sign of the memory cell is not changed, unless it is part of the subfield.
  Because index registers only have 2 bytes and a sign, the rest of the bytes
  are assumed to be 0."
-@@ -355,7 +355,7 @@
-  "Store in cell Nr. M the contents of rI4.
+@@ -299,7 +299,7 @@
+          "Store in cell Nr. M the contents of rI4.
  The modification of the operation code represents the subfield of the
  memory cell that is to be overwritten with bytes from a register. These
 -bytes are taken beginning by the rightmost side of the register. The
@@ -348,8 +160,8 @@ Last-Update: 2019-01-23
  sign of the memory cell is not changed, unless it is part of the subfield.
  Because index registers only have 2 bytes and a sign, the rest of the bytes
  are assumed to be 0."
-@@ -366,7 +366,7 @@
-  "Store in cell Nr. M the contents of rI5.
+@@ -309,7 +309,7 @@
+          "Store in cell Nr. M the contents of rI5.
  The modification of the operation code represents the subfield of the
  memory cell that is to be overwritten with bytes from a register. These
 -bytes are taken beginning by the rightmost side of the register. The
@@ -357,8 +169,8 @@ Last-Update: 2019-01-23
  sign of the memory cell is not changed, unless it is part of the subfield.
  Because index registers only have 2 bytes and a sign, the rest of the bytes
  are assumed to be 0."
-@@ -377,7 +377,7 @@
-  "Store in cell Nr. M the contents of rI6.
+@@ -319,7 +319,7 @@
+          "Store in cell Nr. M the contents of rI6.
  The modification of the operation code represents the subfield of the
  memory cell that is to be overwritten with bytes from a register. These
 -bytes are taken beginning by the rightmost side of the register. The
@@ -366,222 +178,173 @@ Last-Update: 2019-01-23
  sign of the memory cell is not changed, unless it is part of the subfield.
  Because index registers only have 2 bytes and a sign, the rest of the bytes
  are assumed to be 0."
-@@ -388,7 +388,7 @@
-  "Store in cell Nr. M the contents of rJ.
+@@ -329,7 +329,7 @@
+          "Store in cell Nr. M the contents of rJ.
  The modification of the operation code represents the subfield of the
  memory cell that is to be overwritten with bytes from a register. These
 -bytes are taken beginning by the rightmost side of the register. The sign
 +bytes are taken starting with the rightmost side of the register. The sign
  of rJ is always +, sign of the memory cell is not changed, unless it is
  part of the subfield. The default field for STJ is (0:2)."
-  2)
-@@ -404,7 +404,7 @@
-  'ADD 'arithmetic "add" 1 'field
-  "Add to A the contents of cell Nr. M.
+          2)
+@@ -343,7 +343,7 @@
+     (ADD arithmetic "add" 1 field
+          "Add to A the contents of cell Nr. M.
  Subfield is padded with zero to make a word.
 -If the result is to large, the operation result modulo 1,073,741,823 (the
 +If the result is too large, the operation result modulo 1,073,741,823 (the
  maximum value storable in a MIX word) is stored in `rA', and the overflow
  toggle is set to TRUE."
-  2)
-@@ -413,7 +413,7 @@
-  'SUB 'arithmetic "subtract" 2 'field
-  "Subtract to A the contents of cell Nr. M.
+          2)
+@@ -351,7 +351,7 @@
+     (SUB arithmetic "subtract" 2 field
+          "Subtract to A the contents of cell Nr. M.
  Subfield is padded with zero to make a word.
 -If the result is to large, the operation result modulo 1,073,741,823 (the
 +If the result is too large, the operation result modulo 1,073,741,823 (the
  maximum value storable in a MIX word) is stored in `rA', and the overflow
  toggle is set to TRUE."
-  2)
-@@ -427,8 +427,8 @@
- (mixal-add-operation-code
-  'DIV 'arithmetic "divide" 4 'field
-  "Both rA and rX are taken together and divided by cell Nr. M, quotient is placed in rA, remainder in rX.
+          2)
+@@ -363,8 +363,8 @@
+ 
+     (DIV arithmetic "divide" 4 field
+          "Both rA and rX are taken together and divided by cell Nr. M, quotient is placed in rA, remainder in rX.
 -The sign is taken from rA, and after the divide the sign of rA is set to + when
--both the sign of rA and M where the same. Divide by zero and overflow of rA result
+-both the sign of rA and M where the same. Divide by zero and overflow of rA
 +The sign is taken from rA, and after the division the sign of rA is set to + when
-+both the signs of rA and M where the same. Divide by zero and overflow of rA result
- in undefined behavior."
-  12)
++both the signs of rA and M where the same. Divide by zero and overflow of rA
+ result in undefined behavior."
+          12)
  
-@@ -656,7 +656,7 @@
-  'CMP1 'comparison "compare I1" (+ 56 1) 'field
-  "Compare contents of rI1 with contents of M.
+@@ -555,42 +555,42 @@
+     (CMP1 comparison "compare I1" 57 field
+           "Compare contents of rI1 with contents of M.
  The field specifier works on both fields. The comparison indicator
 -is set to LESS, EQUAL or GREATER depending on the outcome. Bit 1,2 and 3
-+is set to LESS, EQUAL or GREATER depending on the outcome. Bits 1, 2 and 3
++is set to LESS, EQUAL or GREATER depending on the outcome. Bits 1,2 and 3
  have a value of 0."
-  2)
+           2)
  
-@@ -665,7 +665,7 @@
-  'CMP2 'comparison "compare I2" (+ 56 2) 'field
-  "Compare contents of rI2 with contents of M.
+     (CMP2 comparison "compare I2" 58 field
+           "Compare contents of rI2 with contents of M.
  The field specifier works on both fields. The comparison indicator
 -is set to LESS, EQUAL or GREATER depending on the outcome. Bit 1,2 and 3
-+is set to LESS, EQUAL or GREATER depending on the outcome. Bits 1, 2 and 3
++is set to LESS, EQUAL or GREATER depending on the outcome. Bits 1,2 and 3
  have a value of 0."
-  2)
+           2)
  
-@@ -674,7 +674,7 @@
-  'CMP3 'comparison "compare I3" (+ 56 3) 'field
-  "Compare contents of rI3 with contents of M.
+     (CMP3 comparison "compare I3" 59 field
+           "Compare contents of rI3 with contents of M.
  The field specifier works on both fields. The comparison indicator
 -is set to LESS, EQUAL or GREATER depending on the outcome. Bit 1,2 and 3
-+is set to LESS, EQUAL or GREATER depending on the outcome. Bits 1, 2 and 3
++is set to LESS, EQUAL or GREATER depending on the outcome. Bits 1,2 and 3
  have a value of 0."
-  2)
+           2)
  
-@@ -683,7 +683,7 @@
-  'CMP4 'comparison "compare I4" (+ 56 4) 'field
-  "Compare contents of rI4 with contents of M.
+     (CMP4 comparison "compare I4" 60 field
+           "Compare contents of rI4 with contents of M.
  The field specifier works on both fields. The comparison indicator
 -is set to LESS, EQUAL or GREATER depending on the outcome. Bit 1,2 and 3
-+is set to LESS, EQUAL or GREATER depending on the outcome. Bits 1, 2 and 3
++is set to LESS, EQUAL or GREATER depending on the outcome. Bits 1,2 and 3
  have a value of 0."
-  2)
+           2)
  
-@@ -692,7 +692,7 @@
-  'CMP5 'comparison "compare I5" (+ 56 5) 'field
-  "Compare contents of rI5 with contents of M.
+     (CMP5 comparison "compare I5" 61 field
+           "Compare contents of rI5 with contents of M.
  The field specifier works on both fields. The comparison indicator
 -is set to LESS, EQUAL or GREATER depending on the outcome. Bit 1,2 and 3
-+is set to LESS, EQUAL or GREATER depending on the outcome. Bits 1, 2 and 3
++is set to LESS, EQUAL or GREATER depending on the outcome. Bits 1,2 and 3
  have a value of 0."
-  2)
+           2)
  
-@@ -701,7 +701,7 @@
-  'CMP6 'comparison "compare I6" (+ 56 6) 'field
-  "Compare contents of rI6 with contents of M.
+     (CMP6 comparison "compare I6" 62 field
+           "Compare contents of rI6 with contents of M.
  The field specifier works on both fields. The comparison indicator
 -is set to LESS, EQUAL or GREATER depending on the outcome. Bit 1,2 and 3
 +is set to LESS, EQUAL or GREATER depending on the outcome. Bits 1, 2 and 3
  have a value of 0."
-  2)
+           2)
  
-@@ -1188,21 +1188,21 @@
+@@ -965,41 +965,41 @@
+           1)
  
- (mixal-add-operation-code
-  'SLA 'miscellaneous "shift left A" 6 0
-- "Shift to A, M bytes left.
+     (SLA miscellaneous "shift left A" 6
+-         "Shift to A, M bytes left.
 -Hero's will be added to the right."
-+ "Shift A, M bytes to the left.
++         "Shift A, M bytes to the left.
 +Zeros will be added to the right."
-  2)
- 
+          2)
  
- (mixal-add-operation-code
-  'SRA 'miscellaneous "shift right A" 6 1
-- "Shift to A, M bytes right.
-+ "Shift A, M bytes to the right.
+     (SRA miscellaneous "shift right A" 6
+-         "Shift to A, M bytes right.
++         "Shift A, M bytes to the right.
  Zeros will be added to the left."
-  2)
- 
+          2)
  
- (mixal-add-operation-code
-  'SLAX 'miscellaneous "shift left AX" 6 2
-- "Shift AX, M bytes left.
-+ "Shift AX, M bytes to the left.
+     (SLAX miscellaneous "shift left AX" 6
+-          "Shift AX, M bytes left.
++          "Shift AX, M bytes to the left.
  Zeros will be added to the right."
-  2)
+           2)
  
-@@ -1210,32 +1210,32 @@
- 
- (mixal-add-operation-code
-  'SRAX 'miscellaneous "shift right AX" 6 3
-- "Shift AX, M bytes right.
-+ "Shift AX, M bytes to the right.
+     (SRAX miscellaneous "shift right AX" 6
+-          "Shift AX, M bytes right.
++          "Shift AX, M bytes to the right.
  Zeros will be added to the left."
-  2)
- 
+           2)
  
- (mixal-add-operation-code
-  'SLC 'miscellaneous "shift left AX circularly" 6 4
-- "Shift AX, M bytes left circularly.
+     (SLC miscellaneous "shift left AX circularly" 6
+-         "Shift AX, M bytes left circularly.
 -The bytes that fall off to the left will be added to the right."
-+ "Shift AX, M bytes to the left circularly.
-+The bits that fall off on the left will be added to the right."
-  2)
++         "Shift AX, M bytes to the left circularly.
++The bytes that fall off on the left will be added to the right."
+          2)
  
- 
- (mixal-add-operation-code
-  'SRC 'miscellaneous "shift right AX circularly" 6 4
-- "Shift AX, M bytes right circularly.
+     (SRC miscellaneous "shift right AX circularly" 6
+-         "Shift AX, M bytes right circularly.
 -The bytes that fall off to the right will be added to the left."
-+ "Shift AX, M bytes to the right circularly.
++         "Shift AX, M bytes to the right circularly.
 +The bytes that fall off on the right will be added to the left."
-  2)
- 
- (mixal-add-operation-code
-  'SLB 'miscellaneous "shift left AX binary" 6 6
-- "Shift AX, M binary places left."
-+ "Shift AX, M binary places to the left."
-  2)
- 
- (mixal-add-operation-code
-  'SRB 'miscellaneous "shift right AX binary" 6 7
-- "Shift AX, M binary places right."
-+ "Shift AX, M binary places to the right."
-  2)
- 
- (mixal-add-operation-code
-@@ -1285,15 +1285,15 @@
- 
- (mixal-add-operation-code
-  'NUM 'conversion "convert to numeric" 5 0
-- "Convert rAX to its numerical value and store it in rA.
+          2)
+ 
+     (SLB miscellaneous "shift left AX binary" 6
+-         "Shift AX, M binary places left."
++         "Shift AX, M binary places to the left."
+          2)
+ 
+     (SRB miscellaneous "shift right AX binary" 6
+-         "Shift AX, M binary places right."
++         "Shift AX, M binary places to the right."
+          2)
+ 
+     (MOVE miscellaneous "move" 7 number
+@@ -1039,14 +1039,14 @@
+           1)
+ 
+     (NUM conversion "convert to numeric" 5
+-         "Convert rAX to its numerical value and store it in rA.
 -the register rAX is assumed to contain a character representation of
-+ "Convert rAX to its numerical value and store it into rA.
++         "Convert rAX to its numerical value and store it into rA.
 +The register rAX is assumed to contain a character representation of
  a number."
-  10)
+          10)
  
- (mixal-add-operation-code
-  'CHAR 'conversion "convert to characters" 5 1
-  "Convert the number stored in rA to a character representation.
+     (CHAR conversion "convert to characters" 5
+           "Convert the number stored in rA to a character representation.
 -The converted character representation is stored in rAX."
 +The converted character representation is stored into rAX."
-  10)
- 
- (defvar mixal-describe-operation-code-history nil
-@@ -1302,15 +1302,15 @@
- (defun mixal-describe-operation-code (&optional op-code)
-   "Display the full documentation of OP-CODE."
-   (interactive)
--  ;; we like to provide completition and history, so do it ourself (interactive "?bla")?
-+  ;; we like to provide completion and history, so do it ourself (interactive "?bla")?
-   (unless op-code
-     (let* ((completion-ignore-case t)
- 	   ;; we already have a list, but it is not in the right format
--	   ;; transform it to a valid table so completition can use it
-+	   ;; transform it to a valid table so completion can use it
- 	   (table (mapcar '(lambda (elm)
- 			     (cons (symbol-name (car elm)) nil))
+           10))
+ 
+   "Alist that contains all the possible operation codes for mix.
+@@ -1097,7 +1097,7 @@
+ 	   ;; transform it to a valid table so completion can use it
+ 	   (table (mapcar (lambda (elm) (cons (symbol-name (car elm)) nil))
  			  mixal-operation-codes-alist))
 -	   ;; prompt is different depending on we are close to a valid op-code
 +	   ;; prompt is different depending on whether we are close to a valid op-code
- 	   (have-default (member (current-word) mixal-operation-codes))
+ 	   (have-default (assq (intern-soft (current-word))
+                                mixal-operation-codes-alist))
  	   (prompt (concat "Describe operation code "
- 			   (if have-default
-@@ -1334,7 +1334,7 @@
- 
- ;;;; Running
- (defun mixal-run ()
--  "Run's mixal file in current buffer, assumes that file has been compiled"
-+  "Runs mixal file in current buffer, assumes that file has been compiled"
-   (interactive)
-   (mixvm (concat "mixvm -r -t -d "
- 		 (file-name-sans-extension (buffer-file-name)))))
---- a/mixguile/mixguile-commands.scm
-+++ b/mixguile/mixguile-commands.scm
-@@ -19,7 +19,7 @@
- ;
- ;;
- 
--;; auxiliar functions for argument conversion
-+;; auxiliary functions for argument conversion
- (define argsym->string
-   (lambda (arg)
-     (cond ((symbol? arg) (symbol->string arg))
 --- a/mixguile/mixguile.c
 +++ b/mixguile/mixguile.c
 @@ -101,7 +101,7 @@
@@ -604,35 +367,6 @@ Last-Update: 2019-01-23
  extern mix_vm_cmd_dispatcher_t *
  mixguile_get_cmd_dispatcher (void);
  
---- a/mixguile/xmixguile_cmd_dispatcher.c
-+++ b/mixguile/xmixguile_cmd_dispatcher.c
-@@ -363,7 +363,7 @@
- 
- /* ----- hook functions ---- */
- 
--/* auxiliar arg list maker */
-+/* auxiliary arg list maker */
- static SCM
- make_arg_list_ (const gchar *arg)
- {
-@@ -380,7 +380,7 @@
-   return argument;
- }
- 
--/* command hook auxiliar functions and types */
-+/* command hook auxiliary functions and types */
- /*
- static SCM
- hook_error_handler_ (void *data, SCM tag, SCM args){}
-@@ -413,7 +413,7 @@
-                       scm_handle_by_message_noexit, dis);
- }
- 
--/* global hook auxiliar functions and types */
-+/* global hook auxiliary functions and types */
- typedef struct
- {
-   SCM function;
 --- a/mixlib/mix_eval.c
 +++ b/mixlib/mix_eval.c
 @@ -183,7 +183,7 @@
@@ -699,17 +433,6 @@ Last-Update: 2019-01-23
    };
  
    return errors[code > MIX_VM_ERROR_UNEXPECTED ?
---- a/mixlib/xmix_vm.c
-+++ b/mixlib/xmix_vm.c
-@@ -23,7 +23,7 @@
- 
- #include "xmix_vm.h"
- 
--/* auxiliar functions */
-+/* auxiliary functions */
- G_INLINE_FUNC mix_address_t
- get_M_ (const mix_vm_t *vm, const mix_ins_t *ins);
- G_INLINE_FUNC mix_word_t
 --- a/mixlib/xmix_vm.h
 +++ b/mixlib/xmix_vm.h
 @@ -53,7 +53,7 @@
@@ -734,21 +457,32 @@ Last-Update: 2019-01-23
  #, c-format
 --- a/mixgtk/mixgtk.glade
 +++ b/mixgtk/mixgtk.glade
-@@ -454,7 +454,7 @@
-                     <child>
-                       <widget class="GtkCheckMenuItem" id="save_on_exit">
-                         <property name="visible">True</property>
--                        <property name="tooltip" translatable="yes">Toogle save settings on exit</property>
-+                        <property name="tooltip" translatable="yes">Toggle save settings on exit</property>
-                         <property name="label" translatable="yes">Save on _exit</property>
-                         <property name="use_underline">True</property>
-                         <signal name="toggled" handler="on_save_on_exit_toggle"/>
-@@ -1444,7 +1444,7 @@
+@@ -763,7 +763,7 @@
+                     <property name="height_request">0</property>
                      <property name="visible">True</property>
-                     <property name="xalign">0.47999998927116394</property>
-                     <property name="yalign">0.52999997138977051</property>
+                     <property name="can_focus">False</property>
 -                    <property name="label" translatable="yes">MIX asssembler path</property>
 +                    <property name="label" translatable="yes">MIX assembler path</property>
                      <property name="single_line_mode">True</property>
-                   </widget>
-                   <packing>
+                     <property name="xalign">0.47999998927116394</property>
+                     <property name="yalign">0.52999997138977051</property>
+--- a/doc/MIX.DOC
++++ b/doc/MIX.DOC
+@@ -44,7 +44,7 @@
+ it can be used to hold information shifted to the right out of rA.  The index
+ registers rI1, rI2, rI3, rI4, rI5, and rI6 are used primarily for counting and
+ for referencing variable memory addresses.  The J-register always hold the
+-address of the instruction following the preceding ``JUMP'' intruction, and it
++address of the instruction following the preceding ``JUMP'' instruction, and it
+ is primarily used in connection with subroutines.
+     Besides thesee registers, MIX contains
+     
+@@ -124,7 +124,7 @@
+     If I is zero, the ``,I'' is omitted.  If F is the -normal- F-specification
+ for this particular operator, the ``(F)'' need not be written.  The normal F-
+ specification for almost all operators is (0:5), representing a whole word.
+-If a different F is standard, it will be mentioned explicity when we discuss
++If a different F is standard, it will be mentioned explicitly when we discuss
+ a particular operator.
+ 
+ ...