about summary refs log tree commit diff stats
path: root/html/514gap-buffer.mu.html
diff options
context:
space:
mode:
Diffstat (limited to 'html/514gap-buffer.mu.html')
-rw-r--r--html/514gap-buffer.mu.html446
1 files changed, 223 insertions, 223 deletions
diff --git a/html/514gap-buffer.mu.html b/html/514gap-buffer.mu.html
index 662aa1d0..fecdeb83 100644
--- a/html/514gap-buffer.mu.html
+++ b/html/514gap-buffer.mu.html
@@ -65,8 +65,8 @@ if ('onhashchange' in window) {
 <span id="L1" class="LineNr">   1 </span><span class="muComment"># primitive for editing text</span>
 <span id="L2" class="LineNr">   2 </span>
 <span id="L3" class="LineNr">   3 </span><span class="PreProc">type</span> <a href='514gap-buffer.mu.html#L3'>gap-buffer</a> <span class="Delimiter">{</span>
-<span id="L4" class="LineNr">   4 </span>  left: <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>
-<span id="L5" class="LineNr">   5 </span>  right: <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>
+<span id="L4" class="LineNr">   4 </span>  left: <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>
+<span id="L5" class="LineNr">   5 </span>  right: <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>
 <span id="L6" class="LineNr">   6 </span>  <span class="muComment"># some fields for scanning incrementally through a gap-buffer</span>
 <span id="L7" class="LineNr">   7 </span>  left-read-index: int
 <span id="L8" class="LineNr">   8 </span>  right-read-index: int
@@ -74,41 +74,41 @@ if ('onhashchange' in window) {
 <span id="L10" class="LineNr">  10 </span>
 <span id="L11" class="LineNr">  11 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L11'>initialize-gap-buffer</a></span> _self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>), capacity: int <span class="Delimiter">{</span>
 <span id="L12" class="LineNr">  12 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L13" class="LineNr">  13 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get self, left
-<span id="L14" class="LineNr">  14 </span>  <a href='513grapheme-stack.mu.html#L8'>initialize-grapheme-stack</a> left, capacity
-<span id="L15" class="LineNr">  15 </span>  <span class="PreProc">var</span> right/eax: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get self, right
-<span id="L16" class="LineNr">  16 </span>  <a href='513grapheme-stack.mu.html#L8'>initialize-grapheme-stack</a> right, capacity
+<span id="L13" class="LineNr">  13 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get self, left
+<span id="L14" class="LineNr">  14 </span>  <a href='513grapheme-stack.mu.html#L8'>initialize-code-point-utf8-stack</a> left, capacity
+<span id="L15" class="LineNr">  15 </span>  <span class="PreProc">var</span> right/eax: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get self, right
+<span id="L16" class="LineNr">  16 </span>  <a href='513grapheme-stack.mu.html#L8'>initialize-code-point-utf8-stack</a> right, capacity
 <span id="L17" class="LineNr">  17 </span><span class="Delimiter">}</span>
 <span id="L18" class="LineNr">  18 </span>
 <span id="L19" class="LineNr">  19 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L19'>clear-gap-buffer</a></span> _self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Delimiter">{</span>
 <span id="L20" class="LineNr">  20 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L21" class="LineNr">  21 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get self, left
-<span id="L22" class="LineNr">  22 </span>  <a href='513grapheme-stack.mu.html#L16'>clear-grapheme-stack</a> left
-<span id="L23" class="LineNr">  23 </span>  <span class="PreProc">var</span> right/eax: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get self, right
-<span id="L24" class="LineNr">  24 </span>  <a href='513grapheme-stack.mu.html#L16'>clear-grapheme-stack</a> right
+<span id="L21" class="LineNr">  21 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get self, left
+<span id="L22" class="LineNr">  22 </span>  <a href='513grapheme-stack.mu.html#L16'>clear-code-point-utf8-stack</a> left
+<span id="L23" class="LineNr">  23 </span>  <span class="PreProc">var</span> right/eax: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get self, right
+<span id="L24" class="LineNr">  24 </span>  <a href='513grapheme-stack.mu.html#L16'>clear-code-point-utf8-stack</a> right
 <span id="L25" class="LineNr">  25 </span><span class="Delimiter">}</span>
 <span id="L26" class="LineNr">  26 </span>
 <span id="L27" class="LineNr">  27 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L27'>gap-buffer-empty?</a></span> _self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
 <span id="L28" class="LineNr">  28 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L29" class="LineNr">  29 </span>  <span class="muComment"># if !empty?(left) return false</span>
 <span id="L30" class="LineNr">  30 </span>  <span class="Delimiter">{</span>
-<span id="L31" class="LineNr">  31 </span>    <span class="PreProc">var</span> left/eax: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get self, left
-<span id="L32" class="LineNr">  32 </span>    <span class="PreProc">var</span> result/eax: boolean <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L22'>grapheme-stack-empty?</a> left
+<span id="L31" class="LineNr">  31 </span>    <span class="PreProc">var</span> left/eax: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get self, left
+<span id="L32" class="LineNr">  32 </span>    <span class="PreProc">var</span> result/eax: boolean <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L22'>code-point-utf8-stack-empty?</a> left
 <span id="L33" class="LineNr">  33 </span>    compare result, <span class="Constant">0</span>/false
 <span id="L34" class="LineNr">  34 </span>    <span class="PreProc">break-if-!=</span>
 <span id="L35" class="LineNr">  35 </span>    <span class="PreProc">return</span> <span class="Constant">0</span>/false
 <span id="L36" class="LineNr">  36 </span>  <span class="Delimiter">}</span>
 <span id="L37" class="LineNr">  37 </span>  <span class="muComment"># return empty?(right)</span>
-<span id="L38" class="LineNr">  38 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get self, left
-<span id="L39" class="LineNr">  39 </span>  <span class="PreProc">var</span> result/eax: boolean <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L22'>grapheme-stack-empty?</a> left
+<span id="L38" class="LineNr">  38 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get self, left
+<span id="L39" class="LineNr">  39 </span>  <span class="PreProc">var</span> result/eax: boolean <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L22'>code-point-utf8-stack-empty?</a> left
 <span id="L40" class="LineNr">  40 </span>  <span class="PreProc">return</span> result
 <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='514gap-buffer.mu.html#L43'>gap-buffer-capacity</a></span> _gap: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/<span class="muRegEdx">edx</span>: int <span class="Delimiter">{</span>
 <span id="L44" class="LineNr">  44 </span>  <span class="PreProc">var</span> gap/<span class="muRegEsi">esi</span>: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _gap
-<span id="L45" class="LineNr">  45 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get gap, left
-<span id="L46" class="LineNr">  46 </span>  <span class="PreProc">var</span> left-data-ah/eax: (addr handle array grapheme) <span class="Special">&lt;-</span> get left, data
-<span id="L47" class="LineNr">  47 </span>  <span class="PreProc">var</span> left-data/eax: (addr array grapheme) <span class="Special">&lt;-</span> <a href='120allocate.subx.html#L235'>lookup</a> *left-data-ah
+<span id="L45" class="LineNr">  45 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get gap, left
+<span id="L46" class="LineNr">  46 </span>  <span class="PreProc">var</span> left-data-ah/eax: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> get left, data
+<span id="L47" class="LineNr">  47 </span>  <span class="PreProc">var</span> left-data/eax: (addr array code-point-utf8) <span class="Special">&lt;-</span> <a href='120allocate.subx.html#L235'>lookup</a> *left-data-ah
 <span id="L48" class="LineNr">  48 </span>  <span class="PreProc">var</span> result/eax: int <span class="Special">&lt;-</span> length left-data
 <span id="L49" class="LineNr">  49 </span>  <span class="PreProc">return</span> result
 <span id="L50" class="LineNr">  50 </span><span class="Delimiter">}</span>
@@ -122,8 +122,8 @@ if ('onhashchange' in window) {
 <span id="L58" class="LineNr">  58 </span>    <span class="PreProc">var</span> done?/eax: boolean <span class="Special">&lt;-</span> <a href='309stream.subx.html#L6'>stream-empty?</a> input-stream
 <span id="L59" class="LineNr">  59 </span>    compare done?, <span class="Constant">0</span>/false
 <span id="L60" class="LineNr">  60 </span>    <span class="PreProc">break-if-!=</span>
-<span id="L61" class="LineNr">  61 </span>    <span class="PreProc">var</span> g/eax: grapheme <span class="Special">&lt;-</span> <a href='403unicode.mu.html#L236'>read-grapheme</a> input-stream
-<span id="L62" class="LineNr">  62 </span>    <a href='514gap-buffer.mu.html#L440'>add-grapheme-at-gap</a> self, g
+<span id="L61" class="LineNr">  61 </span>    <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='403unicode.mu.html#L229'>read-code-point-utf8</a> input-stream
+<span id="L62" class="LineNr">  62 </span>    <a href='514gap-buffer.mu.html#L440'>add-code-point-utf8-at-gap</a> self, g
 <span id="L63" class="LineNr">  63 </span>    <span class="PreProc">loop</span>
 <span id="L64" class="LineNr">  64 </span>  <span class="Delimiter">}</span>
 <span id="L65" class="LineNr">  65 </span><span class="Delimiter">}</span>
@@ -137,7 +137,7 @@ if ('onhashchange' in window) {
 <span id="L73" class="LineNr">  73 </span>    <span class="PreProc">var</span> key/eax: byte <span class="Special">&lt;-</span> <a href='112read-byte.subx.html#L13'>read-byte</a> in
 <span id="L74" class="LineNr">  74 </span>    compare key, <span class="Constant">0</span>/null
 <span id="L75" class="LineNr">  75 </span>    <span class="PreProc">break-if-=</span>
-<span id="L76" class="LineNr">  76 </span>    <span class="PreProc">var</span> g/eax: grapheme <span class="Special">&lt;-</span> copy key
+<span id="L76" class="LineNr">  76 </span>    <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> copy key
 <span id="L77" class="LineNr">  77 </span>    <a href='514gap-buffer.mu.html#L1203'>edit-gap-buffer</a> self, g
 <span id="L78" class="LineNr">  78 </span>    <span class="PreProc">loop</span>
 <span id="L79" class="LineNr">  79 </span>  <span class="Delimiter">}</span>
@@ -150,44 +150,44 @@ if ('onhashchange' in window) {
 <span id="L86" class="LineNr">  86 </span>
 <span id="L87" class="LineNr">  87 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L87'>append-gap-buffer</a></span> _self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>), out: (addr stream byte) <span class="Delimiter">{</span>
 <span id="L88" class="LineNr">  88 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L89" class="LineNr">  89 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get self, left
+<span id="L89" class="LineNr">  89 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get self, left
 <span id="L90" class="LineNr">  90 </span>  <a href='514gap-buffer.mu.html#L96'>emit-stack-from-bottom</a> left, out
-<span id="L91" class="LineNr">  91 </span>  <span class="PreProc">var</span> right/eax: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get self, right
+<span id="L91" class="LineNr">  91 </span>  <span class="PreProc">var</span> right/eax: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get self, right
 <span id="L92" class="LineNr">  92 </span>  <a href='514gap-buffer.mu.html#L114'>emit-stack-from-top</a> right, out
 <span id="L93" class="LineNr">  93 </span><span class="Delimiter">}</span>
 <span id="L94" class="LineNr">  94 </span>
 <span id="L95" class="LineNr">  95 </span><span class="muComment"># dump stack from bottom to top</span>
-<span id="L96" class="LineNr">  96 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L96'>emit-stack-from-bottom</a></span> _self: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>), out: (addr stream byte) <span class="Delimiter">{</span>
-<span id="L97" class="LineNr">  97 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L98" class="LineNr">  98 </span>  <span class="PreProc">var</span> data-ah/<span class="muRegEdi">edi</span>: (addr handle array grapheme) <span class="Special">&lt;-</span> get self, data
-<span id="L99" class="LineNr">  99 </span>  <span class="PreProc">var</span> _data/eax: (addr array grapheme) <span class="Special">&lt;-</span> <a href='120allocate.subx.html#L235'>lookup</a> *data-ah
-<span id="L100" class="LineNr"> 100 </span>  <span class="PreProc">var</span> data/<span class="muRegEdi">edi</span>: (addr array grapheme) <span class="Special">&lt;-</span> copy _data
+<span id="L96" class="LineNr">  96 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L96'>emit-stack-from-bottom</a></span> _self: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>), out: (addr stream byte) <span class="Delimiter">{</span>
+<span id="L97" class="LineNr">  97 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> copy _self
+<span id="L98" class="LineNr">  98 </span>  <span class="PreProc">var</span> data-ah/<span class="muRegEdi">edi</span>: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> get self, data
+<span id="L99" class="LineNr">  99 </span>  <span class="PreProc">var</span> _data/eax: (addr array code-point-utf8) <span class="Special">&lt;-</span> <a href='120allocate.subx.html#L235'>lookup</a> *data-ah
+<span id="L100" class="LineNr"> 100 </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="L101" class="LineNr"> 101 </span>  <span class="PreProc">var</span> top-addr/<span class="muRegEcx">ecx</span>: (addr int) <span class="Special">&lt;-</span> get self, top
 <span id="L102" class="LineNr"> 102 </span>  <span class="PreProc">var</span> i/eax: int <span class="Special">&lt;-</span> copy <span class="Constant">0</span>
 <span id="L103" class="LineNr"> 103 </span>  <span class="Delimiter">{</span>
 <span id="L104" class="LineNr"> 104 </span>    compare i, *top-addr
 <span id="L105" class="LineNr"> 105 </span>    <span class="PreProc">break-if-&gt;=</span>
-<span id="L106" class="LineNr"> 106 </span>    <span class="PreProc">var</span> g/<span class="muRegEdx">edx</span>: (addr grapheme) <span class="Special">&lt;-</span> index data, i
-<span id="L107" class="LineNr"> 107 </span>    <a href='403unicode.mu.html#L339'>write-grapheme</a> out, *g
+<span id="L106" class="LineNr"> 106 </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="L107" class="LineNr"> 107 </span>    <a href='403unicode.mu.html#L389'>write-code-point-utf8</a> out, *g
 <span id="L108" class="LineNr"> 108 </span>    i <span class="Special">&lt;-</span> increment
 <span id="L109" class="LineNr"> 109 </span>    <span class="PreProc">loop</span>
 <span id="L110" class="LineNr"> 110 </span>  <span class="Delimiter">}</span>
 <span id="L111" class="LineNr"> 111 </span><span class="Delimiter">}</span>
 <span id="L112" class="LineNr"> 112 </span>
 <span id="L113" class="LineNr"> 113 </span><span class="muComment"># dump stack from top to bottom</span>
-<span id="L114" class="LineNr"> 114 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L114'>emit-stack-from-top</a></span> _self: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>), out: (addr stream byte) <span class="Delimiter">{</span>
-<span id="L115" class="LineNr"> 115 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L116" class="LineNr"> 116 </span>  <span class="PreProc">var</span> data-ah/<span class="muRegEdi">edi</span>: (addr handle array grapheme) <span class="Special">&lt;-</span> get self, data
-<span id="L117" class="LineNr"> 117 </span>  <span class="PreProc">var</span> _data/eax: (addr array grapheme) <span class="Special">&lt;-</span> <a href='120allocate.subx.html#L235'>lookup</a> *data-ah
-<span id="L118" class="LineNr"> 118 </span>  <span class="PreProc">var</span> data/<span class="muRegEdi">edi</span>: (addr array grapheme) <span class="Special">&lt;-</span> copy _data
+<span id="L114" class="LineNr"> 114 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L114'>emit-stack-from-top</a></span> _self: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>), out: (addr stream byte) <span class="Delimiter">{</span>
+<span id="L115" class="LineNr"> 115 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> copy _self
+<span id="L116" class="LineNr"> 116 </span>  <span class="PreProc">var</span> data-ah/<span class="muRegEdi">edi</span>: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> get self, data
+<span id="L117" class="LineNr"> 117 </span>  <span class="PreProc">var</span> _data/eax: (addr array code-point-utf8) <span class="Special">&lt;-</span> <a href='120allocate.subx.html#L235'>lookup</a> *data-ah
+<span id="L118" class="LineNr"> 118 </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="L119" class="LineNr"> 119 </span>  <span class="PreProc">var</span> top-addr/<span class="muRegEcx">ecx</span>: (addr int) <span class="Special">&lt;-</span> get self, top
 <span id="L120" class="LineNr"> 120 </span>  <span class="PreProc">var</span> i/eax: int <span class="Special">&lt;-</span> copy *top-addr
 <span id="L121" class="LineNr"> 121 </span>  i <span class="Special">&lt;-</span> decrement
 <span id="L122" class="LineNr"> 122 </span>  <span class="Delimiter">{</span>
 <span id="L123" class="LineNr"> 123 </span>    compare i, <span class="Constant">0</span>
 <span id="L124" class="LineNr"> 124 </span>    <span class="PreProc">break-if-&lt;</span>
-<span id="L125" class="LineNr"> 125 </span>    <span class="PreProc">var</span> g/<span class="muRegEdx">edx</span>: (addr grapheme) <span class="Special">&lt;-</span> index data, i
-<span id="L126" class="LineNr"> 126 </span>    <a href='403unicode.mu.html#L339'>write-grapheme</a> out, *g
+<span id="L125" class="LineNr"> 125 </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="L126" class="LineNr"> 126 </span>    <a href='403unicode.mu.html#L389'>write-code-point-utf8</a> out, *g
 <span id="L127" class="LineNr"> 127 </span>    i <span class="Special">&lt;-</span> decrement
 <span id="L128" class="LineNr"> 128 </span>    <span class="PreProc">loop</span>
 <span id="L129" class="LineNr"> 129 </span>  <span class="Delimiter">}</span>
@@ -197,16 +197,16 @@ if ('onhashchange' in window) {
 <span id="L133" class="LineNr"> 133 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L134" class="LineNr"> 134 </span>  <a href='106stream.subx.html#L20'>clear-stream</a> out
 <span id="L135" class="LineNr"> 135 </span>  <span class="Delimiter">{</span>
-<span id="L136" class="LineNr"> 136 </span>    <span class="PreProc">var</span> g/eax: grapheme <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L243'>grapheme-at-gap</a> self
-<span id="L137" class="LineNr"> 137 </span>    <span class="PreProc">var</span> at-word?/eax: boolean <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L334'>is-ascii-word-grapheme?</a> g
+<span id="L136" class="LineNr"> 136 </span>    <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L243'>code-point-utf8-at-gap</a> self
+<span id="L137" class="LineNr"> 137 </span>    <span class="PreProc">var</span> at-word?/eax: boolean <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L334'>is-ascii-word-code-point-utf8?</a> g
 <span id="L138" class="LineNr"> 138 </span>    compare at-word?, <span class="Constant">0</span>/false
 <span id="L139" class="LineNr"> 139 </span>    <span class="PreProc">break-if-!=</span>
 <span id="L140" class="LineNr"> 140 </span>    <span class="PreProc">return</span>
 <span id="L141" class="LineNr"> 141 </span>  <span class="Delimiter">}</span>
-<span id="L142" class="LineNr"> 142 </span>  <span class="PreProc">var</span> left/<span class="muRegEcx">ecx</span>: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get self, left
+<span id="L142" class="LineNr"> 142 </span>  <span class="PreProc">var</span> left/<span class="muRegEcx">ecx</span>: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get self, left
 <span id="L143" class="LineNr"> 143 </span>  <span class="PreProc">var</span> left-index/eax: int <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L275'>top-most-word</a> left
 <span id="L144" class="LineNr"> 144 </span>  <a href='514gap-buffer.mu.html#L297'>emit-stack-from-index</a> left, left-index, out
-<span id="L145" class="LineNr"> 145 </span>  <span class="PreProc">var</span> right/<span class="muRegEcx">ecx</span>: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get self, right
+<span id="L145" class="LineNr"> 145 </span>  <span class="PreProc">var</span> right/<span class="muRegEcx">ecx</span>: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get self, right
 <span id="L146" class="LineNr"> 146 </span>  <span class="PreProc">var</span> right-index/eax: int <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L275'>top-most-word</a> right
 <span id="L147" class="LineNr"> 147 </span>  <a href='514gap-buffer.mu.html#L314'>emit-stack-to-index</a> right, right-index, out
 <span id="L148" class="LineNr"> 148 </span><span class="Delimiter">}</span>
