From 8c501a65916a423680e61142e3c2d5a50350486c Mon Sep 17 00:00:00 2001
From: Tony Garnock-Jones <tonygarnockjones@gmail.com>
Date: Sun, 23 Sep 2018 22:44:43 +0100
Subject: [PATCH] Fixes

---
 imperative/mc/preserve.md | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/imperative/mc/preserve.md b/imperative/mc/preserve.md
index 75e0295..9cc515b 100644
--- a/imperative/mc/preserve.md
+++ b/imperative/mc/preserve.md
@@ -1,7 +1,13 @@
 ---
 ---
 <style>
-body { padding-top: 2rem; font-family: palatino, "Palatino Linotype", "Palatino LT STD", "URW Palladio L", serif; max-width: 40em; margin: auto; font-size: 120%; }
+body { font-family: palatino, "Palatino Linotype", "Palatino LT STD", "URW Palladio L", serif; }
+@media screen {
+  body { padding-top: 2rem; max-width: 40em; margin: auto; font-size: 120%; }
+}
+@media print {
+  body { margin-left: 2rem; }
+}
 h1, h2, h3, h4, h5, h6 { margin-left: -1rem; color: #4f81bd; }
 h2 { border-bottom: solid #4f81bd 1px; }
 pre, code { background-color: #eee; }
@@ -44,13 +50,13 @@ later in this document.
                           Value = Atom
                                 | Compound
 
-                           Atom = SignedInteger
+                           Atom = Boolean
+                                | Float
+                                | Double
+                                | SignedInteger
                                 | String
                                 | ByteString
                                 | Symbol
-                                | Boolean
-                                | Float
-                                | Double
 
                        Compound = Record
                                 | Sequence
@@ -80,12 +86,12 @@ values of different kinds is essentially arbitrary, but having a total
 order is convenient for many tasks, so we define it as
 follows:[^ordering-by-syntax]
 
-            (Values)        Compound < Atom
+            (Values)        Atom < Compound
 
             (Compounds)     Record < Sequence < Set < Dictionary
 
-            (Atoms)         SignedInteger < String < ByteString < Symbol
-                              < Boolean < Float < Double
+            (Atoms)         Boolean < Float < Double < SignedInteger
+                              < String < ByteString < Symbol
 
   [^ordering-by-syntax]: The observant reader may note that the
     ordering here is the same as that implied by the tagging scheme
@@ -325,7 +331,7 @@ The following figure summarises the definitions below:
 
     01 00 mmmm  ...        SignedInteger, big-endian binary
     01 01 mmmm  ...        String, UTF-8 binary
-    01 10 mmmm  ...        Bytes
+    01 10 mmmm  ...        ByteString
     01 11 mmmm  ...        Symbol, UTF-8 binary
 
     10 00 mmmm  ...        application-specific Record
@@ -887,7 +893,7 @@ should both be identities.
 
      4x - SignedInteger
      5x - String
-     6x - Bytes
+     6x - ByteString
      7x - Symbol
 
      8x - short form Record label index 0
@@ -1078,7 +1084,7 @@ Q. Should I map to SPKI SEXP or is that nonsense / for later?[^why-not-spki-sexp
 Q. Should `Symbol` be a special syntax for a `Record` with a `Symbol`
 label (recursive!?) and a single `String` field?
 
-Q. Should `String` be a special syntax for `(utf8 Bytes)`? Again,
+Q. Should `String` be a special syntax for `(utf8 ByteString)`? Again,
 recursiveness problems...?
 
 Q. Should `Dictionary` be a special syntax for etc etc.? `Set`?