Merge pull request #138 from sebras/reorder/cas.x

Reorder and fix typos in cas.x

scans/README.md

@@ -29,7 +29,8 @@ Details of the files:
 * maksys.s: page 64  of 01-s1.pdf
 * trysys.s: page 65  of 01-s1.pdf
 * scope.v: pages 3-18 of 03-scope.pdf
-* cas.s: pages 1-17 of 04-cas.pdf
+* cas.s: pages 1-8 of 04-cas.pdf
+* cas.x: 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

scans/cas.s

@@ -488,572 +488,3 @@ nins: .=.+1
 o100: 0100
 o12012: 012012
 o12060: 012060
-
-
-
-
-
-"** 04-cas.pdf page 9
-:ca
-v
-af
-nl "???
-x
-hd
-v
-hi
-x
-mn
-r
-
-:cb
-x
-ga
-v
-gi
-ik
-kk
-mi "???
-ma
-aa
-ai
-ck
-ek
-gi
-x
-mn
-r
-
-:cc
-x
-kk
-v
-mi "???
-mc
-ka
-ca
-ac
-ai
-dl
-x
-mn
-r
-
-:cd
-v
-aa
-ai
-ck
-kk
-mi
-ma
-x
-mn
-r
-
-:ce
-x
-mk
-v
-ma
-"** 04-cas.pdf page 10
-aa
-ak
-x
-gh
-v
-ga
-x
-mn
-r
-
-:cf
-v
-aa
-ak
-x
-gh
-v
-ga
-x
-mn
-r
-
-:cg
-x
-gf
-v
-gk
-nk
-x
-kk
-v
-mi
-mc
-ka
-ca
-ac
-ai
-dl
-x
-mn
-r
-
-:ch
-x
-aa
-v
-na
-x
-gb "???
-v
-gk
-x
-ak
-v
-nk
-x
-mn
-r
-
-:ci
-x
-"** 04-cas.pdf page 11
-md
-v
-mi
-x
-lf
-v
-af
-x
-ad
-v
-ai
-x
-mn
-r
-
-:cj
-x
-ka
-v
-mc
-mg
-ki
-ai "???
-x
-ag
-v
-al "???
-x
-mn
-r
-
-:ck
-x
-aa
-v
-na
-x
-ak
-v
-ia
-x
-mk
-v
-fe
-x
-mn
-r
-
-:cl
-x
-aa
-v
-ma
-mk
-x
-mn
-r
-
-:cm
-v
-aa
-"** 04-cas.pdf page 12
-hf
-ak
-nk
-x
-mn
-r
-
-:cn
-x
-ak
-v
-mk
-aa
-na
-x
-mn
-r
-
-:co
-x "???
-ai
-v
-ch
-ei
-ck
-ai
-ac
-ca
-ka
-mc "???
-mi
-kk
-ck
-x
-mn
-r
-
-:cp
-v
-aa
-ai
-ck
-ek
-gi
-ga
-x
-mn
-r
-
-:cq
-x
-mc
-v
-ka
-ca
-ac
-ai
-ck
-kk
-mi
-mc
-"** 04-cas.pdf page 13
-x
-jh
-v
-nl
-x
-mn
-r
-
-:cr
-v
-aa
-ai
-ck
-ek
-gi
-ga
-x
-mk
-v
-gf
-x
-mn
-r
-
-:cs
-x
-ka
-v
-mc
-mi
-kk
-ik
-gi
-gc
-ea
-ca
-ac
-ai
-dl
-x
-mn
-r
-
-:ct
-x
-aa
-v
-al
-x
-mf
-v
-af
-x
-mn
-r
-
-:cu
-x
-aa
-v
-ka
-"** 04-cas.pdf page 14
-mc
-ml "???
-kk
-x
-ak
-v
-lk
-x
-mn
-r
-
-:cv
-x
-aa
-v
-mf
-x
-ak
-v
-mf
-x
-mn
-r
-
-:cw
-x
-aa
-v
-mc
-af
-x
-ak
-v
-mi
-af
-x
-mn
-r
-
-:cx
-v
-gf
-x
-ak
-v
-gf
-x
-aa
-v
-nl
-x
-mn
-r
-
-:cy
-x
-aa
-v
-if
-x
-ak
-"** 04-cas.pdf page 15
-v
-if
-nf
-x
-mn
-r
-
-:cz
-x
-aa
-v
-ak
-ma
-ml
-x
-mn
-r
-
-:c0
-x
-ck
-v
-ai
-ac
-ca
-ka
-mc
-mi
-kk
-ck
-x
-mn
-r
-
-:c1
-x
-ce
-v
-af
-mf
-x
-md
-v
-mi
-x
-mn
-r
-
-:c2
-x
-ca
-v
-ac
-ai
-ck
-ek
-gi
-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
-r
-
-:c3
-x
-aa
-v
-ak
-fe
-fi
-hk
-kk
-mi
-mc
-x
-ka
-v
-nd
-x
-mn
-r
-
-:c4
-x
-mh
-v
-ah
-ia
-il
-x
-mn
-r
-
-:c5
-x
-ak
-v
-aa
-fa
-fi
-hk
-kk
-mi
-mc
-x
-ka
-v
-nd
-x
-mn
-r
-
-:c6
-x
-ck
-v
-ai
-ac
-ca
-ka
-
-" The end of file seems abrupt, every other :cX section ends with:
-" x
-" mn
-" r