@@ -234,7 +234,7 @@ if ('onhashchange' in window) {
 <span id="L170" class="LineNr"> 170 </span>  <a href='109stream-equal.subx.html#L194'>check-stream-equal</a> out, <span class="Constant">&quot;abc&quot;</span>, <span class="Constant">&quot;F - test-word-at-gap-single-word-with-gap-at-start&quot;</span>
 <span id="L171" class="LineNr"> 171 </span><span class="Delimiter">}</span>
 <span id="L172" class="LineNr"> 172 </span>
-<span id="L173" class="LineNr"> 173 </span><span class="PreProc">fn</span> <span class="muTest"><a href='514gap-buffer.mu.html#L173'>test-word-at-gap-multiple-words-with-gap-at-non-word-grapheme-at-end</a></span> <span class="Delimiter">{</span>
+<span id="L173" class="LineNr"> 173 </span><span class="PreProc">fn</span> <span class="muTest"><a href='514gap-buffer.mu.html#L173'>test-word-at-gap-multiple-words-with-gap-at-non-word-code-point-utf8-at-end</a></span> <span class="Delimiter">{</span>
 <span id="L174" class="LineNr"> 174 </span>  <span class="PreProc">var</span> _g: <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>
 <span id="L175" class="LineNr"> 175 </span>  <span class="PreProc">var</span> g/<span class="muRegEsi">esi</span>: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Special">&lt;-</span> address _g
 <span id="L176" class="LineNr"> 176 </span>  <a href='514gap-buffer.mu.html#L52'>initialize-gap-buffer-with</a> g, <span class="Constant">&quot;abc &quot;</span>
@@ -242,10 +242,10 @@ if ('onhashchange' in window) {
 <span id="L178" class="LineNr"> 178 </span>  <span class="PreProc">var</span> out-storage: (stream byte <span class="Constant">0x10</span>)
 <span id="L179" class="LineNr"> 179 </span>  <span class="PreProc">var</span> out/eax: (addr stream byte) <span class="Special">&lt;-</span> address out-storage
 <span id="L180" class="LineNr"> 180 </span>  <a href='514gap-buffer.mu.html#L132'>word-at-gap</a> g, out
-<span id="L181" class="LineNr"> 181 </span>  <a href='109stream-equal.subx.html#L194'>check-stream-equal</a> out, <span class="Constant">&quot;&quot;</span>, <span class="Constant">&quot;F - test-word-at-gap-multiple-words-with-gap-at-non-word-grapheme-at-end&quot;</span>
+<span id="L181" class="LineNr"> 181 </span>  <a href='109stream-equal.subx.html#L194'>check-stream-equal</a> out, <span class="Constant">&quot;&quot;</span>, <span class="Constant">&quot;F - test-word-at-gap-multiple-words-with-gap-at-non-word-code-point-utf8-at-end&quot;</span>
 <span id="L182" class="LineNr"> 182 </span><span class="Delimiter">}</span>
 <span id="L183" class="LineNr"> 183 </span>
-<span id="L184" class="LineNr"> 184 </span><span class="PreProc">fn</span> <span class="muTest"><a href='514gap-buffer.mu.html#L184'>test-word-at-gap-multiple-words-with-gap-at-non-word-grapheme-at-start</a></span> <span class="Delimiter">{</span>
+<span id="L184" class="LineNr"> 184 </span><span class="PreProc">fn</span> <span class="muTest"><a href='514gap-buffer.mu.html#L184'>test-word-at-gap-multiple-words-with-gap-at-non-word-code-point-utf8-at-start</a></span> <span class="Delimiter">{</span>
 <span id="L185" class="LineNr"> 185 </span>  <span class="PreProc">var</span> _g: <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>
 <span id="L186" class="LineNr"> 186 </span>  <span class="PreProc">var</span> g/<span class="muRegEsi">esi</span>: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Special">&lt;-</span> address _g
 <span id="L187" class="LineNr"> 187 </span>  <a href='514gap-buffer.mu.html#L52'>initialize-gap-buffer-with</a> g, <span class="Constant">&quot; abc&quot;</span>
@@ -254,7 +254,7 @@ if ('onhashchange' in window) {
 <span id="L190" class="LineNr"> 190 </span>  <span class="PreProc">var</span> out-storage: (stream byte <span class="Constant">0x10</span>)
 <span id="L191" class="LineNr"> 191 </span>  <span class="PreProc">var</span> out/eax: (addr stream byte) <span class="Special">&lt;-</span> address out-storage
 <span id="L192" class="LineNr"> 192 </span>  <a href='514gap-buffer.mu.html#L132'>word-at-gap</a> g, out
-<span id="L193" class="LineNr"> 193 </span>  <a href='109stream-equal.subx.html#L194'>check-stream-equal</a> out, <span class="Constant">&quot;&quot;</span>, <span class="Constant">&quot;F - test-word-at-gap-multiple-words-with-gap-at-non-word-grapheme-at-start&quot;</span>
+<span id="L193" class="LineNr"> 193 </span>  <a href='109stream-equal.subx.html#L194'>check-stream-equal</a> out, <span class="Constant">&quot;&quot;</span>, <span class="Constant">&quot;F - test-word-at-gap-multiple-words-with-gap-at-non-word-code-point-utf8-at-start&quot;</span>
 <span id="L194" class="LineNr"> 194 </span><span class="Delimiter">}</span>
 <span id="L195" class="LineNr"> 195 </span>
 <span id="L196" class="LineNr"> 196 </span><span class="PreProc">fn</span> <span class="muTest"><a href='514gap-buffer.mu.html#L196'>test-word-at-gap-multiple-words-with-gap-at-end</a></span> <span class="Delimiter">{</span>
@@ -284,7 +284,7 @@ if ('onhashchange' in window) {
 <span id="L220" class="LineNr"> 220 </span>  <span class="PreProc">var</span> _g: <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>
 <span id="L221" class="LineNr"> 221 </span>  <span class="PreProc">var</span> g/<span class="muRegEsi">esi</span>: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Special">&lt;-</span> address _g
 <span id="L222" class="LineNr"> 222 </span>  <a href='514gap-buffer.mu.html#L52'>initialize-gap-buffer-with</a> g, <span class="Constant">&quot;a bc d&quot;</span>
-<span id="L223" class="LineNr"> 223 </span>  <span class="PreProc">var</span> dummy/eax: grapheme <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L495'>gap-left</a> g
+<span id="L223" class="LineNr"> 223 </span>  <span class="PreProc">var</span> dummy/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L495'>gap-left</a> g
 <span id="L224" class="LineNr"> 224 </span>  <span class="muComment"># gap is at final word</span>
 <span id="L225" class="LineNr"> 225 </span>  <span class="PreProc">var</span> out-storage: (stream byte <span class="Constant">0x10</span>)
 <span id="L226" class="LineNr"> 226 </span>  <span class="PreProc">var</span> out/eax: (addr stream byte) <span class="Special">&lt;-</span> address out-storage
@@ -296,7 +296,7 @@ if ('onhashchange' in window) {
 <span id="L232" class="LineNr"> 232 </span>  <span class="PreProc">var</span> _g: <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>
 <span id="L233" class="LineNr"> 233 </span>  <span class="PreProc">var</span> g/<span class="muRegEsi">esi</span>: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Special">&lt;-</span> address _g
 <span id="L234" class="LineNr"> 234 </span>  <a href='514gap-buffer.mu.html#L52'>initialize-gap-buffer-with</a> g, <span class="Constant">&quot;abc &quot;</span>
-<span id="L235" class="LineNr"> 235 </span>  <span class="PreProc">var</span> dummy/eax: grapheme <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L495'>gap-left</a> g
+<span id="L235" class="LineNr"> 235 </span>  <span class="PreProc">var</span> dummy/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L495'>gap-left</a> g
 <span id="L236" class="LineNr"> 236 </span>  <span class="muComment"># gap is at final word</span>
 <span id="L237" class="LineNr"> 237 </span>  <span class="PreProc">var</span> out-storage: (stream byte <span class="Constant">0x10</span>)
 <span id="L238" class="LineNr"> 238 </span>  <span class="PreProc">var</span> out/eax: (addr stream byte) <span class="Special">&lt;-</span> address out-storage
@@ -304,51 +304,51 @@ if ('onhashchange' in window) {
 <span id="L240" class="LineNr"> 240 </span>  <a href='109stream-equal.subx.html#L194'>check-stream-equal</a> out, <span class="Constant">&quot;&quot;</span>, <span class="Constant">&quot;F - test-word-at-gap-multiple-words-with-gap-at-final-non-word&quot;</span>
 <span id="L241" class="LineNr"> 241 </span><span class="Delimiter">}</span>
 <span id="L242" class="LineNr"> 242 </span>
-<span id="L243" class="LineNr"> 243 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L243'>grapheme-at-gap</a></span> _self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: grapheme <span class="Delimiter">{</span>
+<span id="L243" class="LineNr"> 243 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L243'>code-point-utf8-at-gap</a></span> _self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: code-point-utf8 <span class="Delimiter">{</span>
 <span id="L244" class="LineNr"> 244 </span>  <span class="muComment"># send top of right most of the time</span>
 <span id="L245" class="LineNr"> 245 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L246" class="LineNr"> 246 </span>  <span class="PreProc">var</span> right/<span class="muRegEdi">edi</span>: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get self, right
-<span id="L247" class="LineNr"> 247 </span>  <span class="PreProc">var</span> data-ah/eax: (addr handle array grapheme) <span class="Special">&lt;-</span> get right, data
-<span id="L248" class="LineNr"> 248 </span>  <span class="PreProc">var</span> data/eax: (addr array grapheme) <span class="Special">&lt;-</span> <a href='120allocate.subx.html#L235'>lookup</a> *data-ah
+<span id="L246" class="LineNr"> 246 </span>  <span class="PreProc">var</span> right/<span class="muRegEdi">edi</span>: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get self, right
+<span id="L247" class="LineNr"> 247 </span>  <span class="PreProc">var</span> data-ah/eax: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> get right, data
+<span id="L248" class="LineNr"> 248 </span>  <span class="PreProc">var</span> data/eax: (addr array code-point-utf8) <span class="Special">&lt;-</span> <a href='120allocate.subx.html#L235'>lookup</a> *data-ah
 <span id="L249" class="LineNr"> 249 </span>  <span class="PreProc">var</span> top-addr/<span class="muRegEcx">ecx</span>: (addr int) <span class="Special">&lt;-</span> get right, top
 <span id="L250" class="LineNr"> 250 </span>  <span class="Delimiter">{</span>
 <span id="L251" class="LineNr"> 251 </span>    compare *top-addr, <span class="Constant">0</span>
 <span id="L252" class="LineNr"> 252 </span>    <span class="PreProc">break-if-&lt;=</span>
 <span id="L253" class="LineNr"> 253 </span>    <span class="PreProc">var</span> top/<span class="muRegEcx">ecx</span>: int <span class="Special">&lt;-</span> copy *top-addr
 <span id="L254" class="LineNr"> 254 </span>    top <span class="Special">&lt;-</span> decrement
-<span id="L255" class="LineNr"> 255 </span>    <span class="PreProc">var</span> result/eax: (addr grapheme) <span class="Special">&lt;-</span> index data, top
+<span id="L255" class="LineNr"> 255 </span>    <span class="PreProc">var</span> result/eax: (addr code-point-utf8) <span class="Special">&lt;-</span> index data, top
 <span id="L256" class="LineNr"> 256 </span>    <span class="PreProc">return</span> *result
 <span id="L257" class="LineNr"> 257 </span>  <span class="Delimiter">}</span>
 <span id="L258" class="LineNr"> 258 </span>  <span class="muComment"># send top of left only if right is empty</span>
-<span id="L259" class="LineNr"> 259 </span>  <span class="PreProc">var</span> left/<span class="muRegEdi">edi</span>: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get self, left
-<span id="L260" class="LineNr"> 260 </span>  <span class="PreProc">var</span> data-ah/eax: (addr handle array grapheme) <span class="Special">&lt;-</span> get left, data
-<span id="L261" class="LineNr"> 261 </span>  <span class="PreProc">var</span> data/eax: (addr array grapheme) <span class="Special">&lt;-</span> <a href='120allocate.subx.html#L235'>lookup</a> *data-ah
+<span id="L259" class="LineNr"> 259 </span>  <span class="PreProc">var</span> left/<span class="muRegEdi">edi</span>: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get self, left
+<span id="L260" class="LineNr"> 260 </span>  <span class="PreProc">var</span> data-ah/eax: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> get left, data
+<span id="L261" class="LineNr"> 261 </span>  <span class="PreProc">var</span> data/eax: (addr array code-point-utf8) <span class="Special">&lt;-</span> <a href='120allocate.subx.html#L235'>lookup</a> *data-ah
 <span id="L262" class="LineNr"> 262 </span>  <span class="PreProc">var</span> top-addr/<span class="muRegEcx">ecx</span>: (addr int) <span class="Special">&lt;-</span> get left, top
 <span id="L263" class="LineNr"> 263 </span>  <span class="Delimiter">{</span>
 <span id="L264" class="LineNr"> 264 </span>    compare *top-addr, <span class="Constant">0</span>
 <span id="L265" class="LineNr"> 265 </span>    <span class="PreProc">break-if-&lt;=</span>
 <span id="L266" class="LineNr"> 266 </span>    <span class="PreProc">var</span> top/<span class="muRegEcx">ecx</span>: int <span class="Special">&lt;-</span> copy *top-addr
 <span id="L267" class="LineNr"> 267 </span>    top <span class="Special">&lt;-</span> decrement
-<span id="L268" class="LineNr"> 268 </span>    <span class="PreProc">var</span> result/eax: (addr grapheme) <span class="Special">&lt;-</span> index data, top
+<span id="L268" class="LineNr"> 268 </span>    <span class="PreProc">var</span> result/eax: (addr code-point-utf8) <span class="Special">&lt;-</span> index data, top
 <span id="L269" class="LineNr"> 269 </span>    <span class="PreProc">return</span> *result
 <span id="L270" class="LineNr"> 270 </span>  <span class="Delimiter">}</span>
 <span id="L271" class="LineNr"> 271 </span>  <span class="muComment"># send null if everything is empty</span>
 <span id="L272" class="LineNr"> 272 </span>  <span class="PreProc">return</span> <span class="Constant">0</span>
 <span id="L273" class="LineNr"> 273 </span><span class="Delimiter">}</span>
 <span id="L274" class="LineNr"> 274 </span>
-<span id="L275" class="LineNr"> 275 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L275'>top-most-word</a></span> _self: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>)<span class="PreProc"> -&gt; </span>_/eax: int <span class="Delimiter">{</span>
-<span id="L276" class="LineNr"> 276 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L277" class="LineNr"> 277 </span>  <span class="PreProc">var</span> data-ah/<span class="muRegEdi">edi</span>: (addr handle array grapheme) <span class="Special">&lt;-</span> get self, data
-<span id="L278" class="LineNr"> 278 </span>  <span class="PreProc">var</span> _data/eax: (addr array grapheme) <span class="Special">&lt;-</span> <a href='120allocate.subx.html#L235'>lookup</a> *data-ah
-<span id="L279" class="LineNr"> 279 </span>  <span class="PreProc">var</span> data/<span class="muRegEdi">edi</span>: (addr array grapheme) <span class="Special">&lt;-</span> copy _data
+<span id="L275" class="LineNr"> 275 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L275'>top-most-word</a></span> _self: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>)<span class="PreProc"> -&gt; </span>_/eax: int <span class="Delimiter">{</span>
+<span id="L276" class="LineNr"> 276 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> copy _self
+<span id="L277" class="LineNr"> 277 </span>  <span class="PreProc">var</span> data-ah/<span class="muRegEdi">edi</span>: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> get self, data
+<span id="L278" class="LineNr"> 278 </span>  <span class="PreProc">var</span> _data/eax: (addr array code-point-utf8) <span class="Special">&lt;-</span> <a href='120allocate.subx.html#L235'>lookup</a> *data-ah
+<span id="L279" class="LineNr"> 279 </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="L280" class="LineNr"> 280 </span>  <span class="PreProc">var</span> top-addr/<span class="muRegEcx">ecx</span>: (addr int) <span class="Special">&lt;-</span> get self, top
 <span id="L281" class="LineNr"> 281 </span>  <span class="PreProc">var</span> i/<span class="muRegEbx">ebx</span>: int <span class="Special">&lt;-</span> copy *top-addr
 <span id="L282" class="LineNr"> 282 </span>  i <span class="Special">&lt;-</span> decrement
 <span id="L283" class="LineNr"> 283 </span>  <span class="Delimiter">{</span>
 <span id="L284" class="LineNr"> 284 </span>    compare i, <span class="Constant">0</span>
 <span id="L285" class="LineNr"> 285 </span>    <span class="PreProc">break-if-&lt;</span>
-<span id="L286" class="LineNr"> 286 </span>    <span class="PreProc">var</span> g/<span class="muRegEdx">edx</span>: (addr grapheme) <span class="Special">&lt;-</span> index data, i
-<span id="L287" class="LineNr"> 287 </span>    <span class="PreProc">var</span> is-word?/eax: boolean <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L334'>is-ascii-word-grapheme?</a> *g
+<span id="L286" class="LineNr"> 286 </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="L287" class="LineNr"> 287 </span>    <span class="PreProc">var</span> is-word?/eax: boolean <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L334'>is-ascii-word-code-point-utf8?</a> *g
 <span id="L288" class="LineNr"> 288 </span>    compare is-word?, <span class="Constant">0</span>/false
 <span id="L289" class="LineNr"> 289 </span>    <span class="PreProc">break-if-=</span>
 <span id="L290" class="LineNr"> 290 </span>    i <span class="Special">&lt;-</span> decrement
@@ -358,28 +358,28 @@ if ('onhashchange' in window) {
 <span id="L294" class="LineNr"> 294 </span>  <span class="PreProc">return</span> i
 <span id="L295" class="LineNr"> 295 </span><span class="Delimiter">}</span>
 <span id="L296" class="LineNr"> 296 </span>
-<span id="L297" class="LineNr"> 297 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L297'>emit-stack-from-index</a></span> _self: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>), start: int, out: (addr stream byte) <span class="Delimiter">{</span>
-<span id="L298" class="LineNr"> 298 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L299" class="LineNr"> 299 </span>  <span class="PreProc">var</span> data-ah/<span class="muRegEdi">edi</span>: (addr handle array grapheme) <span class="Special">&lt;-</span> get self, data
-<span id="L300" class="LineNr"> 300 </span>  <span class="PreProc">var</span> _data/eax: (addr array grapheme) <span class="Special">&lt;-</span> <a href='120allocate.subx.html#L235'>lookup</a> *data-ah
-<span id="L301" class="LineNr"> 301 </span>  <span class="PreProc">var</span> data/<span class="muRegEdi">edi</span>: (addr array grapheme) <span class="Special">&lt;-</span> copy _data
+<span id="L297" class="LineNr"> 297 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L297'>emit-stack-from-index</a></span> _self: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>), start: int, out: (addr stream byte) <span class="Delimiter">{</span>
+<span id="L298" class="LineNr"> 298 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> copy _self
+<span id="L299" class="LineNr"> 299 </span>  <span class="PreProc">var</span> data-ah/<span class="muRegEdi">edi</span>: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> get self, data
+<span id="L300" class="LineNr"> 300 </span>  <span class="PreProc">var</span> _data/eax: (addr array code-point-utf8) <span class="Special">&lt;-</span> <a href='120allocate.subx.html#L235'>lookup</a> *data-ah
+<span id="L301" class="LineNr"> 301 </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="L302" class="LineNr"> 302 </span>  <span class="PreProc">var</span> top-addr/<span class="muRegEcx">ecx</span>: (addr int) <span class="Special">&lt;-</span> get self, top
 <span id="L303" class="LineNr"> 303 </span>  <span class="PreProc">var</span> i/eax: int <span class="Special">&lt;-</span> copy start
 <span id="L304" class="LineNr"> 304 </span>  <span class="Delimiter">{</span>
 <span id="L305" class="LineNr"> 305 </span>    compare i, *top-addr
 <span id="L306" class="LineNr"> 306 </span>    <span class="PreProc">break-if-&gt;=</span>
-<span id="L307" class="LineNr"> 307 </span>    <span class="PreProc">var</span> g/<span class="muRegEdx">edx</span>: (addr grapheme) <span class="Special">&lt;-</span> index data, i
-<span id="L308" class="LineNr"> 308 </span>    <a href='403unicode.mu.html#L339'>write-grapheme</a> out, *g
+<span id="L307" class="LineNr"> 307 </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="L308" class="LineNr"> 308 </span>    <a href='403unicode.mu.html#L389'>write-code-point-utf8</a> out, *g
 <span id="L309" class="LineNr"> 309 </span>    i <span class="Special">&lt;-</span> increment
 <span id="L310" class="LineNr"> 310 </span>    <span class="PreProc">loop</span>
 <span id="L311" class="LineNr"> 311 </span>  <span class="Delimiter">}</span>
 <span id="L312" class="LineNr"> 312 </span><span class="Delimiter">}</span>
 <span id="L313" class="LineNr"> 313 </span>
-<span id="L314" class="LineNr"> 314 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L314'>emit-stack-to-index</a></span> _self: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>), end: int, out: (addr stream byte) <span class="Delimiter">{</span>
-<span id="L315" class="LineNr"> 315 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L316" class="LineNr"> 316 </span>  <span class="PreProc">var</span> data-ah/<span class="muRegEdi">edi</span>: (addr handle array grapheme) <span class="Special">&lt;-</span> get self, data
-<span id="L317" class="LineNr"> 317 </span>  <span class="PreProc">var</span> _data/eax: (addr array grapheme) <span class="Special">&lt;-</span> <a href='120allocate.subx.html#L235'>lookup</a> *data-ah
-<span id="L318" class="LineNr"> 318 </span>  <span class="PreProc">var</span> data/<span class="muRegEdi">edi</span>: (addr array grapheme) <span class="Special">&lt;-</span> copy _data
+<span id="L314" class="LineNr"> 314 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L314'>emit-stack-to-index</a></span> _self: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>), end: int, out: (addr stream byte) <span class="Delimiter">{</span>
+<span id="L315" class="LineNr"> 315 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> copy _self
+<span id="L316" class="LineNr"> 316 </span>  <span class="PreProc">var</span> data-ah/<span class="muRegEdi">edi</span>: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> get self, data
+<span id="L317" class="LineNr"> 317 </span>  <span class="PreProc">var</span> _data/eax: (addr array code-point-utf8) <span class="Special">&lt;-</span> <a href='120allocate.subx.html#L235'>lookup</a> *data-ah
+<span id="L318" class="LineNr"> 318 </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="L319" class="LineNr"> 319 </span>  <span class="PreProc">var</span> top-addr/<span class="muRegEcx">ecx</span>: (addr int) <span class="Special">&lt;-</span> get self, top
 <span id="L320" class="LineNr"> 320 </span>  <span class="PreProc">var</span> i/eax: int <span class="Special">&lt;-</span> copy *top-addr
 <span id="L321" class="LineNr"> 321 </span>  i <span class="Special">&lt;-</span> decrement
@@ -388,14 +388,14 @@ if ('onhashchange' in window) {
 <span id="L324" class="LineNr"> 324 </span>    <span class="PreProc">break-if-&lt;</span>
 <span id="L325" class="LineNr"> 325 </span>    compare i, end
 <span id="L326" class="LineNr"> 326 </span>    <span class="PreProc">break-if-&lt;</span>
-<span id="L327" class="LineNr"> 327 </span>    <span class="PreProc">var</span> g/<span class="muRegEdx">edx</span>: (addr grapheme) <span class="Special">&lt;-</span> index data, i
-<span id="L328" class="LineNr"> 328 </span>    <a href='403unicode.mu.html#L339'>write-grapheme</a> out, *g
+<span id="L327" class="LineNr"> 327 </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="L328" class="LineNr"> 328 </span>    <a href='403unicode.mu.html#L389'>write-code-point-utf8</a> out, *g
 <span id="L329" class="LineNr"> 329 </span>    i <span class="Special">&lt;-</span> decrement
 <span id="L330" class="LineNr"> 330 </span>    <span class="PreProc">loop</span>
 <span id="L331" class="LineNr"> 331 </span>  <span class="Delimiter">}</span>
 <span id="L332" class="LineNr"> 332 </span><span class="Delimiter">}</span>
 <span id="L333" class="LineNr"> 333 </span>
-<span id="L334" class="LineNr"> 334 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L334'>is-ascii-word-grapheme?</a></span> g: grapheme<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
+<span id="L334" class="LineNr"> 334 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L334'>is-ascii-word-code-point-utf8?</a></span> g: code-point-utf8<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
 <span id="L335" class="LineNr"> 335 </span>  compare g, <span class="Constant">0x21</span>/!
 <span id="L336" class="LineNr"> 336 </span>  <span class="Delimiter">{</span>
 <span id="L337" class="LineNr"> 337 </span>    <span class="PreProc">break-if-!=</span>
@@ -448,14 +448,14 @@ if ('onhashchange' in window) {
 <span id="L384" class="LineNr"> 384 </span><span class="muComment"># cursor is a single other color.</span>
 <span id="L385" class="LineNr"> 385 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L385'>render-gap-buffer-wrapping-right-then-down</a></span> <a href='500fake-screen.mu.html#L16'>screen</a>: (addr <a href='500fake-screen.mu.html#L16'>screen</a>), _gap: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>), xmin: int, ymin: int, xmax: int, ymax: int, render-cursor?: boolean, color: int, background-color: int<span class="PreProc"> -&gt; </span>_/eax: int, _/<span class="muRegEcx">ecx</span>: int <span class="Delimiter">{</span>
 <span id="L386" class="LineNr"> 386 </span>  <span class="PreProc">var</span> gap/<span class="muRegEsi">esi</span>: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _gap
-<span id="L387" class="LineNr"> 387 </span>  <span class="PreProc">var</span> left/<span class="muRegEdx">edx</span>: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get gap, left
+<span id="L387" class="LineNr"> 387 </span>  <span class="PreProc">var</span> left/<span class="muRegEdx">edx</span>: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get gap, left
 <span id="L388" class="LineNr"> 388 </span>  <span class="PreProc">var</span> <a href='514gap-buffer.mu.html#L942'>highlight-matching-open-paren?</a>/<span class="muRegEbx">ebx</span>: boolean <span class="Special">&lt;-</span> copy <span class="Constant">0</span>/false
 <span id="L389" class="LineNr"> 389 </span>  <span class="PreProc">var</span> matching-open-paren-depth/<span class="muRegEdi">edi</span>: int <span class="Special">&lt;-</span> copy <span class="Constant">0</span>
 <span id="L390" class="LineNr"> 390 </span>  <a href='514gap-buffer.mu.html#L942'>highlight-matching-open-paren?</a>, matching-open-paren-depth <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L942'>highlight-matching-open-paren?</a> gap, render-cursor?
 <span id="L391" class="LineNr"> 391 </span>  <span class="PreProc">var</span> x2/eax: int <span class="Special">&lt;-</span> copy <span class="Constant">0</span>
 <span id="L392" class="LineNr"> 392 </span>  <span class="PreProc">var</span> y2/<span class="muRegEcx">ecx</span>: int <span class="Special">&lt;-</span> copy <span class="Constant">0</span>
 <span id="L393" class="LineNr"> 393 </span>  x2, y2 <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L87'>render-stack-from-bottom-wrapping-right-then-down</a> <a href='500fake-screen.mu.html#L16'>screen</a>, left, xmin, ymin, xmax, ymax, xmin, ymin, <a href='514gap-buffer.mu.html#L942'>highlight-matching-open-paren?</a>, matching-open-paren-depth, color, background-color
-<span id="L394" class="LineNr"> 394 </span>  <span class="PreProc">var</span> right/<span class="muRegEdx">edx</span>: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get gap, right
+<span id="L394" class="LineNr"> 394 </span>  <span class="PreProc">var</span> right/<span class="muRegEdx">edx</span>: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get gap, right
 <span id="L395" class="LineNr"> 395 </span>  x2, y2 <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L143'>render-stack-from-top-wrapping-right-then-down</a> <a href='500fake-screen.mu.html#L16'>screen</a>, right, xmin, ymin, xmax, ymax, x2, y2, render-cursor?, color, background-color
 <span id="L396" class="LineNr"> 396 </span>  <span class="muComment"># decide whether we still need to print a cursor</span>
 <span id="L397" class="LineNr"> 397 </span>  <span class="PreProc">var</span> fg/<span class="muRegEdi">edi</span>: int <span class="Special">&lt;-</span> copy color
@@ -463,17 +463,17 @@ if ('onhashchange' in window) {
 <span id="L399" class="LineNr"> 399 </span>  compare render-cursor?, <span class="Constant">0</span>/false
 <span id="L400" class="LineNr"> 400 </span>  <span class="Delimiter">{</span>
 <span id="L401" class="LineNr"> 401 </span>    <span class="PreProc">break-if-=</span>
-<span id="L402" class="LineNr"> 402 </span>    <span class="muComment"># if the right side is empty, grapheme stack didn't print the cursor</span>
-<span id="L403" class="LineNr"> 403 </span>    <span class="PreProc">var</span> empty?/eax: boolean <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L22'>grapheme-stack-empty?</a> right
+<span id="L402" class="LineNr"> 402 </span>    <span class="muComment"># if the right side is empty, code-point-utf8 stack didn't print the cursor</span>
+<span id="L403" class="LineNr"> 403 </span>    <span class="PreProc">var</span> empty?/eax: boolean <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L22'>code-point-utf8-stack-empty?</a> right
 <span id="L404" class="LineNr"> 404 </span>    compare empty?, <span class="Constant">0</span>/false
 <span id="L405" class="LineNr"> 405 </span>    <span class="PreProc">break-if-=</span>
 <span id="L406" class="LineNr"> 406 </span>    <span class="muComment"># swap foreground and background</span>
 <span id="L407" class="LineNr"> 407 </span>    fg <span class="Special">&lt;-</span> copy background-color
 <span id="L408" class="LineNr"> 408 </span>    bg <span class="Special">&lt;-</span> copy color
 <span id="L409" class="LineNr"> 409 </span>  <span class="Delimiter">}</span>
-<span id="L410" class="LineNr"> 410 </span>  <span class="muComment"># print a grapheme either way so that cursor position doesn't affect printed width</span>
+<span id="L410" class="LineNr"> 410 </span>  <span class="muComment"># print a code-point-utf8 either way so that cursor position doesn't affect printed width</span>
 <span id="L411" class="LineNr"> 411 </span>  <span class="PreProc">var</span> space/<span class="muRegEdx">edx</span>: code-point <span class="Special">&lt;-</span> copy <span class="Constant">0x20</span>
-<span id="L412" class="LineNr"> 412 </span>  x2, y2 <span class="Special">&lt;-</span> <a href='501draw-text.mu.html#L162'>render-code-point</a> <a href='500fake-screen.mu.html#L16'>screen</a>, space, xmin, ymin, xmax, ymax, x2, y2, fg, bg
+<span id="L412" class="LineNr"> 412 </span>  x2, y2 <span class="Special">&lt;-</span> <a href='501draw-text.mu.html#L155'>render-code-point</a> <a href='500fake-screen.mu.html#L16'>screen</a>, space, xmin, ymin, xmax, ymax, x2, y2, fg, bg
 <span id="L413" class="LineNr"> 413 </span>  <span class="PreProc">return</span> x2, y2
 <span id="L414" class="LineNr"> 414 </span><span class="Delimiter">}</span>
 <span id="L415" class="LineNr"> 415 </span>
@@ -491,30 +491,30 @@ if ('onhashchange' in window) {
 <span id="L427" class="LineNr"> 427 </span>
 <span id="L428" class="LineNr"> 428 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L428'>gap-buffer-length</a></span> _gap: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: int <span class="Delimiter">{</span>
 <span id="L429" class="LineNr"> 429 </span>  <span class="PreProc">var</span> gap/<span class="muRegEsi">esi</span>: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _gap
-<span id="L430" class="LineNr"> 430 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get gap, left
+<span id="L430" class="LineNr"> 430 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get gap, left
 <span id="L431" class="LineNr"> 431 </span>  <span class="PreProc">var</span> tmp/eax: (addr int) <span class="Special">&lt;-</span> get left, top
 <span id="L432" class="LineNr"> 432 </span>  <span class="PreProc">var</span> left-length/<span class="muRegEcx">ecx</span>: int <span class="Special">&lt;-</span> copy *tmp
-<span id="L433" class="LineNr"> 433 </span>  <span class="PreProc">var</span> right/<span class="muRegEsi">esi</span>: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get gap, right
+<span id="L433" class="LineNr"> 433 </span>  <span class="PreProc">var</span> right/<span class="muRegEsi">esi</span>: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get gap, right
 <span id="L434" class="LineNr"> 434 </span>  tmp <span class="Special">&lt;-</span> get right, top
 <span id="L435" class="LineNr"> 435 </span>  <span class="PreProc">var</span> result/eax: int <span class="Special">&lt;-</span> copy *tmp
 <span id="L436" class="LineNr"> 436 </span>  result <span class="Special">&lt;-</span> add left-length
 <span id="L437" class="LineNr"> 437 </span>  <span class="PreProc">return</span> result
 <span id="L438" class="LineNr"> 438 </span><span class="Delimiter">}</span>
 <span id="L439" class="LineNr"> 439 </span>
-<span id="L440" class="LineNr"> 440 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L440'>add-grapheme-at-gap</a></span> _self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>), g: grapheme <span class="Delimiter">{</span>
+<span id="L440" class="LineNr"> 440 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L440'>add-code-point-utf8-at-gap</a></span> _self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>), g: code-point-utf8 <span class="Delimiter">{</span>
 <span id="L441" class="LineNr"> 441 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L442" class="LineNr"> 442 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get self, left
-<span id="L443" class="LineNr"> 443 </span>  <a href='513grapheme-stack.mu.html#L39'>push-grapheme-stack</a> left, g
+<span id="L442" class="LineNr"> 442 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get self, left
+<span id="L443" class="LineNr"> 443 </span>  <a href='513grapheme-stack.mu.html#L39'>push-code-point-utf8-stack</a> left, g
 <span id="L444" class="LineNr"> 444 </span><span class="Delimiter">}</span>
 <span id="L445" class="LineNr"> 445 </span>
 <span id="L446" class="LineNr"> 446 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L446'>add-code-point-at-gap</a></span> self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>), c: code-point <span class="Delimiter">{</span>
-<span id="L447" class="LineNr"> 447 </span>  <span class="PreProc">var</span> g/eax: grapheme <span class="Special">&lt;-</span> copy c
-<span id="L448" class="LineNr"> 448 </span>  <a href='514gap-buffer.mu.html#L440'>add-grapheme-at-gap</a> self, g
+<span id="L447" class="LineNr"> 447 </span>  <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> copy c
+<span id="L448" class="LineNr"> 448 </span>  <a href='514gap-buffer.mu.html#L440'>add-code-point-utf8-at-gap</a> self, g
 <span id="L449" class="LineNr"> 449 </span><span class="Delimiter">}</span>
 <span id="L450" class="LineNr"> 450 </span>
 <span id="L451" class="LineNr"> 451 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L451'>gap-to-start</a></span> self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Delimiter">{</span>
 <span id="L452" class="LineNr"> 452 </span>  <span class="Delimiter">{</span>
-<span id="L453" class="LineNr"> 453 </span>    <span class="PreProc">var</span> curr/eax: grapheme <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L495'>gap-left</a> self
+<span id="L453" class="LineNr"> 453 </span>    <span class="PreProc">var</span> curr/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L495'>gap-left</a> self
 <span id="L454" class="LineNr"> 454 </span>    compare curr, <span class="Constant">-1</span>
 <span id="L455" class="LineNr"> 455 </span>    <span class="PreProc">loop-if-!=</span>
 <span id="L456" class="LineNr"> 456 </span>  <span class="Delimiter">}</span>
@@ -522,7 +522,7 @@ if ('onhashchange' in window) {
 <span id="L458" class="LineNr"> 458 </span>
 <span id="L459" class="LineNr"> 459 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L459'>gap-to-end</a></span> self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Delimiter">{</span>
 <span id="L460" class="LineNr"> 460 </span>  <span class="Delimiter">{</span>
-<span id="L461" class="LineNr"> 461 </span>    <span class="PreProc">var</span> curr/eax: grapheme <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L481'>gap-right</a> self
+<span id="L461" class="LineNr"> 461 </span>    <span class="PreProc">var</span> curr/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L481'>gap-right</a> self
 <span id="L462" class="LineNr"> 462 </span>    compare curr, <span class="Constant">-1</span>
 <span id="L463" class="LineNr"> 463 </span>    <span class="PreProc">loop-if-!=</span>
 <span id="L464" class="LineNr"> 464 </span>  <span class="Delimiter">}</span>
@@ -530,96 +530,96 @@ if ('onhashchange' in window) {
 <span id="L466" class="LineNr"> 466 </span>
 <span id="L467" class="LineNr"> 467 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L467'>gap-at-start?</a></span> _self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
 <span id="L468" class="LineNr"> 468 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L469" class="LineNr"> 469 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get self, left
-<span id="L470" class="LineNr"> 470 </span>  <span class="PreProc">var</span> result/eax: boolean <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L22'>grapheme-stack-empty?</a> left
+<span id="L469" class="LineNr"> 469 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get self, left
+<span id="L470" class="LineNr"> 470 </span>  <span class="PreProc">var</span> result/eax: boolean <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L22'>code-point-utf8-stack-empty?</a> left
 <span id="L471" class="LineNr"> 471 </span>  <span class="PreProc">return</span> result
 <span id="L472" class="LineNr"> 472 </span><span class="Delimiter">}</span>
 <span id="L473" class="LineNr"> 473 </span>
 <span id="L474" class="LineNr"> 474 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L474'>gap-at-end?</a></span> _self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
 <span id="L475" class="LineNr"> 475 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L476" class="LineNr"> 476 </span>  <span class="PreProc">var</span> right/eax: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get self, right
-<span id="L477" class="LineNr"> 477 </span>  <span class="PreProc">var</span> result/eax: boolean <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L22'>grapheme-stack-empty?</a> right
+<span id="L476" class="LineNr"> 476 </span>  <span class="PreProc">var</span> right/eax: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get self, right
+<span id="L477" class="LineNr"> 477 </span>  <span class="PreProc">var</span> result/eax: boolean <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L22'>code-point-utf8-stack-empty?</a> right
 <span id="L478" class="LineNr"> 478 </span>  <span class="PreProc">return</span> result
 <span id="L479" class="LineNr"> 479 </span><span class="Delimiter">}</span>
 <span id="L480" class="LineNr"> 480 </span>
-<span id="L481" class="LineNr"> 481 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L481'>gap-right</a></span> _self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: grapheme <span class="Delimiter">{</span>
+<span id="L481" class="LineNr"> 481 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L481'>gap-right</a></span> _self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: code-point-utf8 <span class="Delimiter">{</span>
 <span id="L482" class="LineNr"> 482 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L483" class="LineNr"> 483 </span>  <span class="PreProc">var</span> g/eax: grapheme <span class="Special">&lt;-</span> copy <span class="Constant">0</span>
-<span id="L484" class="LineNr"> 484 </span>  <span class="PreProc">var</span> right/<span class="muRegEcx">ecx</span>: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get self, right
-<span id="L485" class="LineNr"> 485 </span>  g <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L51'>pop-grapheme-stack</a> right
+<span id="L483" class="LineNr"> 483 </span>  <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> copy <span class="Constant">0</span>
+<span id="L484" class="LineNr"> 484 </span>  <span class="PreProc">var</span> right/<span class="muRegEcx">ecx</span>: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get self, right
+<span id="L485" class="LineNr"> 485 </span>  g <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L51'>pop-code-point-utf8-stack</a> right
 <span id="L486" class="LineNr"> 486 </span>  compare g, <span class="Constant">-1</span>
 <span id="L487" class="LineNr"> 487 </span>  <span class="Delimiter">{</span>
 <span id="L488" class="LineNr"> 488 </span>    <span class="PreProc">break-if-=</span>
-<span id="L489" class="LineNr"> 489 </span>    <span class="PreProc">var</span> left/<span class="muRegEcx">ecx</span>: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get self, left
-<span id="L490" class="LineNr"> 490 </span>    <a href='513grapheme-stack.mu.html#L39'>push-grapheme-stack</a> left, g
+<span id="L489" class="LineNr"> 489 </span>    <span class="PreProc">var</span> left/<span class="muRegEcx">ecx</span>: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get self, left
+<span id="L490" class="LineNr"> 490 </span>    <a href='513grapheme-stack.mu.html#L39'>push-code-point-utf8-stack</a> left, g
 <span id="L491" class="LineNr"> 491 </span>  <span class="Delimiter">}</span>
 <span id="L492" class="LineNr"> 492 </span>  <span class="PreProc">return</span> g
 <span id="L493" class="LineNr"> 493 </span><span class="Delimiter">}</span>
 <span id="L494" class="LineNr"> 494 </span>
-<span id="L495" class="LineNr"> 495 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L495'>gap-left</a></span> _self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: grapheme <span class="Delimiter">{</span>
+<span id="L495" class="LineNr"> 495 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L495'>gap-left</a></span> _self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: code-point-utf8 <span class="Delimiter">{</span>
 <span id="L496" class="LineNr"> 496 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L497" class="LineNr"> 497 </span>  <span class="PreProc">var</span> g/eax: grapheme <span class="Special">&lt;-</span> copy <span class="Constant">0</span>
+<span id="L497" class="LineNr"> 497 </span>  <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> copy <span class="Constant">0</span>
 <span id="L498" class="LineNr"> 498 </span>  <span class="Delimiter">{</span>
-<span id="L499" class="LineNr"> 499 </span>    <span class="PreProc">var</span> left/<span class="muRegEcx">ecx</span>: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get self, left
-<span id="L500" class="LineNr"> 500 </span>    g <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L51'>pop-grapheme-stack</a> left
+<span id="L499" class="LineNr"> 499 </span>    <span class="PreProc">var</span> left/<span class="muRegEcx">ecx</span>: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get self, left
+<span id="L500" class="LineNr"> 500 </span>    g <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L51'>pop-code-point-utf8-stack</a> left
 <span id="L501" class="LineNr"> 501 </span>  <span class="Delimiter">}</span>
 <span id="L502" class="LineNr"> 502 </span>  compare g, <span class="Constant">-1</span>
 <span id="L503" class="LineNr"> 503 </span>  <span class="Delimiter">{</span>
 <span id="L504" class="LineNr"> 504 </span>    <span class="PreProc">break-if-=</span>
-<span id="L505" class="LineNr"> 505 </span>    <span class="PreProc">var</span> right/<span class="muRegEcx">ecx</span>: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get self, right
-<span id="L506" class="LineNr"> 506 </span>    <a href='513grapheme-stack.mu.html#L39'>push-grapheme-stack</a> right, g
+<span id="L505" class="LineNr"> 505 </span>    <span class="PreProc">var</span> right/<span class="muRegEcx">ecx</span>: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get self, right
+<span id="L506" class="LineNr"> 506 </span>    <a href='513grapheme-stack.mu.html#L39'>push-code-point-utf8-stack</a> right, g
 <span id="L507" class="LineNr"> 507 </span>  <span class="Delimiter">}</span>
 <span id="L508" class="LineNr"> 508 </span>  <span class="PreProc">return</span> g
 <span id="L509" class="LineNr"> 509 </span><span class="Delimiter">}</span>
 <span id="L510" class="LineNr"> 510 </span>
 <span id="L511" class="LineNr"> 511 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L511'>index-of-gap</a></span> _self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: int <span class="Delimiter">{</span>
 <span id="L512" class="LineNr"> 512 </span>  <span class="PreProc">var</span> self/eax: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L513" class="LineNr"> 513 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get self, left
+<span id="L513" class="LineNr"> 513 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get self, left
 <span id="L514" class="LineNr"> 514 </span>  <span class="PreProc">var</span> top-addr/eax: (addr int) <span class="Special">&lt;-</span> get left, top
 <span id="L515" class="LineNr"> 515 </span>  <span class="PreProc">var</span> result/eax: int <span class="Special">&lt;-</span> copy *top-addr
 <span id="L516" class="LineNr"> 516 </span>  <span class="PreProc">return</span> result
 <span id="L517" class="LineNr"> 517 </span><span class="Delimiter">}</span>
 <span id="L518" class="LineNr"> 518 </span>
-<span id="L519" class="LineNr"> 519 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L519'>first-grapheme-in-gap-buffer</a></span> _self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: grapheme <span class="Delimiter">{</span>
+<span id="L519" class="LineNr"> 519 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L519'>first-code-point-utf8-in-gap-buffer</a></span> _self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: code-point-utf8 <span class="Delimiter">{</span>
 <span id="L520" class="LineNr"> 520 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L521" class="LineNr"> 521 </span>  <span class="muComment"># try to read from left</span>
-<span id="L522" class="LineNr"> 522 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get self, left
+<span id="L522" class="LineNr"> 522 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get self, left
 <span id="L523" class="LineNr"> 523 </span>  <span class="PreProc">var</span> top-addr/<span class="muRegEcx">ecx</span>: (addr int) <span class="Special">&lt;-</span> get left, top
 <span id="L524" class="LineNr"> 524 </span>  compare *top-addr, <span class="Constant">0</span>
 <span id="L525" class="LineNr"> 525 </span>  <span class="Delimiter">{</span>
 <span id="L526" class="LineNr"> 526 </span>    <span class="PreProc">break-if-&lt;=</span>
-<span id="L527" class="LineNr"> 527 </span>    <span class="PreProc">var</span> data-ah/eax: (addr handle array grapheme) <span class="Special">&lt;-</span> get left, data
-<span id="L528" class="LineNr"> 528 </span>    <span class="PreProc">var</span> data/eax: (addr array grapheme) <span class="Special">&lt;-</span> <a href='120allocate.subx.html#L235'>lookup</a> *data-ah
-<span id="L529" class="LineNr"> 529 </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="L527" class="LineNr"> 527 </span>    <span class="PreProc">var</span> data-ah/eax: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> get left, data
+<span id="L528" class="LineNr"> 528 </span>    <span class="PreProc">var</span> data/eax: (addr array code-point-utf8) <span class="Special">&lt;-</span> <a href='120allocate.subx.html#L235'>lookup</a> *data-ah
+<span id="L529" class="LineNr"> 529 </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="L530" class="LineNr"> 530 </span>    <span class="PreProc">return</span> *result-addr
 <span id="L531" class="LineNr"> 531 </span>  <span class="Delimiter">}</span>
 <span id="L532" class="LineNr"> 532 </span>  <span class="muComment"># try to read from right</span>
-<span id="L533" class="LineNr"> 533 </span>  <span class="PreProc">var</span> right/eax: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get self, right
+<span id="L533" class="LineNr"> 533 </span>  <span class="PreProc">var</span> right/eax: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get self, right
 <span id="L534" class="LineNr"> 534 </span>  top-addr <span class="Special">&lt;-</span> get right, top
 <span id="L535" class="LineNr"> 535 </span>  compare *top-addr, <span class="Constant">0</span>
 <span id="L536" class="LineNr"> 536 </span>  <span class="Delimiter">{</span>
 <span id="L537" class="LineNr"> 537 </span>    <span class="PreProc">break-if-&lt;=</span>
-<span id="L538" class="LineNr"> 538 </span>    <span class="PreProc">var</span> data-ah/eax: (addr handle array grapheme) <span class="Special">&lt;-</span> get right, data
-<span id="L539" class="LineNr"> 539 </span>    <span class="PreProc">var</span> data/eax: (addr array grapheme) <span class="Special">&lt;-</span> <a href='120allocate.subx.html#L235'>lookup</a> *data-ah
+<span id="L538" class="LineNr"> 538 </span>    <span class="PreProc">var</span> data-ah/eax: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> get right, data
+<span id="L539" class="LineNr"> 539 </span>    <span class="PreProc">var</span> data/eax: (addr array code-point-utf8) <span class="Special">&lt;-</span> <a href='120allocate.subx.html#L235'>lookup</a> *data-ah
 <span id="L540" class="LineNr"> 540 </span>    <span class="PreProc">var</span> top/<span class="muRegEcx">ecx</span>: int <span class="Special">&lt;-</span> copy *top-addr
 <span id="L541" class="LineNr"> 541 </span>    top <span class="Special">&lt;-</span> decrement
-<span id="L542" class="LineNr"> 542 </span>    <span class="PreProc">var</span> result-addr/eax: (addr grapheme) <span class="Special">&lt;-</span> index data, top
+<span id="L542" class="LineNr"> 542 </span>    <span class="PreProc">var</span> result-addr/eax: (addr code-point-utf8) <span class="Special">&lt;-</span> index data, top
 <span id="L543" class="LineNr"> 543 </span>    <span class="PreProc">return</span> *result-addr
 <span id="L544" class="LineNr"> 544 </span>  <span class="Delimiter">}</span>
 <span id="L545" class="LineNr"> 545 </span>  <span class="muComment"># give up</span>
 <span id="L546" class="LineNr"> 546 </span>  <span class="PreProc">return</span> <span class="Constant">-1</span>
 <span id="L547" class="LineNr"> 547 </span><span class="Delimiter">}</span>
 <span id="L548" class="LineNr"> 548 </span>
-<span id="L549" class="LineNr"> 549 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L549'>grapheme-before-cursor-in-gap-buffer</a></span> _self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: grapheme <span class="Delimiter">{</span>
+<span id="L549" class="LineNr"> 549 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L549'>code-point-utf8-before-cursor-in-gap-buffer</a></span> _self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: code-point-utf8 <span class="Delimiter">{</span>
 <span id="L550" class="LineNr"> 550 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L551" class="LineNr"> 551 </span>  <span class="muComment"># try to read from left</span>
-<span id="L552" class="LineNr"> 552 </span>  <span class="PreProc">var</span> left/<span class="muRegEcx">ecx</span>: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get self, left
+<span id="L552" class="LineNr"> 552 </span>  <span class="PreProc">var</span> left/<span class="muRegEcx">ecx</span>: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get self, left
 <span id="L553" class="LineNr"> 553 </span>  <span class="PreProc">var</span> top-addr/<span class="muRegEdx">edx</span>: (addr int) <span class="Special">&lt;-</span> get left, top
 <span id="L554" class="LineNr"> 554 </span>  compare *top-addr, <span class="Constant">0</span>
 <span id="L555" class="LineNr"> 555 </span>  <span class="Delimiter">{</span>
 <span id="L556" class="LineNr"> 556 </span>    <span class="PreProc">break-if-&lt;=</span>
-<span id="L557" class="LineNr"> 557 </span>    <span class="PreProc">var</span> result/eax: grapheme <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L51'>pop-grapheme-stack</a> left
-<span id="L558" class="LineNr"> 558 </span>    <a href='513grapheme-stack.mu.html#L39'>push-grapheme-stack</a> left, result
+<span id="L557" class="LineNr"> 557 </span>    <span class="PreProc">var</span> result/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L51'>pop-code-point-utf8-stack</a> left
+<span id="L558" class="LineNr"> 558 </span>    <a href='513grapheme-stack.mu.html#L39'>push-code-point-utf8-stack</a> left, result
 <span id="L559" class="LineNr"> 559 </span>    <span class="PreProc">return</span> result
 <span id="L560" class="LineNr"> 560 </span>  <span class="Delimiter">}</span>
 <span id="L561" class="LineNr"> 561 </span>  <span class="muComment"># give up</span>
@@ -628,27 +628,27 @@ if ('onhashchange' in window) {
 <span id="L564" class="LineNr"> 564 </span>
 <span id="L565" class="LineNr"> 565 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L565'>delete-before-gap</a></span> _self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Delimiter">{</span>
 <span id="L566" class="LineNr"> 566 </span>  <span class="PreProc">var</span> self/eax: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L567" class="LineNr"> 567 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get self, left
-<span id="L568" class="LineNr"> 568 </span>  <span class="PreProc">var</span> dummy/eax: grapheme <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L51'>pop-grapheme-stack</a> left
+<span id="L567" class="LineNr"> 567 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get self, left
+<span id="L568" class="LineNr"> 568 </span>  <span class="PreProc">var</span> dummy/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L51'>pop-code-point-utf8-stack</a> left
 <span id="L569" class="LineNr"> 569 </span><span class="Delimiter">}</span>
 <span id="L570" class="LineNr"> 570 </span>
-<span id="L571" class="LineNr"> 571 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L571'>pop-after-gap</a></span> _self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: grapheme <span class="Delimiter">{</span>
+<span id="L571" class="LineNr"> 571 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L571'>pop-after-gap</a></span> _self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: code-point-utf8 <span class="Delimiter">{</span>
 <span id="L572" class="LineNr"> 572 </span>  <span class="PreProc">var</span> self/eax: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L573" class="LineNr"> 573 </span>  <span class="PreProc">var</span> right/eax: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get self, right
-<span id="L574" class="LineNr"> 574 </span>  <span class="PreProc">var</span> result/eax: grapheme <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L51'>pop-grapheme-stack</a> right
+<span id="L573" class="LineNr"> 573 </span>  <span class="PreProc">var</span> right/eax: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get self, right
+<span id="L574" class="LineNr"> 574 </span>  <span class="PreProc">var</span> result/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L51'>pop-code-point-utf8-stack</a> right
 <span id="L575" class="LineNr"> 575 </span>  <span class="PreProc">return</span> result
 <span id="L576" class="LineNr"> 576 </span><span class="Delimiter">}</span>
 <span id="L577" class="LineNr"> 577 </span>
 <span id="L578" class="LineNr"> 578 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L578'>gap-buffer-equal?</a></span> _self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>), s: (addr array byte)<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
 <span id="L579" class="LineNr"> 579 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L580" class="LineNr"> 580 </span>  <span class="muComment"># complication: graphemes may be multiple bytes</span>
