From f89cdd7f1b7c5569573cbcd4d7a3c53947494b65 Mon Sep 17 00:00:00 2001
From: Sebastian Rasmussen <sebras@gmail.com>
Date: Tue, 22 Oct 2019 01:55:20 +0200
Subject: [PATCH 1/3] Reorder contents of pages 16 and 17 also in scans/cas.x

Pages 16 and 17 in scans/cas.x must have been accidentally reordered
when scanned. This commits reorders the contents in scans/cas.x
to reflect the original authors' intentions.
---
 scans/cas.x | 127 +++++++++++++++++++++++++---------------------------
 1 file changed, 61 insertions(+), 66 deletions(-)

diff --git a/scans/cas.x b/scans/cas.x
index 3779a83..f38685b 100644
--- a/scans/cas.x
+++ b/scans/cas.x
@@ -433,68 +433,6 @@ gc
 ia
 ma
 ml "???
-"** 04-cas.pdf page 16
-mc
-mi
-kk
-hk
-fi
-fc
-ha
-x
-mn
-r
-
-:c7
-x
-aa
-v
-ak
-nb
-x
-mn
-r
-
-:c8
-x
-gc
-v
-ea
-ca
-ac
-ai
-ck
-ek
-gi
-gc
-ia
-ka
-mc
-mi
-kk
-ik
-gi
-x
-mn
-r
-
-:c9
-x
-ka
-v
-mc
-mi
-kk
-ck
-ai
-ac
-ca
-fa
-hc
-hi
-fk
-x
-mn
 "** 04-cas.pdf page 17
 x
 mn
@@ -557,8 +495,65 @@ ai
 ac
 ca
 ka
+"** 04-cas.pdf page 16
+mc
+mi
+kk
+hk
+fi
+fc
+ha
+x
+mn
+r
 
-" The end of file seems abrupt, every other :cX section ends with:
-" x
-" mn
-" r
+:c7
+x
+aa
+v
+ak
+nb
+x
+mn
+r
+
+:c8
+x
+gc
+v
+ea
+ca
+ac
+ai
+ck
+ek
+gi
+gc
+ia
+ka
+mc
+mi
+kk
+ik
+gi
+x
+mn
+r
+
+:c9
+x
+ka
+v
+mc
+mi
+kk
+ck
+ai
+ac
+ca
+fa
+hc
+hi
+fk
+x
+mn

From 4d5da877805ddd47fbd4b17b4258ed94deb08f9b Mon Sep 17 00:00:00 2001
From: Sebastian Rasmussen <sebras@gmail.com>
Date: Tue, 22 Oct 2019 01:56:43 +0200
Subject: [PATCH 2/3] Adhere to common pattern even in last section of
 scans/cas.x

All previous sections end with the sequence x/mn/r, but the section
:c9 ends with only x/mn. This is likely not correct. Without a
trailing r statement when cas processes cas.x the output will not
contain the definition of the last character.
---
 scans/cas.x | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scans/cas.x b/scans/cas.x
index f38685b..b3fd662 100644
--- a/scans/cas.x
+++ b/scans/cas.x
@@ -557,3 +557,4 @@ hi
 fk
 x
 mn
+r

From d0a432565b802a33558f825501d8e1aa9ff2e389 Mon Sep 17 00:00:00 2001
From: Sebastian Rasmussen <sebras@gmail.com>
Date: Tue, 22 Oct 2019 02:03:15 +0200
Subject: [PATCH 3/3] Rename cas.x to cas.cas

The intention is the point to what tool should be used to process
the character definitions.
---
 scans/README.md            | 2 +-
 scans/{cas.x => cas.cas}   | 0
 src/cmd/{cas.x => cas.cas} | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename scans/{cas.x => cas.cas} (100%)
 rename src/cmd/{cas.x => cas.cas} (100%)

diff --git a/scans/README.md b/scans/README.md
index 359beea..172b453 100644
--- a/scans/README.md
+++ b/scans/README.md
@@ -30,7 +30,7 @@ Details of the files:
 * trysys.s: page 65  of 01-s1.pdf
 * scope.v: pages 3-18 of 03-scope.pdf
 * cas.s: pages 1-8 of 04-cas.pdf
-* cas.x: pages 9-17 of 04-cas.pdf
+* cas.cas: pages 9-17 of 04-cas.pdf
 * adm.s: pages 2-11  of 05-1-4.pdf
 * ald.s: pages 13-17 of 05-1-4.pdf
 * apr.s: pages 19-30 of 05-1-4.pdf
diff --git a/scans/cas.x b/scans/cas.cas
similarity index 100%
rename from scans/cas.x
rename to scans/cas.cas
diff --git a/src/cmd/cas.x b/src/cmd/cas.cas
similarity index 100%
rename from src/cmd/cas.x
rename to src/cmd/cas.cas