scans/cas.x

@@ -0,0 +1,564 @@
+"** 04-cas.pdf page 9
+:ca
+v
+af
+nl "???
+x
+hd
+v
+hi
+x
+mn
+r
+
+:cb
+x
+ga
+v
+gi
+ik
+kk
+mi "???
+ma
+aa
+ai
+ck
+ek
+gi
+x
+mn
+r
+
+:cc
+x
+kk
+v
+mi "???
+mc
+ka
+ca
+ac
+ai
+dl
+x
+mn
+r
+
+:cd
+v
+aa
+ai
+ck
+kk
+mi
+ma
+x
+mn
+r
+
+:ce
+x
+mk
+v
+ma
+"** 04-cas.pdf page 10
+aa
+ak
+x
+gh
+v
+ga
+x
+mn
+r
+
+:cf
+v
+aa
+ak
+x
+gh
+v
+ga
+x
+mn
+r
+
+:cg
+x
+gf
+v
+gk
+nk
+x
+kk
+v
+mi
+mc
+ka
+ca
+ac
+ai
+dl
+x
+mn
+r
+
+:ch
+x
+aa
+v
+na
+x
+gb "???
+v
+gk
+x
+ak
+v
+nk
+x
+mn
+r
+
+:ci
+x
+"** 04-cas.pdf page 11
+md
+v
+mi
+x
+lf
+v
+af
+x
+ad
+v
+ai
+x
+mn
+r
+
+:cj
+x
+ka
+v
+mc
+mg
+ki
+ai "???
+x
+ag
+v
+al "???
+x
+mn
+r
+
+:ck
+x
+aa
+v
+na
+x
+ak
+v
+ia
+x
+mk
+v
+fe
+x
+mn
+r
+
+:cl
+x
+aa
+v
+ma
+mk
+x
+mn
+r
+
+:cm
+v
+aa
+"** 04-cas.pdf page 12
+hf
+ak
+nk
+x
+mn
+r
+
+:cn
+x
+ak
+v
+mk
+aa
+na
+x
+mn
+r
+
+:co
+x "???
+ai
+v
+ch
+ei
+ck
+ai
+ac
+ca
+ka
+mc "???
+mi
+kk
+ck
+x
+mn
+r
+
+:cp
+v
+aa
+ai
+ck
+ek
+gi
+ga
+x
+mn
+r
+
+:cq
+x
+mc
+v
+ka
+ca
+ac
+ai
+ck
+kk
+mi
+mc
+"** 04-cas.pdf page 13
+x
+jh
+v
+nl
+x
+mn
+r
+
+:cr
+v
+aa
+ai
+ck
+ek
+gi
+ga
+x
+mk
+v
+gf
+x
+mn
+r
+
+:cs
+x
+ka
+v
+mc
+mi
+kk
+ik
+gi
+gc
+ea
+ca
+ac
+ai
+dl
+x
+mn
+r
+
+:ct
+x
+aa
+v
+al
+x
+mf
+v
+af
+x
+mn
+r
+
+:cu
+x
+aa
+v
+ka
+"** 04-cas.pdf page 14
+mc
+mi "???
+kk
+x
+ak
+v
+lk
+x
+mn
+r
+
+:cv
+x
+aa
+v
+mf
+x
+ak
+v
+mf
+x
+mn
+r
+
+:cw
+x
+aa
+v
+mc
+af
+x
+ak
+v
+mi
+af
+x
+mn
+r
+
+:cx
+v
+gf
+x
+ak
+v
+gf
+x
+aa
+v
+nl
+x
+mn
+r
+
+:cy
+x
+aa
+v
+if
+x
+ak
+"** 04-cas.pdf page 15
+v
+if
+nf
+x
+mn
+r
+
+:cz
+x
+aa
+v
+ak
+ma
+ml
+x
+mn
+r
+
+:c0
+x
+ck
+v
+ai
+ac
+ca
+ka
+mc
+mi
+kk
+ck
+x
+mn
+r
+
+:c1
+x
+ce
+v
+af
+mf
+x
+md
+v
+mi
+x
+mn
+r
+
+:c2
+x
+ca
+v
+ac
+ai
+ck
+ek
+gi
+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
+r
+
+:c3
+x
+aa
+v
+ak
+fe
+fi
+hk
+kk
+mi
+mc
+x
+ka
+v
+nd
+x
+mn
+r
+
+:c4
+x
+mh
+v
+ah
+ia
+il
+x
+mn
+r
+
+:c5
+x
+ak
+v
+aa
+fa
+fi
+hk
+kk
+mi
+mc
+x
+ka
+v
+nd
+x
+mn
+r
+
+:c6
+x
+ck
+v
+ai
+ac
+ca
+ka
+
+" The end of file seems abrupt, every other :cX section ends with:
+" x
+" mn
+" r