+<span id="L580" class="LineNr"> 580 </span>  <span class="muComment"># complication: code-point-utf8s may be multiple bytes</span>
 <span id="L581" class="LineNr"> 581 </span>  <span class="muComment"># so don't rely on length</span>
 <span id="L582" class="LineNr"> 582 </span>  <span class="muComment"># instead turn the expected result into a stream and arrange to read from it in order</span>
 <span id="L583" class="LineNr"> 583 </span>  <span class="PreProc">var</span> stream-storage: (stream byte <span class="Constant">0x10</span>/capacity)
 <span id="L584" class="LineNr"> 584 </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="L585" class="LineNr"> 585 </span>  <a href='108write.subx.html#L11'>write</a> expected-stream, s
 <span id="L586" class="LineNr"> 586 </span>  <span class="muComment"># compare left</span>
-<span id="L587" class="LineNr"> 587 </span>  <span class="PreProc">var</span> left/<span class="muRegEdx">edx</span>: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get self, left
+<span id="L587" class="LineNr"> 587 </span>  <span class="PreProc">var</span> left/<span class="muRegEdx">edx</span>: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get self, left
 <span id="L588" class="LineNr"> 588 </span>  <span class="PreProc">var</span> result/eax: boolean <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L497'>prefix-match?</a> left, expected-stream
 <span id="L589" class="LineNr"> 589 </span>  compare result, <span class="Constant">0</span>/false
 <span id="L590" class="LineNr"> 590 </span>  <span class="Delimiter">{</span>
@@ -656,7 +656,7 @@ if ('onhashchange' in window) {
 <span id="L592" class="LineNr"> 592 </span>    <span class="PreProc">return</span> result
 <span id="L593" class="LineNr"> 593 </span>  <span class="Delimiter">}</span>
 <span id="L594" class="LineNr"> 594 </span>  <span class="muComment"># compare right</span>
-<span id="L595" class="LineNr"> 595 </span>  <span class="PreProc">var</span> right/<span class="muRegEdx">edx</span>: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get self, right
+<span id="L595" class="LineNr"> 595 </span>  <span class="PreProc">var</span> right/<span class="muRegEdx">edx</span>: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get self, right
 <span id="L596" class="LineNr"> 596 </span>  result <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L525'>suffix-match?</a> right, expected-stream
 <span id="L597" class="LineNr"> 597 </span>  compare result, <span class="Constant">0</span>/false
 <span id="L598" class="LineNr"> 598 </span>  <span class="Delimiter">{</span>
@@ -689,7 +689,7 @@ if ('onhashchange' in window) {
 <span id="L625" class="LineNr"> 625 </span>  <a href='514gap-buffer.mu.html#L446'>add-code-point-at-gap</a> g, <span class="Constant">0x61</span>/a
 <span id="L626" class="LineNr"> 626 </span>  <a href='514gap-buffer.mu.html#L446'>add-code-point-at-gap</a> g, <span class="Constant">0x61</span>/a
 <span id="L627" class="LineNr"> 627 </span>  <a href='514gap-buffer.mu.html#L446'>add-code-point-at-gap</a> g, <span class="Constant">0x61</span>/a
-<span id="L628" class="LineNr"> 628 </span>  <span class="PreProc">var</span> dummy/eax: grapheme <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L495'>gap-left</a> g
+<span id="L628" class="LineNr"> 628 </span>  <span class="PreProc">var</span> dummy/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L495'>gap-left</a> g
 <span id="L629" class="LineNr"> 629 </span>  <span class="muComment"># gap is in the middle</span>
 <span id="L630" class="LineNr"> 630 </span>  <span class="PreProc">var</span> result/eax: boolean <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L578'>gap-buffer-equal?</a> g, <span class="Constant">&quot;aaa&quot;</span>
 <span id="L631" class="LineNr"> 631 </span>  <a href='502test.mu.html#L19'>check</a> result, <span class="Constant">&quot;F - test-gap-buffer-equal-from-middle&quot;</span>
@@ -703,7 +703,7 @@ if ('onhashchange' in window) {
 <span id="L639" class="LineNr"> 639 </span>  <a href='514gap-buffer.mu.html#L446'>add-code-point-at-gap</a> g, <span class="Constant">0x61</span>/a
 <span id="L640" class="LineNr"> 640 </span>  <a href='514gap-buffer.mu.html#L446'>add-code-point-at-gap</a> g, <span class="Constant">0x61</span>/a
 <span id="L641" class="LineNr"> 641 </span>  <a href='514gap-buffer.mu.html#L446'>add-code-point-at-gap</a> g, <span class="Constant">0x61</span>/a
-<span id="L642" class="LineNr"> 642 </span>  <span class="PreProc">var</span> dummy/eax: grapheme <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L495'>gap-left</a> g
+<span id="L642" class="LineNr"> 642 </span>  <span class="PreProc">var</span> dummy/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L495'>gap-left</a> g
 <span id="L643" class="LineNr"> 643 </span>  dummy <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L495'>gap-left</a> g
 <span id="L644" class="LineNr"> 644 </span>  dummy <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L495'>gap-left</a> g
 <span id="L645" class="LineNr"> 645 </span>  <span class="muComment"># gap is at the start</span>
@@ -738,9 +738,9 @@ if ('onhashchange' in window) {
 <span id="L674" class="LineNr"> 674 </span>    compare i, len
 <span id="L675" class="LineNr"> 675 </span>    <span class="PreProc">break-if-&gt;=</span>
 <span id="L676" class="LineNr"> 676 </span>    <span class="Delimiter">{</span>
-<span id="L677" class="LineNr"> 677 </span>      <span class="PreProc">var</span> tmp/eax: grapheme <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L690'>gap-index</a> self, i
-<span id="L678" class="LineNr"> 678 </span>      <span class="PreProc">var</span> curr/<span class="muRegEcx">ecx</span>: grapheme <span class="Special">&lt;-</span> copy tmp
-<span id="L679" class="LineNr"> 679 </span>      <span class="PreProc">var</span> currg/eax: grapheme <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L690'>gap-index</a> g, i
+<span id="L677" class="LineNr"> 677 </span>      <span class="PreProc">var</span> tmp/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L690'>gap-index</a> self, i
+<span id="L678" class="LineNr"> 678 </span>      <span class="PreProc">var</span> curr/<span class="muRegEcx">ecx</span>: code-point-utf8 <span class="Special">&lt;-</span> copy tmp
+<span id="L679" class="LineNr"> 679 </span>      <span class="PreProc">var</span> currg/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L690'>gap-index</a> g, i
 <span id="L680" class="LineNr"> 680 </span>      compare curr, currg
 <span id="L681" class="LineNr"> 681 </span>      <span class="PreProc">break-if-=</span>
 <span id="L682" class="LineNr"> 682 </span>      <span class="PreProc">return</span> <span class="Constant">0</span>/false
@@ -751,36 +751,36 @@ if ('onhashchange' in window) {
 <span id="L687" class="LineNr"> 687 </span>  <span class="PreProc">return</span> <span class="Constant">1</span>/true
 <span id="L688" class="LineNr"> 688 </span><span class="Delimiter">}</span>
 <span id="L689" class="LineNr"> 689 </span>
-<span id="L690" class="LineNr"> 690 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L690'>gap-index</a></span> _self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>), _n: int<span class="PreProc"> -&gt; </span>_/eax: grapheme <span class="Delimiter">{</span>
+<span id="L690" class="LineNr"> 690 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L690'>gap-index</a></span> _self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>), _n: int<span class="PreProc"> -&gt; </span>_/eax: code-point-utf8 <span class="Delimiter">{</span>
 <span id="L691" class="LineNr"> 691 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L692" class="LineNr"> 692 </span>  <span class="PreProc">var</span> n/<span class="muRegEbx">ebx</span>: int <span class="Special">&lt;-</span> copy _n
 <span id="L693" class="LineNr"> 693 </span>  <span class="muComment"># if n &lt; left-&gt;length, index into left</span>
-<span id="L694" class="LineNr"> 694 </span>  <span class="PreProc">var</span> left/<span class="muRegEdi">edi</span>: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get self, left
+<span id="L694" class="LineNr"> 694 </span>  <span class="PreProc">var</span> left/<span class="muRegEdi">edi</span>: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get self, left
 <span id="L695" class="LineNr"> 695 </span>  <span class="PreProc">var</span> left-len-a/<span class="muRegEdx">edx</span>: (addr int) <span class="Special">&lt;-</span> get left, top
 <span id="L696" class="LineNr"> 696 </span>  compare n, *left-len-a
 <span id="L697" class="LineNr"> 697 </span>  <span class="Delimiter">{</span>
 <span id="L698" class="LineNr"> 698 </span>    <span class="PreProc">break-if-&gt;=</span>
-<span id="L699" class="LineNr"> 699 </span>    <span class="PreProc">var</span> data-ah/eax: (addr handle array grapheme) <span class="Special">&lt;-</span> get left, data
-<span id="L700" class="LineNr"> 700 </span>    <span class="PreProc">var</span> data/eax: (addr array grapheme) <span class="Special">&lt;-</span> <a href='120allocate.subx.html#L235'>lookup</a> *data-ah
-<span id="L701" class="LineNr"> 701 </span>    <span class="PreProc">var</span> result/eax: (addr grapheme) <span class="Special">&lt;-</span> index data, n
+<span id="L699" class="LineNr"> 699 </span>    <span class="PreProc">var</span> data-ah/eax: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> get left, data
+<span id="L700" class="LineNr"> 700 </span>    <span class="PreProc">var</span> data/eax: (addr array code-point-utf8) <span class="Special">&lt;-</span> <a href='120allocate.subx.html#L235'>lookup</a> *data-ah
+<span id="L701" class="LineNr"> 701 </span>    <span class="PreProc">var</span> result/eax: (addr code-point-utf8) <span class="Special">&lt;-</span> index data, n
 <span id="L702" class="LineNr"> 702 </span>    <span class="PreProc">return</span> *result
 <span id="L703" class="LineNr"> 703 </span>  <span class="Delimiter">}</span>
 <span id="L704" class="LineNr"> 704 </span>  <span class="muComment"># shrink n</span>
 <span id="L705" class="LineNr"> 705 </span>  n <span class="Special">&lt;-</span> subtract *left-len-a
 <span id="L706" class="LineNr"> 706 </span>  <span class="muComment"># if n &lt; right-&gt;length, index into right</span>
-<span id="L707" class="LineNr"> 707 </span>  <span class="PreProc">var</span> right/<span class="muRegEdi">edi</span>: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get self, right
+<span id="L707" class="LineNr"> 707 </span>  <span class="PreProc">var</span> right/<span class="muRegEdi">edi</span>: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get self, right
 <span id="L708" class="LineNr"> 708 </span>  <span class="PreProc">var</span> right-len-a/<span class="muRegEdx">edx</span>: (addr int) <span class="Special">&lt;-</span> get right, top
 <span id="L709" class="LineNr"> 709 </span>  compare n, *right-len-a
 <span id="L710" class="LineNr"> 710 </span>  <span class="Delimiter">{</span>
 <span id="L711" class="LineNr"> 711 </span>    <span class="PreProc">break-if-&gt;=</span>
-<span id="L712" class="LineNr"> 712 </span>    <span class="PreProc">var</span> data-ah/eax: (addr handle array grapheme) <span class="Special">&lt;-</span> get right, data
-<span id="L713" class="LineNr"> 713 </span>    <span class="PreProc">var</span> data/eax: (addr array grapheme) <span class="Special">&lt;-</span> <a href='120allocate.subx.html#L235'>lookup</a> *data-ah
+<span id="L712" class="LineNr"> 712 </span>    <span class="PreProc">var</span> data-ah/eax: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> get right, data
+<span id="L713" class="LineNr"> 713 </span>    <span class="PreProc">var</span> data/eax: (addr array code-point-utf8) <span class="Special">&lt;-</span> <a href='120allocate.subx.html#L235'>lookup</a> *data-ah
 <span id="L714" class="LineNr"> 714 </span>    <span class="muComment"># idx = right-&gt;len - n - 1</span>
 <span id="L715" class="LineNr"> 715 </span>    <span class="PreProc">var</span> idx/<span class="muRegEbx">ebx</span>: int <span class="Special">&lt;-</span> copy n
 <span id="L716" class="LineNr"> 716 </span>    idx <span class="Special">&lt;-</span> subtract *right-len-a
 <span id="L717" class="LineNr"> 717 </span>    idx <span class="Special">&lt;-</span> negate
 <span id="L718" class="LineNr"> 718 </span>    idx <span class="Special">&lt;-</span> subtract <span class="Constant">1</span>
-<span id="L719" class="LineNr"> 719 </span>    <span class="PreProc">var</span> result/eax: (addr grapheme) <span class="Special">&lt;-</span> index data, idx
+<span id="L719" class="LineNr"> 719 </span>    <span class="PreProc">var</span> result/eax: (addr code-point-utf8) <span class="Special">&lt;-</span> index data, idx
 <span id="L720" class="LineNr"> 720 </span>    <span class="PreProc">return</span> *result
 <span id="L721" class="LineNr"> 721 </span>  <span class="Delimiter">}</span>
 <span id="L722" class="LineNr"> 722 </span>  <span class="muComment"># error</span>
@@ -821,25 +821,25 @@ if ('onhashchange' in window) {
 <span id="L757" class="LineNr"> 757 </span>  <span class="PreProc">var</span> gap/<span class="muRegEsi">esi</span>: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Special">&lt;-</span> address gap-storage
 <span id="L758" class="LineNr"> 758 </span>  <a href='514gap-buffer.mu.html#L52'>initialize-gap-buffer-with</a> gap, <span class="Constant">&quot;abc&quot;</span>
 <span id="L759" class="LineNr"> 759 </span>  <span class="muComment"># gap is at end, all contents are in left</span>
-<span id="L760" class="LineNr"> 760 </span>  <span class="PreProc">var</span> g/eax: grapheme <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L690'>gap-index</a> gap, <span class="Constant">0</span>
+<span id="L760" class="LineNr"> 760 </span>  <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L690'>gap-index</a> gap, <span class="Constant">0</span>
 <span id="L761" class="LineNr"> 761 </span>  <span class="PreProc">var</span> x/<span class="muRegEcx">ecx</span>: int <span class="Special">&lt;-</span> copy g
 <span id="L762" class="LineNr"> 762 </span>  <a href='502test.mu.html#L2'>check-ints-equal</a> x, <span class="Constant">0x61</span>/a, <span class="Constant">&quot;F - test-gap-index/left-1&quot;</span>
-<span id="L763" class="LineNr"> 763 </span>  <span class="PreProc">var</span> g/eax: grapheme <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L690'>gap-index</a> gap, <span class="Constant">1</span>
+<span id="L763" class="LineNr"> 763 </span>  <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L690'>gap-index</a> gap, <span class="Constant">1</span>
 <span id="L764" class="LineNr"> 764 </span>  <span class="PreProc">var</span> x/<span class="muRegEcx">ecx</span>: int <span class="Special">&lt;-</span> copy g
 <span id="L765" class="LineNr"> 765 </span>  <a href='502test.mu.html#L2'>check-ints-equal</a> x, <span class="Constant">0x62</span>/b, <span class="Constant">&quot;F - test-gap-index/left-2&quot;</span>
-<span id="L766" class="LineNr"> 766 </span>  <span class="PreProc">var</span> g/eax: grapheme <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L690'>gap-index</a> gap, <span class="Constant">2</span>
+<span id="L766" class="LineNr"> 766 </span>  <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L690'>gap-index</a> gap, <span class="Constant">2</span>
 <span id="L767" class="LineNr"> 767 </span>  <span class="PreProc">var</span> x/<span class="muRegEcx">ecx</span>: int <span class="Special">&lt;-</span> copy g
 <span id="L768" class="LineNr"> 768 </span>  <a href='502test.mu.html#L2'>check-ints-equal</a> x, <span class="Constant">0x63</span>/c, <span class="Constant">&quot;F - test-gap-index/left-3&quot;</span>
 <span id="L769" class="LineNr"> 769 </span>  <span class="muComment"># now check when everything is to the right</span>
 <span id="L770" class="LineNr"> 770 </span>  <a href='514gap-buffer.mu.html#L451'>gap-to-start</a> gap
 <span id="L771" class="LineNr"> 771 </span>  <a href='514gap-buffer.mu.html#L1014'>rewind-gap-buffer</a> gap
-<span id="L772" class="LineNr"> 772 </span>  <span class="PreProc">var</span> g/eax: grapheme <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L690'>gap-index</a> gap, <span class="Constant">0</span>
+<span id="L772" class="LineNr"> 772 </span>  <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L690'>gap-index</a> gap, <span class="Constant">0</span>
 <span id="L773" class="LineNr"> 773 </span>  <span class="PreProc">var</span> x/<span class="muRegEcx">ecx</span>: int <span class="Special">&lt;-</span> copy g
 <span id="L774" class="LineNr"> 774 </span>  <a href='502test.mu.html#L2'>check-ints-equal</a> x, <span class="Constant">0x61</span>/a, <span class="Constant">&quot;F - test-gap-index/right-1&quot;</span>
-<span id="L775" class="LineNr"> 775 </span>  <span class="PreProc">var</span> g/eax: grapheme <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L690'>gap-index</a> gap, <span class="Constant">1</span>
+<span id="L775" class="LineNr"> 775 </span>  <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L690'>gap-index</a> gap, <span class="Constant">1</span>
 <span id="L776" class="LineNr"> 776 </span>  <span class="PreProc">var</span> x/<span class="muRegEcx">ecx</span>: int <span class="Special">&lt;-</span> copy g
 <span id="L777" class="LineNr"> 777 </span>  <a href='502test.mu.html#L2'>check-ints-equal</a> x, <span class="Constant">0x62</span>/b, <span class="Constant">&quot;F - test-gap-index/right-2&quot;</span>
-<span id="L778" class="LineNr"> 778 </span>  <span class="PreProc">var</span> g/eax: grapheme <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L690'>gap-index</a> gap, <span class="Constant">2</span>
+<span id="L778" class="LineNr"> 778 </span>  <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L690'>gap-index</a> gap, <span class="Constant">2</span>
 <span id="L779" class="LineNr"> 779 </span>  <span class="PreProc">var</span> x/<span class="muRegEcx">ecx</span>: int <span class="Special">&lt;-</span> copy g
 <span id="L780" class="LineNr"> 780 </span>  <a href='502test.mu.html#L2'>check-ints-equal</a> x, <span class="Constant">0x63</span>/c, <span class="Constant">&quot;F - test-gap-index/right-3&quot;</span>
 <span id="L781" class="LineNr"> 781 </span><span class="Delimiter">}</span>
@@ -852,25 +852,25 @@ if ('onhashchange' in window) {
 <span id="L788" class="LineNr"> 788 </span>  <span class="PreProc">var</span> dest-ah/eax: (addr handle <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _dest-ah
 <span id="L789" class="LineNr"> 789 </span>  <span class="PreProc">var</span> _dest-a/eax: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Special">&lt;-</span> <a href='120allocate.subx.html#L235'>lookup</a> *dest-ah
 <span id="L790" class="LineNr"> 790 </span>  <span class="PreProc">var</span> dest-a/<span class="muRegEdi">edi</span>: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _dest-a
-<span id="L791" class="LineNr"> 791 </span>  <span class="muComment"># copy left grapheme-stack</span>
-<span id="L792" class="LineNr"> 792 </span>  <span class="PreProc">var</span> src/<span class="muRegEcx">ecx</span>: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get src-a, left
-<span id="L793" class="LineNr"> 793 </span>  <span class="PreProc">var</span> dest/<span class="muRegEdx">edx</span>: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get dest-a, left
-<span id="L794" class="LineNr"> 794 </span>  <a href='513grapheme-stack.mu.html#L67'>copy-grapheme-stack</a> src, dest
-<span id="L795" class="LineNr"> 795 </span>  <span class="muComment"># copy right grapheme-stack</span>
+<span id="L791" class="LineNr"> 791 </span>  <span class="muComment"># copy left code-point-utf8-stack</span>
+<span id="L792" class="LineNr"> 792 </span>  <span class="PreProc">var</span> src/<span class="muRegEcx">ecx</span>: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get src-a, left
+<span id="L793" class="LineNr"> 793 </span>  <span class="PreProc">var</span> dest/<span class="muRegEdx">edx</span>: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get dest-a, left
+<span id="L794" class="LineNr"> 794 </span>  <a href='513grapheme-stack.mu.html#L67'>copy-code-point-utf8-stack</a> src, dest
+<span id="L795" class="LineNr"> 795 </span>  <span class="muComment"># copy right code-point-utf8-stack</span>
 <span id="L796" class="LineNr"> 796 </span>  src <span class="Special">&lt;-</span> get src-a, right
 <span id="L797" class="LineNr"> 797 </span>  dest <span class="Special">&lt;-</span> get dest-a, right
-<span id="L798" class="LineNr"> 798 </span>  <a href='513grapheme-stack.mu.html#L67'>copy-grapheme-stack</a> src, dest
+<span id="L798" class="LineNr"> 798 </span>  <a href='513grapheme-stack.mu.html#L67'>copy-code-point-utf8-stack</a> src, dest
 <span id="L799" class="LineNr"> 799 </span><span class="Delimiter">}</span>
 <span id="L800" class="LineNr"> 800 </span>
 <span id="L801" class="LineNr"> 801 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L801'>gap-buffer-is-decimal-integer?</a></span> _self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
 <span id="L802" class="LineNr"> 802 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L803" class="LineNr"> 803 </span>  <span class="PreProc">var</span> curr/<span class="muRegEcx">ecx</span>: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get self, left
-<span id="L804" class="LineNr"> 804 </span>  <span class="PreProc">var</span> result/eax: boolean <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L552'>grapheme-stack-is-decimal-integer?</a> curr
+<span id="L803" class="LineNr"> 803 </span>  <span class="PreProc">var</span> curr/<span class="muRegEcx">ecx</span>: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get self, left
+<span id="L804" class="LineNr"> 804 </span>  <span class="PreProc">var</span> result/eax: boolean <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L552'>code-point-utf8-stack-is-decimal-integer?</a> curr
 <span id="L805" class="LineNr"> 805 </span>  <span class="Delimiter">{</span>
 <span id="L806" class="LineNr"> 806 </span>    compare result, <span class="Constant">0</span>/false
 <span id="L807" class="LineNr"> 807 </span>    <span class="PreProc">break-if-=</span>
 <span id="L808" class="LineNr"> 808 </span>    curr <span class="Special">&lt;-</span> get self, right
-<span id="L809" class="LineNr"> 809 </span>    result <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L552'>grapheme-stack-is-decimal-integer?</a> curr
+<span id="L809" class="LineNr"> 809 </span>    result <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L552'>code-point-utf8-stack-is-decimal-integer?</a> curr
 <span id="L810" class="LineNr"> 810 </span>  <span class="Delimiter">}</span>
 <span id="L811" class="LineNr"> 811 </span>  <span class="PreProc">return</span> result
 <span id="L812" class="LineNr"> 812 </span><span class="Delimiter">}</span>
@@ -905,7 +905,7 @@ if ('onhashchange' in window) {
 <span id="L841" class="LineNr"> 841 </span>  <span class="muComment">#</span>
 <span id="L842" class="LineNr"> 842 </span>  <span class="PreProc">var</span> x/eax: int <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L416'>render-gap-buffer</a> <a href='500fake-screen.mu.html#L16'>screen</a>, gap, <span class="Constant">0</span>/x, <span class="Constant">0</span>/y, <span class="Constant">1</span>/show-cursor, <span class="Constant">3</span>/fg, <span class="Constant">0xc5</span>/bg=blue-bg
 <span id="L843" class="LineNr"> 843 </span>  <a href='504test-screen.mu.html#L7'>check-screen-row</a> <a href='500fake-screen.mu.html#L16'>screen</a>, <span class="Constant">0</span>/y, <span class="Constant">&quot;abc &quot;</span>, <span class="Constant">&quot;F - test-render-gap-buffer-with-cursor-at-end&quot;</span>
-<span id="L844" class="LineNr"> 844 </span>  <span class="muComment"># we've drawn one extra grapheme for the cursor</span>
+<span id="L844" class="LineNr"> 844 </span>  <span class="muComment"># we've drawn one extra code-point-utf8 for the cursor</span>
 <span id="L845" class="LineNr"> 845 </span>  <a href='502test.mu.html#L2'>check-ints-equal</a> x, <span class="Constant">4</span>, <span class="Constant">&quot;F - <a href='514gap-buffer.mu.html#L831'>test-render-gap-buffer-with-cursor-at-end</a>: result&quot;</span>
 <span id="L846" class="LineNr"> 846 </span>                                                                <span class="muComment"># abc</span>
 <span id="L847" class="LineNr"> 847 </span>  <a href='504test-screen.mu.html#L267'>check-background-color-in-screen-row</a> <a href='500fake-screen.mu.html#L16'>screen</a>, <span class="Constant">3</span>/bg=reverse, <span class="Constant">0</span>/y, <span class="Constant">&quot;   |&quot;</span>, <span class="Constant">&quot;F - <a href='514gap-buffer.mu.html#L831'>test-render-gap-buffer-with-cursor-at-end</a>: bg&quot;</span>
@@ -917,7 +917,7 @@ if ('onhashchange' in window) {
 <span id="L853" class="LineNr"> 853 </span>  <span class="PreProc">var</span> gap/<span class="muRegEsi">esi</span>: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Special">&lt;-</span> address gap-storage
 <span id="L854" class="LineNr"> 854 </span>  <a href='514gap-buffer.mu.html#L52'>initialize-gap-buffer-with</a> gap, <span class="Constant">&quot;abc&quot;</span>
 <span id="L855" class="LineNr"> 855 </span>  <a href='514gap-buffer.mu.html#L459'>gap-to-end</a> gap
-<span id="L856" class="LineNr"> 856 </span>  <span class="PreProc">var</span> dummy/eax: grapheme <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L495'>gap-left</a> gap
+<span id="L856" class="LineNr"> 856 </span>  <span class="PreProc">var</span> dummy/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L495'>gap-left</a> gap
 <span id="L857" class="LineNr"> 857 </span>  <span class="muComment"># setup: screen</span>
 <span id="L858" class="LineNr"> 858 </span>  <span class="PreProc">var</span> screen-storage: <a href='500fake-screen.mu.html#L16'>screen</a>
 <span id="L859" class="LineNr"> 859 </span>  <span class="PreProc">var</span> <a href='500fake-screen.mu.html#L16'>screen</a>/<span class="muRegEdi">edi</span>: (addr <a href='500fake-screen.mu.html#L16'>screen</a>) <span class="Special">&lt;-</span> address screen-storage
@@ -969,7 +969,7 @@ if ('onhashchange' in window) {
 <span id="L905" class="LineNr"> 905 </span>  <span class="PreProc">var</span> gap/<span class="muRegEsi">esi</span>: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Special">&lt;-</span> address gap-storage
 <span id="L906" class="LineNr"> 906 </span>  <a href='514gap-buffer.mu.html#L52'>initialize-gap-buffer-with</a> gap, <span class="Constant">&quot;(a)&quot;</span>
 <span id="L907" class="LineNr"> 907 </span>  <a href='514gap-buffer.mu.html#L459'>gap-to-end</a> gap
-<span id="L908" class="LineNr"> 908 </span>  <span class="PreProc">var</span> dummy/eax: grapheme <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L495'>gap-left</a> gap
+<span id="L908" class="LineNr"> 908 </span>  <span class="PreProc">var</span> dummy/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L495'>gap-left</a> gap
 <span id="L909" class="LineNr"> 909 </span>  <span class="muComment"># setup: screen</span>
 <span id="L910" class="LineNr"> 910 </span>  <span class="PreProc">var</span> screen-storage: <a href='500fake-screen.mu.html#L16'>screen</a>
 <span id="L911" class="LineNr"> 911 </span>  <span class="PreProc">var</span> <a href='500fake-screen.mu.html#L16'>screen</a>/<span class="muRegEdi">edi</span>: (addr <a href='500fake-screen.mu.html#L16'>screen</a>) <span class="Special">&lt;-</span> address screen-storage
@@ -1011,7 +1011,7 @@ if ('onhashchange' in window) {
 <span id="L947" class="LineNr"> 947 </span>    <span class="PreProc">return</span> <span class="Constant">0</span>/false, <span class="Constant">0</span>
 <span id="L948" class="LineNr"> 948 </span>  <span class="Delimiter">}</span>
 <span id="L949" class="LineNr"> 949 </span>  <span class="PreProc">var</span> gap/<span class="muRegEsi">esi</span>: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _gap
-<span id="L950" class="LineNr"> 950 </span>  <span class="PreProc">var</span> stack/<span class="muRegEdi">edi</span>: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get gap, right
+<span id="L950" class="LineNr"> 950 </span>  <span class="PreProc">var</span> stack/<span class="muRegEdi">edi</span>: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get gap, right
 <span id="L951" class="LineNr"> 951 </span>  <span class="PreProc">var</span> top-addr/eax: (addr int) <span class="Special">&lt;-</span> get stack, top
 <span id="L952" class="LineNr"> 952 </span>  <span class="PreProc">var</span> top-index/<span class="muRegEcx">ecx</span>: int <span class="Special">&lt;-</span> copy *top-addr
 <span id="L953" class="LineNr"> 953 </span>  compare top-index, <span class="Constant">0</span>
@@ -1027,9 +1027,9 @@ if ('onhashchange' in window) {
 <span id="L963" class="LineNr"> 963 </span>      <span class="PreProc">return</span> <span class="Constant">0</span>/false, <span class="Constant">0</span>
 <span id="L964" class="LineNr"> 964 </span>    <span class="Delimiter">}</span>
 <span id="L965" class="LineNr"> 965 </span>    top-index <span class="Special">&lt;-</span> decrement
-<span id="L966" class="LineNr"> 966 </span>    <span class="PreProc">var</span> data-ah/eax: (addr handle array grapheme) <span class="Special">&lt;-</span> get stack, data
-<span id="L967" class="LineNr"> 967 </span>    <span class="PreProc">var</span> data/eax: (addr array grapheme) <span class="Special">&lt;-</span> <a href='120allocate.subx.html#L235'>lookup</a> *data-ah
-<span id="L968" class="LineNr"> 968 </span>    <span class="PreProc">var</span> g/eax: (addr grapheme) <span class="Special">&lt;-</span> index data, top-index
+<span id="L966" class="LineNr"> 966 </span>    <span class="PreProc">var</span> data-ah/eax: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> get stack, data
+<span id="L967" class="LineNr"> 967 </span>    <span class="PreProc">var</span> data/eax: (addr array code-point-utf8) <span class="Special">&lt;-</span> <a href='120allocate.subx.html#L235'>lookup</a> *data-ah
+<span id="L968" class="LineNr"> 968 </span>    <span class="PreProc">var</span> g/eax: (addr code-point-utf8) <span class="Special">&lt;-</span> index data, top-index
 <span id="L969" class="LineNr"> 969 </span>    compare *g, <span class="Constant">0x29</span>/close-paren
 <span id="L970" class="LineNr"> 970 </span>    <span class="Delimiter">{</span>
 <span id="L971" class="LineNr"> 971 </span>      <span class="PreProc">break-if-=</span>
@@ -1039,9 +1039,9 @@ if ('onhashchange' in window) {
 <span id="L975" class="LineNr"> 975 </span>  <span class="Delimiter">}</span>
 <span id="L976" class="LineNr"> 976 </span>  <span class="muComment"># cursor is not at end; return (char at cursor == ')')</span>
 <span id="L977" class="LineNr"> 977 </span>  top-index <span class="Special">&lt;-</span> decrement
-<span id="L978" class="LineNr"> 978 </span>  <span class="PreProc">var</span> data-ah/eax: (addr handle array grapheme) <span class="Special">&lt;-</span> get stack, data
-<span id="L979" class="LineNr"> 979 </span>  <span class="PreProc">var</span> data/eax: (addr array grapheme) <span class="Special">&lt;-</span> <a href='120allocate.subx.html#L235'>lookup</a> *data-ah
-<span id="L980" class="LineNr"> 980 </span>  <span class="PreProc">var</span> g/eax: (addr grapheme) <span class="Special">&lt;-</span> index data, top-index
+<span id="L978" class="LineNr"> 978 </span>  <span class="PreProc">var</span> data-ah/eax: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> get stack, data
+<span id="L979" class="LineNr"> 979 </span>  <span class="PreProc">var</span> data/eax: (addr array code-point-utf8) <span class="Special">&lt;-</span> <a href='120allocate.subx.html#L235'>lookup</a> *data-ah
+<span id="L980" class="LineNr"> 980 </span>  <span class="PreProc">var</span> g/eax: (addr code-point-utf8) <span class="Special">&lt;-</span> index data, top-index
 <span id="L981" class="LineNr"> 981 </span>  compare *g, <span class="Constant">0x29</span>/close-paren
 <span id="L982" class="LineNr"> 982 </span>  <span class="Delimiter">{</span>
 <span id="L983" class="LineNr"> 983 </span>    <span class="PreProc">break-if-=</span>
@@ -1062,7 +1062,7 @@ if ('onhashchange' in window) {
 <span id="L998" class="LineNr"> 998 </span>  <a href='514gap-buffer.mu.html#L942'>highlight-matching-open-paren?</a>, open-paren-depth <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L942'>highlight-matching-open-paren?</a> gap, <span class="Constant">1</span>/render-cursor
 <span id="L999" class="LineNr"> 999 </span>  <a href='502test.mu.html#L19'>check</a> <a href='514gap-buffer.mu.html#L942'>highlight-matching-open-paren?</a>, <span class="Constant">&quot;F - <a href='514gap-buffer.mu.html#L989'>test-highlight-matching-open-paren</a>: at end immediately after ')'&quot;</span>
 <span id="L1000" class="LineNr">1000 </span>  <a href='502test.mu.html#L2'>check-ints-equal</a> open-paren-depth, <span class="Constant">1</span>, <span class="Constant">&quot;F - <a href='514gap-buffer.mu.html#L989'>test-highlight-matching-open-paren</a>: depth at end immediately after ')'&quot;</span>
-<span id="L1001" class="LineNr">1001 </span>  <span class="PreProc">var</span> dummy/eax: grapheme <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L495'>gap-left</a> gap
+<span id="L1001" class="LineNr">1001 </span>  <span class="PreProc">var</span> dummy/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L495'>gap-left</a> gap
 <span id="L1002" class="LineNr">1002 </span>  <a href='514gap-buffer.mu.html#L942'>highlight-matching-open-paren?</a>, open-paren-depth <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L942'>highlight-matching-open-paren?</a> gap, <span class="Constant">1</span>/render-cursor
 <span id="L1003" class="LineNr">1003 </span>  <a href='502test.mu.html#L19'>check</a> <a href='514gap-buffer.mu.html#L942'>highlight-matching-open-paren?</a>, <span class="Constant">&quot;F - <a href='514gap-buffer.mu.html#L989'>test-highlight-matching-open-paren</a>: on ')'&quot;</span>
 <span id="L1004" class="LineNr">1004 </span>  dummy <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L495'>gap-left</a> gap
@@ -1086,8 +1086,8 @@ if ('onhashchange' in window) {
 <span id="L1022" class="LineNr">1022 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L1022'>gap-buffer-scan-done?</a></span> _self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
 <span id="L1023" class="LineNr">1023 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L1024" class="LineNr">1024 </span>  <span class="muComment"># more in left?</span>
-<span id="L1025" class="LineNr">1025 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get self, left
-<span id="L1026" class="LineNr">1026 </span>  <span class="PreProc">var</span> left-size/eax: int <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L33'>grapheme-stack-length</a> left
+<span id="L1025" class="LineNr">1025 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get self, left
+<span id="L1026" class="LineNr">1026 </span>  <span class="PreProc">var</span> left-size/eax: int <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L33'>code-point-utf8-stack-length</a> left
 <span id="L1027" class="LineNr">1027 </span>  <span class="PreProc">var</span> left-read-index/<span class="muRegEcx">ecx</span>: (addr int) <span class="Special">&lt;-</span> get self, left-read-index
 <span id="L1028" class="LineNr">1028 </span>  compare *left-read-index, left-size
 <span id="L1029" class="LineNr">1029 </span>  <span class="Delimiter">{</span>
@@ -1095,8 +1095,8 @@ if ('onhashchange' in window) {
 <span id="L1031" class="LineNr">1031 </span>    <span class="PreProc">return</span> <span class="Constant">0</span>/false
 <span id="L1032" class="LineNr">1032 </span>  <span class="Delimiter">}</span>
 <span id="L1033" class="LineNr">1033 </span>  <span class="muComment"># more in right?</span>
-<span id="L1034" class="LineNr">1034 </span>  <span class="PreProc">var</span> right/eax: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get self, right
-<span id="L1035" class="LineNr">1035 </span>  <span class="PreProc">var</span> right-size/eax: int <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L33'>grapheme-stack-length</a> right
+<span id="L1034" class="LineNr">1034 </span>  <span class="PreProc">var</span> right/eax: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get self, right
+<span id="L1035" class="LineNr">1035 </span>  <span class="PreProc">var</span> right-size/eax: int <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L33'>code-point-utf8-stack-length</a> right
 <span id="L1036" class="LineNr">1036 </span>  <span class="PreProc">var</span> right-read-index/<span class="muRegEcx">ecx</span>: (addr int) <span class="Special">&lt;-</span> get self, right-read-index
 <span id="L1037" class="LineNr">1037 </span>  compare *right-read-index, right-size
 <span id="L1038" class="LineNr">1038 </span>  <span class="Delimiter">{</span>
@@ -1107,73 +1107,73 @@ if ('onhashchange' in window) {
 <span id="L1043" class="LineNr">1043 </span>  <span class="PreProc">return</span> <span class="Constant">1</span>/true
 <span id="L1044" class="LineNr">1044 </span><span class="Delimiter">}</span>
 <span id="L1045" class="LineNr">1045 </span>
-<span id="L1046" class="LineNr">1046 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L1046'>peek-from-gap-buffer</a></span> _self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: grapheme <span class="Delimiter">{</span>
+<span id="L1046" class="LineNr">1046 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L1046'>peek-from-gap-buffer</a></span> _self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: code-point-utf8 <span class="Delimiter">{</span>
 <span id="L1047" class="LineNr">1047 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L1048" class="LineNr">1048 </span>  <span class="muComment"># more in left?</span>
-<span id="L1049" class="LineNr">1049 </span>  <span class="PreProc">var</span> left/<span class="muRegEcx">ecx</span>: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get self, left
-<span id="L1050" class="LineNr">1050 </span>  <span class="PreProc">var</span> left-size/eax: int <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L33'>grapheme-stack-length</a> left
+<span id="L1049" class="LineNr">1049 </span>  <span class="PreProc">var</span> left/<span class="muRegEcx">ecx</span>: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get self, left
+<span id="L1050" class="LineNr">1050 </span>  <span class="PreProc">var</span> left-size/eax: int <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L33'>code-point-utf8-stack-length</a> left
 <span id="L1051" class="LineNr">1051 </span>  <span class="PreProc">var</span> left-read-index-a/<span class="muRegEdx">edx</span>: (addr int) <span class="Special">&lt;-</span> get self, left-read-index
 <span id="L1052" class="LineNr">1052 </span>  compare *left-read-index-a, left-size
 <span id="L1053" class="LineNr">1053 </span>  <span class="Delimiter">{</span>
 <span id="L1054" class="LineNr">1054 </span>    <span class="PreProc">break-if-&gt;=</span>
-<span id="L1055" class="LineNr">1055 </span>    <span class="PreProc">var</span> left-data-ah/eax: (addr handle array grapheme) <span class="Special">&lt;-</span> get left, data
-<span id="L1056" class="LineNr">1056 </span>    <span class="PreProc">var</span> left-data/eax: (addr array grapheme) <span class="Special">&lt;-</span> <a href='120allocate.subx.html#L235'>lookup</a> *left-data-ah
+<span id="L1055" class="LineNr">1055 </span>    <span class="PreProc">var</span> left-data-ah/eax: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> get left, data
+<span id="L1056" class="LineNr">1056 </span>    <span class="PreProc">var</span> left-data/eax: (addr array code-point-utf8) <span class="Special">&lt;-</span> <a href='120allocate.subx.html#L235'>lookup</a> *left-data-ah
 <span id="L1057" class="LineNr">1057 </span>    <span class="PreProc">var</span> left-read-index/<span class="muRegEcx">ecx</span>: int <span class="Special">&lt;-</span> copy *left-read-index-a
-<span id="L1058" class="LineNr">1058 </span>    <span class="PreProc">var</span> result/eax: (addr grapheme) <span class="Special">&lt;-</span> index left-data, left-read-index
+<span id="L1058" class="LineNr">1058 </span>    <span class="PreProc">var</span> result/eax: (addr code-point-utf8) <span class="Special">&lt;-</span> index left-data, left-read-index
 <span id="L1059" class="LineNr">1059 </span>    <span class="PreProc">return</span> *result
 <span id="L1060" class="LineNr">1060 </span>  <span class="Delimiter">}</span>
 <span id="L1061" class="LineNr">1061 </span>  <span class="muComment"># more in right?</span>
-<span id="L1062" class="LineNr">1062 </span>  <span class="PreProc">var</span> right/<span class="muRegEcx">ecx</span>: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get self, right
-<span id="L1063" class="LineNr">1063 </span>  <span class="PreProc">var</span> _right-size/eax: int <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L33'>grapheme-stack-length</a> right
+<span id="L1062" class="LineNr">1062 </span>  <span class="PreProc">var</span> right/<span class="muRegEcx">ecx</span>: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get self, right
+<span id="L1063" class="LineNr">1063 </span>  <span class="PreProc">var</span> _right-size/eax: int <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L33'>code-point-utf8-stack-length</a> right
 <span id="L1064" class="LineNr">1064 </span>  <span class="PreProc">var</span> right-size/<span class="muRegEbx">ebx</span>: int <span class="Special">&lt;-</span> copy _right-size
 <span id="L1065" class="LineNr">1065 </span>  <span class="PreProc">var</span> right-read-index-a/<span class="muRegEdx">edx</span>: (addr int) <span class="Special">&lt;-</span> get self, right-read-index
 <span id="L1066" class="LineNr">1066 </span>  compare *right-read-index-a, right-size
 <span id="L1067" class="LineNr">1067 </span>  <span class="Delimiter">{</span>
 <span id="L1068" class="LineNr">1068 </span>    <span class="PreProc">break-if-&gt;=</span>
 <span id="L1069" class="LineNr">1069 </span>    <span class="muComment"># read the right from reverse</span>
-<span id="L1070" class="LineNr">1070 </span>    <span class="PreProc">var</span> right-data-ah/eax: (addr handle array grapheme) <span class="Special">&lt;-</span> get right, data
-<span id="L1071" class="LineNr">1071 </span>    <span class="PreProc">var</span> right-data/eax: (addr array grapheme) <span class="Special">&lt;-</span> <a href='120allocate.subx.html#L235'>lookup</a> *right-data-ah
+<span id="L1070" class="LineNr">1070 </span>    <span class="PreProc">var</span> right-data-ah/eax: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> get right, data
+<span id="L1071" class="LineNr">1071 </span>    <span class="PreProc">var</span> right-data/eax: (addr array code-point-utf8) <span class="Special">&lt;-</span> <a href='120allocate.subx.html#L235'>lookup</a> *right-data-ah
 <span id="L1072" class="LineNr">1072 </span>    <span class="PreProc">var</span> right-read-index/<span class="muRegEbx">ebx</span>: int <span class="Special">&lt;-</span> copy right-size
 <span id="L1073" class="LineNr">1073 </span>    right-read-index <span class="Special">&lt;-</span> subtract *right-read-index-a
 <span id="L1074" class="LineNr">1074 </span>    right-read-index <span class="Special">&lt;-</span> subtract <span class="Constant">1</span>
-<span id="L1075" class="LineNr">1075 </span>    <span class="PreProc">var</span> result/eax: (addr grapheme) <span class="Special">&lt;-</span> index right-data, right-read-index
+<span id="L1075" class="LineNr">1075 </span>    <span class="PreProc">var</span> result/eax: (addr code-point-utf8) <span class="Special">&lt;-</span> index right-data, right-read-index
 <span id="L1076" class="LineNr">1076 </span>    <span class="PreProc">return</span> *result
 <span id="L1077" class="LineNr">1077 </span>  <span class="Delimiter">}</span>
 <span id="L1078" class="LineNr">1078 </span>  <span class="muComment"># if we get here there's nothing left</span>
 <span id="L1079" class="LineNr">1079 </span>  <span class="PreProc">return</span> <span class="Constant">0</span>/nul
 <span id="L1080" class="LineNr">1080 </span><span class="Delimiter">}</span>
 <span id="L1081" class="LineNr">1081 </span>
-<span id="L1082" class="LineNr">1082 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L1082'>read-from-gap-buffer</a></span> _self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: grapheme <span class="Delimiter">{</span>
+<span id="L1082" class="LineNr">1082 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L1082'>read-from-gap-buffer</a></span> _self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: code-point-utf8 <span class="Delimiter">{</span>
 <span id="L1083" class="LineNr">1083 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L1084" class="LineNr">1084 </span>  <span class="muComment"># more in left?</span>
-<span id="L1085" class="LineNr">1085 </span>  <span class="PreProc">var</span> left/<span class="muRegEcx">ecx</span>: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get self, left
-<span id="L1086" class="LineNr">1086 </span>  <span class="PreProc">var</span> left-size/eax: int <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L33'>grapheme-stack-length</a> left
+<span id="L1085" class="LineNr">1085 </span>  <span class="PreProc">var</span> left/<span class="muRegEcx">ecx</span>: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get self, left
+<span id="L1086" class="LineNr">1086 </span>  <span class="PreProc">var</span> left-size/eax: int <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L33'>code-point-utf8-stack-length</a> left
 <span id="L1087" class="LineNr">1087 </span>  <span class="PreProc">var</span> left-read-index-a/<span class="muRegEdx">edx</span>: (addr int) <span class="Special">&lt;-</span> get self, left-read-index
 <span id="L1088" class="LineNr">1088 </span>  compare *left-read-index-a, left-size
 <span id="L1089" class="LineNr">1089 </span>  <span class="Delimiter">{</span>
 <span id="L1090" class="LineNr">1090 </span>    <span class="PreProc">break-if-&gt;=</span>
-<span id="L1091" class="LineNr">1091 </span>    <span class="PreProc">var</span> left-data-ah/eax: (addr handle array grapheme) <span class="Special">&lt;-</span> get left, data
-<span id="L1092" class="LineNr">1092 </span>    <span class="PreProc">var</span> left-data/eax: (addr array grapheme) <span class="Special">&lt;-</span> <a href='120allocate.subx.html#L235'>lookup</a> *left-data-ah
+<span id="L1091" class="LineNr">1091 </span>    <span class="PreProc">var</span> left-data-ah/eax: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> get left, data
+<span id="L1092" class="LineNr">1092 </span>    <span class="PreProc">var</span> left-data/eax: (addr array code-point-utf8) <span class="Special">&lt;-</span> <a href='120allocate.subx.html#L235'>lookup</a> *left-data-ah
 <span id="L1093" class="LineNr">1093 </span>    <span class="PreProc">var</span> left-read-index/<span class="muRegEcx">ecx</span>: int <span class="Special">&lt;-</span> copy *left-read-index-a
-<span id="L1094" class="LineNr">1094 </span>    <span class="PreProc">var</span> result/eax: (addr grapheme) <span class="Special">&lt;-</span> index left-data, left-read-index
+<span id="L1094" class="LineNr">1094 </span>    <span class="PreProc">var</span> result/eax: (addr code-point-utf8) <span class="Special">&lt;-</span> index left-data, left-read-index
 <span id="L1095" class="LineNr">1095 </span>    increment *left-read-index-a
 <span id="L1096" class="LineNr">1096 </span>    <span class="PreProc">return</span> *result
 <span id="L1097" class="LineNr">1097 </span>  <span class="Delimiter">}</span>
 <span id="L1098" class="LineNr">1098 </span>  <span class="muComment"># more in right?</span>
-<span id="L1099" class="LineNr">1099 </span>  <span class="PreProc">var</span> right/<span class="muRegEcx">ecx</span>: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get self, right
-<span id="L1100" class="LineNr">1100 </span>  <span class="PreProc">var</span> _right-size/eax: int <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L33'>grapheme-stack-length</a> right
+<span id="L1099" class="LineNr">1099 </span>  <span class="PreProc">var</span> right/<span class="muRegEcx">ecx</span>: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get self, right
+<span id="L1100" class="LineNr">1100 </span>  <span class="PreProc">var</span> _right-size/eax: int <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L33'>code-point-utf8-stack-length</a> right
 <span id="L1101" class="LineNr">1101 </span>  <span class="PreProc">var</span> right-size/<span class="muRegEbx">ebx</span>: int <span class="Special">&lt;-</span> copy _right-size
 <span id="L1102" class="LineNr">1102 </span>  <span class="PreProc">var</span> right-read-index-a/<span class="muRegEdx">edx</span>: (addr int) <span class="Special">&lt;-</span> get self, right-read-index
 <span id="L1103" class="LineNr">1103 </span>  compare *right-read-index-a, right-size
 <span id="L1104" class="LineNr">1104 </span>  <span class="Delimiter">{</span>
 <span id="L1105" class="LineNr">1105 </span>    <span class="PreProc">break-if-&gt;=</span>
 <span id="L1106" class="LineNr">1106 </span>    <span class="muComment"># read the right from reverse</span>
-<span id="L1107" class="LineNr">1107 </span>    <span class="PreProc">var</span> right-data-ah/eax: (addr handle array grapheme) <span class="Special">&lt;-</span> get right, data
-<span id="L1108" class="LineNr">1108 </span>    <span class="PreProc">var</span> right-data/eax: (addr array grapheme) <span class="Special">&lt;-</span> <a href='120allocate.subx.html#L235'>lookup</a> *right-data-ah
+<span id="L1107" class="LineNr">1107 </span>    <span class="PreProc">var</span> right-data-ah/eax: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> get right, data
+<span id="L1108" class="LineNr">1108 </span>    <span class="PreProc">var</span> right-data/eax: (addr array code-point-utf8) <span class="Special">&lt;-</span> <a href='120allocate.subx.html#L235'>lookup</a> *right-data-ah
 <span id="L1109" class="LineNr">1109 </span>    <span class="PreProc">var</span> right-read-index/<span class="muRegEbx">ebx</span>: int <span class="Special">&lt;-</span> copy right-size
 <span id="L1110" class="LineNr">1110 </span>    right-read-index <span class="Special">&lt;-</span> subtract *right-read-index-a
 <span id="L1111" class="LineNr">1111 </span>    right-read-index <span class="Special">&lt;-</span> subtract <span class="Constant">1</span>
-<span id="L1112" class="LineNr">1112 </span>    <span class="PreProc">var</span> result/eax: (addr grapheme) <span class="Special">&lt;-</span> index right-data, right-read-index
+<span id="L1112" class="LineNr">1112 </span>    <span class="PreProc">var</span> result/eax: (addr code-point-utf8) <span class="Special">&lt;-</span> index right-data, right-read-index
 <span id="L1113" class="LineNr">1113 </span>    increment *right-read-index-a
 <span id="L1114" class="LineNr">1114 </span>    <span class="PreProc">return</span> *result
 <span id="L1115" class="LineNr">1115 </span>  <span class="Delimiter">}</span>
@@ -1184,8 +1184,8 @@ if ('onhashchange' in window) {
 <span id="L1120" class="LineNr">1120 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L1120'>put-back-from-gap-buffer</a></span> _self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Delimiter">{</span>
 <span id="L1121" class="LineNr">1121 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L1122" class="LineNr">1122 </span>  <span class="muComment"># more in right?</span>
-<span id="L1123" class="LineNr">1123 </span>  <span class="PreProc">var</span> right/eax: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get self, right
-<span id="L1124" class="LineNr">1124 </span>  <span class="PreProc">var</span> right-size/eax: int <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L33'>grapheme-stack-length</a> right
+<span id="L1123" class="LineNr">1123 </span>  <span class="PreProc">var</span> right/eax: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get self, right
+<span id="L1124" class="LineNr">1124 </span>  <span class="PreProc">var</span> right-size/eax: int <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L33'>code-point-utf8-stack-length</a> right
 <span id="L1125" class="LineNr">1125 </span>  <span class="PreProc">var</span> right-read-index-a/eax: (addr int) <span class="Special">&lt;-</span> get self, right-read-index
 <span id="L1126" class="LineNr">1126 </span>  compare *right-read-index-a, <span class="Constant">0</span>
 <span id="L1127" class="LineNr">1127 </span>  <span class="Delimiter">{</span>
@@ -1194,8 +1194,8 @@ if ('onhashchange' in window) {
 <span id="L1130" class="LineNr">1130 </span>    <span class="PreProc">return</span>
 <span id="L1131" class="LineNr">1131 </span>  <span class="Delimiter">}</span>
 <span id="L1132" class="LineNr">1132 </span>  <span class="muComment"># more in left?</span>
-<span id="L1133" class="LineNr">1133 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> get self, left
-<span id="L1134" class="LineNr">1134 </span>  <span class="PreProc">var</span> left-size/eax: int <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L33'>grapheme-stack-length</a> left
+<span id="L1133" class="LineNr">1133 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get self, left
+<span id="L1134" class="LineNr">1134 </span>  <span class="PreProc">var</span> left-size/eax: int <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L33'>code-point-utf8-stack-length</a> left
 <span id="L1135" class="LineNr">1135 </span>  <span class="PreProc">var</span> left-read-index-a/eax: (addr int) <span class="Special">&lt;-</span> get self, left-read-index
 <span id="L1136" class="LineNr">1136 </span>  decrement *left-read-index-a
 <span id="L1137" class="LineNr">1137 </span><span class="Delimiter">}</span>
@@ -1207,22 +1207,22 @@ if ('onhashchange' in window) {
 <span id="L1143" class="LineNr">1143 </span>  <span class="muComment"># gap is at end, all contents are in left</span>
 <span id="L1144" class="LineNr">1144 </span>  <span class="PreProc">var</span> done?/eax: boolean <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L1022'>gap-buffer-scan-done?</a> gap
 <span id="L1145" class="LineNr">1145 </span>  <a href='502test.mu.html#L32'>check-not</a> done?, <span class="Constant">&quot;F - <a href='514gap-buffer.mu.html#L1139'>test-read-from-gap-buffer</a>/left-1/done&quot;</span>
-<span id="L1146" class="LineNr">1146 </span>  <span class="PreProc">var</span> g/eax: grapheme <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L1082'>read-from-gap-buffer</a> gap
+<span id="L1146" class="LineNr">1146 </span>  <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L1082'>read-from-gap-buffer</a> gap
 <span id="L1147" class="LineNr">1147 </span>  <span class="PreProc">var</span> x/<span class="muRegEcx">ecx</span>: int <span class="Special">&lt;-</span> copy g
 <span id="L1148" class="LineNr">1148 </span>  <a href='502test.mu.html#L2'>check-ints-equal</a> x, <span class="Constant">0x61</span>/a, <span class="Constant">&quot;F - <a href='514gap-buffer.mu.html#L1139'>test-read-from-gap-buffer</a>/left-1&quot;</span>
 <span id="L1149" class="LineNr">1149 </span>  <span class="PreProc">var</span> done?/eax: boolean <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L1022'>gap-buffer-scan-done?</a> gap
 <span id="L1150" class="LineNr">1150 </span>  <a href='502test.mu.html#L32'>check-not</a> done?, <span class="Constant">&quot;F - <a href='514gap-buffer.mu.html#L1139'>test-read-from-gap-buffer</a>/left-2/done&quot;</span>
-<span id="L1151" class="LineNr">1151 </span>  <span class="PreProc">var</span> g/eax: grapheme <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L1082'>read-from-gap-buffer</a> gap
+<span id="L1151" class="LineNr">1151 </span>  <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L1082'>read-from-gap-buffer</a> gap
 <span id="L1152" class="LineNr">1152 </span>  <span class="PreProc">var</span> x/<span class="muRegEcx">ecx</span>: int <span class="Special">&lt;-</span> copy g
 <span id="L1153" class="LineNr">1153 </span>  <a href='502test.mu.html#L2'>check-ints-equal</a> x, <span class="Constant">0x62</span>/b, <span class="Constant">&quot;F - <a href='514gap-buffer.mu.html#L1139'>test-read-from-gap-buffer</a>/left-2&quot;</span>
 <span id="L1154" class="LineNr">1154 </span>  <span class="PreProc">var</span> done?/eax: boolean <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L1022'>gap-buffer-scan-done?</a> gap
 <span id="L1155" class="LineNr">1155 </span>  <a href='502test.mu.html#L32'>check-not</a> done?, <span class="Constant">&quot;F - <a href='514gap-buffer.mu.html#L1139'>test-read-from-gap-buffer</a>/left-3/done&quot;</span>
-<span id="L1156" class="LineNr">1156 </span>  <span class="PreProc">var</span> g/eax: grapheme <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L1082'>read-from-gap-buffer</a> gap
+<span id="L1156" class="LineNr">1156 </span>  <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L1082'>read-from-gap-buffer</a> gap
 <span id="L1157" class="LineNr">1157 </span>  <span class="PreProc">var</span> x/<span class="muRegEcx">ecx</span>: int <span class="Special">&lt;-</span> copy g
 <span id="L1158" class="LineNr">1158 </span>  <a href='502test.mu.html#L2'>check-ints-equal</a> x, <span class="Constant">0x63</span>/c, <span class="Constant">&quot;F - <a href='514gap-buffer.mu.html#L1139'>test-read-from-gap-buffer</a>/left-3&quot;</span>
 <span id="L1159" class="LineNr">1159 </span>  <span class="PreProc">var</span> done?/eax: boolean <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L1022'>gap-buffer-scan-done?</a> gap
 <span id="L1160" class="LineNr">1160 </span>  <a href='502test.mu.html#L19'>check</a> done?, <span class="Constant">&quot;F - <a href='514gap-buffer.mu.html#L1139'>test-read-from-gap-buffer</a>/left-4/done&quot;</span>
-<span id="L1161" class="LineNr">1161 </span>  <span class="PreProc">var</span> g/eax: grapheme <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L1082'>read-from-gap-buffer</a> gap
+<span id="L1161" class="LineNr">1161 </span>  <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L1082'>read-from-gap-buffer</a> gap
 <span id="L1162" class="LineNr">1162 </span>  <span class="PreProc">var</span> x/<span class="muRegEcx">ecx</span>: int <span class="Special">&lt;-</span> copy g
 <span id="L1163" class="LineNr">1163 </span>  <a href='502test.mu.html#L2'>check-ints-equal</a> x, <span class="Constant">0</span>/nul, <span class="Constant">&quot;F - <a href='514gap-buffer.mu.html#L1139'>test-read-from-gap-buffer</a>/left-4&quot;</span>
 <span id="L1164" class="LineNr">1164 </span>  <span class="muComment"># now check when everything is to the right</span>
@@ -1230,22 +1230,22 @@ if ('onhashchange' in window) {
 <span id="L1166" class="LineNr">1166 </span>  <a href='514gap-buffer.mu.html#L1014'>rewind-gap-buffer</a> gap
 <span id="L1167" class="LineNr">1167 </span>  <span class="PreProc">var</span> done?/eax: boolean <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L1022'>gap-buffer-scan-done?</a> gap
 <span id="L1168" class="LineNr">1168 </span>  <a href='502test.mu.html#L32'>check-not</a> done?, <span class="Constant">&quot;F - <a href='514gap-buffer.mu.html#L1139'>test-read-from-gap-buffer</a>/right-1/done&quot;</span>
-<span id="L1169" class="LineNr">1169 </span>  <span class="PreProc">var</span> g/eax: grapheme <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L1082'>read-from-gap-buffer</a> gap
+<span id="L1169" class="LineNr">1169 </span>  <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L1082'>read-from-gap-buffer</a> gap
 <span id="L1170" class="LineNr">1170 </span>  <span class="PreProc">var</span> x/<span class="muRegEcx">ecx</span>: int <span class="Special">&lt;-</span> copy g
 <span id="L1171" class="LineNr">1171 </span>  <a href='502test.mu.html#L2'>check-ints-equal</a> x, <span class="Constant">0x61</span>/a, <span class="Constant">&quot;F - <a href='514gap-buffer.mu.html#L1139'>test-read-from-gap-buffer</a>/right-1&quot;</span>
 <span id="L1172" class="LineNr">1172 </span>  <span class="PreProc">var</span> done?/eax: boolean <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L1022'>gap-buffer-scan-done?</a> gap
 <span id="L1173" class="LineNr">1173 </span>  <a href='502test.mu.html#L32'>check-not</a> done?, <span class="Constant">&quot;F - <a href='514gap-buffer.mu.html#L1139'>test-read-from-gap-buffer</a>/right-2/done&quot;</span>
-<span id="L1174" class="LineNr">1174 </span>  <span class="PreProc">var</span> g/eax: grapheme <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L1082'>read-from-gap-buffer</a> gap
+<span id="L1174" class="LineNr">1174 </span>  <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L1082'>read-from-gap-buffer</a> gap
 <span id="L1175" class="LineNr">1175 </span>  <span class="PreProc">var</span> x/<span class="muRegEcx">ecx</span>: int <span class="Special">&lt;-</span> copy g
 <span id="L1176" class="LineNr">1176 </span>  <a href='502test.mu.html#L2'>check-ints-equal</a> x, <span class="Constant">0x62</span>/b, <span class="Constant">&quot;F - <a href='514gap-buffer.mu.html#L1139'>test-read-from-gap-buffer</a>/right-2&quot;</span>
 <span id="L1177" class="LineNr">1177 </span>  <span class="PreProc">var</span> done?/eax: boolean <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L1022'>gap-buffer-scan-done?</a> gap
 <span id="L1178" class="LineNr">1178 </span>  <a href='502test.mu.html#L32'>check-not</a> done?, <span class="Constant">&quot;F - <a href='514gap-buffer.mu.html#L1139'>test-read-from-gap-buffer</a>/right-3/done&quot;</span>
-<span id="L1179" class="LineNr">1179 </span>  <span class="PreProc">var</span> g/eax: grapheme <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L1082'>read-from-gap-buffer</a> gap
+<span id="L1179" class="LineNr">1179 </span>  <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L1082'>read-from-gap-buffer</a> gap
 <span id="L1180" class="LineNr">1180 </span>  <span class="PreProc">var</span> x/<span class="muRegEcx">ecx</span>: int <span class="Special">&lt;-</span> copy g
 <span id="L1181" class="LineNr">1181 </span>  <a href='502test.mu.html#L2'>check-ints-equal</a> x, <span class="Constant">0x63</span>/c, <span class="Constant">&quot;F - <a href='514gap-buffer.mu.html#L1139'>test-read-from-gap-buffer</a>/right-3&quot;</span>
 <span id="L1182" class="LineNr">1182 </span>  <span class="PreProc">var</span> done?/eax: boolean <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L1022'>gap-buffer-scan-done?</a> gap
 <span id="L1183" class="LineNr">1183 </span>  <a href='502test.mu.html#L19'>check</a> done?, <span class="Constant">&quot;F - <a href='514gap-buffer.mu.html#L1139'>test-read-from-gap-buffer</a>/right-4/done&quot;</span>
-<span id="L1184" class="LineNr">1184 </span>  <span class="PreProc">var</span> g/eax: grapheme <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L1082'>read-from-gap-buffer</a> gap
+<span id="L1184" class="LineNr">1184 </span>  <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L1082'>read-from-gap-buffer</a> gap
 <span id="L1185" class="LineNr">1185 </span>  <span class="PreProc">var</span> x/<span class="muRegEcx">ecx</span>: int <span class="Special">&lt;-</span> copy g
 <span id="L1186" class="LineNr">1186 </span>  <a href='502test.mu.html#L2'>check-ints-equal</a> x, <span class="Constant">0</span>/nul, <span class="Constant">&quot;F - <a href='514gap-buffer.mu.html#L1139'>test-read-from-gap-buffer</a>/right-4&quot;</span>
 <span id="L1187" class="LineNr">1187 </span><span class="Delimiter">}</span>
@@ -1254,7 +1254,7 @@ if ('onhashchange' in window) {
 <span id="L1190" class="LineNr">1190 </span>  <span class="PreProc">var</span> done?/eax: boolean <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L1022'>gap-buffer-scan-done?</a> self
 <span id="L1191" class="LineNr">1191 </span>  compare done?, <span class="Constant">0</span>/false
 <span id="L1192" class="LineNr">1192 </span>  <span class="PreProc">break-if-!=</span>
-<span id="L1193" class="LineNr">1193 </span>  <span class="PreProc">var</span> g/eax: grapheme <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L1046'>peek-from-gap-buffer</a> self
+<span id="L1193" class="LineNr">1193 </span>  <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L1046'>peek-from-gap-buffer</a> self
 <span id="L1194" class="LineNr">1194 </span>  <span class="Delimiter">{</span>
 <span id="L1195" class="LineNr">1195 </span>    compare g, <span class="Constant">0x20</span>/space
 <span id="L1196" class="LineNr">1196 </span>    <span class="PreProc">break-if-=</span>
@@ -1264,8 +1264,8 @@ if ('onhashchange' in window) {
 <span id="L1200" class="LineNr">1200 </span>  <span class="PreProc">loop</span>
 <span id="L1201" class="LineNr">1201 </span><span class="Delimiter">}</span>
 <span id="L1202" class="LineNr">1202 </span>
-<span id="L1203" class="LineNr">1203 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L1203'>edit-gap-buffer</a></span> self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>), key: grapheme <span class="Delimiter">{</span>
-<span id="L1204" class="LineNr">1204 </span>  <span class="PreProc">var</span> g/<span class="muRegEdx">edx</span>: grapheme <span class="Special">&lt;-</span> copy key
+<span id="L1203" class="LineNr">1203 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L1203'>edit-gap-buffer</a></span> self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>), key: code-point-utf8 <span class="Delimiter">{</span>
+<span id="L1204" class="LineNr">1204 </span>  <span class="PreProc">var</span> g/<span class="muRegEdx">edx</span>: code-point-utf8 <span class="Special">&lt;-</span> copy key
 <span id="L1205" class="LineNr">1205 </span>  <span class="Delimiter">{</span>
 <span id="L1206" class="LineNr">1206 </span>    compare g, <span class="Constant">8</span>/backspace
 <span id="L1207" class="LineNr">1207 </span>    <span class="PreProc">break-if-!=</span>
@@ -1275,13 +1275,13 @@ if ('onhashchange' in window) {
 <span id="L1211" class="LineNr">1211 </span>  <span class="Delimiter">{</span>
 <span id="L1212" class="LineNr">1212 </span>    compare g, <span class="Constant">0x80</span>/left-arrow
 <span id="L1213" class="LineNr">1213 </span>    <span class="PreProc">break-if-!=</span>
-<span id="L1214" class="LineNr">1214 </span>    <span class="PreProc">var</span> dummy/eax: grapheme <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L495'>gap-left</a> self
+<span id="L1214" class="LineNr">1214 </span>    <span class="PreProc">var</span> dummy/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L495'>gap-left</a> self
 <span id="L1215" class="LineNr">1215 </span>    <span class="PreProc">return</span>
 <span id="L1216" class="LineNr">1216 </span>  <span class="Delimiter">}</span>
 <span id="L1217" class="LineNr">1217 </span>  <span class="Delimiter">{</span>
 <span id="L1218" class="LineNr">1218 </span>    compare g, <span class="Constant">0x83</span>/right-arrow
 <span id="L1219" class="LineNr">1219 </span>    <span class="PreProc">break-if-!=</span>
-<span id="L1220" class="LineNr">1220 </span>    <span class="PreProc">var</span> dummy/eax: grapheme <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L481'>gap-right</a> self
+<span id="L1220" class="LineNr">1220 </span>    <span class="PreProc">var</span> dummy/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L481'>gap-right</a> self
 <span id="L1221" class="LineNr">1221 </span>    <span class="PreProc">return</span>
 <span id="L1222" class="LineNr">1222 </span>  <span class="Delimiter">}</span>
 <span id="L1223" class="LineNr">1223 </span>  <span class="Delimiter">{</span>
@@ -1335,11 +1335,11 @@ if ('onhashchange' in window) {
 <span id="L1271" class="LineNr">1271 </span>    <span class="PreProc">return</span>
 <span id="L1272" class="LineNr">1272 </span>  <span class="Delimiter">}</span>
 <span id="L1273" class="LineNr">1273 </span>  <span class="muComment"># default: insert character</span>
-<span id="L1274" class="LineNr">1274 </span>  <a href='514gap-buffer.mu.html#L440'>add-grapheme-at-gap</a> self, g
+<span id="L1274" class="LineNr">1274 </span>  <a href='514gap-buffer.mu.html#L440'>add-code-point-utf8-at-gap</a> self, g
 <span id="L1275" class="LineNr">1275 </span><span class="Delimiter">}</span>
 <span id="L1276" class="LineNr">1276 </span>
 <span id="L1277" class="LineNr">1277 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L1277'>gap-to-start-of-next-word</a></span> self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Delimiter">{</span>
-<span id="L1278" class="LineNr">1278 </span>  <span class="PreProc">var</span> curr/eax: grapheme <span class="Special">&lt;-</span> copy <span class="Constant">0</span>
+<span id="L1278" class="LineNr">1278 </span>  <span class="PreProc">var</span> curr/eax: code-point-utf8 <span class="Special">&lt;-</span> copy <span class="Constant">0</span>
 <span id="L1279" class="LineNr">1279 </span>  <span class="muComment"># skip to next space</span>
 <span id="L1280" class="LineNr">1280 </span>  <span class="Delimiter">{</span>
 <span id="L1281" class="LineNr">1281 </span>    curr <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L481'>gap-right</a> self
@@ -1366,7 +1366,7 @@ if ('onhashchange' in window) {
 <span id="L1302" class="LineNr">1302 </span><span class="Delimiter">}</span>
 <span id="L1303" class="LineNr">1303 </span>
 <span id="L1304" class="LineNr">1304 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L1304'>gap-to-end-of-previous-word</a></span> self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Delimiter">{</span>
-<span id="L1305" class="LineNr">1305 </span>  <span class="PreProc">var</span> curr/eax: grapheme <span class="Special">&lt;-</span> copy <span class="Constant">0</span>
+<span id="L1305" class="LineNr">1305 </span>  <span class="PreProc">var</span> curr/eax: code-point-utf8 <span class="Special">&lt;-</span> copy <span class="Constant">0</span>
 <span id="L1306" class="LineNr">1306 </span>  <span class="muComment"># skip to previous space</span>
 <span id="L1307" class="LineNr">1307 </span>  <span class="Delimiter">{</span>
 <span id="L1308" class="LineNr">1308 </span>    curr <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L495'>gap-left</a> self
@@ -1394,7 +1394,7 @@ if ('onhashchange' in window) {
 <span id="L1330" class="LineNr">1330 </span>
 <span id="L1331" class="LineNr">1331 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L1331'>gap-to-previous-start-of-line</a></span> self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Delimiter">{</span>
 <span id="L1332" class="LineNr">1332 </span>  <span class="muComment"># skip past immediate newline</span>
-<span id="L1333" class="LineNr">1333 </span>  <span class="PreProc">var</span> dummy/eax: grapheme <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L495'>gap-left</a> self
+<span id="L1333" class="LineNr">1333 </span>  <span class="PreProc">var</span> dummy/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L495'>gap-left</a> self
 <span id="L1334" class="LineNr">1334 </span>  <span class="muComment"># skip to previous newline</span>
 <span id="L1335" class="LineNr">1335 </span>  <span class="Delimiter">{</span>
 <span id="L1336" class="LineNr">1336 </span>    dummy <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L495'>gap-left</a> self
@@ -1415,7 +1415,7 @@ if ('onhashchange' in window) {
 <span id="L1351" class="LineNr">1351 </span>
 <span id="L1352" class="LineNr">1352 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L1352'>gap-to-next-end-of-line</a></span> self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Delimiter">{</span>
 <span id="L1353" class="LineNr">1353 </span>  <span class="muComment"># skip past immediate newline</span>
-<span id="L1354" class="LineNr">1354 </span>  <span class="PreProc">var</span> dummy/eax: grapheme <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L481'>gap-right</a> self
+<span id="L1354" class="LineNr">1354 </span>  <span class="PreProc">var</span> dummy/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L481'>gap-right</a> self
 <span id="L1355" class="LineNr">1355 </span>  <span class="muComment"># skip to next newline</span>
 <span id="L1356" class="LineNr">1356 </span>  <span class="Delimiter">{</span>
 <span id="L1357" class="LineNr">1357 </span>    dummy <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L481'>gap-right</a> self
@@ -1444,7 +1444,7 @@ if ('onhashchange' in window) {
 <span id="L1380" class="LineNr">1380 </span>  <span class="Delimiter">{</span>
 <span id="L1381" class="LineNr">1381 </span>    compare i, col
 <span id="L1382" class="LineNr">1382 </span>    <span class="PreProc">break-if-&gt;=</span>
-<span id="L1383" class="LineNr">1383 </span>    <span class="PreProc">var</span> curr/eax: grapheme <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L481'>gap-right</a> self
+<span id="L1383" class="LineNr">1383 </span>    <span class="PreProc">var</span> curr/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L481'>gap-right</a> self
 <span id="L1384" class="LineNr">1384 </span>    <span class="Delimiter">{</span>
 <span id="L1385" class="LineNr">1385 </span>      compare curr, <span class="Constant">-1</span>
 <span id="L1386" class="LineNr">1386 </span>      <span class="PreProc">break-if-!=</span>
@@ -1466,13 +1466,13 @@ if ('onhashchange' in window) {
 <span id="L1402" class="LineNr">1402 </span>  <span class="PreProc">var</span> col/<span class="muRegEdx">edx</span>: int <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L1428'>count-columns-to-start-of-line</a> self
 <span id="L1403" class="LineNr">1403 </span>  <span class="muComment"># skip to start of next line</span>
 <span id="L1404" class="LineNr">1404 </span>  <a href='514gap-buffer.mu.html#L1451'>gap-to-end-of-line</a> self
-<span id="L1405" class="LineNr">1405 </span>  <span class="PreProc">var</span> dummy/eax: grapheme <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L481'>gap-right</a> self
+<span id="L1405" class="LineNr">1405 </span>  <span class="PreProc">var</span> dummy/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L481'>gap-right</a> self
 <span id="L1406" class="LineNr">1406 </span>  <span class="muComment"># skip ahead by up to col on previous line</span>
 <span id="L1407" class="LineNr">1407 </span>  <span class="PreProc">var</span> i/<span class="muRegEcx">ecx</span>: int <span class="Special">&lt;-</span> copy <span class="Constant">0</span>
 <span id="L1408" class="LineNr">1408 </span>  <span class="Delimiter">{</span>
 <span id="L1409" class="LineNr">1409 </span>    compare i, col
 <span id="L1410" class="LineNr">1410 </span>    <span class="PreProc">break-if-&gt;=</span>
-<span id="L1411" class="LineNr">1411 </span>    <span class="PreProc">var</span> curr/eax: grapheme <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L481'>gap-right</a> self
+<span id="L1411" class="LineNr">1411 </span>    <span class="PreProc">var</span> curr/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L481'>gap-right</a> self
 <span id="L1412" class="LineNr">1412 </span>    <span class="Delimiter">{</span>
 <span id="L1413" class="LineNr">1413 </span>      compare curr, <span class="Constant">-1</span>
 <span id="L1414" class="LineNr">1414 </span>      <span class="PreProc">break-if-!=</span>
@@ -1491,7 +1491,7 @@ if ('onhashchange' in window) {
 <span id="L1427" class="LineNr">1427 </span>
 <span id="L1428" class="LineNr">1428 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L1428'>count-columns-to-start-of-line</a></span> self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/<span class="muRegEdx">edx</span>: int <span class="Delimiter">{</span>
 <span id="L1429" class="LineNr">1429 </span>  <span class="PreProc">var</span> count/<span class="muRegEdx">edx</span>: int <span class="Special">&lt;-</span> copy <span class="Constant">0</span>
-<span id="L1430" class="LineNr">1430 </span>  <span class="PreProc">var</span> dummy/eax: grapheme <span class="Special">&lt;-</span> copy <span class="Constant">0</span>
+<span id="L1430" class="LineNr">1430 </span>  <span class="PreProc">var</span> dummy/eax: code-point-utf8 <span class="Special">&lt;-</span> copy <span class="Constant">0</span>
 <span id="L1431" class="LineNr">1431 </span>  <span class="muComment"># skip to previous newline</span>
 <span id="L1432" class="LineNr">1432 </span>  <span class="Delimiter">{</span>
 <span id="L1433" class="LineNr">1433 </span>    dummy <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L495'>gap-left</a> self
@@ -1513,7 +1513,7 @@ if ('onhashchange' in window) {
 <span id="L1449" class="LineNr">1449 </span><span class="Delimiter">}</span>
 <span id="L1450" class="LineNr">1450 </span>
 <span id="L1451" class="LineNr">1451 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='514gap-buffer.mu.html#L1451'>gap-to-end-of-line</a></span> self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>) <span class="Delimiter">{</span>
-<span id="L1452" class="LineNr">1452 </span>  <span class="PreProc">var</span> dummy/eax: grapheme <span class="Special">&lt;-</span> copy <span class="Constant">0</span>
+<span id="L1452" class="LineNr">1452 </span>  <span class="PreProc">var</span> dummy/eax: code-point-utf8 <span class="Special">&lt;-</span> copy <span class="Constant">0</span>
 <span id="L1453" class="LineNr">1453 </span>  <span class="muComment"># skip to next newline</span>
 <span id="L1454" class="LineNr">1454 </span>  <span class="Delimiter">{</span>
 <span id="L1455" class="LineNr">1455 </span>    dummy <span class="Special">&lt;-</span> <a href='514gap-buffer.mu.html#L481'>gap-right</a> self