about summary refs log tree commit diff stats
path: root/html/linux/tile
diff options
context:
space:
mode:
Diffstat (limited to 'html/linux/tile')
-rw-r--r--html/linux/tile/box.mu.html10
-rw-r--r--html/linux/tile/data.mu.html10
-rw-r--r--html/linux/tile/environment.mu.html122
-rw-r--r--html/linux/tile/float-stack.mu.html6
-rw-r--r--html/linux/tile/gap-buffer.mu.html196
-rw-r--r--html/linux/tile/grapheme-stack.mu.html132
-rw-r--r--html/linux/tile/main.mu.html16
-rw-r--r--html/linux/tile/rpn.mu.html8
-rw-r--r--html/linux/tile/surface.mu.html26
-rw-r--r--html/linux/tile/table.mu.html10
-rw-r--r--html/linux/tile/value-stack.mu.html12
-rw-r--r--html/linux/tile/value.mu.html24
-rw-r--r--html/linux/tile/word.mu.html58
13 files changed, 315 insertions, 315 deletions
diff --git a/html/linux/tile/box.mu.html b/html/linux/tile/box.mu.html
index b70352c6..d86f639d 100644
--- a/html/linux/tile/box.mu.html
+++ b/html/linux/tile/box.mu.html
@@ -15,14 +15,14 @@ body { font-size:12pt; font-family: monospace; color: #000000; background-color:
 a { color:inherit; }
 * { font-size:12pt; font-size: 1em; }
 .PreProc { color: #c000c0; }
-.muRegEcx { color: #870000; }
 .LineNr { }
 .muRegEsi { color: #005faf; }
+.muComment { color: #005faf; }
 .Constant { color: #008787; }
-.muFunction { color: #af5f00; text-decoration: underline; }
+.muRegEcx { color: #870000; }
 .Delimiter { color: #c000c0; }
+.muFunction { color: #af5f00; text-decoration: underline; }
 .Special { color: #ff6060; }
-.muComment { color: #005faf; }
 -->
 </style>
 
@@ -138,7 +138,7 @@ if ('onhashchange' in window) {
 <span id="L78" class="LineNr"> 78 </span>    <span class="Delimiter">{</span>
 <span id="L79" class="LineNr"> 79 </span>      compare j, col2
 <span id="L80" class="LineNr"> 80 </span>      <span class="PreProc">break-if-&gt;</span>
-<span id="L81" class="LineNr"> 81 </span>      <a href='../405screen.mu.html#L214'>print-grapheme</a> <a href='../405screen.mu.html#L9'>screen</a> <span class="Constant">0x20</span>/space
+<span id="L81" class="LineNr"> 81 </span>      <a href='../405screen.mu.html#L214'>print-code-point-utf8</a> <a href='../405screen.mu.html#L9'>screen</a> <span class="Constant">0x20</span>/space
 <span id="L82" class="LineNr"> 82 </span>      j <span class="Special">&lt;-</span> increment
 <span id="L83" class="LineNr"> 83 </span>      <span class="PreProc">loop</span>
 <span id="L84" class="LineNr"> 84 </span>    <span class="Delimiter">}</span>
@@ -158,7 +158,7 @@ if ('onhashchange' in window) {
 <span id="L98" class="LineNr"> 98 </span>    <span class="Delimiter">{</span>
 <span id="L99" class="LineNr"> 99 </span>      compare j, h
 <span id="L100" class="LineNr">100 </span>      <span class="PreProc">break-if-&gt;=</span>
-<span id="L101" class="LineNr">101 </span>      <a href='../405screen.mu.html#L214'>print-grapheme</a> <a href='../405screen.mu.html#L9'>screen</a> <span class="Constant">0x20</span>/space
+<span id="L101" class="LineNr">101 </span>      <a href='../405screen.mu.html#L214'>print-code-point-utf8</a> <a href='../405screen.mu.html#L9'>screen</a> <span class="Constant">0x20</span>/space
 <span id="L102" class="LineNr">102 </span>      j <span class="Special">&lt;-</span> increment
 <span id="L103" class="LineNr">103 </span>      <span class="PreProc">loop</span>
 <span id="L104" class="LineNr">104 </span>    <span class="Delimiter">}</span>
diff --git a/html/linux/tile/data.mu.html b/html/linux/tile/data.mu.html
index b69e828e..625b78e7 100644
--- a/html/linux/tile/data.mu.html
+++ b/html/linux/tile/data.mu.html
@@ -15,17 +15,17 @@ body { font-size:12pt; font-family: monospace; color: #000000; background-color:
 a { color:inherit; }
 * { font-size:12pt; font-size: 1em; }
 .PreProc { color: #c000c0; }
-.CommentedCode { color: #8a8a8a; }
-.muRegEcx { color: #870000; }
 .muRegEdx { color: #af5f00; }
 .LineNr { }
-.muRegEsi { color: #005faf; }
-.muRegEdi { color: #00af00; }
 .Constant { color: #008787; }
+.muRegEsi { color: #005faf; }
+.CommentedCode { color: #8a8a8a; }
 .muFunction { color: #af5f00; text-decoration: underline; }
+.muRegEdi { color: #00af00; }
+.muRegEcx { color: #870000; }
 .Delimiter { color: #c000c0; }
-.muComment { color: #005faf; }
 .Special { color: #ff6060; }
+.muComment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/linux/tile/environment.mu.html b/html/linux/tile/environment.mu.html
index 34efaaa2..ea0a2706 100644
--- a/html/linux/tile/environment.mu.html
+++ b/html/linux/tile/environment.mu.html
@@ -16,18 +16,18 @@ a { color:inherit; }
 * { font-size:12pt; font-size: 1em; }
 .LineNr { }
 .Delimiter { color: #c000c0; }
-.muRegEcx { color: #870000; }
-.muRegEdx { color: #af5f00; }
+.muFunction { color: #af5f00; text-decoration: underline; }
 .muRegEbx { color: #5f00ff; }
 .muRegEsi { color: #005faf; }
 .muRegEdi { color: #00af00; }
 .Constant { color: #008787; }
 .Special { color: #ff6060; }
 .PreProc { color: #c000c0; }
-.muFunction { color: #af5f00; text-decoration: underline; }
-.muComment { color: #005faf; }
 .muS2Comment { color: #8a8a8a; }
 .CommentedCode { color: #8a8a8a; }
+.muComment { color: #005faf; }
+.muRegEcx { color: #870000; }
+.muRegEdx { color: #af5f00; }
 -->
 </style>
 
@@ -135,7 +135,7 @@ if ('onhashchange' in window) {
 <span id="L70" class="LineNr">  70 </span><span class="muComment"># Iterate</span>
 <span id="L71" class="LineNr">  71 </span><span class="muComment">#############</span>
 <span id="L72" class="LineNr">  72 </span>
-<span id="L73" class="LineNr">  73 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='environment.mu.html#L73'>process</a></span> _self: (addr <a href='environment.mu.html#L16'>environment</a>), key: grapheme <span class="Delimiter">{</span>
+<span id="L73" class="LineNr">  73 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='environment.mu.html#L73'>process</a></span> _self: (addr <a href='environment.mu.html#L16'>environment</a>), key: code-point-utf8 <span class="Delimiter">{</span>
 <span id="L74" class="LineNr">  74 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='environment.mu.html#L16'>environment</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L75" class="LineNr">  75 </span>  <span class="PreProc">var</span> fn-name-ah/eax: (addr handle <a href='data.mu.html#L42'>word</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, partial-function-name
 <span id="L76" class="LineNr">  76 </span>  <span class="PreProc">var</span> fn-name/eax: (addr <a href='data.mu.html#L42'>word</a>) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *fn-name-ah
@@ -167,7 +167,7 @@ if ('onhashchange' in window) {
 <span id="L102" class="LineNr"> 102 </span><span class="Delimiter">}</span>
 <span id="L103" class="LineNr"> 103 </span>
 <span id="L104" class="LineNr"> 104 </span><span class="muComment"># collect new name in partial-function-name, and move the cursor to function with that name</span>
-<span id="L105" class="LineNr"> 105 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='environment.mu.html#L105'>process-goto-dialog</a></span> _self: (addr <a href='environment.mu.html#L16'>environment</a>), key: grapheme <span class="Delimiter">{</span>
+<span id="L105" class="LineNr"> 105 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='environment.mu.html#L105'>process-goto-dialog</a></span> _self: (addr <a href='environment.mu.html#L16'>environment</a>), key: code-point-utf8 <span class="Delimiter">{</span>
 <span id="L106" class="LineNr"> 106 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='environment.mu.html#L16'>environment</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L107" class="LineNr"> 107 </span>  <span class="PreProc">var</span> fn-name-ah/<span class="muRegEdi">edi</span>: (addr handle <a href='data.mu.html#L42'>word</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, partial-function-name
 <span id="L108" class="LineNr"> 108 </span>  <span class="muComment"># if 'esc' pressed, cancel goto</span>
@@ -195,7 +195,7 @@ if ('onhashchange' in window) {
 <span id="L130" class="LineNr"> 130 </span>  compare key, <span class="Constant">0x7f</span>/del  <span class="muComment"># backspace on Macs</span>
 <span id="L131" class="LineNr"> 131 </span>  $process-goto-dialog:backspace: <span class="Delimiter">{</span>
 <span id="L132" class="LineNr"> 132 </span>    <span class="PreProc">break-if-!=</span>
-<span id="L133" class="LineNr"> 133 </span>    <span class="muComment"># if not at start, delete grapheme before cursor</span>
+<span id="L133" class="LineNr"> 133 </span>    <span class="muComment"># if not at start, delete code-point-utf8 before cursor</span>
 <span id="L134" class="LineNr"> 134 </span>    <span class="PreProc">var</span> fn-name/eax: (addr <a href='data.mu.html#L42'>word</a>) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *fn-name-ah
 <span id="L135" class="LineNr"> 135 </span>    <span class="PreProc">var</span> at-start?/eax: boolean <span class="Special">&lt;-</span> <a href='word.mu.html#L155'>cursor-at-start?</a> fn-name
 <span id="L136" class="LineNr"> 136 </span>    compare at-start?, <span class="Constant">0</span>/false
@@ -207,24 +207,24 @@ if ('onhashchange' in window) {
 <span id="L142" class="LineNr"> 142 </span>    <span class="PreProc">return</span>
 <span id="L143" class="LineNr"> 143 </span>  <span class="Delimiter">}</span>
 <span id="L144" class="LineNr"> 144 </span>  <span class="muComment"># otherwise insert key within current word</span>
-<span id="L145" class="LineNr"> 145 </span>  <span class="PreProc">var</span> print?/eax: boolean <span class="Special">&lt;-</span> <a href='environment.mu.html#L2147'>real-grapheme?</a> key
-<span id="L146" class="LineNr"> 146 </span>  $process-goto-dialog:real-grapheme: <span class="Delimiter">{</span>
+<span id="L145" class="LineNr"> 145 </span>  <span class="PreProc">var</span> print?/eax: boolean <span class="Special">&lt;-</span> <a href='environment.mu.html#L2147'>real-code-point-utf8?</a> key
+<span id="L146" class="LineNr"> 146 </span>  $process-goto-dialog:real-code-point-utf8: <span class="Delimiter">{</span>
 <span id="L147" class="LineNr"> 147 </span>    compare print?, <span class="Constant">0</span>/false
 <span id="L148" class="LineNr"> 148 </span>    <span class="PreProc">break-if-=</span>
 <span id="L149" class="LineNr"> 149 </span>    <span class="PreProc">var</span> fn-name/eax: (addr <a href='data.mu.html#L42'>word</a>) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *fn-name-ah
-<span id="L150" class="LineNr"> 150 </span>    <a href='word.mu.html#L148'>add-grapheme-to-word</a> fn-name, key
+<span id="L150" class="LineNr"> 150 </span>    <a href='word.mu.html#L148'>add-code-point-utf8-to-word</a> fn-name, key
 <span id="L151" class="LineNr"> 151 </span>    <span class="PreProc">return</span>
 <span id="L152" class="LineNr"> 152 </span>  <span class="Delimiter">}</span>
 <span id="L153" class="LineNr"> 153 </span>  <span class="muComment"># silently ignore other hotkeys</span>
 <span id="L154" class="LineNr"> 154 </span><span class="Delimiter">}</span>
 <span id="L155" class="LineNr"> 155 </span>
-<span id="L156" class="LineNr"> 156 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='environment.mu.html#L156'>process-function</a></span> _self: (addr <a href='environment.mu.html#L16'>environment</a>), _function: (addr <a href='data.mu.html#L21'>function</a>), key: grapheme <span class="Delimiter">{</span>
+<span id="L156" class="LineNr"> 156 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='environment.mu.html#L156'>process-function</a></span> _self: (addr <a href='environment.mu.html#L16'>environment</a>), _function: (addr <a href='data.mu.html#L21'>function</a>), key: code-point-utf8 <span class="Delimiter">{</span>
 <span id="L157" class="LineNr"> 157 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='environment.mu.html#L16'>environment</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L158" class="LineNr"> 158 </span>  <span class="PreProc">var</span> <a href='data.mu.html#L21'>function</a>/<span class="muRegEdi">edi</span>: (addr <a href='data.mu.html#L21'>function</a>) <span class="Special">&lt;-</span> copy _function
 <span id="L159" class="LineNr"> 159 </span>  <a href='environment.mu.html#L162'>process-function-edit</a> self, <a href='data.mu.html#L21'>function</a>, key
 <span id="L160" class="LineNr"> 160 </span><span class="Delimiter">}</span>
 <span id="L161" class="LineNr"> 161 </span>
-<span id="L162" class="LineNr"> 162 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='environment.mu.html#L162'>process-function-edit</a></span> _self: (addr <a href='environment.mu.html#L16'>environment</a>), _function: (addr <a href='data.mu.html#L21'>function</a>), key: grapheme <span class="Delimiter">{</span>
+<span id="L162" class="LineNr"> 162 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='environment.mu.html#L162'>process-function-edit</a></span> _self: (addr <a href='environment.mu.html#L16'>environment</a>), _function: (addr <a href='data.mu.html#L21'>function</a>), key: code-point-utf8 <span class="Delimiter">{</span>
 <span id="L163" class="LineNr"> 163 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='environment.mu.html#L16'>environment</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L164" class="LineNr"> 164 </span>  <span class="PreProc">var</span> <a href='data.mu.html#L21'>function</a>/<span class="muRegEdi">edi</span>: (addr <a href='data.mu.html#L21'>function</a>) <span class="Special">&lt;-</span> copy _function
 <span id="L165" class="LineNr"> 165 </span>  <span class="PreProc">var</span> cursor-word-ah/<span class="muRegEbx">ebx</span>: (addr handle <a href='data.mu.html#L42'>word</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> <a href='data.mu.html#L21'>function</a>, cursor-word
@@ -355,7 +355,7 @@ if ('onhashchange' in window) {
 <span id="L290" class="LineNr"> 290 </span>  compare key, <span class="Constant">0x7f</span>/del  <span class="muComment"># backspace on Macs</span>
 <span id="L291" class="LineNr"> 291 </span>  $process-function-edit:backspace: <span class="Delimiter">{</span>
 <span id="L292" class="LineNr"> 292 </span>    <span class="PreProc">break-if-!=</span>
-<span id="L293" class="LineNr"> 293 </span>    <span class="muComment"># if not at start of some word, delete grapheme before cursor within current word</span>
+<span id="L293" class="LineNr"> 293 </span>    <span class="muComment"># if not at start of some word, delete code-point-utf8 before cursor within current word</span>
 <span id="L294" class="LineNr"> 294 </span>    <span class="PreProc">var</span> at-start?/eax: boolean <span class="Special">&lt;-</span> <a href='word.mu.html#L155'>cursor-at-start?</a> cursor-word
 <span id="L295" class="LineNr"> 295 </span>    compare at-start?, <span class="Constant">0</span>/false
 <span id="L296" class="LineNr"> 296 </span>    <span class="Delimiter">{</span>
@@ -390,25 +390,25 @@ if ('onhashchange' in window) {
 <span id="L325" class="LineNr"> 325 </span>      copy-object new-prev-word-ah, cursor-word-ah
 <span id="L326" class="LineNr"> 326 </span>      <span class="PreProc">return</span>
 <span id="L327" class="LineNr"> 327 </span>    <span class="Delimiter">}</span>
-<span id="L328" class="LineNr"> 328 </span>    <span class="muComment"># if start of word is quote and grapheme before cursor is not, just insert it as usual</span>
+<span id="L328" class="LineNr"> 328 </span>    <span class="muComment"># if start of word is quote and code-point-utf8 before cursor is not, just insert it as usual</span>
 <span id="L329" class="LineNr"> 329 </span>    <span class="muComment"># TODO: support string escaping</span>
 <span id="L330" class="LineNr"> 330 </span>    <span class="Delimiter">{</span>
-<span id="L331" class="LineNr"> 331 </span>      <span class="PreProc">var</span> <a href='word.mu.html#L132'>first-grapheme</a>/eax: grapheme <span class="Special">&lt;-</span> <a href='word.mu.html#L132'>first-grapheme</a> cursor-word
-<span id="L332" class="LineNr"> 332 </span>      compare <a href='word.mu.html#L132'>first-grapheme</a>, <span class="Constant">0x22</span>/double-quote
+<span id="L331" class="LineNr"> 331 </span>      <span class="PreProc">var</span> <a href='word.mu.html#L132'>first-code-point-utf8</a>/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='word.mu.html#L132'>first-code-point-utf8</a> cursor-word
+<span id="L332" class="LineNr"> 332 </span>      compare <a href='word.mu.html#L132'>first-code-point-utf8</a>, <span class="Constant">0x22</span>/double-quote
 <span id="L333" class="LineNr"> 333 </span>      <span class="PreProc">break-if-!=</span>
-<span id="L334" class="LineNr"> 334 </span>      <span class="PreProc">var</span> final-grapheme/eax: grapheme <span class="Special">&lt;-</span> <a href='word.mu.html#L140'>grapheme-before-cursor</a> cursor-word
-<span id="L335" class="LineNr"> 335 </span>      compare final-grapheme, <span class="Constant">0x22</span>/double-quote
+<span id="L334" class="LineNr"> 334 </span>      <span class="PreProc">var</span> final-code-point-utf8/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='word.mu.html#L140'>code-point-utf8-before-cursor</a> cursor-word
+<span id="L335" class="LineNr"> 335 </span>      compare final-code-point-utf8, <span class="Constant">0x22</span>/double-quote
 <span id="L336" class="LineNr"> 336 </span>      <span class="PreProc">break-if-=</span>
 <span id="L337" class="LineNr"> 337 </span>      <span class="PreProc">break</span> $process-function-edit:space
 <span id="L338" class="LineNr"> 338 </span>    <span class="Delimiter">}</span>
-<span id="L339" class="LineNr"> 339 </span>    <span class="muComment"># if start of word is '[' and grapheme before cursor is not ']', just insert it as usual</span>
+<span id="L339" class="LineNr"> 339 </span>    <span class="muComment"># if start of word is '[' and code-point-utf8 before cursor is not ']', just insert it as usual</span>
 <span id="L340" class="LineNr"> 340 </span>    <span class="muComment"># TODO: support nested arrays</span>
 <span id="L341" class="LineNr"> 341 </span>    <span class="Delimiter">{</span>
-<span id="L342" class="LineNr"> 342 </span>      <span class="PreProc">var</span> <a href='word.mu.html#L132'>first-grapheme</a>/eax: grapheme <span class="Special">&lt;-</span> <a href='word.mu.html#L132'>first-grapheme</a> cursor-word
-<span id="L343" class="LineNr"> 343 </span>      compare <a href='word.mu.html#L132'>first-grapheme</a>, <span class="Constant">0x5b</span>/[
+<span id="L342" class="LineNr"> 342 </span>      <span class="PreProc">var</span> <a href='word.mu.html#L132'>first-code-point-utf8</a>/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='word.mu.html#L132'>first-code-point-utf8</a> cursor-word
+<span id="L343" class="LineNr"> 343 </span>      compare <a href='word.mu.html#L132'>first-code-point-utf8</a>, <span class="Constant">0x5b</span>/[
 <span id="L344" class="LineNr"> 344 </span>      <span class="PreProc">break-if-!=</span>
-<span id="L345" class="LineNr"> 345 </span>      <span class="PreProc">var</span> final-grapheme/eax: grapheme <span class="Special">&lt;-</span> <a href='word.mu.html#L140'>grapheme-before-cursor</a> cursor-word
-<span id="L346" class="LineNr"> 346 </span>      compare final-grapheme, <span class="Constant">0x5d</span>/]
+<span id="L345" class="LineNr"> 345 </span>      <span class="PreProc">var</span> final-code-point-utf8/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='word.mu.html#L140'>code-point-utf8-before-cursor</a> cursor-word
+<span id="L346" class="LineNr"> 346 </span>      compare final-code-point-utf8, <span class="Constant">0x5d</span>/]
 <span id="L347" class="LineNr"> 347 </span>      <span class="PreProc">break-if-=</span>
 <span id="L348" class="LineNr"> 348 </span>      <span class="PreProc">break</span> $process-function-edit:space
 <span id="L349" class="LineNr"> 349 </span>    <span class="Delimiter">}</span>
@@ -433,26 +433,26 @@ if ('onhashchange' in window) {
 <span id="L368" class="LineNr"> 368 </span>      <span class="PreProc">var</span> at-end?/eax: boolean <span class="Special">&lt;-</span> <a href='word.mu.html#L163'>cursor-at-end?</a> cursor-word
 <span id="L369" class="LineNr"> 369 </span>      compare at-end?, <span class="Constant">0</span>/false
 <span id="L370" class="LineNr"> 370 </span>      <span class="PreProc">break-if-!=</span>
-<span id="L371" class="LineNr"> 371 </span>      <span class="PreProc">var</span> g/eax: grapheme <span class="Special">&lt;-</span> <a href='word.mu.html#L214'>pop-after-cursor</a> cursor-word
-<span id="L372" class="LineNr"> 372 </span>      <a href='word.mu.html#L148'>add-grapheme-to-word</a> <a href='../127next-word.subx.html#L11'>next-word</a>, g
+<span id="L371" class="LineNr"> 371 </span>      <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='word.mu.html#L214'>pop-after-cursor</a> cursor-word
+<span id="L372" class="LineNr"> 372 </span>      <a href='word.mu.html#L148'>add-code-point-utf8-to-word</a> <a href='../127next-word.subx.html#L11'>next-word</a>, g
 <span id="L373" class="LineNr"> 373 </span>      <span class="PreProc">loop</span>
 <span id="L374" class="LineNr"> 374 </span>    <span class="Delimiter">}</span>
 <span id="L375" class="LineNr"> 375 </span>    <a href='word.mu.html#L185'>cursor-to-start</a> <a href='../127next-word.subx.html#L11'>next-word</a>
 <span id="L376" class="LineNr"> 376 </span>    <span class="PreProc">return</span>
 <span id="L377" class="LineNr"> 377 </span>  <span class="Delimiter">}</span>
 <span id="L378" class="LineNr"> 378 </span>  <span class="muComment"># otherwise insert key within current word</span>
-<span id="L379" class="LineNr"> 379 </span>  <span class="PreProc">var</span> g/<span class="muRegEdx">edx</span>: grapheme <span class="Special">&lt;-</span> copy key
-<span id="L380" class="LineNr"> 380 </span>  <span class="PreProc">var</span> print?/eax: boolean <span class="Special">&lt;-</span> <a href='environment.mu.html#L2147'>real-grapheme?</a> key
-<span id="L381" class="LineNr"> 381 </span>  $process-function-edit:real-grapheme: <span class="Delimiter">{</span>
+<span id="L379" class="LineNr"> 379 </span>  <span class="PreProc">var</span> g/<span class="muRegEdx">edx</span>: code-point-utf8 <span class="Special">&lt;-</span> copy key
+<span id="L380" class="LineNr"> 380 </span>  <span class="PreProc">var</span> print?/eax: boolean <span class="Special">&lt;-</span> <a href='environment.mu.html#L2147'>real-code-point-utf8?</a> key
+<span id="L381" class="LineNr"> 381 </span>  $process-function-edit:real-code-point-utf8: <span class="Delimiter">{</span>
 <span id="L382" class="LineNr"> 382 </span>    compare print?, <span class="Constant">0</span>/false
 <span id="L383" class="LineNr"> 383 </span>    <span class="PreProc">break-if-=</span>
-<span id="L384" class="LineNr"> 384 </span>    <a href='word.mu.html#L148'>add-grapheme-to-word</a> cursor-word, g
+<span id="L384" class="LineNr"> 384 </span>    <a href='word.mu.html#L148'>add-code-point-utf8-to-word</a> cursor-word, g
 <span id="L385" class="LineNr"> 385 </span>    <span class="PreProc">return</span>
 <span id="L386" class="LineNr"> 386 </span>  <span class="Delimiter">}</span>
 <span id="L387" class="LineNr"> 387 </span>  <span class="muComment"># silently ignore other hotkeys</span>
 <span id="L388" class="LineNr"> 388 </span><span class="Delimiter">}</span>
 <span id="L389" class="LineNr"> 389 </span>
-<span id="L390" class="LineNr"> 390 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='environment.mu.html#L390'>process-sandbox</a></span> _self: (addr <a href='environment.mu.html#L16'>environment</a>), _sandbox: (addr <a href='data.mu.html#L5'>sandbox</a>), key: grapheme <span class="Delimiter">{</span>
+<span id="L390" class="LineNr"> 390 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='environment.mu.html#L390'>process-sandbox</a></span> _self: (addr <a href='environment.mu.html#L16'>environment</a>), _sandbox: (addr <a href='data.mu.html#L5'>sandbox</a>), key: code-point-utf8 <span class="Delimiter">{</span>
 <span id="L391" class="LineNr"> 391 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='environment.mu.html#L16'>environment</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L392" class="LineNr"> 392 </span>  <span class="PreProc">var</span> <a href='data.mu.html#L5'>sandbox</a>/<span class="muRegEdi">edi</span>: (addr <a href='data.mu.html#L5'>sandbox</a>) <span class="Special">&lt;-</span> copy _sandbox
 <span id="L393" class="LineNr"> 393 </span>  <span class="PreProc">var</span> rename-word-mode-ah?/<span class="muRegEcx">ecx</span>: (addr handle <a href='data.mu.html#L42'>word</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> <a href='data.mu.html#L5'>sandbox</a>, partial-name-for-cursor-word
@@ -478,7 +478,7 @@ if ('onhashchange' in window) {
 <span id="L413" class="LineNr"> 413 </span>  <a href='environment.mu.html#L416'>process-sandbox-edit</a> self, <a href='data.mu.html#L5'>sandbox</a>, key
 <span id="L414" class="LineNr"> 414 </span><span class="Delimiter">}</span>
 <span id="L415" class="LineNr"> 415 </span>
-<span id="L416" class="LineNr"> 416 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='environment.mu.html#L416'>process-sandbox-edit</a></span> _self: (addr <a href='environment.mu.html#L16'>environment</a>), _sandbox: (addr <a href='data.mu.html#L5'>sandbox</a>), key: grapheme <span class="Delimiter">{</span>
+<span id="L416" class="LineNr"> 416 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='environment.mu.html#L416'>process-sandbox-edit</a></span> _self: (addr <a href='environment.mu.html#L16'>environment</a>), _sandbox: (addr <a href='data.mu.html#L5'>sandbox</a>), key: code-point-utf8 <span class="Delimiter">{</span>
 <span id="L417" class="LineNr"> 417 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='environment.mu.html#L16'>environment</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L418" class="LineNr"> 418 </span>  <span class="PreProc">var</span> <a href='data.mu.html#L5'>sandbox</a>/<span class="muRegEdi">edi</span>: (addr <a href='data.mu.html#L5'>sandbox</a>) <span class="Special">&lt;-</span> copy _sandbox
 <span id="L419" class="LineNr"> 419 </span>  <span class="PreProc">var</span> cursor-call-path-ah/eax: (addr handle <a href='data.mu.html#L77'>call-path-element</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> <a href='data.mu.html#L5'>sandbox</a>, cursor-call-path
@@ -795,7 +795,7 @@ if ('onhashchange' in window) {
 <span id="L730" class="LineNr"> 730 </span>  compare key, <span class="Constant">0x7f</span>/del  <span class="muComment"># backspace on Macs</span>
 <span id="L731" class="LineNr"> 731 </span>  $process-sandbox-edit:backspace: <span class="Delimiter">{</span>
 <span id="L732" class="LineNr"> 732 </span>    <span class="PreProc">break-if-!=</span>
-<span id="L733" class="LineNr"> 733 </span>    <span class="muComment"># if not at start of some word, delete grapheme before cursor within current word</span>
+<span id="L733" class="LineNr"> 733 </span>    <span class="muComment"># if not at start of some word, delete code-point-utf8 before cursor within current word</span>
 <span id="L734" class="LineNr"> 734 </span>    <span class="PreProc">var</span> at-start?/eax: boolean <span class="Special">&lt;-</span> <a href='word.mu.html#L155'>cursor-at-start?</a> cursor-word
 <span id="L735" class="LineNr"> 735 </span>    compare at-start?, <span class="Constant">0</span>/false
 <span id="L736" class="LineNr"> 736 </span>    <span class="Delimiter">{</span>
@@ -831,25 +831,25 @@ if ('onhashchange' in window) {
 <span id="L766" class="LineNr"> 766 </span>      <a href='data.mu.html#L465'>decrement-final-element</a> cursor-call-path
 <span id="L767" class="LineNr"> 767 </span>      <span class="PreProc">return</span>
 <span id="L768" class="LineNr"> 768 </span>    <span class="Delimiter">}</span>
-<span id="L769" class="LineNr"> 769 </span>    <span class="muComment"># if start of word is quote and grapheme before cursor is not, just insert it as usual</span>
+<span id="L769" class="LineNr"> 769 </span>    <span class="muComment"># if start of word is quote and code-point-utf8 before cursor is not, just insert it as usual</span>
 <span id="L770" class="LineNr"> 770 </span>    <span class="muComment"># TODO: support string escaping</span>
 <span id="L771" class="LineNr"> 771 </span>    <span class="Delimiter">{</span>
-<span id="L772" class="LineNr"> 772 </span>      <span class="PreProc">var</span> <a href='word.mu.html#L132'>first-grapheme</a>/eax: grapheme <span class="Special">&lt;-</span> <a href='word.mu.html#L132'>first-grapheme</a> cursor-word
-<span id="L773" class="LineNr"> 773 </span>      compare <a href='word.mu.html#L132'>first-grapheme</a>, <span class="Constant">0x22</span>/double-quote
+<span id="L772" class="LineNr"> 772 </span>      <span class="PreProc">var</span> <a href='word.mu.html#L132'>first-code-point-utf8</a>/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='word.mu.html#L132'>first-code-point-utf8</a> cursor-word
+<span id="L773" class="LineNr"> 773 </span>      compare <a href='word.mu.html#L132'>first-code-point-utf8</a>, <span class="Constant">0x22</span>/double-quote
 <span id="L774" class="LineNr"> 774 </span>      <span class="PreProc">break-if-!=</span>
-<span id="L775" class="LineNr"> 775 </span>      <span class="PreProc">var</span> final-grapheme/eax: grapheme <span class="Special">&lt;-</span> <a href='word.mu.html#L140'>grapheme-before-cursor</a> cursor-word
-<span id="L776" class="LineNr"> 776 </span>      compare final-grapheme, <span class="Constant">0x22</span>/double-quote
+<span id="L775" class="LineNr"> 775 </span>      <span class="PreProc">var</span> final-code-point-utf8/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='word.mu.html#L140'>code-point-utf8-before-cursor</a> cursor-word
+<span id="L776" class="LineNr"> 776 </span>      compare final-code-point-utf8, <span class="Constant">0x22</span>/double-quote
 <span id="L777" class="LineNr"> 777 </span>      <span class="PreProc">break-if-=</span>
 <span id="L778" class="LineNr"> 778 </span>      <span class="PreProc">break</span> $process-sandbox-edit:space
 <span id="L779" class="LineNr"> 779 </span>    <span class="Delimiter">}</span>
-<span id="L780" class="LineNr"> 780 </span>    <span class="muComment"># if start of word is '[' and grapheme before cursor is not ']', just insert it as usual</span>
+<span id="L780" class="LineNr"> 780 </span>    <span class="muComment"># if start of word is '[' and code-point-utf8 before cursor is not ']', just insert it as usual</span>
 <span id="L781" class="LineNr"> 781 </span>    <span class="muComment"># TODO: support nested arrays</span>
 <span id="L782" class="LineNr"> 782 </span>    <span class="Delimiter">{</span>
-<span id="L783" class="LineNr"> 783 </span>      <span class="PreProc">var</span> <a href='word.mu.html#L132'>first-grapheme</a>/eax: grapheme <span class="Special">&lt;-</span> <a href='word.mu.html#L132'>first-grapheme</a> cursor-word
-<span id="L784" class="LineNr"> 784 </span>      compare <a href='word.mu.html#L132'>first-grapheme</a>, <span class="Constant">0x5b</span>/[
+<span id="L783" class="LineNr"> 783 </span>      <span class="PreProc">var</span> <a href='word.mu.html#L132'>first-code-point-utf8</a>/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='word.mu.html#L132'>first-code-point-utf8</a> cursor-word
+<span id="L784" class="LineNr"> 784 </span>      compare <a href='word.mu.html#L132'>first-code-point-utf8</a>, <span class="Constant">0x5b</span>/[
 <span id="L785" class="LineNr"> 785 </span>      <span class="PreProc">break-if-!=</span>
-<span id="L786" class="LineNr"> 786 </span>      <span class="PreProc">var</span> final-grapheme/eax: grapheme <span class="Special">&lt;-</span> <a href='word.mu.html#L140'>grapheme-before-cursor</a> cursor-word
-<span id="L787" class="LineNr"> 787 </span>      compare final-grapheme, <span class="Constant">0x5d</span>/]
+<span id="L786" class="LineNr"> 786 </span>      <span class="PreProc">var</span> final-code-point-utf8/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='word.mu.html#L140'>code-point-utf8-before-cursor</a> cursor-word
+<span id="L787" class="LineNr"> 787 </span>      compare final-code-point-utf8, <span class="Constant">0x5d</span>/]
 <span id="L788" class="LineNr"> 788 </span>      <span class="PreProc">break-if-=</span>
 <span id="L789" class="LineNr"> 789 </span>      <span class="PreProc">break</span> $process-sandbox-edit:space
 <span id="L790" class="LineNr"> 790 </span>    <span class="Delimiter">}</span>
@@ -874,8 +874,8 @@ if ('onhashchange' in window) {
 <span id="L809" class="LineNr"> 809 </span>      <span class="PreProc">var</span> at-end?/eax: boolean <span class="Special">&lt;-</span> <a href='word.mu.html#L163'>cursor-at-end?</a> cursor-word
 <span id="L810" class="LineNr"> 810 </span>      compare at-end?, <span class="Constant">0</span>/false
 <span id="L811" class="LineNr"> 811 </span>      <span class="PreProc">break-if-!=</span>
-<span id="L812" class="LineNr"> 812 </span>      <span class="PreProc">var</span> g/eax: grapheme <span class="Special">&lt;-</span> <a href='word.mu.html#L214'>pop-after-cursor</a> cursor-word
-<span id="L813" class="LineNr"> 813 </span>      <a href='word.mu.html#L148'>add-grapheme-to-word</a> <a href='../127next-word.subx.html#L11'>next-word</a>, g
+<span id="L812" class="LineNr"> 812 </span>      <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='word.mu.html#L214'>pop-after-cursor</a> cursor-word
+<span id="L813" class="LineNr"> 813 </span>      <a href='word.mu.html#L148'>add-code-point-utf8-to-word</a> <a href='../127next-word.subx.html#L11'>next-word</a>, g
 <span id="L814" class="LineNr"> 814 </span>      <span class="PreProc">loop</span>
 <span id="L815" class="LineNr"> 815 </span>    <span class="Delimiter">}</span>
 <span id="L816" class="LineNr"> 816 </span>    <a href='word.mu.html#L185'>cursor-to-start</a> <a href='../127next-word.subx.html#L11'>next-word</a>
@@ -903,12 +903,12 @@ if ('onhashchange' in window) {
 <span id="L838" class="LineNr"> 838 </span>    <span class="PreProc">return</span>
 <span id="L839" class="LineNr"> 839 </span>  <span class="Delimiter">}</span>
 <span id="L840" class="LineNr"> 840 </span>  <span class="muComment"># otherwise insert key within current word</span>
-<span id="L841" class="LineNr"> 841 </span>  <span class="PreProc">var</span> g/<span class="muRegEdx">edx</span>: grapheme <span class="Special">&lt;-</span> copy key
-<span id="L842" class="LineNr"> 842 </span>  <span class="PreProc">var</span> print?/eax: boolean <span class="Special">&lt;-</span> <a href='environment.mu.html#L2147'>real-grapheme?</a> key
-<span id="L843" class="LineNr"> 843 </span>  $process-sandbox-edit:real-grapheme: <span class="Delimiter">{</span>
+<span id="L841" class="LineNr"> 841 </span>  <span class="PreProc">var</span> g/<span class="muRegEdx">edx</span>: code-point-utf8 <span class="Special">&lt;-</span> copy key
+<span id="L842" class="LineNr"> 842 </span>  <span class="PreProc">var</span> print?/eax: boolean <span class="Special">&lt;-</span> <a href='environment.mu.html#L2147'>real-code-point-utf8?</a> key
+<span id="L843" class="LineNr"> 843 </span>  $process-sandbox-edit:real-code-point-utf8: <span class="Delimiter">{</span>
 <span id="L844" class="LineNr"> 844 </span>    compare print?, <span class="Constant">0</span>/false
 <span id="L845" class="LineNr"> 845 </span>    <span class="PreProc">break-if-=</span>
-<span id="L846" class="LineNr"> 846 </span>    <a href='word.mu.html#L148'>add-grapheme-to-word</a> cursor-word, g
+<span id="L846" class="LineNr"> 846 </span>    <a href='word.mu.html#L148'>add-code-point-utf8-to-word</a> cursor-word, g
 <span id="L847" class="LineNr"> 847 </span>    <span class="PreProc">return</span>
 <span id="L848" class="LineNr"> 848 </span>  <span class="Delimiter">}</span>
 <span id="L849" class="LineNr"> 849 </span>  <span class="muComment"># silently ignore other hotkeys</span>
@@ -917,7 +917,7 @@ if ('onhashchange' in window) {
 <span id="L852" class="LineNr"> 852 </span><span class="muComment"># collect new name in partial-name-for-cursor-word, and then rename the word</span>
 <span id="L853" class="LineNr"> 853 </span><span class="muComment"># at cursor to it</span>
 <span id="L854" class="LineNr"> 854 </span><span class="muComment"># Precondition: cursor-call-path is a singleton (not within a call)</span>
-<span id="L855" class="LineNr"> 855 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='environment.mu.html#L855'>process-sandbox-rename</a></span> _sandbox: (addr <a href='data.mu.html#L5'>sandbox</a>), key: grapheme <span class="Delimiter">{</span>
+<span id="L855" class="LineNr"> 855 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='environment.mu.html#L855'>process-sandbox-rename</a></span> _sandbox: (addr <a href='data.mu.html#L5'>sandbox</a>), key: code-point-utf8 <span class="Delimiter">{</span>
 <span id="L856" class="LineNr"> 856 </span>  <span class="PreProc">var</span> <a href='data.mu.html#L5'>sandbox</a>/<span class="muRegEsi">esi</span>: (addr <a href='data.mu.html#L5'>sandbox</a>) <span class="Special">&lt;-</span> copy _sandbox
 <span id="L857" class="LineNr"> 857 </span>  <span class="PreProc">var</span> new-name-ah/<span class="muRegEdi">edi</span>: (addr handle <a href='data.mu.html#L42'>word</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> <a href='data.mu.html#L5'>sandbox</a>, partial-name-for-cursor-word
 <span id="L858" class="LineNr"> 858 </span>  <span class="muComment"># if 'esc' pressed, cancel rename</span>
@@ -976,7 +976,7 @@ if ('onhashchange' in window) {
 <span id="L911" class="LineNr"> 911 </span>    <span class="Delimiter">{</span>
 <span id="L912" class="LineNr"> 912 </span>      <span class="PreProc">var</span> new-name/eax: (addr <a href='data.mu.html#L42'>word</a>) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *new-name-ah
 <span id="L913" class="LineNr"> 913 </span>      <a href='word.mu.html#L185'>cursor-to-start</a> new-name
-<span id="L914" class="LineNr"> 914 </span>      <a href='word.mu.html#L148'>add-grapheme-to-word</a> new-name, <span class="Constant">0x3d</span>/=
+<span id="L914" class="LineNr"> 914 </span>      <a href='word.mu.html#L148'>add-code-point-utf8-to-word</a> new-name, <span class="Constant">0x3d</span>/=
 <span id="L915" class="LineNr"> 915 </span>    <span class="Delimiter">}</span>
 <span id="L916" class="LineNr"> 916 </span>    <span class="muComment"># append name to new line</span>
 <span id="L917" class="LineNr"> 917 </span>    <a href='word.mu.html#L459'>chain-words</a> new-line-word-ah, new-name-ah
@@ -1006,7 +1006,7 @@ if ('onhashchange' in window) {
 <span id="L941" class="LineNr"> 941 </span>  compare key, <span class="Constant">0x7f</span>/del  <span class="muComment"># backspace on Macs</span>
 <span id="L942" class="LineNr"> 942 </span>  $process-sandbox-rename:backspace: <span class="Delimiter">{</span>
 <span id="L943" class="LineNr"> 943 </span>    <span class="PreProc">break-if-!=</span>
-<span id="L944" class="LineNr"> 944 </span>    <span class="muComment"># if not at start, delete grapheme before cursor</span>
+<span id="L944" class="LineNr"> 944 </span>    <span class="muComment"># if not at start, delete code-point-utf8 before cursor</span>
 <span id="L945" class="LineNr"> 945 </span>    <span class="PreProc">var</span> new-name/eax: (addr <a href='data.mu.html#L42'>word</a>) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *new-name-ah
 <span id="L946" class="LineNr"> 946 </span>    <span class="PreProc">var</span> at-start?/eax: boolean <span class="Special">&lt;-</span> <a href='word.mu.html#L155'>cursor-at-start?</a> new-name
 <span id="L947" class="LineNr"> 947 </span>    compare at-start?, <span class="Constant">0</span>/false
@@ -1018,12 +1018,12 @@ if ('onhashchange' in window) {
 <span id="L953" class="LineNr"> 953 </span>    <span class="PreProc">return</span>
 <span id="L954" class="LineNr"> 954 </span>  <span class="Delimiter">}</span>
 <span id="L955" class="LineNr"> 955 </span>  <span class="muComment"># otherwise insert key within current word</span>
-<span id="L956" class="LineNr"> 956 </span>  <span class="PreProc">var</span> print?/eax: boolean <span class="Special">&lt;-</span> <a href='environment.mu.html#L2147'>real-grapheme?</a> key
-<span id="L957" class="LineNr"> 957 </span>  $process-sandbox-rename:real-grapheme: <span class="Delimiter">{</span>
+<span id="L956" class="LineNr"> 956 </span>  <span class="PreProc">var</span> print?/eax: boolean <span class="Special">&lt;-</span> <a href='environment.mu.html#L2147'>real-code-point-utf8?</a> key
+<span id="L957" class="LineNr"> 957 </span>  $process-sandbox-rename:real-code-point-utf8: <span class="Delimiter">{</span>
 <span id="L958" class="LineNr"> 958 </span>    compare print?, <span class="Constant">0</span>/false
 <span id="L959" class="LineNr"> 959 </span>    <span class="PreProc">break-if-=</span>
 <span id="L960" class="LineNr"> 960 </span>    <span class="PreProc">var</span> new-name/eax: (addr <a href='data.mu.html#L42'>word</a>) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *new-name-ah
-<span id="L961" class="LineNr"> 961 </span>    <a href='word.mu.html#L148'>add-grapheme-to-word</a> new-name, key
+<span id="L961" class="LineNr"> 961 </span>    <a href='word.mu.html#L148'>add-code-point-utf8-to-word</a> new-name, key
 <span id="L962" class="LineNr"> 962 </span>    <span class="PreProc">return</span>
 <span id="L963" class="LineNr"> 963 </span>  <span class="Delimiter">}</span>
 <span id="L964" class="LineNr"> 964 </span>  <span class="muComment"># silently ignore other hotkeys</span>
@@ -1033,7 +1033,7 @@ if ('onhashchange' in window) {
 <span id="L968" class="LineNr"> 968 </span><span class="muComment"># of the sandbox to be a new function with that name. Replace the last line</span>
 <span id="L969" class="LineNr"> 969 </span><span class="muComment"># with a call to the appropriate function.</span>
 <span id="L970" class="LineNr"> 970 </span><span class="muComment"># Precondition: cursor-call-path is a singleton (not within a call)</span>
-<span id="L971" class="LineNr"> 971 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='environment.mu.html#L971'>process-sandbox-define</a></span> _sandbox: (addr <a href='data.mu.html#L5'>sandbox</a>), functions: (addr handle <a href='data.mu.html#L21'>function</a>), key: grapheme <span class="Delimiter">{</span>
+<span id="L971" class="LineNr"> 971 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='environment.mu.html#L971'>process-sandbox-define</a></span> _sandbox: (addr <a href='data.mu.html#L5'>sandbox</a>), functions: (addr handle <a href='data.mu.html#L21'>function</a>), key: code-point-utf8 <span class="Delimiter">{</span>
 <span id="L972" class="LineNr"> 972 </span>  <span class="PreProc">var</span> <a href='data.mu.html#L5'>sandbox</a>/<span class="muRegEsi">esi</span>: (addr <a href='data.mu.html#L5'>sandbox</a>) <span class="Special">&lt;-</span> copy _sandbox
 <span id="L973" class="LineNr"> 973 </span>  <span class="PreProc">var</span> new-name-ah/<span class="muRegEdi">edi</span>: (addr handle <a href='data.mu.html#L42'>word</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> <a href='data.mu.html#L5'>sandbox</a>, partial-name-for-function
 <span id="L974" class="LineNr"> 974 </span>  <span class="muComment"># if 'esc' pressed, cancel define</span>
@@ -1098,7 +1098,7 @@ if ('onhashchange' in window) {
 <span id="L1033" class="LineNr">1033 </span>  compare key, <span class="Constant">0x7f</span>/del  <span class="muComment"># backspace on Macs</span>
 <span id="L1034" class="LineNr">1034 </span>  $process-sandbox-define:backspace: <span class="Delimiter">{</span>
 <span id="L1035" class="LineNr">1035 </span>    <span class="PreProc">break-if-!=</span>
-<span id="L1036" class="LineNr">1036 </span>    <span class="muComment"># if not at start, delete grapheme before cursor</span>
+<span id="L1036" class="LineNr">1036 </span>    <span class="muComment"># if not at start, delete code-point-utf8 before cursor</span>
 <span id="L1037" class="LineNr">1037 </span>    <span class="PreProc">var</span> new-name/eax: (addr <a href='data.mu.html#L42'>word</a>) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *new-name-ah
 <span id="L1038" class="LineNr">1038 </span>    <span class="PreProc">var</span> at-start?/eax: boolean <span class="Special">&lt;-</span> <a href='word.mu.html#L155'>cursor-at-start?</a> new-name
 <span id="L1039" class="LineNr">1039 </span>    compare at-start?, <span class="Constant">0</span>/false
@@ -1110,12 +1110,12 @@ if ('onhashchange' in window) {
 <span id="L1045" class="LineNr">1045 </span>    <span class="PreProc">return</span>
 <span id="L1046" class="LineNr">1046 </span>  <span class="Delimiter">}</span>
 <span id="L1047" class="LineNr">1047 </span>  <span class="muComment"># otherwise insert key within current word</span>
-<span id="L1048" class="LineNr">1048 </span>  <span class="PreProc">var</span> print?/eax: boolean <span class="Special">&lt;-</span> <a href='environment.mu.html#L2147'>real-grapheme?</a> key
-<span id="L1049" class="LineNr">1049 </span>  $process-sandbox-define:real-grapheme: <span class="Delimiter">{</span>
+<span id="L1048" class="LineNr">1048 </span>  <span class="PreProc">var</span> print?/eax: boolean <span class="Special">&lt;-</span> <a href='environment.mu.html#L2147'>real-code-point-utf8?</a> key
+<span id="L1049" class="LineNr">1049 </span>  $process-sandbox-define:real-code-point-utf8: <span class="Delimiter">{</span>
 <span id="L1050" class="LineNr">1050 </span>    compare print?, <span class="Constant">0</span>/false
 <span id="L1051" class="LineNr">1051 </span>    <span class="PreProc">break-if-=</span>
 <span id="L1052" class="LineNr">1052 </span>    <span class="PreProc">var</span> new-name/eax: (addr <a href='data.mu.html#L42'>word</a>) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *new-name-ah
-<span id="L1053" class="LineNr">1053 </span>    <a href='word.mu.html#L148'>add-grapheme-to-word</a> new-name, key
+<span id="L1053" class="LineNr">1053 </span>    <a href='word.mu.html#L148'>add-code-point-utf8-to-word</a> new-name, key
 <span id="L1054" class="LineNr">1054 </span>    <span class="PreProc">return</span>
 <span id="L1055" class="LineNr">1055 </span>  <span class="Delimiter">}</span>
 <span id="L1056" class="LineNr">1056 </span>  <span class="muComment"># silently ignore other hotkeys</span>
@@ -2172,7 +2172,7 @@ if ('onhashchange' in window) {
 <span id="L2107" class="LineNr">2107 </span>  <a href='../405screen.mu.html#L523'>start-color</a> <a href='../405screen.mu.html#L9'>screen</a>, <span class="Constant">0</span>, <span class="Constant">0xf7</span>
 <span id="L2108" class="LineNr">2108 </span>  <a href='box.mu.html#L71'>clear-rect</a> <a href='../405screen.mu.html#L9'>screen</a>, row, col, new-row, col2
 <span id="L2109" class="LineNr">2109 </span>  col <span class="Special">&lt;-</span> add <span class="Constant">1</span>
-<span id="L2110" class="LineNr">2110 </span><span class="CommentedCode">#?   var dummy/eax: grapheme &lt;- read-key-from-real-keyboard</span>
+<span id="L2110" class="LineNr">2110 </span><span class="CommentedCode">#?   var dummy/eax: code-point-utf8 &lt;- read-key-from-real-keyboard</span>
 <span id="L2111" class="LineNr">2111 </span>  <a href='environment.mu.html#L2121'>render-function</a> <a href='../405screen.mu.html#L9'>screen</a>, row, col, f
 <span id="L2112" class="LineNr">2112 </span>  new-row <span class="Special">&lt;-</span> add <span class="Constant">1</span>/function-bottom-margin
 <span id="L2113" class="LineNr">2113 </span>  col <span class="Special">&lt;-</span> subtract <span class="Constant">1</span>/function-left-padding
@@ -2209,7 +2209,7 @@ if ('onhashchange' in window) {
 <span id="L2144" class="LineNr">2144 </span>  <a href='environment.mu.html#L1634'>render-line-without-stack</a> <a href='../405screen.mu.html#L9'>screen</a>, body, row, col, cursor-word, cursor-row, cursor-col
 <span id="L2145" class="LineNr">2145 </span><span class="Delimiter">}</span>
 <span id="L2146" class="LineNr">2146 </span>
-<span id="L2147" class="LineNr">2147 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='environment.mu.html#L2147'>real-grapheme?</a></span> g: grapheme<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
+<span id="L2147" class="LineNr">2147 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='environment.mu.html#L2147'>real-code-point-utf8?</a></span> g: code-point-utf8<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
 <span id="L2148" class="LineNr">2148 </span>  <span class="muComment"># if g == newline return true</span>
 <span id="L2149" class="LineNr">2149 </span>  compare g, <span class="Constant">0xa</span>
 <span id="L2150" class="LineNr">2150 </span>  <span class="Delimiter">{</span>
diff --git a/html/linux/tile/float-stack.mu.html b/html/linux/tile/float-stack.mu.html
index 39df3268..cefbb013 100644
--- a/html/linux/tile/float-stack.mu.html
+++ b/html/linux/tile/float-stack.mu.html
@@ -15,14 +15,14 @@ body { font-size:12pt; font-family: monospace; color: #000000; background-color:
 a { color:inherit; }
 * { font-size:12pt; font-size: 1em; }
 .PreProc { color: #c000c0; }
-.muRegEcx { color: #870000; }
 .muRegEdx { color: #af5f00; }
 .LineNr { }
+.Constant { color: #008787; }
 .muRegEsi { color: #005faf; }
 .muRegEdi { color: #00af00; }
-.Constant { color: #008787; }
-.muFunction { color: #af5f00; text-decoration: underline; }
+.muRegEcx { color: #870000; }
 .Delimiter { color: #c000c0; }
+.muFunction { color: #af5f00; text-decoration: underline; }
 .Special { color: #ff6060; }
 -->
 </style>
diff --git a/html/linux/tile/gap-buffer.mu.html b/html/linux/tile/gap-buffer.mu.html
index c45d7e78..8adacb5b 100644
--- a/html/linux/tile/gap-buffer.mu.html
+++ b/html/linux/tile/gap-buffer.mu.html
@@ -15,17 +15,17 @@ body { font-size:12pt; font-family: monospace; color: #000000; background-color:
 a { color:inherit; }
 * { font-size:12pt; font-size: 1em; }
 .PreProc { color: #c000c0; }
-.muRegEcx { color: #870000; }
 .muRegEdx { color: #af5f00; }
+.muRegEcx { color: #870000; }
 .LineNr { }
+.Constant { color: #008787; }
 .muRegEsi { color: #005faf; }
 .muRegEdi { color: #00af00; }
-.Constant { color: #008787; }
+.muComment { color: #005faf; }
+.Delimiter { color: #c000c0; }
 .muFunction { color: #af5f00; text-decoration: underline; }
 .muTest { color: #5f8700; }
-.Delimiter { color: #c000c0; }
 .Special { color: #ff6060; }
-.muComment { color: #005faf; }
 -->
 </style>
 
@@ -62,16 +62,16 @@ if ('onhashchange' in window) {
 <a href='https://github.com/akkartik/mu/blob/main/linux/tile/gap-buffer.mu'>https://github.com/akkartik/mu/blob/main/linux/tile/gap-buffer.mu</a>
 <pre id='vimCodeElement'>
 <span id="L1" class="LineNr">  1 </span><span class="PreProc">type</span> <a href='gap-buffer.mu.html#L1'>gap-buffer</a> <span class="Delimiter">{</span>
-<span id="L2" class="LineNr">  2 </span>  left: <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>
-<span id="L3" class="LineNr">  3 </span>  right: <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>
+<span id="L2" class="LineNr">  2 </span>  left: <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>
+<span id="L3" class="LineNr">  3 </span>  right: <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>
 <span id="L4" class="LineNr">  4 </span><span class="Delimiter">}</span>
 <span id="L5" class="LineNr">  5 </span>
 <span id="L6" class="LineNr">  6 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L6'>initialize-gap-buffer</a></span> _self: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Delimiter">{</span>
 <span id="L7" class="LineNr">  7 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L8" class="LineNr">  8 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
-<span id="L9" class="LineNr">  9 </span>  <a href='grapheme-stack.mu.html#L6'>initialize-grapheme-stack</a> left, <span class="Constant">0x10</span>/max-word-size
-<span id="L10" class="LineNr"> 10 </span>  <span class="PreProc">var</span> right/eax: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, right
-<span id="L11" class="LineNr"> 11 </span>  <a href='grapheme-stack.mu.html#L6'>initialize-grapheme-stack</a> right, <span class="Constant">0x10</span>/max-word-size
+<span id="L8" class="LineNr">  8 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
+<span id="L9" class="LineNr">  9 </span>  <a href='grapheme-stack.mu.html#L6'>initialize-code-point-utf8-stack</a> left, <span class="Constant">0x10</span>/max-word-size
+<span id="L10" class="LineNr"> 10 </span>  <span class="PreProc">var</span> right/eax: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, right
+<span id="L11" class="LineNr"> 11 </span>  <a href='grapheme-stack.mu.html#L6'>initialize-code-point-utf8-stack</a> right, <span class="Constant">0x10</span>/max-word-size
 <span id="L12" class="LineNr"> 12 </span><span class="Delimiter">}</span>
 <span id="L13" class="LineNr"> 13 </span>
 <span id="L14" class="LineNr"> 14 </span><span class="muComment"># just for tests</span>
@@ -84,8 +84,8 @@ if ('onhashchange' in window) {
 <span id="L21" class="LineNr"> 21 </span>    <span class="PreProc">var</span> done?/eax: boolean <span class="Special">&lt;-</span> <a href='../309stream.subx.html#L6'>stream-empty?</a> stream
 <span id="L22" class="LineNr"> 22 </span>    compare done?, <span class="Constant">0</span>/false
 <span id="L23" class="LineNr"> 23 </span>    <span class="PreProc">break-if-!=</span>
-<span id="L24" class="LineNr"> 24 </span>    <span class="PreProc">var</span> g/eax: grapheme <span class="Special">&lt;-</span> <a href='../403unicode.mu.html#L158'>read-grapheme</a> stream
-<span id="L25" class="LineNr"> 25 </span>    <a href='gap-buffer.mu.html#L103'>add-grapheme-at-gap</a> self, g
+<span id="L24" class="LineNr"> 24 </span>    <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='../403unicode.mu.html#L155'>read-code-point-utf8</a> stream
+<span id="L25" class="LineNr"> 25 </span>    <a href='gap-buffer.mu.html#L103'>add-code-point-utf8-at-gap</a> self, g
 <span id="L26" class="LineNr"> 26 </span>    <span class="PreProc">loop</span>
 <span id="L27" class="LineNr"> 27 </span>  <span class="Delimiter">}</span>
 <span id="L28" class="LineNr"> 28 </span><span class="Delimiter">}</span>
@@ -100,44 +100,44 @@ if ('onhashchange' in window) {
 <span id="L37" class="LineNr"> 37 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L37'>emit-gap-buffer</a></span> _self: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>), out: (addr stream byte) <span class="Delimiter">{</span>
 <span id="L38" class="LineNr"> 38 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L39" class="LineNr"> 39 </span>  <a href='../106stream.subx.html#L17'>clear-stream</a> out
-<span id="L40" class="LineNr"> 40 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
+<span id="L40" class="LineNr"> 40 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
 <span id="L41" class="LineNr"> 41 </span>  <a href='gap-buffer.mu.html#L47'>emit-stack-from-bottom</a> left, out
-<span id="L42" class="LineNr"> 42 </span>  <span class="PreProc">var</span> right/eax: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, right
+<span id="L42" class="LineNr"> 42 </span>  <span class="PreProc">var</span> right/eax: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, right
 <span id="L43" class="LineNr"> 43 </span>  <a href='gap-buffer.mu.html#L65'>emit-stack-from-top</a> right, out
 <span id="L44" class="LineNr"> 44 </span><span class="Delimiter">}</span>
 <span id="L45" class="LineNr"> 45 </span>
 <span id="L46" class="LineNr"> 46 </span><span class="muComment"># dump stack from bottom to top</span>
-<span id="L47" class="LineNr"> 47 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L47'>emit-stack-from-bottom</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>), out: (addr stream byte) <span class="Delimiter">{</span>
-<span id="L48" class="LineNr"> 48 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L49" class="LineNr"> 49 </span>  <span class="PreProc">var</span> data-ah/<span class="muRegEdi">edi</span>: (addr handle array grapheme) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, data
-<span id="L50" class="LineNr"> 50 </span>  <span class="PreProc">var</span> _data/eax: (addr array grapheme) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *data-ah
-<span id="L51" class="LineNr"> 51 </span>  <span class="PreProc">var</span> data/<span class="muRegEdi">edi</span>: (addr array grapheme) <span class="Special">&lt;-</span> copy _data
+<span id="L47" class="LineNr"> 47 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L47'>emit-stack-from-bottom</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>), out: (addr stream byte) <span class="Delimiter">{</span>
+<span id="L48" class="LineNr"> 48 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> copy _self
+<span id="L49" class="LineNr"> 49 </span>  <span class="PreProc">var</span> data-ah/<span class="muRegEdi">edi</span>: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, data
+<span id="L50" class="LineNr"> 50 </span>  <span class="PreProc">var</span> _data/eax: (addr array code-point-utf8) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *data-ah
+<span id="L51" class="LineNr"> 51 </span>  <span class="PreProc">var</span> data/<span class="muRegEdi">edi</span>: (addr array code-point-utf8) <span class="Special">&lt;-</span> copy _data
 <span id="L52" class="LineNr"> 52 </span>  <span class="PreProc">var</span> top-addr/<span class="muRegEcx">ecx</span>: (addr int) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, <a href='../203stack.subx.html#L338'>top</a>
 <span id="L53" class="LineNr"> 53 </span>  <span class="PreProc">var</span> i/eax: int <span class="Special">&lt;-</span> copy <span class="Constant">0</span>
 <span id="L54" class="LineNr"> 54 </span>  <span class="Delimiter">{</span>
 <span id="L55" class="LineNr"> 55 </span>    compare i, *top-addr
 <span id="L56" class="LineNr"> 56 </span>    <span class="PreProc">break-if-&gt;=</span>
-<span id="L57" class="LineNr"> 57 </span>    <span class="PreProc">var</span> g/<span class="muRegEdx">edx</span>: (addr grapheme) <span class="Special">&lt;-</span> index data, i
-<span id="L58" class="LineNr"> 58 </span>    <a href='../403unicode.mu.html#L372'>write-grapheme</a> out, *g
+<span id="L57" class="LineNr"> 57 </span>    <span class="PreProc">var</span> g/<span class="muRegEdx">edx</span>: (addr code-point-utf8) <span class="Special">&lt;-</span> index data, i
+<span id="L58" class="LineNr"> 58 </span>    <a href='../403unicode.mu.html#L369'>write-code-point-utf8</a> out, *g
 <span id="L59" class="LineNr"> 59 </span>    i <span class="Special">&lt;-</span> increment
 <span id="L60" class="LineNr"> 60 </span>    <span class="PreProc">loop</span>
 <span id="L61" class="LineNr"> 61 </span>  <span class="Delimiter">}</span>
 <span id="L62" class="LineNr"> 62 </span><span class="Delimiter">}</span>
 <span id="L63" class="LineNr"> 63 </span>
 <span id="L64" class="LineNr"> 64 </span><span class="muComment"># dump stack from top to bottom</span>
-<span id="L65" class="LineNr"> 65 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L65'>emit-stack-from-top</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>), out: (addr stream byte) <span class="Delimiter">{</span>
-<span id="L66" class="LineNr"> 66 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L67" class="LineNr"> 67 </span>  <span class="PreProc">var</span> data-ah/<span class="muRegEdi">edi</span>: (addr handle array grapheme) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, data
-<span id="L68" class="LineNr"> 68 </span>  <span class="PreProc">var</span> _data/eax: (addr array grapheme) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *data-ah
-<span id="L69" class="LineNr"> 69 </span>  <span class="PreProc">var</span> data/<span class="muRegEdi">edi</span>: (addr array grapheme) <span class="Special">&lt;-</span> copy _data
+<span id="L65" class="LineNr"> 65 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L65'>emit-stack-from-top</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>), out: (addr stream byte) <span class="Delimiter">{</span>
+<span id="L66" class="LineNr"> 66 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> copy _self
+<span id="L67" class="LineNr"> 67 </span>  <span class="PreProc">var</span> data-ah/<span class="muRegEdi">edi</span>: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, data
+<span id="L68" class="LineNr"> 68 </span>  <span class="PreProc">var</span> _data/eax: (addr array code-point-utf8) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *data-ah
+<span id="L69" class="LineNr"> 69 </span>  <span class="PreProc">var</span> data/<span class="muRegEdi">edi</span>: (addr array code-point-utf8) <span class="Special">&lt;-</span> copy _data
 <span id="L70" class="LineNr"> 70 </span>  <span class="PreProc">var</span> top-addr/<span class="muRegEcx">ecx</span>: (addr int) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, <a href='../203stack.subx.html#L338'>top</a>
 <span id="L71" class="LineNr"> 71 </span>  <span class="PreProc">var</span> i/eax: int <span class="Special">&lt;-</span> copy *top-addr
 <span id="L72" class="LineNr"> 72 </span>  i <span class="Special">&lt;-</span> decrement
 <span id="L73" class="LineNr"> 73 </span>  <span class="Delimiter">{</span>
 <span id="L74" class="LineNr"> 74 </span>    compare i, <span class="Constant">0</span>
 <span id="L75" class="LineNr"> 75 </span>    <span class="PreProc">break-if-&lt;</span>
-<span id="L76" class="LineNr"> 76 </span>    <span class="PreProc">var</span> g/<span class="muRegEdx">edx</span>: (addr grapheme) <span class="Special">&lt;-</span> index data, i
-<span id="L77" class="LineNr"> 77 </span>    <a href='../403unicode.mu.html#L372'>write-grapheme</a> out, *g
+<span id="L76" class="LineNr"> 76 </span>    <span class="PreProc">var</span> g/<span class="muRegEdx">edx</span>: (addr code-point-utf8) <span class="Special">&lt;-</span> index data, i
+<span id="L77" class="LineNr"> 77 </span>    <a href='../403unicode.mu.html#L369'>write-code-point-utf8</a> out, *g
 <span id="L78" class="LineNr"> 78 </span>    i <span class="Special">&lt;-</span> decrement
 <span id="L79" class="LineNr"> 79 </span>    <span class="PreProc">loop</span>
 <span id="L80" class="LineNr"> 80 </span>  <span class="Delimiter">}</span>
@@ -145,33 +145,33 @@ if ('onhashchange' in window) {
 <span id="L82" class="LineNr"> 82 </span>
 <span id="L83" class="LineNr"> 83 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L83'>render-gap-buffer</a></span> <a href='../405screen.mu.html#L9'>screen</a>: (addr <a href='../405screen.mu.html#L9'>screen</a>), _gap: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Delimiter">{</span>
 <span id="L84" class="LineNr"> 84 </span>  <span class="PreProc">var</span> gap/<span class="muRegEsi">esi</span>: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _gap
-<span id="L85" class="LineNr"> 85 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> gap, left
+<span id="L85" class="LineNr"> 85 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> gap, left
 <span id="L86" class="LineNr"> 86 </span>  <a href='grapheme-stack.mu.html#L78'>render-stack-from-bottom</a> left, <a href='../405screen.mu.html#L9'>screen</a>
-<span id="L87" class="LineNr"> 87 </span>  <span class="PreProc">var</span> right/eax: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> gap, right
+<span id="L87" class="LineNr"> 87 </span>  <span class="PreProc">var</span> right/eax: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> gap, right
 <span id="L88" class="LineNr"> 88 </span>  <a href='grapheme-stack.mu.html#L97'>render-stack-from-top</a> right, <a href='../405screen.mu.html#L9'>screen</a>
 <span id="L89" class="LineNr"> 89 </span><span class="Delimiter">}</span>
 <span id="L90" class="LineNr"> 90 </span>
 <span id="L91" class="LineNr"> 91 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L91'>gap-buffer-length</a></span> _gap: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: int <span class="Delimiter">{</span>
 <span id="L92" class="LineNr"> 92 </span>  <span class="PreProc">var</span> gap/<span class="muRegEsi">esi</span>: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _gap
-<span id="L93" class="LineNr"> 93 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> gap, left
+<span id="L93" class="LineNr"> 93 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> gap, left
 <span id="L94" class="LineNr"> 94 </span>  <span class="PreProc">var</span> tmp/eax: (addr int) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> left, <a href='../203stack.subx.html#L338'>top</a>
 <span id="L95" class="LineNr"> 95 </span>  <span class="PreProc">var</span> left-length/<span class="muRegEcx">ecx</span>: int <span class="Special">&lt;-</span> copy *tmp
-<span id="L96" class="LineNr"> 96 </span>  <span class="PreProc">var</span> right/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> gap, right
+<span id="L96" class="LineNr"> 96 </span>  <span class="PreProc">var</span> right/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> gap, right
 <span id="L97" class="LineNr"> 97 </span>  tmp <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> right, <a href='../203stack.subx.html#L338'>top</a>
 <span id="L98" class="LineNr"> 98 </span>  <span class="PreProc">var</span> <a href='data.mu.html#L82'>result</a>/eax: int <span class="Special">&lt;-</span> copy *tmp
 <span id="L99" class="LineNr"> 99 </span>  <a href='data.mu.html#L82'>result</a> <span class="Special">&lt;-</span> add left-length
 <span id="L100" class="LineNr">100 </span>  <span class="PreProc">return</span> <a href='data.mu.html#L82'>result</a>
 <span id="L101" class="LineNr">101 </span><span class="Delimiter">}</span>
 <span id="L102" class="LineNr">102 </span>
-<span id="L103" class="LineNr">103 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L103'>add-grapheme-at-gap</a></span> _self: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>), g: grapheme <span class="Delimiter">{</span>
+<span id="L103" class="LineNr">103 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L103'>add-code-point-utf8-at-gap</a></span> _self: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>), g: code-point-utf8 <span class="Delimiter">{</span>
 <span id="L104" class="LineNr">104 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L105" class="LineNr">105 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
-<span id="L106" class="LineNr">106 </span>  <a href='grapheme-stack.mu.html#L31'>push-grapheme-stack</a> left, g
+<span id="L105" class="LineNr">105 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
+<span id="L106" class="LineNr">106 </span>  <a href='grapheme-stack.mu.html#L31'>push-code-point-utf8-stack</a> left, g
 <span id="L107" class="LineNr">107 </span><span class="Delimiter">}</span>
 <span id="L108" class="LineNr">108 </span>
 <span id="L109" class="LineNr">109 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L109'>gap-to-start</a></span> self: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Delimiter">{</span>
 <span id="L110" class="LineNr">110 </span>  <span class="Delimiter">{</span>
-<span id="L111" class="LineNr">111 </span>    <span class="PreProc">var</span> curr/eax: grapheme <span class="Special">&lt;-</span> <a href='gap-buffer.mu.html#L153'>gap-left</a> self
+<span id="L111" class="LineNr">111 </span>    <span class="PreProc">var</span> curr/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='gap-buffer.mu.html#L153'>gap-left</a> self
 <span id="L112" class="LineNr">112 </span>    compare curr, <span class="Constant">-1</span>
 <span id="L113" class="LineNr">113 </span>    <span class="PreProc">loop-if-!=</span>
 <span id="L114" class="LineNr">114 </span>  <span class="Delimiter">}</span>
@@ -179,7 +179,7 @@ if ('onhashchange' in window) {
 <span id="L116" class="LineNr">116 </span>
 <span id="L117" class="LineNr">117 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L117'>gap-to-end</a></span> self: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Delimiter">{</span>
 <span id="L118" class="LineNr">118 </span>  <span class="Delimiter">{</span>
-<span id="L119" class="LineNr">119 </span>    <span class="PreProc">var</span> curr/eax: grapheme <span class="Special">&lt;-</span> <a href='gap-buffer.mu.html#L139'>gap-right</a> self
+<span id="L119" class="LineNr">119 </span>    <span class="PreProc">var</span> curr/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='gap-buffer.mu.html#L139'>gap-right</a> self
 <span id="L120" class="LineNr">120 </span>    compare curr, <span class="Constant">-1</span>
 <span id="L121" class="LineNr">121 </span>    <span class="PreProc">loop-if-!=</span>
 <span id="L122" class="LineNr">122 </span>  <span class="Delimiter">}</span>
@@ -187,96 +187,96 @@ if ('onhashchange' in window) {
 <span id="L124" class="LineNr">124 </span>
 <span id="L125" class="LineNr">125 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L125'>gap-at-start?</a></span> _self: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
 <span id="L126" class="LineNr">126 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L127" class="LineNr">127 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
-<span id="L128" class="LineNr">128 </span>  <span class="PreProc">var</span> <a href='data.mu.html#L82'>result</a>/eax: boolean <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L20'>grapheme-stack-empty?</a> left
+<span id="L127" class="LineNr">127 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
+<span id="L128" class="LineNr">128 </span>  <span class="PreProc">var</span> <a href='data.mu.html#L82'>result</a>/eax: boolean <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L20'>code-point-utf8-stack-empty?</a> left
 <span id="L129" class="LineNr">129 </span>  <span class="PreProc">return</span> <a href='data.mu.html#L82'>result</a>
 <span id="L130" class="LineNr">130 </span><span class="Delimiter">}</span>
 <span id="L131" class="LineNr">131 </span>
 <span id="L132" class="LineNr">132 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L132'>gap-at-end?</a></span> _self: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
 <span id="L133" class="LineNr">133 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L134" class="LineNr">134 </span>  <span class="PreProc">var</span> right/eax: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, right
-<span id="L135" class="LineNr">135 </span>  <span class="PreProc">var</span> <a href='data.mu.html#L82'>result</a>/eax: boolean <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L20'>grapheme-stack-empty?</a> right
+<span id="L134" class="LineNr">134 </span>  <span class="PreProc">var</span> right/eax: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, right
+<span id="L135" class="LineNr">135 </span>  <span class="PreProc">var</span> <a href='data.mu.html#L82'>result</a>/eax: boolean <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L20'>code-point-utf8-stack-empty?</a> right
 <span id="L136" class="LineNr">136 </span>  <span class="PreProc">return</span> <a href='data.mu.html#L82'>result</a>
 <span id="L137" class="LineNr">137 </span><span class="Delimiter">}</span>
 <span id="L138" class="LineNr">138 </span>
-<span id="L139" class="LineNr">139 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L139'>gap-right</a></span> _self: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: grapheme <span class="Delimiter">{</span>
+<span id="L139" class="LineNr">139 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L139'>gap-right</a></span> _self: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: code-point-utf8 <span class="Delimiter">{</span>
 <span id="L140" class="LineNr">140 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L141" class="LineNr">141 </span>  <span class="PreProc">var</span> g/eax: grapheme <span class="Special">&lt;-</span> copy <span class="Constant">0</span>
-<span id="L142" class="LineNr">142 </span>  <span class="PreProc">var</span> right/<span class="muRegEcx">ecx</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, right
-<span id="L143" class="LineNr">143 </span>  g <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L43'>pop-grapheme-stack</a> right
+<span id="L141" class="LineNr">141 </span>  <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> copy <span class="Constant">0</span>
+<span id="L142" class="LineNr">142 </span>  <span class="PreProc">var</span> right/<span class="muRegEcx">ecx</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, right
+<span id="L143" class="LineNr">143 </span>  g <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L43'>pop-code-point-utf8-stack</a> right
 <span id="L144" class="LineNr">144 </span>  compare g, <span class="Constant">-1</span>
 <span id="L145" class="LineNr">145 </span>  <span class="Delimiter">{</span>
 <span id="L146" class="LineNr">146 </span>    <span class="PreProc">break-if-=</span>
-<span id="L147" class="LineNr">147 </span>    <span class="PreProc">var</span> left/<span class="muRegEcx">ecx</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
-<span id="L148" class="LineNr">148 </span>    <a href='grapheme-stack.mu.html#L31'>push-grapheme-stack</a> left, g
+<span id="L147" class="LineNr">147 </span>    <span class="PreProc">var</span> left/<span class="muRegEcx">ecx</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
+<span id="L148" class="LineNr">148 </span>    <a href='grapheme-stack.mu.html#L31'>push-code-point-utf8-stack</a> left, g
 <span id="L149" class="LineNr">149 </span>  <span class="Delimiter">}</span>
 <span id="L150" class="LineNr">150 </span>  <span class="PreProc">return</span> g
 <span id="L151" class="LineNr">151 </span><span class="Delimiter">}</span>
 <span id="L152" class="LineNr">152 </span>
-<span id="L153" class="LineNr">153 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L153'>gap-left</a></span> _self: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: grapheme <span class="Delimiter">{</span>
+<span id="L153" class="LineNr">153 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L153'>gap-left</a></span> _self: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: code-point-utf8 <span class="Delimiter">{</span>
 <span id="L154" class="LineNr">154 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L155" class="LineNr">155 </span>  <span class="PreProc">var</span> g/eax: grapheme <span class="Special">&lt;-</span> copy <span class="Constant">0</span>
+<span id="L155" class="LineNr">155 </span>  <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> copy <span class="Constant">0</span>
 <span id="L156" class="LineNr">156 </span>  <span class="Delimiter">{</span>
-<span id="L157" class="LineNr">157 </span>    <span class="PreProc">var</span> left/<span class="muRegEcx">ecx</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
-<span id="L158" class="LineNr">158 </span>    g <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L43'>pop-grapheme-stack</a> left
+<span id="L157" class="LineNr">157 </span>    <span class="PreProc">var</span> left/<span class="muRegEcx">ecx</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
+<span id="L158" class="LineNr">158 </span>    g <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L43'>pop-code-point-utf8-stack</a> left
 <span id="L159" class="LineNr">159 </span>  <span class="Delimiter">}</span>
 <span id="L160" class="LineNr">160 </span>  compare g, <span class="Constant">-1</span>
 <span id="L161" class="LineNr">161 </span>  <span class="Delimiter">{</span>
 <span id="L162" class="LineNr">162 </span>    <span class="PreProc">break-if-=</span>
-<span id="L163" class="LineNr">163 </span>    <span class="PreProc">var</span> right/<span class="muRegEcx">ecx</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, right
-<span id="L164" class="LineNr">164 </span>    <a href='grapheme-stack.mu.html#L31'>push-grapheme-stack</a> right, g
+<span id="L163" class="LineNr">163 </span>    <span class="PreProc">var</span> right/<span class="muRegEcx">ecx</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, right
+<span id="L164" class="LineNr">164 </span>    <a href='grapheme-stack.mu.html#L31'>push-code-point-utf8-stack</a> right, g
 <span id="L165" class="LineNr">165 </span>  <span class="Delimiter">}</span>
 <span id="L166" class="LineNr">166 </span>  <span class="PreProc">return</span> g
 <span id="L167" class="LineNr">167 </span><span class="Delimiter">}</span>
 <span id="L168" class="LineNr">168 </span>
 <span id="L169" class="LineNr">169 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L169'>gap-index</a></span> _self: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: int <span class="Delimiter">{</span>
 <span id="L170" class="LineNr">170 </span>  <span class="PreProc">var</span> self/eax: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L171" class="LineNr">171 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
+<span id="L171" class="LineNr">171 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
 <span id="L172" class="LineNr">172 </span>  <span class="PreProc">var</span> top-addr/eax: (addr int) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> left, <a href='../203stack.subx.html#L338'>top</a>
 <span id="L173" class="LineNr">173 </span>  <span class="PreProc">var</span> <a href='data.mu.html#L82'>result</a>/eax: int <span class="Special">&lt;-</span> copy *top-addr
 <span id="L174" class="LineNr">174 </span>  <span class="PreProc">return</span> <a href='data.mu.html#L82'>result</a>
 <span id="L175" class="LineNr">175 </span><span class="Delimiter">}</span>
 <span id="L176" class="LineNr">176 </span>
-<span id="L177" class="LineNr">177 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L177'>first-grapheme-in-gap-buffer</a></span> _self: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: grapheme <span class="Delimiter">{</span>
+<span id="L177" class="LineNr">177 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L177'>first-code-point-utf8-in-gap-buffer</a></span> _self: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: code-point-utf8 <span class="Delimiter">{</span>
 <span id="L178" class="LineNr">178 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L179" class="LineNr">179 </span>  <span class="muComment"># try to read from left</span>
-<span id="L180" class="LineNr">180 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
+<span id="L180" class="LineNr">180 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
 <span id="L181" class="LineNr">181 </span>  <span class="PreProc">var</span> top-addr/<span class="muRegEcx">ecx</span>: (addr int) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> left, <a href='../203stack.subx.html#L338'>top</a>
 <span id="L182" class="LineNr">182 </span>  compare *top-addr, <span class="Constant">0</span>
 <span id="L183" class="LineNr">183 </span>  <span class="Delimiter">{</span>
 <span id="L184" class="LineNr">184 </span>    <span class="PreProc">break-if-&lt;=</span>
-<span id="L185" class="LineNr">185 </span>    <span class="PreProc">var</span> data-ah/eax: (addr handle array grapheme) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> left, data
-<span id="L186" class="LineNr">186 </span>    <span class="PreProc">var</span> data/eax: (addr array grapheme) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *data-ah
-<span id="L187" class="LineNr">187 </span>    <span class="PreProc">var</span> result-addr/eax: (addr grapheme) <span class="Special">&lt;-</span> index data, <span class="Constant">0</span>
+<span id="L185" class="LineNr">185 </span>    <span class="PreProc">var</span> data-ah/eax: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> left, data
+<span id="L186" class="LineNr">186 </span>    <span class="PreProc">var</span> data/eax: (addr array code-point-utf8) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *data-ah
+<span id="L187" class="LineNr">187 </span>    <span class="PreProc">var</span> result-addr/eax: (addr code-point-utf8) <span class="Special">&lt;-</span> index data, <span class="Constant">0</span>
 <span id="L188" class="LineNr">188 </span>    <span class="PreProc">return</span> *result-addr
 <span id="L189" class="LineNr">189 </span>  <span class="Delimiter">}</span>
 <span id="L190" class="LineNr">190 </span>  <span class="muComment"># try to read from right</span>
-<span id="L191" class="LineNr">191 </span>  <span class="PreProc">var</span> right/eax: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, right
+<span id="L191" class="LineNr">191 </span>  <span class="PreProc">var</span> right/eax: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, right
 <span id="L192" class="LineNr">192 </span>  top-addr <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> right, <a href='../203stack.subx.html#L338'>top</a>
 <span id="L193" class="LineNr">193 </span>  compare *top-addr, <span class="Constant">0</span>
 <span id="L194" class="LineNr">194 </span>  <span class="Delimiter">{</span>
 <span id="L195" class="LineNr">195 </span>    <span class="PreProc">break-if-&lt;=</span>
-<span id="L196" class="LineNr">196 </span>    <span class="PreProc">var</span> data-ah/eax: (addr handle array grapheme) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> right, data
-<span id="L197" class="LineNr">197 </span>    <span class="PreProc">var</span> data/eax: (addr array grapheme) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *data-ah
+<span id="L196" class="LineNr">196 </span>    <span class="PreProc">var</span> data-ah/eax: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> right, data
+<span id="L197" class="LineNr">197 </span>    <span class="PreProc">var</span> data/eax: (addr array code-point-utf8) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *data-ah
 <span id="L198" class="LineNr">198 </span>    <span class="PreProc">var</span> <a href='../203stack.subx.html#L338'>top</a>/<span class="muRegEcx">ecx</span>: int <span class="Special">&lt;-</span> copy *top-addr
 <span id="L199" class="LineNr">199 </span>    <a href='../203stack.subx.html#L338'>top</a> <span class="Special">&lt;-</span> decrement
-<span id="L200" class="LineNr">200 </span>    <span class="PreProc">var</span> result-addr/eax: (addr grapheme) <span class="Special">&lt;-</span> index data, <a href='../203stack.subx.html#L338'>top</a>
+<span id="L200" class="LineNr">200 </span>    <span class="PreProc">var</span> result-addr/eax: (addr code-point-utf8) <span class="Special">&lt;-</span> index data, <a href='../203stack.subx.html#L338'>top</a>
 <span id="L201" class="LineNr">201 </span>    <span class="PreProc">return</span> *result-addr
 <span id="L202" class="LineNr">202 </span>  <span class="Delimiter">}</span>
 <span id="L203" class="LineNr">203 </span>  <span class="muComment"># give up</span>
 <span id="L204" class="LineNr">204 </span>  <span class="PreProc">return</span> <span class="Constant">-1</span>
 <span id="L205" class="LineNr">205 </span><span class="Delimiter">}</span>
 <span id="L206" class="LineNr">206 </span>
-<span id="L207" class="LineNr">207 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L207'>grapheme-before-cursor-in-gap-buffer</a></span> _self: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: grapheme <span class="Delimiter">{</span>
+<span id="L207" class="LineNr">207 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L207'>code-point-utf8-before-cursor-in-gap-buffer</a></span> _self: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: code-point-utf8 <span class="Delimiter">{</span>
 <span id="L208" class="LineNr">208 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L209" class="LineNr">209 </span>  <span class="muComment"># try to read from left</span>
-<span id="L210" class="LineNr">210 </span>  <span class="PreProc">var</span> left/<span class="muRegEcx">ecx</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
+<span id="L210" class="LineNr">210 </span>  <span class="PreProc">var</span> left/<span class="muRegEcx">ecx</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
 <span id="L211" class="LineNr">211 </span>  <span class="PreProc">var</span> top-addr/<span class="muRegEdx">edx</span>: (addr int) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> left, <a href='../203stack.subx.html#L338'>top</a>
 <span id="L212" class="LineNr">212 </span>  compare *top-addr, <span class="Constant">0</span>
 <span id="L213" class="LineNr">213 </span>  <span class="Delimiter">{</span>
 <span id="L214" class="LineNr">214 </span>    <span class="PreProc">break-if-&lt;=</span>
-<span id="L215" class="LineNr">215 </span>    <span class="PreProc">var</span> <a href='data.mu.html#L82'>result</a>/eax: grapheme <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L43'>pop-grapheme-stack</a> left
-<span id="L216" class="LineNr">216 </span>    <a href='grapheme-stack.mu.html#L31'>push-grapheme-stack</a> left, <a href='data.mu.html#L82'>result</a>
+<span id="L215" class="LineNr">215 </span>    <span class="PreProc">var</span> <a href='data.mu.html#L82'>result</a>/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L43'>pop-code-point-utf8-stack</a> left
+<span id="L216" class="LineNr">216 </span>    <a href='grapheme-stack.mu.html#L31'>push-code-point-utf8-stack</a> left, <a href='data.mu.html#L82'>result</a>
 <span id="L217" class="LineNr">217 </span>    <span class="PreProc">return</span> <a href='data.mu.html#L82'>result</a>
 <span id="L218" class="LineNr">218 </span>  <span class="Delimiter">}</span>
 <span id="L219" class="LineNr">219 </span>  <span class="muComment"># give up</span>
@@ -285,27 +285,27 @@ if ('onhashchange' in window) {
 <span id="L222" class="LineNr">222 </span>
 <span id="L223" class="LineNr">223 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L223'>delete-before-gap</a></span> _self: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Delimiter">{</span>
 <span id="L224" class="LineNr">224 </span>  <span class="PreProc">var</span> self/eax: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L225" class="LineNr">225 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
-<span id="L226" class="LineNr">226 </span>  <span class="PreProc">var</span> dummy/eax: grapheme <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L43'>pop-grapheme-stack</a> left
+<span id="L225" class="LineNr">225 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
+<span id="L226" class="LineNr">226 </span>  <span class="PreProc">var</span> dummy/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L43'>pop-code-point-utf8-stack</a> left
 <span id="L227" class="LineNr">227 </span><span class="Delimiter">}</span>
 <span id="L228" class="LineNr">228 </span>
-<span id="L229" class="LineNr">229 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L229'>pop-after-gap</a></span> _self: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: grapheme <span class="Delimiter">{</span>
+<span id="L229" class="LineNr">229 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L229'>pop-after-gap</a></span> _self: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: code-point-utf8 <span class="Delimiter">{</span>
 <span id="L230" class="LineNr">230 </span>  <span class="PreProc">var</span> self/eax: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L231" class="LineNr">231 </span>  <span class="PreProc">var</span> right/eax: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, right
-<span id="L232" class="LineNr">232 </span>  <span class="PreProc">var</span> <a href='data.mu.html#L82'>result</a>/eax: grapheme <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L43'>pop-grapheme-stack</a> right
+<span id="L231" class="LineNr">231 </span>  <span class="PreProc">var</span> right/eax: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, right
+<span id="L232" class="LineNr">232 </span>  <span class="PreProc">var</span> <a href='data.mu.html#L82'>result</a>/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L43'>pop-code-point-utf8-stack</a> right
 <span id="L233" class="LineNr">233 </span>  <span class="PreProc">return</span> <a href='data.mu.html#L82'>result</a>
 <span id="L234" class="LineNr">234 </span><span class="Delimiter">}</span>
 <span id="L235" class="LineNr">235 </span>
 <span id="L236" class="LineNr">236 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L236'>gap-buffer-equal?</a></span> _self: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>), s: (addr array byte)<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
 <span id="L237" class="LineNr">237 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L238" class="LineNr">238 </span>  <span class="muComment"># complication: graphemes may be multiple bytes</span>
+<span id="L238" class="LineNr">238 </span>  <span class="muComment"># complication: code-point-utf8s may be multiple bytes</span>
 <span id="L239" class="LineNr">239 </span>  <span class="muComment"># so don't rely on length</span>
 <span id="L240" class="LineNr">240 </span>  <span class="muComment"># instead turn the expected result into a stream and arrange to read from it in order</span>
 <span id="L241" class="LineNr">241 </span>  <span class="PreProc">var</span> stream-storage: (stream byte <span class="Constant">0x10</span>/max-word-size)
 <span id="L242" class="LineNr">242 </span>  <span class="PreProc">var</span> expected-stream/<span class="muRegEcx">ecx</span>: (addr stream byte) <span class="Special">&lt;-</span> address stream-storage
 <span id="L243" class="LineNr">243 </span>  <a href='../108write.subx.html#L24'>write</a> expected-stream, s
 <span id="L244" class="LineNr">244 </span>  <span class="muComment"># compare left</span>
-<span id="L245" class="LineNr">245 </span>  <span class="PreProc">var</span> left/<span class="muRegEdx">edx</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
+<span id="L245" class="LineNr">245 </span>  <span class="PreProc">var</span> left/<span class="muRegEdx">edx</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
 <span id="L246" class="LineNr">246 </span>  <span class="PreProc">var</span> <a href='data.mu.html#L82'>result</a>/eax: boolean <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L117'>prefix-match?</a> left, expected-stream
 <span id="L247" class="LineNr">247 </span>  compare <a href='data.mu.html#L82'>result</a>, <span class="Constant">0</span>/false
 <span id="L248" class="LineNr">248 </span>  <span class="Delimiter">{</span>
@@ -313,7 +313,7 @@ if ('onhashchange' in window) {
 <span id="L250" class="LineNr">250 </span>    <span class="PreProc">return</span> <a href='data.mu.html#L82'>result</a>
 <span id="L251" class="LineNr">251 </span>  <span class="Delimiter">}</span>
 <span id="L252" class="LineNr">252 </span>  <span class="muComment"># compare right</span>
-<span id="L253" class="LineNr">253 </span>  <span class="PreProc">var</span> right/<span class="muRegEdx">edx</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, right
+<span id="L253" class="LineNr">253 </span>  <span class="PreProc">var</span> right/<span class="muRegEdx">edx</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, right
 <span id="L254" class="LineNr">254 </span>  <a href='data.mu.html#L82'>result</a> <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L145'>suffix-match?</a> right, expected-stream
 <span id="L255" class="LineNr">255 </span>  compare <a href='data.mu.html#L82'>result</a>, <span class="Constant">0</span>/false
 <span id="L256" class="LineNr">256 </span>  <span class="Delimiter">{</span>
@@ -330,10 +330,10 @@ if ('onhashchange' in window) {
 <span id="L267" class="LineNr">267 </span>  <span class="PreProc">var</span> g/<span class="muRegEsi">esi</span>: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> address _g
 <span id="L268" class="LineNr">268 </span>  <a href='gap-buffer.mu.html#L6'>initialize-gap-buffer</a> g
 <span id="L269" class="LineNr">269 </span>  <span class="muComment">#</span>
-<span id="L270" class="LineNr">270 </span>  <span class="PreProc">var</span> c/eax: grapheme <span class="Special">&lt;-</span> copy <span class="Constant">0x61</span>/a
-<span id="L271" class="LineNr">271 </span>  <a href='gap-buffer.mu.html#L103'>add-grapheme-at-gap</a> g, c
-<span id="L272" class="LineNr">272 </span>  <a href='gap-buffer.mu.html#L103'>add-grapheme-at-gap</a> g, c
-<span id="L273" class="LineNr">273 </span>  <a href='gap-buffer.mu.html#L103'>add-grapheme-at-gap</a> g, c
+<span id="L270" class="LineNr">270 </span>  <span class="PreProc">var</span> c/eax: code-point-utf8 <span class="Special">&lt;-</span> copy <span class="Constant">0x61</span>/a
+<span id="L271" class="LineNr">271 </span>  <a href='gap-buffer.mu.html#L103'>add-code-point-utf8-at-gap</a> g, c
+<span id="L272" class="LineNr">272 </span>  <a href='gap-buffer.mu.html#L103'>add-code-point-utf8-at-gap</a> g, c
+<span id="L273" class="LineNr">273 </span>  <a href='gap-buffer.mu.html#L103'>add-code-point-utf8-at-gap</a> g, c
 <span id="L274" class="LineNr">274 </span>  <span class="muComment"># gap is at end (right is empty)</span>
 <span id="L275" class="LineNr">275 </span>  <span class="PreProc">var</span> _result/eax: boolean <span class="Special">&lt;-</span> <a href='gap-buffer.mu.html#L236'>gap-buffer-equal?</a> g, <span class="Constant">&quot;aaa&quot;</span>
 <span id="L276" class="LineNr">276 </span>  <span class="PreProc">var</span> <a href='data.mu.html#L82'>result</a>/eax: int <span class="Special">&lt;-</span> copy _result
@@ -345,11 +345,11 @@ if ('onhashchange' in window) {
 <span id="L282" class="LineNr">282 </span>  <span class="PreProc">var</span> g/<span class="muRegEsi">esi</span>: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> address _g
 <span id="L283" class="LineNr">283 </span>  <a href='gap-buffer.mu.html#L6'>initialize-gap-buffer</a> g
 <span id="L284" class="LineNr">284 </span>  <span class="muComment">#</span>
-<span id="L285" class="LineNr">285 </span>  <span class="PreProc">var</span> c/eax: grapheme <span class="Special">&lt;-</span> copy <span class="Constant">0x61</span>/a
-<span id="L286" class="LineNr">286 </span>  <a href='gap-buffer.mu.html#L103'>add-grapheme-at-gap</a> g, c
-<span id="L287" class="LineNr">287 </span>  <a href='gap-buffer.mu.html#L103'>add-grapheme-at-gap</a> g, c
-<span id="L288" class="LineNr">288 </span>  <a href='gap-buffer.mu.html#L103'>add-grapheme-at-gap</a> g, c
-<span id="L289" class="LineNr">289 </span>  <span class="PreProc">var</span> dummy/eax: grapheme <span class="Special">&lt;-</span> <a href='gap-buffer.mu.html#L153'>gap-left</a> g
+<span id="L285" class="LineNr">285 </span>  <span class="PreProc">var</span> c/eax: code-point-utf8 <span class="Special">&lt;-</span> copy <span class="Constant">0x61</span>/a
+<span id="L286" class="LineNr">286 </span>  <a href='gap-buffer.mu.html#L103'>add-code-point-utf8-at-gap</a> g, c
+<span id="L287" class="LineNr">287 </span>  <a href='gap-buffer.mu.html#L103'>add-code-point-utf8-at-gap</a> g, c
+<span id="L288" class="LineNr">288 </span>  <a href='gap-buffer.mu.html#L103'>add-code-point-utf8-at-gap</a> g, c
+<span id="L289" class="LineNr">289 </span>  <span class="PreProc">var</span> dummy/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='gap-buffer.mu.html#L153'>gap-left</a> g
 <span id="L290" class="LineNr">290 </span>  <span class="muComment"># gap is in the middle</span>
 <span id="L291" class="LineNr">291 </span>  <span class="PreProc">var</span> _result/eax: boolean <span class="Special">&lt;-</span> <a href='gap-buffer.mu.html#L236'>gap-buffer-equal?</a> g, <span class="Constant">&quot;aaa&quot;</span>
 <span id="L292" class="LineNr">292 </span>  <span class="PreProc">var</span> <a href='data.mu.html#L82'>result</a>/eax: int <span class="Special">&lt;-</span> copy _result
@@ -361,11 +361,11 @@ if ('onhashchange' in window) {
 <span id="L298" class="LineNr">298 </span>  <span class="PreProc">var</span> g/<span class="muRegEsi">esi</span>: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> address _g
 <span id="L299" class="LineNr">299 </span>  <a href='gap-buffer.mu.html#L6'>initialize-gap-buffer</a> g
 <span id="L300" class="LineNr">300 </span>  <span class="muComment">#</span>
-<span id="L301" class="LineNr">301 </span>  <span class="PreProc">var</span> c/eax: grapheme <span class="Special">&lt;-</span> copy <span class="Constant">0x61</span>/a
-<span id="L302" class="LineNr">302 </span>  <a href='gap-buffer.mu.html#L103'>add-grapheme-at-gap</a> g, c
-<span id="L303" class="LineNr">303 </span>  <a href='gap-buffer.mu.html#L103'>add-grapheme-at-gap</a> g, c
-<span id="L304" class="LineNr">304 </span>  <a href='gap-buffer.mu.html#L103'>add-grapheme-at-gap</a> g, c
-<span id="L305" class="LineNr">305 </span>  <span class="PreProc">var</span> dummy/eax: grapheme <span class="Special">&lt;-</span> <a href='gap-buffer.mu.html#L153'>gap-left</a> g
+<span id="L301" class="LineNr">301 </span>  <span class="PreProc">var</span> c/eax: code-point-utf8 <span class="Special">&lt;-</span> copy <span class="Constant">0x61</span>/a
+<span id="L302" class="LineNr">302 </span>  <a href='gap-buffer.mu.html#L103'>add-code-point-utf8-at-gap</a> g, c
+<span id="L303" class="LineNr">303 </span>  <a href='gap-buffer.mu.html#L103'>add-code-point-utf8-at-gap</a> g, c
+<span id="L304" class="LineNr">304 </span>  <a href='gap-buffer.mu.html#L103'>add-code-point-utf8-at-gap</a> g, c
+<span id="L305" class="LineNr">305 </span>  <span class="PreProc">var</span> dummy/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='gap-buffer.mu.html#L153'>gap-left</a> g
 <span id="L306" class="LineNr">306 </span>  dummy <span class="Special">&lt;-</span> <a href='gap-buffer.mu.html#L153'>gap-left</a> g
 <span id="L307" class="LineNr">307 </span>  dummy <span class="Special">&lt;-</span> <a href='gap-buffer.mu.html#L153'>gap-left</a> g
 <span id="L308" class="LineNr">308 </span>  <span class="muComment"># gap is at the start</span>
@@ -382,25 +382,25 @@ if ('onhashchange' in window) {
 <span id="L319" class="LineNr">319 </span>  <span class="PreProc">var</span> dest-ah/eax: (addr handle <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _dest-ah
 <span id="L320" class="LineNr">320 </span>  <span class="PreProc">var</span> _dest-a/eax: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *dest-ah
 <span id="L321" class="LineNr">321 </span>  <span class="PreProc">var</span> dest-a/<span class="muRegEdi">edi</span>: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _dest-a
-<span id="L322" class="LineNr">322 </span>  <span class="muComment"># copy left grapheme-stack</span>
-<span id="L323" class="LineNr">323 </span>  <span class="PreProc">var</span> src/<span class="muRegEcx">ecx</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> src-a, left
-<span id="L324" class="LineNr">324 </span>  <span class="PreProc">var</span> dest/<span class="muRegEdx">edx</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> dest-a, left
-<span id="L325" class="LineNr">325 </span>  <a href='grapheme-stack.mu.html#L59'>copy-grapheme-stack</a> src, dest
-<span id="L326" class="LineNr">326 </span>  <span class="muComment"># copy right grapheme-stack</span>
+<span id="L322" class="LineNr">322 </span>  <span class="muComment"># copy left code-point-utf8-stack</span>
+<span id="L323" class="LineNr">323 </span>  <span class="PreProc">var</span> src/<span class="muRegEcx">ecx</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> src-a, left
+<span id="L324" class="LineNr">324 </span>  <span class="PreProc">var</span> dest/<span class="muRegEdx">edx</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> dest-a, left
+<span id="L325" class="LineNr">325 </span>  <a href='grapheme-stack.mu.html#L59'>copy-code-point-utf8-stack</a> src, dest
+<span id="L326" class="LineNr">326 </span>  <span class="muComment"># copy right code-point-utf8-stack</span>
 <span id="L327" class="LineNr">327 </span>  src <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> src-a, right
 <span id="L328" class="LineNr">328 </span>  dest <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> dest-a, right
-<span id="L329" class="LineNr">329 </span>  <a href='grapheme-stack.mu.html#L59'>copy-grapheme-stack</a> src, dest
+<span id="L329" class="LineNr">329 </span>  <a href='grapheme-stack.mu.html#L59'>copy-code-point-utf8-stack</a> src, dest
 <span id="L330" class="LineNr">330 </span><span class="Delimiter">}</span>
 <span id="L331" class="LineNr">331 </span>
 <span id="L332" class="LineNr">332 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L332'>gap-buffer-is-decimal-integer?</a></span> _self: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
 <span id="L333" class="LineNr">333 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L334" class="LineNr">334 </span>  <span class="PreProc">var</span> curr/<span class="muRegEcx">ecx</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
-<span id="L335" class="LineNr">335 </span>  <span class="PreProc">var</span> <a href='data.mu.html#L82'>result</a>/eax: boolean <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L172'>grapheme-stack-is-decimal-integer?</a> curr
+<span id="L334" class="LineNr">334 </span>  <span class="PreProc">var</span> curr/<span class="muRegEcx">ecx</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
+<span id="L335" class="LineNr">335 </span>  <span class="PreProc">var</span> <a href='data.mu.html#L82'>result</a>/eax: boolean <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L172'>code-point-utf8-stack-is-decimal-integer?</a> curr
 <span id="L336" class="LineNr">336 </span>  <span class="Delimiter">{</span>
 <span id="L337" class="LineNr">337 </span>    compare <a href='data.mu.html#L82'>result</a>, <span class="Constant">0</span>/false
 <span id="L338" class="LineNr">338 </span>    <span class="PreProc">break-if-=</span>
 <span id="L339" class="LineNr">339 </span>    curr <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, right
-<span id="L340" class="LineNr">340 </span>    <a href='data.mu.html#L82'>result</a> <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L172'>grapheme-stack-is-decimal-integer?</a> curr
+<span id="L340" class="LineNr">340 </span>    <a href='data.mu.html#L82'>result</a> <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L172'>code-point-utf8-stack-is-decimal-integer?</a> curr
 <span id="L341" class="LineNr">341 </span>  <span class="Delimiter">}</span>
 <span id="L342" class="LineNr">342 </span>  <span class="PreProc">return</span> <a href='data.mu.html#L82'>result</a>
 <span id="L343" class="LineNr">343 </span><span class="Delimiter">}</span>
diff --git a/html/linux/tile/grapheme-stack.mu.html b/html/linux/tile/grapheme-stack.mu.html
index 09c487b4..d5a29921 100644
--- a/html/linux/tile/grapheme-stack.mu.html
+++ b/html/linux/tile/grapheme-stack.mu.html
@@ -16,16 +16,16 @@ a { color:inherit; }
 * { font-size:12pt; font-size: 1em; }
 .PreProc { color: #c000c0; }
 .muRegEbx { color: #5f00ff; }
-.muRegEcx { color: #870000; }
 .muRegEdx { color: #af5f00; }
 .LineNr { }
+.Constant { color: #008787; }
+.muComment { color: #005faf; }
 .muRegEsi { color: #005faf; }
 .muRegEdi { color: #00af00; }
-.Constant { color: #008787; }
-.muFunction { color: #af5f00; text-decoration: underline; }
+.muRegEcx { color: #870000; }
 .Delimiter { color: #c000c0; }
+.muFunction { color: #af5f00; text-decoration: underline; }
 .Special { color: #ff6060; }
-.muComment { color: #005faf; }
 -->
 </style>
 
@@ -61,27 +61,27 @@ if ('onhashchange' in window) {
 <body onload='JumpToLine();'>
 <a href='https://github.com/akkartik/mu/blob/main/linux/tile/grapheme-stack.mu'>https://github.com/akkartik/mu/blob/main/linux/tile/grapheme-stack.mu</a>
 <pre id='vimCodeElement'>
-<span id="L1" class="LineNr">  1 </span><span class="PreProc">type</span> <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a> <span class="Delimiter">{</span>
-<span id="L2" class="LineNr">  2 </span>  data: (handle array grapheme)
+<span id="L1" class="LineNr">  1 </span><span class="PreProc">type</span> <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a> <span class="Delimiter">{</span>
+<span id="L2" class="LineNr">  2 </span>  data: (handle array code-point-utf8)
 <span id="L3" class="LineNr">  3 </span>  <a href='../203stack.subx.html#L338'>top</a>: int
 <span id="L4" class="LineNr">  4 </span><span class="Delimiter">}</span>
 <span id="L5" class="LineNr">  5 </span>
-<span id="L6" class="LineNr">  6 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L6'>initialize-grapheme-stack</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>), n: int <span class="Delimiter">{</span>
-<span id="L7" class="LineNr">  7 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L8" class="LineNr">  8 </span>  <span class="PreProc">var</span> d/<span class="muRegEdi">edi</span>: (addr handle array grapheme) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, data
+<span id="L6" class="LineNr">  6 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L6'>initialize-code-point-utf8-stack</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>), n: int <span class="Delimiter">{</span>
+<span id="L7" class="LineNr">  7 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> copy _self
+<span id="L8" class="LineNr">  8 </span>  <span class="PreProc">var</span> d/<span class="muRegEdi">edi</span>: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, data
 <span id="L9" class="LineNr">  9 </span>  populate d, n
 <span id="L10" class="LineNr"> 10 </span>  <span class="PreProc">var</span> <a href='../203stack.subx.html#L338'>top</a>/eax: (addr int) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, <a href='../203stack.subx.html#L338'>top</a>
 <span id="L11" class="LineNr"> 11 </span>  copy-to *top, <span class="Constant">0</span>
 <span id="L12" class="LineNr"> 12 </span><span class="Delimiter">}</span>
 <span id="L13" class="LineNr"> 13 </span>
-<span id="L14" class="LineNr"> 14 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L14'>clear-grapheme-stack</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Delimiter">{</span>
-<span id="L15" class="LineNr"> 15 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> copy _self
+<span id="L14" class="LineNr"> 14 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L14'>clear-code-point-utf8-stack</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Delimiter">{</span>
+<span id="L15" class="LineNr"> 15 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L16" class="LineNr"> 16 </span>  <span class="PreProc">var</span> <a href='../203stack.subx.html#L338'>top</a>/eax: (addr int) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, <a href='../203stack.subx.html#L338'>top</a>
 <span id="L17" class="LineNr"> 17 </span>  copy-to *top, <span class="Constant">0</span>
 <span id="L18" class="LineNr"> 18 </span><span class="Delimiter">}</span>
 <span id="L19" class="LineNr"> 19 </span>
-<span id="L20" class="LineNr"> 20 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L20'>grapheme-stack-empty?</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>)<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
-<span id="L21" class="LineNr"> 21 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> copy _self
+<span id="L20" class="LineNr"> 20 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L20'>code-point-utf8-stack-empty?</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>)<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
+<span id="L21" class="LineNr"> 21 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L22" class="LineNr"> 22 </span>  <span class="PreProc">var</span> <a href='../203stack.subx.html#L338'>top</a>/eax: (addr int) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, <a href='../203stack.subx.html#L338'>top</a>
 <span id="L23" class="LineNr"> 23 </span>  compare *top, <span class="Constant">0</span>
 <span id="L24" class="LineNr"> 24 </span>  <span class="Delimiter">{</span>
@@ -91,20 +91,20 @@ if ('onhashchange' in window) {
 <span id="L28" class="LineNr"> 28 </span>  <span class="PreProc">return</span> <span class="Constant">0</span>/false
 <span id="L29" class="LineNr"> 29 </span><span class="Delimiter">}</span>
 <span id="L30" class="LineNr"> 30 </span>
-<span id="L31" class="LineNr"> 31 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L31'>push-grapheme-stack</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>), _val: grapheme <span class="Delimiter">{</span>
-<span id="L32" class="LineNr"> 32 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> copy _self
+<span id="L31" class="LineNr"> 31 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L31'>push-code-point-utf8-stack</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>), _val: code-point-utf8 <span class="Delimiter">{</span>
+<span id="L32" class="LineNr"> 32 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L33" class="LineNr"> 33 </span>  <span class="PreProc">var</span> top-addr/<span class="muRegEcx">ecx</span>: (addr int) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, <a href='../203stack.subx.html#L338'>top</a>
-<span id="L34" class="LineNr"> 34 </span>  <span class="PreProc">var</span> data-ah/<span class="muRegEdx">edx</span>: (addr handle array grapheme) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, data
-<span id="L35" class="LineNr"> 35 </span>  <span class="PreProc">var</span> data/eax: (addr array grapheme) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *data-ah
+<span id="L34" class="LineNr"> 34 </span>  <span class="PreProc">var</span> data-ah/<span class="muRegEdx">edx</span>: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, data
+<span id="L35" class="LineNr"> 35 </span>  <span class="PreProc">var</span> data/eax: (addr array code-point-utf8) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *data-ah
 <span id="L36" class="LineNr"> 36 </span>  <span class="PreProc">var</span> <a href='../203stack.subx.html#L338'>top</a>/<span class="muRegEdx">edx</span>: int <span class="Special">&lt;-</span> copy *top-addr
-<span id="L37" class="LineNr"> 37 </span>  <span class="PreProc">var</span> dest-addr/<span class="muRegEdx">edx</span>: (addr grapheme) <span class="Special">&lt;-</span> index data, <a href='../203stack.subx.html#L338'>top</a>
-<span id="L38" class="LineNr"> 38 </span>  <span class="PreProc">var</span> val/eax: grapheme <span class="Special">&lt;-</span> copy _val
+<span id="L37" class="LineNr"> 37 </span>  <span class="PreProc">var</span> dest-addr/<span class="muRegEdx">edx</span>: (addr code-point-utf8) <span class="Special">&lt;-</span> index data, <a href='../203stack.subx.html#L338'>top</a>
+<span id="L38" class="LineNr"> 38 </span>  <span class="PreProc">var</span> val/eax: code-point-utf8 <span class="Special">&lt;-</span> copy _val
 <span id="L39" class="LineNr"> 39 </span>  copy-to *dest-addr, val
 <span id="L40" class="LineNr"> 40 </span>  add-to *top-addr, <span class="Constant">1</span>
 <span id="L41" class="LineNr"> 41 </span><span class="Delimiter">}</span>
 <span id="L42" class="LineNr"> 42 </span>
-<span id="L43" class="LineNr"> 43 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L43'>pop-grapheme-stack</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>)<span class="PreProc"> -&gt; </span>_/eax: grapheme <span class="Delimiter">{</span>
-<span id="L44" class="LineNr"> 44 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> copy _self
+<span id="L43" class="LineNr"> 43 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L43'>pop-code-point-utf8-stack</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>)<span class="PreProc"> -&gt; </span>_/eax: code-point-utf8 <span class="Delimiter">{</span>
+<span id="L44" class="LineNr"> 44 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L45" class="LineNr"> 45 </span>  <span class="PreProc">var</span> top-addr/<span class="muRegEcx">ecx</span>: (addr int) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, <a href='../203stack.subx.html#L338'>top</a>
 <span id="L46" class="LineNr"> 46 </span>  <span class="Delimiter">{</span>
 <span id="L47" class="LineNr"> 47 </span>    compare *top-addr, <span class="Constant">0</span>
@@ -112,25 +112,25 @@ if ('onhashchange' in window) {
 <span id="L49" class="LineNr"> 49 </span>    <span class="PreProc">return</span> <span class="Constant">-1</span>
 <span id="L50" class="LineNr"> 50 </span>  <span class="Delimiter">}</span>
 <span id="L51" class="LineNr"> 51 </span>  subtract-from *top-addr, <span class="Constant">1</span>
-<span id="L52" class="LineNr"> 52 </span>  <span class="PreProc">var</span> data-ah/<span class="muRegEdx">edx</span>: (addr handle array grapheme) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, data
-<span id="L53" class="LineNr"> 53 </span>  <span class="PreProc">var</span> data/eax: (addr array grapheme) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *data-ah
+<span id="L52" class="LineNr"> 52 </span>  <span class="PreProc">var</span> data-ah/<span class="muRegEdx">edx</span>: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, data
+<span id="L53" class="LineNr"> 53 </span>  <span class="PreProc">var</span> data/eax: (addr array code-point-utf8) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *data-ah
 <span id="L54" class="LineNr"> 54 </span>  <span class="PreProc">var</span> <a href='../203stack.subx.html#L338'>top</a>/<span class="muRegEdx">edx</span>: int <span class="Special">&lt;-</span> copy *top-addr
-<span id="L55" class="LineNr"> 55 </span>  <span class="PreProc">var</span> result-addr/eax: (addr grapheme) <span class="Special">&lt;-</span> index data, <a href='../203stack.subx.html#L338'>top</a>
+<span id="L55" class="LineNr"> 55 </span>  <span class="PreProc">var</span> result-addr/eax: (addr code-point-utf8) <span class="Special">&lt;-</span> index data, <a href='../203stack.subx.html#L338'>top</a>
 <span id="L56" class="LineNr"> 56 </span>  <span class="PreProc">return</span> *result-addr
 <span id="L57" class="LineNr"> 57 </span><span class="Delimiter">}</span>
 <span id="L58" class="LineNr"> 58 </span>
-<span id="L59" class="LineNr"> 59 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L59'>copy-grapheme-stack</a></span> _src: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>), dest: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Delimiter">{</span>
-<span id="L60" class="LineNr"> 60 </span>  <span class="PreProc">var</span> src/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> copy _src
-<span id="L61" class="LineNr"> 61 </span>  <span class="PreProc">var</span> data-ah/<span class="muRegEdi">edi</span>: (addr handle array grapheme) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> src, data
-<span id="L62" class="LineNr"> 62 </span>  <span class="PreProc">var</span> _data/eax: (addr array grapheme) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *data-ah
-<span id="L63" class="LineNr"> 63 </span>  <span class="PreProc">var</span> data/<span class="muRegEdi">edi</span>: (addr array grapheme) <span class="Special">&lt;-</span> copy _data
+<span id="L59" class="LineNr"> 59 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L59'>copy-code-point-utf8-stack</a></span> _src: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>), dest: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Delimiter">{</span>
+<span id="L60" class="LineNr"> 60 </span>  <span class="PreProc">var</span> src/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> copy _src
+<span id="L61" class="LineNr"> 61 </span>  <span class="PreProc">var</span> data-ah/<span class="muRegEdi">edi</span>: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> src, data
+<span id="L62" class="LineNr"> 62 </span>  <span class="PreProc">var</span> _data/eax: (addr array code-point-utf8) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *data-ah
+<span id="L63" class="LineNr"> 63 </span>  <span class="PreProc">var</span> data/<span class="muRegEdi">edi</span>: (addr array code-point-utf8) <span class="Special">&lt;-</span> copy _data
 <span id="L64" class="LineNr"> 64 </span>  <span class="PreProc">var</span> top-addr/<span class="muRegEcx">ecx</span>: (addr int) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> src, <a href='../203stack.subx.html#L338'>top</a>
 <span id="L65" class="LineNr"> 65 </span>  <span class="PreProc">var</span> i/eax: int <span class="Special">&lt;-</span> copy <span class="Constant">0</span>
 <span id="L66" class="LineNr"> 66 </span>  <span class="Delimiter">{</span>
 <span id="L67" class="LineNr"> 67 </span>    compare i, *top-addr
 <span id="L68" class="LineNr"> 68 </span>    <span class="PreProc">break-if-&gt;=</span>
-<span id="L69" class="LineNr"> 69 </span>    <span class="PreProc">var</span> g/<span class="muRegEdx">edx</span>: (addr grapheme) <span class="Special">&lt;-</span> index data, i
-<span id="L70" class="LineNr"> 70 </span>    <a href='grapheme-stack.mu.html#L31'>push-grapheme-stack</a> dest, *g
+<span id="L69" class="LineNr"> 69 </span>    <span class="PreProc">var</span> g/<span class="muRegEdx">edx</span>: (addr code-point-utf8) <span class="Special">&lt;-</span> index data, i
+<span id="L70" class="LineNr"> 70 </span>    <a href='grapheme-stack.mu.html#L31'>push-code-point-utf8-stack</a> dest, *g
 <span id="L71" class="LineNr"> 71 </span>    i <span class="Special">&lt;-</span> increment
 <span id="L72" class="LineNr"> 72 </span>    <span class="PreProc">loop</span>
 <span id="L73" class="LineNr"> 73 </span>  <span class="Delimiter">}</span>
@@ -138,18 +138,18 @@ if ('onhashchange' in window) {
 <span id="L75" class="LineNr"> 75 </span>
 <span id="L76" class="LineNr"> 76 </span><span class="muComment"># dump stack to screen from bottom to top</span>
 <span id="L77" class="LineNr"> 77 </span><span class="muComment"># don't move the cursor or anything</span>
-<span id="L78" class="LineNr"> 78 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L78'>render-stack-from-bottom</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>), <a href='../405screen.mu.html#L9'>screen</a>: (addr <a href='../405screen.mu.html#L9'>screen</a>) <span class="Delimiter">{</span>
-<span id="L79" class="LineNr"> 79 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L80" class="LineNr"> 80 </span>  <span class="PreProc">var</span> data-ah/<span class="muRegEdi">edi</span>: (addr handle array grapheme) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, data
-<span id="L81" class="LineNr"> 81 </span>  <span class="PreProc">var</span> _data/eax: (addr array grapheme) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *data-ah
-<span id="L82" class="LineNr"> 82 </span>  <span class="PreProc">var</span> data/<span class="muRegEdi">edi</span>: (addr array grapheme) <span class="Special">&lt;-</span> copy _data
+<span id="L78" class="LineNr"> 78 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L78'>render-stack-from-bottom</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>), <a href='../405screen.mu.html#L9'>screen</a>: (addr <a href='../405screen.mu.html#L9'>screen</a>) <span class="Delimiter">{</span>
+<span id="L79" class="LineNr"> 79 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> copy _self
+<span id="L80" class="LineNr"> 80 </span>  <span class="PreProc">var</span> data-ah/<span class="muRegEdi">edi</span>: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, data
+<span id="L81" class="LineNr"> 81 </span>  <span class="PreProc">var</span> _data/eax: (addr array code-point-utf8) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *data-ah
+<span id="L82" class="LineNr"> 82 </span>  <span class="PreProc">var</span> data/<span class="muRegEdi">edi</span>: (addr array code-point-utf8) <span class="Special">&lt;-</span> copy _data
 <span id="L83" class="LineNr"> 83 </span>  <span class="PreProc">var</span> top-addr/<span class="muRegEcx">ecx</span>: (addr int) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, <a href='../203stack.subx.html#L338'>top</a>
 <span id="L84" class="LineNr"> 84 </span>  <span class="PreProc">var</span> i/eax: int <span class="Special">&lt;-</span> copy <span class="Constant">0</span>
 <span id="L85" class="LineNr"> 85 </span>  <span class="Delimiter">{</span>
 <span id="L86" class="LineNr"> 86 </span>    compare i, *top-addr
 <span id="L87" class="LineNr"> 87 </span>    <span class="PreProc">break-if-&gt;=</span>
-<span id="L88" class="LineNr"> 88 </span>    <span class="PreProc">var</span> g/<span class="muRegEdx">edx</span>: (addr grapheme) <span class="Special">&lt;-</span> index data, i
-<span id="L89" class="LineNr"> 89 </span>    <a href='../405screen.mu.html#L214'>print-grapheme</a> <a href='../405screen.mu.html#L9'>screen</a>, *g
+<span id="L88" class="LineNr"> 88 </span>    <span class="PreProc">var</span> g/<span class="muRegEdx">edx</span>: (addr code-point-utf8) <span class="Special">&lt;-</span> index data, i
+<span id="L89" class="LineNr"> 89 </span>    <a href='../405screen.mu.html#L214'>print-code-point-utf8</a> <a href='../405screen.mu.html#L9'>screen</a>, *g
 <span id="L90" class="LineNr"> 90 </span>    i <span class="Special">&lt;-</span> increment
 <span id="L91" class="LineNr"> 91 </span>    <span class="PreProc">loop</span>
 <span id="L92" class="LineNr"> 92 </span>  <span class="Delimiter">}</span>
@@ -157,19 +157,19 @@ if ('onhashchange' in window) {
 <span id="L94" class="LineNr"> 94 </span>
 <span id="L95" class="LineNr"> 95 </span><span class="muComment"># dump stack to screen from top to bottom</span>
 <span id="L96" class="LineNr"> 96 </span><span class="muComment"># don't move the cursor or anything</span>
-<span id="L97" class="LineNr"> 97 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L97'>render-stack-from-top</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>), <a href='../405screen.mu.html#L9'>screen</a>: (addr <a href='../405screen.mu.html#L9'>screen</a>) <span class="Delimiter">{</span>
-<span id="L98" class="LineNr"> 98 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L99" class="LineNr"> 99 </span>  <span class="PreProc">var</span> data-ah/<span class="muRegEdi">edi</span>: (addr handle array grapheme) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, data
-<span id="L100" class="LineNr">100 </span>  <span class="PreProc">var</span> _data/eax: (addr array grapheme) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *data-ah
-<span id="L101" class="LineNr">101 </span>  <span class="PreProc">var</span> data/<span class="muRegEdi">edi</span>: (addr array grapheme) <span class="Special">&lt;-</span> copy _data
+<span id="L97" class="LineNr"> 97 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L97'>render-stack-from-top</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>), <a href='../405screen.mu.html#L9'>screen</a>: (addr <a href='../405screen.mu.html#L9'>screen</a>) <span class="Delimiter">{</span>
+<span id="L98" class="LineNr"> 98 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> copy _self
+<span id="L99" class="LineNr"> 99 </span>  <span class="PreProc">var</span> data-ah/<span class="muRegEdi">edi</span>: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, data
+<span id="L100" class="LineNr">100 </span>  <span class="PreProc">var</span> _data/eax: (addr array code-point-utf8) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *data-ah
+<span id="L101" class="LineNr">101 </span>  <span class="PreProc">var</span> data/<span class="muRegEdi">edi</span>: (addr array code-point-utf8) <span class="Special">&lt;-</span> copy _data
 <span id="L102" class="LineNr">102 </span>  <span class="PreProc">var</span> top-addr/<span class="muRegEcx">ecx</span>: (addr int) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, <a href='../203stack.subx.html#L338'>top</a>
 <span id="L103" class="LineNr">103 </span>  <span class="PreProc">var</span> i/eax: int <span class="Special">&lt;-</span> copy *top-addr
 <span id="L104" class="LineNr">104 </span>  i <span class="Special">&lt;-</span> decrement
 <span id="L105" class="LineNr">105 </span>  <span class="Delimiter">{</span>
 <span id="L106" class="LineNr">106 </span>    compare i, <span class="Constant">0</span>
 <span id="L107" class="LineNr">107 </span>    <span class="PreProc">break-if-&lt;</span>
-<span id="L108" class="LineNr">108 </span>    <span class="PreProc">var</span> g/<span class="muRegEdx">edx</span>: (addr grapheme) <span class="Special">&lt;-</span> index data, i
-<span id="L109" class="LineNr">109 </span>    <a href='../405screen.mu.html#L214'>print-grapheme</a> <a href='../405screen.mu.html#L9'>screen</a>, *g
+<span id="L108" class="LineNr">108 </span>    <span class="PreProc">var</span> g/<span class="muRegEdx">edx</span>: (addr code-point-utf8) <span class="Special">&lt;-</span> index data, i
+<span id="L109" class="LineNr">109 </span>    <a href='../405screen.mu.html#L214'>print-code-point-utf8</a> <a href='../405screen.mu.html#L9'>screen</a>, *g
 <span id="L110" class="LineNr">110 </span>    i <span class="Special">&lt;-</span> decrement
 <span id="L111" class="LineNr">111 </span>    <span class="PreProc">loop</span>
 <span id="L112" class="LineNr">112 </span>  <span class="Delimiter">}</span>
@@ -177,11 +177,11 @@ if ('onhashchange' in window) {
 <span id="L114" class="LineNr">114 </span>
 <span id="L115" class="LineNr">115 </span><span class="muComment"># compare from bottom</span>
 <span id="L116" class="LineNr">116 </span><span class="muComment"># beware: modifies 'stream', which must be disposed of after a false result</span>
-<span id="L117" class="LineNr">117 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L117'>prefix-match?</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>), s: (addr stream byte)<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
-<span id="L118" class="LineNr">118 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L119" class="LineNr">119 </span>  <span class="PreProc">var</span> data-ah/<span class="muRegEdi">edi</span>: (addr handle array grapheme) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, data
-<span id="L120" class="LineNr">120 </span>  <span class="PreProc">var</span> _data/eax: (addr array grapheme) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *data-ah
-<span id="L121" class="LineNr">121 </span>  <span class="PreProc">var</span> data/<span class="muRegEdi">edi</span>: (addr array grapheme) <span class="Special">&lt;-</span> copy _data
+<span id="L117" class="LineNr">117 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L117'>prefix-match?</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>), s: (addr stream byte)<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
+<span id="L118" class="LineNr">118 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> copy _self
+<span id="L119" class="LineNr">119 </span>  <span class="PreProc">var</span> data-ah/<span class="muRegEdi">edi</span>: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, data
+<span id="L120" class="LineNr">120 </span>  <span class="PreProc">var</span> _data/eax: (addr array code-point-utf8) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *data-ah
+<span id="L121" class="LineNr">121 </span>  <span class="PreProc">var</span> data/<span class="muRegEdi">edi</span>: (addr array code-point-utf8) <span class="Special">&lt;-</span> copy _data
 <span id="L122" class="LineNr">122 </span>  <span class="PreProc">var</span> top-addr/<span class="muRegEcx">ecx</span>: (addr int) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, <a href='../203stack.subx.html#L338'>top</a>
 <span id="L123" class="LineNr">123 </span>  <span class="PreProc">var</span> i/<span class="muRegEbx">ebx</span>: int <span class="Special">&lt;-</span> copy <span class="Constant">0</span>
 <span id="L124" class="LineNr">124 </span>  <span class="Delimiter">{</span>
@@ -189,8 +189,8 @@ if ('onhashchange' in window) {
 <span id="L126" class="LineNr">126 </span>    <span class="PreProc">break-if-&gt;=</span>
 <span id="L127" class="LineNr">127 </span>    <span class="muComment"># if curr != expected, return false</span>
 <span id="L128" class="LineNr">128 </span>    <span class="Delimiter">{</span>
-<span id="L129" class="LineNr">129 </span>      <span class="PreProc">var</span> curr-a/<span class="muRegEdx">edx</span>: (addr grapheme) <span class="Special">&lt;-</span> index data, i
-<span id="L130" class="LineNr">130 </span>      <span class="PreProc">var</span> expected/eax: grapheme <span class="Special">&lt;-</span> <a href='../403unicode.mu.html#L158'>read-grapheme</a> s
+<span id="L129" class="LineNr">129 </span>      <span class="PreProc">var</span> curr-a/<span class="muRegEdx">edx</span>: (addr code-point-utf8) <span class="Special">&lt;-</span> index data, i
+<span id="L130" class="LineNr">130 </span>      <span class="PreProc">var</span> expected/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='../403unicode.mu.html#L155'>read-code-point-utf8</a> s
 <span id="L131" class="LineNr">131 </span>      <span class="Delimiter">{</span>
 <span id="L132" class="LineNr">132 </span>        compare expected, *curr-a
 <span id="L133" class="LineNr">133 </span>        <span class="PreProc">break-if-=</span>
@@ -205,11 +205,11 @@ if ('onhashchange' in window) {
 <span id="L142" class="LineNr">142 </span>
 <span id="L143" class="LineNr">143 </span><span class="muComment"># compare from bottom</span>
 <span id="L144" class="LineNr">144 </span><span class="muComment"># beware: modifies 'stream', which must be disposed of after a false result</span>
-<span id="L145" class="LineNr">145 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L145'>suffix-match?</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>), s: (addr stream byte)<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
-<span id="L146" class="LineNr">146 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L147" class="LineNr">147 </span>  <span class="PreProc">var</span> data-ah/<span class="muRegEdi">edi</span>: (addr handle array grapheme) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, data
-<span id="L148" class="LineNr">148 </span>  <span class="PreProc">var</span> _data/eax: (addr array grapheme) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *data-ah
-<span id="L149" class="LineNr">149 </span>  <span class="PreProc">var</span> data/<span class="muRegEdi">edi</span>: (addr array grapheme) <span class="Special">&lt;-</span> copy _data
+<span id="L145" class="LineNr">145 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L145'>suffix-match?</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>), s: (addr stream byte)<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
+<span id="L146" class="LineNr">146 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> copy _self
+<span id="L147" class="LineNr">147 </span>  <span class="PreProc">var</span> data-ah/<span class="muRegEdi">edi</span>: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, data
+<span id="L148" class="LineNr">148 </span>  <span class="PreProc">var</span> _data/eax: (addr array code-point-utf8) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *data-ah
+<span id="L149" class="LineNr">149 </span>  <span class="PreProc">var</span> data/<span class="muRegEdi">edi</span>: (addr array code-point-utf8) <span class="Special">&lt;-</span> copy _data
 <span id="L150" class="LineNr">150 </span>  <span class="PreProc">var</span> top-addr/eax: (addr int) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, <a href='../203stack.subx.html#L338'>top</a>
 <span id="L151" class="LineNr">151 </span>  <span class="PreProc">var</span> i/<span class="muRegEbx">ebx</span>: int <span class="Special">&lt;-</span> copy *top-addr
 <span id="L152" class="LineNr">152 </span>  i <span class="Special">&lt;-</span> decrement
@@ -217,8 +217,8 @@ if ('onhashchange' in window) {
 <span id="L154" class="LineNr">154 </span>    compare i, <span class="Constant">0</span>
 <span id="L155" class="LineNr">155 </span>    <span class="PreProc">break-if-&lt;</span>
 <span id="L156" class="LineNr">156 </span>    <span class="Delimiter">{</span>
-<span id="L157" class="LineNr">157 </span>      <span class="PreProc">var</span> curr-a/<span class="muRegEdx">edx</span>: (addr grapheme) <span class="Special">&lt;-</span> index data, i
-<span id="L158" class="LineNr">158 </span>      <span class="PreProc">var</span> expected/eax: grapheme <span class="Special">&lt;-</span> <a href='../403unicode.mu.html#L158'>read-grapheme</a> s
+<span id="L157" class="LineNr">157 </span>      <span class="PreProc">var</span> curr-a/<span class="muRegEdx">edx</span>: (addr code-point-utf8) <span class="Special">&lt;-</span> index data, i
+<span id="L158" class="LineNr">158 </span>      <span class="PreProc">var</span> expected/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='../403unicode.mu.html#L155'>read-code-point-utf8</a> s
 <span id="L159" class="LineNr">159 </span>      <span class="muComment"># if curr != expected, return false</span>
 <span id="L160" class="LineNr">160 </span>      <span class="Delimiter">{</span>
 <span id="L161" class="LineNr">161 </span>        compare expected, *curr-a
@@ -232,18 +232,18 @@ if ('onhashchange' in window) {
 <span id="L169" class="LineNr">169 </span>  <span class="PreProc">return</span> <span class="Constant">1</span>   <span class="muComment"># true</span>
 <span id="L170" class="LineNr">170 </span><span class="Delimiter">}</span>
 <span id="L171" class="LineNr">171 </span>
-<span id="L172" class="LineNr">172 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L172'>grapheme-stack-is-decimal-integer?</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>)<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
-<span id="L173" class="LineNr">173 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L174" class="LineNr">174 </span>  <span class="PreProc">var</span> data-ah/eax: (addr handle array grapheme) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, data
-<span id="L175" class="LineNr">175 </span>  <span class="PreProc">var</span> _data/eax: (addr array grapheme) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *data-ah
-<span id="L176" class="LineNr">176 </span>  <span class="PreProc">var</span> data/<span class="muRegEdx">edx</span>: (addr array grapheme) <span class="Special">&lt;-</span> copy _data
+<span id="L172" class="LineNr">172 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L172'>code-point-utf8-stack-is-decimal-integer?</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>)<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
+<span id="L173" class="LineNr">173 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> copy _self
+<span id="L174" class="LineNr">174 </span>  <span class="PreProc">var</span> data-ah/eax: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, data
+<span id="L175" class="LineNr">175 </span>  <span class="PreProc">var</span> _data/eax: (addr array code-point-utf8) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *data-ah
+<span id="L176" class="LineNr">176 </span>  <span class="PreProc">var</span> data/<span class="muRegEdx">edx</span>: (addr array code-point-utf8) <span class="Special">&lt;-</span> copy _data
 <span id="L177" class="LineNr">177 </span>  <span class="PreProc">var</span> top-addr/<span class="muRegEcx">ecx</span>: (addr int) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, <a href='../203stack.subx.html#L338'>top</a>
 <span id="L178" class="LineNr">178 </span>  <span class="PreProc">var</span> i/<span class="muRegEbx">ebx</span>: int <span class="Special">&lt;-</span> copy <span class="Constant">0</span>
 <span id="L179" class="LineNr">179 </span>  <span class="PreProc">var</span> <a href='data.mu.html#L82'>result</a>/eax: boolean <span class="Special">&lt;-</span> copy <span class="Constant">1</span>/true
-<span id="L180" class="LineNr">180 </span>  $grapheme-stack-is-integer?:<span class="PreProc">loop</span>: <span class="Delimiter">{</span>
+<span id="L180" class="LineNr">180 </span>  $code-point-utf8-stack-is-integer?:<span class="PreProc">loop</span>: <span class="Delimiter">{</span>
 <span id="L181" class="LineNr">181 </span>    compare i, *top-addr
 <span id="L182" class="LineNr">182 </span>    <span class="PreProc">break-if-&gt;=</span>
-<span id="L183" class="LineNr">183 </span>    <span class="PreProc">var</span> g/<span class="muRegEdx">edx</span>: (addr grapheme) <span class="Special">&lt;-</span> index data, i
+<span id="L183" class="LineNr">183 </span>    <span class="PreProc">var</span> g/<span class="muRegEdx">edx</span>: (addr code-point-utf8) <span class="Special">&lt;-</span> index data, i
 <span id="L184" class="LineNr">184 </span>    <a href='data.mu.html#L82'>result</a> <span class="Special">&lt;-</span> <a href='../126write-int-decimal.subx.html#L306'>decimal-digit?</a> *g
 <span id="L185" class="LineNr">185 </span>    compare <a href='data.mu.html#L82'>result</a>, <span class="Constant">0</span>/false
 <span id="L186" class="LineNr">186 </span>    <span class="PreProc">break-if-=</span>
diff --git a/html/linux/tile/main.mu.html b/html/linux/tile/main.mu.html
index f274b46e..9f972072 100644
--- a/html/linux/tile/main.mu.html
+++ b/html/linux/tile/main.mu.html
@@ -15,16 +15,16 @@ body { font-size:12pt; font-family: monospace; color: #000000; background-color:
 a { color:inherit; }
 * { font-size:12pt; font-size: 1em; }
 .PreProc { color: #c000c0; }
-.muComment { color: #005faf; }
-.muRegEcx { color: #870000; }
 .LineNr { }
 .muRegEsi { color: #005faf; }
-.muRegEdi { color: #00af00; }
+.muRegEbx { color: #5f00ff; }
 .Constant { color: #008787; }
-.muFunction { color: #af5f00; text-decoration: underline; }
+.muRegEdi { color: #00af00; }
+.muRegEcx { color: #870000; }
 .Delimiter { color: #c000c0; }
+.muFunction { color: #af5f00; text-decoration: underline; }
+.muComment { color: #005faf; }
 .Special { color: #ff6060; }
-.muRegEbx { color: #5f00ff; }
 -->
 </style>
 
@@ -116,7 +116,7 @@ if ('onhashchange' in window) {
 <span id="L54" class="LineNr"> 54 </span>  <a href='environment.mu.html#L30'>initialize-environment</a> env
 <span id="L55" class="LineNr"> 55 </span>  <span class="Delimiter">{</span>
 <span id="L56" class="LineNr"> 56 </span>    <a href='environment.mu.html#L1309'>render</a> env
-<span id="L57" class="LineNr"> 57 </span>    <span class="PreProc">var</span> key/eax: grapheme <span class="Special">&lt;-</span> <a href='../305keyboard.subx.html#L132'>read-key-from-real-keyboard</a>
+<span id="L57" class="LineNr"> 57 </span>    <span class="PreProc">var</span> key/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='../305keyboard.subx.html#L132'>read-key-from-real-keyboard</a>
 <span id="L58" class="LineNr"> 58 </span>    compare key, <span class="Constant">0x11</span>/ctrl-q
 <span id="L59" class="LineNr"> 59 </span>    <span class="PreProc">break-if-=</span>
 <span id="L60" class="LineNr"> 60 </span>    <a href='environment.mu.html#L73'>process</a> env, key
@@ -141,7 +141,7 @@ if ('onhashchange' in window) {
 <span id="L79" class="LineNr"> 79 </span>    <span class="PreProc">var</span> done?/eax: boolean <span class="Special">&lt;-</span> <a href='../309stream.subx.html#L6'>stream-empty?</a> cmds-stream-a
 <span id="L80" class="LineNr"> 80 </span>    compare done?, <span class="Constant">0</span>/false
 <span id="L81" class="LineNr"> 81 </span>    <span class="PreProc">break-if-!=</span>
-<span id="L82" class="LineNr"> 82 </span>    <span class="PreProc">var</span> g/eax: grapheme <span class="Special">&lt;-</span> <a href='../403unicode.mu.html#L158'>read-grapheme</a> cmds-stream-a
+<span id="L82" class="LineNr"> 82 </span>    <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='../403unicode.mu.html#L155'>read-code-point-utf8</a> cmds-stream-a
 <span id="L83" class="LineNr"> 83 </span>    <a href='environment.mu.html#L73'>process</a> env, g
 <span id="L84" class="LineNr"> 84 </span>    <span class="PreProc">loop</span>
 <span id="L85" class="LineNr"> 85 </span>  <span class="Delimiter">}</span>
@@ -167,7 +167,7 @@ if ('onhashchange' in window) {
 <span id="L105" class="LineNr">105 </span>      <span class="PreProc">var</span> done?/eax: boolean <span class="Special">&lt;-</span> <a href='../309stream.subx.html#L6'>stream-empty?</a> <a href='data.mu.html#L34'>line</a>
 <span id="L106" class="LineNr">106 </span>      compare done?, <span class="Constant">0</span>/false
 <span id="L107" class="LineNr">107 </span>      <span class="PreProc">break-if-!=</span>
-<span id="L108" class="LineNr">108 </span>      <span class="PreProc">var</span> g/eax: grapheme <span class="Special">&lt;-</span> <a href='../403unicode.mu.html#L158'>read-grapheme</a> <a href='data.mu.html#L34'>line</a>
+<span id="L108" class="LineNr">108 </span>      <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='../403unicode.mu.html#L155'>read-code-point-utf8</a> <a href='data.mu.html#L34'>line</a>
 <span id="L109" class="LineNr">109 </span>      <a href='environment.mu.html#L73'>process</a> env, g
 <span id="L110" class="LineNr">110 </span>      <span class="PreProc">loop</span>
 <span id="L111" class="LineNr">111 </span>    <span class="Delimiter">}</span>
diff --git a/html/linux/tile/rpn.mu.html b/html/linux/tile/rpn.mu.html
index 20de2046..030a7eda 100644
--- a/html/linux/tile/rpn.mu.html
+++ b/html/linux/tile/rpn.mu.html
@@ -16,18 +16,18 @@ a { color:inherit; }
 * { font-size:12pt; font-size: 1em; }
 .LineNr { }
 .Delimiter { color: #c000c0; }
-.muRegEcx { color: #870000; }
-.muRegEdx { color: #af5f00; }
+.muFunction { color: #af5f00; text-decoration: underline; }
 .muRegEbx { color: #5f00ff; }
 .muRegEsi { color: #005faf; }
 .muRegEdi { color: #00af00; }
 .Constant { color: #008787; }
 .Special { color: #ff6060; }
 .PreProc { color: #c000c0; }
-.muFunction { color: #af5f00; text-decoration: underline; }
+.CommentedCode { color: #8a8a8a; }
 .muTest { color: #5f8700; }
 .muComment { color: #005faf; }
-.CommentedCode { color: #8a8a8a; }
+.muRegEcx { color: #870000; }
+.muRegEdx { color: #af5f00; }
 -->
 </style>
 
diff --git a/html/linux/tile/surface.mu.html b/html/linux/tile/surface.mu.html
index 6e702b47..de9cfa43 100644
--- a/html/linux/tile/surface.mu.html
+++ b/html/linux/tile/surface.mu.html
@@ -16,18 +16,18 @@ a { color:inherit; }
 * { font-size:12pt; font-size: 1em; }
 .LineNr { }
 .Delimiter { color: #c000c0; }
-.muRegEcx { color: #870000; }
-.muRegEdx { color: #af5f00; }
+.muFunction { color: #af5f00; text-decoration: underline; }
 .muRegEbx { color: #5f00ff; }
 .muRegEsi { color: #005faf; }
 .muRegEdi { color: #00af00; }
 .Constant { color: #008787; }
 .Special { color: #ff6060; }
 .PreProc { color: #c000c0; }
-.muFunction { color: #af5f00; text-decoration: underline; }
+.CommentedCode { color: #8a8a8a; }
 .muTest { color: #5f8700; }
 .muComment { color: #005faf; }
-.CommentedCode { color: #8a8a8a; }
+.muRegEcx { color: #870000; }
+.muRegEdx { color: #af5f00; }
 -->
 </style>
 
@@ -176,10 +176,10 @@ if ('onhashchange' in window) {
 <span id="L111" class="LineNr">111 </span>  compare idx, <span class="Constant">0</span>
 <span id="L112" class="LineNr">112 </span>  <span class="Delimiter">{</span>
 <span id="L113" class="LineNr">113 </span>    <span class="PreProc">break-if-&gt;=</span>
-<span id="L114" class="LineNr">114 </span>    <span class="PreProc">var</span> space/<span class="muRegEcx">ecx</span>: grapheme <span class="Special">&lt;-</span> copy <span class="Constant">0x20</span>
+<span id="L114" class="LineNr">114 </span>    <span class="PreProc">var</span> space/<span class="muRegEcx">ecx</span>: code-point-utf8 <span class="Special">&lt;-</span> copy <span class="Constant">0x20</span>
 <span id="L115" class="LineNr">115 </span>    <span class="PreProc">var</span> screen-ah/<span class="muRegEdi">edi</span>: (addr handle <a href='../405screen.mu.html#L9'>screen</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, <a href='../405screen.mu.html#L9'>screen</a>
 <span id="L116" class="LineNr">116 </span>    <span class="PreProc">var</span> <a href='../405screen.mu.html#L9'>screen</a>/eax: (addr <a href='../405screen.mu.html#L9'>screen</a>) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *screen-ah
-<span id="L117" class="LineNr">117 </span>    <a href='../405screen.mu.html#L214'>print-grapheme</a> <a href='../405screen.mu.html#L9'>screen</a>, space
+<span id="L117" class="LineNr">117 </span>    <a href='../405screen.mu.html#L214'>print-code-point-utf8</a> <a href='../405screen.mu.html#L9'>screen</a>, space
 <span id="L118" class="LineNr">118 </span>    <span class="PreProc">return</span>
 <span id="L119" class="LineNr">119 </span>  <span class="Delimiter">}</span>
 <span id="L120" class="LineNr">120 </span>  <span class="muComment"># otherwise print the appropriate screen-cell</span>
@@ -221,9 +221,9 @@ if ('onhashchange' in window) {
 <span id="L156" class="LineNr">156 </span>    <span class="PreProc">break-if-=</span>
 <span id="L157" class="LineNr">157 </span>    <a href='../405screen.mu.html#L583'>start-blinking</a> <a href='../405screen.mu.html#L9'>screen</a>
 <span id="L158" class="LineNr">158 </span>  <span class="Delimiter">}</span>
-<span id="L159" class="LineNr">159 </span>  <span class="PreProc">var</span> g/eax: (addr grapheme) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> cell, data
-<span id="L160" class="LineNr">160 </span>  <a href='../405screen.mu.html#L214'>print-grapheme</a> <a href='../405screen.mu.html#L9'>screen</a>, *g
-<span id="L161" class="LineNr">161 </span><span class="CommentedCode">#?   var g2/eax: grapheme &lt;- copy *g</span>
+<span id="L159" class="LineNr">159 </span>  <span class="PreProc">var</span> g/eax: (addr code-point-utf8) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> cell, data
+<span id="L160" class="LineNr">160 </span>  <a href='../405screen.mu.html#L214'>print-code-point-utf8</a> <a href='../405screen.mu.html#L9'>screen</a>, *g
+<span id="L161" class="LineNr">161 </span><span class="CommentedCode">#?   var g2/eax: code-point-utf8 &lt;- copy *g</span>
 <span id="L162" class="LineNr">162 </span><span class="CommentedCode">#?   var g3/eax: int &lt;- copy g2</span>
 <span id="L163" class="LineNr">163 </span><span class="CommentedCode">#?   print-int32-hex-to-real-screen g3</span>
 <span id="L164" class="LineNr">164 </span><span class="CommentedCode">#?   print-string-to-real-screen &quot;\n&quot;</span>
@@ -329,7 +329,7 @@ if ('onhashchange' in window) {
 <span id="L264" class="LineNr">264 </span>    <span class="PreProc">var</span> done?/eax: boolean <span class="Special">&lt;-</span> <a href='../309stream.subx.html#L6'>stream-empty?</a> s-addr
 <span id="L265" class="LineNr">265 </span>    compare done?, <span class="Constant">0</span>/false
 <span id="L266" class="LineNr">266 </span>    <span class="PreProc">break-if-!=</span>
-<span id="L267" class="LineNr">267 </span>    <span class="PreProc">var</span> g/eax: grapheme <span class="Special">&lt;-</span> <a href='../403unicode.mu.html#L158'>read-grapheme</a> s-addr
+<span id="L267" class="LineNr">267 </span>    <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='../403unicode.mu.html#L155'>read-code-point-utf8</a> s-addr
 <span id="L268" class="LineNr">268 </span>    compare g, <span class="Constant">0xa</span>/newline
 <span id="L269" class="LineNr">269 </span>    <span class="PreProc">loop-if-!=</span>
 <span id="L270" class="LineNr">270 </span>    <a href='data.mu.html#L82'>result</a> <span class="Special">&lt;-</span> increment
@@ -347,7 +347,7 @@ if ('onhashchange' in window) {
 <span id="L282" class="LineNr">282 </span>    <span class="PreProc">var</span> done?/eax: boolean <span class="Special">&lt;-</span> <a href='../309stream.subx.html#L6'>stream-empty?</a> s-addr
 <span id="L283" class="LineNr">283 </span>    compare done?, <span class="Constant">0</span>/false
 <span id="L284" class="LineNr">284 </span>    <span class="PreProc">break-if-!=</span>
-<span id="L285" class="LineNr">285 </span>    <span class="PreProc">var</span> g/eax: grapheme <span class="Special">&lt;-</span> <a href='../403unicode.mu.html#L158'>read-grapheme</a> s-addr
+<span id="L285" class="LineNr">285 </span>    <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='../403unicode.mu.html#L155'>read-code-point-utf8</a> s-addr
 <span id="L286" class="LineNr">286 </span>    compare g, <span class="Constant">0xa</span>/newline
 <span id="L287" class="LineNr">287 </span>    <span class="PreProc">break-if-=</span>
 <span id="L288" class="LineNr">288 </span>    <a href='data.mu.html#L82'>result</a> <span class="Special">&lt;-</span> increment
@@ -366,12 +366,12 @@ if ('onhashchange' in window) {
 <span id="L301" class="LineNr">301 </span>    <span class="PreProc">var</span> done?/eax: boolean <span class="Special">&lt;-</span> <a href='../309stream.subx.html#L6'>stream-empty?</a> s-addr
 <span id="L302" class="LineNr">302 </span>    compare done?, <span class="Constant">0</span>/false
 <span id="L303" class="LineNr">303 </span>    <span class="PreProc">break-if-!=</span>
-<span id="L304" class="LineNr">304 </span>    <span class="PreProc">var</span> g/eax: grapheme <span class="Special">&lt;-</span> <a href='../403unicode.mu.html#L158'>read-grapheme</a> s-addr
+<span id="L304" class="LineNr">304 </span>    <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='../403unicode.mu.html#L155'>read-code-point-utf8</a> s-addr
 <span id="L305" class="LineNr">305 </span>    compare g, <span class="Constant">0xa</span>/newline
 <span id="L306" class="LineNr">306 </span>    <span class="PreProc">loop-if-=</span>
 <span id="L307" class="LineNr">307 </span>    <span class="PreProc">var</span> offset/<span class="muRegEdx">edx</span>: (offset <a href='../405screen.mu.html#L20'>screen-cell</a>) <span class="Special">&lt;-</span> compute-offset out, idx
 <span id="L308" class="LineNr">308 </span>    <span class="PreProc">var</span> dest/<span class="muRegEdx">edx</span>: (addr <a href='../405screen.mu.html#L20'>screen-cell</a>) <span class="Special">&lt;-</span> index out, offset
-<span id="L309" class="LineNr">309 </span>    <span class="PreProc">var</span> dest2/<span class="muRegEdx">edx</span>: (addr grapheme) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> dest, data
+<span id="L309" class="LineNr">309 </span>    <span class="PreProc">var</span> dest2/<span class="muRegEdx">edx</span>: (addr code-point-utf8) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> dest, data
 <span id="L310" class="LineNr">310 </span>    copy-to *dest2, g
 <span id="L311" class="LineNr">311 </span>    idx <span class="Special">&lt;-</span> increment
 <span id="L312" class="LineNr">312 </span>    <span class="PreProc">loop</span>
diff --git a/html/linux/tile/table.mu.html b/html/linux/tile/table.mu.html
index 8f263bfe..8fb3ec7e 100644
--- a/html/linux/tile/table.mu.html
+++ b/html/linux/tile/table.mu.html
@@ -15,18 +15,18 @@ body { font-size:12pt; font-family: monospace; color: #000000; background-color:
 a { color:inherit; }
 * { font-size:12pt; font-size: 1em; }
 .PreProc { color: #c000c0; }
-.muRegEbx { color: #5f00ff; }
-.muRegEcx { color: #870000; }
 .muRegEdx { color: #af5f00; }
+.muRegEcx { color: #870000; }
 .LineNr { }
+.Constant { color: #008787; }
+.muRegEbx { color: #5f00ff; }
 .muRegEsi { color: #005faf; }
 .muRegEdi { color: #00af00; }
-.Constant { color: #008787; }
+.CommentedCode { color: #8a8a8a; }
+.Delimiter { color: #c000c0; }
 .muFunction { color: #af5f00; text-decoration: underline; }
 .muComment { color: #005faf; }
-.Delimiter { color: #c000c0; }
 .Special { color: #ff6060; }
-.CommentedCode { color: #8a8a8a; }
 -->
 </style>
 
diff --git a/html/linux/tile/value-stack.mu.html b/html/linux/tile/value-stack.mu.html
index c3ad6071..f8fee64e 100644
--- a/html/linux/tile/value-stack.mu.html
+++ b/html/linux/tile/value-stack.mu.html
@@ -15,18 +15,18 @@ body { font-size:12pt; font-family: monospace; color: #000000; background-color:
 a { color:inherit; }
 * { font-size:12pt; font-size: 1em; }
 .PreProc { color: #c000c0; }
-.CommentedCode { color: #8a8a8a; }
-.muRegEcx { color: #870000; }
+.muRegEbx { color: #5f00ff; }
 .muRegEdx { color: #af5f00; }
+.Special { color: #ff6060; }
 .LineNr { }
+.Constant { color: #008787; }
+.CommentedCode { color: #8a8a8a; }
 .muRegEsi { color: #005faf; }
 .muRegEdi { color: #00af00; }
-.Constant { color: #008787; }
-.muFunction { color: #af5f00; text-decoration: underline; }
-.muRegEbx { color: #5f00ff; }
+.muRegEcx { color: #870000; }
 .Delimiter { color: #c000c0; }
+.muFunction { color: #af5f00; text-decoration: underline; }
 .muComment { color: #005faf; }
-.Special { color: #ff6060; }
 -->
 </style>
 
diff --git a/html/linux/tile/value.mu.html b/html/linux/tile/value.mu.html
index 2aa1a26f..fa671074 100644
--- a/html/linux/tile/value.mu.html
+++ b/html/linux/tile/value.mu.html
@@ -15,18 +15,18 @@ body { font-size:12pt; font-family: monospace; color: #000000; background-color:
 a { color:inherit; }
 * { font-size:12pt; font-size: 1em; }
 .PreProc { color: #c000c0; }
-.CommentedCode { color: #8a8a8a; }
-.muRegEcx { color: #870000; }
 .muRegEdx { color: #af5f00; }
 .LineNr { }
-.muRegEsi { color: #005faf; }
-.muRegEdi { color: #00af00; }
 .Constant { color: #008787; }
-.muFunction { color: #af5f00; text-decoration: underline; }
+.muRegEdi { color: #00af00; }
+.muComment { color: #005faf; }
+.muRegEsi { color: #005faf; }
 .muRegEbx { color: #5f00ff; }
+.muRegEcx { color: #870000; }
 .Delimiter { color: #c000c0; }
+.muFunction { color: #af5f00; text-decoration: underline; }
+.CommentedCode { color: #8a8a8a; }
 .Special { color: #ff6060; }
-.muComment { color: #005faf; }
 -->
 </style>
 
@@ -154,15 +154,15 @@ if ('onhashchange' in window) {
 <span id="L90" class="LineNr"> 90 </span>    fg <span class="Special">&lt;-</span> copy <span class="Constant">0</span>
 <span id="L91" class="LineNr"> 91 </span>  <span class="Delimiter">}</span>
 <span id="L92" class="LineNr"> 92 </span>  <a href='../405screen.mu.html#L523'>start-color</a> <a href='../405screen.mu.html#L9'>screen</a>, fg, bg
-<span id="L93" class="LineNr"> 93 </span>  <a href='../405screen.mu.html#L214'>print-grapheme</a> <a href='../405screen.mu.html#L9'>screen</a>, <span class="Constant">0x20</span>/space
+<span id="L93" class="LineNr"> 93 </span>  <a href='../405screen.mu.html#L214'>print-code-point-utf8</a> <a href='../405screen.mu.html#L9'>screen</a>, <span class="Constant">0x20</span>/space
 <span id="L94" class="LineNr"> 94 </span>  <a href='../412print-float-decimal.mu.html#L151'>print-float-decimal-approximate</a> <a href='../405screen.mu.html#L9'>screen</a>, val, <span class="Constant">3</span>
-<span id="L95" class="LineNr"> 95 </span>  <a href='../405screen.mu.html#L214'>print-grapheme</a> <a href='../405screen.mu.html#L9'>screen</a>, <span class="Constant">0x20</span>/space
+<span id="L95" class="LineNr"> 95 </span>  <a href='../405screen.mu.html#L214'>print-code-point-utf8</a> <a href='../405screen.mu.html#L9'>screen</a>, <span class="Constant">0x20</span>/space
 <span id="L96" class="LineNr"> 96 </span><span class="Delimiter">}</span>
 <span id="L97" class="LineNr"> 97 </span>
 <span id="L98" class="LineNr"> 98 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='value.mu.html#L98'>render-array-at</a></span> <a href='../405screen.mu.html#L9'>screen</a>: (addr <a href='../405screen.mu.html#L9'>screen</a>), row: int, col: int, _a: (addr array <a href='data.mu.html#L49'>value</a>) <span class="Delimiter">{</span>
 <span id="L99" class="LineNr"> 99 </span>  <a href='../405screen.mu.html#L523'>start-color</a> <a href='../405screen.mu.html#L9'>screen</a>, <span class="Constant">0xf2</span>, <span class="Constant">7</span>
 <span id="L100" class="LineNr">100 </span>  <span class="muComment"># don't surround in spaces</span>
-<span id="L101" class="LineNr">101 </span>  <a href='../405screen.mu.html#L214'>print-grapheme</a> <a href='../405screen.mu.html#L9'>screen</a>, <span class="Constant">0x5b</span>/[
+<span id="L101" class="LineNr">101 </span>  <a href='../405screen.mu.html#L214'>print-code-point-utf8</a> <a href='../405screen.mu.html#L9'>screen</a>, <span class="Constant">0x5b</span>/[
 <span id="L102" class="LineNr">102 </span>  increment col
 <span id="L103" class="LineNr">103 </span>  <span class="PreProc">var</span> a/<span class="muRegEsi">esi</span>: (addr array <a href='data.mu.html#L49'>value</a>) <span class="Special">&lt;-</span> copy _a
 <span id="L104" class="LineNr">104 </span>  <span class="PreProc">var</span> <a href='surface.mu.html#L207'>max</a>/<span class="muRegEcx">ecx</span>: int <span class="Special">&lt;-</span> length a
@@ -186,7 +186,7 @@ if ('onhashchange' in window) {
 <span id="L122" class="LineNr">122 </span>    i <span class="Special">&lt;-</span> increment
 <span id="L123" class="LineNr">123 </span>    <span class="PreProc">loop</span>
 <span id="L124" class="LineNr">124 </span>  <span class="Delimiter">}</span>
-<span id="L125" class="LineNr">125 </span>  <a href='../405screen.mu.html#L214'>print-grapheme</a> <a href='../405screen.mu.html#L9'>screen</a>, <span class="Constant">0x5d</span>/]
+<span id="L125" class="LineNr">125 </span>  <a href='../405screen.mu.html#L214'>print-code-point-utf8</a> <a href='../405screen.mu.html#L9'>screen</a>, <span class="Constant">0x5d</span>/]
 <span id="L126" class="LineNr">126 </span><span class="Delimiter">}</span>
 <span id="L127" class="LineNr">127 </span>
 <span id="L128" class="LineNr">128 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='value.mu.html#L128'>render-screen</a></span> <a href='../405screen.mu.html#L9'>screen</a>: (addr <a href='../405screen.mu.html#L9'>screen</a>), row: int, col: int, _target-screen: (addr <a href='../405screen.mu.html#L9'>screen</a>) <span class="Delimiter">{</span>
@@ -243,13 +243,13 @@ if ('onhashchange' in window) {
 <span id="L179" class="LineNr">179 </span>    <a href='../405screen.mu.html#L583'>start-blinking</a> <a href='../405screen.mu.html#L9'>screen</a>
 <span id="L180" class="LineNr">180 </span>    <a href='../405screen.mu.html#L523'>start-color</a> <a href='../405screen.mu.html#L9'>screen</a>, <span class="Constant">0</span>, <span class="Constant">1</span>
 <span id="L181" class="LineNr">181 </span>  <span class="Delimiter">}</span>
-<span id="L182" class="LineNr">182 </span>  <span class="PreProc">var</span> g/eax: grapheme <span class="Special">&lt;-</span> <a href='../405screen.mu.html#L308'>screen-grapheme-at</a> target, row, col
+<span id="L182" class="LineNr">182 </span>  <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='../405screen.mu.html#L308'>screen-code-point-utf8-at</a> target, row, col
 <span id="L183" class="LineNr">183 </span>  <span class="Delimiter">{</span>
 <span id="L184" class="LineNr">184 </span>    compare g, <span class="Constant">0</span>
 <span id="L185" class="LineNr">185 </span>    <span class="PreProc">break-if-!=</span>
 <span id="L186" class="LineNr">186 </span>    g <span class="Special">&lt;-</span> copy <span class="Constant">0x20</span>/space
 <span id="L187" class="LineNr">187 </span>  <span class="Delimiter">}</span>
-<span id="L188" class="LineNr">188 </span>  <a href='../405screen.mu.html#L214'>print-grapheme</a> <a href='../405screen.mu.html#L9'>screen</a>, g
+<span id="L188" class="LineNr">188 </span>  <a href='../405screen.mu.html#L214'>print-code-point-utf8</a> <a href='../405screen.mu.html#L9'>screen</a>, g
 <span id="L189" class="LineNr">189 </span>  <a href='../405screen.mu.html#L506'>reset-formatting</a> <a href='../405screen.mu.html#L9'>screen</a>
 <span id="L190" class="LineNr">190 </span><span class="Delimiter">}</span>
 <span id="L191" class="LineNr">191 </span>
diff --git a/html/linux/tile/word.mu.html b/html/linux/tile/word.mu.html
index f619aa82..4d1e86d3 100644
--- a/html/linux/tile/word.mu.html
+++ b/html/linux/tile/word.mu.html
@@ -15,18 +15,18 @@ body { font-size:12pt; font-family: monospace; color: #000000; background-color:
 a { color:inherit; }
 * { font-size:12pt; font-size: 1em; }
 .PreProc { color: #c000c0; }
-.CommentedCode { color: #8a8a8a; }
-.muRegEcx { color: #870000; }
 .muRegEdx { color: #af5f00; }
+.muRegEcx { color: #870000; }
 .LineNr { }
+.Constant { color: #008787; }
+.CommentedCode { color: #8a8a8a; }
 .muRegEsi { color: #005faf; }
 .muRegEdi { color: #00af00; }
-.Constant { color: #008787; }
+.muComment { color: #005faf; }
+.Delimiter { color: #c000c0; }
 .muFunction { color: #af5f00; text-decoration: underline; }
 .muRegEbx { color: #5f00ff; }
-.Delimiter { color: #c000c0; }
 .Special { color: #ff6060; }
-.muComment { color: #005faf; }
 -->
 </style>
 
@@ -122,15 +122,15 @@ if ('onhashchange' in window) {
 <span id="L58" class="LineNr"> 58 </span>  <a href='word.mu.html#L185'>cursor-to-start</a> src
 <span id="L59" class="LineNr"> 59 </span>  <span class="PreProc">var</span> src-data-ah/eax: (addr handle <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> src, scalar-data
 <span id="L60" class="LineNr"> 60 </span>  <span class="PreProc">var</span> src-data/eax: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *src-data-ah
-<span id="L61" class="LineNr"> 61 </span>  <span class="PreProc">var</span> src-stack/<span class="muRegEcx">ecx</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> src-data, right
+<span id="L61" class="LineNr"> 61 </span>  <span class="PreProc">var</span> src-stack/<span class="muRegEcx">ecx</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> src-data, right
 <span id="L62" class="LineNr"> 62 </span>  <span class="Delimiter">{</span>
-<span id="L63" class="LineNr"> 63 </span>    <span class="PreProc">var</span> done?/eax: boolean <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L20'>grapheme-stack-empty?</a> src-stack
+<span id="L63" class="LineNr"> 63 </span>    <span class="PreProc">var</span> done?/eax: boolean <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L20'>code-point-utf8-stack-empty?</a> src-stack
 <span id="L64" class="LineNr"> 64 </span>    compare done?, <span class="Constant">0</span>/false
 <span id="L65" class="LineNr"> 65 </span>    <span class="PreProc">break-if-!=</span>
-<span id="L66" class="LineNr"> 66 </span>    <span class="PreProc">var</span> g/eax: grapheme <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L43'>pop-grapheme-stack</a> src-stack
-<span id="L67" class="LineNr"> 67 </span><span class="CommentedCode">#?     print-grapheme 0, g</span>
+<span id="L66" class="LineNr"> 66 </span>    <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L43'>pop-code-point-utf8-stack</a> src-stack
+<span id="L67" class="LineNr"> 67 </span><span class="CommentedCode">#?     print-code-point-utf8 0, g</span>
 <span id="L68" class="LineNr"> 68 </span><span class="CommentedCode">#?     print-string 0, &quot;\n&quot;</span>
-<span id="L69" class="LineNr"> 69 </span>    <a href='word.mu.html#L148'>add-grapheme-to-word</a> dest, g
+<span id="L69" class="LineNr"> 69 </span>    <a href='word.mu.html#L148'>add-code-point-utf8-to-word</a> dest, g
 <span id="L70" class="LineNr"> 70 </span>    <span class="PreProc">loop</span>
 <span id="L71" class="LineNr"> 71 </span>  <span class="Delimiter">}</span>
 <span id="L72" class="LineNr"> 72 </span><span class="Delimiter">}</span>
@@ -143,17 +143,17 @@ if ('onhashchange' in window) {
 <span id="L79" class="LineNr"> 79 </span>  <span class="PreProc">var</span> src/eax: (addr <a href='data.mu.html#L42'>word</a>) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *src-ah
 <span id="L80" class="LineNr"> 80 </span>  <span class="PreProc">var</span> src-data-ah/eax: (addr handle <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> src, scalar-data
 <span id="L81" class="LineNr"> 81 </span>  <span class="PreProc">var</span> src-data/eax: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *src-data-ah
-<span id="L82" class="LineNr"> 82 </span>  <span class="PreProc">var</span> src-stack/<span class="muRegEcx">ecx</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> src-data, left
-<span id="L83" class="LineNr"> 83 </span>  <span class="PreProc">var</span> src-stack-data-ah/eax: (addr handle array grapheme) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> src-stack, data
-<span id="L84" class="LineNr"> 84 </span>  <span class="PreProc">var</span> _src-stack-data/eax: (addr array grapheme) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *src-stack-data-ah
-<span id="L85" class="LineNr"> 85 </span>  <span class="PreProc">var</span> src-stack-data/<span class="muRegEdx">edx</span>: (addr array grapheme) <span class="Special">&lt;-</span> copy _src-stack-data
+<span id="L82" class="LineNr"> 82 </span>  <span class="PreProc">var</span> src-stack/<span class="muRegEcx">ecx</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> src-data, left
+<span id="L83" class="LineNr"> 83 </span>  <span class="PreProc">var</span> src-stack-data-ah/eax: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> src-stack, data
+<span id="L84" class="LineNr"> 84 </span>  <span class="PreProc">var</span> _src-stack-data/eax: (addr array code-point-utf8) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *src-stack-data-ah
+<span id="L85" class="LineNr"> 85 </span>  <span class="PreProc">var</span> src-stack-data/<span class="muRegEdx">edx</span>: (addr array code-point-utf8) <span class="Special">&lt;-</span> copy _src-stack-data
 <span id="L86" class="LineNr"> 86 </span>  <span class="PreProc">var</span> top-addr/<span class="muRegEcx">ecx</span>: (addr int) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> src-stack, <a href='../203stack.subx.html#L338'>top</a>
 <span id="L87" class="LineNr"> 87 </span>  <span class="PreProc">var</span> i/eax: int <span class="Special">&lt;-</span> copy <span class="Constant">0</span>
 <span id="L88" class="LineNr"> 88 </span>  <span class="Delimiter">{</span>
 <span id="L89" class="LineNr"> 89 </span>    compare i, *top-addr
 <span id="L90" class="LineNr"> 90 </span>    <span class="PreProc">break-if-&gt;=</span>
-<span id="L91" class="LineNr"> 91 </span>    <span class="PreProc">var</span> g/<span class="muRegEdx">edx</span>: (addr grapheme) <span class="Special">&lt;-</span> index src-stack-data, i
-<span id="L92" class="LineNr"> 92 </span>    <a href='word.mu.html#L148'>add-grapheme-to-word</a> dest, *g
+<span id="L91" class="LineNr"> 91 </span>    <span class="PreProc">var</span> g/<span class="muRegEdx">edx</span>: (addr code-point-utf8) <span class="Special">&lt;-</span> index src-stack-data, i
+<span id="L92" class="LineNr"> 92 </span>    <a href='word.mu.html#L148'>add-code-point-utf8-to-word</a> dest, *g
 <span id="L93" class="LineNr"> 93 </span>    i <span class="Special">&lt;-</span> increment
 <span id="L94" class="LineNr"> 94 </span>    <span class="PreProc">loop</span>
 <span id="L95" class="LineNr"> 95 </span>  <span class="Delimiter">}</span>
@@ -193,27 +193,27 @@ if ('onhashchange' in window) {
 <span id="L129" class="LineNr">129 </span>  copy-object curr-ah, out  <span class="muComment"># modify 'out' right at the end, just in case it's same as 'in'</span>
 <span id="L130" class="LineNr">130 </span><span class="Delimiter">}</span>
 <span id="L131" class="LineNr">131 </span>
-<span id="L132" class="LineNr">132 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='word.mu.html#L132'>first-grapheme</a></span> _self: (addr <a href='data.mu.html#L42'>word</a>)<span class="PreProc"> -&gt; </span>_/eax: grapheme <span class="Delimiter">{</span>
+<span id="L132" class="LineNr">132 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='word.mu.html#L132'>first-code-point-utf8</a></span> _self: (addr <a href='data.mu.html#L42'>word</a>)<span class="PreProc"> -&gt; </span>_/eax: code-point-utf8 <span class="Delimiter">{</span>
 <span id="L133" class="LineNr">133 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='data.mu.html#L42'>word</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L134" class="LineNr">134 </span>  <span class="PreProc">var</span> data-ah/eax: (addr handle <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, scalar-data
 <span id="L135" class="LineNr">135 </span>  <span class="PreProc">var</span> data/eax: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *data-ah
-<span id="L136" class="LineNr">136 </span>  <span class="PreProc">var</span> <a href='data.mu.html#L82'>result</a>/eax: grapheme <span class="Special">&lt;-</span> <a href='gap-buffer.mu.html#L177'>first-grapheme-in-gap-buffer</a> data
+<span id="L136" class="LineNr">136 </span>  <span class="PreProc">var</span> <a href='data.mu.html#L82'>result</a>/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='gap-buffer.mu.html#L177'>first-code-point-utf8-in-gap-buffer</a> data
 <span id="L137" class="LineNr">137 </span>  <span class="PreProc">return</span> <a href='data.mu.html#L82'>result</a>
 <span id="L138" class="LineNr">138 </span><span class="Delimiter">}</span>
 <span id="L139" class="LineNr">139 </span>
-<span id="L140" class="LineNr">140 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='word.mu.html#L140'>grapheme-before-cursor</a></span> _self: (addr <a href='data.mu.html#L42'>word</a>)<span class="PreProc"> -&gt; </span>_/eax: grapheme <span class="Delimiter">{</span>
+<span id="L140" class="LineNr">140 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='word.mu.html#L140'>code-point-utf8-before-cursor</a></span> _self: (addr <a href='data.mu.html#L42'>word</a>)<span class="PreProc"> -&gt; </span>_/eax: code-point-utf8 <span class="Delimiter">{</span>
 <span id="L141" class="LineNr">141 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='data.mu.html#L42'>word</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L142" class="LineNr">142 </span>  <span class="PreProc">var</span> data-ah/eax: (addr handle <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, scalar-data
 <span id="L143" class="LineNr">143 </span>  <span class="PreProc">var</span> data/eax: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *data-ah
-<span id="L144" class="LineNr">144 </span>  <span class="PreProc">var</span> <a href='data.mu.html#L82'>result</a>/eax: grapheme <span class="Special">&lt;-</span> <a href='gap-buffer.mu.html#L207'>grapheme-before-cursor-in-gap-buffer</a> data
+<span id="L144" class="LineNr">144 </span>  <span class="PreProc">var</span> <a href='data.mu.html#L82'>result</a>/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='gap-buffer.mu.html#L207'>code-point-utf8-before-cursor-in-gap-buffer</a> data
 <span id="L145" class="LineNr">145 </span>  <span class="PreProc">return</span> <a href='data.mu.html#L82'>result</a>
 <span id="L146" class="LineNr">146 </span><span class="Delimiter">}</span>
 <span id="L147" class="LineNr">147 </span>
-<span id="L148" class="LineNr">148 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='word.mu.html#L148'>add-grapheme-to-word</a></span> _self: (addr <a href='data.mu.html#L42'>word</a>), c: grapheme <span class="Delimiter">{</span>
+<span id="L148" class="LineNr">148 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='word.mu.html#L148'>add-code-point-utf8-to-word</a></span> _self: (addr <a href='data.mu.html#L42'>word</a>), c: code-point-utf8 <span class="Delimiter">{</span>
 <span id="L149" class="LineNr">149 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='data.mu.html#L42'>word</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L150" class="LineNr">150 </span>  <span class="PreProc">var</span> data-ah/eax: (addr handle <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, scalar-data
 <span id="L151" class="LineNr">151 </span>  <span class="PreProc">var</span> data/eax: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *data-ah
-<span id="L152" class="LineNr">152 </span>  <a href='gap-buffer.mu.html#L103'>add-grapheme-at-gap</a> data, c
+<span id="L152" class="LineNr">152 </span>  <a href='gap-buffer.mu.html#L103'>add-code-point-utf8-at-gap</a> data, c
 <span id="L153" class="LineNr">153 </span><span class="Delimiter">}</span>
 <span id="L154" class="LineNr">154 </span>
 <span id="L155" class="LineNr">155 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='word.mu.html#L155'>cursor-at-start?</a></span> _self: (addr <a href='data.mu.html#L42'>word</a>)<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
@@ -236,14 +236,14 @@ if ('onhashchange' in window) {
 <span id="L172" class="LineNr">172 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='data.mu.html#L42'>word</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L173" class="LineNr">173 </span>  <span class="PreProc">var</span> data-ah/eax: (addr handle <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, scalar-data
 <span id="L174" class="LineNr">174 </span>  <span class="PreProc">var</span> data/eax: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *data-ah
-<span id="L175" class="LineNr">175 </span>  <span class="PreProc">var</span> dummy/eax: grapheme <span class="Special">&lt;-</span> <a href='gap-buffer.mu.html#L153'>gap-left</a> data
+<span id="L175" class="LineNr">175 </span>  <span class="PreProc">var</span> dummy/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='gap-buffer.mu.html#L153'>gap-left</a> data
 <span id="L176" class="LineNr">176 </span><span class="Delimiter">}</span>
 <span id="L177" class="LineNr">177 </span>
 <span id="L178" class="LineNr">178 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='word.mu.html#L178'>cursor-right</a></span> _self: (addr <a href='data.mu.html#L42'>word</a>) <span class="Delimiter">{</span>
 <span id="L179" class="LineNr">179 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='data.mu.html#L42'>word</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L180" class="LineNr">180 </span>  <span class="PreProc">var</span> data-ah/eax: (addr handle <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, scalar-data
 <span id="L181" class="LineNr">181 </span>  <span class="PreProc">var</span> data/eax: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *data-ah
-<span id="L182" class="LineNr">182 </span>  <span class="PreProc">var</span> dummy/eax: grapheme <span class="Special">&lt;-</span> <a href='gap-buffer.mu.html#L139'>gap-right</a> data
+<span id="L182" class="LineNr">182 </span>  <span class="PreProc">var</span> dummy/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='gap-buffer.mu.html#L139'>gap-right</a> data
 <span id="L183" class="LineNr">183 </span><span class="Delimiter">}</span>
 <span id="L184" class="LineNr">184 </span>
 <span id="L185" class="LineNr">185 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='word.mu.html#L185'>cursor-to-start</a></span> _self: (addr <a href='data.mu.html#L42'>word</a>) <span class="Delimiter">{</span>
@@ -275,11 +275,11 @@ if ('onhashchange' in window) {
 <span id="L211" class="LineNr">211 </span>  <a href='gap-buffer.mu.html#L223'>delete-before-gap</a> data
 <span id="L212" class="LineNr">212 </span><span class="Delimiter">}</span>
 <span id="L213" class="LineNr">213 </span>
-<span id="L214" class="LineNr">214 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='word.mu.html#L214'>pop-after-cursor</a></span> _self: (addr <a href='data.mu.html#L42'>word</a>)<span class="PreProc"> -&gt; </span>_/eax: grapheme <span class="Delimiter">{</span>
+<span id="L214" class="LineNr">214 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='word.mu.html#L214'>pop-after-cursor</a></span> _self: (addr <a href='data.mu.html#L42'>word</a>)<span class="PreProc"> -&gt; </span>_/eax: code-point-utf8 <span class="Delimiter">{</span>
 <span id="L215" class="LineNr">215 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='data.mu.html#L42'>word</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L216" class="LineNr">216 </span>  <span class="PreProc">var</span> data-ah/eax: (addr handle <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, scalar-data
 <span id="L217" class="LineNr">217 </span>  <span class="PreProc">var</span> data/eax: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *data-ah
-<span id="L218" class="LineNr">218 </span>  <span class="PreProc">var</span> <a href='data.mu.html#L82'>result</a>/eax: grapheme <span class="Special">&lt;-</span> <a href='gap-buffer.mu.html#L229'>pop-after-gap</a> data
+<span id="L218" class="LineNr">218 </span>  <span class="PreProc">var</span> <a href='data.mu.html#L82'>result</a>/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='gap-buffer.mu.html#L229'>pop-after-gap</a> data
 <span id="L219" class="LineNr">219 </span>  <span class="PreProc">return</span> <a href='data.mu.html#L82'>result</a>
 <span id="L220" class="LineNr">220 </span><span class="Delimiter">}</span>
 <span id="L221" class="LineNr">221 </span>
@@ -617,14 +617,14 @@ if ('onhashchange' in window) {
 <span id="L553" class="LineNr">553 </span>    <span class="PreProc">var</span> done?/eax: boolean <span class="Special">&lt;-</span> <a href='../309stream.subx.html#L6'>stream-empty?</a> in-stream-a
 <span id="L554" class="LineNr">554 </span>    compare done?, <span class="Constant">0</span>/false
 <span id="L555" class="LineNr">555 </span>    <span class="PreProc">break-if-!=</span>
-<span id="L556" class="LineNr">556 </span>    <span class="PreProc">var</span> _g/eax: grapheme <span class="Special">&lt;-</span> <a href='../403unicode.mu.html#L158'>read-grapheme</a> in-stream-a
-<span id="L557" class="LineNr">557 </span>    <span class="PreProc">var</span> g/<span class="muRegEcx">ecx</span>: grapheme <span class="Special">&lt;-</span> copy _g
+<span id="L556" class="LineNr">556 </span>    <span class="PreProc">var</span> _g/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='../403unicode.mu.html#L155'>read-code-point-utf8</a> in-stream-a
+<span id="L557" class="LineNr">557 </span>    <span class="PreProc">var</span> g/<span class="muRegEcx">ecx</span>: code-point-utf8 <span class="Special">&lt;-</span> copy _g
 <span id="L558" class="LineNr">558 </span>    <span class="muComment"># if not space, insert</span>
 <span id="L559" class="LineNr">559 </span>    compare g, <span class="Constant">0x20</span>/space
 <span id="L560" class="LineNr">560 </span>    <span class="Delimiter">{</span>
 <span id="L561" class="LineNr">561 </span>      <span class="PreProc">break-if-=</span>
 <span id="L562" class="LineNr">562 </span>      <span class="PreProc">var</span> cursor-word/eax: (addr <a href='data.mu.html#L42'>word</a>) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *cursor-word-ah
-<span id="L563" class="LineNr">563 </span>      <a href='word.mu.html#L148'>add-grapheme-to-word</a> cursor-word, g
+<span id="L563" class="LineNr">563 </span>      <a href='word.mu.html#L148'>add-code-point-utf8-to-word</a> cursor-word, g
 <span id="L564" class="LineNr">564 </span>      <span class="PreProc">loop</span> $parse-words:<span class="PreProc">loop</span>
 <span id="L565" class="LineNr">565 </span>    <span class="Delimiter">}</span>
 <span id="L566" class="LineNr">566 </span>    <span class="muComment"># otherwise insert word after and move cursor to it</span>