src/cmd/cas.x

@@ -1,10 +1,7 @@
-"** 04-cas.pdf page 8
-" captital character definitions???
-" lower case definitions at 03-scope.pdf, page 2 ???
 :ca
 v
 af
-nl "???
+nl
 x
 hd
 v
@@ -20,7 +17,7 @@ v
 gi
 ik
 kk
-mi "???
+mi
 ma
 aa
 ai
@@ -35,7 +32,7 @@ r
 x
 kk
 v
-mi "???
+mi
 mc
 ka
 ca
@@ -63,7 +60,6 @@ x
 mk
 v
 ma
-"** 04-cas.pdf page 10
 aa
 ak
 x
@@ -112,7 +108,7 @@ aa
 v
 na
 x
-gb "???
+gb
 v
 gk
 x
@@ -125,7 +121,6 @@ r
 
 :ci
 x
-"** 04-cas.pdf page 11
 md
 v
 mi
@@ -148,11 +143,11 @@ v
 mc
 mg
 ki
-ai "???
+ai
 x
 ag
 v
-al "???
+al
 x
 mn
 r
@@ -187,7 +182,6 @@ r
 :cm
 v
 aa
-"** 04-cas.pdf page 12
 hf
 ak
 nk
@@ -207,7 +201,7 @@ mn
 r
 
 :co
-x "???
+x
 ai
 v
 ch
@@ -217,7 +211,7 @@ ai
 ac
 ca
 ka
-mc "???
+mc
 mi
 kk
 ck
@@ -249,7 +243,6 @@ ck
 kk
 mi
 mc
-"** 04-cas.pdf page 13
 x
 jh
 v
@@ -311,9 +304,8 @@ x
 aa
 v
 ka
-"** 04-cas.pdf page 14
 mc
-ml "???
+mi
 kk
 x
 ak
@@ -373,7 +365,6 @@ v
 if
 x
 ak
-"** 04-cas.pdf page 15
 v
 if
 nf
@@ -434,8 +425,68 @@ gi
 gc
 ia
 ma
-ml "???
+ml
-"** 04-cas.pdf page 16
+x
+mn
+r
+
+:c3
+x
+aa
+v
+ak
+fe
+fi
+hk
+kk
+mi
+mc
+x
+ka
+v
+nd
+x
+mn
+r
+
+:c4
+x
+mh
+v
+ah
+ia
+il
+x
+mn
+r
+
+:c5
+x
+ak
+v
+aa
+fa
+fi
+hk
+kk
+mi
+mc
+x
+ka
+v
+nd
+x
+mn
+r
+
+:c6
+x
+ck
+v
+ai
+ac
+ca
+ka
 mc
 mi
 kk
@@ -497,70 +548,4 @@ hi
 fk
 x
 mn
-"** 04-cas.pdf page 17
-x
-mn
 r
-
-:c3
-x
-aa
-v
-ak
-fe
-fi
-hk
-kk
-mi
-mc
-x
-ka
-v
-nd
-x
-mn
-r
-
-:c4
-x
-mh
-v
-ah
-ia
-ll
-x
-mn
-r
-
-:c5
-x
-ak
-v
-aa
-fa
-fi
-hk
-kk
-mi
-mc
-x
-ka
-v
-nd
-x
-mn
-r
-
-:c6
-x
-ck
-v
-ai
-ac
-ca
-ka
-
-" The end of file seems abrupt, every other :cX section ends with:
-" x
-" mn
-" r